First attempt at fixing errors in confirmation screen.

feature/default_network_editable
Kevin Serrano 8 years ago
parent 115fdc36fe
commit 26a548a7a3
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
  1. 6
      app/scripts/lib/idStore.js
  2. 1
      app/scripts/metamask-controller.js

@ -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()

@ -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) => {

Loading…
Cancel
Save