diff options
author | Dan J Miller <dmiller@kyokan.io> | 2019-04-27 17:29:55 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-27 17:29:55 +0800 |
commit | 39b714542397277733134214c228403ae89d7d29 (patch) | |
tree | 5cfd1cbdaaffed2ee64e687f7c72f2bdfd5957ae /ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js | |
parent | 0dac3eb09528f8a3ac672377319e60905032ad2d (diff) | |
download | tangerine-wallet-browser-39b714542397277733134214c228403ae89d7d29.tar.gz tangerine-wallet-browser-39b714542397277733134214c228403ae89d7d29.tar.zst tangerine-wallet-browser-39b714542397277733134214c228403ae89d7d29.zip |
Ensure home screen does not render if there are unapproved txs (#6501)
* Ensure that the confirm screen renders before the home screen if there are unapproved txs.
* Only render confirm screen before home screen on mount.
Diffstat (limited to 'ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js')
-rw-r--r-- | ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js index 1cbe5951d..678f64844 100644 --- a/ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js +++ b/ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js @@ -99,15 +99,18 @@ export default class ConfirmTransactionBase extends Component { submitError: null, } - componentDidUpdate () { + componentDidUpdate (prevProps) { const { transactionStatus, showTransactionConfirmedModal, history, clearConfirmTransaction, } = this.props + const { transactionStatus: prevTxStatus } = prevProps + const statusUpdated = transactionStatus !== prevTxStatus + const txDroppedOrConfirmed = transactionStatus === DROPPED_STATUS || transactionStatus === CONFIRMED_STATUS - if (transactionStatus === DROPPED_STATUS || transactionStatus === CONFIRMED_STATUS) { + if (statusUpdated && txDroppedOrConfirmed) { showTransactionConfirmedModal({ onSubmit: () => { clearConfirmTransaction() |