From 3f85730099e42a977c5f2613554a76c99470f4bd Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 21 Nov 2016 11:36:41 -0300
Subject: [PATCH] Moves bitpayCard pref to tab-settings

---
 src/js/controllers/tab-settings.js | 10 +++++++++-
 src/js/routes.js                   |  6 +++---
 src/sass/views/tab-settings.scss   |  4 ++++
 www/views/bitpayCard.html          |  5 -----
 www/views/tab-settings.html        | 10 ++++++++++
 5 files changed, 26 insertions(+), 9 deletions(-)

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 cd935dda2..aaf6b6023 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -967,10 +967,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 @@
     <ion-nav-back-button>
     </ion-nav-back-button>
     <ion-nav-title>BitPay Visa<sup>&reg;</sup> Card ({{card.lastFourDigits}})</ion-nav-title>
-    <ion-nav-buttons side="secondary">
-      <button class="button no-border" ui-sref="tabs.bitpayCard.preferences">
-        <i class="icon ion-ios-settings"></i>
-      </button>
-    </ion-nav-buttons>
   </ion-nav-bar>
 
   <ion-content>
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 @@
         <i class="icon bp-arrow-right"></i>
       </a>
 
+      <a class=" item item-icon-left item-icon-right"
+         ng-if="bitpayCardEnabled && bitpayCards"
+         ui-sref="tabs.preferences.bitpayCard">
+        <i class="icon big-icon-svg circle">
+          <div class="bg icon-bitpay-card"></div>
+        </i>
+        <span>BitPay Visa&reg; Card</span>
+        <i class="icon bp-arrow-right"></i>
+      </a>
+
       <div class="item item-divider"></div>
 
       <a class="ng-hide item item-icon-left item-icon-right" href ng-hide="true">