diff options
-rw-r--r-- | ui/app/components/app/signature-request.js | 2 | ||||
-rw-r--r-- | ui/app/pages/confirm-transaction/conf-tx.js | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/ui/app/components/app/signature-request.js b/ui/app/components/app/signature-request.js index 5f0f16b37..32823aa8e 100644 --- a/ui/app/components/app/signature-request.js +++ b/ui/app/components/app/signature-request.js @@ -74,9 +74,9 @@ function mergeProps (stateProps, dispatchProps, ownProps) { } return { + ...ownProps, ...stateProps, ...dispatchProps, - ...ownProps, txData, cancel, sign, diff --git a/ui/app/pages/confirm-transaction/conf-tx.js b/ui/app/pages/confirm-transaction/conf-tx.js index f9af6624e..d66cb699d 100644 --- a/ui/app/pages/confirm-transaction/conf-tx.js +++ b/ui/app/pages/confirm-transaction/conf-tx.js @@ -12,7 +12,6 @@ const R = require('ramda') const SignatureRequest = require('../../components/app/signature-request') const Loading = require('../../components/ui/loading-screen') const { DEFAULT_ROUTE } = require('../../helpers/constants/routes') -const { getMetaMaskAccounts } = require('../../selectors/selectors') module.exports = compose( withRouter, @@ -29,8 +28,6 @@ function mapStateToProps (state) { return { identities: state.metamask.identities, - accounts: getMetaMaskAccounts(state), - selectedAddress: state.metamask.selectedAddress, unapprovedTxs: state.metamask.unapprovedTxs, unapprovedMsgs: state.metamask.unapprovedMsgs, unapprovedPersonalMsgs: state.metamask.unapprovedPersonalMsgs, @@ -39,7 +36,6 @@ function mapStateToProps (state) { warning: state.appState.warning, network: state.metamask.network, provider: state.metamask.provider, - conversionRate: state.metamask.conversionRate, currentCurrency: state.metamask.currentCurrency, blockGasLimit: state.metamask.currentBlockGasLimit, computedBalances: state.metamask.computedBalances, @@ -146,7 +142,6 @@ ConfirmTxScreen.prototype.render = function () { const props = this.props const { currentCurrency, - conversionRate, blockGasLimit, } = props @@ -159,10 +154,7 @@ ConfirmTxScreen.prototype.render = function () { // Properties txData: txData, key: txData.id, - selectedAddress: props.selectedAddress, - accounts: props.accounts, identities: props.identities, - conversionRate, currentCurrency, blockGasLimit, // Actions |