diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-06-25 09:02:28 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-06-25 09:02:28 +0800 |
| commit | ab55fefa1a4ebeaa9a42756a72d49b63f036b946 (patch) | |
| tree | f30f51dd7dbe413b8944b230d14660a4c1a2fd61 /ui/app/conf-tx.js | |
| parent | ef743499cb93dc8360be20db03c4ab0676aa57bb (diff) | |
| parent | 36a183db94e66999421980f50c2ab2e8d1ce2c3b (diff) | |
| download | tangerine-wallet-browser-ab55fefa1a4ebeaa9a42756a72d49b63f036b946.tar tangerine-wallet-browser-ab55fefa1a4ebeaa9a42756a72d49b63f036b946.tar.gz tangerine-wallet-browser-ab55fefa1a4ebeaa9a42756a72d49b63f036b946.tar.bz2 tangerine-wallet-browser-ab55fefa1a4ebeaa9a42756a72d49b63f036b946.tar.lz tangerine-wallet-browser-ab55fefa1a4ebeaa9a42756a72d49b63f036b946.tar.xz tangerine-wallet-browser-ab55fefa1a4ebeaa9a42756a72d49b63f036b946.tar.zst tangerine-wallet-browser-ab55fefa1a4ebeaa9a42756a72d49b63f036b946.zip | |
Merge branch 'master' into uiFixes
Diffstat (limited to 'ui/app/conf-tx.js')
| -rw-r--r-- | ui/app/conf-tx.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 5c80939b9..8455826b8 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -6,7 +6,7 @@ const connect = require('react-redux').connect const actions = require('./actions') const txHelper = require('../lib/tx-helper') -const ConfirmTx = require('./components/pending-tx') +const PendingTx = require('./components/pending-tx') const PendingMsg = require('./components/pending-msg') module.exports = connect(mapStateToProps)(ConfirmTxScreen) @@ -101,7 +101,7 @@ ConfirmTxScreen.prototype.render = function () { function currentTxView (opts) { if ('txParams' in opts.txData) { // This is a pending transaction - return h(ConfirmTx, opts) + return h(PendingTx, opts) } else if ('msgParams' in opts.txData) { // This is a pending message to sign return h(PendingMsg, opts) |