From 195e9190c5ffa2e26dbb126652be3d6446690f9b Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Tue, 3 Apr 2018 14:28:47 +0900 Subject: [PATCH] Update: Adds displayBitcoinCoreFlag --- src/js/services/configService.js | 13 ------------- src/js/services/profileService.js | 4 +++- src/js/services/storageService.js | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/js/services/configService.js b/src/js/services/configService.js index ad508b819..17f556ce3 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -249,18 +249,5 @@ angular.module('copayApp.services').factory('configService', function(storageSer return lodash.clone(defaultConfig); }; - root.checkIfConfigIsSet = function(key) { - return new Promise(function(resolve, reject) { - storageService.getConfig(function(err, localConfig) { - if (localConfig) { - configCache = JSON.parse(localConfig); - resolve(configCache.hasOwnProperty(key)); - } else { - reject(false); - } - }); - }); - } - return root; }); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index c0087ca88..630c7ee69 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -1038,7 +1038,7 @@ angular.module('copayApp.services') }; root.initBitcoinCoreDisplay = function() { - configService.checkIfConfigIsSet('displayBitcoinCore').then(function(result) { + storageService.checkIfFlagIsSet('displayBitcoinCoreFlag').then(function(result) { if (!result) { var walletsBtc = root.getWallets({coin: 'btc'}); var totalBtc = 0; @@ -1057,6 +1057,8 @@ angular.module('copayApp.services') configService.set(opts, function(err) { if (err) $log.debug(err); }); + + storageService.activateDisplayBitcoinCoreFlag(); } }); }; diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index 9a74e02ed..25acb2552 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -634,5 +634,24 @@ angular.module('copayApp.services') storage.remove('receivedTxs-' + walletId, cb); } + root.checkIfFlagIsSet = function(key) { + return new Promise(function(resolve, reject) { + storage.get(key, function(i, value) { + if (value == null) { + resolve(false); + } else { + resolve(true); + } + }); + }); + } + + root.activateDisplayBitcoinCoreFlag = function() { + var flag = { + initialized: true + }; + storage.set('displayBitcoinCoreFlag', flag, function() { }); + } + return root; });