From 1721c15079c6f834cd7aa2055a33dc826e7baee8 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Sun, 1 Jun 2025 22:56:06 +0200
Subject: [PATCH] Properly reset state after backup import

---
 src/lib/requests/RequestManager.ts    | 8 +-------
 src/modules/backup/screens/Backup.tsx | 1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/lib/requests/RequestManager.ts b/src/lib/requests/RequestManager.ts
index baffb295..a0e2c743 100644
--- a/src/lib/requests/RequestManager.ts
+++ b/src/lib/requests/RequestManager.ts
@@ -2684,7 +2684,7 @@ export class RequestManager {
         file: File,
         options?: MutationOptions<RestoreBackupMutation, RestoreBackupMutationVariables>,
     ): AbortableApolloMutationResponse<RestoreBackupMutation> {
-        const result = this.doRequest<RestoreBackupMutation, RestoreBackupMutationVariables>(
+        return this.doRequest<RestoreBackupMutation, RestoreBackupMutationVariables>(
             GQLMethod.MUTATION,
             RESTORE_BACKUP,
             { backup: file },
@@ -2692,12 +2692,6 @@ export class RequestManager {
                 ...options,
             },
         );
-
-        result.response.then(() => {
-            this.reset();
-        });
-
-        return result;
     }
 
     public validateBackupFile(
diff --git a/src/modules/backup/screens/Backup.tsx b/src/modules/backup/screens/Backup.tsx
index 42578b99..db9e32c5 100644
--- a/src/modules/backup/screens/Backup.tsx
+++ b/src/modules/backup/screens/Backup.tsx
@@ -120,6 +120,7 @@ export function Backup() {
                 makeToast(t('settings.backup.action.restore.error.label.failure'), 'error');
             }
 
+            requestManager.reset();
             backupRestoreId = undefined;
             setTriggerReRender(Date.now());
         }