From 06061087a3f4b8067660f88692d01659ab3ae83b Mon Sep 17 00:00:00 2001 From: GustavoRSSilva Date: Tue, 8 Apr 2025 16:22:22 +0100 Subject: [PATCH 1/5] fix: Swap to ethereum string --- shared/constants/bridge.ts | 1 + shared/constants/multichain/networks.ts | 2 ++ .../confirmation/alerts/TemplateAlertContext.tsx | 10 +++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/shared/constants/bridge.ts b/shared/constants/bridge.ts index 7bdc87a758e2..9612ec01644e 100644 --- a/shared/constants/bridge.ts +++ b/shared/constants/bridge.ts @@ -52,6 +52,7 @@ export const NETWORK_TO_SHORT_NETWORK_NAME_MAP: Record< string > = { [CHAIN_IDS.MAINNET]: 'Ethereum', + [MultichainNetworks.ETHEREUM]: 'Ethereum', [CHAIN_IDS.LINEA_MAINNET]: 'Linea', [CHAIN_IDS.POLYGON]: NETWORK_TO_NAME_MAP[CHAIN_IDS.POLYGON], [CHAIN_IDS.AVALANCHE]: 'Avalanche', diff --git a/shared/constants/multichain/networks.ts b/shared/constants/multichain/networks.ts index ee1b7c0907da..8df741b19d41 100644 --- a/shared/constants/multichain/networks.ts +++ b/shared/constants/multichain/networks.ts @@ -34,6 +34,7 @@ export type MultichainProviderConfig = ProviderConfigWithImageUrl & { export type MultichainNetworkIds = `${MultichainNetworks}`; export enum MultichainNetworks { + ETHEREUM = 'eip155:1', BITCOIN = 'bip122:000000000019d6689c085ae165831e93', BITCOIN_TESTNET = 'bip122:000000000933ea01ad0ee984209779ba', @@ -48,6 +49,7 @@ export const MULTICHAIN_ACCOUNT_TYPE_TO_MAINNET = { } as const; export const MULTICHAIN_NETWORK_TO_NICKNAME: Record = { + [MultichainNetworks.ETHEREUM]: 'Ethereum', [MultichainNetworks.BITCOIN]: 'Bitcoin', [MultichainNetworks.BITCOIN_TESTNET]: 'Bitcoin (testnet)', [MultichainNetworks.SOLANA]: 'Solana', diff --git a/ui/pages/confirmations/confirmation/alerts/TemplateAlertContext.tsx b/ui/pages/confirmations/confirmation/alerts/TemplateAlertContext.tsx index 0ba7be09a4a3..262c43e7fe22 100644 --- a/ui/pages/confirmations/confirmation/alerts/TemplateAlertContext.tsx +++ b/ui/pages/confirmations/confirmation/alerts/TemplateAlertContext.tsx @@ -38,18 +38,18 @@ export const TemplateAlertContextProvider: React.FC<{ (confirmation) => confirmation.id === confirmationId, ) ?? pendingConfirmations[0]; - const [isAlertsModalVisible, setAlertsModalVisible] = useState(false); + const [isAlertsModalVisible, setIsAlertsModalVisible] = useState(false); const alertOwnerId = pendingConfirmation?.id; useTemplateConfirmationAlerts(pendingConfirmation); const { hasAlerts } = useAlerts(alertOwnerId); const showAlertsModal = useCallback(() => { - setAlertsModalVisible(true); - }, [setAlertsModalVisible]); + setIsAlertsModalVisible(true); + }, [setIsAlertsModalVisible]); const hideAlertModal = useCallback(() => { - setAlertsModalVisible(false); - }, [setAlertsModalVisible]); + setIsAlertsModalVisible(false); + }, [setIsAlertsModalVisible]); const onFinalSubmit = useCallback(() => { hideAlertModal(); From 95ef6429abe1e82edcb0eb76b8606b7379e8b346 Mon Sep 17 00:00:00 2001 From: GustavoRSSilva Date: Tue, 8 Apr 2025 18:37:01 +0100 Subject: [PATCH 2/5] fix: Swap to ethereum string --- shared/constants/bridge.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shared/constants/bridge.ts b/shared/constants/bridge.ts index 9612ec01644e..19075c4c5919 100644 --- a/shared/constants/bridge.ts +++ b/shared/constants/bridge.ts @@ -52,7 +52,7 @@ export const NETWORK_TO_SHORT_NETWORK_NAME_MAP: Record< string > = { [CHAIN_IDS.MAINNET]: 'Ethereum', - [MultichainNetworks.ETHEREUM]: 'Ethereum', + [toEvmCaipChainId(CHAIN_IDS.MAINNET)]: 'Ethereum', [CHAIN_IDS.LINEA_MAINNET]: 'Linea', [CHAIN_IDS.POLYGON]: NETWORK_TO_NAME_MAP[CHAIN_IDS.POLYGON], [CHAIN_IDS.AVALANCHE]: 'Avalanche', @@ -71,7 +71,6 @@ export const NETWORK_TO_SHORT_NETWORK_NAME_MAP: Record< [toEvmCaipChainId(CHAIN_IDS.OPTIMISM)]: NETWORK_TO_NAME_MAP[CHAIN_IDS.OPTIMISM], [toEvmCaipChainId(CHAIN_IDS.ZKSYNC_ERA)]: 'ZkSync Era', - [toEvmCaipChainId(CHAIN_IDS.BASE)]: 'Base', ///: BEGIN:ONLY_INCLUDE_IF(solana-swaps) [MultichainNetworks.SOLANA]: 'Solana', [MultichainNetworks.SOLANA_TESTNET]: 'Solana Testnet', From 452ddcd99593f7f1005b7716c07c5bde4a7250fb Mon Sep 17 00:00:00 2001 From: GustavoRSSilva Date: Tue, 8 Apr 2025 18:39:30 +0100 Subject: [PATCH 3/5] fix: Swap to ethereum string --- shared/constants/bridge.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/shared/constants/bridge.ts b/shared/constants/bridge.ts index 19075c4c5919..fb817cf68710 100644 --- a/shared/constants/bridge.ts +++ b/shared/constants/bridge.ts @@ -54,23 +54,23 @@ export const NETWORK_TO_SHORT_NETWORK_NAME_MAP: Record< [CHAIN_IDS.MAINNET]: 'Ethereum', [toEvmCaipChainId(CHAIN_IDS.MAINNET)]: 'Ethereum', [CHAIN_IDS.LINEA_MAINNET]: 'Linea', - [CHAIN_IDS.POLYGON]: NETWORK_TO_NAME_MAP[CHAIN_IDS.POLYGON], - [CHAIN_IDS.AVALANCHE]: 'Avalanche', - [CHAIN_IDS.BSC]: NETWORK_TO_NAME_MAP[CHAIN_IDS.BSC], - [CHAIN_IDS.ARBITRUM]: NETWORK_TO_NAME_MAP[CHAIN_IDS.ARBITRUM], - [CHAIN_IDS.OPTIMISM]: NETWORK_TO_NAME_MAP[CHAIN_IDS.OPTIMISM], - [CHAIN_IDS.ZKSYNC_ERA]: 'ZkSync Era', - [CHAIN_IDS.BASE]: 'Base', - [toEvmCaipChainId(CHAIN_IDS.BASE)]: 'Base', [toEvmCaipChainId(CHAIN_IDS.LINEA_MAINNET)]: 'Linea', + [CHAIN_IDS.POLYGON]: NETWORK_TO_NAME_MAP[CHAIN_IDS.POLYGON], [toEvmCaipChainId(CHAIN_IDS.POLYGON)]: NETWORK_TO_NAME_MAP[CHAIN_IDS.POLYGON], + [CHAIN_IDS.AVALANCHE]: 'Avalanche', [toEvmCaipChainId(CHAIN_IDS.AVALANCHE)]: 'Avalanche', + [CHAIN_IDS.BSC]: NETWORK_TO_NAME_MAP[CHAIN_IDS.BSC], [toEvmCaipChainId(CHAIN_IDS.BSC)]: NETWORK_TO_NAME_MAP[CHAIN_IDS.BSC], + [CHAIN_IDS.ARBITRUM]: NETWORK_TO_NAME_MAP[CHAIN_IDS.ARBITRUM], [toEvmCaipChainId(CHAIN_IDS.ARBITRUM)]: NETWORK_TO_NAME_MAP[CHAIN_IDS.ARBITRUM], + [CHAIN_IDS.OPTIMISM]: NETWORK_TO_NAME_MAP[CHAIN_IDS.OPTIMISM], [toEvmCaipChainId(CHAIN_IDS.OPTIMISM)]: NETWORK_TO_NAME_MAP[CHAIN_IDS.OPTIMISM], + [CHAIN_IDS.ZKSYNC_ERA]: 'ZkSync Era', [toEvmCaipChainId(CHAIN_IDS.ZKSYNC_ERA)]: 'ZkSync Era', + [CHAIN_IDS.BASE]: 'Base', + [toEvmCaipChainId(CHAIN_IDS.BASE)]: 'Base', ///: BEGIN:ONLY_INCLUDE_IF(solana-swaps) [MultichainNetworks.SOLANA]: 'Solana', [MultichainNetworks.SOLANA_TESTNET]: 'Solana Testnet', From 9c20939f1a3009cc5af51848a82115be43db90ed Mon Sep 17 00:00:00 2001 From: GustavoRSSilva Date: Tue, 8 Apr 2025 18:40:08 +0100 Subject: [PATCH 4/5] fix: Swap to ethereum string --- shared/constants/multichain/networks.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/shared/constants/multichain/networks.ts b/shared/constants/multichain/networks.ts index 8df741b19d41..0d4007b13e32 100644 --- a/shared/constants/multichain/networks.ts +++ b/shared/constants/multichain/networks.ts @@ -34,7 +34,6 @@ export type MultichainProviderConfig = ProviderConfigWithImageUrl & { export type MultichainNetworkIds = `${MultichainNetworks}`; export enum MultichainNetworks { - ETHEREUM = 'eip155:1', BITCOIN = 'bip122:000000000019d6689c085ae165831e93', BITCOIN_TESTNET = 'bip122:000000000933ea01ad0ee984209779ba', From 49238ba9635658e9ee2501abc0390168f333853c Mon Sep 17 00:00:00 2001 From: GustavoRSSilva Date: Tue, 8 Apr 2025 18:50:48 +0100 Subject: [PATCH 5/5] fix: Swap to ethereum string --- shared/constants/multichain/networks.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/shared/constants/multichain/networks.ts b/shared/constants/multichain/networks.ts index 0d4007b13e32..ee1b7c0907da 100644 --- a/shared/constants/multichain/networks.ts +++ b/shared/constants/multichain/networks.ts @@ -48,7 +48,6 @@ export const MULTICHAIN_ACCOUNT_TYPE_TO_MAINNET = { } as const; export const MULTICHAIN_NETWORK_TO_NICKNAME: Record = { - [MultichainNetworks.ETHEREUM]: 'Ethereum', [MultichainNetworks.BITCOIN]: 'Bitcoin', [MultichainNetworks.BITCOIN_TESTNET]: 'Bitcoin (testnet)', [MultichainNetworks.SOLANA]: 'Solana',