@salesforce/ui-bundle-template-app-react-sample-b2x 3.0.0 → 3.1.0

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Profile.tsx

@@ -2,14 +2,14 @@ import { useState, useEffect } from "react";
 import { z } from "zod";
 
 import { CenteredPageLayout } from "../layout/centered-page-layout";
-import { CardSkeleton } from "../layout/card-skeleton";
 import { AuthForm } from "../forms/auth-form";
 import { useAppForm } from "../hooks/form";
 import { ROUTES } from "../authenticationConfig";
 import { emailSchema } from "../authHelpers";
-import { getErrorMessage } from "../utils/helpers";
 import { useUser } from "../context/AuthContext";
 import { fetchUserProfile, updateUserProfile } from "../api/userProfileApi";
+import { Skeleton } from "../../../components/ui/skeleton";
+import { Field, FieldLabel } from "../../../components/ui/field";
 
 const optionalString = z
 	.string()
@@ -32,6 +32,38 @@ const profileSchema = z.object({
 
 type ProfileFormValues = z.infer<typeof profileSchema>;
 
+function FieldSkeleton({ label }: { label: string }) {
+	return (
+		<Field>
+			<FieldLabel>{label}</FieldLabel>
+			<Skeleton className="h-9 w-full rounded-md" />
+		</Field>
+	);
+}
+
+function ProfileFieldsSkeleton() {
+	return (
+		<div role="status" aria-live="polite">
+			<span className="sr-only">Loading profile…</span>
+			<FieldSkeleton label="Email" />
+			<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 items-start">
+				<FieldSkeleton label="First name" />
+				<FieldSkeleton label="Last name" />
+			</div>
+			<FieldSkeleton label="Phone" />
+			<FieldSkeleton label="Street" />
+			<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 items-start">
+				<FieldSkeleton label="City" />
+				<FieldSkeleton label="State" />
+			</div>
+			<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 items-start">
+				<FieldSkeleton label="Postal Code" />
+				<FieldSkeleton label="Country" />
+			</div>
+		</div>
+	);
+}
+
 export default function Profile() {
 	const user = useUser();
 	const [profile, setProfile] = useState<ProfileFormValues | null>(null);
@@ -62,7 +94,8 @@ export default function Profile() {
 				setSuccess(true);
 				window.scrollTo({ top: 0, behavior: "smooth" });
 			} catch (err) {
-				setSubmitError(getErrorMessage(err, "Failed to update profile"));
+				console.error("Failed to update profile", err);
+				setSubmitError("Failed to update profile");
 			}
 		},
 		onSubmitInvalid: () => {},
@@ -88,10 +121,9 @@ export default function Profile() {
 				}
 			})
 			.catch((err: any) => {
+				console.error("Failed to load profile", err);
 				if (mounted) {
-					setLoadError(getErrorMessage(err, "Failed to load profile"));
-				} else {
-					console.error("Failed to load profile", err);
+					setLoadError("Failed to load profile");
 				}
 			});
 		return () => {
@@ -106,9 +138,7 @@ export default function Profile() {
 		}
 	}, [profile, form]);
 
