From f08d9edf3212736ad0dab7c0254257bdaa6c6078 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Mon, 17 Aug 2026 17:25:05 +0330
Subject: [PATCH 1/2] refactor(ui): fix Button link nesting accessibility and
 add sync failure error toast

---
 src/app/questions-list/page.tsx       |  5 ++
 src/components/Componentes/button.tsx | 76 +++++++++++++++------------
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/src/app/questions-list/page.tsx b/src/app/questions-list/page.tsx
index 7a1768c..4690eeb 100644
--- a/src/app/questions-list/page.tsx
+++ b/src/app/questions-list/page.tsx
@@ -452,6 +452,11 @@ export default function QuestionsListPage() {
     } catch (err) {
       console.error("Failed to sync pending sections:", err);
       setIsSyncError(true);
+      setToastMessage(
+        t[
+          "Sending the match request failed. Please check your connection and try again."
+        ] ?? "Sending the match request failed. Please check your connection and try again."
+      );
     } finally {
       setIsSyncing(false);
     }
diff --git a/src/components/Componentes/button.tsx b/src/components/Componentes/button.tsx
index 0c9008c..5c013dc 100644
--- a/src/components/Componentes/button.tsx
+++ b/src/components/Componentes/button.tsx
@@ -153,7 +153,47 @@ export function Button({
     );
   };
 
