4 files changed, 22 insertions, 14 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 6e5aa57cd..53dbc3354 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -341,7 +341,7 @@ App.prototype.renderDropdown = function () {
     }),
 
     h(DropMenuItem, {
-      label: 'Info',
+      label: 'Info/Help',
       closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
       action: () => this.props.dispatch(actions.showInfoPage()),
       icon: h('i.fa.fa-question.fa-lg'),
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index e3b307b0b..4b1a00eca 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -32,7 +32,7 @@ function PendingTx () {
 
 PendingTx.prototype.render = function () {
   const props = this.props
-  const { currentCurrency } = props
+  const { currentCurrency, blockGasLimit } = props
 
   const conversionRate = props.conversionRate
   const txMeta = this.gatherTxMeta()
@@ -50,7 +50,8 @@ PendingTx.prototype.render = function () {
   // Gas
   const gas = txParams.gas
   const gasBn = hexToBn(gas)
-  const safeGasLimit = parseInt(txMeta.blockGasLimit)
+  const gasLimit = new BN(parseInt(blockGasLimit))
+  const safeGasLimit = this.bnMultiplyByFraction(gasLimit, 19, 20).toString(10)
 
   // Gas Price
   const gasPrice = txParams.gasPrice || MIN_GAS_PRICE_BN.toString(16)
@@ -458,6 +459,12 @@ PendingTx.prototype._notZeroOrEmptyString = function (obj) {
   return obj !== '' && obj !== '0x0'
 }
 
+PendingTx.prototype.bnMultiplyByFraction = function (targetBN, numerator, denominator) {
+  const numBN = new BN(numerator)
+  const denomBN = new BN(denominator)
+  return targetBN.mul(numBN).div(denomBN)
+}
+
 function forwardCarrat () {
   return (
     h('img', {
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 4ae81f35f..747d3ce2b 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -29,6 +29,7 @@ function mapStateToProps (state) {
     provider: state.metamask.provider,
     conversionRate: state.metamask.conversionRate,
     currentCurrency: state.metamask.currentCurrency,
+    blockGasLimit: state.metamask.currentBlockGasLimit,
   }
 }
 
@@ -40,7 +41,7 @@ function ConfirmTxScreen () {
 ConfirmTxScreen.prototype.render = function () {
   const props = this.props
   const { network, provider, unapprovedTxs, currentCurrency,
-    unapprovedMsgs, unapprovedPersonalMsgs, conversionRate } = props
+    unapprovedMsgs, unapprovedPersonalMsgs, conversionRate, blockGasLimit } = props
 
   var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, network)
 
@@ -107,6 +108,7 @@ ConfirmTxScreen.prototype.render = function () {
           identities: props.identities,
           conversionRate,
           currentCurrency,
+          blockGasLimit,
           // Actions
           buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress),
           sendTransaction: this.sendTransaction.bind(this),
diff --git a/ui/app/info.js b/ui/app/info.js
index a6fdeb315..aa4503b62 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -52,7 +52,7 @@ InfoScreen.prototype.render = function () {
 
           h('div', {
             style: {
-              marginBottom: '10px',
+              marginBottom: '5px',
             }},
             [
               h('div', [
@@ -87,7 +87,7 @@ InfoScreen.prototype.render = function () {
 
           h('hr', {
             style: {
-              margin: '20px 0 ',
+              margin: '10px 0 ',
               width: '7em',
             },
           }),
@@ -97,6 +97,13 @@ InfoScreen.prototype.render = function () {
               paddingLeft: '30px',
             }},
             [
+              h('div.fa.fa-github', [
+                h('a.info', {
+                  href: 'https://github.com/MetaMask/faq',
+                  target: '_blank',
+                  onClick (event) { this.navigateTo(event.target.href) },
+                }, 'Need Help? Read our FAQ!'),
+              ]),
               h('div', [
                 h('a', {
                   href: 'https://metamask.io/',
@@ -138,14 +145,6 @@ InfoScreen.prototype.render = function () {
                   onClick () { this.navigateTo('mailto:help@metamask.io?subject=Feedback') },
                 }, 'Email us!'),
               ]),
-
-              h('div.fa.fa-github', [
-                h('a.info', {
-                  href: 'https://github.com/MetaMask/metamask-plugin/issues',
-                  target: '_blank',
-                  onClick (event) { this.navigateTo(event.target.href) },
-                }, 'Start a thread on GitHub'),
-              ]),
             ]),
         ]),
       ]),