Merge pull request #2885 from Emurgo/production

[pull] Latest Production to Develop after 4.14.300
Emurgo · Jun 9, 2022 · cef1674 · cef1674
2 parents 3e137fb + 6330cda
commit cef1674
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/packages/yoroi-ergo-connector/src/inject.js b/packages/yoroi-ergo-connector/src/inject.js
@@ -258,9 +258,14 @@ class CardanoAPI {
       return this._cardano_rpc_call("sign_data", [address, payload]);
     }
 
+    // DEPRECATED
     getCollateralUtxos(requiredAmount) {
       return this._cardano_rpc_call("get_collateral_utxos", [requiredAmount]);
     }
+
+    getCollateral(requiredAmount) {
+      return this._cardano_rpc_call("get_collateral_utxos", [requiredAmount]);
+    }
 }
 `
 

diff --git a/packages/yoroi-extension/app/stores/toplevel/TransactionsStore.js b/packages/yoroi-extension/app/stores/toplevel/TransactionsStore.js
@@ -583,7 +583,7 @@ export default class TransactionsStore extends Store<StoresMap, ActionsMap> {
         new AssetIdsReducer(),
       ];
 
-      for (;;) {
+      for (let i = 0; ; i++) {
         const batchRequest = {
           ...request,
           skip: cursor,
@@ -592,7 +592,11 @@ export default class TransactionsStore extends Store<StoresMap, ActionsMap> {
 
         const batchResult =
           await this.stores.substores[apiType].transactions.refreshTransactions(
-            batchRequest
+            {
+              ...batchRequest,
+              // only the first call should update from remote
+              isLocalRequest: i > 0,
+            }
           );
         if (batchResult.transactions.length === 0) {
           break;

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "4.14.200",
+  "version": "4.14.300",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev:build": "rimraf dev/ && babel-node scripts/build --type=debug",