From ff4e9a0d1122db83221bc956f11c9520bf0e008c Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 10 Oct 2017 10:50:45 -0700
Subject: metamask controller - define this.newTransaction to ease
 instantiation order

---
 app/scripts/metamask-controller.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/scripts')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index df5784571..1292d2a1e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -90,7 +90,7 @@ module.exports = class MetamaskController extends EventEmitter {
       // account mgmt
       getAccounts: nodeify(this.getAccounts, this),
       // tx signing
-      processTransaction: nodeify(this.txController.newUnapprovedTransaction, this.txController),
+      processTransaction: nodeify(this.newTransaction, this),
       // old style msg signing
       processMessage: this.newUnsignedMessage.bind(this),
       // personal_sign msg signing
@@ -525,6 +525,11 @@ module.exports = class MetamaskController extends EventEmitter {
   // Identity Management
   //
 
+  // this function wrappper lets us pass the fn reference before txController is instantiated
+  async newTransaction (txParams) {
+    return await this.txController.newUnapprovedTransaction(txParams)
+  }
+
   newUnsignedMessage (msgParams, cb) {
     const msgId = this.messageManager.addUnapprovedMessage(msgParams)
     this.sendUpdate()
-- 
cgit