From 0ad20fcc77763a037b76f363e70d51eb66b67f71 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 29 Aug 2016 18:54:14 -0300
Subject: [PATCH] Fix bitpayCard and buyAmazon

---
 public/views/modals/tx-status.html |  6 ++--
 src/js/controllers/bitpayCard.js   |  2 +-
 src/js/controllers/buyAmazon.js    | 57 +++---------------------------
 3 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html
index a5ca07ea5..950540001 100644
--- a/public/views/modals/tx-status.html
+++ b/public/views/modals/tx-status.html
@@ -13,7 +13,7 @@
   </div>
 
 
-  <div ng-if="type == 'created'" class="popup-txsigned m30tp">
+  <div ng-if="type == 'created'" class="popup-txsigned text-center m30tp">
     <i class="icon ion-checkmark-round"></i>
     <div class="text-center size-18 tu text-bold m20t">
       <span translate>Payment Proposal Created</span>
@@ -25,7 +25,7 @@
 
 
 
-  <div ng-if="type == 'accepted'" class="popup-txsigned m30tp">
+  <div ng-if="type == 'accepted'" class="popup-txsigned text-center m30tp">
     <i class="icon ion-checkmark-round"></i>
     <div class="text-center size-18 tu text-bold m20t">
       <span translate>Payment Accepted</span>
@@ -35,7 +35,7 @@
     </div>
   </div>
 
-  <div ng-if="type=='rejected'" class="popup-txrejected m30tp">
+  <div ng-if="type=='rejected'" class="popup-txrejected text-center m30tp">
     <i class="icon ion-close-round"></i>
     <div class="text-center size-18 tu text-bold m20t">
       <span translate>Payment Rejected</span>
diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index 38bc2f2a5..2ae134471 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -184,7 +184,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
               });
               return;
             }
-            walletService.publishAndSign(createdTxp, function(err, tx) {
+            walletService.publishAndSign(wallet, createdTxp, function(err, tx) {
               if (err) {
                 self.error = err;
                 $timeout(function() {
diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js
index 335ab0cbc..24eac0422 100644
--- a/src/js/controllers/buyAmazon.js
+++ b/src/js/controllers/buyAmazon.js
@@ -139,10 +139,13 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
                   });
                   return;
                 }
-                self.confirmTx(createdTxp, function(err, tx) {
+                walletService.publishAndSign(wallet, createdTxp, function(err, tx) {
                   if (err) {
                     ongoingProcess.set('Processing Transaction...', false);
                     self.error = bwcError.msg(err);
+                    walletService.removeTx(wallet, tx, function(err) {
+                      if (err) $log.debug(err);
+                    });
                     $timeout(function() {
                       $scope.$digest();
                     });
@@ -223,56 +226,4 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
       });
     };
 
-    this.confirmTx = function(txp, cb) {
-      fingerprintService.check(wallet, function(err) {
-        if (err) {
-          $log.debug(err);
-          return cb(err);
-        }
-
-        walletService.handleEncryptedWallet(wallet, function(err) {
-          if (err) {
-            $log.debug(err);
-            return bwcError.cb(err, null, cb);
-          }
-
-          ongoingProcess.set('Processing Transaction...', true);
-          walletService.publishTx(wallet, txp, function(err, publishedTxp) {
-            if (err) {
-              $log.debug(err);
-              return bwcError.cb(err, null, cb);
-            }
-
-            walletService.signTx(wallet, publishedTxp, function(err, signedTxp) {
-              if (err) {
-                $log.debug(err);
-                walletService.removeTx(wallet, signedTxp, function(err) {
-                  if (err) $log.debug(err);
-                });
-                return bwcError.cb(err, null, cb);
-              }
-              if (signedTxp.status == 'accepted') {
-                walletService.broadcastTx(wallet, signedTxp, function(err, broadcastedTxp) {
-                  if (err) {
-                    $log.debug(err);
-                    walletService.removeTx(wallet, broadcastedTxp, function(err) {
-                      if (err) $log.debug(err);
-                    });
-                    return bwcError.cb(err, null, cb);
-                  }
-                  $timeout(function() {
-                    return cb(null, broadcastedTxp);
-                  }, 5000);
-                });
-              } else {
-                $timeout(function() {
-                  return cb(null, signedTxp);
-                }, 5000);
-              }
-            });
-          });
-        });
-      });
-    };
-
   });