From e6da8e2762cd54975c334314357f1cd27cc980c8 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Wed, 4 Jan 2017 13:04:33 -0800
Subject: Fix signing of transactions

---
 app/scripts/keyring-controller.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'app/scripts/keyring-controller.js')

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 016740d88..acec8feb1 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -310,20 +310,22 @@ module.exports = class KeyringController extends EventEmitter {
   //
   // This method signs tx and returns a promise for
   // TX Manager to update the state after signing
-  signTransaction (ethTx, selectedAddress, txId, cb) {
-    try {
-      const address = normalize(selectedAddress)
-      return this.getKeyringForAccount(address)
-      .then((keyring) => {
-        return keyring.signTransaction(address, ethTx)
-      }).then((tx) => {
-        this.emit(`${txId}:signed`, {tx, txId, cb})
-      })
-    } catch (e) {
-      cb(e)
-    }
-  }
 
+  signTransaction (ethTx, selectedAddress, txId) {
+    return new Promise((resolve, reject) => {
+      try {
+        const address = normalize(selectedAddress)
+        return this.getKeyringForAccount(address)
+        .then((keyring) => {
+          return keyring.signTransaction(address, ethTx)
+        }).then((tx) => {
+          resolve({tx, txId})
+        })
+      } catch (e) {
+        reject(e)
+      }
+    })
+  }
   // Add Unconfirmed Message
   // @object msgParams
   // @function cb
-- 
cgit