diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index 9355dd730..42fa10855 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -13,10 +13,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
$scope.hideNextSteps = {
value: config.hideNextSteps.enabled
};
- $scope.displayBitcoinCoreEnabled = {
- value: config.displayBitcoinCore.enabled
- };
-
};
$scope.spendUnconfirmedChange = function() {
@@ -52,17 +48,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
});
};
- $scope.displayBitcoinCoreChange = function() {
- var opts = {
- displayBitcoinCore: {
- enabled: $scope.displayBitcoinCoreEnabled.value
- }
- };
- configService.set(opts, function(err) {
- if (err) $log.debug(err);
- });
- };
-
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
updateConfig();
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 28736972f..dee94f4b1 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -83,9 +83,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$scope.$on("$ionicView.enter", function(event, data) {
$ionicNavBarDelegate.showBar(true);
- updateAllWallets(function() {
- profileService.initBitcoinCoreDisplay();
- });
+ updateAllWallets();
addressbookService.list(function(err, ab) {
if (err) $log.error(err);
@@ -126,8 +124,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$scope.nextStepsItems = nextStepsService.get();
}
- $scope.displayBitcoinCore = config.displayBitcoinCore.enabled;
-
$scope.showServices = true;
pushNotificationsService.init();
firebaseEventsService.init();
@@ -326,9 +322,4 @@ angular.module('copayApp.controllers').controller('tabHomeController',
updateAllWallets();
};
- $rootScope.$on('Local/SettingsUpdated', function(e, walletId) {
- configService.whenAvailable(function(config) {
- $scope.displayBitcoinCore = config.displayBitcoinCore.enabled;
- });
- });
});
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index 377cb9a49..65077995f 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -81,7 +81,6 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
coin: v.coin,
network: v.network,
balanceString: v.cachedBalance,
- displayWallet: v.coin == 'btc' ? config.displayBitcoinCore.enabled : true,
getAddress: function(cb) {
walletService.getAddress(v, false, cb);
},
diff --git a/src/js/directives/walletSelector.js b/src/js/directives/walletSelector.js
index 578d298ce..256a2c20d 100644
--- a/src/js/directives/walletSelector.js
+++ b/src/js/directives/walletSelector.js
@@ -11,11 +11,9 @@ angular.module('copayApp.directives')
show: '=walletSelectorShow',
wallets: '=walletSelectorWallets',
selectedWallet: '=walletSelectorSelectedWallet',
- onSelect: '=walletSelectorOnSelect',
- alwaysDisplayBitcoinCore: '=walletSelectorAlwaysDisplayBitcoinCore'
+ onSelect: '=walletSelectorOnSelect'
},
link: function(scope, element, attrs) {
- scope.displayWallet = true;
scope.hide = function() {
scope.show = false;
};
@@ -28,19 +26,6 @@ angular.module('copayApp.directives')
scope.$watch('wallets', function(newValue, oldValue) {
scope.wallets = newValue;
});
- scope.initDisplayBitcoinCoreConfig = function() {
- configService.whenAvailable(function(config) {
- scope.displayBitcoinCore = config.displayBitcoinCore.enabled;
- scope.initWalletDisplay();
- });
- };
- scope.initWalletDisplay = function() {
- scope.displayWallet = scope.alwaysDisplayBitcoinCore ? true : scope.displayBitcoinCore;
- };
- scope.initDisplayBitcoinCoreConfig();
- $rootScope.$on('Local/SettingsUpdated', function(e, walletId) {
- scope.initDisplayBitcoinCoreConfig();
- });
}
};
});
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index fcf496775..1e46da03a 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -85,10 +85,6 @@ angular.module('copayApp.services').factory('configService', function(storageSer
enabled: true,
},
- displayBitcoinCore: {
- enabled: false,
- },
-
hideNextSteps: {
enabled: isWindowsPhoneApp ? true : false,
},
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 09ba746f4..068c3b2ae 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -1037,39 +1037,6 @@ angular.module('copayApp.services')
return cb(null, txps, n);
};
- // Displays Bitcoin Core Wallets if BTC balance is more than 0
- root.initBitcoinCoreDisplay = function() {
- storageService.checkIfFlagIsSet('displayBitcoinCoreFlag')
- .then(function(result) {
- // Perform checks for flags which are even set to true once more, set the new flag value to 1
- if (result === false || result === true) {
- root.checkBtcBalanceAndInitDisplay(1);
- }
- });
- };
-
- root.checkBtcBalanceAndInitDisplay = function(flagValue) {
- var walletsBtc = root.getWallets({coin: 'btc'});
- if (walletsBtc.length > 0) {
- // Do not trust cachedBalance as it is added asynchronously. Using a new promise-based function.
- root.getWalletsBalance(walletsBtc)
- .then(function(totalBalance) {
- var enableDisplayBitcoinCore = totalBalance > 0 ? true : false;
-
- var opts = {
- displayBitcoinCore: {
- enabled: enableDisplayBitcoinCore
- }
- };
- configService.set(opts, function(err) {
- if (err) $log.debug(err);
- });
-
- storageService.activateDisplayBitcoinCoreFlag(flagValue);
- });
- }
- }
-
// Calculate wallets total balance (Promise). Attempts to fix asynchronous issue with cachedBalance not being available when it's needed
root.getWalletsBalance = function(wallets) {
return new Promise(function(resolve, reject) {
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index c2f8077be..3d1ecfeef 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -645,13 +645,6 @@ angular.module('copayApp.services')
});
});
}
-
- root.activateDisplayBitcoinCoreFlag = function(value) {
- var flag = {
- initialized: value
- };
- storage.set('displayBitcoinCoreFlag', flag, function() { });
- }
-
+
return root;
});
diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html
index 2b46e5375..253c35c8f 100644
--- a/www/views/advancedSettings.html
+++ b/www/views/advancedSettings.html
@@ -29,15 +29,6 @@
Hide Next Steps Card
-
-
-
-
-
diff --git a/www/views/includes/walletSelector.html b/www/views/includes/walletSelector.html
index bcb7b3f90..a53d1c7f1 100644
--- a/www/views/includes/walletSelector.html
+++ b/www/views/includes/walletSelector.html
@@ -37,14 +37,13 @@
-
- Your Bitcoin Cash (BCH) Wallet is ready!
-
-
- A Bitcoin Core (BTC) wallet can be displayed from Settings Advanced
+ Your Bitcoin Wallets are ready!
@@ -73,8 +70,7 @@
-
+
Bitcoin Core (BTC)
diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index 2f33a863e..838c04299 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -75,8 +75,7 @@
+ ng-click="goToAmount(item)">
{{item.name}}