m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'develop' of github.com:MetaMask/metamask-extension into v4.7.3

Browse Source
This commit is contained in:
kumavis 2018-06-04 16:14:37 -07:00
commit 98b0c160c9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/components/modals/edit-account-name-modal.js
View File

@ -9,7 +9,7 @@ const { getSelectedAccount } = require('../../selectors')
function mapStateToProps (state) { function mapStateToProps (state) {
return { return {
selectedAccount: getSelectedAccount(state), selectedAccount: getSelectedAccount(state),
identity: state.appState.modal.modalState.identity, identity: state.appState.modal.modalState.props.identity,
} }
} }

2
ui/app/components/modals/hide-token-confirmation-modal.js
View File

@ -9,7 +9,7 @@ const Identicon = require('../identicon')
function mapStateToProps (state) { function mapStateToProps (state) {
return { return {
network: state.metamask.network, network: state.metamask.network,
token: state.appState.modal.modalState.token, token: state.appState.modal.modalState.props.token,
} }
} }

2
ui/app/components/modals/shapeshift-deposit-tx-modal.js
View File

@ -8,7 +8,7 @@ const AccountModalContainer = require('./account-modal-container')
function mapStateToProps (state) { function mapStateToProps (state) {
return { return {
Qr: state.appState.modal.modalState.Qr, Qr: state.appState.modal.modalState.props.Qr,
} }
} }