m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-23 18:41:38 +01:00
Code

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

Browse Source
This commit is contained in:
Kevin Serrano 2017-02-28 15:23:03 -08:00
commit 9bffe2d11a
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,6 +463,7 @@ module.exports = class MetamaskController extends EventEmitter {
}
updateAndApproveTx(txMeta, cb) {
log.debug(`MetaMaskController - updateAndApproveTx: ${JSON.stringify(txMeta)}`)
const txManager = this.txManager
txManager.updateTx(txMeta)
txManager.approveTransaction(txMeta.id, cb)

4
ui/app/actions.js
View File

@ -399,7 +399,7 @@ function signTx (txData) {
}
function sendTx (txData) {
log.info('actions: sendTx')
log.info(`actions - sendTx: ${JSON.stringify(txData.txParams)}`)
return (dispatch) => {
log.debug(`actions calling background.approveTransaction`)
background.approveTransaction(txData.id, (err) => {
@ -413,7 +413,7 @@ function sendTx (txData) {
}
function updateAndApproveTx (txData) {
log.info('actions: updateAndApproveTx')
log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData))
return (dispatch) => {
log.debug(`actions calling background.updateAndApproveTx`)
background.updateAndApproveTransaction(txData, (err) => {

2
ui/app/conf-tx.js
View File

@ -175,7 +175,7 @@ ConfirmTxScreen.prototype.sendTransaction = function (txData, event) {
event.stopPropagation()
const state = this.state || {}
const txMeta = state.txData
this.props.dispatch(actions.sendTx(txMeta || txData))
this.props.dispatch(actions.updateAndApproveTx(txMeta || txData))
}
ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) {