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

Merge branch 'master' into feature/01-alert-txs

Browse source
This commit is contained in:
Gustavo Cortez 2014-05-20 14:45:32 -03:00
commit 3f8612ee0c
7 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
js/controllers/addresses.js
View file

@ -1,23 +1,24 @@
'use strict';
angular.module('copay.addresses').controller('AddressesController',
function($scope, $rootScope, controllerUtils) {
function($scope, $rootScope, $timeout, controllerUtils) {
$scope.loading = false;
var w = $rootScope.wallet;
$scope.newAddr = function() {
$scope.loading=true;
$scope.loading = true;
w.generateAddress(null, function() {
setTimeout(function() {
$timeout(function() {
controllerUtils.setSocketHandlers();
controllerUtils.updateAddressList();
$scope.loading=false;
$rootScope.selectedAddr = $rootScope.addrInfos[0].address.toString();
$scope.loading = false;
$rootScope.$digest();
},1);
});
};
$scope.selectAddr = function(addr) {
$scope.selectedAddr = addr;
$scope.selectAddr = function (addr) {
return addr === $rootScope.selectedAddr ? 'selected' : '';
};
});

2
js/controllers/signin.js
View file

@ -67,6 +67,8 @@ angular.module('copay.signin').controller('SigninController',
if (err || !w) {
if (err === 'joinError')
$rootScope.flashMessage = { message: 'Can not find peer'};
else if (err === 'walletFull')
$rootScope.flashMessage = { message: 'The wallet is full'};
else if (err === 'badSecret')
$rootScope.flashMessage = { message: 'Bad secret secret string', type: 'error'};
else