From 4e83d09f478105ac059ab14a49be2b47b579096a Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Tue, 22 May 2018 09:43:39 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Bug=20-=20348=20-=20Tapping=20=E2=86=BB=20o?= =?UTF-8?q?n=20the=20"Wallet=20Service=20URL"=20screen=20will=20change=20i?= =?UTF-8?q?t=20to=20a=20wrong=20URL.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/controllers/preferencesBwsUrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/preferencesBwsUrl.js b/src/js/controllers/preferencesBwsUrl.js index 0c6be93ba..6f0248c45 100644 --- a/src/js/controllers/preferencesBwsUrl.js +++ b/src/js/controllers/preferencesBwsUrl.js @@ -16,7 +16,7 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController', }; $scope.resetDefaultUrl = function() { - $scope.bwsurl.value = defaults.bws.url; + $scope.bwsurl.value = ($scope.wallet.coin === 'btc') ? defaults.bws.url : defaults.bwscash.url; }; $scope.save = function() { From 6eaf243e6e9c948ef341f856d16cb4108ff9da88 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Tue, 22 May 2018 09:54:56 +0200 Subject: [PATCH 2/2] Also fixed for aliases 'prod' and 'production' --- src/js/controllers/preferencesBwsUrl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/preferencesBwsUrl.js b/src/js/controllers/preferencesBwsUrl.js index 6f0248c45..907628551 100644 --- a/src/js/controllers/preferencesBwsUrl.js +++ b/src/js/controllers/preferencesBwsUrl.js @@ -25,15 +25,15 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController', switch ($scope.bwsurl.value) { case 'prod': case 'production': - bws = 'https://bws.bitcoin.com/bws/api' + bws = ($scope.wallet.coin === 'btc') ? defaults.bws.url : defaults.bwscash.url; break; case 'sta': case 'staging': - bws = 'https://bws-staging.b-pay.net/bws/api' + bws = 'https://bws-staging.b-pay.net/bws/api'; break; case 'loc': case 'local': - bws = 'http://localhost:3232/bws/api' + bws = 'http://localhost:3232/bws/api'; break; }; if (bws) {