From 97c59174012db9342d9683c1a724b56df351fbc6 Mon Sep 17 00:00:00 2001
From: rstubryan <restubumirr@gmail.com>
Date: Fri, 26 Dec 2025 16:21:42 +0700
Subject: [PATCH] refactor(FE-438): Unsubscribe immediately after validation

---
 src/components/pages/uniformity/UniformityPageWrapper.tsx | 7 +++----
 src/components/pages/uniformity/form/UniformityForm.tsx   | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/pages/uniformity/UniformityPageWrapper.tsx b/src/components/pages/uniformity/UniformityPageWrapper.tsx
index 3871e487..4e71dc9c 100644
--- a/src/components/pages/uniformity/UniformityPageWrapper.tsx
+++ b/src/components/pages/uniformity/UniformityPageWrapper.tsx
@@ -26,15 +26,14 @@ export default function UniformityPageWrapper({
     const unsub = useUiStore.getState().subscribeIsValid((isValid) => {
       if (isValid) {
         router.push('/uniformity');
+        unsub?.();
         setExpandedDrawerOpen(false);
+      } else {
+        unsub?.();
       }
     });
 
     toggleValidate();
-
-    setTimeout(() => {
-      unsub?.();
-    }, 100);
   };
 
   return (
diff --git a/src/components/pages/uniformity/form/UniformityForm.tsx b/src/components/pages/uniformity/form/UniformityForm.tsx
index 0cfc6213..da4d7e4f 100644
--- a/src/components/pages/uniformity/form/UniformityForm.tsx
+++ b/src/components/pages/uniformity/form/UniformityForm.tsx
@@ -40,6 +40,7 @@ const UniformityForm = ({
   initialValues,
 }: UniformityFormProps) => {
   const router = useRouter();
+
   const subscribeValidate = useUiStore((s) => s.subscribeValidate);
   const setIsValid = useUiStore((s) => s.setIsValid);
   const expandedDrawerOpen = useUiStore((s) => s.expandedDrawerOpen);