diff options
author | kumavis <aaron@kumavis.me> | 2018-03-21 04:01:08 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-03-21 04:01:08 +0800 |
commit | 29cc2f8ab9628d21cc32962666879c71be4e69d1 (patch) | |
tree | 592a68784a7e8f7ee600249380fb2f4e11d1e8dd /ui/app/conf-tx.js | |
parent | 2ddc2cc1fbe5249f70d80e2a74146cb87dcc8421 (diff) | |
parent | fd3e240dd934c0938a57344a6ae09a213aaa8e37 (diff) | |
download | tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.gz tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.zst tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.zip |
Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index cbf5cd1d2..03848f490 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -40,6 +40,7 @@ function mapStateToProps (state) { currentCurrency: state.metamask.currentCurrency, blockGasLimit: state.metamask.currentBlockGasLimit, computedBalances: state.metamask.computedBalances, + selectedAddressTxList: state.metamask.selectedAddressTxList, } } @@ -48,6 +49,23 @@ function ConfirmTxScreen () { Component.call(this) } +ConfirmTxScreen.prototype.componentDidUpdate = function (prevProps) { + const { + unapprovedTxs, + network, + selectedAddressTxList, + } = this.props + const { index: prevIndex, unapprovedTxs: prevUnapprovedTxs } = prevProps + const prevUnconfTxList = txHelper(prevUnapprovedTxs, {}, {}, {}, network) + const prevTxData = prevUnconfTxList[prevIndex] || {} + const prevTx = selectedAddressTxList.find(({ id }) => id === prevTxData.id) || {} + const unconfTxList = txHelper(unapprovedTxs, {}, {}, {}, network) + + if (prevTx.status === 'dropped' && unconfTxList.length === 0) { + this.goHome({}) + } +} + ConfirmTxScreen.prototype.render = function () { const props = this.props const { |