aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2017-12-05 11:27:42 +0800
committerAlexander Tseung <alextsg@gmail.com>2017-12-15 06:11:23 +0800
commit5d1187c37bfee988d7384f189f228882ce847005 (patch)
tree72df1ce878a53439a496338b261e25238831af57 /ui/app/conf-tx.js
parent706a6b0ad6d7b6e2d56252f17713e63430d84abc (diff)
downloadtangerine-wallet-browser-5d1187c37bfee988d7384f189f228882ce847005.tar
tangerine-wallet-browser-5d1187c37bfee988d7384f189f228882ce847005.tar.gz
tangerine-wallet-browser-5d1187c37bfee988d7384f189f228882ce847005.tar.bz2
tangerine-wallet-browser-5d1187c37bfee988d7384f189f228882ce847005.tar.lz
tangerine-wallet-browser-5d1187c37bfee988d7384f189f228882ce847005.tar.xz
tangerine-wallet-browser-5d1187c37bfee988d7384f189f228882ce847005.tar.zst
tangerine-wallet-browser-5d1187c37bfee988d7384f189f228882ce847005.zip
Add route for signature request
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js27
1 files changed, 10 insertions, 17 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index ce0012d5b..05bbd2696 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -8,7 +8,6 @@ const actions = require('./actions')
const txHelper = require('../lib/tx-helper')
const PendingTx = require('./components/pending-tx')
-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')
@@ -21,6 +20,12 @@ module.exports = compose(
)(ConfirmTxScreen)
function mapStateToProps (state) {
+ const { metamask } = state
+ const {
+ unapprovedMsgCount,
+ unapprovedPersonalMsgCount,
+ } = metamask
+
return {
identities: state.metamask.identities,
accounts: state.metamask.accounts,
@@ -37,6 +42,8 @@ function mapStateToProps (state) {
currentCurrency: state.metamask.currentCurrency,
blockGasLimit: state.metamask.currentBlockGasLimit,
computedBalances: state.metamask.computedBalances,
+ unapprovedMsgCount,
+ unapprovedPersonalMsgCount,
}
}
@@ -125,27 +132,13 @@ ConfirmTxScreen.prototype.render = function () {
function currentTxView (opts) {
log.info('rendering current tx view')
const { txData } = opts
- const { txParams, msgParams } = txData
+ const { txParams } = 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') {
- // 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)
}