aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-05-26 07:28:07 +0800
committerDan Finlay <dan@danfinlay.com>2016-05-26 07:28:07 +0800
commit294b16a275d35983eb9f0e720a84ef95e0fad186 (patch)
treefbe37acb0e7fbdadcbdb4ee3eff763b7e49cf110 /ui/app/app.js
parent4f9e66994d7287344fcab4c8e23d7eec971603b1 (diff)
downloadtangerine-wallet-browser-294b16a275d35983eb9f0e720a84ef95e0fad186.tar
tangerine-wallet-browser-294b16a275d35983eb9f0e720a84ef95e0fad186.tar.gz
tangerine-wallet-browser-294b16a275d35983eb9f0e720a84ef95e0fad186.tar.bz2
tangerine-wallet-browser-294b16a275d35983eb9f0e720a84ef95e0fad186.tar.lz
tangerine-wallet-browser-294b16a275d35983eb9f0e720a84ef95e0fad186.tar.xz
tangerine-wallet-browser-294b16a275d35983eb9f0e720a84ef95e0fad186.tar.zst
tangerine-wallet-browser-294b16a275d35983eb9f0e720a84ef95e0fad186.zip
Fix back button on pending tx screen
Fixes #208
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js14
1 files changed, 1 insertions, 13 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 73791ec13..7e7ca24ad 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -239,11 +239,7 @@ App.prototype.renderPrimary = function(){
return h(CreateVaultScreen, {key: 'createVault'})
default:
- if (this.hasPendingTxs()) {
- return h(ConfirmTxScreen, {key: 'confirm-tx'})
- } else {
- return h(AccountDetailScreen, {key: 'account-detail'})
- }
+ return h(AccountDetailScreen, {key: 'account-detail'})
}
}
@@ -259,14 +255,6 @@ App.prototype.toggleMetamaskActive = function(){
}
}
-App.prototype.hasPendingTxs = function() {
- var state = this.props
- var unconfTxs = state.unconfTxs
- var unconfMsgs = state.unconfMsgs
- var unconfTxList = txHelper(unconfTxs, unconfMsgs)
- return unconfTxList.length > 0
-}
-
function onOffToggle(state){
var buttonSize = '50px';
var lockWidth = '20px';