From bb1aa3dcfd2d4ae934475230532e4c2bc9564574 Mon Sep 17 00:00:00 2001 From: Andy Phillipson Date: Mon, 21 Nov 2016 17:24:42 -0500 Subject: [PATCH] Use error popup rather than in view error text. --- src/js/controllers/bitpayCard.js | 2 +- src/js/controllers/preferencesBitpayCard.js | 3 +-- www/views/preferencesBitpayCard.html | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 7a7ae1652..40187b4ef 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -63,9 +63,9 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi if (err) { $log.error(err); - $scope.error = gettextCatalog.getString('Could not get transactions'); self.bitpayCardTransactionHistory = null; self.bitpayCardCurrentBalance = null; + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not get transactions')); return; } diff --git a/src/js/controllers/preferencesBitpayCard.js b/src/js/controllers/preferencesBitpayCard.js index f2e4f7f14..f97bc255e 100644 --- a/src/js/controllers/preferencesBitpayCard.js +++ b/src/js/controllers/preferencesBitpayCard.js @@ -13,8 +13,7 @@ angular.module('copayApp.controllers').controller('preferencesBitpayCardControll var remove = function(card) { bitpayCardService.remove(card, function(err) { if (err) { - $scope.error = gettextCatalog.getString('Could not remove card'); - return; + return popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not remove card')); } $ionicHistory.clearHistory(); $timeout(function() { diff --git a/www/views/preferencesBitpayCard.html b/www/views/preferencesBitpayCard.html index 4744c8320..138327698 100644 --- a/www/views/preferencesBitpayCard.html +++ b/www/views/preferencesBitpayCard.html @@ -6,9 +6,6 @@ -
- {{error}} -
Cards