-	if (!profile && !loadError) {
-		return <CardSkeleton contentMaxWidth="md" loadingText="Loading profile…" />;
-	}
+	const loading = !profile && !loadError;
 
 	return (
 		<CenteredPageLayout contentMaxWidth="md" title={ROUTES.PROFILE.TITLE}>
@@ -116,44 +146,51 @@ export default function Profile() {
 				<AuthForm
 					title="Profile"
 					description="Update your account information"
+					showAlreadyLoggedIn={false}
 					error={loadError ?? submitError}
 					success={success && "Profile updated!"}
-					submit={{ text: "Save Changes", loadingText: "Saving…" }}
+					submit={{ text: "Save Changes", loadingText: "Saving…", disabled: loading }}
 					footer={{ link: ROUTES.CHANGE_PASSWORD.PATH, linkText: "Change password" }}
 				>
-					<form.AppField name="Email">
-						{(field) => <field.EmailField label="Email" disabled />}
-					</form.AppField>
-					<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 items-start">
-						<form.AppField name="FirstName">
-							{(field) => <field.TextField label="First name" autoComplete="given-name" />}
-						</form.AppField>
-						<form.AppField name="LastName">
-							{(field) => <field.TextField label="Last name" autoComplete="family-name" />}
-						</form.AppField>
-					</div>
-					<form.AppField name="Phone">
-						{(field) => <field.TextField label="Phone" type="tel" autoComplete="tel" />}
-					</form.AppField>
-					<form.AppField name="Street">
-						{(field) => <field.TextField label="Street" autoComplete="street-address" />}
-					</form.AppField>
-					<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 items-start">
-						<form.AppField name="City">
-							{(field) => <field.TextField label="City" autoComplete="address-level2" />}
-						</form.AppField>
-						<form.AppField name="State">
-							{(field) => <field.TextField label="State" autoComplete="address-level1" />}
-						</form.AppField>
-					</div>
-					<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 items-start">
-						<form.AppField name="PostalCode">
-							{(field) => <field.TextField label="Postal Code" autoComplete="postal-code" />}
-						</form.AppField>
-						<form.AppField name="Country">
-							{(field) => <field.TextField label="Country" autoComplete="country-name" />}
-						</form.AppField>
-					</div>
+					{loading ? (
+						<ProfileFieldsSkeleton />
+					) : (
+						<>
+							<form.AppField name="Email">
+								{(field) => <field.EmailField label="Email" disabled />}
+							</form.AppField>
+							<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 items-start">
+								<form.AppField name="FirstName">
+									{(field) => <field.TextField label="First name" autoComplete="given-name" />}
+								</form.AppField>
+								<form.AppField name="LastName">
+									{(field) => <field.TextField label="Last name" autoComplete="family-name" />}
+								</form.AppField>
+							</div>
+							<form.AppField name="Phone">
+								{(field) => <field.TextField label="Phone" type="tel" autoComplete="tel" />}
+							</form.AppField>
+							<form.AppField name="Street">
+								{(field) => <field.TextField label="Street" autoComplete="street-address" />}
+							</form.AppField>
+							<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 items-start">
+								<form.AppField name="City">
+									{(field) => <field.TextField label="City" autoComplete="address-level2" />}
+								</form.AppField>
+								<form.AppField name="State">
+									{(field) => <field.TextField label="State" autoComplete="address-level1" />}
+								</form.AppField>
+							</div>
+							<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 items-start">
+								<form.AppField name="PostalCode">
+									{(field) => <field.TextField label="Postal Code" autoComplete="postal-code" />}
+								</form.AppField>
+								<form.AppField name="Country">
+									{(field) => <field.TextField label="Country" autoComplete="country-name" />}
+								</form.AppField>
+							</div>
+						</>
+					)}
 				</AuthForm>
 			</form.AppForm>
 		</CenteredPageLayout>

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/Register.tsx

@@ -7,7 +7,7 @@ import { useAppForm } from "../hooks/form";
 import { createDataSDK } from "@salesforce/platform-sdk-data";
 import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
 import { emailSchema, passwordSchema, getStartUrl, type AuthResponse } from "../authHelpers";
-import { handleApiResponse, getErrorMessage } from "../utils/helpers";
+import { ApiError, handleApiResponse } from "../utils/helpers";
 
 const registerSchema = z
 	.object({
@@ -26,7 +26,7 @@ const registerSchema = z
 export default function Register() {
 	const navigate = useNavigate();
 	const [searchParams] = useSearchParams();
-	const [submitError, setSubmitError] = useState<string | null>(null);
+	const [submitError, setSubmitError] = useState<React.ReactNode>(null);
 
 	const form = useAppForm({
 		defaultValues: {
@@ -56,7 +56,7 @@ export default function Register() {
 						Accept: "application/json",
 					},
 				});
-				const result = await handleApiResponse<AuthResponse>(response, "Registration failed");
+				const result = await handleApiResponse<AuthResponse>(response);
 				if (result?.redirectUrl) {
 					// Hard navigate to the URL which logs the new user in
 					window.location.replace(result.redirectUrl);
@@ -65,7 +65,18 @@ export default function Register() {
 					navigate(ROUTES.LOGIN.PATH, { replace: true });
 				}
 			} catch (err) {
-				setSubmitError(getErrorMessage(err, "Registration failed"));
+				console.error("Registration failed", err);
+				if (err instanceof ApiError) {
+					setSubmitError(
+						<ul>
+							{err.errors.map((e, i) => (
+								<li key={i}>{e}</li>
+							))}
+						</ul>,
+					);
+				} else {
+					setSubmitError("Registration failed");
+				}
 			}
 		},
 		onSubmitInvalid: () => {},

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/pages/ResetPassword.tsx

@@ -8,13 +8,13 @@ import { useAppForm } from "../hooks/form";
 import { createDataSDK } from "@salesforce/platform-sdk-data";
 import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
 import { newPasswordSchema } from "../authHelpers";
-import { handleApiResponse, getErrorMessage } from "../utils/helpers";
+import { ApiError, handleApiResponse } from "../utils/helpers";
 
 export default function ResetPassword() {
 	const [searchParams] = useSearchParams();
 	const token = searchParams.get("token");
 	const [success, setSuccess] = useState(false);
-	const [submitError, setSubmitError] = useState<string | null>(null);
+	const [submitError, setSubmitError] = useState<React.ReactNode>(null);
 
 	const form = useAppForm({
 		defaultValues: { newPassword: "", confirmPassword: "" },
@@ -34,12 +34,27 @@ export default function ResetPassword() {
 						Accept: "application/json",
 					},
 				});
-				await handleApiResponse(response, "Password reset failed");
+				await handleApiResponse(response);
 				setSuccess(true);
 				// Scroll to top of page after successful submission so user sees it
 				window.scrollTo({ top: 0, behavior: "smooth" });
 			} catch (err) {
-				setSubmitError(getErrorMessage(err, "Password reset failed"));
+				console.error("Password reset failed", err);
+				if (err instanceof ApiError) {
+					setSubmitError(
+						err.errors.length === 1 ? (
+							err.errors[0]
+						) : (
+							<ul>
+								{err.errors.map((e, i) => (
+									<li key={i}>{e}</li>
+								))}
+							</ul>
+						),
+					);
+				} else {
+					setSubmitError("Password reset failed");
+				}
 			}
 		},
 		onSubmitInvalid: () => {},

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/utils/helpers.ts

@@ -1,29 +1,22 @@
 /**
- * MAINTAINABILITY: Robust error extraction.
- * Handles strings, objects, and standard Error instances.
- *
- * @param err - The error object (unknown type)
- * @param fallback - Fallback message if error doesn't have a message property
- * @returns The error message string
+ * Error thrown when the API returns a non-OK response with structured error messages.
+ * The `errors` array contains user-facing messages that are safe to display —
+ * backend Apex classes guarantee that system exceptions are never exposed.
  */
-export function getErrorMessage(err: unknown, fallback: string): string {
-	if (err instanceof Error) return err.message;
-	if (typeof err === "string") return err;
-	// Check if it's an object with a message property
-	if (typeof err === "object" && err !== null && "message" in err) {
-		return String((err as { message: unknown }).message);
+export class ApiError extends Error {
+	errors: string[];
+	constructor(errors: string[]) {
+		super(errors[0]);
+		this.name = "ApiError";
+		this.errors = errors;
 	}
-	return fallback;
 }
 
 /**
  * [Dev Note] Helper to parse the fetch Response.
  * It handles the distinction between success (JSON) and failure (throwing Error).
  */
-export async function handleApiResponse<T = unknown>(
-	response: Response,
-	fallbackError: string,
-): Promise<T> {
+export async function handleApiResponse<T = unknown>(response: Response): Promise<T> {
 	// 1. Robustness: Handle 204 No Content gracefully
 	if (response.status === 204) {
 		return {} as T;
@@ -41,9 +34,11 @@ export async function handleApiResponse<T = unknown>(
 	}
 
 	if (!response.ok) {
-		// [Dev Note] Throwing here allows the calling component to catch and
-		// display the error via getErrorMessage()
-		throw new Error(parseApiResponseError(data, fallbackError));
+		console.error("API request failed", data);
+		if (data?.errors?.length) {
+			throw new ApiError(data.errors);
+		}
+		throw new Error("An unexpected error occurred");
 	}
 
 	return data as T;
@@ -87,35 +82,3 @@ export function flattenGraphQLRecord<T>(
 		]),
 	) as T;
 }
-
-/**
- * [Dev Note] Salesforce APIs may return errors as an array or a single object.
- * This helper standardizes the extraction of the error message string.
- *
- * @param data - The response data.
- * @param fallbackError - Fallback error message if response doesn't have a message property
- * @returns The error message string
- */
-function parseApiResponseError(
-	data: any,
-	fallbackError: string = "An unknown error occurred",
-): string {
-	if (data?.message) {
-		return data.message;
-	}
-	if (data?.error) {
-		return data.error;
-	}
-	if (data?.errors && Array.isArray(data.errors) && data.errors.length > 0) {
-		return data.errors.join(" ") || fallbackError;
-	}
-	if (Array.isArray(data) && data.length > 0) {
-		return (
-			data
-				.map((e) => e?.message)
-				.filter(Boolean)
-				.join(" ") || fallbackError
-		);
-	}
-	return fallbackError;
-}

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountObjectDetailPage.tsx

@@ -18,7 +18,7 @@ import {
 } from "../../../../components/ui/collapsible";
 import { Separator } from "../../../../components/ui/separator";
 import { Skeleton } from "../../../../components/ui/skeleton";
-import { useCachedAsyncData } from "../../hooks/useCachedAsyncData";
+import { useAsyncData } from "../../hooks/useAsyncData";
 import { ObjectBreadcrumb } from "../../components/ObjectBreadcrumb";
 
 type AccountNode = NonNullable<
@@ -49,9 +49,7 @@ export default function AccountObjectDetail() {
 		data: account,
 		loading,
 		error,
-	} = useCachedAsyncData(() => fetchAccountDetail(recordId!), [recordId], {
-		key: `account:${recordId}`,
-	});
+	} = useAsyncData(() => fetchAccountDetail(recordId!), [recordId]);
 
 	return (
 		<div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6">

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/__examples__/pages/AccountSearch.tsx

@@ -6,7 +6,7 @@ import {
 	fetchDistinctIndustries,
 	fetchDistinctTypes,
 } from "../api/accountSearchService";
-import { useCachedAsyncData } from "../../hooks/useCachedAsyncData";
+import { useAsyncData } from "../../hooks/useAsyncData";
 import { fieldValue } from "../../utils/fieldUtils";
 import { useObjectSearchParams } from "../../hooks/useObjectSearchParams";
 import { Alert, AlertTitle, AlertDescription } from "../../../../components/ui/alert";
@@ -42,8 +42,8 @@ import PaginationControls from "../../components/PaginationControls";
 import type { PaginationConfig } from "../../hooks/useObjectSearchParams";
 
 const PAGINATION_CONFIG: PaginationConfig = {
-	defaultPageSize: 6,
-	validPageSizes: [6, 12, 24, 48],
+	defaultPageSize: 7,
+	validPageSizes: [7, 14, 28, 42],
 };
 
 type AccountNode = NonNullable<
@@ -77,22 +77,15 @@ const ACCOUNT_SORT_CONFIGS: SortFieldConfig<keyof Account_OrderBy>[] = [
 
 export default function AccountSearch() {
 	const [filtersOpen, setFiltersOpen] = useState(true);
-	const { data: industryOptions } = useCachedAsyncData(fetchDistinctIndustries, [], {
-		key: "distinctIndustries",
-		ttl: 300_000,
-	});
-	const { data: typeOptions } = useCachedAsyncData(fetchDistinctTypes, [], {
-		key: "distinctTypes",
-		ttl: 300_000,
-	});
+	const { data: industryOptions } = useAsyncData(fetchDistinctIndustries, []);
+	const { data: typeOptions } = useAsyncData(fetchDistinctTypes, []);
 
 	const { filters, sort, query, pagination, resetAll } = useObjectSearchParams<
 		Account_Filter,
 		Account_OrderBy
 	>(FILTER_CONFIGS, ACCOUNT_SORT_CONFIGS, PAGINATION_CONFIG);
 
-	const searchKey = `accounts:${JSON.stringify({ where: query.where, orderBy: query.orderBy, first: pagination.pageSize, after: pagination.afterCursor })}`;
-	const { data, loading, error } = useCachedAsyncData(
+	const { data, loading, error } = useAsyncData(
 		() =>
 			searchAccounts({
 				where: query.where,
@@ -101,7 +94,6 @@ export default function AccountSearch() {
 				after: pagination.afterCursor,
 			}),
 		[query.where, query.orderBy, pagination.pageSize, pagination.afterCursor],
-		{ key: searchKey },
 	);
 
 	const pageInfo = data?.pageInfo;
@@ -196,7 +188,7 @@ export default function AccountSearch() {
 						<ActiveFilters filters={filters.active} onRemove={filters.remove} />
 					</div>
 
-					<div className="min-h-112">
+					<div className="min-h-132">
 						{/* Loading state */}
 						{loading && (
 							<>

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/NumericRangeFilter.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { Input } from "../../../../components/ui/input";
 
 import { useFilterField } from "../FilterContext";
@@ -67,12 +67,16 @@ export function NumericRangeFilterInputs({
 
 	const externalMin = value?.min ?? "";
 	const externalMax = value?.max ?? "";
-	useEffect(() => {
+	const [prevExternalMin, setPrevExternalMin] = useState(externalMin);
+	const [prevExternalMax, setPrevExternalMax] = useState(externalMax);
+	if (prevExternalMin !== externalMin) {
+		setPrevExternalMin(externalMin);
 		setLocalMin(externalMin);
-	}, [externalMin]);
-	useEffect(() => {
+	}
+	if (prevExternalMax !== externalMax) {
+		setPrevExternalMax(externalMax);
 		setLocalMax(externalMax);
-	}, [externalMax]);
+	}
 
 	const isOutOfBounds = (v: string) => {
 		if (v === "") return false;

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/SearchFilter.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 
 import { SearchBar } from "../SearchBar";
 import { useFilterField } from "../FilterContext";
@@ -22,9 +22,11 @@ export function SearchFilter({
 	const [localValue, setLocalValue] = useState(value?.value ?? "");
 
 	const externalValue = value?.value ?? "";
-	useEffect(() => {
+	const [prevExternalValue, setPrevExternalValue] = useState(externalValue);
+	if (prevExternalValue !== externalValue) {
+		setPrevExternalValue(externalValue);
 		setLocalValue(externalValue);
-	}, [externalValue]);
+	}
 
 	const debouncedOnChange = useDebouncedCallback((v: string) => {
 		if (v) {

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/components/filters/TextFilter.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { Input } from "../../../../components/ui/input";
 import { cn } from "../../../../lib/utils";
 import { useFilterField } from "../FilterContext";
@@ -62,9 +62,11 @@ export function TextFilterInput({
 	const [localValue, setLocalValue] = useState(value?.value ?? "");
 
 	const externalValue = value?.value ?? "";
-	useEffect(() => {
+	const [prevExternalValue, setPrevExternalValue] = useState(externalValue);
+	if (prevExternalValue !== externalValue) {
+		setPrevExternalValue(externalValue);
 		setLocalValue(externalValue);
-	}, [externalValue]);
+	}
 
 	const debouncedOnChange = useDebouncedCallback((v: string) => {
 		if (v) {

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/object-search/hooks/useAsyncData.ts

@@ -22,16 +22,24 @@ export function useAsyncData<T>(
 	const [data, setData] = useState<T | null>(null);
 	const [loading, setLoading] = useState(true);
 	const [error, setError] = useState<string | null>(null);
+	const [generation, setGeneration] = useState(0);
 
 	const fetcherRef = useRef(fetcher);
 	useEffect(() => {
 		fetcherRef.current = fetcher;
 	});
 
+	// Detect dep changes during render to reset loading state and bump generation
+	const [prevDeps, setPrevDeps] = useState(deps);
+	if (deps.length !== prevDeps.length || deps.some((d, i) => d !== prevDeps[i])) {
+		setPrevDeps(deps);
+		setGeneration((g) => g + 1);
+		if (!loading) setLoading(true);
+		if (error !== null) setError(null);
+	}
+
 	useEffect(() => {
 		let cancelled = false;
-		setLoading(true);
-		setError(null);
 
 		fetcherRef
 			.current()
@@ -49,8 +57,7 @@ export function useAsyncData<T>(
 		return () => {
 			cancelled = true;
 		};
-		// eslint-disable-next-line react-hooks/exhaustive-deps --- deps are explicitly managed by the caller
-	}, deps);
+	}, [generation]);
 
 	return { data, loading, error };
 }

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useAsyncData.ts

@@ -0,0 +1,67 @@
+import { useEffect, useRef, useState } from 'react';
+
+interface UseAsyncDataResult<T> {
+  data: T | null;
+  loading: boolean;
+  error: string | null;
+}
+
+/**
+ * Runs an async fetcher on mount and whenever `deps` change.
+ * Returns the loading/error/data state. Does not cache — every call
+ * to the fetcher hits the source directly.
+ *
+ * A cleanup flag prevents state updates if the component unmounts
+ * or deps change before the fetch completes (avoids React warnings
+ * and stale updates from out-of-order responses).
+ */
+export function useAsyncData<T>(
+  fetcher: () => Promise<T>,
+  deps: React.DependencyList
+): UseAsyncDataResult<T> {
+  const [data, setData] = useState<T | null>(null);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [generation, setGeneration] = useState(0);
+
+  const fetcherRef = useRef(fetcher);
+  useEffect(() => {
+    fetcherRef.current = fetcher;
+  });
+
+  // Detect dep changes during render to reset loading state and bump generation
+  const [prevDeps, setPrevDeps] = useState(deps);
+  if (
+    deps.length !== prevDeps.length ||
+    deps.some((d, i) => d !== prevDeps[i])
+  ) {
+    setPrevDeps(deps);
+    setGeneration(g => g + 1);
+    if (!loading) setLoading(true);
+    if (error !== null) setError(null);
+  }
+
+  useEffect(() => {
+    let cancelled = false;
+
+    fetcherRef
+      .current()
+      .then(result => {
+        if (!cancelled) setData(result);
+      })
+      .catch(err => {
+        console.error(err);
+        if (!cancelled)
+          setError(err instanceof Error ? err.message : 'An error occurred');
+      })
+      .finally(() => {
+        if (!cancelled) setLoading(false);
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [generation]);
+
+  return { data, loading, error };
+}

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/hooks/useGeocode.ts

@@ -1,5 +1,5 @@
 import { geocodeAddress, getStateZipFromAddress, type GeocodeResult } from "@/utils/geocode";
-import { useCachedAsyncData } from "@/features/object-search/hooks/useCachedAsyncData";
+import { useAsyncData } from "@/hooks/useAsyncData";
 
 async function geocodeWithFallback(address: string): Promise<GeocodeResult | null> {
 	const normalized = address.replace(/\n/g, ", ").trim();
@@ -20,14 +20,10 @@ export function useGeocode(address: string | null | undefined): {
 } {
 	const trimmed = address?.trim() ?? "";
 
-	const { data: coords, loading } = useCachedAsyncData(
-		() => {
-			if (!trimmed) return Promise.resolve(null);
-			return geocodeWithFallback(trimmed);
-		},
-		[trimmed],
-		{ key: `geocode:${trimmed}`, ttl: 600_000 },
-	);
+	const { data: coords, loading } = useAsyncData(() => {
+		if (!trimmed) return Promise.resolve(null);
+		return geocodeWithFallback(trimmed);
+	}, [trimmed]);
 
 	return { coords, loading };
 }