Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice

I1473 dapp default gas price

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Seed word confirmation wording is now scarier.
 - Fix error for invalid seed words.
 - Prevent users from submitting two duplicate transactions by disabling submit.
+- Allow Dapps to specify gas price as hex string.
 
 ## 3.7.8 2017-6-12
 

app/scripts/controllers/transactions.js

@@ -150,13 +150,15 @@ module.exports = class TransactionController extends EventEmitter {
     const txParams = txMeta.txParams
     // ensure value
     txParams.value = txParams.value || '0x0'
+    if (!txParams.gasPrice) {
       this.query.gasPrice((err, gasPrice) => {
         if (err) return cb(err)
         // set gasPrice
         txParams.gasPrice = gasPrice
+      })
+    }
     // set gasLimit
     this.txProviderUtils.analyzeGasUsage(txMeta, cb)
-    })
   }
 
   getUnapprovedTxList () {