From 5a2ba82fff5f248c1a4bc69e2f52bba27dcb9737 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 13 May 2025 10:46:29 +0530
Subject: [PATCH] return current state instead of original state on errors

this should be a more graceful behaviour on errors
---
 web/packages/new/photos/services/collections.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/packages/new/photos/services/collections.ts b/web/packages/new/photos/services/collections.ts
index d9663654cf..50a20d590c 100644
--- a/web/packages/new/photos/services/collections.ts
+++ b/web/packages/new/photos/services/collections.ts
@@ -379,23 +379,23 @@ export async function syncTrash(
 
     const updatedTrash = await updateTrash(
         collectionMap,
+        trash,
         lastSyncTime,
         onUpdateTrashFiles,
         onPruneDeletedFiles,
-        trash,
     );
     await cleanTrashCollections(updatedTrash);
 }
 
 const updateTrash = async (
     collections: Map<number, Collection>,
+    currentTrash: Trash,
     sinceTime: number,
     onUpdateTrashFiles: (files: EnteFile[]) => void,
     onPruneDeletedFiles: (files: EnteFile[]) => void,
-    currentTrash: Trash,
 ): Promise<Trash> => {
+    let updatedTrash: Trash = [...currentTrash];
     try {
-        let updatedTrash: Trash = [...currentTrash];
         let time = sinceTime;
 
         let resp;
@@ -441,11 +441,10 @@ const updateTrash = async (
             await localForage.setItem(TRASH, updatedTrash);
             await localForage.setItem(TRASH_TIME, time);
         } while (resp.data.hasMore);
-        return updatedTrash;
     } catch (e) {
         log.error("Get trash files failed", e);
     }
-    return currentTrash;
+    return updatedTrash;
 };
 
 export const emptyTrash = async () => {