diff options
author | Dan <danjm.com@gmail.com> | 2017-10-26 00:01:58 +0800 |
---|---|---|
committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-26 03:40:16 +0800 |
commit | 78836b0ead0e1b2307a48868c109a5412effc78b (patch) | |
tree | 164bcf1be8b4eea64ea145543d5508458f40c8f4 /ui/app/conf-tx.js | |
parent | 0d39a3a8d445e3c18eea3509dc5049be4a6d2375 (diff) | |
download | tangerine-wallet-browser-78836b0ead0e1b2307a48868c109a5412effc78b.tar.gz tangerine-wallet-browser-78836b0ead0e1b2307a48868c109a5412effc78b.tar.zst tangerine-wallet-browser-78836b0ead0e1b2307a48868c109a5412effc78b.zip |
Signature Request
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index dfa6f88c4..fb5d2c0cf 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -6,9 +6,10 @@ const actions = require('./actions') const txHelper = require('../lib/tx-helper') const PendingTx = require('./components/pending-tx') -const PendingMsg = require('./components/pending-msg') -const PendingPersonalMsg = require('./components/pending-personal-msg') -const PendingTypedMsg = require('./components/pending-typed-msg') +const SignatureRequest = require('./components/signature-request') +// const PendingMsg = require('./components/pending-msg') +// const PendingPersonalMsg = require('./components/pending-personal-msg') +// const PendingTypedMsg = require('./components/pending-typed-msg') const Loading = require('./components/loading') // const contentDivider = h('div', { @@ -102,8 +103,10 @@ ConfirmTxScreen.prototype.render = function () { cancelTransaction: this.cancelTransaction.bind(this, txData), signMessage: this.signMessage.bind(this, txData), signPersonalMessage: this.signPersonalMessage.bind(this, txData), + signTypedMessage: this.signTypedMessage.bind(this, txData), cancelMessage: this.cancelMessage.bind(this, txData), cancelPersonalMessage: this.cancelPersonalMessage.bind(this, txData), + cancelTypedMessage: this.cancelTypedMessage.bind(this, txData), }) } @@ -119,16 +122,18 @@ function currentTxView (opts) { } else if (msgParams) { log.debug('msgParams detected, rendering pending msg') - if (type === 'eth_sign') { - log.debug('rendering eth_sign message') - return h(PendingMsg, opts) - } else if (type === 'personal_sign') { - log.debug('rendering personal_sign message') - return h(PendingPersonalMsg, opts) - } else if (type === 'eth_signTypedData') { - log.debug('rendering eth_signTypedData message') - return h(PendingTypedMsg, opts) - } + return h(SignatureRequest, opts) + + // if (type === 'eth_sign') { + // log.debug('rendering eth_sign message') + // return h(PendingMsg, opts) + // } else if (type === 'personal_sign') { + // log.debug('rendering personal_sign message') + // return h(PendingPersonalMsg, opts) + // } else if (type === 'eth_signTypedData') { + // log.debug('rendering eth_signTypedData message') + // return h(PendingTypedMsg, opts) + // } } return h(Loading) } |