diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2019-07-02 01:58:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-02 01:58:25 +0800 |
| commit | 448720327b45470af4ee62ae0ad5649df5a6d8b4 (patch) | |
| tree | 0a38c27b78eedb821a5ecaf6d79c57f953231d47 /ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js | |
| parent | d16d6f483c28c07aedcaa0bc69228109fa5fbade (diff) | |
| parent | 743afd4e9d0c229001519e1370945d640946fd2c (diff) | |
| download | tangerine-wallet-browser-448720327b45470af4ee62ae0ad5649df5a6d8b4.tar tangerine-wallet-browser-448720327b45470af4ee62ae0ad5649df5a6d8b4.tar.gz tangerine-wallet-browser-448720327b45470af4ee62ae0ad5649df5a6d8b4.tar.bz2 tangerine-wallet-browser-448720327b45470af4ee62ae0ad5649df5a6d8b4.tar.lz tangerine-wallet-browser-448720327b45470af4ee62ae0ad5649df5a6d8b4.tar.xz tangerine-wallet-browser-448720327b45470af4ee62ae0ad5649df5a6d8b4.tar.zst tangerine-wallet-browser-448720327b45470af4ee62ae0ad5649df5a6d8b4.zip | |
Merge pull request #6765 from MetaMask/master
Using admin privilege to bypass code owner review because it has already [been reviewed](https://github.com/MetaMask/metamask-extension/pull/6763) and those code owners are out today.
Diffstat (limited to 'ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js')
| -rw-r--r-- | ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js index 6b73b58f0..e769d8974 100644 --- a/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js +++ b/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js @@ -91,6 +91,10 @@ const mapStateToProps = (state, ownProps) => { const transaction = R.find(({ id }) => id === (transactionId || Number(paramsTransactionId)))(selectedAddressTxList) const transactionStatus = transaction ? transaction.status : '' + if (transaction && transaction.simulationFails) { + txData.simulationFails = transaction.simulationFails + } + const currentNetworkUnapprovedTxs = R.filter( ({ metamaskNetworkId }) => metamaskNetworkId === network, unapprovedTxs, |