Merge pull request #220 from MetaMask/FixTransactionBackButton

SignTransaction return button broken

1 files changed, 1 insertions, 50 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 511012fab..7e7ca24ad 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -86,43 +86,6 @@ App.prototype.render = function() {
           this.renderPrimary(),
         ]),
       ]),
-
-      // footer
-      // h('.app-footer.flex-row.flex-space-around', {
-      //   style: {
-      //     display: shouldHaveFooter ? 'flex' : 'none',
-      //     alignItems: 'center',
-      //     height: '56px',
-      //   }
-      // }, [
-
-        // // settings icon
-        // h('i.fa.fa-cog.fa-lg' + (view  === 'config' ? '.active' : '.cursor-pointer'), {
-        //   style: {
-        //     opacity: state.isUnlocked ? '1.0' : '0.0',
-        //     transition: 'opacity 200ms ease-in',
-        //     //transform: `translateX(${state.isUnlocked ? '0px' : '-100px'})`,
-        //   },
-        //   onClick: function(ev) {
-        //     state.dispatch(actions.showConfigPage())
-        //   },
-        // }),
-
-        // // toggle
-        // onOffToggle({
-        //   toggleMetamaskActive: this.toggleMetamaskActive.bind(this),
-        //   isUnlocked: state.isUnlocked,
-        // }),
-
-        // // help
-        // h('i.fa.fa-question.fa-lg.cursor-pointer', {
-        //   style: {
-        //     opacity: state.isUnlocked ? '1.0' : '0.0',
-        //   },
-        //   onClick() { state.dispatch(actions.showInfoPage()) }
-        // }),
-      // ]),
-
     ])
   )
 }
@@ -276,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'})
    }
 }
 
@@ -296,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';