Merge pull request #1508 from cmgustavo/bug/check-coin-from-credentia…

…ls-01 Fix: GlobalSelect should check coin/chain from credentials instead CurrencyAbbreviation
bitpay · Jan 6, 2025 · 676de65 · 676de65
2 parents 4bb3282 + c187981
commit 676de65
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 30 deletions.
diff --git a/src/navigation/tabs/contacts/screens/ContactsDetails.tsx b/src/navigation/tabs/contacts/screens/ContactsDetails.tsx
@@ -173,27 +173,28 @@ const ContactsDetails = ({
       // Remove prefix
       newAddress = ToCashAddress(contact.address, false);
     }
-    if (!IsEVMChain(contact.chain)) {
-      contactOptions.push({
-        img: theme.dark ? <SendIconWhite /> : <SendIcon />,
-        title: t('Send ') + contact.coin.toUpperCase(),
-        onPress: async () => {
-          setShowIconOptions(false);
-          await sleep(500);
-          navigation.navigate('GlobalSelect', {
-            context: 'contact',
-            recipient: {
-              name: contact.name,
-              address: newAddress,
-              currency: contact.coin,
-              chain: contact.chain,
-              network: contact.network,
-              destinationTag: contact.tag || contact.destinationTag,
+    contactOptions.push({
+      img: theme.dark ? <SendIconWhite /> : <SendIcon />,
+      title: t('Send to this contact'),
+      onPress: async () => {
+        setShowIconOptions(false);
+        await sleep(500);
+        navigation.navigate('GlobalSelect', {
+          context: 'contact',
+          recipient: {
+            name: contact.name,
+            address: newAddress,
+            currency: contact.coin,
+            chain: contact.chain,
+            network: contact.network,
+            destinationTag: contact.tag || contact.destinationTag,
+            opts: {
+              showEVMWalletsAndTokens: true,
             },
-          });
-        },
-      });
-    }
+          },
+        });
+      },
+    });
   }
 
   contactOptions.push({

diff --git a/src/navigation/wallet/screens/GlobalSelect.tsx b/src/navigation/wallet/screens/GlobalSelect.tsx
@@ -641,10 +641,10 @@ const GlobalSelect: React.FC<GlobalSelectScreenProps | GlobalSelectProps> = ({
     if (recipient.currency && recipient.chain) {
       wallets = wallets.filter(
         wallet =>
-          (wallet.currencyAbbreviation === recipient?.currency &&
-            wallet.chain === recipient?.chain) ||
+          (wallet.credentials.coin === recipient?.currency &&
+            wallet.credentials.chain === recipient?.chain) ||
           (recipient?.opts?.showEVMWalletsAndTokens &&
-            BitpaySupportedEvmCoins[wallet.currencyAbbreviation]),
+            BitpaySupportedEvmCoins[wallet.credentials.chain]),
       );
     }
     if (recipient?.network) {
@@ -665,7 +665,7 @@ const GlobalSelect: React.FC<GlobalSelectScreenProps | GlobalSelectProps> = ({
       ),
     ];
     wallets = wallets.filter(wallet =>
-      supportedCurrencies.includes(wallet.currencyAbbreviation),
+      supportedCurrencies.includes(wallet.credentials.coin),
     );
   }
 
@@ -700,15 +700,21 @@ const GlobalSelect: React.FC<GlobalSelectScreenProps | GlobalSelectProps> = ({
           _filterByCustomWallets = wallets.filter(
             w =>
               allCurrencies.includes(
-                getExternalServiceSymbol(w.currencyAbbreviation, w.chain),
+                getExternalServiceSymbol(
+                  w.credentials.coin,
+                  w.credentials.chain,
+                ),
               ) && w.keyId === key.id,
           );
         } else {
           _filterByCustomWallets = wallets.filter(w => {
             const isContextValid =
               !['coinbaseDeposit'].includes(context) ||
               allCurrencies.includes(
-                getCurrencyAbbreviation(w.currencyAbbreviation, w.chain),
+                getCurrencyAbbreviation(
+                  w.credentials.coin,
+                  w.credentials.chain,
+                ),
               );
 
             return isContextValid && w.keyId === key.id;
@@ -879,8 +885,7 @@ const GlobalSelect: React.FC<GlobalSelectScreenProps | GlobalSelectProps> = ({
               wallet,
               sendTo,
               sendMaxEnabled: ['contact', 'scanner'].includes(context),
-              cryptoCurrencyAbbreviation:
-                wallet.currencyAbbreviation.toUpperCase(),
+              cryptoCurrencyAbbreviation: wallet.credentials.coin.toUpperCase(),
               chain: wallet.chain,
               tokenAddress: wallet.tokenAddress,
               onAmountSelected: async (amount, setButtonState, opts) => {

diff --git a/src/store/wallet/utils/wallet.ts b/src/store/wallet/utils/wallet.ts
@@ -15,7 +15,6 @@ import {
   BitpaySupportedMaticTokens,
   BitpaySupportedUtxoCoins,
   OtherBitpaySupportedCoins,
-  SUPPORTED_CURRENCIES,
 } from '../../../constants/currencies';
 import {CurrencyListIcons} from '../../../constants/SupportedCurrencyOptions';
 import {BwcProvider} from '../../../lib/bwc';
@@ -25,7 +24,6 @@ import {
   GetProtocolPrefix,
   IsERCToken,
   IsEVMChain,
-  IsUtxoChain,
 } from './currency';
 import {
   addTokenChainSuffix,