From efd92f5d4a0baffd1821420cf3a4ccebfdd3f9b2 Mon Sep 17 00:00:00 2001
From: Andy Phillipson <andy@bitpay.com>
Date: Wed, 22 Feb 2017 12:16:38 -0500
Subject: [PATCH] Remove html from popup messages. Refresh view after card or
 account removal. Remove old code in tab-settings ctrl.

---
 .../controllers/preferencesBitpayServices.js  |  5 ++++-
 src/js/controllers/tab-settings.js            | 22 +++++--------------
 src/js/services/bitpayAccountService.js       |  2 +-
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/js/controllers/preferencesBitpayServices.js b/src/js/controllers/preferencesBitpayServices.js
index 7ce638def..2af60532d 100644
--- a/src/js/controllers/preferencesBitpayServices.js
+++ b/src/js/controllers/preferencesBitpayServices.js
@@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('preferencesBitpayServicesCont
 
     $scope.removeAccount = function(account) {
       var title = gettextCatalog.getString('Remove BitPay Account?');
-      var msg = gettextCatalog.getString('Removing your BitPay account will remove all associated BitPay account data from this device.<br/><br/>Are you sure you would like to remove your BitPay Account ({{email}}) from this device?', {
+      var msg = gettextCatalog.getString('Removing your BitPay account will remove all associated BitPay account data from this device. Are you sure you would like to remove your BitPay Account ({{email}}) from this device?', {
         email: account.email
       });
       popupService.showConfirm(title, msg, null, null, function(res) {
@@ -64,6 +64,9 @@ angular.module('copayApp.controllers').controller('preferencesBitpayServicesCont
           if (cb) {
             cb();
           }
+          $timeout(function(){
+            $rootScope.$apply();
+          }, 10);
         });
       });
     };
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index a8928ab29..d8aa67cc7 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -16,27 +16,17 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
         isoCode: config.wallet.settings.alternativeIsoCode
       };
 
-      $scope.bitpayCardEnabled = config.bitpayCard.enabled;
-      $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
-
+      // TODO move this to a generic service
       bitpayAccountService.getAccounts(function(err, data) {
         if (err) $log.error(err);
         $scope.bitpayAccounts = !lodash.isEmpty(data);
       });
 
-      if ($scope.bitpayCardEnabled) {
-        bitpayCardService.getCards(function(err, cards) {
-          if (err) $log.error(err);
-          $scope.bitpayCards = cards && cards.length > 0;
-        });
-      }
-
-      if ($scope.glideraEnabled) {
-        storageService.getGlideraToken(glideraService.getEnvironment(), function(err, token) {
-          if (err) $log.error(err);
-          $scope.glideraToken = token;
-        });
-      }
+      // TODO move this to a generic service
+      bitpayCardService.getCards(function(err, cards) {
+        if (err) $log.error(err);
+        $scope.bitpayCards = cards && cards.length > 0;
+      });
     });
   };
 
diff --git a/src/js/services/bitpayAccountService.js b/src/js/services/bitpayAccountService.js
index e32e84727..7ab5a1bf7 100644
--- a/src/js/services/bitpayAccountService.js
+++ b/src/js/services/bitpayAccountService.js
@@ -68,7 +68,7 @@ angular.module('copayApp.services').factory('bitpayAccountService', function($lo
           var title = gettextCatalog.getString('Add BitPay Account?');
           var msgDetail = 'Add this BitPay account ({{email}})?';
           if (pairingReason) {
-  	        msgDetail = 'To {{reason}} you must first add your BitPay account.<br/><br/>{{email}}';
+  	        msgDetail = 'To {{reason}} you must first add your BitPay account - {{email}}';
   	      }
           var msg = gettextCatalog.getString(msgDetail, {
           	reason: pairingReason,