tail sync fix

Emurgo · Feb 2, 2024 · 309eadb · 309eadb
1 parent 6d7f04a
commit 309eadb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/packages/yoroi-extension/app/stores/ada/AdaDelegationStore.js b/packages/yoroi-extension/app/stores/ada/AdaDelegationStore.js
@@ -145,9 +145,7 @@ export default class AdaDelegationStore extends Store<StoresMap, ActionsMap> {
             publicDeriver: withStakingKey,
             rewardBalance: new MultiToken(
               [{
-                amount: new BigNumber(stateForStakingKey == null
-                  ? 0
-                  : stateForStakingKey.remainingAmount),
+                amount: new BigNumber(stateForStakingKey?.remainingAmount ?? 0),
                 networkId: defaultToken.defaultNetworkId,
                 identifier: defaultToken.defaultIdentifier,
               }],

diff --git a/packages/yoroi-extension/app/stores/toplevel/TransactionsStore.js b/packages/yoroi-extension/app/stores/toplevel/TransactionsStore.js
@@ -362,7 +362,10 @@ export default class TransactionsStore extends Store<StoresMap, ActionsMap> {
       /*
        * TAIL REQUEST IS USED WHEN FIRST SYNC OR EMPTY WALLET
        */
-      result = await this._internalTailRequestForTxs(request.publicDeriver);
+      result = await this._internalTailRequestForTxs({
+        publicDeriver: request.publicDeriver,
+        isLocalRequest: request.isLocalRequest,
+      });
     } else {
       /*
        * HEAD REQUEST IS USED WITH `AFTER` REFERENCE
@@ -371,6 +374,7 @@ export default class TransactionsStore extends Store<StoresMap, ActionsMap> {
       headRequest.invalidate({ immediately: false });
       headRequest.execute({
         publicDeriver,
+        // HEAD request is never local by logic
         isLocalRequest: false,
         afterTx: txHistoryState.txs[0],
       });
@@ -492,11 +496,13 @@ export default class TransactionsStore extends Store<StoresMap, ActionsMap> {
     );
   }
 
-  _internalTailRequestForTxs: (
-    PublicDeriver<> & IGetLastSyncInfo,
-  ) => Promise<GetTransactionsResponse> = async (
+  _internalTailRequestForTxs: ({|
     publicDeriver: PublicDeriver<> & IGetLastSyncInfo,
-  ) => {
+    isLocalRequest?: boolean,
+  |}) => Promise<GetTransactionsResponse> = async ({
+    publicDeriver,
+    isLocalRequest = false,
+  }) => {
     const withLevels = asHasLevels<ConceptualWallet, IGetLastSyncInfo>(publicDeriver);
     if (withLevels == null) {
       throw new Error(`${nameof(this._loadMore)} no levels`);
@@ -509,7 +515,7 @@ export default class TransactionsStore extends Store<StoresMap, ActionsMap> {
     tailRequest.invalidate({ immediately: false });
     tailRequest.execute({
       publicDeriver: withLevels,
-      isLocalRequest: false,
+      isLocalRequest,
       beforeTx,
     });
     if (!tailRequest.promise) throw new Error('unexpected nullish tailRequest.promise');
@@ -526,7 +532,7 @@ export default class TransactionsStore extends Store<StoresMap, ActionsMap> {
   ) => Promise<void> = async (
     publicDeriver: PublicDeriver<> & IGetLastSyncInfo,
   ) => {
-    const result = await this._internalTailRequestForTxs(publicDeriver);
+    const result = await this._internalTailRequestForTxs({ publicDeriver });
     await this._afterLoadingNewTxs(result, publicDeriver);
   }