Remove recompose (#8097)

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",

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,

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'
 

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'

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'

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,

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'

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'

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,

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'

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,

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'
 

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'
 

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'

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'

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 {

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'

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'

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,

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'

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'

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'

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'
 

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'

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'

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'

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,

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': {

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 {

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'

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'

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'

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'

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'

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 {

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 {

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'

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'

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"