From fcb8e51ec070c02a846426ada926b8d03000f205 Mon Sep 17 00:00:00 2001
From: BADtochka <badtochka@gmail.com>
Date: Sat, 6 Jun 2026 20:16:43 +0300
Subject: [PATCH] fix(admin): clear user route on modal close

---
 frontend/src/admin/AdminPanel.svelte |  2 +-
 frontend/src/lib/webapp/routes.js    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/admin/AdminPanel.svelte b/frontend/src/admin/AdminPanel.svelte
index e290043..48ea266 100644
--- a/frontend/src/admin/AdminPanel.svelte
+++ b/frontend/src/admin/AdminPanel.svelte
@@ -425,7 +425,7 @@
   function closeUserCard() {
     usersStore.closeUser({ skipPush: true });
     if (active === "users" || active === "payments") {
-      onSectionChange(active);
+      onSectionChange(active, 0);
     }
   }
 
diff --git a/frontend/src/lib/webapp/routes.js b/frontend/src/lib/webapp/routes.js
index 2c69574..3bd1e98 100644
--- a/frontend/src/lib/webapp/routes.js
+++ b/frontend/src/lib/webapp/routes.js
@@ -120,9 +120,11 @@ export function syncSectionPath(
   if (normalized === "admin") {
     const adm =
       adminSection || adminSectionFromPath(window.location.pathname, routePrefix) || "stats";
-    const uid =
-      adminUserId ??
-      (adm === "users" ? adminUserIdFromPath(window.location.pathname, routePrefix) : null);
+    const clearAdminUser = adminUserId === 0 || adminUserId === false;
+    const uid = clearAdminUser
+      ? null
+      : (adminUserId ??
+        (adm === "users" ? adminUserIdFromPath(window.location.pathname, routePrefix) : null));
     const supportTicketId =
       adm === "support"
         ? adminSupportTicketIdFromPath(window.location.pathname, routePrefix)
@@ -130,7 +132,7 @@ export function syncSectionPath(
     const paymentId =
       adm === "payments" ? adminPaymentIdFromPath(window.location.pathname, routePrefix) : null;
     const paymentUserId =
-      adm === "payments"
+      adm === "payments" && !clearAdminUser
         ? adminPaymentsUserIdFromPath(window.location.pathname, routePrefix)
         : null;
     if (adm === "users" && uid) targetPath = `/admin/users/${uid}`;