Further improve organization of constants (#10200)

app/scripts/background.js

@@ -19,6 +19,12 @@ import extension from 'extensionizer'
 import { storeAsStream, storeTransformStream } from '@metamask/obs-store'
 import PortStream from 'extension-port-stream'
 import { captureException } from '@sentry/browser'
+
+import {
+  ENVIRONMENT_TYPE_POPUP,
+  ENVIRONMENT_TYPE_NOTIFICATION,
+  ENVIRONMENT_TYPE_FULLSCREEN,
+} from '../../shared/constants/app'
 import migrations from './migrations'
 import Migrator from './lib/migrator'
 import ExtensionPlatform from './platforms/extension'
@@ -31,12 +37,6 @@ import rawFirstTimeState from './first-time-state'
 import getFirstPreferredLangCode from './lib/get-first-preferred-lang-code'
 import getObjStructure from './lib/getObjStructure'
 import setupEnsIpfsResolver from './lib/ens-ipfs/setup'
-
-import {
-  ENVIRONMENT_TYPE_POPUP,
-  ENVIRONMENT_TYPE_NOTIFICATION,
-  ENVIRONMENT_TYPE_FULLSCREEN,
-} from './lib/enums'
 /* eslint-enable import/first */
 
 const { sentry } = global

app/scripts/controllers/detect-tokens.js

@@ -2,12 +2,11 @@ import Web3 from 'web3'
 import contracts from '@metamask/contract-metadata'
 import { warn } from 'loglevel'
 import SINGLE_CALL_BALANCES_ABI from 'single-call-balance-checker-abi'
-import { MAINNET_CHAIN_ID } from './network/enums'
+import { MAINNET_CHAIN_ID } from '../../../shared/constants/network'
+import { SINGLE_CALL_BALANCES_ADDRESS } from '../constants/contracts'
 
 // By default, poll every 3 minutes
 const DEFAULT_INTERVAL = 180 * 1000
-const SINGLE_CALL_BALANCES_ADDRESS =
-  '0xb1f8e55c7f64d203c1400b9d8555d050f94adf39'
 
 /**
  * A controller that polls for token exchange

app/scripts/controllers/incoming-transactions.js

@@ -22,7 +22,7 @@ import {
   RINKEBY_CHAIN_ID,
   ROPSTEN,
   ROPSTEN_CHAIN_ID,
-} from './network/enums'
+} from '../../../shared/constants/network'
 
 const fetchWithTimeout = getFetchWithTimeout(30000)
 

app/scripts/controllers/metametrics.js

@@ -1,7 +1,7 @@
 import { merge, omit } from 'lodash'
 import { ObservableStore } from '@metamask/obs-store'
 import { bufferToHex, sha3 } from 'ethereumjs-util'
-import { ENVIRONMENT_TYPE_BACKGROUND } from '../lib/enums'
+import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../shared/constants/app'
 import {
   METAMETRICS_ANONYMOUS_ID,
   METAMETRICS_BACKGROUND_PAGE_OBJECT,

app/scripts/controllers/network/createInfuraClient.js

@@ -8,7 +8,7 @@ import providerFromMiddleware from 'eth-json-rpc-middleware/providerFromMiddlewa
 import createInfuraMiddleware from 'eth-json-rpc-infura'
 import BlockTracker from 'eth-block-tracker'
 
-import { NETWORK_TYPE_TO_ID_MAP } from './enums'
+import { NETWORK_TYPE_TO_ID_MAP } from '../../../../shared/constants/network'
 
 export default function createInfuraClient({ network, projectId }) {
   const infuraMiddleware = createInfuraMiddleware({

app/scripts/controllers/network/network.js

@@ -9,10 +9,6 @@ import {
   createEventEmitterProxy,
 } from 'swappable-obj-proxy'
 import EthQuery from 'eth-query'
-import createMetamaskMiddleware from './createMetamaskMiddleware'
-import createInfuraClient from './createInfuraClient'
-import createJsonRpcClient from './createJsonRpcClient'
-
 import {
   RINKEBY,
   MAINNET,
@@ -20,7 +16,10 @@ import {
   NETWORK_TYPE_TO_ID_MAP,
   MAINNET_CHAIN_ID,
   RINKEBY_CHAIN_ID,
-} from './enums'
+} from '../../../../shared/constants/network'
+import createMetamaskMiddleware from './createMetamaskMiddleware'
+import createInfuraClient from './createInfuraClient'
+import createJsonRpcClient from './createJsonRpcClient'
 
 const env = process.env.METAMASK_ENV
 

app/scripts/controllers/network/util.js

@@ -1,4 +1,4 @@
-import { NETWORK_TO_NAME_MAP } from './enums'
+import { NETWORK_TO_NAME_MAP } from '../../../../shared/constants/network'
 
 export const getNetworkDisplayName = (key) => NETWORK_TO_NAME_MAP[key]
 

app/scripts/controllers/permissions/enums.js

@@ -10,11 +10,6 @@ export const METADATA_STORE_KEY = 'domainMetadata'
 
 export const METADATA_CACHE_MAX_SIZE = 100
 
-export const CAVEAT_NAMES = {
-  exposedAccounts: 'exposedAccounts',
-  primaryAccountOnly: 'primaryAccountOnly',
-}
-
 export const CAVEAT_TYPES = {
   limitResponseLength: 'limitResponseLength',
   filterResponse: 'filterResponse',

app/scripts/controllers/permissions/index.js

@@ -6,10 +6,7 @@ import { CapabilitiesController as RpcCap } from 'rpc-cap'
 import { ethErrors } from 'eth-json-rpc-errors'
 import { cloneDeep } from 'lodash'
 
-import createPermissionsMethodMiddleware from './permissionsMethodMiddleware'
-import PermissionsLogController from './permissionsLog'
-
-// Methods that do not require any permissions to use:
+import { CAVEAT_NAMES } from '../../../../shared/constants/permissions'
 import {
   APPROVAL_TYPE,
   SAFE_METHODS, // methods that do not require any permissions to use
@@ -18,11 +15,13 @@ import {
   METADATA_CACHE_MAX_SIZE,
   LOG_STORE_KEY,
   HISTORY_STORE_KEY,
-  CAVEAT_NAMES,
   NOTIFICATION_NAMES,
   CAVEAT_TYPES,
 } from './enums'
 
+import createPermissionsMethodMiddleware from './permissionsMethodMiddleware'
+import PermissionsLogController from './permissionsLog'
+
 // instanbul ignore next
 const noop = () => undefined
 

app/scripts/controllers/permissions/permissionsLog.js

@@ -1,6 +1,6 @@
 import { cloneDeep } from 'lodash'
+import { CAVEAT_NAMES } from '../../../../shared/constants/permissions'
 import {
-  CAVEAT_NAMES,
   HISTORY_STORE_KEY,
   LOG_IGNORE_METHODS,
   LOG_LIMIT,

app/scripts/controllers/preferences.js

@@ -7,7 +7,7 @@ import ethers from 'ethers'
 import log from 'loglevel'
 import { isPrefixedFormattedHexString } from '../lib/util'
 import { LISTED_CONTRACT_ADDRESSES } from '../../../shared/constants/tokens'
-import { NETWORK_TYPE_TO_ID_MAP } from './network/enums'
+import { NETWORK_TYPE_TO_ID_MAP } from '../../../shared/constants/network'
 
 export default class PreferencesController {
   /**

app/scripts/lib/account-tracker.js

@@ -19,14 +19,14 @@ import {
   RINKEBY_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
   KOVAN_CHAIN_ID,
-} from '../controllers/network/enums'
+} from '../../../shared/constants/network'
 
 import {
   SINGLE_CALL_BALANCES_ADDRESS,
   SINGLE_CALL_BALANCES_ADDRESS_RINKEBY,
   SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN,
   SINGLE_CALL_BALANCES_ADDRESS_KOVAN,
-} from '../controllers/network/contract-addresses'
+} from '../constants/contracts'
 import { bnToHex } from './util'
 
 /**

app/scripts/lib/decrypt-message-manager.js

@@ -3,9 +3,9 @@ import { ObservableStore } from '@metamask/obs-store'
 import ethUtil from 'ethereumjs-util'
 import { ethErrors } from 'eth-json-rpc-errors'
 import log from 'loglevel'
+import { MESSAGE_TYPE } from '../../../shared/constants/app'
 import { addHexPrefix } from './util'
 import createId from './random-id'
-import { MESSAGE_TYPE } from './enums'
 
 const hexRe = /^[0-9A-Fa-f]+$/gu
 

app/scripts/lib/encryption-public-key-manager.js

@@ -2,8 +2,8 @@ import EventEmitter from 'events'
 import { ObservableStore } from '@metamask/obs-store'
 import { ethErrors } from 'eth-json-rpc-errors'
 import log from 'loglevel'
+import { MESSAGE_TYPE } from '../../../shared/constants/app'
 import createId from './random-id'
-import { MESSAGE_TYPE } from './enums'
 
 /**
  * Represents, and contains data about, an 'eth_getEncryptionPublicKey' type request. These are created when

app/scripts/lib/message-manager.js

@@ -2,8 +2,8 @@ import EventEmitter from 'events'
 import { ObservableStore } from '@metamask/obs-store'
 import ethUtil from 'ethereumjs-util'
 import { ethErrors } from 'eth-json-rpc-errors'
+import { MESSAGE_TYPE } from '../../../shared/constants/app'
 import createId from './random-id'
-import { MESSAGE_TYPE } from './enums'
 
 /**
  * Represents, and contains data about, an 'eth_sign' type signature request. These are created when a signature for

app/scripts/lib/personal-message-manager.js

@@ -3,9 +3,9 @@ import { ObservableStore } from '@metamask/obs-store'
 import ethUtil from 'ethereumjs-util'
 import { ethErrors } from 'eth-json-rpc-errors'
 import log from 'loglevel'
+import { MESSAGE_TYPE } from '../../../shared/constants/app'
 import { addHexPrefix } from './util'
 import createId from './random-id'
-import { MESSAGE_TYPE } from './enums'
 
 const hexRe = /^[0-9A-Fa-f]+$/gu
 

app/scripts/lib/rpc-method-middleware/handlers/get-provider-state.js

@@ -1,4 +1,4 @@
-import { MESSAGE_TYPE } from '../../enums'
+import { MESSAGE_TYPE } from '../../../../../shared/constants/app'
 
 /**
  * This RPC method gets background state relevant to the provider.

app/scripts/lib/rpc-method-middleware/handlers/log-web3-shim-usage.js

@@ -1,4 +1,4 @@
-import { MESSAGE_TYPE } from '../../enums'
+import { MESSAGE_TYPE } from '../../../../../shared/constants/app'
 
 /**
  * This RPC method is called by the inpage provider whenever it detects the

app/scripts/lib/rpc-method-middleware/handlers/watch-asset.js

@@ -1,4 +1,4 @@
-import { MESSAGE_TYPE } from '../../enums'
+import { MESSAGE_TYPE } from '../../../../../shared/constants/app'
 
 const watchAsset = {
   methodNames: [MESSAGE_TYPE.WATCH_ASSET, MESSAGE_TYPE.WATCH_ASSET_LEGACY],

app/scripts/lib/typed-message-manager.js

@@ -6,8 +6,8 @@ import { typedSignatureHash, TYPED_MESSAGE_SCHEMA } from 'eth-sig-util'
 import { isValidAddress } from 'ethereumjs-util'
 import log from 'loglevel'
 import jsonschema from 'jsonschema'
+import { MESSAGE_TYPE } from '../../../shared/constants/app'
 import createId from './random-id'
-import { MESSAGE_TYPE } from './enums'
 
 /**
  * Represents, and contains data about, an 'eth_signTypedData' type signature request. These are created when a

app/scripts/lib/util.js

@@ -14,7 +14,7 @@ import {
   PLATFORM_CHROME,
   PLATFORM_EDGE,
   PLATFORM_BRAVE,
-} from './enums'
+} from '../../../shared/constants/app'
 
 /**
  * @see {@link getEnvironmentType}

app/scripts/migrations/051.js

@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash'
-import { NETWORK_TYPE_TO_ID_MAP } from '../controllers/network/enums'
+import { NETWORK_TYPE_TO_ID_MAP } from '../../../shared/constants/network'
 
 const version = 51
 

app/scripts/platforms/extension.js

@@ -1,7 +1,7 @@
 import extension from 'extensionizer'
 import { createExplorerLink as explorerLink } from '@metamask/etherscan-link'
 import { getEnvironmentType, checkForError } from '../lib/util'
-import { ENVIRONMENT_TYPE_BACKGROUND } from '../lib/enums'
+import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../shared/constants/app'
 import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction'
 
 export default class ExtensionPlatform {

app/scripts/ui.js

@@ -12,12 +12,12 @@ import EthQuery from 'eth-query'
 import StreamProvider from 'web3-stream-provider'
 import log from 'loglevel'
 import launchMetaMaskUi from '../../ui'
-import ExtensionPlatform from './platforms/extension'
-import { setupMultiplex } from './lib/stream-utils'
 import {
   ENVIRONMENT_TYPE_FULLSCREEN,
   ENVIRONMENT_TYPE_POPUP,
-} from './lib/enums'
+} from '../../shared/constants/app'
+import ExtensionPlatform from './platforms/extension'
+import { setupMultiplex } from './lib/stream-utils'
 import { getEnvironmentType } from './lib/util'
 
 start().catch(log.error)

shared/constants/app.js

@@ -6,19 +6,18 @@
  * background - The background process that powers the extension
  * @typedef {'popup' | 'notification' | 'fullscreen' | 'background'} EnvironmentType
  */
+export const ENVIRONMENT_TYPE_POPUP = 'popup'
+export const ENVIRONMENT_TYPE_NOTIFICATION = 'notification'
+export const ENVIRONMENT_TYPE_FULLSCREEN = 'fullscreen'
+export const ENVIRONMENT_TYPE_BACKGROUND = 'background'
 
-const ENVIRONMENT_TYPE_POPUP = 'popup'
-const ENVIRONMENT_TYPE_NOTIFICATION = 'notification'
-const ENVIRONMENT_TYPE_FULLSCREEN = 'fullscreen'
-const ENVIRONMENT_TYPE_BACKGROUND = 'background'
+export const PLATFORM_BRAVE = 'Brave'
+export const PLATFORM_CHROME = 'Chrome'
+export const PLATFORM_EDGE = 'Edge'
+export const PLATFORM_FIREFOX = 'Firefox'
+export const PLATFORM_OPERA = 'Opera'
 
-const PLATFORM_BRAVE = 'Brave'
-const PLATFORM_CHROME = 'Chrome'
-const PLATFORM_EDGE = 'Edge'
-const PLATFORM_FIREFOX = 'Firefox'
-const PLATFORM_OPERA = 'Opera'
-
-const MESSAGE_TYPE = {
+export const MESSAGE_TYPE = {
   ETH_DECRYPT: 'eth_decrypt',
   ETH_GET_ENCRYPTION_PUBLIC_KEY: 'eth_getEncryptionPublicKey',
   ETH_SIGN: 'eth_sign',
@@ -29,16 +28,3 @@ const MESSAGE_TYPE = {
   WATCH_ASSET: 'wallet_watchAsset',
   WATCH_ASSET_LEGACY: 'metamask_watchAsset',
 }
-
-export {
-  ENVIRONMENT_TYPE_POPUP,
-  ENVIRONMENT_TYPE_NOTIFICATION,
-  ENVIRONMENT_TYPE_FULLSCREEN,
-  ENVIRONMENT_TYPE_BACKGROUND,
-  MESSAGE_TYPE,
-  PLATFORM_BRAVE,
-  PLATFORM_CHROME,
-  PLATFORM_EDGE,
-  PLATFORM_FIREFOX,
-  PLATFORM_OPERA,
-}

shared/constants/metametrics.js

@@ -1,6 +1,6 @@
 // Type Imports
 /**
- * @typedef {import('../../app/scripts/lib/enums').EnvironmentType} EnvironmentType
+ * @typedef {import('../../shared/constants/app').EnvironmentType} EnvironmentType
  */
 
 // Type Declarations

shared/constants/permissions.js

@@ -0,0 +1,4 @@
+export const CAVEAT_NAMES = {
+  exposedAccounts: 'exposedAccounts',
+  primaryAccountOnly: 'primaryAccountOnly',
+}

test/unit/app/controllers/detect-tokens-test.js

@@ -7,10 +7,7 @@ import BigNumber from 'bignumber.js'
 import DetectTokensController from '../../../../app/scripts/controllers/detect-tokens'
 import NetworkController from '../../../../app/scripts/controllers/network/network'
 import PreferencesController from '../../../../app/scripts/controllers/preferences'
-import {
-  MAINNET,
-  ROPSTEN,
-} from '../../../../app/scripts/controllers/network/enums'
+import { MAINNET, ROPSTEN } from '../../../../shared/constants/network'
 
 describe('DetectTokensController', function () {
   const sandbox = sinon.createSandbox()

test/unit/app/controllers/incoming-transactions-test.js

@@ -14,7 +14,7 @@ import {
   ROPSTEN,
   ROPSTEN_CHAIN_ID,
   ROPSTEN_NETWORK_ID,
-} from '../../../../app/scripts/controllers/network/enums'
+} from '../../../../shared/constants/network'
 import {
   TRANSACTION_CATEGORIES,
   TRANSACTION_STATUSES,

test/unit/app/controllers/metametrics-test.js

@@ -1,7 +1,7 @@
 import { strict as assert } from 'assert'
 import sinon from 'sinon'
 import MetaMetricsController from '../../../../app/scripts/controllers/metametrics'
-import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../../shared/constants/app'
 import { createSegmentMock } from '../../../../app/scripts/lib/segment'
 import {
   METAMETRICS_ANONYMOUS_ID,

test/unit/app/controllers/permissions/mocks.js

@@ -5,8 +5,8 @@ import { ApprovalController } from '@metamask/controllers'
 
 import _getRestrictedMethods from '../../../../../app/scripts/controllers/permissions/restrictedMethods'
 
+import { CAVEAT_NAMES } from '../../../../../shared/constants/permissions'
 import {
-  CAVEAT_NAMES,
   CAVEAT_TYPES,
   NOTIFICATION_NAMES,
 } from '../../../../../app/scripts/controllers/permissions/enums'

test/unit/app/controllers/swaps-test.js

@@ -8,7 +8,7 @@ import { ObservableStore } from '@metamask/obs-store'
 import {
   ROPSTEN_NETWORK_ID,
   MAINNET_NETWORK_ID,
-} from '../../../../app/scripts/controllers/network/enums'
+} from '../../../../shared/constants/network'
 import { ETH_SWAPS_TOKEN_ADDRESS } from '../../../../ui/app/helpers/constants/swaps'
 import { createTestProviderTools } from '../../../stub/provider'
 import SwapsController, {

test/unit/app/util-test.js

@@ -10,7 +10,7 @@ import {
   ENVIRONMENT_TYPE_NOTIFICATION,
   ENVIRONMENT_TYPE_FULLSCREEN,
   ENVIRONMENT_TYPE_BACKGROUND,
-} from '../../../app/scripts/lib/enums'
+} from '../../../shared/constants/app'
 
 describe('app utils', function () {
   describe('getEnvironmentType', function () {

test/unit/migrations/051-test.js

@@ -3,7 +3,7 @@ import migration51 from '../../../app/scripts/migrations/051'
 import {
   INFURA_PROVIDER_TYPES,
   NETWORK_TYPE_TO_ID_MAP,
-} from '../../../app/scripts/controllers/network/enums'
+} from '../../../shared/constants/network'
 
 describe('migration #51', function () {
   it('should update the version metadata', async function () {

ui/app/components/app/account-menu/account-menu.component.js

@@ -4,7 +4,7 @@ import { debounce } from 'lodash'
 import Fuse from 'fuse.js'
 import InputAdornment from '@material-ui/core/InputAdornment'
 import classnames from 'classnames'
-import { ENVIRONMENT_TYPE_POPUP } from '../../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../../app/scripts/lib/util'
 import Identicon from '../../ui/identicon'
 import SiteIcon from '../../ui/site-icon'

ui/app/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import {
   ENVIRONMENT_TYPE_POPUP,
   ENVIRONMENT_TYPE_NOTIFICATION,
-} from '../../../../../../app/scripts/lib/enums'
+} from '../../../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../../../app/scripts/lib/util'
 import NetworkDisplay from '../../network-display'
 import Identicon from '../../../ui/identicon'

ui/app/components/app/dropdowns/network-dropdown.js

@@ -9,7 +9,7 @@ import {
   NETWORKS_ROUTE,
   NETWORKS_FORM_ROUTE,
 } from '../../../helpers/constants/routes'
-import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../shared/constants/app'
 import {
   getEnvironmentType,
   isPrefixedFormattedHexString,

ui/app/components/app/menu-bar/account-options-menu.js

@@ -16,7 +16,7 @@ import {
 import { useI18nContext } from '../../../hooks/useI18nContext'
 import { useMetricEvent } from '../../../hooks/useMetricEvent'
 import { getEnvironmentType } from '../../../../../app/scripts/lib/util'
-import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../shared/constants/app'
 
 export default function AccountOptionsMenu({ anchorElement, onClose }) {
   const t = useI18nContext()

ui/app/components/app/menu-bar/menu-bar.js

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux'
 import SelectedAccount from '../selected-account'
 import ConnectedStatusIndicator from '../connected-status-indicator'
 import { getEnvironmentType } from '../../../../../app/scripts/lib/util'
-import { ENVIRONMENT_TYPE_POPUP } from '../../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../../shared/constants/app'
 import { CONNECTED_ACCOUNTS_ROUTE } from '../../../helpers/constants/routes'
 import { useI18nContext } from '../../../hooks/useI18nContext'
 import { useMetricEvent } from '../../../hooks/useMetricEvent'

ui/app/components/app/modals/modal.js

@@ -6,7 +6,7 @@ import * as actions from '../../../store/actions'
 import { resetCustomData as resetCustomGasData } from '../../../ducks/gas/gas.duck'
 import isMobileView from '../../../../lib/is-mobile-view'
 import { getEnvironmentType } from '../../../../../app/scripts/lib/util'
-import { ENVIRONMENT_TYPE_POPUP } from '../../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../../shared/constants/app'
 
 // Modal Components
 import ConfirmCustomizeGasModal from '../gas-customization/gas-modal-page-container'

ui/app/components/app/modals/qr-scanner/qr-scanner.component.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import log from 'loglevel'
 import { BrowserQRCodeReader } from '@zxing/library'
 import { getEnvironmentType } from '../../../../../../app/scripts/lib/util'
-import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../../shared/constants/app'
 import Spinner from '../../../ui/spinner'
 import WebcamUtils from '../../../../../lib/webcam-utils'
 import PageContainerFooter from '../../../ui/page-container/page-container-footer/page-container-footer.component'

ui/app/components/app/network-display/network-display.component.js

@@ -7,7 +7,7 @@ import {
   RINKEBY_NETWORK_ID,
   KOVAN_NETWORK_ID,
   GOERLI_NETWORK_ID,
-} from '../../../../../app/scripts/controllers/network/enums'
+} from '../../../../../shared/constants/network'
 
 const networkIdToTypeMap = {
   [MAINNET_NETWORK_ID]: 'mainnet',

ui/app/components/app/signature-request-original/signature-request-original.component.js

@@ -7,7 +7,7 @@ import { ObjectInspector } from 'react-inspector'
 import {
   ENVIRONMENT_TYPE_NOTIFICATION,
   MESSAGE_TYPE,
-} from '../../../../../app/scripts/lib/enums'
+} from '../../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../../app/scripts/lib/util'
 import Identicon from '../../ui/identicon'
 import AccountListItem from '../account-list-item'

ui/app/components/app/signature-request-original/signature-request-original.container.js

@@ -2,7 +2,7 @@ import { connect } from 'react-redux'
 import { compose } from 'redux'
 import { withRouter } from 'react-router-dom'
 
-import { MESSAGE_TYPE } from '../../../../../app/scripts/lib/enums'
+import { MESSAGE_TYPE } from '../../../../../shared/constants/app'
 import { goHome } from '../../../store/actions'
 import {
   accountsWithSendEtherInfoSelector,

ui/app/components/app/signature-request/signature-request.constants.js

@@ -1,3 +1,3 @@
-import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../../shared/constants/app'
 
 export { ENVIRONMENT_TYPE_NOTIFICATION }

ui/app/components/app/signature-request/signature-request.container.js

@@ -2,7 +2,7 @@ import { connect } from 'react-redux'
 import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck'
 import { accountsWithSendEtherInfoSelector } from '../../../selectors'
 import { getAccountByAddress } from '../../../helpers/utils/util'
-import { MESSAGE_TYPE } from '../../../../../app/scripts/lib/enums'
+import { MESSAGE_TYPE } from '../../../../../shared/constants/app'
 import SignatureRequest from './signature-request.component'
 
 function mapStateToProps(state) {

ui/app/components/app/wallet-overview/eth-overview.js

@@ -34,7 +34,7 @@ import {
   setSwapsFromToken,
 } from '../../../ducks/swaps/swaps'
 import IconButton from '../../ui/icon-button'
-import { MAINNET_CHAIN_ID } from '../../../../../app/scripts/controllers/network/enums'
+import { MAINNET_CHAIN_ID } from '../../../../../shared/constants/network'
 import WalletOverview from './wallet-overview'
 
 const EthOverview = ({ className }) => {

ui/app/components/app/wallet-overview/token-overview.js

@@ -27,7 +27,7 @@ import {
   getCurrentKeyring,
   getCurrentChainId,
 } from '../../../selectors/selectors'
-import { MAINNET_CHAIN_ID } from '../../../../../app/scripts/controllers/network/enums'
+import { MAINNET_CHAIN_ID } from '../../../../../shared/constants/network'
 
 import SwapIcon from '../../ui/icon/swap-icon.component'
 import SendIcon from '../../ui/icon/overview-send-icon.component'

ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js

@@ -4,7 +4,7 @@ import Button from '../../components/ui/button'
 import Identicon from '../../components/ui/identicon'
 import TokenBalance from '../../components/ui/token-balance'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
-import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../shared/constants/app'
 
 export default class ConfirmAddSuggestedToken extends Component {
   static contextTypes = {

ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.component.js

@@ -9,7 +9,7 @@ import Identicon from '../../components/ui/identicon'
 import Tooltip from '../../components/ui/tooltip'
 import Copy from '../../components/ui/icon/copy-icon.component'
 
-import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
 import { conversionUtil } from '../../helpers/utils/conversion-util'
 

ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js

@@ -5,7 +5,7 @@ import AccountListItem from '../../components/app/account-list-item'
 import Button from '../../components/ui/button'
 import Identicon from '../../components/ui/identicon'
 
-import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
 import { conversionUtil } from '../../helpers/utils/conversion-util'
 

ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js

@@ -1,7 +1,7 @@
 import ethUtil from 'ethereumjs-util'
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
 import ConfirmPageContainer, {
   ConfirmDetailRow,

ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js

@@ -14,7 +14,7 @@ import {
   DECRYPT_MESSAGE_REQUEST_PATH,
   ENCRYPTION_PUBLIC_KEY_REQUEST_PATH,
 } from '../../helpers/constants/routes'
-import { MESSAGE_TYPE } from '../../../../app/scripts/lib/enums'
+import { MESSAGE_TYPE } from '../../../../shared/constants/app'
 import { TRANSACTION_CATEGORIES } from '../../../../shared/constants/transaction'
 
 export default class ConfirmTransactionSwitch extends Component {

ui/app/pages/confirm-transaction/conf-tx.js

@@ -10,7 +10,7 @@ import SignatureRequest from '../../components/app/signature-request'
 import SignatureRequestOriginal from '../../components/app/signature-request-original'
 import Loading from '../../components/ui/loading-screen'
 import { getMostRecentOverviewPage } from '../../ducks/history/history'
-import { MESSAGE_TYPE } from '../../../../app/scripts/lib/enums'
+import { MESSAGE_TYPE } from '../../../../shared/constants/app'
 import { TRANSACTION_STATUSES } from '../../../../shared/constants/transaction'
 
 function mapStateToProps(state) {

ui/app/pages/error/error.component.js

@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
-import { ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app'
 
 class ErrorPage extends PureComponent {
   static contextTypes = {

ui/app/pages/home/home.container.js

@@ -33,7 +33,7 @@ import { getEnvironmentType } from '../../../../app/scripts/lib/util'
 import {
   ENVIRONMENT_TYPE_NOTIFICATION,
   ENVIRONMENT_TYPE_POPUP,
-} from '../../../../app/scripts/lib/enums'
+} from '../../../../shared/constants/app'
 import {
   ALERT_TYPES,
   WEB3_SHIM_USAGE_ALERT_STATES,

ui/app/pages/permissions-connect/permissions-connect.component.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 import { Switch, Route } from 'react-router-dom'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
-import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../shared/constants/app'
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes'
 import PermissionPageContainer from '../../components/app/permission-page-container'
 import ChooseAccount from './choose-account'

ui/app/pages/routes/routes.component.js

@@ -58,7 +58,7 @@ import {
 import {
   ENVIRONMENT_TYPE_NOTIFICATION,
   ENVIRONMENT_TYPE_POPUP,
-} from '../../../../app/scripts/lib/enums'
+} from '../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
 import { TRANSACTION_STATUSES } from '../../../../shared/constants/transaction'
 

ui/app/pages/send/send-content/add-recipient/ens-input.component.js

@@ -13,7 +13,7 @@ import {
   isValidAddress,
   isValidAddressHead,
 } from '../../../../helpers/utils/util'
-import { MAINNET_NETWORK_ID } from '../../../../../../app/scripts/controllers/network/enums'
+import { MAINNET_NETWORK_ID } from '../../../../../../shared/constants/network'
 
 // Local Constants
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'

ui/app/pages/settings/contact-list-tab/contact-list-tab.container.js

@@ -2,7 +2,7 @@ import { compose } from 'redux'
 import { connect } from 'react-redux'
 import { withRouter } from 'react-router-dom'
 import { getAddressBook } from '../../../selectors'
-import { ENVIRONMENT_TYPE_POPUP } from '../../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../../app/scripts/lib/util'
 
 import {

ui/app/pages/settings/networks-tab/networks-tab.constants.js

@@ -9,7 +9,7 @@ import {
   RINKEBY_CHAIN_ID,
   ROPSTEN,
   ROPSTEN_CHAIN_ID,
-} from '../../../../../app/scripts/controllers/network/enums'
+} from '../../../../../shared/constants/network'
 
 const defaultNetworksData = [
   {

ui/app/pages/settings/networks-tab/networks-tab.container.js

@@ -10,7 +10,7 @@ import {
   showModal,
 } from '../../../store/actions'
 import { NETWORKS_FORM_ROUTE } from '../../../helpers/constants/routes'
-import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../../app/scripts/lib/util'
 import NetworksTab from './networks-tab.component'
 import { defaultNetworksData } from './networks-tab.constants'

ui/app/pages/settings/settings.container.js

@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
 import { withRouter } from 'react-router-dom'
 import { getAddressBookEntryName } from '../../selectors'
 import { isValidAddress } from '../../helpers/utils/util'
-import { ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
 import { getMostRecentOverviewPage } from '../../ducks/history/history'
 

ui/app/pages/swaps/index.js

@@ -48,7 +48,7 @@ import {
   SWAP_FAILED_ERROR,
   OFFLINE_FOR_MAINTENANCE,
 } from '../../helpers/constants/swaps'
-import { MAINNET_CHAIN_ID } from '../../../../app/scripts/controllers/network/enums'
+import { MAINNET_CHAIN_ID } from '../../../../shared/constants/network'
 
 import {
   resetBackgroundSwapsState,

ui/app/pages/unlock-page/unlock-page.container.js

@@ -2,7 +2,7 @@ import { connect } from 'react-redux'
 import { withRouter } from 'react-router-dom'
 import { compose } from 'redux'
 import { getEnvironmentType } from '../../../../app/scripts/lib/util'
-import { ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app'
 import {
   DEFAULT_ROUTE,
   RESTORE_VAULT_ROUTE,

ui/app/selectors/permissions.js

@@ -1,5 +1,5 @@
 import { forOwn } from 'lodash'
-import { CAVEAT_NAMES } from '../../../app/scripts/controllers/permissions/enums'
+import { CAVEAT_NAMES } from '../../../shared/constants/permissions'
 import {
   getMetaMaskAccountsOrdered,
   getOriginOfCurrentTab,

ui/app/store/actions.js

@@ -12,7 +12,7 @@ import {
 import { getMethodDataAsync } from '../helpers/utils/transactions.util'
 import { fetchSymbolAndDecimals } from '../helpers/utils/token-util'
 import switchDirection from '../helpers/utils/switch-direction'
-import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../shared/constants/app'
 import { hasUnconfirmedTransactions } from '../helpers/utils/confirm-tx.util'
 import { setCustomGasLimit } from '../ducks/gas/gas.duck'
 import txHelper from '../../lib/tx-helper'

ui/index.js

@@ -6,7 +6,7 @@ import { render } from 'react-dom'
 import { getEnvironmentType } from '../app/scripts/lib/util'
 import { ALERT_TYPES } from '../shared/constants/alerts'
 import { SENTRY_STATE } from '../app/scripts/lib/setupSentry'
-import { ENVIRONMENT_TYPE_POPUP } from '../app/scripts/lib/enums'
+import { ENVIRONMENT_TYPE_POPUP } from '../shared/constants/app'
 import Root from './app/pages'
 import * as actions from './app/store/actions'
 import configureStore from './app/store/store'

ui/lib/etherscan-prefix-for-network.js

@@ -1,4 +1,4 @@
-import * as networkEnums from '../../app/scripts/controllers/network/enums'
+import * as networkEnums from '../../shared/constants/network'
 
 /**
  * Gets the etherscan.io URL prefix for a given network ID.

ui/lib/webcam-utils.js

@@ -4,7 +4,7 @@ import {
   ENVIRONMENT_TYPE_POPUP,
   PLATFORM_BRAVE,
   PLATFORM_FIREFOX,
-} from '../../app/scripts/lib/enums'
+} from '../../shared/constants/app'
 import { getEnvironmentType, getPlatform } from '../../app/scripts/lib/util'
 
 class WebcamUtils {