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

Revert "Revert "WIP: Bug/notif2""

Browse source 
This reverts commit cd867d0171.

Conflicts:
	src/css/main.css
This commit is contained in:
Matias Alejo Garcia 2015-04-23 23:51:21 -03:00
commit 1c2432316a
7 changed files with 60 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/css/main.css
View file

@ -1108,12 +1108,12 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.onGoingProcess {
background: #213140;
text-align: center;
max-width: 14.5rem;
max-width: 16.5rem;
max-height: 3.5rem;
top:auto;
left:0;
right:0;
bottom:90px;
bottom:170px;
margin: auto;
border-radius: 3px;
color: #fff;

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

@ -72,7 +72,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.alternativeBalanceAvailable = false;
self.totalBalanceAlternative = null;
self.notAuthorized = false;
self.clientError = null;
self.txHistory = [];
self.txHistoryPaging = false;
@ -411,17 +410,27 @@ angular.module('copayApp.controllers').controller('indexController', function($r
};
self.clientError = function (err) {
if (isCordova) {
navigator.notification.confirm(
err,
function() {},
'Wallet Server Error', ['OK']
);
} else {
alert(err);
}
};
self.recreate = function(cb) {
var fc = profileService.focusedClient;
self.setOngoingProcess('recreating', true);
self.clientError = null;
fc.recreateWallet(function(err) {
self.notAuthorized = false;
self.setOngoingProcess('recreating', false);
if (err) {
self.clientError = 'Could not recreate wallet:' + err;
self.clientError('Could not recreate wallet:' + err);
$rootScope.$apply();
return;
}
@ -458,7 +467,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();
}
});
@ -522,7 +531,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$on(eventName, function(event) {
$log.debug('### Online event');
self.isOffline = false;
self.clientError = null;
self.updateAll();
self.updateTxHistory();
});
@ -547,7 +555,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 to Bitcore Wallet Service: Service not found');
$rootScope.$apply();
});
@ -560,7 +568,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
} else if (err.code === 'ETIMEDOUT') {
$log.debug('Time out:', err);
} else {
self.clientError = err;
self.clientError(err && err.message ? 'Error at Bitcore Wallet Service:' + err.message : err);
}
$rootScope.$apply();
});
@ -630,7 +638,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$timeout(function() {
self.hasProfile = true;
self.noFocusedWallet = true;
self.clientError = null;
self.isComplete = null;
self.walletName = null;
go.addWallet();