fix: remove eth as swappable token (#5)

Signed-off-by: ryanml <[email protected]>
ava-labs · Jul 29, 2024 · 85dbef4 · 85dbef4
1 parent 37a6f8b
commit 85dbef4
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 31 deletions.
diff --git a/src/background/services/tokens/handlers/getTokenList.ts b/src/background/services/tokens/handlers/getTokenList.ts
@@ -8,7 +8,7 @@ import { TokenManagerService } from '../TokenManagerService';
 type HandlerType = ExtensionRequestHandler<
   ExtensionRequest.GET_NETWORK_TOKENS,
   { tokens: { [address: string]: NetworkContractToken } },
-  [number]
+  [number, string[]]
 >;
 
 @injectable()
@@ -18,7 +18,7 @@ export class GetTokensListHandler implements HandlerType {
   constructor(private tokenManagerService: TokenManagerService) {}
 
   handle: HandlerType['handle'] = async ({ request }) => {
-    const [chainId] = request.params;
+    const [chainId, disallowedAssets] = request.params;
 
     const [tokens, err] = await resolve<NetworkContractToken[]>(
       this.tokenManagerService.getTokensByChainId(chainId)
@@ -35,6 +35,9 @@ export class GetTokensListHandler implements HandlerType {
       ...request,
       result: {
         tokens: tokens.reduce((allTokens, token) => {
+          if (disallowedAssets.includes(token.symbol)) {
+            return allTokens;
+          }
           allTokens[token.address] = token;
           return allTokens;
         }, {}),

diff --git a/src/contexts/SwapProvider/SwapProvider.tsx b/src/contexts/SwapProvider/SwapProvider.tsx
@@ -37,6 +37,7 @@ import {
   SwapContextAPI,
   SwapParams,
   hasParaswapError,
+  DISALLOWED_SWAP_ASSETS,
 } from './models';
 
 export const SwapContext = createContext<SwapContextAPI>({} as any);
@@ -51,7 +52,10 @@ export function SwapContextProvider({ children }: { children: any }) {
   const { networkFee } = useNetworkFeeContext();
   const { captureEncrypted } = useAnalyticsContext();
   const { t } = useTranslation();
-  const tokens = useTokensWithBalances(true);
+  const tokens = useTokensWithBalances({
+    forceShowTokensWithoutBalances: true,
+    disallowedAssets: DISALLOWED_SWAP_ASSETS,
+  });
 
   const paraswap = useMemo(
     () => new ParaSwap(ChainId.AVALANCHE_MAINNET_ID, undefined, new Web3()),

diff --git a/src/contexts/SwapProvider/models.ts b/src/contexts/SwapProvider/models.ts
@@ -66,3 +66,8 @@ export type SwapContextAPI = {
     approveTxHash: string;
   }>;
 };
+
+export const DISALLOWED_SWAP_ASSETS: string[] = [
+  // ETH is disabled in Swaps per issue CP-8409
+  'ETH',
+];
diff --git a/src/hooks/useTokenFromParams.ts b/src/hooks/useTokenFromParams.ts
@@ -12,7 +12,9 @@ export function useTokenFromParams(
   withDefault = true
 ): TokenWithBalance | undefined {
   const { search } = useLocation();
-  const allTokens = useTokensWithBalances(true);
+  const allTokens = useTokensWithBalances({
+    forceShowTokensWithoutBalances: true,
+  });
   const [selectedToken, setSelectedToken] = useState<
     TokenWithBalance | undefined
   >(undefined);

diff --git a/src/hooks/useTokensWithBalances.ts b/src/hooks/useTokensWithBalances.ts
@@ -14,21 +14,29 @@ import { ExtensionRequest } from '@src/background/connections/extensionConnectio
 import { merge } from 'lodash';
 import { getAddressForChain } from '@src/utils/getAddressForChain';
 
+type UseTokensWithBalanceOptions = {
+  // Requests the tokens WITH and WITHOUT balances
+  forceShowTokensWithoutBalances?: boolean;
+  // string array of asset symbols that are to be excluded from the result
+  disallowedAssets?: string[];
+  chainId?: number;
+};
+
 const bnZero = new BN(0);
 
 const nativeTokensFirst = (tokens: TokenWithBalance[]): TokenWithBalance[] =>
   [...tokens].sort((t) => (t.type === TokenType.NATIVE ? -1 : 1));
 
+const DISALLOWED_ASSETS = [];
+
 /**
  *
- * @param forceShowTokensWithoutBalances - show the tokens WITH and WITHOUT balances
- * @param chainId
+ * @param {UseTokensWithBalanceOptions} options
  * @returns Tokens list with OR without balances based on `forceShowTokensWithoutBalances`
  */
-export function useTokensWithBalances(
-  forceShowTokensWithoutBalances?: boolean,
-  chainId?: number
-) {
+export const useTokensWithBalances = (
+  options: UseTokensWithBalanceOptions = {}
+) => {
   const [selectedChainId, setSelectedChainId] = useState<number | undefined>(
     undefined
   );
@@ -46,6 +54,11 @@ export function useTokensWithBalances(
     accounts: { active: activeAccount },
   } = useAccountsContext();
   const { network } = useNetworkContext();
+  const {
+    forceShowTokensWithoutBalances = false,
+    disallowedAssets = DISALLOWED_ASSETS,
+    chainId = undefined,
+  } = options;
 
   const customTokensWithZeroBalance: {
     [address: string]: TokenWithBalance;
@@ -85,7 +98,7 @@ export function useTokensWithBalances(
       try {
         const networkTokens = await request<GetTokensListHandler>({
           method: ExtensionRequest.GET_NETWORK_TOKENS,
-          params: [selectedChainId],
+          params: [selectedChainId, disallowedAssets],
         });
 
         const tokensWithPlaceholderBalances = Object.entries(
@@ -124,6 +137,7 @@ export function useTokensWithBalances(
     forceShowTokensWithoutBalances,
     showTokensWithoutBalances,
     customTokensWithZeroBalance,
+    disallowedAssets,
   ]);
 
   return useMemo<TokenWithBalance[]>(() => {
@@ -176,4 +190,4 @@ export function useTokensWithBalances(
     showTokensWithoutBalances,
     allTokensWithPlaceholderBalances,
   ]);
-}
+};
diff --git a/src/pages/Bridge/hooks/useAssetBalancesEVM.ts b/src/pages/Bridge/hooks/useAssetBalancesEVM.ts
@@ -40,7 +40,9 @@ export function useAssetBalancesEVM(
 
   const { getTokenSymbolOnNetwork } = useGetTokenSymbolOnNetwork();
 
-  const tokens = useTokensWithBalances(true);
+  const tokens = useTokensWithBalances({
+    forceShowTokensWithoutBalances: true,
+  });
 
   // For balances on the Avalanche side, for all bridge assets on avalanche
   const balances = useMemo(() => {

diff --git a/src/pages/Bridge/hooks/useBtcBridge.ts b/src/pages/Bridge/hooks/useBtcBridge.ts
@@ -53,16 +53,16 @@ export function useBtcBridge(amountInBtc: Big): BridgeAdapter {
   const { getNetworkFee } = useNetworkFeeContext();
   const { config } = useBridgeConfig();
   const { createBridgeTransaction } = useBridgeContext();
-  const avalancheTokens = useTokensWithBalances(
-    true,
-    isDeveloperMode
+  const avalancheTokens = useTokensWithBalances({
+    forceShowTokensWithoutBalances: true,
+    chainId: isDeveloperMode
       ? ChainId.AVALANCHE_TESTNET_ID
-      : ChainId.AVALANCHE_MAINNET_ID
-  );
-  const btcTokens = useTokensWithBalances(
-    true,
-    isDeveloperMode ? ChainId.BITCOIN_TESTNET : ChainId.BITCOIN
-  );
+      : ChainId.AVALANCHE_MAINNET_ID,
+  });
+  const btcTokens = useTokensWithBalances({
+    forceShowTokensWithoutBalances: true,
+    chainId: isDeveloperMode ? ChainId.BITCOIN_TESTNET : ChainId.BITCOIN,
+  });
   const {
     accounts: { active: activeAccount },
   } = useAccountsContext();

diff --git a/src/pages/Bridge/hooks/useLogoUriForBridgeTransaction.ts b/src/pages/Bridge/hooks/useLogoUriForBridgeTransaction.ts
@@ -40,7 +40,10 @@ export function useLogoUriForBridgeTransaction(
         : ChainId.AVALANCHE_TESTNET_ID;
   }
 
-  const tokens = useTokensWithBalances(true, chainId);
+  const tokens = useTokensWithBalances({
+    forceShowTokensWithoutBalances: true,
+    chainId,
+  });
 
   if (!bridgeTransaction || !targetBlockchain) {
     return;

diff --git a/src/pages/Collectibles/CollectibleSend.tsx b/src/pages/Collectibles/CollectibleSend.tsx
@@ -40,7 +40,7 @@ export function CollectibleSend() {
     accounts: { active },
   } = useAccountsContext();
   const { captureEncrypted } = useAnalyticsContext();
-  const tokens = useTokensWithBalances(false);
+  const tokens = useTokensWithBalances();
   const { nft } = useCollectibleFromParams();
 
   const { isFunctionAvailable, isFunctionSupported } = useIsFunctionAvailable(

diff --git a/src/pages/ManageTokens/AddToken.tsx b/src/pages/ManageTokens/AddToken.tsx
@@ -24,7 +24,9 @@ export function AddToken() {
   const { t } = useTranslation();
   const { request } = useConnectionContext();
   const { network } = useNetworkContext();
-  const tokens = useTokensWithBalances(true);
+  const tokens = useTokensWithBalances({
+    forceShowTokensWithoutBalances: true,
+  });
   const history = useHistory();
 
   const [addressInput, setAddressInput] = useState<string>('');

diff --git a/src/pages/ManageTokens/ManageTokensList.tsx b/src/pages/ManageTokens/ManageTokensList.tsx
@@ -12,7 +12,9 @@ type ManageTokensListProps = {
 };
 
 export const ManageTokensList = ({ searchQuery }: ManageTokensListProps) => {
-  const tokensWithBalances = useTokensWithBalances(true);
+  const tokensWithBalances = useTokensWithBalances({
+    forceShowTokensWithoutBalances: true,
+  });
 
   return (
     <Stack

diff --git a/src/pages/Send/Send.tsx b/src/pages/Send/Send.tsx
@@ -53,7 +53,7 @@ export function SendPage() {
     accounts: { active },
   } = useAccountsContext();
   const { captureEncrypted } = useAnalyticsContext();
-  const tokens = useTokensWithBalances(false);
+  const tokens = useTokensWithBalances();
 
   const { isFunctionAvailable, isFunctionSupported } = useIsFunctionAvailable(
     FunctionNames.SEND

diff --git a/src/pages/SignTransaction/SignTransaction.tsx b/src/pages/SignTransaction/SignTransaction.tsx
@@ -73,7 +73,9 @@ export function SignTransactionPage() {
   const [transactionProgressState, setTransactionProgressState] = useState(
     TransactionProgressState.NOT_APPROVED
   );
-  const tokens = useTokensWithBalances(false, network?.chainId);
+  const tokens = useTokensWithBalances({
+    chainId: network?.chainId,
+  });
   const header = useSignTransactionHeader(transaction?.displayData);
   const isUsingLedgerWallet = useIsUsingLedgerWallet();
   const isUsingKeystoneWallet = useIsUsingKeystoneWallet();

diff --git a/src/pages/Swap/Swap.tsx b/src/pages/Swap/Swap.tsx
@@ -36,6 +36,7 @@ import { TokenSelect } from '@src/components/common/TokenSelect';
 import { useAccountsContext } from '@src/contexts/AccountsProvider';
 import { isBitcoinNetwork } from '@src/background/services/network/utils/isBitcoinNetwork';
 import { isUserRejectionError } from '@src/utils/errors';
+import { DISALLOWED_SWAP_ASSETS } from '@src/contexts/SwapProvider/models';
 
 const ReviewOrderButtonContainer = styled('div')<{
   isTransactionDetailsOpen: boolean;
@@ -60,8 +61,13 @@ export function Swap() {
   } = useIsFunctionAvailable(FunctionNames.SWAP);
   const history = useHistory();
   const theme = useTheme();
-  const tokensWBalances = useTokensWithBalances();
-  const allTokensOnNetwork = useTokensWithBalances(true);
+  const tokensWBalances = useTokensWithBalances({
+    disallowedAssets: DISALLOWED_SWAP_ASSETS,
+  });
+  const allTokensOnNetwork = useTokensWithBalances({
+    forceShowTokensWithoutBalances: true,
+    disallowedAssets: DISALLOWED_SWAP_ASSETS,
+  });
   const {
     accounts: { active: activeAccount },
   } = useAccountsContext();

diff --git a/src/pages/Swap/hooks/useSwapStateFunctions.ts b/src/pages/Swap/hooks/useSwapStateFunctions.ts
@@ -10,9 +10,12 @@ import { useSendAnalyticsData } from '@src/hooks/useSendAnalyticsData';
 import BN from 'bn.js';
 import { bnToLocaleString } from '@avalabs/utils-sdk';
 import { useSwap } from './useSwap';
+import { DISALLOWED_SWAP_ASSETS } from '@src/contexts/SwapProvider/models';
 
 export function useSwapStateFunctions() {
-  const tokensWBalances = useTokensWithBalances();
+  const tokensWBalances = useTokensWithBalances({
+    disallowedAssets: DISALLOWED_SWAP_ASSETS,
+  });
   const { setNavigationHistoryData } = usePageHistory();
   const { sendTokenSelectedAnalytics, sendAmountEnteredAnalytics } =
     useSendAnalyticsData();