diff --git a/app/scripts/controllers/bridge/bridge-controller.ts b/app/scripts/controllers/bridge/bridge-controller.ts index d4934177d4c8..59a861cf6a24 100644 --- a/app/scripts/controllers/bridge/bridge-controller.ts +++ b/app/scripts/controllers/bridge/bridge-controller.ts @@ -35,12 +35,14 @@ import { TxData, } from '../../../../shared/types/bridge'; import { CHAIN_IDS } from '../../../../shared/constants/network'; +import { + RequestStatus, + METABRIDGE_CHAIN_TO_ADDRESS_MAP, +} from '../../../../shared/constants/bridge'; import { BRIDGE_CONTROLLER_NAME, DEFAULT_BRIDGE_STATE, REFRESH_INTERVAL_MS, - RequestStatus, - METABRIDGE_CHAIN_TO_ADDRESS_MAP, } from './constants'; import { BridgeControllerMessenger } from './types'; diff --git a/shared/types/bridge.ts b/shared/types/bridge.ts index 5a15eae4b789..be990d26d6b5 100644 --- a/shared/types/bridge.ts +++ b/shared/types/bridge.ts @@ -1,9 +1,7 @@ import { BigNumber } from 'bignumber.js'; import { Hex } from '@metamask/utils'; import { SwapsTokenObject } from '../constants/swaps'; -// TODO: Remove restricted import -// eslint-disable-next-line import/no-restricted-paths -import { RequestStatus } from '../../app/scripts/controllers/bridge/constants'; +import { RequestStatus } from '../constants/bridge'; export type ChainConfiguration = { isActiveSrc: boolean; diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts index 5e71b92c8223..6492bd463459 100644 --- a/ui/ducks/bridge/selectors.ts +++ b/ui/ducks/bridge/selectors.ts @@ -20,6 +20,7 @@ import { BRIDGE_PREFERRED_GAS_ESTIMATE, BRIDGE_QUOTE_MAX_ETA_SECONDS, BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE, + RequestStatus, } from '../../../shared/constants/bridge'; import { BridgeState, @@ -36,9 +37,6 @@ import { } from '../../../shared/modules/selectors/networks'; import { SwapsTokenObject } from '../../../shared/constants/swaps'; import { getConversionRate, getGasFeeEstimates } from '../metamask/metamask'; -// TODO: Remove restricted import -// eslint-disable-next-line import/no-restricted-paths -import { RequestStatus } from '../../../app/scripts/controllers/bridge/constants'; import { calcAdjustedReturn, calcCost, diff --git a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx index c4ff26f6c743..dfa17287796d 100644 --- a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx +++ b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx @@ -3,10 +3,8 @@ import { renderWithProvider } from '../../../../test/jest'; import configureStore from '../../../store/store'; import { createBridgeMockStore } from '../../../../test/jest/mock-store'; import { CHAIN_IDS } from '../../../../shared/constants/network'; +import { RequestStatus } from '../../../../shared/constants/bridge'; import mockBridgeQuotesNativeErc20 from '../../../../test/data/bridge/mock-quotes-native-erc20.json'; -// TODO: Remove restricted import -// eslint-disable-next-line import/no-restricted-paths -import { RequestStatus } from '../../../../app/scripts/controllers/bridge/constants'; import { BridgeCTAButton } from './bridge-cta-button'; describe('BridgeCTAButton', () => { diff --git a/ui/pages/bridge/quotes/bridge-quote-card.test.tsx b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx index 59db6fa4cc63..a76cd0ad1152 100644 --- a/ui/pages/bridge/quotes/bridge-quote-card.test.tsx +++ b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx @@ -3,11 +3,9 @@ import { renderWithProvider } from '../../../../test/jest'; import configureStore from '../../../store/store'; import { createBridgeMockStore } from '../../../../test/jest/mock-store'; import { CHAIN_IDS } from '../../../../shared/constants/network'; +import { RequestStatus } from '../../../../shared/constants/bridge'; import mockBridgeQuotesErc20Erc20 from '../../../../test/data/bridge/mock-quotes-erc20-erc20.json'; import mockBridgeQuotesNativeErc20 from '../../../../test/data/bridge/mock-quotes-native-erc20.json'; -// TODO: Remove restricted import -// eslint-disable-next-line import/no-restricted-paths -import { RequestStatus } from '../../../../app/scripts/controllers/bridge/constants'; import { BridgeQuoteCard } from './bridge-quote-card'; describe('BridgeQuoteCard', () => { diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx index 42c5968bb5b0..dd89e575ad75 100644 --- a/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx +++ b/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx @@ -1,7 +1,5 @@ import React from 'react'; -// TODO: Remove restricted import -// eslint-disable-next-line import/no-restricted-paths -import { RequestStatus } from '../../../../app/scripts/controllers/bridge/constants'; +import { RequestStatus } from '../../../../shared/constants/bridge'; import mockBridgeQuotesErc20Erc20 from '../../../../test/data/bridge/mock-quotes-erc20-erc20.json'; import { createBridgeMockStore } from '../../../../test/jest/mock-store'; import { renderWithProvider } from '../../../../test/lib/render-helpers';