Merge pull request #174 from Gamboster/fix/walletSelection

Fix: wallet selection condition
bitpay · Jul 1, 2022 · 8907a87 · 8907a87
2 parents cc49b96 + 2fbbbb9
commit 8907a87
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/navigation/services/buy-crypto/screens/BuyCryptoRoot.tsx b/src/navigation/services/buy-crypto/screens/BuyCryptoRoot.tsx
@@ -642,7 +642,7 @@ const BuyCryptoRoot: React.FC<
         modalTitle={'Select Destination'}
         onDismiss={(newWallet?: Wallet) => {
           hideModal('walletSelector');
-          if (newWallet) {
+          if (newWallet?.currencyAbbreviation) {
             setWallet(newWallet);
           }
         }}

diff --git a/src/navigation/services/swap-crypto/screens/SwapCryptoRoot.tsx b/src/navigation/services/swap-crypto/screens/SwapCryptoRoot.tsx
@@ -182,7 +182,7 @@ const SwapCryptoRoot: React.FC = () => {
     setRateData(undefined);
 
     const coinsTo = cloneDeep(swapCryptoSupportedCoinsFrom).filter(
-      coin => coin !== fromWallet.currencyAbbreviation.toLowerCase(),
+      coin => coin !== fromWallet.currencyAbbreviation?.toLowerCase(),
     );
 
     setSwapCryptoSupportedCoinsTo(coinsTo);
@@ -201,14 +201,15 @@ const SwapCryptoRoot: React.FC = () => {
     if (fromWalletSelected) {
       setFromWalletData(
         SupportedCurrencyOptions.find(
-          ({id}) => id === fromWalletSelected?.credentials.coin,
+          ({id}) =>
+            id === fromWalletSelected.currencyAbbreviation.toLowerCase(),
         ),
       );
     }
     if (toWalletSelected) {
       setToWalletData(
         SupportedCurrencyOptions.find(
-          ({id}) => id === toWalletSelected?.credentials.coin,
+          ({id}) => id === toWalletSelected.currencyAbbreviation.toLowerCase(),
         ),
       );
     }
@@ -894,7 +895,7 @@ const SwapCryptoRoot: React.FC = () => {
         modalTitle={'Select Source Wallet'}
         onDismiss={(fromWallet: Wallet) => {
           hideModal('fromWalletSelector');
-          if (fromWallet) {
+          if (fromWallet?.currencyAbbreviation) {
             setFromWallet(fromWallet);
           }
         }}
@@ -907,7 +908,7 @@ const SwapCryptoRoot: React.FC = () => {
         modalTitle={'Select Destination'}
         onDismiss={(toWallet?: Wallet) => {
           hideModal('walletSelector');
-          if (toWallet) {
+          if (toWallet?.currencyAbbreviation) {
             setToWallet(toWallet);
           }
         }}