m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #811 from MetaMask/deadly-fix

Browse Source 
Fix error display in confirmation screen
This commit is contained in:
kumavis 2016-11-14 22:39:17 -05:00 committed by GitHub
commit 68d5b459ed
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## Current Master ## Current Master
- Show a warning when a transaction fails during simulation. - Show a warning when a transaction fails during simulation.
- Fix bug where 20% of gas estimate was not being added properly. - Fix bug where 20% of gas estimate was not being added properly.
- Render error messages in our confirmation screen more gracefully.
## 2.13.7 2016-11-8 ## 2.13.7 2016-11-8

6
app/scripts/lib/idStore.js
View File

@ -248,7 +248,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
function analyzeForDelegateCall(cb){ function analyzeForDelegateCall(cb){
if (txParams.to) { if (txParams.to) {
query.getCode(txParams.to, (err, result) => { query.getCode(txParams.to, (err, result) => {
if (err) return cb(err) if (err) return cb(err.message || err)
var containsDelegateCall = self.checkForDelegateCall(result) var containsDelegateCall = self.checkForDelegateCall(result)
txData.containsDelegateCall = containsDelegateCall txData.containsDelegateCall = containsDelegateCall
cb() cb()
@ -264,7 +264,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
var gasLimit = '0x3b9aca00' var gasLimit = '0x3b9aca00'
estimationParams.gas = gasLimit estimationParams.gas = gasLimit
query.estimateGas(estimationParams, function(err, result){ query.estimateGas(estimationParams, function(err, result){
if (err) return cb(err) if (err) return cb(err.message || err)
if (result === estimationParams.gas) { if (result === estimationParams.gas) {
txData.simulationFails = true txData.simulationFails = true
query.getBlockByNumber('latest', true, function(err, block){ query.getBlockByNumber('latest', true, function(err, block){
@ -282,7 +282,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
} }
function didComplete (err) { function didComplete (err) {
if (err) return cb(err) if (err) return cb(err.message || err)
configManager.addTx(txData) configManager.addTx(txData)
// signal update // signal update
self._didUpdate() self._didUpdate()

1
app/scripts/metamask-controller.js
View File

@ -212,7 +212,6 @@ module.exports = class MetamaskController {
newUnsignedTransaction (txParams, onTxDoneCb) { newUnsignedTransaction (txParams, onTxDoneCb) {
const idStore = this.idStore const idStore = this.idStore
let err = this.enforceTxValidations(txParams) let err = this.enforceTxValidations(txParams)
if (err) return onTxDoneCb(err) if (err) return onTxDoneCb(err)
idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => {