From 460ddfa3bc69f806ac6362eb9e5914c3782c12a2 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 24 Apr 2015 03:37:18 -0300
Subject: [PATCH 1/2] fix error handler for join

---
 public/views/join.html            | 7 +++++++
 src/js/controllers/join.js        | 5 +++--
 src/js/services/profileService.js | 4 +---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/public/views/join.html b/public/views/join.html
index 359e2998b..68c778d4a 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -12,6 +12,13 @@
 
   <div class="row" ng-show="!join.loading">
     <div class="large-12 columns">
+
+      <div class="box-notification" ng-show="join.error ">
+        <span class="text-warning size-14">
+          {{join.error|translate}}
+        </span>
+      </div>
+  
       <form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
           <label><span translate>Your nickname</span>
             <div class="input">
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 3947cfddc..870d1af43 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -134,7 +134,7 @@ angular.module('copayApp.controllers').controller('joinController',
 
     this.join = function(form) {
       if (form && form.$invalid) {
-        notification.error('Error', 'Please enter the required fields');
+        self.error = 'Please enter the required fields';
         return;
       }
       self.loading = true;
@@ -147,7 +147,8 @@ angular.module('copayApp.controllers').controller('joinController',
         }, function(err) {
           self.loading = false;
           if (err) {
-            notification.error(err);
+            self.error = 'Could not join wallet: ' +  (err.message ? err.message : err);
+            $rootScope.$apply();
           }
           else {
             go.walletHome();
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index d3504db00..769274428 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -151,7 +151,6 @@ angular.module('copayApp.services')
       })
     };
 
-    // TODO copayer name
     root.createWallet = function(opts, cb) {
       var walletClient = bwcService.getClient();
       $log.debug('Creating Wallet:', opts);
@@ -191,8 +190,7 @@ angular.module('copayApp.services')
       }
       // TODO name
       walletClient.joinWallet(opts.secret, opts.myName || 'me', function(err) {
-        // TODO: err
-        if (err) return cb('Error joining wallet' + err);
+        if (err) return cb(err);
 
         root.profile.credentials.push(JSON.parse(walletClient.export()));
         root.setWalletClients();

From 06343f6fca8c47660c9505f8e848013793017a8b Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 24 Apr 2015 03:43:57 -0300
Subject: [PATCH 2/2] rm error box from receive

---
 public/views/walletHome.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index bde94b2bd..601427c70 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -179,11 +179,6 @@ index.onGoingProcessName == 'openingWallet'
     </div>
   </div>
   <div ng-show="!index.needsBackup || home.skipBackup">
-    <div class="box-notification" ng-show="home.error ">
-      <span class="text-warning size-14">
-        {{home.error|translate}}
-      </span>
-    </div>
     <div class="row" ng-if="home.addr">
       <!-- Address-->
       <div class="large-12 columns">