aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-04-28 05:50:19 +0800
committerDan Finlay <dan@danfinlay.com>2017-04-28 05:50:19 +0800
commitd1a10691802fc7eef65f13126c684b6cdf13d461 (patch)
tree9143b42107d8aeb75fa58f8de45c5730bb8621dd /ui/app/conf-tx.js
parentb0919ba7296553200161913ab413f214aa58e741 (diff)
parenta90b010de891f7936bc17c09c5fd27c61fc0610d (diff)
downloadtangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar
tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar.gz
tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar.bz2
tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar.lz
tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar.xz
tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar.zst
tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.zip
Merge branch 'master' into rinkeby
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 770f79b19..83ac5a4fd 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -125,14 +125,12 @@ function currentTxView (opts) {
if (txParams) {
log.debug('txParams detected, rendering pending tx')
return h(PendingTx, 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)