From e4ac11889664a0bdae90beaa0c8c5c94a1352468 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 25 Jan 2017 11:13:18 -0300
Subject: [PATCH] Enable Coinbase to old and new users

---
 src/js/controllers/advancedSettings.js     | 6 ++----
 src/js/controllers/buyandsellController.js | 2 +-
 src/js/controllers/tab-home.js             | 4 ++--
 src/js/controllers/tab-settings.js         | 2 +-
 src/js/services/configService.js           | 9 +++------
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index 4b6fd264e..9bfd90a58 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -19,7 +19,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
       value: config.glidera.enabled
     };
     $scope.coinbaseEnabled = {
-      value: config.coinbase.enabled
+      value: config.coinbaseV2
     };
     $scope.recentTransactionsEnabled = {
       value: config.recentTransactions.enabled
@@ -72,9 +72,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
 
   $scope.coinbaseChange = function() {
     var opts = {
-      coinbase: {
-        enabled: $scope.coinbaseEnabled.value
-      }
+      coinbaseV2: $scope.coinbaseEnabled.value
     };
     configService.set(opts, function(err) {
       if (err) $log.debug(err);
diff --git a/src/js/controllers/buyandsellController.js b/src/js/controllers/buyandsellController.js
index d679a9e9d..93df71069 100644
--- a/src/js/controllers/buyandsellController.js
+++ b/src/js/controllers/buyandsellController.js
@@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('buyandsellController', functi
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     configService.whenAvailable(function(config) {
-      $scope.isCoinbaseEnabled = config.coinbase.enabled;
+      $scope.isCoinbaseEnabled = config.coinbaseV2;
       $scope.isGlideraEnabled = config.glidera.enabled;
 
       if (!$scope.isCoinbaseEnabled && !$scope.isGlideraEnabled)
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index dcd495d89..701e67b43 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -83,7 +83,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           var wallet = profileService.getWallet(walletId);
           updateWallet(wallet);
           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
             coinbaseService.updatePendingTransactions();
           }
@@ -102,7 +102,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
 
           $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
-          $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp;
+          $scope.coinbaseEnabled = config.coinbaseV2 && !isWindowsPhoneApp;
           $scope.amazonEnabled = config.amazon.enabled;
           $scope.bitpayCardEnabled = config.bitpayCard.enabled;
 
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index a92d8cb6c..4a3624c2f 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -26,7 +26,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
 
       $scope.bitpayCardEnabled = config.bitpayCard.enabled;
       $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
-      $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp;
+      $scope.coinbaseEnabled = config.coinbaseV2 && !isWindowsPhoneApp;
 
       if ($scope.bitpayCardEnabled) {
         bitpayCardService.getBitpayDebitCards(function(err, cards) {
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 88bd1e3bb..fd6b3206a 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -48,10 +48,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
       testnet: false
     },
 
-    coinbase: {
-      enabled: true,
-      testnet: false
-    },
+    coinbaseV2: true,
 
     bitpayCard: {
       enabled: true
@@ -197,8 +194,8 @@ angular.module('copayApp.services').factory('configService', function(storageSer
         if (!configCache.glidera) {
           configCache.glidera = defaultConfig.glidera;
         }
-        if (!configCache.coinbase) {
-          configCache.coinbase = defaultConfig.coinbase;
+        if (!configCache.coinbaseV2) {
+          configCache.coinbaseV2 = defaultConfig.coinbaseV2;
         }
         if (!configCache.amazon) {
           configCache.amazon = defaultConfig.amazon;