From f2b5c53d4c59b08d73d693658a7b904dc60792f0 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Tue, 7 Nov 2017 18:30:54 -0800
Subject: [PATCH] Immediately remove delivery receipts from the retry cache
 (#1719)

---
 js/background.js        | 2 +-
 js/delivery_receipts.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/background.js b/js/background.js
index bfcb05b31..e22cdcc7c 100644
--- a/js/background.js
+++ b/js/background.js
@@ -708,7 +708,7 @@
             source: deliveryReceipt.source
         });
 
-        receipt.on('remove', ev.confirm);
+        ev.confirm();
 
         // Calling this directly so we can wait for completion
         return Whisper.DeliveryReceipts.onReceipt(receipt);
diff --git a/js/delivery_receipts.js b/js/delivery_receipts.js
index 63147fe7b..e4289a57f 100644
--- a/js/delivery_receipts.js
+++ b/js/delivery_receipts.js
@@ -67,7 +67,6 @@
                         receipt.get('source'),
                         receipt.get('timestamp')
                     );
-                    resolve();
                 }
             }.bind(this)).catch(function(error) {
                 console.log(