diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index 0151862cf..6f45e6fd6 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, $ionicModal, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService) {
+angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, $ionicModal, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService) {
var updateConfig = function() {
@@ -23,6 +23,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.currentFeeLevel = feeService.getCurrentFeeLevel();
$scope.wallets = profileService.getWallets();
+
+ $scope.bitpayCardEnabled = config.bitpayCard.enabled;
};
$scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) {
@@ -31,6 +33,12 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.$on("$ionicView.beforeEnter", function(event, data) {
updateConfig();
+
+ bitpayCardService.getBitpayDebitCards(function(err, data) {
+ if (!lodash.isEmpty(data)) {
+ $scope.bitpayCards = true;
+ }
+ });
});
});
diff --git a/src/js/routes.js b/src/js/routes.js
index 20d4c09f2..25a24a609 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -993,10 +993,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
paypro: null
}
})
- .state('tabs.bitpayCard.preferences', {
- url: '/preferences',
+ .state('tabs.preferences.bitpayCard', {
+ url: '/bitpay-card',
views: {
- 'tab-home@tabs': {
+ 'tab-settings@tabs': {
controller: 'preferencesBitpayCardController',
templateUrl: 'views/preferencesBitpayCard.html'
}
diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss
index c78445097..ee9022f5b 100644
--- a/src/sass/views/tab-settings.scss
+++ b/src/sass/views/tab-settings.scss
@@ -1,5 +1,9 @@
.settings {
@extend .deflash-blue;
+ .icon-bitpay-card {
+ background-image: url("../img/icon-card.svg");
+ background-color: #1e3186;
+ }
.item {
color: $dark-gray;
border-color: rgba(221, 221, 221, 0.3);
diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html
index e9a9a53da..d2a590ebb 100644
--- a/www/views/bitpayCard.html
+++ b/www/views/bitpayCard.html
@@ -3,11 +3,6 @@
BitPay Visa® Card ({{card.lastFourDigits}})
-
-
-
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index 107dc53e3..69ea4b0b9 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -118,6 +118,16 @@
+
+
+
+
+ BitPay Visa® Card
+
+
+