From cc246fb1df68112d8c8696e6c111de9fbf87686d Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Sat, 9 Sep 2023 14:21:51 +0300
Subject: [PATCH] after merge fixes

---
 packages/yoroi-connector/src/cardanoApiInject.js        | 8 ++++++--
 packages/yoroi-extension/chrome/extension/background.js | 5 +++--
 packages/yoroi-extension/package-lock.json              | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-connector/src/cardanoApiInject.js b/packages/yoroi-connector/src/cardanoApiInject.js
index 138c52a822..c0bbfca8fb 100644
--- 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
index b241bec196..5c5d2985dd 100644
--- 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
index 6d01a85b78..1dbcafb9ef 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "4.22.404",
+  "version": "4.22.500",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {