From 93bb16776645be620111c5f4ee8a8b3329d0e189 Mon Sep 17 00:00:00 2001 From: Kadir Sekha Date: Thu, 26 Oct 2017 17:36:01 +0900 Subject: [PATCH] switch between btc and bch service url when switching coins --- src/js/controllers/create.js | 9 +++++++-- src/js/controllers/import.js | 4 ++++ src/js/controllers/join.js | 7 ++++++- www/views/includes/cash.html | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index b48eb770e..92efa36d6 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -19,13 +19,14 @@ angular.module('copayApp.controllers').controller('createController', 12: 1, }; + var defaults = configService.getDefaults(); + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.formData = {}; - var defaults = configService.getDefaults(); var config = configService.getSync(); var tc = $state.current.name == 'tabs.add.create-personal' ? 1 : defaults.wallet.totalCopayers; $scope.formData.account = 1; - $scope.formData.bwsurl = defaults.bws.url; + $scope.formData.bwsurl = data.stateParams.coin == 'btc' ? defaults.bws.url : defaults.bwscash.url; $scope.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1); $scope.formData.derivationPath = derivationPathHelper.default; $scope.formData.coin = data.stateParams.coin; @@ -37,6 +38,10 @@ angular.module('copayApp.controllers').controller('createController', resetPasswordFields(); }); + $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; diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index f796b21f6..3c8008830 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -74,6 +74,10 @@ angular.module('copayApp.controllers').controller('importController', }); }; + $scope.coinChanged = function() { + $scope.formData.bwsurl = $scope.formData.coin == 'btc' ? defaults.bws.url : defaults.bwscash.url; + } + $scope.processWalletInfo = function(code) { if (!code) return; diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 3a979b75e..7f813b703 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -3,8 +3,9 @@ angular.module('copayApp.controllers').controller('joinController', function($scope, $rootScope, $timeout, $state, $ionicHistory, $ionicScrollDelegate, profileService, configService, storageService, applicationService, gettextCatalog, lodash, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService, appConfigService) { + var defaults = configService.getDefaults(); + $scope.$on("$ionicView.beforeEnter", function(event, data) { - var defaults = configService.getDefaults(); var config = configService.getSync(); $scope.formData = {}; $scope.formData.bwsurl = defaults.bws.url; @@ -17,6 +18,10 @@ angular.module('copayApp.controllers').controller('joinController', updateSeedSourceSelect(); }); + $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; diff --git a/www/views/includes/cash.html b/www/views/includes/cash.html index 335b72811..17c7c2fe8 100644 --- a/www/views/includes/cash.html +++ b/www/views/includes/cash.html @@ -2,7 +2,7 @@
Coin
-