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

add wallets nicknames, handle error messages

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-24 16:35:52 -03:00
commit 5d30a6abea
8 changed files with 98 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/controllers/setup.js
View file

@ -26,11 +26,12 @@ angular.module('copay.setup').controller('SetupController',
updateRCSelect(tc);
});
$scope.create = function(totalCopayers, requiredCopayers) {
$scope.create = function(totalCopayers, requiredCopayers, walletName) {
$scope.loading = true;
var opts = {
requiredCopayers: requiredCopayers,
totalCopayers: totalCopayers
totalCopayers: totalCopayers,
name: walletName,
};
var w = walletFactory.create(opts);
controllerUtils.setupUxHandlers(w);

9
js/controllers/signin.js
View file

@ -3,8 +3,8 @@
angular.module('copay.signin').controller('SigninController',
function($scope, $rootScope, $location, walletFactory, controllerUtils) {
$scope.loading = false;
$scope.walletIds = walletFactory.getWalletIds();
$scope.selectedWalletId = $scope.walletIds.length ? $scope.walletIds[0]:null;
$scope.wallets = walletFactory.getWallets();
$scope.selectedWalletId = $scope.wallets.length ? $scope.wallets[0].id : null;
$scope.create = function() {
$location.path('setup');
@ -12,14 +12,13 @@ angular.module('copay.signin').controller('SigninController',
$scope.open = function(walletId, opts) {
$scope.loading = true;
console.log('[signin.js.23:walletId:]',walletId); //TODO
var w = walletFactory.open(walletId, opts);
controllerUtils.setupUxHandlers(w);
};
$scope.join = function(secret) {
if (!secret || !secret.length) {
if (!secret || secret.length !==66 || !secret.match(/^[0-9a-f]*$/) ) {
$rootScope.flashMessage = { message: 'Bad secret secret string', type: 'error'};
return;
}
$scope.loading = true;