diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js index 9beb45fc2..20b508f9a 100644 --- a/src/js/controllers/glidera.js +++ b/src/js/controllers/glidera.js @@ -8,8 +8,9 @@ angular.module('copayApp.controllers').controller('glideraController', }; this.submitOauthCode = function(code) { - var fc = profileService.focusedClient; var self = this; + var glideraTestnet = configService.getSync().glidera.testnet; + var network = glideraTestnet ? 'testnet' : 'livenet'; this.loading = true; this.error = null; $timeout(function() { @@ -22,7 +23,7 @@ angular.module('copayApp.controllers').controller('glideraController', }, 100); } else if (data && data.access_token) { - storageService.setGlideraToken(fc.credentials.network, data.access_token, function() { + storageService.setGlideraToken(network, data.access_token, function() { $scope.$emit('Local/GlideraUpdated', data.access_token); $timeout(function() { $scope.$apply(); diff --git a/src/js/controllers/glideraUri.js b/src/js/controllers/glideraUri.js index 97d21ef6b..a42859e5d 100644 --- a/src/js/controllers/glideraUri.js +++ b/src/js/controllers/glideraUri.js @@ -1,10 +1,11 @@ 'use strict'; angular.module('copayApp.controllers').controller('glideraUriController', - function($scope, $stateParams, $timeout, profileService, glideraService, storageService, go) { + function($scope, $stateParams, $timeout, profileService, configService, glideraService, storageService, go) { this.submitOauthCode = function(code) { - var fc = profileService.focusedClient; var self = this; + var glideraTestnet = configService.getSync().glidera.testnet; + var network = glideraTestnet ? 'testnet' : 'livenet'; this.loading = true; this.error = null; $timeout(function() { @@ -17,7 +18,7 @@ angular.module('copayApp.controllers').controller('glideraUriController', }, 100); } else if (data && data.access_token) { - storageService.setGlideraToken(fc.credentials.network, data.access_token, function() { + storageService.setGlideraToken(network, data.access_token, function() { $scope.$emit('Local/GlideraUpdated', data.access_token); $timeout(function() { go.path('glidera'); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index bd3ec1911..b01b9b6f3 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -925,11 +925,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.initGlidera = function(accessToken) { self.glideraEnabled = configService.getSync().glidera.enabled; - // self.glideraTestnet = configService.getSync().glidera.testnet; - // var network = self.glideraTestnet ? 'testnet' : 'livenet'; - // Disabled for testnet - self.glideraTestnet = false; - var network = 'livenet'; + self.glideraTestnet = configService.getSync().glidera.testnet; + var network = self.glideraTestnet ? 'testnet' : 'livenet'; self.glideraToken = null; self.glideraError = null; diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 427e31325..e08b8f9ea 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -70,12 +70,17 @@ angular.module('copayApp.services').factory('configService', function(storageSer configCache.wallet.settings.unitCode = defaultConfig.wallet.settings.unitCode; } if (!configCache.glidera) { - configCache.glidera = defaultConfig.glidera; + configCache.glidera = defaultConfig.glidera; } } else { configCache = lodash.clone(defaultConfig); }; + + // Glidera + // Disabled for testnet + configCache.glidera.testnet = false; + $log.debug('Preferences read:', configCache) return cb(err, configCache); });