From dae6f96709a5f7b3dd3bf36b4cec0c71aae1ad62 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 24 Apr 2015 03:26:57 -0300 Subject: [PATCH] fix error at copayers --- public/views/copayers.html | 4 +--- src/js/controllers/index.js | 8 +++++--- src/js/models/profile.js | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/public/views/copayers.html b/public/views/copayers.html index a59570fe1..71b421fcf 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -1,6 +1,4 @@ -
- +
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 2ef504013..dd6c4b50d 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -214,6 +214,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updateTxHistory = function(skip) { var fc = profileService.focusedClient; + if (!fc.isComplete()) return; + if (!skip) { self.txHistory = []; } @@ -470,7 +472,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (err) { if (self.walletId == walletId) self.setOngoingProcess('scanning', false); - self.clientError = ('Could not scan wallet:' + err); + self.clientError('Could not scan wallet:' + err); $rootScope.$apply(); } }); @@ -558,7 +560,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); $rootScope.$on('Local/BWSNotFound', function(event) { - self.clientError('Could not access to Bitcore Wallet Service: Service not found'); + self.clientError('Could not access Wallet Service: Not found'); $rootScope.$apply(); }); @@ -571,7 +573,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r } else if (err.code === 'ETIMEDOUT') { $log.debug('Time out:', err); } else { - self.clientError(err && err.message ? 'Error at Bitcore Wallet Service:' + err.message : err); + self.clientError(err && err.message ? 'Error at Wallet Service:' + err.message : err); } $rootScope.$apply(); }); diff --git a/src/js/models/profile.js b/src/js/models/profile.js index e6bfd6087..c18967ded 100644 --- a/src/js/models/profile.js +++ b/src/js/models/profile.js @@ -34,7 +34,6 @@ Profile.fromString = function(str) { }; Profile.prototype.toObj = function() { -console.log('[profile.js.37:this:]',this); //TODO return JSON.stringify(this); };