From fabfa6a49176b674e19f22b7293f12110b9efeeb Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Thu, 18 Feb 2021 23:08:48 -0800
Subject: [PATCH] Tweak language, remove original attachment once complete

---
 app/scenes/Settings/ImportExport.js | 6 +++---
 server/services/importer.js         | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/scenes/Settings/ImportExport.js b/app/scenes/Settings/ImportExport.js
index 9ae3c5949..338197ab2 100644
--- a/app/scenes/Settings/ImportExport.js
+++ b/app/scenes/Settings/ImportExport.js
@@ -128,8 +128,8 @@ function ImportExport() {
       {isImported && (
         <Notice>
           <Trans>
-            Your file has been uploaded and the import is being processed, you
-            can safely leave this page.
+            Your file has been uploaded and the import is currently being
+            processed, you can safely leave this page while it completes.
           </Trans>
         </Notice>
       )}
@@ -167,7 +167,7 @@ function ImportExport() {
             disabled={isImporting}
             primary
           >
-            {isImporting ? `${t("Importing")}…` : t("Confirm & Import")}
+            {isImporting ? `${t("Uploading")}…` : t("Confirm & Import")}
           </Button>
         </>
       ) : (
diff --git a/server/services/importer.js b/server/services/importer.js
index 3d4f96053..133e1b941 100644
--- a/server/services/importer.js
+++ b/server/services/importer.js
@@ -32,6 +32,8 @@ export default class Importer {
           ip: event.ip,
         });
 
+        await attachment.destroy();
+
         return;
       }
       default: