aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-04-03 05:13:45 +0800
committerkumavis <aaron@kumavis.me>2018-04-03 05:13:45 +0800
commit98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb (patch)
tree23176562ed22c97daa13f4f8f1081b581f2ba2b1 /app/scripts/controllers/transactions.js
parent8db097d8d9307bc7a0bbb0cd802ad30ad0fc2740 (diff)
parentfd30fabfbd7707adf2e4bc3606362c1687aeed9a (diff)
downloadtangerine-wallet-browser-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.tar
tangerine-wallet-browser-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.tar.gz
tangerine-wallet-browser-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.tar.bz2
tangerine-wallet-browser-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.tar.lz
tangerine-wallet-browser-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.tar.xz
tangerine-wallet-browser-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.tar.zst
tangerine-wallet-browser-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r--app/scripts/controllers/transactions.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 7e2cc15da..a18a2d2e2 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -161,9 +161,11 @@ module.exports = class TransactionController extends EventEmitter {
this.emit(`${txMeta.id}:unapproved`, txMeta)
}
- async newUnapprovedTransaction (txParams) {
+ async newUnapprovedTransaction (txParams, opts = {}) {
log.debug(`MetaMaskController newUnapprovedTransaction ${JSON.stringify(txParams)}`)
const initialTxMeta = await this.addUnapprovedTransaction(txParams)
+ initialTxMeta.origin = opts.origin
+ this.txStateManager.updateTx(initialTxMeta, '#newUnapprovedTransaction - adding the origin')
// listen for tx completion (success, fail)
return new Promise((resolve, reject) => {
this.txStateManager.once(`${initialTxMeta.id}:finished`, (finishedTxMeta) => {