-  const button = (
+  const content = isLoading ? (
+    <LoadingThreeDot />
+  ) : (
+    <span className="flex w-full items-center justify-center gap-2">
+      {renderArrow("left")}
+      <span className="flex min-w-0 flex-col items-center justify-center">
+        <span className="flex items-center justify-center gap-2 text-center group-16 font-semibold leading-none">
+          {children}
+        </span>
+        {description && !isOutlined ? (
+          <span
+            id={countdownId}
+            className="mt-1 text-center group-10 font-semibold leading-none text-white"
+          >
+            {description}
+          </span>
+        ) : null}
+      </span>
+      {countdownLocked ? (
+        <span className="shrink-0">
+          <CountdownProgress value={remainingSeconds} progress={progress} />
+        </span>
+      ) : (
+        renderArrow("right")
+      )}
+    </span>
+  );
+
+  if (href) {
+    return (
+      <Link
+        href={localizePath(href, locale)}
+        aria-disabled={isDisabled}
+        className={`${baseClassName} ${isDisabled ? "pointer-events-none" : ""}`}
+      >
+        {content}
+      </Link>
+    );
+  }
+
+  return (
     <button
       {...props}
       type={type}
@@ -161,41 +201,9 @@ export function Button({
       aria-describedby={description && !isOutlined ? countdownId : undefined}
       className={baseClassName}
     >
-      {isLoading ? (
-        <LoadingThreeDot />
-      ) : (
-        <span className="flex w-full items-center justify-center gap-2">
-          {renderArrow("left")}
-          <span className="flex min-w-0 flex-col items-center justify-center">
-            <span className="flex items-center justify-center gap-2 text-center group-16 font-semibold leading-none">
-              {children}
-            </span>
-            {description && !isOutlined ? (
-              <span
-                id={countdownId}
-                className="mt-1 text-center group-10 font-semibold leading-none text-white"
-              >
-                {description}
-              </span>
-            ) : null}
-          </span>
-          {countdownLocked ? (
-            <span className="shrink-0">
-              <CountdownProgress value={remainingSeconds} progress={progress} />
-            </span>
-          ) : (
-            renderArrow("right")
-          )}
-        </span>
-      )}
+      {content}
     </button>
   );
-
-  return href ? (
-    <Link href={localizePath(href, locale)}>{button}</Link>
-  ) : (
-    button
-  );
 }
 
 type CountdownProgressProps = {

From 740bb9a4a1630e70b91b245f57821efffa5945f0 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Mon, 17 Aug 2026 17:38:10 +0330
Subject: [PATCH 2/2] perf(core): optimize Layer 1 SSR cookie reading and unify
 synchronous head bootstrap

---
 src/app/layout.tsx | 107 +++++++++++++--------------------------------
 1 file changed, 31 insertions(+), 76 deletions(-)

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 9d284f4..2077197 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,8 +1,7 @@
 import type { Metadata, Viewport } from "next";
 import { Amiri } from "next/font/google";
 import localFont from "next/font/local";
-import { headers } from "next/headers";
-import Script from "next/script";
+import { cookies, headers } from "next/headers";
 import Providers from "./providers";
 import "./globals.css";
 import DevClickToComponent from "@/components/Componentes/dev-click-to-component";
@@ -54,10 +53,20 @@ export default async function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  const requestHeaders = await headers();
+  const [cookieStore, requestHeaders] = await Promise.all([
+    cookies(),
+    headers(),
+  ]);
   const headerLocale = requestHeaders.get("x-habib-locale");
+  const cookieLocale =
+    cookieStore.get("HABIB_LANGUAGE")?.value ??
+    cookieStore.get("habib_language")?.value;
   const locale =
-    headerLocale && isLocale(headerLocale) ? headerLocale : defaultLocale;
+    headerLocale && isLocale(headerLocale)
+      ? headerLocale
+      : isLocale(cookieLocale)
+        ? cookieLocale
+        : defaultLocale;
 
   return (
     <html
@@ -68,24 +77,22 @@ export default async function RootLayout({
       <head>
         <link rel="preconnect" href="https://habibapp.com" />
         <link rel="dns-prefetch" href="https://habibapp.com" />
-        <Script
-          id="flutter-and-cookies-setup"
-          strategy="beforeInteractive"
-          // biome-ignore lint/security/noDangerouslySetInnerHtml: Static document-start bridge code must run before hydration.
+        <script
+          id="habib-core-bootstrap"
           dangerouslySetInnerHTML={{
             __html: `
-              if (typeof window !== 'undefined') {
+              (function() {
+                if (typeof window === 'undefined') return;
+
+                // 1. Setup Flutter response dispatcher bridge
                 var flutterResponseListeners = window.__flutterResponseListeners || [];
                 window.__flutterResponseListeners = flutterResponseListeners;
 
                 window.addFlutterResponseListener = window.addFlutterResponseListener || function(listener) {
                   flutterResponseListeners.push(listener);
-
                   return function() {
                     var index = flutterResponseListeners.indexOf(listener);
-                    if (index >= 0) {
-                      flutterResponseListeners.splice(index, 1);
-                    }
+                    if (index >= 0) flutterResponseListeners.splice(index, 1);
                   };
                 };
 
@@ -99,6 +106,7 @@ export default async function RootLayout({
                   });
                 };
 
+                // 2. Cookie Management & Reactive Global Stores
                 var HABIB_TOKEN_COOKIE = 'HABIB_TOKEN';
                 var HABIB_COINS_COOKIE = 'HABIB_COINS';
                 var HABIB_ENTRY_PATH_COOKIE = 'HABIB_MARRIAGE_ENTRY_PATH';
@@ -106,38 +114,25 @@ export default async function RootLayout({
 
                 function writeCookie(name, value) {
                   if (value === undefined || value === null || value === '') return;
-
                   var secure = window.location.protocol === 'https:';
                   var cookie = name + '=' + encodeURIComponent(String(value)) + '; Path=/; Max-Age=' + HABIB_COOKIE_MAX_AGE + '; SameSite=Lax';
-
-                  if (secure) {
-                    cookie += '; Secure';
-                  }
-
+                  if (secure) cookie += '; Secure';
                   document.cookie = cookie;
                 }
 
                 function clearCookie(name) {
                   var secure = window.location.protocol === 'https:';
                   var cookie = name + '=; Path=/; Max-Age=0; SameSite=Lax';
-
-                  if (secure) {
-                    cookie += '; Secure';
-                  }
-
+                  if (secure) cookie += '; Secure';
                   document.cookie = cookie;
                 }
 
                 function readCookie(name) {
                   var cookies = document.cookie ? document.cookie.split('; ') : [];
-
                   for (var i = 0; i < cookies.length; i += 1) {
                     var parts = cookies[i].split('=');
-                    if (parts[0] === name) {
-                      return decodeURIComponent(parts.slice(1).join('='));
-                    }
+                    if (parts[0] === name) return decodeURIComponent(parts.slice(1).join('='));
                   }
-
                   return '';
                 }
 
@@ -155,24 +150,18 @@ export default async function RootLayout({
                           clearCookie(HABIB_ENTRY_PATH_COOKIE);
                         }
                         writeCookie(HABIB_TOKEN_COOKIE, nextToken);
-                        try {
-                          sessionStorage.setItem(HABIB_TOKEN_COOKIE, nextToken);
-                        } catch (e) {}
+                        try { sessionStorage.setItem(HABIB_TOKEN_COOKIE, nextToken); } catch (e) {}
                       } else {
                         clearCookie(HABIB_TOKEN_COOKIE);
                         clearCookie('habib_token');
                         clearCookie(HABIB_ENTRY_PATH_COOKIE);
-                        try {
-                          sessionStorage.removeItem(HABIB_TOKEN_COOKIE);
-                        } catch (e) {}
+                        try { sessionStorage.removeItem(HABIB_TOKEN_COOKIE); } catch (e) {}
                       }
                       window.dispatchEvent(new Event('habib:auth-token-changed'));
                     },
                     get: function() {
                       var ssVal;
-                      try {
-                        ssVal = sessionStorage.getItem(HABIB_TOKEN_COOKIE);
-                      } catch (e) {}
+                      try { ssVal = sessionStorage.getItem(HABIB_TOKEN_COOKIE); } catch (e) {}
                       return this._habib_token || readCookie(HABIB_TOKEN_COOKIE) || ssVal || undefined;
                     }
                   });
@@ -185,43 +174,19 @@ export default async function RootLayout({
                       this._habib_coins = value;
                       if (value !== undefined && value !== null && value !== '') {
                         writeCookie(HABIB_COINS_COOKIE, value);
-                        try {
-                          sessionStorage.setItem(HABIB_COINS_COOKIE, String(value));
-                        } catch (e) {}
+                        try { sessionStorage.setItem(HABIB_COINS_COOKIE, String(value)); } catch (e) {}
                       }
                     },
                     get: function() {
                       var cookieValue = readCookie(HABIB_COINS_COOKIE);
                       var ssVal;
-                      try {
-                        ssVal = sessionStorage.getItem(HABIB_COINS_COOKIE);
-                      } catch (e) {}
+                      try { ssVal = sessionStorage.getItem(HABIB_COINS_COOKIE); } catch (e) {}
                       return this._habib_coins || parseInt(cookieValue || ssVal || '0');
                     }
                   });
                 }
 
-                // Performance monitoring
-                window.addEventListener('load', function() {
-                  try {
-                    var perfData = performance.getEntriesByType('navigation')[0];
-                    if (perfData) {
-                      console.log('⏱️ Load time:', Math.round(perfData.loadEventEnd - perfData.fetchStart), 'ms');
-                    }
-                  } catch (e) {}
-                });
-              }
-            `,
-          }}
-        />
-        <Script
-          id="habib-web-bootstrap"
-          strategy="beforeInteractive"
-          // biome-ignore lint/security/noDangerouslySetInnerHtml: Static bootstrap code must receive Flutter config before the app is visible.
-          dangerouslySetInnerHTML={{
-            __html: `
-              (function() {
-                if (typeof window === 'undefined') return;
+                // 3. Document-Level Safe Area & Bootstrap
                 var root = document.documentElement;
                 var configApplied = false;
 
@@ -255,9 +220,6 @@ export default async function RootLayout({
                   window.dispatchEvent(new CustomEvent('habib:bootstrap-ready', { detail: config }));
                 }
 
-                // Document-start injection: if Flutter placed the config on
-                // window before this script ran, apply it immediately so the
-                // pre-config frame never renders at all.
                 if (window.__HABIB_BOOTSTRAP__) {
                   apply(window.__HABIB_BOOTSTRAP__);
                 }
@@ -269,16 +231,12 @@ export default async function RootLayout({
                   }
                 });
 
-                // This script lives in <head>, so everything above runs before
-                // the body renders. Hide the shell before the first paint
-                // inside the Habib WebView so the untuned frame (wrong
-                // safe-area / locale) never becomes visible. Plain browsers
-                // (no HabibApp bridge) are never hidden.
                 var isWebView = !!(window.HabibApp && window.HabibApp.postMessage);
                 if (isWebView && !configApplied) {
                   root.dataset.webBootstrap = 'pending';
                 }
 
+                // 4. Instant web_ready Announcement
                 function announce() {
                   if (window.__habibWebReadySent || !window.HabibApp || !window.HabibApp.postMessage) return false;
                   window.__habibWebReadySent = true;
@@ -291,9 +249,6 @@ export default async function RootLayout({
 
                 function tryAnnounce() {
                   if (!announce()) return false;
-                  // Watchdog: if the bridge never delivers initial_config
-                  // (wedged WebView / very old client), release the shell so
-                  // the app is never left invisible.
                   setTimeout(function() {
                     if (root.dataset.webBootstrap === 'pending') {
                       root.dataset.webBootstrap = 'ready';