Merge pull request #5091 from cmgustavo/ref/move-bitpaycard-preferences

Moves bitpayCard pref to tab-settings

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;
+      }
+    });
   });
 
 });

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'
           }

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);