Merge pull request #5883 from matiu/bug/amazon-retry

Bug/amazon retry

src/js/controllers/amazonCards.js

@@ -29,15 +29,18 @@ angular.module('copayApp.controllers').controller('amazonCardsController',
         var index = 0;
         var gcds = $scope.giftCards;
         lodash.forEach(gcds, function(dataFromStorage) {
-          if (dataFromStorage.status == 'PENDING') {
+          if (dataFromStorage.status == 'PENDING' || dataFromStorage.status == 'invalid') {
-            $log.debug("creating gift card");
+            $log.debug("Creating / Updating gift card");
             $scope.updatingPending[dataFromStorage.invoiceId] = true;
+
             amazonService.createGiftCard(dataFromStorage, function(err, giftCard) {
+
               $scope.updatingPending[dataFromStorage.invoiceId] = false;
               if (err) {
                 popupService.showAlert('Error creating gift card', err);
                 return;
               }
+
               if (giftCard.status != 'PENDING') {
                 var newData = {};
 

src/js/services/amazonService.js

@@ -72,8 +72,10 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
       if (opts && opts.remove) {
         delete(inv[gc.invoiceId]);
       }
+
       inv = JSON.stringify(inv);
 
+
       storageService.setAmazonGiftCards(network, inv, function(err) {
 
         homeIntegrationsService.register(homeItem);

www/views/amazonCards.html

@@ -14,16 +14,16 @@
         <img src="img/a-smile_color_btn.png" alt="{{id}}" width="40">
         <ion-spinner class="spinner-dark recent right m10 size-16" icon="crescent" ng-show="updatingPending[item.invoiceId]">
         </ion-spinner>
-        <h2>
+        <h2 ng-if="item.amount">
-          <span ng-if="item.claimCode">{{item.amount | currency : '$ ' : 2}} {{item.currency}}</span>
+          {{item.amount | currency : '$ ' : 2}} {{item.currency}}
-          <span ng-if="!item.claimCode">-</span>
         </h2> 
         <p>
           <span class="assertive" ng-if="item.status == 'FAILURE' || item.status == 'RESEND'">Error</span>
           <span class="assertive" ng-if="item.status == 'expired'">Expired</span>
+          <span class="assertive" ng-if="item.status == 'invalid'">Still waiting confirmation<br> (Use higher fees setting to faster delivery)</span>
           <span class="text-gray" ng-if="item.status == 'PENDING'">Pending to confirmation</span>
           <span class="assertive" ng-if="item.status == 'SUCCESS' && item.cardStatus == 'Canceled'">Canceled</span>
-          <span class="text-gray" ng-if="item.status == 'SUCCESS' && item.cardStatus == 'Fulfilled'">{{item.date | amTimeAgo}}</span>
+          <span class="text-gray">{{item.date | amTimeAgo}}</span>
         </p>
       </div>
     </div>

www/views/modals/amazon-card-details.html

@@ -11,13 +11,21 @@
       <div class="header-modal text-center">
         <img src="img/a_generic.jpg" alt="Amazon.com Gift Card" width="230" ng-click="refreshGiftCard()">
 
+        <div class="m10t">
+          Gift Card Amount:
+          <span class="text-bold">
+            {{card.amount | currency : '$ ' : 2}}
+          </span>
+        </div>
+
+
+        <div class="m10t">
+          Created
+            {{card.date | amTimeAgo}}
+        </div>
+
+
         <div ng-show="card.claimCode">
-          <div class="m10t">
-            Gift Card Amount:
-            <span class="text-bold">
-              {{card.amount | currency : '$ ' : 2}}
-            </span>
-          </div>
           <div ng-show="card.cardStatus !== 'Canceled'">
             Claim code: <span class="text-bold" copy-to-clipboard="card.claimCode">{{card.claimCode}}</span>
           </div>
@@ -42,6 +50,10 @@
             <span class="text-bold" ng-show="card.status == 'PENDING'">
               PENDING
             </span>
+            <span class="text-bold" ng-show="card.status=='invalid'">
+              STILL PENDING
+            </span>
+
             <span class="text-bold" ng-show="card.status == 'FAILURE' || card.status == 'RESEND'">
               FAILURE
             </span>