Migrate Matic to POL

- Polygon blockchain - migration - Ethereum blockchain - Remove Matic, add POL - BSC Smart Chain - Remove Matic
nicolas-meilan · Oct 25, 2024 · 27bf91e · 27bf91e
1 parent 016b4ac
commit 27bf91e
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 37 deletions.
diff --git a/src/components/BlockchainSelector.tsx b/src/components/BlockchainSelector.tsx
@@ -29,25 +29,25 @@ const BlockchainSelector = ({
 
   const {
     blockchain,
-    blockchainsBaseTokenSymbols,
+    blockchainsBaseToken,
     setBlockchain,
   } = useBlockchainData();
 
   const blockchains = useMemo(() => (
-    Object.keys(blockchainsBaseTokenSymbols) as Blockchains[]
+    Object.keys(blockchainsBaseToken) as Blockchains[]
   ).map((blockchainKey) => ({
     value: blockchainKey,
     label: t(`blockchain.${blockchainKey}`),
     leftComponent: (
       <TokenIcon
         size={24}
-        tokenSymbol={BLOCKCHAINS_CONFIG[blockchainKey].blockchainSymbol || blockchainsBaseTokenSymbols[blockchainKey]}
+        iconName={BLOCKCHAINS_CONFIG[blockchainKey].blockchainSymbol || blockchainsBaseToken[blockchainKey].iconName}
       />),
     data: undefined,
     disabled: disableBlockchainsWithoutAddress
       ? !walletPublicValues?.[BLOCKCHAIN_PUBLIC_VALUES_CONFIG[blockchainKey].addressProp]
       : false,
-  })), [blockchainsBaseTokenSymbols]);
+  })), [blockchainsBaseToken]);
 
   return (
     <Select

diff --git a/src/components/Calculator.tsx b/src/components/Calculator.tsx
@@ -227,7 +227,7 @@ const Calculator = ({
       <Content>
         {!!token && (
           <Token>
-            <TokenIcon tokenSymbol={token.symbol} />
+            <TokenIcon iconName={token.iconName} />
             <SkeletonWrapper isLoading={tokenBalancesLoading}>
               <Skeleton
                 isLoading={tokenBalancesLoading}

diff --git a/src/components/TokenIcon.tsx b/src/components/TokenIcon.tsx
@@ -15,7 +15,7 @@ import type { TokenType } from '@web3/tokens';
 type TokenStatus = 'success' | 'warning' | 'error';
 
 export type TokenIconProps = SvgProps & {
-  tokenSymbol: TokenType['symbol'] | FiatCurrencies;
+  iconName: TokenType['iconName'] | FiatCurrencies;
   isFiat?: boolean;
   status?: TokenStatus;
 };
@@ -33,7 +33,7 @@ const StyledSvg = styled(Svg) <{ status?: TokenStatus }>`
 
 const TokenIcon = ({
   status,
-  tokenSymbol,
+  iconName,
   isFiat = false,
   ...props
 }: TokenIconProps) => {
@@ -44,15 +44,15 @@ const TokenIcon = ({
   const svg = hasError ? defaultTokenIcon : null;
 
   const iconUrl = isFiat
-    ? getFiatIconUrl(tokenSymbol as FiatCurrencies)
-    : TOKEN_ICON_URL.replace(TOKEN_ICON_URL_REPLACER, tokenSymbol);
+    ? getFiatIconUrl(iconName as FiatCurrencies)
+    : TOKEN_ICON_URL.replace(TOKEN_ICON_URL_REPLACER, iconName);
 
   return (
     <StyledSvg
       status={status}
       svg={svg}
       onError={onError}
-      viewBox='0 0 18 18'
+      viewBox="0 0 18 18"
       uri={iconUrl}
       {...props}
     />

diff --git a/src/components/TokenItem.tsx b/src/components/TokenItem.tsx
@@ -76,6 +76,7 @@ const RightIcon = styled(Icon)<{ color?: string }>`
 `;
 
 const TokenItem = ({
+  iconName,
   symbol,
   decimals,
   balance,
@@ -149,7 +150,7 @@ const TokenItem = ({
       disabled={disabled || !onPress}
     >
       <StyledTokenIcon
-        tokenSymbol={symbol}
+        iconName={iconName}
         size={fullName ? 44 : 36}
         status={status}
       />

diff --git a/src/hooks/useBlockchainData.ts b/src/hooks/useBlockchainData.ts
@@ -12,7 +12,6 @@ import getProvider, { tronProvider } from '@web3/providers';
 import getTokens, {
   BASE_TOKEN_ADDRESS,
   TokensStruct,
-  TokenSymbol,
   TokenType,
 } from '@web3/tokens';
 
@@ -25,8 +24,8 @@ type UseBlockchainDataReturn = {
   removeBlockchain: () => void;
   blockchainLoading: boolean;
   isBlockchainInitialLoading: boolean;
-  blockchainsBaseTokenSymbols: {
-    [blockchain in Blockchains]: TokenSymbol;
+  blockchainsBaseToken: {
+    [blockchain in Blockchains]: TokenType;
   };
   blockchain: Blockchains;
   blockchainProvider: Provider | typeof tronProvider;
@@ -91,17 +90,17 @@ const useBlockchainData = ({
   const findBlockchainBaseToken = (tokens: TokensStruct) => Object.values(tokens)
     .find(({ address }) => address === BASE_TOKEN_ADDRESS)!;
 
-  const blockchainsBaseTokenSymbols = useMemo(() => {
+  const blockchainsBaseToken = useMemo(() => {
     const blockchainsKeys = Object.keys(Blockchains) as Blockchains[];
 
     return {
       ...zipObject(
         blockchainsKeys,
         blockchainsKeys.map((blockchainKey) => (
-          findBlockchainBaseToken(getTokens(blockchainKey)).symbol
+          findBlockchainBaseToken(getTokens(blockchainKey))
         )),
       ),
-    } as UseBlockchainDataReturn['blockchainsBaseTokenSymbols'];
+    } as UseBlockchainDataReturn['blockchainsBaseToken'];
   }, []);
 
   const blockchain = useMemo(() => StoredBlockchain || DEFAULT_BLOCKCHAIN, [StoredBlockchain]);
@@ -118,7 +117,7 @@ const useBlockchainData = ({
     blockchainLoading: isLoading || isRefetching,
     isBlockchainInitialLoading,
     blockchain,
-    blockchainsBaseTokenSymbols,
+    blockchainsBaseToken,
     blockchainProvider,
     tokens,
     blockchainBaseToken,

diff --git a/src/hooks/useTokenConversions.ts b/src/hooks/useTokenConversions.ts
@@ -14,7 +14,7 @@ type TokenConversion = TokenConversionsEndpointResponse['data'];
 type UseTokenConversionssReturn = {
   tokenConversions?: TokenConversion | null;
   tokenConversionsLoading: boolean;
-  convert: (balance: number | bigint, from: Omit<TokenType, 'name' | 'address'>) => number;
+  convert: (balance: number | bigint, from: Omit<TokenType, 'name' | 'address' | 'iconName'>) => number;
   refetchTokenConversions: () => Promise<void>;
 };
 

diff --git a/src/screens/main/ConfigurationScreen.tsx b/src/screens/main/ConfigurationScreen.tsx
@@ -135,7 +135,7 @@ const ConfigurationScreen = ({
   const consolidatedCurrenciesList = useMemo(() => Object.values(FiatCurrencies).map((item) => ({
     label: item,
     value: item,
-    leftComponent: <TokenIcon isFiat tokenSymbol={item} size={24} />,
+    leftComponent: <TokenIcon isFiat iconName={item} size={24} />,
     data: undefined,
   })), []);
 

diff --git a/src/screens/main/SendScreen.tsx b/src/screens/main/SendScreen.tsx
@@ -263,7 +263,7 @@ const SendScreen = ({ navigation, route }: SendScreenProps) => {
         value: token.symbol as string,
         data: token,
         label: token.name,
-        leftComponent: <TokenIcon tokenSymbol={token.symbol} size={24} />,
+        leftComponent: <TokenIcon iconName={token.iconName} size={24} />,
         disabled: !tokenBalances || isZero(tokenBalances?.[token.symbol]),
       };
     });

diff --git a/src/screens/main/TokenScreen.tsx b/src/screens/main/TokenScreen.tsx
@@ -233,7 +233,7 @@ const TokenScreen = ({ navigation, route }: TokenScreenProps) => {
         </ButtonsWrapper>
         <TokenBaseInfo>
           <ErrorWrapper requiredValuesToRender={[token]}>
-            {token && <TokenIcon tokenSymbol={token.symbol} size={44} />}
+            {token && <TokenIcon iconName={token.iconName} size={44} />}
             <BalanceWrapper>
               <BalanceSkeleton
                 isLoading={!tokenBalances}

diff --git a/src/screens/main/TxScreen.tsx b/src/screens/main/TxScreen.tsx
@@ -157,7 +157,7 @@ const TxScreen = ({
       goBack={goBack}
     >
       <StyledTokenIcon
-        tokenSymbol={token.symbol}
+        iconName={token.iconName}
         size={TOKEN_ICON_SIZE}
         status={status}
       />