diff --git a/src/app/layout.tsx b/src/app/layout.tsx index d852bea..45a2dfa 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -132,6 +132,7 @@ export default async function RootLayout({ var HABIB_TOKEN_COOKIE = 'HABIB_TOKEN'; var HABIB_COINS_COOKIE = 'HABIB_COINS'; var HABIB_ENTRY_PATH_COOKIE = 'HABIB_MARRIAGE_ENTRY_PATH'; + var HABIB_MARRIAGE_DATA_COOKIE = 'HABIB_MARRIAGE_DATA'; var HABIB_COOKIE_MAX_AGE = 60 * 60 * 24 * 30; function writeCookie(name, value) { @@ -158,6 +159,17 @@ export default async function RootLayout({ return ''; } + var earlyMarriageCookie = readCookie(HABIB_MARRIAGE_DATA_COOKIE) || readCookie('habib_marriage_data'); + if (earlyMarriageCookie) { + try { + var parsedEarlyMarriage = JSON.parse(earlyMarriageCookie); + if (parsedEarlyMarriage && typeof parsedEarlyMarriage === 'object') { + window.__HABIB_MARRIAGE_INITIAL_DATA__ = parsedEarlyMarriage; + window.HABIB_MARRIAGE = parsedEarlyMarriage; + } + } catch (e) {} + } + if (!Object.getOwnPropertyDescriptor(window, 'HABIB_TOKEN')) { Object.defineProperty(window, 'HABIB_TOKEN', { configurable: true, diff --git a/src/app/questions-list/questions-list-client.tsx b/src/app/questions-list/questions-list-client.tsx index e468b76..0cd0396 100644 --- a/src/app/questions-list/questions-list-client.tsx +++ b/src/app/questions-list/questions-list-client.tsx @@ -113,10 +113,7 @@ export default function QuestionsListClient() { [profile], ); const isProfileRedirecting = - profileTargetPath !== null && - profileTargetPath !== "/questions-list" && - (!hasCompletedMarriageProfileBasics(profile) || - profile?.can_edit_profile === false); + profileTargetPath !== null && profileTargetPath !== "/questions-list"; useEffect(() => { if (isProfileRedirecting && profileTargetPath) { diff --git a/src/lib/auth-bridge.ts b/src/lib/auth-bridge.ts index b698e60..ec17c7a 100644 --- a/src/lib/auth-bridge.ts +++ b/src/lib/auth-bridge.ts @@ -53,6 +53,15 @@ class AuthBridge { if (win.HABIB_MARRIAGE || win.__HABIB_MARRIAGE_INITIAL_DATA__) { this.marriageData = win.HABIB_MARRIAGE ?? win.__HABIB_MARRIAGE_INITIAL_DATA__ ?? null; + } else { + const rawMarriageCookie = + getClientCookie("HABIB_MARRIAGE_DATA") ?? + getClientCookie("habib_marriage_data"); + if (rawMarriageCookie) { + try { + this.marriageData = JSON.parse(decodeURIComponent(rawMarriageCookie)); + } catch (e) {} + } } const token =