diff --git a/package.json b/package.json index 2d80dabfa..f3f1e0d00 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,6 @@ "react-transition-group": "^1.2.1", "react-trigger-change": "^1.0.2", "readable-stream": "^2.3.3", - "recompose": "^0.25.0", "redux": "^4.0.5", "redux-thunk": "^2.3.0", "reselect": "^3.0.1", diff --git a/ui/app/components/app/account-menu/account-menu.container.js b/ui/app/components/app/account-menu/account-menu.container.js index 68f330972..81ca7ea51 100644 --- a/ui/app/components/app/account-menu/account-menu.container.js +++ b/ui/app/components/app/account-menu/account-menu.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import { toggleAccountMenu, diff --git a/ui/app/components/app/app-header/app-header.container.js b/ui/app/components/app/app-header/app-header.container.js index 28d9a796d..926e9f1ee 100644 --- a/ui/app/components/app/app-header/app-header.container.js +++ b/ui/app/components/app/app-header/app-header.container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import AppHeader from './app-header.component' import * as actions from '../../../store/actions' diff --git a/ui/app/components/app/dai-migration-component/dai-migration-notification.container.js b/ui/app/components/app/dai-migration-component/dai-migration-notification.container.js index 175083bce..d626548ab 100644 --- a/ui/app/components/app/dai-migration-component/dai-migration-notification.container.js +++ b/ui/app/components/app/dai-migration-component/dai-migration-notification.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import DaiMigrationNotification from './dai-migration-notification.component' import withTokenTracker from '../../../helpers/higher-order-components/with-token-tracker' import { getSelectedAddress, getDaiV1Token } from '../../../selectors/selectors' diff --git a/ui/app/components/app/dropdowns/account-details-dropdown.js b/ui/app/components/app/dropdowns/account-details-dropdown.js index a9d5f0a5a..c98b11a19 100644 --- a/ui/app/components/app/dropdowns/account-details-dropdown.js +++ b/ui/app/components/app/dropdowns/account-details-dropdown.js @@ -1,6 +1,6 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import { connect } from 'react-redux' import * as actions from '../../../store/actions' diff --git a/ui/app/components/app/dropdowns/network-dropdown.js b/ui/app/components/app/dropdowns/network-dropdown.js index 86cdab8b0..889da4f08 100644 --- a/ui/app/components/app/dropdowns/network-dropdown.js +++ b/ui/app/components/app/dropdowns/network-dropdown.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import * as actions from '../../../store/actions' import { Dropdown, DropdownMenuItem } from './components/dropdown' import NetworkDropdownIcon from './components/network-dropdown-icon' diff --git a/ui/app/components/app/modals/cancel-transaction/cancel-transaction.container.js b/ui/app/components/app/modals/cancel-transaction/cancel-transaction.container.js index bed72119a..341a6cfb5 100644 --- a/ui/app/components/app/modals/cancel-transaction/cancel-transaction.container.js +++ b/ui/app/components/app/modals/cancel-transaction/cancel-transaction.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import ethUtil from 'ethereumjs-util' import { multiplyCurrencies } from '../../../../helpers/utils/conversion-util' import withModalProps from '../../../../helpers/higher-order-components/with-modal-props' diff --git a/ui/app/components/app/modals/confirm-delete-network/confirm-delete-network.container.js b/ui/app/components/app/modals/confirm-delete-network/confirm-delete-network.container.js index 6df902572..e9df26735 100644 --- a/ui/app/components/app/modals/confirm-delete-network/confirm-delete-network.container.js +++ b/ui/app/components/app/modals/confirm-delete-network/confirm-delete-network.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import withModalProps from '../../../../helpers/higher-order-components/with-modal-props' import ConfirmDeleteNetwork from './confirm-delete-network.component' import { delRpcTarget } from '../../../../store/actions' diff --git a/ui/app/components/app/modals/confirm-remove-account/confirm-remove-account.container.js b/ui/app/components/app/modals/confirm-remove-account/confirm-remove-account.container.js index 6434899a2..e5bddb62f 100644 --- a/ui/app/components/app/modals/confirm-remove-account/confirm-remove-account.container.js +++ b/ui/app/components/app/modals/confirm-remove-account/confirm-remove-account.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import ConfirmRemoveAccount from './confirm-remove-account.component' import withModalProps from '../../../../helpers/higher-order-components/with-modal-props' import { removeAccount } from '../../../../store/actions' diff --git a/ui/app/components/app/modals/confirm-reset-account/confirm-reset-account.container.js b/ui/app/components/app/modals/confirm-reset-account/confirm-reset-account.container.js index b870f191c..727cb9ae6 100644 --- a/ui/app/components/app/modals/confirm-reset-account/confirm-reset-account.container.js +++ b/ui/app/components/app/modals/confirm-reset-account/confirm-reset-account.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import withModalProps from '../../../../helpers/higher-order-components/with-modal-props' import ConfirmResetAccount from './confirm-reset-account.component' import { resetAccount } from '../../../../store/actions' diff --git a/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js b/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js index c0b406d8e..bda50cb4b 100644 --- a/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js +++ b/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import withModalProps from '../../../../helpers/higher-order-components/with-modal-props' import DisconnectAccount from './disconnect-account.component' import { getCurrentAccountWithSendEtherInfo } from '../../../../selectors/selectors' diff --git a/ui/app/components/app/modals/disconnect-all/disconnect-all.container.js b/ui/app/components/app/modals/disconnect-all/disconnect-all.container.js index fe733a5b1..4fc87d4df 100644 --- a/ui/app/components/app/modals/disconnect-all/disconnect-all.container.js +++ b/ui/app/components/app/modals/disconnect-all/disconnect-all.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import withModalProps from '../../../../helpers/higher-order-components/with-modal-props' import DisconnectAll from './disconnect-all.component' diff --git a/ui/app/components/app/modals/edit-approval-permission/edit-approval-permission.container.js b/ui/app/components/app/modals/edit-approval-permission/edit-approval-permission.container.js index ac25fa149..223185f75 100644 --- a/ui/app/components/app/modals/edit-approval-permission/edit-approval-permission.container.js +++ b/ui/app/components/app/modals/edit-approval-permission/edit-approval-permission.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import withModalProps from '../../../../helpers/higher-order-components/with-modal-props' import EditApprovalPermission from './edit-approval-permission.component' import { getSelectedIdentity } from '../../../../selectors/selectors' diff --git a/ui/app/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.container.js b/ui/app/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.container.js index 6ac78ff56..c3e6fd8b3 100644 --- a/ui/app/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.container.js +++ b/ui/app/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import MetaMetricsOptInModal from './metametrics-opt-in-modal.component' import withModalProps from '../../../../helpers/higher-order-components/with-modal-props' import { setParticipateInMetaMetrics } from '../../../../store/actions' diff --git a/ui/app/components/app/modals/reject-transactions/reject-transactions.container.js b/ui/app/components/app/modals/reject-transactions/reject-transactions.container.js index aa74fd800..72eddbc8b 100644 --- a/ui/app/components/app/modals/reject-transactions/reject-transactions.container.js +++ b/ui/app/components/app/modals/reject-transactions/reject-transactions.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import RejectTransactionsModal from './reject-transactions.component' import withModalProps from '../../../../helpers/higher-order-components/with-modal-props' diff --git a/ui/app/components/app/signature-request-original/signature-request-original.container.js b/ui/app/components/app/signature-request-original/signature-request-original.container.js index 625993e32..9a5e9057c 100644 --- a/ui/app/components/app/signature-request-original/signature-request-original.container.js +++ b/ui/app/components/app/signature-request-original/signature-request-original.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import * as actions from '../../../store/actions' diff --git a/ui/app/components/app/transaction-list-item/transaction-list-item.container.js b/ui/app/components/app/transaction-list-item/transaction-list-item.container.js index 9569040bb..2a6089ff7 100644 --- a/ui/app/components/app/transaction-list-item/transaction-list-item.container.js +++ b/ui/app/components/app/transaction-list-item/transaction-list-item.container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import TransactionListItem from './transaction-list-item.component' import { setSelectedToken, showModal, showSidebar, getContractMethodData } from '../../../store/actions' import { hexToDecimal } from '../../../helpers/utils/conversions.util' diff --git a/ui/app/components/app/transaction-view-balance/transaction-view-balance.container.js b/ui/app/components/app/transaction-view-balance/transaction-view-balance.container.js index b85e9d0fe..e9fdbe141 100644 --- a/ui/app/components/app/transaction-view-balance/transaction-view-balance.container.js +++ b/ui/app/components/app/transaction-view-balance/transaction-view-balance.container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import TransactionViewBalance from './transaction-view-balance.component' import { getSelectedToken, diff --git a/ui/app/components/app/wallet-view/wallet-view.container.js b/ui/app/components/app/wallet-view/wallet-view.container.js index e9073e273..ad6318f43 100644 --- a/ui/app/components/app/wallet-view/wallet-view.container.js +++ b/ui/app/components/app/wallet-view/wallet-view.container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import WalletView from './wallet-view.component' import { hideSidebar, setSelectedToken } from '../../../store/actions' import { getSelectedAddress, getSelectedAccount } from '../../../selectors/selectors' diff --git a/ui/app/components/ui/token-balance/token-balance.container.js b/ui/app/components/ui/token-balance/token-balance.container.js index 6198bcc5c..30efeeb31 100644 --- a/ui/app/components/ui/token-balance/token-balance.container.js +++ b/ui/app/components/ui/token-balance/token-balance.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import withTokenTracker from '../../../helpers/higher-order-components/with-token-tracker' import TokenBalance from './token-balance.component' import { getSelectedAddress } from '../../../selectors/selectors' diff --git a/ui/app/helpers/higher-order-components/metametrics/metametrics.provider.js b/ui/app/helpers/higher-order-components/metametrics/metametrics.provider.js index 1cc0cfdcb..ed49d5a9b 100644 --- a/ui/app/helpers/higher-order-components/metametrics/metametrics.provider.js +++ b/ui/app/helpers/higher-order-components/metametrics/metametrics.provider.js @@ -2,7 +2,7 @@ import { Component } from 'react' import { connect } from 'react-redux' import PropTypes from 'prop-types' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import { getCurrentNetworkId, getSelectedAsset, diff --git a/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js b/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js index 59b2a7637..3cbd3c73b 100644 --- a/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js +++ b/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import ConfirmAddSuggestedToken from './confirm-add-suggested-token.component' import { withRouter } from 'react-router-dom' import { addToken, removeSuggestedTokens } from '../../store/actions' diff --git a/ui/app/pages/confirm-approve/confirm-approve.container.js b/ui/app/pages/confirm-approve/confirm-approve.container.js index 92f0eb552..7dd297272 100644 --- a/ui/app/pages/confirm-approve/confirm-approve.container.js +++ b/ui/app/pages/confirm-approve/confirm-approve.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import { contractExchangeRateSelector, diff --git a/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js b/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js index 8bc561a3f..9d497c7cb 100644 --- a/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js +++ b/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import { goHome, decryptMsg, cancelDecryptMsg, decryptMsgInline } from '../../store/actions' diff --git a/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js b/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js index b70d06b6a..1903de78d 100644 --- a/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js +++ b/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import { goHome, encryptionPublicKeyMsg, cancelEncryptionPublicKeyMsg } from '../../store/actions' diff --git a/ui/app/pages/confirm-send-ether/confirm-send-ether.container.js b/ui/app/pages/confirm-send-ether/confirm-send-ether.container.js index 45e830d5d..d35b5bbd7 100644 --- a/ui/app/pages/confirm-send-ether/confirm-send-ether.container.js +++ b/ui/app/pages/confirm-send-ether/confirm-send-ether.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import { updateSend } from '../../store/actions' import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck' diff --git a/ui/app/pages/confirm-send-token/confirm-send-token.container.js b/ui/app/pages/confirm-send-token/confirm-send-token.container.js index 4673297b3..3e0894bd7 100644 --- a/ui/app/pages/confirm-send-token/confirm-send-token.container.js +++ b/ui/app/pages/confirm-send-token/confirm-send-token.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import ConfirmSendToken from './confirm-send-token.component' import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck' diff --git a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js index e68cee832..856aa166d 100644 --- a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js +++ b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import ConfirmTokenTransactionBase from './confirm-token-transaction-base.component' import { diff --git a/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js index 590662160..eedcd96e6 100644 --- a/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js +++ b/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import contractMap from 'eth-contract-metadata' import ConfirmTransactionBase from './confirm-transaction-base.component' diff --git a/ui/app/pages/confirm-transaction/conf-tx.js b/ui/app/pages/confirm-transaction/conf-tx.js index 426aeeb3e..3df1ff4b0 100644 --- a/ui/app/pages/confirm-transaction/conf-tx.js +++ b/ui/app/pages/confirm-transaction/conf-tx.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import * as actions from '../../store/actions' import txHelper from '../../../lib/tx-helper' import log from 'loglevel' diff --git a/ui/app/pages/confirm-transaction/confirm-transaction.container.js b/ui/app/pages/confirm-transaction/confirm-transaction.container.js index 402ea8a28..cdfedd1ec 100644 --- a/ui/app/pages/confirm-transaction/confirm-transaction.container.js +++ b/ui/app/pages/confirm-transaction/confirm-transaction.container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux' -import { compose } from 'recompose' +import { compose } from 'redux' import { withRouter } from 'react-router-dom' import { setTransactionToConfirm, diff --git a/ui/app/pages/create-account/import-account/json.js b/ui/app/pages/create-account/import-account/json.js index 1d5f376c5..f270b9f05 100644 --- a/ui/app/pages/create-account/import-account/json.js +++ b/ui/app/pages/create-account/import-account/json.js @@ -1,7 +1,7 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import * as actions from '../../../store/actions' import FileInput from 'react-simple-file-input' diff --git a/ui/app/pages/create-account/import-account/private-key.js b/ui/app/pages/create-account/import-account/private-key.js index 403f8e2e0..29aaaf5e8 100644 --- a/ui/app/pages/create-account/import-account/private-key.js +++ b/ui/app/pages/create-account/import-account/private-key.js @@ -1,6 +1,6 @@ import React, { Component } from 'react' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import PropTypes from 'prop-types' import { connect } from 'react-redux' import * as actions from '../../../store/actions' diff --git a/ui/app/pages/first-time-flow/select-action/select-action.container.js b/ui/app/pages/first-time-flow/select-action/select-action.container.js index 205156f9a..30813bb00 100644 --- a/ui/app/pages/first-time-flow/select-action/select-action.container.js +++ b/ui/app/pages/first-time-flow/select-action/select-action.container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import { setFirstTimeFlowType } from '../../../store/actions' import { getFirstTimeFlowTypeRoute } from '../first-time-flow.selectors' import Welcome from './select-action.component' diff --git a/ui/app/pages/first-time-flow/welcome/welcome.container.js b/ui/app/pages/first-time-flow/welcome/welcome.container.js index 16944e055..cfe99f2e4 100644 --- a/ui/app/pages/first-time-flow/welcome/welcome.container.js +++ b/ui/app/pages/first-time-flow/welcome/welcome.container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import { closeWelcomeScreen } from '../../../store/actions' import Welcome from './welcome.component' diff --git a/ui/app/pages/home/home.container.js b/ui/app/pages/home/home.container.js index 6389ed2fe..77fe4b612 100644 --- a/ui/app/pages/home/home.container.js +++ b/ui/app/pages/home/home.container.js @@ -1,5 +1,5 @@ import Home from './home.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { unconfirmedTransactionsCountSelector } from '../../selectors/confirm-transaction' diff --git a/ui/app/pages/lock/lock.container.js b/ui/app/pages/lock/lock.container.js index 9fb5f997e..6a3a1c7d7 100644 --- a/ui/app/pages/lock/lock.container.js +++ b/ui/app/pages/lock/lock.container.js @@ -1,5 +1,5 @@ import Lock from './lock.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { lockMetamask } from '../../store/actions' diff --git a/ui/app/pages/routes/index.js b/ui/app/pages/routes/index.js index 3d68a03e1..ee649c30f 100644 --- a/ui/app/pages/routes/index.js +++ b/ui/app/pages/routes/index.js @@ -2,7 +2,7 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import { connect } from 'react-redux' import { Route, Switch, withRouter, matchPath } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import * as actions from '../../store/actions' import log from 'loglevel' import IdleTimer from 'react-idle-timer' diff --git a/ui/app/pages/send/send.container.js b/ui/app/pages/send/send.container.js index e76564ea3..e8c0c85c8 100644 --- a/ui/app/pages/send/send.container.js +++ b/ui/app/pages/send/send.container.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux' import SendEther from './send.component' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import { getAmountConversionRate, diff --git a/ui/app/pages/send/tests/send-container.test.js b/ui/app/pages/send/tests/send-container.test.js index 403630d61..b9dc7faaa 100644 --- a/ui/app/pages/send/tests/send-container.test.js +++ b/ui/app/pages/send/tests/send-container.test.js @@ -22,7 +22,7 @@ proxyquire('../send.container.js', { }, }, 'react-router-dom': { withRouter: () => {} }, - 'recompose': { compose: (_, arg2) => () => arg2() }, + 'redux': { compose: (_, arg2) => () => arg2() }, '../../store/actions': actionSpies, '../../ducks/send/send.duck': duckActionSpies, './send.utils.js': { diff --git a/ui/app/pages/settings/advanced-tab/advanced-tab.container.js b/ui/app/pages/settings/advanced-tab/advanced-tab.container.js index 7eb63ad5f..3875418dd 100644 --- a/ui/app/pages/settings/advanced-tab/advanced-tab.container.js +++ b/ui/app/pages/settings/advanced-tab/advanced-tab.container.js @@ -1,5 +1,5 @@ import AdvancedTab from './advanced-tab.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { diff --git a/ui/app/pages/settings/contact-list-tab/add-contact/add-contact.container.js b/ui/app/pages/settings/contact-list-tab/add-contact/add-contact.container.js index 1bae5245f..2c9731704 100644 --- a/ui/app/pages/settings/contact-list-tab/add-contact/add-contact.container.js +++ b/ui/app/pages/settings/contact-list-tab/add-contact/add-contact.container.js @@ -1,5 +1,5 @@ import AddContact from './add-contact.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { addToAddressBook, showQrScanner, qrCodeDetected } from '../../../../store/actions' diff --git a/ui/app/pages/settings/contact-list-tab/contact-list-tab.container.js b/ui/app/pages/settings/contact-list-tab/contact-list-tab.container.js index 2c7139b5d..5bd3c2251 100644 --- a/ui/app/pages/settings/contact-list-tab/contact-list-tab.container.js +++ b/ui/app/pages/settings/contact-list-tab/contact-list-tab.container.js @@ -1,5 +1,5 @@ import ContactListTab from './contact-list-tab.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { getAddressBook } from '../../../selectors/selectors' diff --git a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.container.js b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.container.js index c13091fae..0cf37ee49 100644 --- a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.container.js +++ b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.container.js @@ -1,5 +1,5 @@ import EditContact from './edit-contact.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { getAddressBookEntry } from '../../../../selectors/selectors' diff --git a/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.container.js b/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.container.js index 6380c9d4c..962bd989d 100644 --- a/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.container.js +++ b/ui/app/pages/settings/contact-list-tab/my-accounts/my-accounts.container.js @@ -1,5 +1,5 @@ import ViewContact from './my-accounts.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { accountsWithSendEtherInfoSelector } from '../../../../selectors/selectors' diff --git a/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.container.js b/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.container.js index 871ab1dc6..4384b9297 100644 --- a/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.container.js +++ b/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.container.js @@ -1,5 +1,5 @@ import ViewContact from './view-contact.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { getAddressBookEntry } from '../../../../selectors/selectors' diff --git a/ui/app/pages/settings/networks-tab/networks-tab.container.js b/ui/app/pages/settings/networks-tab/networks-tab.container.js index 01239528f..64e0e195e 100644 --- a/ui/app/pages/settings/networks-tab/networks-tab.container.js +++ b/ui/app/pages/settings/networks-tab/networks-tab.container.js @@ -1,5 +1,5 @@ import NetworksTab from './networks-tab.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { diff --git a/ui/app/pages/settings/security-tab/security-tab.container.js b/ui/app/pages/settings/security-tab/security-tab.container.js index 0dd38bc37..56e9ad495 100644 --- a/ui/app/pages/settings/security-tab/security-tab.container.js +++ b/ui/app/pages/settings/security-tab/security-tab.container.js @@ -1,5 +1,5 @@ import SecurityTab from './security-tab.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { diff --git a/ui/app/pages/settings/settings.container.js b/ui/app/pages/settings/settings.container.js index 6a6f385d1..a10b4ca7e 100644 --- a/ui/app/pages/settings/settings.container.js +++ b/ui/app/pages/settings/settings.container.js @@ -1,5 +1,5 @@ import Settings from './settings.component' -import { compose } from 'recompose' +import { compose } from 'redux' import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' import { getAddressBookEntryName } from '../../selectors/selectors' diff --git a/ui/app/pages/unlock-page/unlock-page.container.js b/ui/app/pages/unlock-page/unlock-page.container.js index 105072f9b..33d7a6368 100644 --- a/ui/app/pages/unlock-page/unlock-page.container.js +++ b/ui/app/pages/unlock-page/unlock-page.container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux' import { withRouter } from 'react-router-dom' -import { compose } from 'recompose' +import { compose } from 'redux' import { getEnvironmentType } from '../../../../app/scripts/lib/util' import { ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums' import { DEFAULT_ROUTE, RESTORE_VAULT_ROUTE } from '../../helpers/constants/routes' diff --git a/yarn.lock b/yarn.lock index 0cdf97bfa..8b289fa89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23797,16 +23797,6 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -recompose@^0.25.0: - version "0.25.1" - resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.25.1.tgz#5eb9d6cf6e25a9ffad73cbbae5658b5b55d6e728" - integrity sha512-EwFAv6UBrHbLIsIKHUZJ+BKdjTmyEsIrRlGO3R7PKu0S7hkgNznVDRvb+1upQUntURtBvxhYnTVQ3AcWOlsmWA== - dependencies: - change-emitter "^0.1.2" - fbjs "^0.8.1" - hoist-non-react-statics "^2.3.1" - symbol-observable "^1.0.4" - "recompose@^0.26.0 || ^0.27.0": version "0.27.0" resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.27.0.tgz#8230ebd651bf1159097006f79083fe224b1501cf"