anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Enable Coinbase to old and new users

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-01-25 11:13:18 -03:00
commit e4ac118896
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
5 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/advancedSettings.js
View file

@ -19,7 +19,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
value: config.glidera.enabled value: config.glidera.enabled
}; };
$scope.coinbaseEnabled = { $scope.coinbaseEnabled = {
value: config.coinbase.enabled value: config.coinbaseV2
}; };
$scope.recentTransactionsEnabled = { $scope.recentTransactionsEnabled = {
value: config.recentTransactions.enabled value: config.recentTransactions.enabled
@ -72,9 +72,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
$scope.coinbaseChange = function() { $scope.coinbaseChange = function() {
var opts = { var opts = {
coinbase: { coinbaseV2: $scope.coinbaseEnabled.value
enabled: $scope.coinbaseEnabled.value
}
}; };
configService.set(opts, function(err) { configService.set(opts, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);

2
src/js/controllers/buyandsellController.js
View file

@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('buyandsellController', functi
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
configService.whenAvailable(function(config) { configService.whenAvailable(function(config) {
$scope.isCoinbaseEnabled = config.coinbase.enabled; $scope.isCoinbaseEnabled = config.coinbaseV2;
$scope.isGlideraEnabled = config.glidera.enabled; $scope.isGlideraEnabled = config.glidera.enabled;
if (!$scope.isCoinbaseEnabled && !$scope.isGlideraEnabled) if (!$scope.isCoinbaseEnabled && !$scope.isGlideraEnabled)

4
src/js/controllers/tab-home.js
View file

@ -83,7 +83,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
var wallet = profileService.getWallet(walletId); var wallet = profileService.getWallet(walletId);
updateWallet(wallet); updateWallet(wallet);
if ($scope.recentTransactionsEnabled) getNotifications(); if ($scope.recentTransactionsEnabled) getNotifications();
if (type == 'NewBlock' && n && n.data && n.data.network == 'livenet') { if ($scope.coinbaseEnabled && type == 'NewBlock' && n && n.data && n.data.network == 'livenet') {
// Update Coinbase // Update Coinbase
coinbaseService.updatePendingTransactions(); coinbaseService.updatePendingTransactions();
} }
@ -102,7 +102,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
$scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
$scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp; $scope.coinbaseEnabled = config.coinbaseV2 && !isWindowsPhoneApp;
$scope.amazonEnabled = config.amazon.enabled; $scope.amazonEnabled = config.amazon.enabled;
$scope.bitpayCardEnabled = config.bitpayCard.enabled; $scope.bitpayCardEnabled = config.bitpayCard.enabled;

2
src/js/controllers/tab-settings.js
View file

@ -26,7 +26,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.bitpayCardEnabled = config.bitpayCard.enabled; $scope.bitpayCardEnabled = config.bitpayCard.enabled;
$scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
$scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp; $scope.coinbaseEnabled = config.coinbaseV2 && !isWindowsPhoneApp;
if ($scope.bitpayCardEnabled) { if ($scope.bitpayCardEnabled) {
bitpayCardService.getBitpayDebitCards(function(err, cards) { bitpayCardService.getBitpayDebitCards(function(err, cards) {

9
src/js/services/configService.js
View file

@ -48,10 +48,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
testnet: false testnet: false
}, },
coinbase: { coinbaseV2: true,
enabled: true,
testnet: false
},
bitpayCard: { bitpayCard: {
enabled: true enabled: true
@ -197,8 +194,8 @@ angular.module('copayApp.services').factory('configService', function(storageSer
if (!configCache.glidera) { if (!configCache.glidera) {
configCache.glidera = defaultConfig.glidera; configCache.glidera = defaultConfig.glidera;
} }
if (!configCache.coinbase) { if (!configCache.coinbaseV2) {
configCache.coinbase = defaultConfig.coinbase; configCache.coinbaseV2 = defaultConfig.coinbaseV2;
} }
if (!configCache.amazon) { if (!configCache.amazon) {
configCache.amazon = defaultConfig.amazon; configCache.amazon = defaultConfig.amazon;