@salesforce/ui-bundle-template-app-react-sample-b2x 12.6.3-canary.999.2.1.gd0b2ab15 → 12.7.0

package/dist/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.7.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.6.3...v12.7.0) (2026-09-22)
+
+
+### Bug Fixes
+
+* **template-sfdx-project:** preserve target network sender addresses @W-24209513@ ([#993](https://github.com/salesforce-experience-platform-emu/webapps/issues/993)) ([fddbfdd](https://github.com/salesforce-experience-platform-emu/webapps/commit/fddbfddcb41270720372b0fd4c486f043d9ba8c5))
+
+
+
 ## [12.6.3](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.6.2...v12.6.3) (2026-09-14)
 
 **Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project

package/dist/force-app/main/default/uiBundles/propertyrentalapp/package.json

@@ -19,8 +19,8 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/platform-sdk": "^12.6.3-canary.999.2.1.gd0b2ab15",
-    "@salesforce/ui-bundle": "^12.6.3-canary.999.2.1.gd0b2ab15",
+    "@salesforce/platform-sdk": "^12.7.0",
+    "@salesforce/ui-bundle": "^12.7.0",
     "@tailwindcss/vite": "^4.1.17",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -51,8 +51,8 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/graphiti": "^12.6.3-canary.999.2.1.gd0b2ab15",
-    "@salesforce/vite-plugin-ui-bundle": "^12.6.3-canary.999.2.1.gd0b2ab15",
+    "@salesforce/graphiti": "^12.7.0",
+    "@salesforce/vite-plugin-ui-bundle": "^12.7.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
@@ -60,7 +60,7 @@
     "@types/react": "^19.2.5",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.1.1",
-    "@vitest/ui": "^4.1.0",
+    "@vitest/ui": "^4.1.11",
     "eslint": "^9.39.1",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^7.0.1",
@@ -75,7 +75,7 @@
     "typescript-eslint": "^8.46.4",
     "vite": "^7.2.4",
     "vite-plugin-graphql-codegen": "^3.6.3",
-    "vitest": "^4.1.0"
+    "vitest": "^4.1.11"
   },
   "overrides": {
     "lodash": "^4.18.1",

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/api/graphql-operations-types.ts

@@ -7,8 +7,7 @@ export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> =
 	[_ in K]?: never;
 };
 export type Incremental<T> =
-	| T
-	| { [P in keyof T]?: P extends " $fragmentName" | "__typename" ? T[P] : never };
+	T | { [P in keyof T]?: P extends " $fragmentName" | "__typename" ? T[P] : never };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
 	ID: { input: string; output: string };

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/appLayout.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { Outlet, useLocation } from "react-router";
 import { TopBar } from "@/components/layout/TopBar";
 import { VerticalNav } from "@/components/layout/VerticalNav";
@@ -30,7 +30,8 @@ const PAGE_TITLES: { match: (path: string) => boolean; title: string }[] = [
 ];
 
 function pageTitleFor(pathname: string): string {
-	const page = PAGE_TITLES.find((entry) => entry.match(pathname))?.title ?? "Page Not Found";
+	const path = pathname.replace(/\/+$/, "").toLowerCase() || "/";
+	const page = PAGE_TITLES.find((entry) => entry.match(path))?.title ?? "Page Not Found";
 	return `${page} · ${APP_NAME}`;
 }
 
@@ -49,10 +50,10 @@ export default function AppLayout() {
 		}
 	}, [pathname]);
 
