anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix error at copayers

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-24 03:26:57 -03:00
commit dae6f96709
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/copayers.html
View file

@ -1,6 +1,4 @@
<div class="content p20v" ng-controller="copayersController as copayers" ng-init="copayers.init()" <div class="content p20v" ng-controller="copayersController as copayers" ng-init="copayers.init()">
ng-if="!index.clientError">
<div ng-show="!index.notAuthorized"> <div ng-show="!index.notAuthorized">
<div class="row m10t text-center"> <div class="row m10t text-center">
<div class="large-12 columns"> <div class="large-12 columns">

8
src/js/controllers/index.js
View file

@ -214,6 +214,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateTxHistory = function(skip) { self.updateTxHistory = function(skip) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
if (!fc.isComplete()) return;
if (!skip) { if (!skip) {
self.txHistory = []; self.txHistory = [];
} }
@ -470,7 +472,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (err) { if (err) {
if (self.walletId == walletId) if (self.walletId == walletId)
self.setOngoingProcess('scanning', false); self.setOngoingProcess('scanning', false);
self.clientError = ('Could not scan wallet:' + err); self.clientError('Could not scan wallet:' + err);
$rootScope.$apply(); $rootScope.$apply();
} }
}); });
@ -558,7 +560,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}); });
$rootScope.$on('Local/BWSNotFound', function(event) { $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(); $rootScope.$apply();
}); });
@ -571,7 +573,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
} else if (err.code === 'ETIMEDOUT') { } else if (err.code === 'ETIMEDOUT') {
$log.debug('Time out:', err); $log.debug('Time out:', err);
} else { } 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(); $rootScope.$apply();
}); });

1
src/js/models/profile.js
View file

@ -34,7 +34,6 @@ Profile.fromString = function(str) {
}; };
Profile.prototype.toObj = function() { Profile.prototype.toObj = function() {
console.log('[profile.js.37:this:]',this); //TODO
return JSON.stringify(this); return JSON.stringify(this);
}; };