diff options
| author | kumavis <aaron@kumavis.me> | 2018-06-05 07:14:37 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2018-06-05 07:14:37 +0800 |
| commit | 98b0c160c98b6a7e998ec28aca919545a0c8dbff (patch) | |
| tree | 65f48f7866cc9894bf420c62439f582f63459996 | |
| parent | 12a7fc40161e3cd6dd8714f67744a905017b99d9 (diff) | |
| parent | 3b6e96bac918925c4edc674e26dba8cc5feb1324 (diff) | |
| download | dexon-wallet-98b0c160c98b6a7e998ec28aca919545a0c8dbff.tar.gz dexon-wallet-98b0c160c98b6a7e998ec28aca919545a0c8dbff.tar.zst dexon-wallet-98b0c160c98b6a7e998ec28aca919545a0c8dbff.zip | |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into v4.7.3
| -rw-r--r-- | ui/app/components/modals/edit-account-name-modal.js | 2 | ||||
| -rw-r--r-- | ui/app/components/modals/hide-token-confirmation-modal.js | 2 | ||||
| -rw-r--r-- | ui/app/components/modals/shapeshift-deposit-tx-modal.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/modals/edit-account-name-modal.js b/ui/app/components/modals/edit-account-name-modal.js index 5681a3ca..edced872 100644 --- a/ui/app/components/modals/edit-account-name-modal.js +++ b/ui/app/components/modals/edit-account-name-modal.js @@ -9,7 +9,7 @@ const { getSelectedAccount } = require('../../selectors') function mapStateToProps (state) { return { selectedAccount: getSelectedAccount(state), - identity: state.appState.modal.modalState.identity, + identity: state.appState.modal.modalState.props.identity, } } diff --git a/ui/app/components/modals/hide-token-confirmation-modal.js b/ui/app/components/modals/hide-token-confirmation-modal.js index 72e9c84e..1518fa9a 100644 --- a/ui/app/components/modals/hide-token-confirmation-modal.js +++ b/ui/app/components/modals/hide-token-confirmation-modal.js @@ -9,7 +9,7 @@ const Identicon = require('../identicon') function mapStateToProps (state) { return { network: state.metamask.network, - token: state.appState.modal.modalState.token, + token: state.appState.modal.modalState.props.token, } } diff --git a/ui/app/components/modals/shapeshift-deposit-tx-modal.js b/ui/app/components/modals/shapeshift-deposit-tx-modal.js index 24af5a0d..242c7b89 100644 --- a/ui/app/components/modals/shapeshift-deposit-tx-modal.js +++ b/ui/app/components/modals/shapeshift-deposit-tx-modal.js @@ -8,7 +8,7 @@ const AccountModalContainer = require('./account-modal-container') function mapStateToProps (state) { return { - Qr: state.appState.modal.modalState.Qr, + Qr: state.appState.modal.modalState.props.Qr, } } |