diff options
author | frankiebee <frankie.diamond@gmail.com> | 2017-11-08 01:29:47 +0800 |
---|---|---|
committer | frankiebee <frankie.diamond@gmail.com> | 2017-11-08 01:29:47 +0800 |
commit | 08867874ccea02dab9755ba6b0fc4221bb1dbf00 (patch) | |
tree | 5b2b893c4c00a14daa9724ba28ff7dc8f504ea10 /ui/app/conf-tx.js | |
parent | a89b682dec350218b2d753d6cfb196f965acdde2 (diff) | |
parent | acc973d543ac65f8db980c0007c248c509345411 (diff) | |
download | tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.gz tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.bz2 tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.lz tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.xz tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.zst tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.zip |
Merge remote-tracking branch 'origin/uat' into mascara-first-screen
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 97e0646e8..9f273aaec 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -114,14 +114,14 @@ ConfirmTxScreen.prototype.render = function () { function currentTxView (opts) { log.info('rendering current tx view') const { txData } = opts - const { txParams, msgParams, type } = txData + const { txParams, msgParams } = txData if (txParams) { log.debug('txParams detected, rendering pending tx') return h(PendingTx, opts) } else if (msgParams) { log.debug('msgParams detected, rendering pending msg') - + return h(SignatureRequest, opts) // if (type === 'eth_sign') { |