-
-
-
-
+
+
+
+
-
))}
@@ -255,7 +286,7 @@ export default function QuestionsListPage() {
diff --git a/src/app/terms/page.test.tsx b/src/app/terms/page.test.tsx
index 2a993ba..d642677 100644
--- a/src/app/terms/page.test.tsx
+++ b/src/app/terms/page.test.tsx
@@ -72,6 +72,23 @@ describe('TermsRoute Guard', () => {
expect(mockReplace).not.toHaveBeenCalled();
});
+ it('pending_onboarding with completed profile basics redirects to Questions', async () => {
+ mockUseMarriageProfileQuery.mockReturnValue({
+ isLoading: false,
+ data: {
+ status: 'pending_onboarding',
+ gender: 'female',
+ is_registering_for_self: true,
+ }
+ });
+ render(
);
+
+ expect(screen.queryByTestId('slider-page')).not.toBeInTheDocument();
+ await waitFor(() => {
+ expect(mockReplace).toHaveBeenCalledWith('/questions-list');
+ });
+ });
+
it('pending_info => redirects to Questions and SliderPage is NOT rendered', async () => {
mockUseMarriageProfileQuery.mockReturnValue({
isLoading: false,
diff --git a/src/app/terms/page.tsx b/src/app/terms/page.tsx
index a76607c..c6fee7d 100644
--- a/src/app/terms/page.tsx
+++ b/src/app/terms/page.tsx
@@ -3,7 +3,10 @@
import { useEffect } from "react";
import { useRouter } from "next/navigation";
import { useMarriageProfileQuery } from "@/hooks/marriage/use-profile-main";
-import { getSubmitPath } from "@/lib/get-submit-path";
+import {
+ getSubmitPath,
+ hasCompletedMarriageProfileBasics,
+} from "@/lib/get-submit-path";
import SliderPage from "@/components/Componentes/slider-page";
import Button from "@/components/Componentes/button";
import { useI18n } from "@/translations/provider";
@@ -16,7 +19,10 @@ export default function TermsRoute() {
useEffect(() => {
if (!isLoading && profile) {
- if (profile.status !== "pending_onboarding") {
+ if (
+ profile.status !== "pending_onboarding" ||
+ hasCompletedMarriageProfileBasics(profile)
+ ) {
const target = getSubmitPath(profile);
if (target !== "/terms") {
router.replace(localizePath(target, locale));
@@ -50,7 +56,11 @@ export default function TermsRoute() {
);
}
- if (profile && profile.status !== "pending_onboarding") {
+ if (
+ profile &&
+ (profile.status !== "pending_onboarding" ||
+ hasCompletedMarriageProfileBasics(profile))
+ ) {
// If target is /terms but status is not pending_onboarding, we should still not render SliderPage
// to prevent showing Onboarding to users who already finished it but have an unknown status.
return (
diff --git a/src/components/Componentes/entry-route-resolver.test.tsx b/src/components/Componentes/entry-route-resolver.test.tsx
new file mode 100644
index 0000000..7b5dfdf
--- /dev/null
+++ b/src/components/Componentes/entry-route-resolver.test.tsx
@@ -0,0 +1,134 @@
+import { render, waitFor } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import EntryRouteResolver from "./entry-route-resolver";
+
+const mocks = vi.hoisted(() => ({
+ getCachedEntryPath: vi.fn(),
+ isAuthenticated: vi.fn(),
+ refetchProfile: vi.fn(),
+ replace: vi.fn(),
+}));
+
+vi.mock("next/navigation", () => ({
+ useRouter: () => ({ replace: mocks.replace }),
+}));
+
+vi.mock("@/lib/auth-bridge", () => ({
+ HABIB_AUTH_TOKEN_CHANGED_EVENT: "habib:auth-token-changed",
+ authBridge: { isAuthenticated: mocks.isAuthenticated },
+}));
+
+vi.mock("@/lib/entry-route-cache", () => ({
+ getCachedMarriageEntryPath: mocks.getCachedEntryPath,
+}));
+
+vi.mock("@/hooks/marriage/use-profile-main", () => ({
+ useMarriageProfileQuery: () => ({ refetch: mocks.refetchProfile }),
+}));
+
+vi.mock("@/translations/provider", () => ({
+ useI18n: () => ({ locale: "en" }),
+}));
+
+vi.mock("@/translations/config", () => ({
+ localizePath: (path: string, locale: string) => `/${locale}${path}`,
+}));
+
+describe("EntryRouteResolver", () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ mocks.getCachedEntryPath.mockReturnValue(null);
+ delete window.HabibApp;
+ });
+
+ it("renders no loading or page content while resolving", () => {
+ mocks.isAuthenticated.mockReturnValue(true);
+ mocks.refetchProfile.mockReturnValue(new Promise(() => {}));
+
+ const { container } = render(
);
+
+ expect(container).toBeEmptyDOMElement();
+ });
+
+ it("routes a registered pending-info user directly to questions", async () => {
+ mocks.isAuthenticated.mockReturnValue(true);
+ mocks.refetchProfile.mockResolvedValue({
+ data: {
+ status: "pending_info",
+ gender: "female",
+ is_registering_for_self: true,
+ },
+ });
+
+ render(
);
+
+ await waitFor(() => {
+ expect(mocks.replace).toHaveBeenCalledWith("/en/questions-list");
+ });
+ });
+
+ it("uses the persistent entry path without refetching the profile", async () => {
+ mocks.isAuthenticated.mockReturnValue(true);
+ mocks.getCachedEntryPath.mockReturnValue("/questions-list");
+
+ render(
);
+
+ await waitFor(() => {
+ expect(mocks.replace).toHaveBeenCalledWith("/en/questions-list");
+ });
+ expect(mocks.refetchProfile).not.toHaveBeenCalled();
+ });
+
+ it("routes a registered user with an advanced status to that status page", async () => {
+ mocks.isAuthenticated.mockReturnValue(true);
+ mocks.refetchProfile.mockResolvedValue({
+ data: {
+ status: "waiting",
+ gender: "male",
+ is_registering_for_self: false,
+ },
+ });
+
+ render(
);
+
+ await waitFor(() => {
+ expect(mocks.replace).toHaveBeenCalledWith("/en/finding-match");
+ });
+ });
+
+ it("routes an unauthenticated browser user to the real intro route", async () => {
+ mocks.isAuthenticated.mockReturnValue(false);
+
+ render(
);
+
+ await waitFor(() => {
+ expect(mocks.replace).toHaveBeenCalledWith("/en/intro");
+ });
+ expect(mocks.refetchProfile).not.toHaveBeenCalled();
+ });
+
+ it("waits for the WebView token event without rendering a loading page", async () => {
+ let authenticated = false;
+ mocks.isAuthenticated.mockImplementation(() => authenticated);
+ mocks.refetchProfile.mockResolvedValue({
+ data: {
+ status: "pending_info",
+ gender: "female",
+ is_registering_for_self: true,
+ },
+ });
+ window.HabibApp = { postMessage: vi.fn() };
+
+ const { container } = render(
);
+
+ expect(container).toBeEmptyDOMElement();
+ expect(mocks.replace).not.toHaveBeenCalled();
+
+ authenticated = true;
+ window.dispatchEvent(new Event("habib:auth-token-changed"));
+
+ await waitFor(() => {
+ expect(mocks.replace).toHaveBeenCalledWith("/en/questions-list");
+ });
+ });
+});
diff --git a/src/components/Componentes/entry-route-resolver.tsx b/src/components/Componentes/entry-route-resolver.tsx
new file mode 100644
index 0000000..7c55c88
--- /dev/null
+++ b/src/components/Componentes/entry-route-resolver.tsx
@@ -0,0 +1,103 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { useEffect, useRef } from "react";
+import { useMarriageProfileQuery } from "@/hooks/marriage/use-profile-main";
+import {
+ authBridge,
+ HABIB_AUTH_TOKEN_CHANGED_EVENT,
+} from "@/lib/auth-bridge";
+import { getCachedMarriageEntryPath } from "@/lib/entry-route-cache";
+import {
+ getSubmitPath,
+ hasCompletedMarriageProfileBasics,
+} from "@/lib/get-submit-path";
+import { localizePath } from "@/translations/config";
+import { useI18n } from "@/translations/provider";
+
+export default function EntryRouteResolver() {
+ const router = useRouter();
+ const { locale } = useI18n();
+ const { refetch } = useMarriageProfileQuery({
+ enabled: false,
+ retry: false,
+ });
+ const entryCheckIdRef = useRef(0);
+
+ useEffect(() => {
+ let isActive = true;
+ let bridgeWaitTimeout: number | undefined;
+
+ const goToIntro = () => {
+ router.replace(localizePath("/intro", locale));
+ };
+
+ const resolveEntryRoute = async () => {
+ if (!authBridge.isAuthenticated()) {
+ if (isActive) {
+ goToIntro();
+ }
+ return;
+ }
+
+ const cachedEntryPath = getCachedMarriageEntryPath();
+ if (cachedEntryPath) {
+ router.replace(localizePath(cachedEntryPath, locale));
+ return;
+ }
+
+ const checkId = ++entryCheckIdRef.current;
+
+ try {
+ const { data: profile } = await refetch();
+
+ if (!isActive || checkId !== entryCheckIdRef.current) {
+ return;
+ }
+
+ if (!hasCompletedMarriageProfileBasics(profile)) {
+ goToIntro();
+ return;
+ }
+
+ router.replace(localizePath(getSubmitPath(profile), locale));
+ } catch (error) {
+ console.warn("Could not resolve entry route", error);
+ if (isActive && checkId === entryCheckIdRef.current) {
+ goToIntro();
+ }
+ }
+ };
+
+ const handleTokenChanged = () => {
+ if (bridgeWaitTimeout !== undefined) {
+ window.clearTimeout(bridgeWaitTimeout);
+ bridgeWaitTimeout = undefined;
+ }
+ void resolveEntryRoute();
+ };
+
+ window.addEventListener(HABIB_AUTH_TOKEN_CHANGED_EVENT, handleTokenChanged);
+
+ if (authBridge.isAuthenticated()) {
+ void resolveEntryRoute();
+ } else if (window.HabibApp) {
+ bridgeWaitTimeout = window.setTimeout(goToIntro, 4_000);
+ } else {
+ goToIntro();
+ }
+
+ return () => {
+ isActive = false;
+ if (bridgeWaitTimeout !== undefined) {
+ window.clearTimeout(bridgeWaitTimeout);
+ }
+ window.removeEventListener(
+ HABIB_AUTH_TOKEN_CHANGED_EVENT,
+ handleTokenChanged,
+ );
+ };
+ }, [locale, refetch, router]);
+
+ return null;
+}
diff --git a/src/components/Componentes/female-outcome-sheet.test.tsx b/src/components/Componentes/female-outcome-sheet.test.tsx
index d2a325f..00d812b 100644
--- a/src/components/Componentes/female-outcome-sheet.test.tsx
+++ b/src/components/Componentes/female-outcome-sheet.test.tsx
@@ -77,11 +77,15 @@ describe("FemaleOutcomeSheet", () => {
});
expect(confirmation).toHaveProperty("disabled", true);
- await userEvent.type(
+ fireEvent.change(
screen.getByPlaceholderText(
"Feel free to briefly explain your decision...",
),
- "The families could not agree on the next steps.",
+ {
+ target: {
+ value: "The families could not agree on the next steps.",
+ },
+ },
);
expect(confirmation).toHaveProperty("disabled", false);
});
diff --git a/src/components/Componentes/loading-skeleton.tsx b/src/components/Componentes/loading-skeleton.tsx
index d38315b..7a2c95f 100644
--- a/src/components/Componentes/loading-skeleton.tsx
+++ b/src/components/Componentes/loading-skeleton.tsx
@@ -1,7 +1,8 @@
import type { ComponentProps } from "react";
+import { cn } from "@/lib/utils";
-interface LoadingSkeletonProps extends ComponentProps<"div"> {
- variant?: "pulse" | "shimmer";
+export interface LoadingSkeletonProps extends ComponentProps<"div"> {
+ variant?: "pulse" | "shimmer" | "white";
}
export function LoadingSkeleton({
@@ -10,20 +11,20 @@ export function LoadingSkeleton({
...props
}: LoadingSkeletonProps) {
const baseClasses =
- variant === "shimmer"
- ? "shimmer-bg"
- : "animate-pulse bg-neutral-200/80 dark:bg-neutral-800/80";
-
- const hasRoundedClass = className
- .split(" ")
- .some((c) => c.startsWith("rounded-"));
- const roundedClass = hasRoundedClass ? "" : "rounded-md";
+ variant === "white"
+ ? "shimmer-white-bg"
+ : variant === "pulse"
+ ? "animate-pulse bg-slate-200/80 dark:bg-white/[0.08]"
+ : "shimmer-bg";
return (
);
}
+
+export { LoadingSkeleton as Skeleton };
+export default LoadingSkeleton;
diff --git a/src/components/Componentes/network-image.tsx b/src/components/Componentes/network-image.tsx
new file mode 100644
index 0000000..73eca42
--- /dev/null
+++ b/src/components/Componentes/network-image.tsx
@@ -0,0 +1,84 @@
+"use client";
+
+import Image, { type ImageProps } from "next/image";
+import { useState, useEffect } from "react";
+import { cn } from "@/lib/utils";
+
+export interface NetworkImageProps extends Omit
{
+ src?: string | null;
+ fallbackSrc?: string;
+ containerClassName?: string;
+ placeholderClassName?: string;
+}
+
+export function NetworkImage({
+ src,
+ fallbackSrc = "/assets/images/Frame 2095586523.png",
+ alt = "",
+ className,
+ containerClassName,
+ placeholderClassName,
+ fill,
+ width,
+ height,
+ priority,
+ ...props
+}: NetworkImageProps) {
+ const initialSrc = src || fallbackSrc;
+ const [imgSrc, setImgSrc] = useState(initialSrc);
+ const [isLoaded, setIsLoaded] = useState(false);
+ const [hasError, setHasError] = useState(false);
+
+ useEffect(() => {
+ const target = src || fallbackSrc;
+ setImgSrc(target);
+ setHasError(false);
+ setIsLoaded(false);
+ }, [src, fallbackSrc]);
+
+ return (
+
+ {!isLoaded && !hasError && (
+
+ )}
+
setIsLoaded(true)}
+ onError={() => {
+ if (imgSrc !== fallbackSrc) {
+ setImgSrc(fallbackSrc);
+ } else {
+ setHasError(true);
+ }
+ }}
+ className={cn(
+ "transition-opacity duration-300",
+ !isLoaded ? "opacity-0" : "opacity-100",
+ className,
+ )}
+ />
+