-	const closeNav = () => {
+	const closeNav = useCallback(() => {
 		setIsNavOpen(false);
 		menuButtonRef.current?.focus();
-	};
+	}, []);
 
 	return (
 		<TenantAccessProvider>

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/layout/VerticalNav.tsx

@@ -1,8 +1,9 @@
+import { Dialog } from "radix-ui";
 import { Link, useLocation } from "react-router";
-import { Home, Search, BarChart3, Wrench, Phone, type LucideIcon } from "lucide-react";
+import { Home, Search, BarChart3, Wrench, Phone, X, type LucideIcon } from "lucide-react";
 import { useAuth } from "@/features/authentication/context/AuthContext";
 import { useTenantAccess } from "@/context/TenantAccessContext";
-import { useEffect, useMemo } from "react";
+import { useMemo, useRef } from "react";
 
 interface VerticalNavItem {
 	path: string;
@@ -28,15 +29,10 @@ export function VerticalNav({ isOpen = false, onClose }: VerticalNavProps) {
 	const location = useLocation();
 	const { isAuthenticated } = useAuth();
 	const { hasTenantRecord } = useTenantAccess();
+	const mobileNavRef = useRef<HTMLElement>(null);
 
-	useEffect(() => {
-		if (!isOpen) return;
-		const onKey = (e: KeyboardEvent) => {
-			if (e.key === "Escape") onClose?.();
-		};
-		document.addEventListener("keydown", onKey);
-		return () => document.removeEventListener("keydown", onKey);
-	}, [isOpen, onClose]);
+	const triggerRef = useRef<HTMLElement | null>(null);
+	const navigatingRef = useRef(false);
 
 	const visibleItems = useMemo(
 		() =>
@@ -64,7 +60,19 @@ export function VerticalNav({ isOpen = false, onClose }: VerticalNavProps) {
 				<Link
 					key={item.path}
 					to={item.path}
-					onClick={handleClick}
+					onClick={
+						handleClick
+							? (event) => {
+									navigatingRef.current =
+										item.path !== location.pathname &&
+										!event.metaKey &&
+										!event.ctrlKey &&
+										!event.shiftKey &&
+										!event.altKey;
+									handleClick();
+								}
+							: undefined
+					}
 					className={`flex flex-col items-center justify-center gap-2 px-2 py-4 transition-colors ${
 						active
 							? "border-l-4 border-teal-700 bg-teal-100 text-teal-700"
@@ -90,23 +98,48 @@ export function VerticalNav({ isOpen = false, onClose }: VerticalNavProps) {
 				{navContent()}
 			</nav>
 
-			{/* Mobile overlay */}
-			{isOpen && (
-				<>
-					<div className="fixed inset-0 z-40 bg-black/50" onClick={onClose} aria-hidden />
-					{/*
-					 * Distinct label from the desktop sidebar: both navs are in the DOM at the
-					 * same time, and two navigation landmarks sharing one name is ambiguous.
-					 */}
-					<nav
-						id="mobile-nav"
-						className="fixed left-0 top-0 bottom-0 z-50 flex w-24 flex-col border-r border-gray-200 bg-white py-8"
-						aria-label="Mobile navigation"
+			<Dialog.Root
+				open={isOpen}
+				onOpenChange={(open) => {
+					if (!open) onClose?.();
+				}}
+			>
+				<Dialog.Portal>
+					<Dialog.Overlay className="fixed inset-0 z-40 bg-black/50" />
+					<Dialog.Content
+						aria-describedby={undefined}
+						className="fixed inset-y-0 left-0 z-50 w-24 overflow-y-auto border-r border-gray-200 bg-white py-4"
+						onOpenAutoFocus={(event) => {
+							event.preventDefault();
+							triggerRef.current =
+								document.activeElement instanceof HTMLElement ? document.activeElement : null;
+							navigatingRef.current = false;
+							mobileNavRef.current?.focus();
+						}}
+						onCloseAutoFocus={(event) => {
+							event.preventDefault();
+							if (!navigatingRef.current) triggerRef.current?.focus();
+						}}
 					>
-						{navContent(onClose)}
-					</nav>
-				</>
-			)}
+						<Dialog.Title className="sr-only">Navigation menu</Dialog.Title>
+						<Dialog.Close
+							className="mx-auto mb-2 flex size-11 items-center justify-center rounded-md text-gray-600 focus-visible:outline-2 focus-visible:outline-offset-2"
+							aria-label="Close navigation"
+						>
+							<X className="size-5" aria-hidden />
+						</Dialog.Close>
+						<nav
+							id="mobile-nav"
+							ref={mobileNavRef}
+							tabIndex={-1}
+							aria-label="Mobile navigation"
+							className="flex flex-col gap-0 outline-none"
+						>
+							{navContent(onClose)}
+						</nav>
+					</Dialog.Content>
+				</Dialog.Portal>
+			</Dialog.Root>
 		</>
 	);
 }

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/maintenanceRequests/MaintenanceRequestList.tsx

@@ -29,31 +29,32 @@ export default function MaintenanceRequestList({
 					onClose={() => setSelectedRequest(null)}
 				/>
 			)}
-			{loading && (
-				<div role="status" aria-live="polite" aria-atomic="true">
-					<SkeletonListRows count={skeletonCount} />
-					<span className="sr-only">Loading maintenance requests…</span>
-				</div>
-			)}
 			{error && (
 				<p className="py-4 text-sm text-destructive" role="alert">
 					{error}
 				</p>
 			)}
-			{!loading && !error && requests.length === 0 && (
+			{/* Keep loaded rows mounted to preserve the reading cursor during reloads. */}
+			{requests.length > 0 ? (
+				<div className="space-y-4" role="group" aria-busy={loading || undefined}>
+					{requests.map((request) => (
+						<MaintenanceRequestListItem
+							key={request.Id}
+							request={request}
+							onClick={setSelectedRequest}
+						/>
+					))}
+				</div>
+			) : !error && loading ? (
+				<div role="status" aria-live="polite" aria-atomic="true">
+					<SkeletonListRows count={skeletonCount} />
+					<span className="sr-only">Loading maintenance requests…</span>
+				</div>
+			) : !error ? (
 				<div role="status" className="py-8 text-center text-gray-500">
 					{emptyMessage}
 				</div>
-			)}
-			{!loading &&
-				!error &&
-				requests.map((request) => (
-					<MaintenanceRequestListItem
-						key={request.Id}
-						request={request}
-						onClick={setSelectedRequest}
-					/>
-				))}
+			) : null}
 		</>
 	);
 }

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyListingCard.tsx

@@ -151,7 +151,7 @@ export default function PropertyListingCard({
 							{amenityLabels.map((label) => (
 								<span
 									key={label}
-									className="rounded-full border border-border bg-muted/60 px-2.5 py-0.5 text-xs font-medium text-muted-foreground"
+									className="rounded-full border border-border bg-muted/60 px-2.5 py-0.5 text-xs font-medium text-neutral-600 dark:text-neutral-300"
 								>
 									{label}
 								</span>
@@ -163,7 +163,7 @@ export default function PropertyListingCard({
 				{/* Apply button */}
 				<Button
 					size="sm"
-					className="mt-4 w-full cursor-pointer rounded-xl bg-primary px-5 py-5 text-lg font-medium transition-colors duration-200 hover:bg-primary/90"
+					className="mt-4 w-full cursor-pointer rounded-xl bg-primary px-5 py-5 text-lg font-medium transition-colors duration-200 hover:bg-primary/95"
 					onClick={(e: MouseEvent<HTMLButtonElement>) => {
 						e.stopPropagation();
 						navigate(`/application?propertyId=${encodeURIComponent(node.Id)}`);

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertyMap.tsx

@@ -107,12 +107,20 @@ function MapBoundsReporter({
 
 /** Wraps popup content with an in-card close button and shadow; removes need for Leaflet's default chrome */
 function PopupContentWrapper({ children }: { children: ReactNode }) {
-	const map = useMap() as { closePopup?: () => void };
+	const map = useMap() as { closePopup?: () => void; getContainer?: () => HTMLElement };
+	const handleClose = () => {
+		const container = map.getContainer?.();
+		map.closePopup?.();
+		if (container) {
+			if (!container.hasAttribute("tabindex")) container.setAttribute("tabindex", "-1");
+			container.focus();
+		}
+	};
 	return (
 		<div className="relative min-w-0">
 			<button
 				type="button"
-				onClick={() => map.closePopup?.()}
+				onClick={handleClose}
 				className="absolute right-2 top-2 z-10 flex h-7 w-7 items-center justify-center rounded-full bg-black/60 text-white transition-colors hover:bg-black/80"
 				aria-label="Close"
 			>

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/properties/PropertySearchFilters.tsx

@@ -11,7 +11,7 @@ const FILTER_PILL_CLASS =
 	"inline-flex h-10 items-center gap-1.5 rounded-full border-2 border-primary bg-background px-4 text-sm font-medium text-foreground outline-none transition-colors hover:bg-primary/10 focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2";
 
 const SAVE_BUTTON_CLASS =
-	"mt-3 w-full rounded-lg bg-primary px-4 py-2 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2";
+	"mt-3 w-full rounded-lg bg-primary px-4 py-2 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/95 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2";
 
 const DEFAULT_PRICE_MIN = 0;
 const DEFAULT_PRICE_MAX = 100_000;

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/button.tsx

@@ -5,7 +5,7 @@ import { Slot } from 'radix-ui';
 import { cn } from '../../lib/utils';
 
 const buttonVariants = cva(
-  "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 rounded-lg border border-transparent bg-clip-padding text-sm font-medium focus-visible:ring-3 aria-invalid:ring-3 [&_svg:not([class*='size-'])]:size-4 inline-flex items-center justify-center whitespace-nowrap transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none shrink-0 [&_svg]:shrink-0 outline-none group/button select-none",
+  "focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 rounded-lg border border-transparent bg-clip-padding text-sm font-medium focus-visible:ring-3 aria-invalid:ring-3 [&_svg:not([class*='size-'])]:size-4 inline-flex items-center justify-center whitespace-nowrap transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none shrink-0 [&_svg]:shrink-0 outline-none group/button select-none",
   {
     variants: {
       variant: {
@@ -17,7 +17,7 @@ const buttonVariants = cva(
         ghost:
           'hover:bg-muted hover:text-foreground dark:hover:bg-muted/50 aria-expanded:bg-muted aria-expanded:text-foreground',
         destructive:
-          'bg-destructive/10 hover:bg-destructive/20 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/20 text-red-700 dark:text-destructive focus-visible:border-destructive/40 dark:hover:bg-destructive/30',
+          'bg-destructive/10 hover:bg-destructive/20 dark:bg-destructive/20 text-red-700 dark:text-destructive dark:hover:bg-destructive/30',
         link: 'text-primary underline-offset-4 hover:underline',
       },
       size: {

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/checkbox.tsx

@@ -14,7 +14,7 @@ function Checkbox({
     <CheckboxPrimitive.Root
       data-slot="checkbox"
       className={cn(
-        'border-input dark:bg-input/30 data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary data-checked:border-primary aria-invalid:aria-checked:border-primary aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 flex size-4 items-center justify-center rounded-[4px] border transition-colors group-has-disabled/field:opacity-50 focus-visible:ring-3 aria-invalid:ring-3 peer relative shrink-0 outline-none after:absolute after:-inset-x-3 after:-inset-y-2 disabled:cursor-not-allowed disabled:opacity-50',
+        'border-input dark:bg-input/30 data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary data-checked:border-primary aria-invalid:aria-checked:border-primary aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 flex size-4 items-center justify-center rounded-[4px] border transition-colors group-has-disabled/field:opacity-50 focus-visible:ring-3 aria-invalid:ring-3 peer relative shrink-0 outline-none after:absolute after:-inset-x-3 after:-inset-y-2 disabled:cursor-not-allowed disabled:opacity-50',
         className
       )}
       {...props}

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/input.tsx

@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
       type={type}
       data-slot="input"
       className={cn(
-        'dark:bg-input/30 border-input focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 disabled:bg-input/50 dark:disabled:bg-input/80 h-8 rounded-lg border bg-transparent px-2.5 py-1 text-base transition-colors file:h-6 file:text-sm file:font-medium focus-visible:ring-3 aria-invalid:ring-3 md:text-sm file:text-foreground placeholder:text-muted-foreground/70 placeholder:italic w-full min-w-0 outline-none file:inline-flex file:border-0 file:bg-transparent disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50',
+        'dark:bg-input/30 border-input focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 disabled:bg-input/50 dark:disabled:bg-input/80 h-8 rounded-lg border bg-transparent px-2.5 py-1 text-base transition-colors file:h-6 file:text-sm file:font-medium focus-visible:ring-3 aria-invalid:ring-3 md:text-sm file:text-foreground placeholder:text-muted-foreground placeholder:italic w-full min-w-0 outline-none file:inline-flex file:border-0 file:bg-transparent disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50',
         className
       )}
       {...props}

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/components/ui/select.tsx

@@ -42,7 +42,7 @@ function SelectTrigger({
       data-slot="select-trigger"
       data-size={size}
       className={cn(
-        "border-input data-placeholder:text-muted-foreground dark:bg-input/30 dark:hover:bg-input/50 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 gap-1.5 rounded-lg border bg-transparent py-2 pr-2 pl-2.5 text-sm transition-colors select-none focus-visible:ring-3 aria-invalid:ring-3 data-[size=default]:h-8 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] *:data-[slot=select-value]:gap-1.5 [&_svg:not([class*='size-'])]:size-4 flex w-fit items-center justify-between whitespace-nowrap outline-none disabled:cursor-not-allowed disabled:opacity-50 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center [&_svg]:pointer-events-none [&_svg]:shrink-0",
+        "border-input data-placeholder:text-muted-foreground dark:bg-input/30 dark:hover:bg-input/50 focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 gap-1.5 rounded-lg border bg-transparent py-2 pr-2 pl-2.5 text-sm transition-colors select-none focus-visible:ring-3 aria-invalid:ring-3 data-[size=default]:h-8 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] *:data-[slot=select-value]:gap-1.5 [&_svg:not([class*='size-'])]:size-4 flex w-fit items-center justify-between whitespace-nowrap outline-none disabled:cursor-not-allowed disabled:opacity-50 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center [&_svg]:pointer-events-none [&_svg]:shrink-0",
         className
       )}
       {...props}

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/context/TenantAccessContext.tsx

@@ -1,4 +1,4 @@
-import { createContext, useContext, useEffect, useState, type ReactNode } from "react";
+import { createContext, useCallback, useContext, useEffect, useState, type ReactNode } from "react";
 import { useAuth } from "@/features/authentication/context/AuthContext";
 import { getTenantProperties, type TenantProperty } from "@/api/tenants/tenantApi";
 
@@ -6,26 +6,38 @@ interface TenantAccessContextType {
 	hasTenantRecord: boolean;
 	tenantProperties: TenantProperty[];
 	loading: boolean;
+	error: string | null;
+	retry: () => void;
 }
 
 const TenantAccessContext = createContext<TenantAccessContextType>({
 	hasTenantRecord: false,
 	tenantProperties: [],
 	loading: true,
+	error: null,
+	retry: () => {},
 });
 
 export function TenantAccessProvider({ children }: { children: ReactNode }) {
 	const { user } = useAuth();
 	const [tenantProperties, setTenantProperties] = useState<TenantProperty[]>([]);
-	const [loading, setLoading] = useState(true);
+	const [loading, setLoading] = useState(Boolean(user?.id?.trim()));
+	const [error, setError] = useState<string | null>(null);
+	const [attempt, setAttempt] = useState(0);
+	const retry = useCallback(() => {
+		setLoading(true);
+		setError(null);
+		setAttempt((value) => value + 1);
+	}, []);
 
 	// Reset state synchronously during render when user changes
 	const [prevUserId, setPrevUserId] = useState(user?.id);
 	if (prevUserId !== user?.id) {
 		setPrevUserId(user?.id);
+		if (error) setError(null);
+		if (tenantProperties.length > 0) setTenantProperties([]);
 		const id = user?.id?.trim() ?? "";
 		if (!id) {
-			if (tenantProperties.length > 0) setTenantProperties([]);
 			if (loading) setLoading(false);
 		} else {
 			if (!loading) setLoading(true);
@@ -42,7 +54,10 @@ export function TenantAccessProvider({ children }: { children: ReactNode }) {
 				if (!cancelled) setTenantProperties(props);
 			})
 			.catch(() => {
-				if (!cancelled) setTenantProperties([]);
+				if (!cancelled) {
+					setTenantProperties([]);
+					setError("Unable to check tenant access. Please try again.");
+				}
 			})
 			.finally(() => {
 				if (!cancelled) setLoading(false);
@@ -51,12 +66,14 @@ export function TenantAccessProvider({ children }: { children: ReactNode }) {
 		return () => {
 			cancelled = true;
 		};
-	}, [user?.id]);
+	}, [user?.id, attempt]);
 
 	const hasTenantRecord = tenantProperties.length > 0;
 
 	return (
-		<TenantAccessContext.Provider value={{ hasTenantRecord, tenantProperties, loading }}>
+		<TenantAccessContext.Provider
+			value={{ hasTenantRecord, tenantProperties, loading, error, retry }}
+		>
 			{children}
 		</TenantAccessContext.Provider>
 	);

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/forms/auth-form.tsx

@@ -72,10 +72,21 @@ export function AuthForm({
 
 				<form
 					id={id}
-					onSubmit={(e) => {
+					onSubmit={async (e) => {
 						e.preventDefault();
 						e.stopPropagation();
-						form.handleSubmit();
+						const formElement = e.currentTarget;
+						const previousFocus = document.activeElement;
+						await form.handleSubmit();
+						if (!form.state.isValid) {
+							requestAnimationFrame(() => {
+								if (formElement.isConnected && document.activeElement === previousFocus) {
+									formElement
+										.querySelector<HTMLElement>('[aria-invalid="true"]:not(:disabled)')
+										?.focus();
+								}
+							});
+						}
 					}}
 					{...props}
 				>

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/hooks/form.tsx

@@ -1,5 +1,5 @@
 import { useId } from "react";
-import { createFormHookContexts, createFormHook } from "@tanstack/react-form";
+import { createFormHookContexts, createFormHook, useStore } from "@tanstack/react-form";
 import {
 	Field,
 	FieldDescription,
@@ -40,7 +40,10 @@ function TextField({
 	const id = providedId ?? generatedId;
 	const descriptionId = `${id}-description`;
 	const errorId = `${id}-error`;
-	const isInvalid = field.state.meta.isBlurred && field.state.meta.errors.length > 0;
+	// Submitted fields can be invalid before their first blur.
+	const submissionAttempts = useStore(field.form.store, (state) => state.submissionAttempts);
+	const isInvalid =
+		(field.state.meta.isBlurred || submissionAttempts > 0) && field.state.meta.errors.length > 0;
 
 	// Deduplicate errors by message
 	const errors = field.state.meta.errors;
@@ -64,7 +67,13 @@ function TextField({
 				aria-describedby={cn(description && descriptionId, isInvalid && errorId)}
 				{...props}
 			/>
-			{isInvalid && uniqueErrors.length > 0 && <FieldError id={errorId} errors={uniqueErrors} />}
+			{isInvalid && uniqueErrors.length > 0 && (
+				<FieldError
+					id={errorId}
+					errors={uniqueErrors}
+					role={submissionAttempts > 0 ? undefined : "alert"}
+				/>
+			)}
 		</Field>
 	);
 }

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layout/centered-page-layout.tsx

@@ -1,10 +1,12 @@
+/**
+ * Copyright (c) 2026, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+
 import { cva, type VariantProps } from "class-variance-authority";
 import { cn } from "../../../lib/utils";
 
-/**
- * Variant styles for the content container's maximum width.
- * Controls the maximum width of the inner content area within the page layout.
- */
 const contentContainerVariants = cva("w-full", {
 	variants: {
 		contentMaxWidth: {
@@ -18,48 +20,14 @@ const contentContainerVariants = cva("w-full", {
 	},
 });
 
-/**
- * Props for the CenteredPageLayout component.
- */
 interface CenteredPageLayoutProps
 	extends React.ComponentProps<"div">, VariantProps<typeof contentContainerVariants> {
-	/** The content to be displayed within the page layout */
 	children: React.ReactNode;
-	/**
-	 * Maximum width of the content container.
-	 * @default "sm"
-	 */
 	contentMaxWidth?: "sm" | "md" | "lg";
-	/**
-	 * Optional page title. If provided, will render a <title> component that React will place in the document head.
-	 */
 	title?: string;
-	/**
-	 * When true, content is aligned to the top instead of being vertically centered.
-	 * @default true
-	 */
 	topAligned?: boolean;
 }
 
-/**
- * CenteredPageLayout component that provides consistent page structure and spacing.
- *
- * This component creates a full-viewport-height container that centers its content
- * horizontally. By default, content is top-aligned; set `topAligned={false}` to
- * vertically center instead. The inner content area has a configurable maximum width
- * to prevent content from becoming too wide on large screens.
- *
- * @example
- * ```tsx
- * <CenteredPageLayout contentMaxWidth="md">
- *   <YourPageContent />
- * </CenteredPageLayout>
- *
- * <CenteredPageLayout contentMaxWidth="md" topAligned={false}>
- *   <VerticallyCenteredContent />
- * </CenteredPageLayout>
- * ```
- */
 export function CenteredPageLayout({
 	contentMaxWidth,
 	className,
@@ -71,7 +39,7 @@ export function CenteredPageLayout({
 	return (
 		<>
 			{title && <title>{title}</title>}
-			<main
+			<div
 				className={cn(
 					"flex min-h-svh w-full justify-center p-6 md:p-10",
 					topAligned ? "items-start" : "items-center",
@@ -81,7 +49,7 @@ export function CenteredPageLayout({
 				{...props}
 			>
 				<div className={contentContainerVariants({ contentMaxWidth })}>{children}</div>
-			</main>
+			</div>
 		</>
 	);
 }

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/TenantRoute.tsx

@@ -1,19 +1,43 @@
 import { Navigate, Outlet, useLocation } from "react-router";
 import { useAuth } from "@/features/authentication/context/AuthContext";
-import { ROUTES } from "@/features/authentication/authenticationConfig";
+import {
+	AUTH_REDIRECT_PARAM,
+	ROUTES,
+} from "@/features/authentication/authenticationConfig";
 import { useTenantAccess } from "@/context/TenantAccessContext";
 
 export default function TenantRoute() {
 	const location = useLocation();
 	const { isAuthenticated, loading } = useAuth();
-	const { hasTenantRecord, loading: tenantLoading } = useTenantAccess();
+	const { hasTenantRecord, loading: tenantLoading, error, retry } = useTenantAccess();
 
-	if (loading || tenantLoading) return null;
+	if (loading) return <p role="status">Checking sign-in…</p>;
 
 	if (!isAuthenticated) {
-		return <Navigate to={ROUTES.LOGIN.PATH} state={{ from: location.pathname }} replace />;
+		const search = new URLSearchParams({
+			[AUTH_REDIRECT_PARAM]: location.pathname + location.search,
+		});
+		return <Navigate to={{ pathname: ROUTES.LOGIN.PATH, search: search.toString() }} replace />;
 	}
 
+	if (tenantLoading) return <p role="status">Checking tenant access…</p>;
+	if (error)
+		return (
+			<div className="space-y-4">
+				<h1 className="text-xl font-semibold">Tenant access unavailable</h1>
+				<p role="alert" className="text-destructive">
+					{error}
+				</p>
+				<button
+					type="button"
+					onClick={retry}
+					className="rounded-md border px-4 py-2 focus-visible:outline-2 focus-visible:outline-offset-2"
+				>
+					Try again
+				</button>
+			</div>
+		);
+
 	if (!hasTenantRecord) {
 		return <Navigate to="/" replace />;
 	}

package/dist/force-app/main/default/uiBundles/propertyrentalapp/src/features/authentication/layouts/privateRouteLayout.tsx

@@ -12,7 +12,7 @@ export default function PrivateRoute() {
 	const { isAuthenticated, loading } = useAuth();
 	const location = useLocation();
 
-	if (loading) return null;
+	if (loading) return <p role="status">Checking sign-in…</p>;
 
 	if (!isAuthenticated) {
 		const searchParams = new URLSearchParams();