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

can join shared wallet now using main scanner

Browse source
This commit is contained in:
Kadir Sekha 2018-02-05 17:12:21 -04:00
commit 1788dec4fc
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,10 @@ angular.module('copayApp.controllers').controller('joinController',
var defaults = configService.getDefaults();
$scope.coinChanged = function() {
$scope.formData.bwsurl = $scope.formData.coin == 'btc' ? defaults.bws.url : defaults.bwscash.url;
}
$scope.$on("$ionicView.beforeEnter", function(event, data) {
var config = configService.getSync();
$scope.formData = {};
@ -18,12 +22,17 @@ angular.module('copayApp.controllers').controller('joinController',
if (config.cashSupport) $scope.enableCash = true;
resetPasswordFields();
updateSeedSourceSelect();
if (data.stateParams.url) {
var s = data.stateParams.url.replace('copay:', '');
$scope.formData.secret = s;
var coin = s.substring(s.length-3);
if ($scope.formData.coin != coin) {
$scope.formData.coin = coin;
$scope.coinChanged();
}
}
});
$scope.coinChanged = function() {
$scope.formData.bwsurl = $scope.formData.coin == 'btc' ? defaults.bws.url : defaults.bwscash.url;
}
$scope.showAdvChange = function() {
$scope.showAdv = !$scope.showAdv;
$scope.encrypt = null;
@ -68,12 +77,6 @@ angular.module('copayApp.controllers').controller('joinController',
$scope.$apply();
};
if ($stateParams.url) {
var data = $stateParams.url;
data = data.replace('copay:', '');
$scope.onQrCodeScannedJoin(data);
}
function updateSeedSourceSelect() {
$scope.seedOptions = [{
id: 'new',