diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-06-25 08:29:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-25 08:29:38 +0800 |
| commit | 36a183db94e66999421980f50c2ab2e8d1ce2c3b (patch) | |
| tree | 27fc7720c82f88a935c5ba2c28e539f8bf115cbe /ui/app/conf-tx.js | |
| parent | 52518a5efc2f37881c2e88c8cb0649ad5bc41dd4 (diff) | |
| parent | 770528d5380b9e30742130d986d196c192b2ac09 (diff) | |
| download | tangerine-wallet-browser-36a183db94e66999421980f50c2ab2e8d1ce2c3b.tar tangerine-wallet-browser-36a183db94e66999421980f50c2ab2e8d1ce2c3b.tar.gz tangerine-wallet-browser-36a183db94e66999421980f50c2ab2e8d1ce2c3b.tar.bz2 tangerine-wallet-browser-36a183db94e66999421980f50c2ab2e8d1ce2c3b.tar.lz tangerine-wallet-browser-36a183db94e66999421980f50c2ab2e8d1ce2c3b.tar.xz tangerine-wallet-browser-36a183db94e66999421980f50c2ab2e8d1ce2c3b.tar.zst tangerine-wallet-browser-36a183db94e66999421980f50c2ab2e8d1ce2c3b.zip | |
Merge pull request #326 from MetaMask/conf-tx-refactor
Tx/Msg Conf page + notifcation refactor
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) |