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

add test to join!

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-06-15 13:07:02 -03:00
commit f2012ee5bb
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
4 changed files with 121 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/controllers/create.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('createController',
function($scope, $rootScope, $timeout, $log, lodash, go, profileService, configService, gettext, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess) {
function($scope, $ionicScrollDelegate, $rootScope, $timeout, $log, lodash, go, profileService, configService, gettext, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess) {
var isChromeApp = platformInfo.isChromeApp;
var isCordova = platformInfo.isCordova;
@ -89,6 +89,7 @@ angular.module('copayApp.controllers').controller('createController',
this.create = function(form) {
if (form && form.$invalid) {
this.error = gettext('Please enter the required fields');
$ionicScrollDelegate.scrollTop();
return;
}
@ -116,6 +117,7 @@ angular.module('copayApp.controllers').controller('createController',
var pathData = derivationPathHelper.parse($scope.derivationPath);
if (!pathData) {
this.error = gettext('Invalid derivation path');
$ionicScrollDelegate.scrollTop();
return;
}
@ -129,6 +131,7 @@ angular.module('copayApp.controllers').controller('createController',
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
this.error = gettext('Please enter the wallet recovery phrase');
$ionicScrollDelegate.scrollTop();
return;
}
@ -136,6 +139,7 @@ angular.module('copayApp.controllers').controller('createController',
var account = $scope.account;
if (!account || account < 1) {
this.error = gettext('Invalid account number');
$ionicScrollDelegate.scrollTop();
return;
}
@ -151,6 +155,7 @@ angular.module('copayApp.controllers').controller('createController',
ongoingProcess.set('connecting' + self.seedSourceId, false);
if (err) {
self.error = err;
$ionicScrollDelegate.scrollTop();
$scope.$apply();
return;
}
@ -171,6 +176,7 @@ angular.module('copayApp.controllers').controller('createController',
if (err) {
$log.warn(err);
self.error = err;
$ionicScrollDelegate.scrollTop();
$timeout(function() {
$rootScope.$apply();
});
@ -204,5 +210,5 @@ angular.module('copayApp.controllers').controller('createController',
});
updateSeedSourceSelect(1);
self.setSeedSource('new');
self.setSeedSource();
});

6
src/js/controllers/join.js
View file

@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('joinController',
}
};
this.setSeedSource = function(src) {
this.setSeedSource = function() {
self.seedSourceId = $scope.seedSource.id;
$timeout(function() {
@ -86,6 +86,8 @@ angular.module('copayApp.controllers').controller('joinController',
opts.passphrase = form.createPassphrase.$modelValue;
}
opts.walletPrivKey = $scope._walletPrivKey; // Only for testing
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
@ -139,5 +141,5 @@ angular.module('copayApp.controllers').controller('joinController',
};
updateSeedSourceSelect();
self.setSeedSource('new');
self.setSeedSource();
});