after merge fixes

Emurgo · Sep 9, 2023 · cc246fb · cc246fb
1 parent 2056cc1
commit cc246fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/packages/yoroi-connector/src/cardanoApiInject.js b/packages/yoroi-connector/src/cardanoApiInject.js
@@ -140,11 +140,15 @@
 
     // DEPRECATED
     getCollateralUtxos(requiredAmount) {
-      return CardanoAPI._cardano_rpc_call("get_collateral_utxos", [requiredAmount]);
+      const amount = typeof requiredAmount === 'object' ? requiredAmount.amount : requiredAmount;
+      const strAmount = amount == null || amount === '' ? null : String(amount);
+      return CardanoAPI._cardano_rpc_call("get_collateral_utxos", [strAmount]);
     }
 
     getCollateral(requiredAmount) {
-      return CardanoAPI._cardano_rpc_call("get_collateral_utxos", [requiredAmount]);
+      const amount = typeof requiredAmount === 'object' ? requiredAmount.amount : requiredAmount;
+      const strAmount = amount == null || amount === '' ? null : String(amount);
+      return CardanoAPI._cardano_rpc_call("get_collateral_utxos", [strAmount]);
     }
   }
   window.CardanoAPI = CardanoAPI;

diff --git a/packages/yoroi-extension/chrome/extension/background.js b/packages/yoroi-extension/chrome/extension/background.js
@@ -53,7 +53,8 @@ import {
   getAddressing,
   connectorSignData,
   connectorGetAssets,
-  getTokenMetadataFromIds, MAX_COLLATERAL,
+  getTokenMetadataFromIds,
+  MAX_COLLATERAL,
 } from './connector/api';
 import { updateTransactions as ergoUpdateTransactions } from '../../app/api/ergo/lib/storage/bridge/updateTransactions';
 import {
@@ -1777,7 +1778,7 @@ async function handleInjectorMessage(message, sender) {
       try {
         checkParamCount(1);
         await RustModule.load();
-        let requiredAmount: string = message.params[0];
+        let requiredAmount: string = message.params[0] || String(MAX_COLLATERAL);
         if (!/^\d+$/.test(requiredAmount)) {
           try {
             requiredAmount = RustModule.WalletV4.Value.from_bytes(

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json