From 9403ee9c7adb6c6e2f0f3cd42ce9898529a81063 Mon Sep 17 00:00:00 2001 From: Daniel <80175477+dan437@users.noreply.github.com> Date: Thu, 14 Apr 2022 17:02:38 +0200 Subject: [PATCH] Disable Swaps on Rinkeby for production (#14372) * Disable Swaps in Rinkeby for production * Use arrays instead of objects for allowed chain ids * Trigger Build --- shared/constants/swaps.js | 20 ++++++++++++-------- ui/selectors/selectors.js | 8 ++++++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/shared/constants/swaps.js b/shared/constants/swaps.js index c9b183f7a..88cc47949 100644 --- a/shared/constants/swaps.js +++ b/shared/constants/swaps.js @@ -114,14 +114,18 @@ const RINKEBY_DEFAULT_BLOCK_EXPLORER_URL = 'https://rinkeby.etherscan.io/'; const POLYGON_DEFAULT_BLOCK_EXPLORER_URL = 'https://polygonscan.com/'; const AVALANCHE_DEFAULT_BLOCK_EXPLORER_URL = 'https://snowtrace.io/'; -export const ALLOWED_SWAPS_CHAIN_IDS = { - [MAINNET_CHAIN_ID]: true, - [SWAPS_TESTNET_CHAIN_ID]: true, - [BSC_CHAIN_ID]: true, - [POLYGON_CHAIN_ID]: true, - [RINKEBY_CHAIN_ID]: true, - [AVALANCHE_CHAIN_ID]: true, -}; +export const ALLOWED_PROD_SWAPS_CHAIN_IDS = [ + MAINNET_CHAIN_ID, + SWAPS_TESTNET_CHAIN_ID, + BSC_CHAIN_ID, + POLYGON_CHAIN_ID, + AVALANCHE_CHAIN_ID, +]; + +export const ALLOWED_DEV_SWAPS_CHAIN_IDS = [ + ...ALLOWED_PROD_SWAPS_CHAIN_IDS, + RINKEBY_CHAIN_ID, +]; export const ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS = [ MAINNET_CHAIN_ID, diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js index ef880038e..46600ce4a 100644 --- a/ui/selectors/selectors.js +++ b/ui/selectors/selectors.js @@ -37,7 +37,8 @@ import { TRUNCATED_NAME_CHAR_LIMIT } from '../../shared/constants/labels'; import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP, - ALLOWED_SWAPS_CHAIN_IDS, + ALLOWED_PROD_SWAPS_CHAIN_IDS, + ALLOWED_DEV_SWAPS_CHAIN_IDS, } from '../../shared/constants/swaps'; import { shortenAddress, getAccountByAddress } from '../helpers/utils/util'; @@ -666,7 +667,10 @@ export function getSwapsDefaultToken(state) { export function getIsSwapsChain(state) { const chainId = getCurrentChainId(state); - return ALLOWED_SWAPS_CHAIN_IDS[chainId]; + const isProduction = process.env.METAMASK_ENVIRONMENT === 'production'; + return isProduction + ? ALLOWED_PROD_SWAPS_CHAIN_IDS.includes(chainId) + : ALLOWED_DEV_SWAPS_CHAIN_IDS.includes(chainId); } export function getIsBuyableChain(state) {