diff options
| author | Frankie <frankie.diamond@gmail.com> | 2017-02-02 04:03:42 +0800 |
|---|---|---|
| committer | Frankie <frankie.diamond@gmail.com> | 2017-02-02 04:03:42 +0800 |
| commit | ce0c3ed03c20eb0b7438cb9add7cbce490d7de64 (patch) | |
| tree | 7ac9686e82b938097c698b3b68ddc1e1b55598c8 /ui/app/components | |
| parent | e2e8a7cca06f7e6f41f417d86710227b0b5428d6 (diff) | |
| parent | 82578538198de74955d7bc5cfd3c9a02d1b69a6d (diff) | |
| download | tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.gz tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.bz2 tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.lz tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.xz tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.zst tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.zip | |
Merge branch 'dev' into messageManagerCleanUp
Diffstat (limited to 'ui/app/components')
| -rw-r--r-- | ui/app/components/buy-button-subview.js | 1 | ||||
| -rw-r--r-- | ui/app/components/coinbase-form.js | 1 | ||||
| -rw-r--r-- | ui/app/components/pending-msg-details.js | 2 | ||||
| -rw-r--r-- | ui/app/components/pending-tx-details.js | 2 | ||||
| -rw-r--r-- | ui/app/components/shapeshift-form.js | 1 |
5 files changed, 2 insertions, 5 deletions
diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js index afda5bf59..3074bd7cd 100644 --- a/ui/app/components/buy-button-subview.js +++ b/ui/app/components/buy-button-subview.js @@ -13,7 +13,6 @@ module.exports = connect(mapStateToProps)(BuyButtonSubview) function mapStateToProps (state) { return { - selectedAccount: state.selectedAccount, warning: state.appState.warning, buyView: state.appState.buyView, network: state.metamask.network, diff --git a/ui/app/components/coinbase-form.js b/ui/app/components/coinbase-form.js index 430a3eead..40f5719bb 100644 --- a/ui/app/components/coinbase-form.js +++ b/ui/app/components/coinbase-form.js @@ -9,7 +9,6 @@ module.exports = connect(mapStateToProps)(CoinbaseForm) function mapStateToProps (state) { return { - selectedAccount: state.selectedAccount, warning: state.appState.warning, } } diff --git a/ui/app/components/pending-msg-details.js b/ui/app/components/pending-msg-details.js index 404cb8ae2..16308d121 100644 --- a/ui/app/components/pending-msg-details.js +++ b/ui/app/components/pending-msg-details.js @@ -16,7 +16,7 @@ PendingMsgDetails.prototype.render = function () { var msgData = state.txData var msgParams = msgData.msgParams || {} - var address = msgParams.from || state.selectedAccount + var address = msgParams.from || state.selectedAddress var identity = state.identities[address] || { address: address } var account = state.accounts[address] || { address: address } diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js index 286931f6f..e8615404e 100644 --- a/ui/app/components/pending-tx-details.js +++ b/ui/app/components/pending-tx-details.js @@ -22,7 +22,7 @@ PTXP.render = function () { var txData = props.txData var txParams = txData.txParams || {} - var address = txParams.from || props.selectedAccount + var address = txParams.from || props.selectedAddress var identity = props.identities[address] || { address: address } var account = props.accounts[address] var balance = account ? account.balance : '0x0' diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index 383d5b623..8c9686035 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -10,7 +10,6 @@ module.exports = connect(mapStateToProps)(ShapeshiftForm) function mapStateToProps (state) { return { - selectedAccount: state.selectedAccount, warning: state.appState.warning, isSubLoading: state.appState.isSubLoading, qrRequested: state.appState.qrRequested, |