From da908c826a218db41d89bccd4b162937cee177b7 Mon Sep 17 00:00:00 2001 From: aleka Date: Wed, 18 Oct 2023 13:04:25 -0400 Subject: [PATCH] Revert "Revert "remove offline message for testnet4 (#76)" (#78)" (#85) This reverts commit 14316163e4984518a7790c96097a1092d449749e. --- src/hooks/useSelectedNetwork.ts | 15 +------------- src/views/dialogs/ExchangeOfflineDialog.tsx | 23 ++------------------- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/src/hooks/useSelectedNetwork.ts b/src/hooks/useSelectedNetwork.ts index 557dfa8..9b7a898 100644 --- a/src/hooks/useSelectedNetwork.ts +++ b/src/hooks/useSelectedNetwork.ts @@ -1,7 +1,6 @@ -import { useCallback, useEffect } from 'react'; +import { useCallback } from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import { DialogTypes } from '@/constants/dialogs'; import { LocalStorageKey } from '@/constants/localStorage'; import { DEFAULT_APP_ENVIRONMENT, DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; @@ -9,7 +8,6 @@ import { useAccounts, useLocalStorage } from '@/hooks'; import { setSelectedNetwork } from '@/state/app'; import { getSelectedNetwork } from '@/state/appSelectors'; -import { openDialog } from '@/state/dialogs'; import { validateAgainstAvailableEnvironments } from '@/lib/network'; @@ -27,17 +25,6 @@ export const useSelectedNetwork = (): { validateFn: validateAgainstAvailableEnvironments, }); - useEffect(() => { - if ( - import.meta.env.MODE === 'production' && - ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-4' - ) { - dispatch( - openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } }) - ); - } - }, [selectedNetwork]); - const switchNetwork = useCallback( (network: DydxNetwork) => { disconnect(); diff --git a/src/views/dialogs/ExchangeOfflineDialog.tsx b/src/views/dialogs/ExchangeOfflineDialog.tsx index 676187e..5481e34 100644 --- a/src/views/dialogs/ExchangeOfflineDialog.tsx +++ b/src/views/dialogs/ExchangeOfflineDialog.tsx @@ -5,8 +5,6 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { AbacusApiStatus } from '@/constants/abacus'; import { DialogTypes } from '@/constants/dialogs'; import { STRING_KEYS } from '@/constants/localization'; -import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; -import { UNICODE } from '@/constants/unicode'; import { useApiState, useStringGetter } from '@/hooks'; import { layoutMixins } from '@/styles/layoutMixins'; @@ -32,16 +30,8 @@ export const ExchangeOfflineDialog = ({ preventClose, setIsOpen }: ElementProps) const selectedNetwork = useSelector(getSelectedNetwork); const activeDialog = useSelector(getActiveDialog, shallowEqual); - const showOfflineMessage = - import.meta.env.MODE === 'production' && - ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-4'; - useEffect(() => { - if ( - activeDialog?.type === DialogTypes.ExchangeOffline && - status === AbacusApiStatus.NORMAL && - !showOfflineMessage - ) { + if (activeDialog?.type === DialogTypes.ExchangeOffline && status === AbacusApiStatus.NORMAL) { dispatch(closeDialog()); } }, [status, selectedNetwork]); @@ -54,16 +44,7 @@ export const ExchangeOfflineDialog = ({ preventClose, setIsOpen }: ElementProps) title={stringGetter({ key: STRING_KEYS.UNAVAILABLE })} > - {showOfflineMessage ? ( - <> -

Testnet is currently offline. Please check back!

- - {stringGetter({ key: STRING_KEYS.LEARN_MORE })} {UNICODE.ARROW_RIGHT} - - - ) : ( -

{statusErrorMessage}

- )} +

{statusErrorMessage}

{import.meta.env.MODE !== 'production' && }