Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into TxManager

1 files changed, 3 insertions, 3 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c0d2f3b4c..50456b9fa 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -186,8 +186,8 @@ module.exports = class MetamaskController {
       // tx signing
       approveTransaction: this.newUnsignedTransaction.bind(this),
       signTransaction: (...args) => {
-        this.setupSigningListners(...args)
-        this.txManager.formatTxForSigining(...args)
+        this.setupSigningListeners(...args)
+        this.txManager.formatTxForSigning(...args)
         this.sendUpdate()
       },
 
@@ -266,7 +266,7 @@ module.exports = class MetamaskController {
     })
   }
 
-  setupSigningListners (txParams) {
+  setupSigningListeners (txParams) {
     var txId = txParams.metamaskId
     // apply event listeners for signing and formating events
     this.txManager.once(`${txId}:formatted`, this.keyringController.signTransaction.bind(this.keyringController))