diff --git a/ui/pages/confirmations/components/confirm/info/shared/network-row/network-row.tsx b/ui/pages/confirmations/components/confirm/info/shared/network-row/network-row.tsx index 09d88d0178e9..8e0f32faa3c6 100644 --- a/ui/pages/confirmations/components/confirm/info/shared/network-row/network-row.tsx +++ b/ui/pages/confirmations/components/confirm/info/shared/network-row/network-row.tsx @@ -24,7 +24,11 @@ import { ConfirmInfoAlertRow } from '../../../../../../../components/app/confirm import { RowAlertKey } from '../../../../../../../components/app/confirm/info/row/constants'; import { useConfirmContext } from '../../../../../context/confirm'; -export const NetworkRow = ({isShownWithAlertsOnly = false}: {isShownWithAlertsOnly?: boolean}) => { +export const NetworkRow = ({ + isShownWithAlertsOnly = false, +}: { + isShownWithAlertsOnly?: boolean; +}) => { { const t = useI18nContext(); const { currentConfirmation } = useConfirmContext() ?? {}; diff --git a/ui/pages/confirmations/hooks/alerts/useNetworkAndOriginSwitchingAlerts.test.ts b/ui/pages/confirmations/hooks/alerts/useNetworkAndOriginSwitchingAlerts.test.ts index 7a5f77122e01..c28ec8d5c76e 100644 --- a/ui/pages/confirmations/hooks/alerts/useNetworkAndOriginSwitchingAlerts.test.ts +++ b/ui/pages/confirmations/hooks/alerts/useNetworkAndOriginSwitchingAlerts.test.ts @@ -30,28 +30,28 @@ describe('useNetworkAndOriginSwitchingAlerts', () => { chainId: '0x1', origin: 'https://example.com', }); - const { result } = renderHookWithConfirmContextProvider( - () => useNetworkAndOriginSwitchingAlerts(), - getMockContractInteractionConfirmState(), - ); - await waitFor(() => { - expect(result.current).toEqual([ - { - field: 'Network', - key: 'networkSwitchInfo', - message: "You're now transacting on Goerli.", - reason: 'Network changed', - severity: 'info', - }, - { - field: 'requestFrom', - key: 'originSwitchInfo', - message: - "You're now reviewing a request from https://metamask.github.io.", - reason: 'Site changed', - severity: 'info', - }, - ]); + const { result } = renderHookWithConfirmContextProvider( + () => useNetworkAndOriginSwitchingAlerts(), + getMockContractInteractionConfirmState(), + ); + await waitFor(() => { + expect(result.current).toEqual([ + { + field: 'Network', + key: 'networkSwitchInfo', + message: "You're now transacting on Goerli.", + reason: 'Network changed', + severity: 'info', + }, + { + field: 'requestFrom', + key: 'originSwitchInfo', + message: + "You're now reviewing a request from https://metamask.github.io.", + reason: 'Site changed', + severity: 'info', + }, + ]); }); }); }); diff --git a/ui/pages/confirmations/hooks/alerts/useNetworkAndOriginSwitchingAlerts.ts b/ui/pages/confirmations/hooks/alerts/useNetworkAndOriginSwitchingAlerts.ts index ae8857ee516b..589ca0be95a6 100644 --- a/ui/pages/confirmations/hooks/alerts/useNetworkAndOriginSwitchingAlerts.ts +++ b/ui/pages/confirmations/hooks/alerts/useNetworkAndOriginSwitchingAlerts.ts @@ -1,6 +1,7 @@ import { useEffect, useMemo, useState } from 'react'; import { useSelector } from 'react-redux'; +import { TransactionMeta } from '@metamask/transaction-controller'; import { LastInteractedConfirmationInfo } from '../../../../../shared/types/confirm'; import { Alert } from '../../../../ducks/confirm-alerts/confirm-alerts'; import { RowAlertKey } from '../../../../components/app/confirm/info/row/constants'; @@ -12,7 +13,6 @@ import { import { selectNetworkConfigurationByChainId } from '../../../../selectors'; import { useI18nContext } from '../../../../hooks/useI18nContext'; import { useConfirmContext } from '../../context/confirm'; -import { TransactionMeta } from '@metamask/transaction-controller'; import { SignatureRequestType } from '../../types/confirm'; const CHAIN_CHANGE_THRESHOLD_MILLISECONDS = 60 * 1000; // 1 Minute @@ -60,7 +60,11 @@ const useNetworkAndOriginSwitchingAlerts = (): Alert[] => { return () => { isMounted = false; }; - }, [currentConfirmationId, setLastInteractedConfirmationInfo, updateLastInteractedConfirmationInfo]); + }, [ + currentConfirmationId, + setLastInteractedConfirmationInfo, + updateLastInteractedConfirmationInfo, + ]); const networkAndOriginSwitchingAlerts = useMemo((): Alert[] => { if (!currentConfirmationId || !lastInteractedConfirmationInfo) { @@ -99,7 +103,6 @@ const useNetworkAndOriginSwitchingAlerts = (): Alert[] => { }); } } - console.log('---------- 1 ----------', alerts); return alerts; }, [currentConfirmationId, lastInteractedConfirmationInfo, origin, t]);