[FIX] import wallet selector and chain refactor

src/navigation/tabs/contacts/screens/ContactsAdd.tsx

@@ -336,7 +336,7 @@ const ContactsAdd = ({
     chain?: string,
   ) => {
     if (address) {
-      const coinAndNetwork = GetCoinAndNetwork(address);
+      const coinAndNetwork = GetCoinAndNetwork(address, undefined, chain);
       if (coinAndNetwork) {
         const isValid = ValidateCoinAddress(
           address,

src/navigation/wallet/components/MultipleOutputsTx.tsx

@@ -104,7 +104,7 @@ const MultipleOutputsTx = ({tx}: {tx: any}) => {
   tx.outputs.forEach((output: any) => {
     const outputAddr = output.toAddress ? output.toAddress : output.address;
     if (!coin || !network) {
-      const coinAndNetwork = GetCoinAndNetwork(outputAddr, network);
+      const coinAndNetwork = GetCoinAndNetwork(outputAddr, network, chain);
       coin = coin || coinAndNetwork?.coin;
       network = network || coinAndNetwork?.network;
     }

src/navigation/wallet/components/RecoveryPhrase.tsx

@@ -543,7 +543,7 @@ const RecoveryPhrase = () => {
     ({item}) => {
       const currencySelected = (id: string) => {
         const _selectedCurrency = CurrencyOptions.filter(
-          currency => currency.id === id,
+          currency => currency.currencyAbbreviation === id,
         );
         const currencyAbbreviation = _selectedCurrency[0].currencyAbbreviation;
         const defaultCoin = `default${currencyAbbreviation.toUpperCase()}`;
@@ -708,7 +708,7 @@ const RecoveryPhrase = () => {
                       <Row style={{alignItems: 'center'}}>
                         <CurrencyImage img={selectedCurrency.img} size={30} />
                         <CurrencyName>
-                          {selectedCurrency?.currencyAbbreviation}
+                          {selectedCurrency?.currencyAbbreviation?.toUpperCase()}
                         </CurrencyName>
                       </Row>
                       <Icons.DownToggle />

src/navigation/wallet/components/SendToAddress.tsx

@@ -141,7 +141,7 @@ const SendToAddress = () => {
   const checkCoinAndNetwork =
     (data: any): Effect<boolean> =>
     dispatch => {
-      const addrData = GetCoinAndNetwork(data, network);
+      const addrData = GetCoinAndNetwork(data, network, chain);
       const isValid =
         chain === addrData?.coin.toLowerCase() && addrData?.network === network;
 

src/navigation/wallet/screens/AddWallet.tsx

@@ -431,10 +431,10 @@ const AddWallet: React.FC<AddWalletScreenProps> = ({navigation, route}) => {
         ({id}) => id === associatedWallet.id,
       )!;
       const {network, currencyAbbreviation, chain} = fullWalletObj;
-      const addrData = GetCoinAndNetwork(tokenAddress, network);
+      const addrData = GetCoinAndNetwork(tokenAddress, network, chain);
       const isValid =
         currencyAbbreviation.toLowerCase() === addrData?.coin.toLowerCase() &&
-        addrData?.network === network;
+        network === addrData?.network;
 
       if (!isValid) {
         return;
@@ -494,7 +494,10 @@ const AddWallet: React.FC<AddWalletScreenProps> = ({navigation, route}) => {
               <Row
                 style={{alignItems: 'center', justifyContent: 'space-between'}}>
                 <Row style={{alignItems: 'center'}}>
-                  <CurrencyImage img={CurrencyListIcons.eth} size={30} />
+                  <CurrencyImage
+                    img={CurrencyListIcons[associatedWallet.chain]}
+                    size={30}
+                  />
                   <AssociateWalletName>
                     {associatedWallet?.walletName ||
                       `${associatedWallet.currencyAbbreviation.toUpperCase()} Wallet`}

src/navigation/wallet/screens/send/SendTo.tsx

@@ -317,10 +317,10 @@ const SendTo = () => {
           data?.chain?.toLowerCase() === chain.toLowerCase() &&
           data?.network.toLowerCase() === network.toLowerCase();
       } else {
-        addrData = GetCoinAndNetwork(data, network);
+        addrData = GetCoinAndNetwork(data, network, chain);
         isValid =
           chain === addrData?.coin.toLowerCase() &&
-          addrData?.network === network;
+          network === addrData?.network;
       }
 
       if (isValid) {

src/store/wallet/effects/address/address.ts

@@ -134,6 +134,7 @@ export const GetAddressNetwork = (address: string, coin: keyof BitcoreLibs) => {
 export const GetCoinAndNetwork = (
   str: string,
   network: string = 'livenet',
+  evmChain?: string,
 ): CoinNetwork | null => {
   const address = ExtractCoinNetworkAddress(str);
   try {
@@ -144,12 +145,12 @@ export const GetCoinAndNetwork = (
     } catch (bchErr) {
       try {
         const isValidEthAddress = Core.Validation.validateAddress(
-          'ETH',
+          evmChain?.toUpperCase() || 'ETH',
           network,
           address,
         );
         if (isValidEthAddress) {
-          return {coin: 'eth', network};
+          return {coin: evmChain?.toLowerCase() || 'eth', network};
         } else {
           throw isValidEthAddress;
         }

src/store/wallet/effects/rates/rates.ts

@@ -33,7 +33,7 @@ import moment from 'moment';
 import {addAltCurrencyList} from '../../../app/app.actions';
 import {AltCurrenciesRowProps} from '../../../../components/list/AltCurrenciesRow';
 import {LogActions} from '../../../log';
-import {BitpaySupportedEthereumTokenOptsByAddress} from '../../../../constants/tokens';
+import {BitpaySupportedTokenOptsByAddress} from '../../../../constants/tokens';
 import {
   getCurrencyAbbreviation,
   addTokenChainSuffix,
@@ -218,7 +218,7 @@ export const getTokenRates =
         } = getState();
 
         const tokensOptsByAddress = {
-          ...BitpaySupportedEthereumTokenOptsByAddress,
+          ...BitpaySupportedTokenOptsByAddress,
           ...tokenOptionsByAddress,
           ...customTokenOptionsByAddress,
         };
@@ -240,7 +240,6 @@ export const getTokenRates =
           )}&vs_currencies=${altCurrencies.join(
             ',',
           )}&include_24hr_change=true&include_last_updated_at=true`;
-
           dispatch(LogActions.debug(`getTokenRates: get request to: ${url}`));
           const {data} = await axios.get(url);
           dispatch(LogActions.debug('getTokenRates: success get request'));