From 74593fe778dbf6fd438c019ad2651b9ca5f70b11 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 9 Sep 2014 21:31:25 -0300
Subject: [PATCH] fix signed message

---
 js/models/core/Wallet.js       | 13 ++++++-------
 js/services/controllerUtils.js |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index c19d48dc3..4e9cc6f79 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -222,12 +222,12 @@ Wallet.prototype._processProposalEvents = function(senderId, m) {
     if (m.new) {
       ev = {
         type: 'new',
-        cid: senderId
+        cId: senderId
       }
-    } else if (m.newCopayer) {
+    } else if (m.newCopayer.length) {
       ev = {
         type: 'signed',
-        cid: m.newCopayer
+        cId: m.newCopayer[0]
       };
     }
   } else {
@@ -236,7 +236,6 @@ Wallet.prototype._processProposalEvents = function(senderId, m) {
       cId: senderId,
     };
   }
-
   if (ev)
     this.emit('txProposalEvent', ev);
 };
@@ -328,10 +327,10 @@ Wallet.prototype._onTxProposal = function(senderId, data) {
   try {
     m = this.txProposals.merge(data.txProposal, Wallet.builderOpts);
     var keyMap = this._getKeyMap(m.txp);
-    ret.newCopayer = m.txp.setCopayers(senderId, keyMap);
-
+    m.newCopayer = m.txp.setCopayers(senderId, keyMap);
   } catch (e) {
-    log.debug('Corrupt TX proposal received from:', senderId, e);
+    log.error('Corrupt TX proposal received from:', senderId, e);
+    return;
   }
 
   if (m) {
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index f17d267c7..a11e19238 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -108,6 +108,7 @@ angular.module('copayApp.services')
         }, 3000);
       });
       w.on('txProposalEvent', function(e) {
+        
         var user = w.publicKeyRing.nicknameForCopayer(e.cId);
         switch (e.type) {
           case 'signed':