diff --git a/src/app/(agent)/agent/dashboard/page.tsx b/src/app/(agent)/agent/dashboard/page.tsx index 53f2342..03292b1 100644 --- a/src/app/(agent)/agent/dashboard/page.tsx +++ b/src/app/(agent)/agent/dashboard/page.tsx @@ -424,8 +424,8 @@ export default function AgentDashboard() { title={agentProfile.agentType?.name || 'Real Estate Agent'} location={ profileCardData.city && profileCardData.state - ? `${profileCardData.city}, ${profileCardData.state}` - : profileCardData.city || profileCardData.state || profileCardData.serviceAreas?.[0] || 'United States' + ? `${profileCardData.state}, ${profileCardData.city}` + : profileCardData.state || profileCardData.city || profileCardData.serviceAreas?.[0] || 'United States' } memberSince={formatMemberSince((agentProfile as unknown as { createdAt?: string }).createdAt)} bio={profileCardData.bio || agentProfile.bio || ''} diff --git a/src/app/(auth)/forgot-password/page.tsx b/src/app/(auth)/forgot-password/page.tsx index a5abd4c..3464397 100644 --- a/src/app/(auth)/forgot-password/page.tsx +++ b/src/app/(auth)/forgot-password/page.tsx @@ -66,7 +66,7 @@ export default function ForgotPasswordPage() { <> {/* Forgot Password Heading */}
-

Forget Your Password

+

Forgot Your Password

Enter your registered email to reset your password.

diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx index d36c1cd..53c5e5c 100644 --- a/src/app/(auth)/login/page.tsx +++ b/src/app/(auth)/login/page.tsx @@ -144,7 +144,7 @@ export default function LoginPage() {

Login

- Login or create an account to enjoy FREE consultation on all property inquiries. + Login or create an account

@@ -242,7 +242,7 @@ export default function LoginPage() { {/* Forgot Password Link */}
- Forget Your Password ? + Forgot Your Password?
diff --git a/src/app/(user)/user/profile/[id]/page.tsx b/src/app/(user)/user/profile/[id]/page.tsx index 0f5262c..a27964a 100644 --- a/src/app/(user)/user/profile/[id]/page.tsx +++ b/src/app/(user)/user/profile/[id]/page.tsx @@ -353,8 +353,8 @@ export default function AgentProfileView() { isVerified={agentProfile.isVerified} title={agentProfile.agentType?.name || 'Real Estate Agent'} location={profileCardData.city && profileCardData.state - ? `${profileCardData.city}, ${profileCardData.state}` - : profileCardData.city || profileCardData.state || agentProfile.serviceAreas?.[0] || '-'} + ? `${profileCardData.state}, ${profileCardData.city}` + : profileCardData.state || profileCardData.city || agentProfile.serviceAreas?.[0] || '-'} memberSince={formatMemberSince((agentProfile as unknown as { createdAt?: string }).createdAt)} bio={profileCardData.bio || agentProfile.bio || ''} expertise={profileCardData.expertise.length > 0 ? profileCardData.expertise : (agentProfile.specializations || [])} diff --git a/src/app/(user)/user/profiles/page.tsx b/src/app/(user)/user/profiles/page.tsx index 0b1d4ee..55540c1 100644 --- a/src/app/(user)/user/profiles/page.tsx +++ b/src/app/(user)/user/profiles/page.tsx @@ -157,9 +157,9 @@ function ProfileCard({ profile, resolvedAvatarUrl }: ProfileCardProps) { stateValue = profile.state; } - // Build location string + // Build location string (state first, then city) if (cityValue && stateValue) { - return `${cityValue}, ${stateValue}`; + return `${stateValue}, ${cityValue}`; } if (cityValue && profile.country) { return `${cityValue}, ${profile.country}`; diff --git a/src/components/message/MessagingPage.tsx b/src/components/message/MessagingPage.tsx index 0dcfc5d..1d66bf3 100644 --- a/src/components/message/MessagingPage.tsx +++ b/src/components/message/MessagingPage.tsx @@ -771,7 +771,7 @@ export function MessagingPage({ initialConversationId, initialAgentProfileId }: )} {(agent.city || agent.state) && (

- {[agent.city, agent.state].filter(Boolean).join(', ')} + {[agent.state, agent.city].filter(Boolean).join(', ')}

)}
diff --git a/src/components/message/NewConversationModal.tsx b/src/components/message/NewConversationModal.tsx index 09af9fe..bca0f3b 100644 --- a/src/components/message/NewConversationModal.tsx +++ b/src/components/message/NewConversationModal.tsx @@ -162,7 +162,7 @@ export function NewConversationModal({ )} {(contact.city || contact.state) && (

- {[contact.city, contact.state].filter(Boolean).join(', ')} + {[contact.state, contact.city].filter(Boolean).join(', ')}

)} diff --git a/src/components/settings/ProfileSettingsForm.tsx b/src/components/settings/ProfileSettingsForm.tsx index d63d1a9..5482459 100644 --- a/src/components/settings/ProfileSettingsForm.tsx +++ b/src/components/settings/ProfileSettingsForm.tsx @@ -81,7 +81,7 @@ export function ProfileSettingsForm({ career: profile.headline || profile.agentType?.name || 'Real Estate Agent', email: profile.email || session?.user?.email || '', phone: profile.phone || '', - location: [profile.city, profile.state, profile.country].filter(Boolean).join(', '), + location: [profile.state, profile.city, profile.country].filter(Boolean).join(', '), }; setFormData(profileData); setOriginalData(profileData); // Store original for cancel @@ -102,7 +102,7 @@ export function ProfileSettingsForm({ career: '', // Users don't have career/agent type email: profile.email || session?.user?.email || '', phone: profile.phone || '', - location: [profile.city, profile.state, profile.country].filter(Boolean).join(', '), + location: [profile.state, profile.city, profile.country].filter(Boolean).join(', '), }; setFormData(profileData); setOriginalData(profileData); // Store original for cancel @@ -287,7 +287,7 @@ export function ProfileSettingsForm({ const role = (session?.user as any)?.role; // Update profile based on role (email is not editable - tied to auth) - // Parse location into city, state, country + // Parse location into state, city, country (display order is state first) const locationParts = formData.location.split(',').map(s => s.trim()); if (role === 'AGENT') { @@ -296,8 +296,8 @@ export function ProfileSettingsForm({ lastName: formData.lastName, phone: formData.phone, headline: formData.career, - city: locationParts[0] || '', - state: locationParts[1] || '', + state: locationParts[0] || '', + city: locationParts[1] || '', country: locationParts[2] || '', }); } else { @@ -305,8 +305,8 @@ export function ProfileSettingsForm({ firstName: formData.firstName, lastName: formData.lastName, phone: formData.phone, - city: locationParts[0] || undefined, - state: locationParts[1] || undefined, + state: locationParts[0] || undefined, + city: locationParts[1] || undefined, country: locationParts[2] || undefined, }); }