diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index baca061fc..f44719914 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService, platformInfo) {
+angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService, platformInfo, externalLinkService) {
var updateConfig = function() {
var config = configService.getSync();
@@ -15,9 +15,9 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
value: config.hideNextSteps.enabled
};
$scope.cashSupport = {
- value: config.cashSupport.enabled
+ value: config.cashSupport.enabled
};
-
+
};
$scope.spendUnconfirmedChange = function() {
@@ -66,6 +66,10 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
});
};
+ $scope.openExternalLink = function(url) {
+ externalLinkService.open(url);
+ };
+
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
updateConfig();
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index b32e8bd25..e1d84bfed 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -22,12 +22,16 @@ angular.module('copayApp.controllers').controller('createController',
$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.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
$scope.formData.derivationPath = derivationPathHelper.default;
$scope.formData.coin = 'btc';
+
+ if (config.cashSupport.enabled) $scope.enableCash = true;
+
$scope.setTotalCopayers(tc);
updateRCSelect(tc);
resetPasswordFields();
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index b520ad2b6..c66cb4a3f 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -5,6 +5,7 @@ angular.module('copayApp.controllers').controller('importController',
var reader = new FileReader();
var defaults = configService.getDefaults();
+ var config = configService.getSync();
var errors = bwcService.getErrors();
$scope.init = function() {
@@ -20,6 +21,8 @@ angular.module('copayApp.controllers').controller('importController',
$scope.isCopay = appConfigService.name == 'copay';
$scope.fromHardwareWallet = { value: false };
+ if (config.cashSupport.enabled) $scope.enableCash = true;
+
if ($stateParams.code)
$scope.processWalletInfo($stateParams.code);
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index bf1e5ec00..2a209701d 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -5,12 +5,14 @@ angular.module('copayApp.controllers').controller('joinController',
$scope.$on("$ionicView.beforeEnter", function(event, data) {
var defaults = configService.getDefaults();
+ var config = configService.getSync();
$scope.formData = {};
$scope.formData.bwsurl = defaults.bws.url;
$scope.formData.derivationPath = derivationPathHelper.default;
$scope.formData.account = 1;
$scope.formData.secret = null;
$scope.formData.coin = 'btc';
+ if (config.cashSupport.enabled) $scope.enableCash = true;
resetPasswordFields();
updateSeedSourceSelect();
});
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index de2776c0d..8d3bae013 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -62,7 +62,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
},
cashSupport: {
- enabled: true,
+ enabled: false,
},
recentTransactions: {
diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html
index 6b610b5ea..a02356120 100644
--- a/www/views/advancedSettings.html
+++ b/www/views/advancedSettings.html
@@ -12,10 +12,11 @@
Support Bitcoin Cash
-
+