From 6d79b9587690c404f115b3bb8d1e5c0fcb4a8d65 Mon Sep 17 00:00:00 2001
From: Aaron R <aaron@raim.ist>
Date: Mon, 15 Nov 2021 15:37:16 -0600
Subject: [PATCH] Add root folder to zip file created by export chat feature
 (#7097)

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/utils/exportUtils/Exporter.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/exportUtils/Exporter.ts b/src/utils/exportUtils/Exporter.ts
index b23c1153e0..7861e5ce9a 100644
--- a/src/utils/exportUtils/Exporter.ts
+++ b/src/utils/exportUtils/Exporter.ts
@@ -77,7 +77,8 @@ export default abstract class Exporter {
 
     protected async downloadZIP(): Promise<string | void> {
         const brand = SdkConfig.get().brand;
-        const filename = `${brand} - Chat Export - ${formatFullDateNoDay(new Date())}.zip`;
+        const filenameWithoutExt = `${brand} - Chat Export - ${formatFullDateNoDay(new Date())}`;
+        const filename = `${filenameWithoutExt}.zip`;
         const { default: JSZip } = await import('jszip');
 
         const zip = new JSZip();
@@ -85,7 +86,7 @@ export default abstract class Exporter {
         if (!this.cancelled) this.updateProgress("Generating a ZIP");
         else return this.cleanUp();
 
-        for (const file of this.files) zip.file(file.name, file.blob);
+        for (const file of this.files) zip.file(filenameWithoutExt + "/" + file.name, file.blob);
 
         const content = await zip.generateAsync({ type: "blob" });