chore(suite): update network symbol naming

trezor · Dec 4, 2024 · b6003e8 · b6003e8
1 parent 7063601
commit b6003e8
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 97 deletions.
diff --git a/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx b/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 import { spacings, spacingsPx } from '@trezor/theme';
 import { AssetLogo, Badge, Column, Row, Text } from '@trezor/components';
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { getContractAddressForNetwork } from '@suite-common/wallet-utils';
+import { getContractAddressForNetworkSymbol } from '@suite-common/wallet-utils';
 
 import { CoinLogo } from '../CoinLogo/CoinLogo';
 import { AssetOptionBaseProps } from './SelectAssetModal';
@@ -63,7 +63,10 @@ export const AssetItem = ({
                         coingeckoId={coingeckoId}
                         contractAddress={
                             symbolExtended && contractAddress
-                                ? getContractAddressForNetwork(symbolExtended, contractAddress)
+                                ? getContractAddressForNetworkSymbol(
+                                      symbolExtended,
+                                      contractAddress,
+                                  )
                                 : undefined
                         }
                         placeholder={ticker.toUpperCase()}

diff --git a/packages/product-components/src/components/TokenIconSet/TokenIconSet.tsx b/packages/product-components/src/components/TokenIconSet/TokenIconSet.tsx
@@ -3,7 +3,7 @@ import styled, { css } from 'styled-components';
 import { AssetLogo, useElevation } from '@trezor/components';
 import { getCoingeckoId, NetworkSymbol } from '@suite-common/wallet-config';
 import { TokenInfo } from '@trezor/connect';
-import { getContractAddressForNetwork } from '@suite-common/wallet-utils';
+import { getContractAddressForNetworkSymbol } from '@suite-common/wallet-utils';
 import { borders, Elevation, mapElevationToBackground, mapElevationToBorder } from '@trezor/theme';
 
 export type TokenIconSetProps = {
@@ -57,7 +57,7 @@ export const TokenIconSet = ({ symbol, tokens }: TokenIconSetProps) => {
                     key={token.contract}
                     size={20}
                     coingeckoId={coingeckoId ?? ''}
-                    contractAddress={getContractAddressForNetwork(symbol, token.contract)}
+                    contractAddress={getContractAddressForNetworkSymbol(symbol, token.contract)}
                     placeholder={token.symbol?.toUpperCase() ?? ''}
                     placeholderWithTooltip={false}
                 />

diff --git a/packages/suite/src/actions/wallet/exportTransactionsActions.ts b/packages/suite/src/actions/wallet/exportTransactionsActions.ts
@@ -70,7 +70,7 @@ export const exportTransactionsThunk = createThunk(
         // Prepare data in right format
         const data = await formatData(
             {
-                coin: account.symbol,
+                symbol: account.symbol,
                 accountName,
                 type,
                 transactions: filteredTransaction,

diff --git a/packages/suite/src/utils/suite/__fixtures__/stake.ts b/packages/suite/src/utils/suite/__fixtures__/stake.ts
@@ -676,14 +676,14 @@ export const getEthNetworkForWalletSdkFixture = [
     {
         description: 'should return "holesky" for "thol"',
         args: {
-            symbol: 'thol',
+            symbol: 'thol' as const,
         },
         result: 'holesky',
     },
     {
         description: 'should return "mainnet" for "eth"',
         args: {
-            symbol: 'eth',
+            symbol: 'eth' as const,
         },
         result: 'mainnet',
     },
@@ -697,7 +697,7 @@ export const getEthNetworkForWalletSdkFixture = [
     {
         description: 'should return "mainnet" for an unknown symbol',
         args: {
-            symbol: 'unknown',
+            symbol: 'unknown' as const,
         },
         result: 'mainnet',
     },
@@ -712,7 +712,7 @@ export const getInstantStakeTypeFixture = [
                 to: '0x19449f0f696703Aa3b1485DfA2d855F33659397a',
             },
             address: 'address',
-            symbol: 'eth',
+            symbol: 'eth' as const,
         },
         result: 'stake',
     },
@@ -724,7 +724,7 @@ export const getInstantStakeTypeFixture = [
                 to: '0x66cb3AeD024740164EBcF04e292dB09b5B63A2e1',
             },
             address: 'address',
-            symbol: 'thol',
+            symbol: 'thol' as const,
         },
         result: 'stake',
     },
@@ -736,7 +736,7 @@ export const getInstantStakeTypeFixture = [
                 to: 'address',
             },
             address: 'address',
-            symbol: 'eth',
+            symbol: 'eth' as const,
         },
         result: 'unstake',
     },
@@ -748,7 +748,7 @@ export const getInstantStakeTypeFixture = [
                 to: 'address',
             },
             address: 'address',
-            symbol: 'thol',
+            symbol: 'thol' as const,
         },
         result: 'unstake',
     },
@@ -760,7 +760,7 @@ export const getInstantStakeTypeFixture = [
                 to: 'address',
             },
             address: 'address',
-            symbol: 'eth',
+            symbol: 'eth' as const,
         },
         result: 'claim',
     },
@@ -772,7 +772,7 @@ export const getInstantStakeTypeFixture = [
                 to: 'address',
             },
             address: 'address',
-            symbol: 'thol',
+            symbol: 'thol' as const,
         },
         result: 'claim',
     },
@@ -784,7 +784,7 @@ export const getInstantStakeTypeFixture = [
                 to: 'unknown',
             },
             address: 'address',
-            symbol: 'eth',
+            symbol: 'eth' as const,
         },
         result: null,
     },
@@ -813,7 +813,7 @@ export const getChangedInternalTxFixture = [
                 { type: 'sent', txid: '4', internalTransfers: [] },
             ],
             selectedAccountAddress: 'address',
-            symbol: 'eth',
+            symbol: 'eth' as const,
         },
         result: null,
     },
@@ -840,7 +840,7 @@ export const getChangedInternalTxFixture = [
                 { type: 'sent', txid: '2', internalTransfers: [] },
             ],
             selectedAccountAddress: 'address',
-            symbol: 'eth',
+            symbol: 'eth' as const,
         },
         result: {
             from: '0xD523794C879D9eC028960a231F866758e405bE34',

diff --git a/packages/suite/src/utils/suite/__tests__/stake.test.ts b/packages/suite/src/utils/suite/__tests__/stake.test.ts
@@ -11,7 +11,6 @@ import {
 } from '@trezor/connect/src/types/api/blockchainEstimateFee';
 import { WalletAccountTransaction } from '@suite-common/wallet-types';
 import { ValidatorsQueue } from '@suite-common/wallet-core';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import {
     transformTx,
@@ -226,7 +225,7 @@ describe('getAdjustedGasLimitConsumption', () => {
 describe('getEthNetworkForWalletSdk', () => {
     getEthNetworkForWalletSdkFixture.forEach(test => {
         it(test.description, async () => {
-            const result = await getEthNetworkForWalletSdk(test.args.symbol as NetworkSymbol);
+            const result = await getEthNetworkForWalletSdk(test.args.symbol);
             expect(result).toEqual(test.result);
         });
     });
@@ -238,7 +237,7 @@ describe('getInstantStakeType', () => {
             const result = await getInstantStakeType(
                 test.args.internalTransfer as InternalTransfer,
                 test.args.address,
-                test.args.symbol as NetworkSymbol,
+                test.args.symbol,
             );
             expect(result).toEqual(test.result);
         });
@@ -252,7 +251,7 @@ describe('getChangedInternalTx', () => {
                 test.args.prevTxs as WalletAccountTransaction[],
                 test.args.currentTxs as WalletAccountTransaction[],
                 test.args.selectedAccountAddress,
-                test.args.symbol as NetworkSymbol,
+                test.args.symbol,
             );
             expect(result).toEqual(test.result);
         });

diff --git a/packages/suite/src/utils/suite/stake.ts b/packages/suite/src/utils/suite/stake.ts
@@ -37,13 +37,16 @@ const secondsToDays = (seconds: number) => Math.round(seconds / 60 / 60 / 24);
 
 type EthNetwork = 'holesky' | 'mainnet';
 
-export const getEthNetworkForWalletSdk = (symbol: NetworkSymbol): EthNetwork => {
+export const getEthNetworkForWalletSdk = (
+    symbol: NetworkSymbol | 'unknown' | undefined,
+): EthNetwork => {
     const ethNetworks: PartialRecord<NetworkSymbol, EthNetwork> = {
         thol: 'holesky',
         eth: 'mainnet',
     };
+    const network = symbol && symbol !== 'unknown' ? ethNetworks[symbol] : ethNetworks.eth;
 
-    return ethNetworks[symbol] || ethNetworks.eth!;
+    return network!;
 };
 
 export const getAdjustedGasLimitConsumption = (estimatedFee: Success<BlockchainEstimatedFee>) =>

diff --git a/packages/suite/src/utils/wallet/__fixtures__/tokenUtils.ts b/packages/suite/src/utils/wallet/__fixtures__/tokenUtils.ts
@@ -1,5 +1,4 @@
 import { EnhancedTokenInfo, TokenDefinition } from '@suite-common/token-definitions';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 export const getTokensFixtures = [
     {
@@ -8,7 +7,7 @@ export const getTokensFixtures = [
             { contract: '0x1', balance: '100' } as EnhancedTokenInfo,
             { contract: '0x2', balance: '200' } as EnhancedTokenInfo,
         ],
-        symbol: 'eth' as NetworkSymbol,
+        symbol: 'eth' as const,
         coinDefinitions: {
             error: false,
             isLoading: false,
@@ -36,7 +35,7 @@ export const getTokensFixtures = [
             { contract: '0x2', balance: '200' } as EnhancedTokenInfo,
             { contract: '0x3', balance: '0' } as EnhancedTokenInfo,
         ],
-        symbol: 'eth' as NetworkSymbol,
+        symbol: 'eth' as const,
         coinDefinitions: {
             error: false,
             isLoading: false,
@@ -61,7 +60,7 @@ export const getTokensFixtures = [
             { contract: '0x2', balance: '200' } as EnhancedTokenInfo,
             { contract: '0x3', balance: '0' } as EnhancedTokenInfo,
         ],
-        symbol: 'eth' as NetworkSymbol,
+        symbol: 'eth' as const,
         coinDefinitions: {
             error: false,
             isLoading: false,
@@ -88,7 +87,7 @@ export const getTokensFixtures = [
             { contract: '0x4', balance: '0' } as EnhancedTokenInfo,
             { contract: '0x5', balance: '0' } as EnhancedTokenInfo,
         ],
-        symbol: 'eth' as NetworkSymbol,
+        symbol: 'eth' as const,
         coinDefinitions: {
             error: false,
             isLoading: false,
@@ -119,7 +118,7 @@ export const getTokensFixtures = [
             { contract: '0x2', balance: '200', symbol: 'DEF' } as EnhancedTokenInfo,
             { contract: '0x3', balance: '0', symbol: 'GHI' } as EnhancedTokenInfo,
         ],
-        symbol: 'eth' as NetworkSymbol,
+        symbol: 'eth' as const,
         coinDefinitions: {
             error: false,
             isLoading: false,

diff --git a/packages/suite/src/utils/wallet/coinmarket/coinmarketUtils.ts b/packages/suite/src/utils/wallet/coinmarket/coinmarketUtils.ts
@@ -5,16 +5,16 @@ import {
     Network,
     NetworkSymbol,
     getCoingeckoId,
+    getNetwork,
     getNetworkByCoingeckoId,
     getNetworkByCoingeckoNativeId,
     getNetworkFeatures,
     getNetworkType,
-    networks,
 } from '@suite-common/wallet-config';
 import TrezorConnect from '@trezor/connect';
 import { DefinitionType, isTokenDefinitionKnown } from '@suite-common/token-definitions';
 import {
-    getContractAddressForNetwork,
+    getContractAddressForNetworkSymbol,
     substituteBip43Path,
     sortByCoin,
 } from '@suite-common/wallet-utils';
@@ -75,7 +75,7 @@ export function testnetToProdCryptoId(cryptoId: CryptoId): CryptoId {
 }
 
 export const getNetworkName = (symbol: NetworkSymbol) => {
-    return networks[symbol].name;
+    return getNetwork(symbol).name;
 };
 
 interface CoinmarketGetDecimalsProps {
@@ -353,7 +353,7 @@ export const coinmarketBuildAccountOptions = ({
             accountType,
         } = account;
 
-        if (!networks[accountSymbol].coingeckoNativeId) {
+        if (!getNetwork(accountSymbol).coingeckoNativeId) {
             return;
         }
 
@@ -365,10 +365,10 @@ export const coinmarketBuildAccountOptions = ({
                 index,
             });
 
-        const accountDecimals = networks[accountSymbol].decimals;
+        const accountDecimals = getNetwork(accountSymbol).decimals;
         const options: CoinmarketAccountOptionsGroupOptionProps[] = [
             {
-                value: networks[accountSymbol].coingeckoNativeId as CryptoId,
+                value: getNetwork(accountSymbol).coingeckoNativeId as CryptoId,
                 label: accountSymbol.toUpperCase(),
                 cryptoName: getNetworkName(accountSymbol),
                 descriptor,
@@ -391,7 +391,7 @@ export const coinmarketBuildAccountOptions = ({
                     return;
                 }
 
-                const contractAddress = getContractAddressForNetwork(accountSymbol, contract);
+                const contractAddress = getContractAddressForNetworkSymbol(accountSymbol, contract);
 
                 const tokenCryptoId = toTokenCryptoId(accountSymbol, contractAddress);
                 if (supportedCryptoIds && !supportedCryptoIds.has(tokenCryptoId)) {
@@ -510,8 +510,8 @@ export const getAddressAndTokenFromAccountOptionsGroupProps = (
         return { address: '', token: null };
     }
 
-    const networkSymbol = cryptoIdToSymbol(selected.value);
-    const networkType = networkSymbol ? getNetworkType(networkSymbol) : null;
+    const symbol = cryptoIdToSymbol(selected.value);
+    const networkType = symbol ? getNetworkType(symbol) : null;
 
     // set token address for ERC20 transaction to estimate the fees more precisely
     if (networkType === 'ethereum') {