From b6e13b116571e0e5cdaf90df485206d6958616d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 3 Aug 2016 18:27:44 -0300
Subject: [PATCH] adding cancel status on amazon activity view

---
 public/views/amazon.html                       | 3 ++-
 public/views/modals/amazon-card-details.html   | 8 ++++++++
 src/js/controllers/modals/amazonCardDetails.js | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/public/views/amazon.html b/public/views/amazon.html
index 5a430e23f..7a816378e 100644
--- a/public/views/amazon.html
+++ b/public/views/amazon.html
@@ -75,7 +75,8 @@
           <span class="text-warning" ng-if="item.status == 'FAILURE'">Error</span>
           <span class="text-secondary" ng-if="item.status == 'RESEND'">Resend is required</span>
           <span class="text-gray" ng-if="item.status == 'PENDING'">Pending to confirmation</span>
-          <span class="text-gray" ng-if="item.status == 'SUCCESS'">{{item.date | amTimeAgo}}</span>
+          <span class="text-gray" ng-if="item.status == 'SUCCESS' && item.cardStatus == 'RefundedToPurchaser'">Canceled</span>
+          <span class="text-gray" ng-if="item.status == 'SUCCESS' && item.cardStatus == 'Fulfilled'">{{item.date | amTimeAgo}}</span>
         </div>
         <div class="large-1 medium-1 small-1 columns text-right m10t">
           <i class="icon-arrow-right3 size-18"></i>
diff --git a/public/views/modals/amazon-card-details.html b/public/views/modals/amazon-card-details.html
index 1e75ee032..70ee8f125 100644
--- a/public/views/modals/amazon-card-details.html
+++ b/public/views/modals/amazon-card-details.html
@@ -33,6 +33,14 @@
               Redeem Now
             </button>
           </div>
+          <div class="m10t" ng-show="card.cardStatus == 'RefundedToPurchaser'">
+            <div class="m10t">
+              Status:
+              <span class="text-bold">
+                CANCELED
+              </span>
+            </div>
+          </div>
         </div>
         <div ng-show="!card.claimCode">
           <div class="m10t">
diff --git a/src/js/controllers/modals/amazonCardDetails.js b/src/js/controllers/modals/amazonCardDetails.js
index e9e461569..432d32a0d 100644
--- a/src/js/controllers/modals/amazonCardDetails.js
+++ b/src/js/controllers/modals/amazonCardDetails.js
@@ -10,7 +10,10 @@ angular.module('copayApp.controllers').controller('amazonCardDetailsController',
         $scope.error = bwcError.msg(err);
         return;
       }
-      $scope.$emit('UpdateAmazonList');
+      $scope.card.cardStatus = data.cardStatus;
+      amazonService.savePendingGiftCard($scope.card, null, function(err) {
+        $scope.$emit('UpdateAmazonList');
+      });
     });
   };