From cc88ddf295a908ca3119704ac5688acddc744d3e Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 3 Nov 2016 13:49:37 -0300
Subject: [PATCH] Adds confirmation before delete transaction. Fix delete
 transaction

---
 src/js/controllers/modals/txpDetails.js | 32 +++++++++++++------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js
index 7d8918e18..975132f42 100644
--- a/src/js/controllers/modals/txpDetails.js
+++ b/src/js/controllers/modals/txpDetails.js
@@ -141,22 +141,24 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
   };
 
   $scope.remove = function() {
-    $scope.loading = true;
+    var title = gettextCatalog.getString('Warning!');
+    var msg = gettextCatalog.getString('Are you sure you want to remove this transaction?');
+    popupService.showConfirm(title, msg, null, null, function(res) {
+      if (res) {
+        ongoingProcess.set('removeTx', true);
+        walletService.removeTx($scope.wallet, $scope.tx, function(err) {
+          ongoingProcess.set('removeTx', false);
 
-    $timeout(function() {
-      ongoingProcess.set('removeTx', true);
-      walletService.removeTx($scope.wallet, $scope.tx, function(err) {
-        ongoingProcess.set('removeTx', false);
+          // Hacky: request tries to parse an empty response
+          if (err && !(err.message && err.message.match(/Unexpected/))) {
+            $scope.$emit('UpdateTx');
+            return setError(err, gettextCatalog.getString('Could not delete payment proposal'));
+          }
 
-        // Hacky: request tries to parse an empty response
-        if (err && !(err.message && err.message.match(/Unexpected/))) {
-          $scope.$emit('UpdateTx');
-          return setError(err, gettextCatalog.getString('Could not delete payment proposal'));
-        }
-
-        $scope.close();
-      });
-    }, 10);
+          $scope.close();
+        });
+      }
+    });
   };
 
   $scope.broadcast = function(txp) {
@@ -183,7 +185,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
   var updateTxInfo = function(eventName) {
     $scope.wallet.getTx($scope.tx.id, function(err, tx) {
       if (err) {
-        if (err.message && err.message == 'TX_NOT_FOUND' &&
+        if (err.message && err.message == 'Transaction proposal not found' &&
             (eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) {
           $scope.tx.removed = true;
           $scope.tx.canBeRemoved = false;