From 45e15c77270a0e9692511dcec141445164eaa9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 19 Sep 2017 10:59:35 -0300 Subject: [PATCH 1/2] disable trezor and ledger for bitcoin cash wallets --- src/js/controllers/create.js | 5 +++++ src/js/controllers/join.js | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index d47dba87f..da8c66f0d 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -176,6 +176,11 @@ angular.module('copayApp.controllers').controller('createController', } if ($scope.formData.seedSource.id == walletService.externalSource.ledger.id || $scope.formData.seedSource.id == walletService.externalSource.trezor.id || $scope.formData.seedSource.id == walletService.externalSource.intelTEE.id) { + if ($scope.formData.coin == 'bch') { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Hardware wallet are yet not supported with Bitcoin Cash')); + return; + } + var account = $scope.formData.account; if (!account || account < 1) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number')); diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 218d61725..e08f30483 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -141,6 +141,11 @@ angular.module('copayApp.controllers').controller('joinController', } if ($scope.formData.seedSource.id == walletService.externalSource.ledger.id || $scope.formData.seedSource.id == walletService.externalSource.trezor.id || $scope.formData.seedSource.id == walletService.externalSource.intelTEE.id) { + if ($scope.formData.coin == 'bch') { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Hardware wallet are yet not supported with Bitcoin Cash')); + return; + } + var account = $scope.formData.account; if (!account || account < 1) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number')); From f86787f511c1b768fc4c25a4c40e7862d2f88dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 19 Sep 2017 12:40:49 -0300 Subject: [PATCH 2/2] fix --- src/js/controllers/create.js | 2 +- src/js/controllers/join.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index da8c66f0d..4a1ce005a 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -177,7 +177,7 @@ angular.module('copayApp.controllers').controller('createController', if ($scope.formData.seedSource.id == walletService.externalSource.ledger.id || $scope.formData.seedSource.id == walletService.externalSource.trezor.id || $scope.formData.seedSource.id == walletService.externalSource.intelTEE.id) { if ($scope.formData.coin == 'bch') { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Hardware wallet are yet not supported with Bitcoin Cash')); + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Hardware wallets are not yet supported with Bitcoin Cash')); return; } diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index e08f30483..29b97cb6b 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -142,7 +142,7 @@ angular.module('copayApp.controllers').controller('joinController', if ($scope.formData.seedSource.id == walletService.externalSource.ledger.id || $scope.formData.seedSource.id == walletService.externalSource.trezor.id || $scope.formData.seedSource.id == walletService.externalSource.intelTEE.id) { if ($scope.formData.coin == 'bch') { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Hardware wallet are yet not supported with Bitcoin Cash')); + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Hardware wallets are not yet supported with Bitcoin Cash')); return; }