diff --git a/test/unit/actions/config_test.js b/test/unit/actions/config_test.js index 121a176c4..318b7cd4d 100644 --- a/test/unit/actions/config_test.js +++ b/test/unit/actions/config_test.js @@ -1,7 +1,7 @@ import assert from 'assert' import freeze from 'deep-freeze-strict' import reducers from '../../../ui/app/ducks' -import actionConstants from '../../../ui/app/store/actionConstants' +import * as actionConstants from '../../../ui/app/store/actionConstants' describe('config view actions', function () { const initialState = { diff --git a/test/unit/actions/set_account_label_test.js b/test/unit/actions/set_account_label_test.js index bf7ef4ae8..67ad701ed 100644 --- a/test/unit/actions/set_account_label_test.js +++ b/test/unit/actions/set_account_label_test.js @@ -1,7 +1,7 @@ import assert from 'assert' import freeze from 'deep-freeze-strict' import reducers from '../../../ui/app/ducks' -import actionConstants from '../../../ui/app/store/actionConstants' +import * as actionConstants from '../../../ui/app/store/actionConstants' describe('SET_ACCOUNT_LABEL', function () { it('updates the state.metamask.identities[:i].name property of the state to the action.value.label', function () { diff --git a/test/unit/actions/set_selected_account_test.js b/test/unit/actions/set_selected_account_test.js index 375d97879..03292c439 100644 --- a/test/unit/actions/set_selected_account_test.js +++ b/test/unit/actions/set_selected_account_test.js @@ -1,7 +1,7 @@ import assert from 'assert' import freeze from 'deep-freeze-strict' import reducers from '../../../ui/app/ducks' -import actionConstants from '../../../ui/app/store/actionConstants' +import * as actionConstants from '../../../ui/app/store/actionConstants' describe('SHOW_ACCOUNT_DETAIL', function () { it('updates metamask state', function () { diff --git a/test/unit/actions/tx_test.js b/test/unit/actions/tx_test.js index d9f9f86d4..c5be5d031 100644 --- a/test/unit/actions/tx_test.js +++ b/test/unit/actions/tx_test.js @@ -2,7 +2,7 @@ import assert from 'assert' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' import * as actions from '../../../ui/app/store/actions' -import actionConstants from '../../../ui/app/store/actionConstants' +import * as actionConstants from '../../../ui/app/store/actionConstants' const middlewares = [thunk] const mockStore = configureMockStore(middlewares) diff --git a/test/unit/ui/app/reducers/app.spec.js b/test/unit/ui/app/reducers/app.spec.js index 68e625fd0..cd135d220 100644 --- a/test/unit/ui/app/reducers/app.spec.js +++ b/test/unit/ui/app/reducers/app.spec.js @@ -1,6 +1,6 @@ import assert from 'assert' import reduceApp from '../../../../../ui/app/ducks/app/app' -import actionConstants from '../../../../../ui/app/store/actionConstants' +import * as actionConstants from '../../../../../ui/app/store/actionConstants' const actions = actionConstants diff --git a/test/unit/ui/app/reducers/metamask.spec.js b/test/unit/ui/app/reducers/metamask.spec.js index e6b121336..31684922d 100644 --- a/test/unit/ui/app/reducers/metamask.spec.js +++ b/test/unit/ui/app/reducers/metamask.spec.js @@ -1,6 +1,6 @@ import assert from 'assert' import reduceMetamask from '../../../../../ui/app/ducks/metamask/metamask' -import actionConstants from '../../../../../ui/app/store/actionConstants' +import * as actionConstants from '../../../../../ui/app/store/actionConstants' describe('MetaMask Reducers', function () { diff --git a/ui/app/ducks/alerts/unconnected-account.js b/ui/app/ducks/alerts/unconnected-account.js index ee61244a6..b3e215c43 100644 --- a/ui/app/ducks/alerts/unconnected-account.js +++ b/ui/app/ducks/alerts/unconnected-account.js @@ -1,7 +1,7 @@ import { createSlice } from '@reduxjs/toolkit' import { captureException } from '@sentry/browser' -import actionConstants from '../../store/actionConstants' +import * as actionConstants from '../../store/actionConstants' import { addPermittedAccount } from '../../store/actions' import { getOriginOfCurrentTab, diff --git a/ui/app/ducks/app/app.js b/ui/app/ducks/app/app.js index c41c7108a..177ed812c 100644 --- a/ui/app/ducks/app/app.js +++ b/ui/app/ducks/app/app.js @@ -1,4 +1,4 @@ -import actionConstants from '../../store/actionConstants' +import * as actionConstants from '../../store/actionConstants' // actionConstants const SET_THREEBOX_LAST_UPDATED = 'metamask/app/SET_THREEBOX_LAST_UPDATED' diff --git a/ui/app/ducks/locale/locale.js b/ui/app/ducks/locale/locale.js index 2d13bea1d..5eecbad9b 100644 --- a/ui/app/ducks/locale/locale.js +++ b/ui/app/ducks/locale/locale.js @@ -1,4 +1,4 @@ -import actionConstants from '../../store/actionConstants' +import * as actionConstants from '../../store/actionConstants' export default function reduceLocaleMessages (state = {}, { type, value }) { switch (type) { diff --git a/ui/app/ducks/metamask/metamask.js b/ui/app/ducks/metamask/metamask.js index ab85e8fd5..a08a29fa7 100644 --- a/ui/app/ducks/metamask/metamask.js +++ b/ui/app/ducks/metamask/metamask.js @@ -1,4 +1,4 @@ -import actionConstants from '../../store/actionConstants' +import * as actionConstants from '../../store/actionConstants' export default function reduceMetamask (state = {}, action) { const metamaskState = Object.assign({ diff --git a/ui/app/store/actionConstants.js b/ui/app/store/actionConstants.js index a1ec4488f..b784c9819 100644 --- a/ui/app/store/actionConstants.js +++ b/ui/app/store/actionConstants.js @@ -1,117 +1,114 @@ - -export default { - GO_HOME: 'GO_HOME', - // modal state - MODAL_OPEN: 'UI_MODAL_OPEN', - MODAL_CLOSE: 'UI_MODAL_CLOSE', - // notification state - CLOSE_NOTIFICATION_WINDOW: 'CLOSE_NOTIFICATION_WINDOW', - // sidebar state - SIDEBAR_OPEN: 'UI_SIDEBAR_OPEN', - SIDEBAR_CLOSE: 'UI_SIDEBAR_CLOSE', - // alert state - ALERT_OPEN: 'UI_ALERT_OPEN', - ALERT_CLOSE: 'UI_ALERT_CLOSE', - QR_CODE_DETECTED: 'UI_QR_CODE_DETECTED', - // network dropdown open - NETWORK_DROPDOWN_OPEN: 'UI_NETWORK_DROPDOWN_OPEN', - NETWORK_DROPDOWN_CLOSE: 'UI_NETWORK_DROPDOWN_CLOSE', - // remote state - UPDATE_METAMASK_STATE: 'UPDATE_METAMASK_STATE', - SELECTED_ADDRESS_CHANGED: 'SELECTED_ADDRESS_CHANGED', - FORGOT_PASSWORD: 'FORGOT_PASSWORD', - CLOSE_WELCOME_SCREEN: 'CLOSE_WELCOME_SCREEN', - // unlock screen - UNLOCK_IN_PROGRESS: 'UNLOCK_IN_PROGRESS', - UNLOCK_FAILED: 'UNLOCK_FAILED', - UNLOCK_SUCCEEDED: 'UNLOCK_SUCCEEDED', - LOCK_METAMASK: 'LOCK_METAMASK', - // error handling - DISPLAY_WARNING: 'DISPLAY_WARNING', - HIDE_WARNING: 'HIDE_WARNING', - // accounts screen - SET_SELECTED_TOKEN: 'SET_SELECTED_TOKEN', - SHOW_ACCOUNT_DETAIL: 'SHOW_ACCOUNT_DETAIL', - SHOW_ACCOUNTS_PAGE: 'SHOW_ACCOUNTS_PAGE', - SHOW_CONF_TX_PAGE: 'SHOW_CONF_TX_PAGE', - SET_CURRENT_FIAT: 'SET_CURRENT_FIAT', - // account detail screen - SHOW_SEND_TOKEN_PAGE: 'SHOW_SEND_TOKEN_PAGE', - SHOW_PRIVATE_KEY: 'SHOW_PRIVATE_KEY', - SET_ACCOUNT_LABEL: 'SET_ACCOUNT_LABEL', - // tx conf screen - COMPLETED_TX: 'COMPLETED_TX', - TRANSACTION_ERROR: 'TRANSACTION_ERROR', - UPDATE_TRANSACTION_PARAMS: 'UPDATE_TRANSACTION_PARAMS', - SET_NEXT_NONCE: 'SET_NEXT_NONCE', - // send screen - UPDATE_GAS_LIMIT: 'UPDATE_GAS_LIMIT', - UPDATE_GAS_PRICE: 'UPDATE_GAS_PRICE', - UPDATE_GAS_TOTAL: 'UPDATE_GAS_TOTAL', - UPDATE_SEND_HEX_DATA: 'UPDATE_SEND_HEX_DATA', - UPDATE_SEND_TOKEN_BALANCE: 'UPDATE_SEND_TOKEN_BALANCE', - UPDATE_SEND_TO: 'UPDATE_SEND_TO', - UPDATE_SEND_AMOUNT: 'UPDATE_SEND_AMOUNT', - UPDATE_SEND_ERRORS: 'UPDATE_SEND_ERRORS', - UPDATE_MAX_MODE: 'UPDATE_MAX_MODE', - UPDATE_SEND: 'UPDATE_SEND', - CLEAR_SEND: 'CLEAR_SEND', - GAS_LOADING_STARTED: 'GAS_LOADING_STARTED', - GAS_LOADING_FINISHED: 'GAS_LOADING_FINISHED', - UPDATE_SEND_ENS_RESOLUTION: 'UPDATE_SEND_ENS_RESOLUTION', - UPDATE_SEND_ENS_RESOLUTION_ERROR: 'UPDATE_SEND_ENS_RESOLUTION_ERROR', - // config screen - SET_RPC_TARGET: 'SET_RPC_TARGET', - SET_PROVIDER_TYPE: 'SET_PROVIDER_TYPE', - SET_PREVIOUS_PROVIDER: 'SET_PREVIOUS_PROVIDER', - UPDATE_TOKENS: 'UPDATE_TOKENS', - SET_HARDWARE_WALLET_DEFAULT_HD_PATH: 'SET_HARDWARE_WALLET_DEFAULT_HD_PATH', - // loading overlay - SHOW_LOADING: 'SHOW_LOADING_INDICATION', - HIDE_LOADING: 'HIDE_LOADING_INDICATION', - - BUY_ETH: 'BUY_ETH', - - TOGGLE_ACCOUNT_MENU: 'TOGGLE_ACCOUNT_MENU', - - SET_USE_BLOCKIE: 'SET_USE_BLOCKIE', - SET_USE_NONCEFIELD: 'SET_USE_NONCEFIELD', - UPDATE_CUSTOM_NONCE: 'UPDATE_CUSTOM_NONCE', - SET_IPFS_GATEWAY: 'SET_IPFS_GATEWAY', - - SET_PARTICIPATE_IN_METAMETRICS: 'SET_PARTICIPATE_IN_METAMETRICS', - SET_METAMETRICS_SEND_COUNT: 'SET_METAMETRICS_SEND_COUNT', - - // locale - SET_CURRENT_LOCALE: 'SET_CURRENT_LOCALE', - - // Feature Flags - UPDATE_FEATURE_FLAGS: 'UPDATE_FEATURE_FLAGS', - - // Preferences - UPDATE_PREFERENCES: 'UPDATE_PREFERENCES', - - // Onboarding - COMPLETE_ONBOARDING: 'COMPLETE_ONBOARDING', - - SET_MOUSE_USER_STATE: 'SET_MOUSE_USER_STATE', - - // Network - SET_PENDING_TOKENS: 'SET_PENDING_TOKENS', - CLEAR_PENDING_TOKENS: 'CLEAR_PENDING_TOKENS', - - SET_FIRST_TIME_FLOW_TYPE: 'SET_FIRST_TIME_FLOW_TYPE', - - SET_SELECTED_SETTINGS_RPC_URL: 'SET_SELECTED_SETTINGS_RPC_URL', - SET_NETWORKS_TAB_ADD_MODE: 'SET_NETWORKS_TAB_ADD_MODE', - - LOADING_METHOD_DATA_STARTED: 'LOADING_METHOD_DATA_STARTED', - LOADING_METHOD_DATA_FINISHED: 'LOADING_METHOD_DATA_FINISHED', - - LOADING_TOKEN_PARAMS_STARTED: 'LOADING_TOKEN_PARAMS_STARTED', - LOADING_TOKEN_PARAMS_FINISHED: 'LOADING_TOKEN_PARAMS_FINISHED', - - SET_REQUEST_ACCOUNT_TABS: 'SET_REQUEST_ACCOUNT_TABS', - SET_CURRENT_WINDOW_TAB: 'SET_CURRENT_WINDOW_TAB', - SET_OPEN_METAMASK_TAB_IDS: 'SET_OPEN_METAMASK_TAB_IDS', -} +export const GO_HOME = 'GO_HOME' +// modal state +export const MODAL_OPEN = 'UI_MODAL_OPEN' +export const MODAL_CLOSE = 'UI_MODAL_CLOSE' +// notification state +export const CLOSE_NOTIFICATION_WINDOW = 'CLOSE_NOTIFICATION_WINDOW' +// sidebar state +export const SIDEBAR_OPEN = 'UI_SIDEBAR_OPEN' +export const SIDEBAR_CLOSE = 'UI_SIDEBAR_CLOSE' +// alert state +export const ALERT_OPEN = 'UI_ALERT_OPEN' +export const ALERT_CLOSE = 'UI_ALERT_CLOSE' +export const QR_CODE_DETECTED = 'UI_QR_CODE_DETECTED' +// network dropdown open +export const NETWORK_DROPDOWN_OPEN = 'UI_NETWORK_DROPDOWN_OPEN' +export const NETWORK_DROPDOWN_CLOSE = 'UI_NETWORK_DROPDOWN_CLOSE' +// remote state +export const UPDATE_METAMASK_STATE = 'UPDATE_METAMASK_STATE' +export const SELECTED_ADDRESS_CHANGED = 'SELECTED_ADDRESS_CHANGED' +export const FORGOT_PASSWORD = 'FORGOT_PASSWORD' +export const CLOSE_WELCOME_SCREEN = 'CLOSE_WELCOME_SCREEN' +// unlock screen +export const UNLOCK_IN_PROGRESS = 'UNLOCK_IN_PROGRESS' +export const UNLOCK_FAILED = 'UNLOCK_FAILED' +export const UNLOCK_SUCCEEDED = 'UNLOCK_SUCCEEDED' +export const LOCK_METAMASK = 'LOCK_METAMASK' +// error handling +export const DISPLAY_WARNING = 'DISPLAY_WARNING' +export const HIDE_WARNING = 'HIDE_WARNING' +// accounts screen +export const SET_SELECTED_TOKEN = 'SET_SELECTED_TOKEN' +export const SHOW_ACCOUNT_DETAIL = 'SHOW_ACCOUNT_DETAIL' +export const SHOW_ACCOUNTS_PAGE = 'SHOW_ACCOUNTS_PAGE' +export const SHOW_CONF_TX_PAGE = 'SHOW_CONF_TX_PAGE' +export const SET_CURRENT_FIAT = 'SET_CURRENT_FIAT' +// account detail screen +export const SHOW_SEND_TOKEN_PAGE = 'SHOW_SEND_TOKEN_PAGE' +export const SHOW_PRIVATE_KEY = 'SHOW_PRIVATE_KEY' +export const SET_ACCOUNT_LABEL = 'SET_ACCOUNT_LABEL' +// tx conf screen +export const COMPLETED_TX = 'COMPLETED_TX' +export const TRANSACTION_ERROR = 'TRANSACTION_ERROR' +export const UPDATE_TRANSACTION_PARAMS = 'UPDATE_TRANSACTION_PARAMS' +export const SET_NEXT_NONCE = 'SET_NEXT_NONCE' +// send screen +export const UPDATE_GAS_LIMIT = 'UPDATE_GAS_LIMIT' +export const UPDATE_GAS_PRICE = 'UPDATE_GAS_PRICE' +export const UPDATE_GAS_TOTAL = 'UPDATE_GAS_TOTAL' +export const UPDATE_SEND_HEX_DATA = 'UPDATE_SEND_HEX_DATA' +export const UPDATE_SEND_TOKEN_BALANCE = 'UPDATE_SEND_TOKEN_BALANCE' +export const UPDATE_SEND_TO = 'UPDATE_SEND_TO' +export const UPDATE_SEND_AMOUNT = 'UPDATE_SEND_AMOUNT' +export const UPDATE_SEND_ERRORS = 'UPDATE_SEND_ERRORS' +export const UPDATE_MAX_MODE = 'UPDATE_MAX_MODE' +export const UPDATE_SEND = 'UPDATE_SEND' +export const CLEAR_SEND = 'CLEAR_SEND' +export const GAS_LOADING_STARTED = 'GAS_LOADING_STARTED' +export const GAS_LOADING_FINISHED = 'GAS_LOADING_FINISHED' +export const UPDATE_SEND_ENS_RESOLUTION = 'UPDATE_SEND_ENS_RESOLUTION' +export const UPDATE_SEND_ENS_RESOLUTION_ERROR = 'UPDATE_SEND_ENS_RESOLUTION_ERROR' +// config screen +export const SET_RPC_TARGET = 'SET_RPC_TARGET' +export const SET_PROVIDER_TYPE = 'SET_PROVIDER_TYPE' +export const SET_PREVIOUS_PROVIDER = 'SET_PREVIOUS_PROVIDER' +export const UPDATE_TOKENS = 'UPDATE_TOKENS' +export const SET_HARDWARE_WALLET_DEFAULT_HD_PATH = 'SET_HARDWARE_WALLET_DEFAULT_HD_PATH' +// loading overlay +export const SHOW_LOADING = 'SHOW_LOADING_INDICATION' +export const HIDE_LOADING = 'HIDE_LOADING_INDICATION' + +export const BUY_ETH = 'BUY_ETH' + +export const TOGGLE_ACCOUNT_MENU = 'TOGGLE_ACCOUNT_MENU' + +export const SET_USE_BLOCKIE = 'SET_USE_BLOCKIE' +export const SET_USE_NONCEFIELD = 'SET_USE_NONCEFIELD' +export const UPDATE_CUSTOM_NONCE = 'UPDATE_CUSTOM_NONCE' +export const SET_IPFS_GATEWAY = 'SET_IPFS_GATEWAY' + +export const SET_PARTICIPATE_IN_METAMETRICS = 'SET_PARTICIPATE_IN_METAMETRICS' +export const SET_METAMETRICS_SEND_COUNT = 'SET_METAMETRICS_SEND_COUNT' + +// locale +export const SET_CURRENT_LOCALE = 'SET_CURRENT_LOCALE' + +// Feature Flags +export const UPDATE_FEATURE_FLAGS = 'UPDATE_FEATURE_FLAGS' + +// Preferences +export const UPDATE_PREFERENCES = 'UPDATE_PREFERENCES' + +// Onboarding +export const COMPLETE_ONBOARDING = 'COMPLETE_ONBOARDING' + +export const SET_MOUSE_USER_STATE = 'SET_MOUSE_USER_STATE' + +// Network +export const SET_PENDING_TOKENS = 'SET_PENDING_TOKENS' +export const CLEAR_PENDING_TOKENS = 'CLEAR_PENDING_TOKENS' + +export const SET_FIRST_TIME_FLOW_TYPE = 'SET_FIRST_TIME_FLOW_TYPE' + +export const SET_SELECTED_SETTINGS_RPC_URL = 'SET_SELECTED_SETTINGS_RPC_URL' +export const SET_NETWORKS_TAB_ADD_MODE = 'SET_NETWORKS_TAB_ADD_MODE' + +export const LOADING_METHOD_DATA_STARTED = 'LOADING_METHOD_DATA_STARTED' +export const LOADING_METHOD_DATA_FINISHED = 'LOADING_METHOD_DATA_FINISHED' + +export const LOADING_TOKEN_PARAMS_STARTED = 'LOADING_TOKEN_PARAMS_STARTED' +export const LOADING_TOKEN_PARAMS_FINISHED = 'LOADING_TOKEN_PARAMS_FINISHED' + +export const SET_REQUEST_ACCOUNT_TABS = 'SET_REQUEST_ACCOUNT_TABS' +export const SET_CURRENT_WINDOW_TAB = 'SET_CURRENT_WINDOW_TAB' +export const SET_OPEN_METAMASK_TAB_IDS = 'SET_OPEN_METAMASK_TAB_IDS' diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js index d65e2af86..a6d9452d8 100644 --- a/ui/app/store/actions.js +++ b/ui/app/store/actions.js @@ -14,7 +14,7 @@ import { hasUnconfirmedTransactions } from '../helpers/utils/confirm-tx.util' import { setCustomGasLimit } from '../ducks/gas/gas.duck' import txHelper from '../../lib/tx-helper' import { getEnvironmentType } from '../../../app/scripts/lib/util' -import actionConstants from './actionConstants' +import * as actionConstants from './actionConstants' import { getPermittedAccountsForCurrentTab, getSelectedAddress,