Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits

ui/app/components/pending-tx-details.js

@@ -40,7 +40,6 @@ PTXP.render = function () {
   var maxCost = state.maxCost || txData.maxCost || ''
   var dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0
   var imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons
-  var advanced = state.advanced || false
 
   log.debug(`rendering gas: ${gas}, gasPrice: ${gasPrice}, txFee: ${txFee}, maxCost: ${maxCost}`)
 
@@ -109,17 +108,6 @@ PTXP.render = function () {
 
       h('.table-box', [
 
-        h('.row', [
-          h('.cell.label', 'Advanced Options'),
-          h('input', {
-            type: 'checkbox',
-            selected: advanced,
-            onChange: () => {
-              this.setState({advanced: !advanced})
-            },
-          }),
-        ]),
-
         // Ether Value
         // Currently not customizable, but easily modified
         // in the way that gas and gasLimit currently are.
@@ -129,7 +117,7 @@ PTXP.render = function () {
         ]),
 
         // Gas Limit (customizable)
-        advanced ? h('.cell.row', [
+        h('.cell.row', [
           h('.cell.label', 'Gas Limit'),
           h('.cell.value', {
           }, [
@@ -146,10 +134,10 @@ PTXP.render = function () {
               },
             }),
           ]),
-        ]) : null,
+        ]),
 
         // Gas Price (customizable)
-        advanced ? h('.cell.row', [
+        h('.cell.row', [
           h('.cell.label', 'Gas Price'),
           h('.cell.value', {
           }, [
@@ -166,9 +154,7 @@ PTXP.render = function () {
               },
             }),
           ]),
-        ]) : null,
+        ]),
-
-
 
         // Max Transaction Fee (calculated)
         h('.cell.row', [