FORM-426: Fix profile correspondent address (#131)

FORM-426 fix profile correspondent address
bratislava · Apr 3, 2023 · b9302d9 · b9302d9
1 parent fbe0a07
commit b9302d9
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/next/components/forms/segments/UserProfile/UserProfileDetailView.tsx b/next/components/forms/segments/UserProfile/UserProfileDetailView.tsx
@@ -9,13 +9,18 @@ interface UserProfileDetailViewProps {
 
 const UserProfileDetailView = ({ userData }: UserProfileDetailViewProps) => {
   const { t } = useTranslation('account')
+  const postalCodeFormat = (code: string): string => `${code?.slice(0, 3)} ${code?.slice(3)}`
   const { given_name, family_name, email, phone_number, address } = userData
   const fullName = `${given_name ?? ''} ${family_name ?? ''}`
-  const fullAddress = `${address?.street_address ?? ''}${
-    address?.street_address && (address?.locality || address?.postal_code) ? ', ' : ''
-  }${address?.locality}${address?.locality && address?.postal_code ? ' ' : ''}${
-    address?.postal_code ?? ''
-  }`
+  const fullAddress = address
+    ? address.street_address || address.postal_code || address.locality
+      ? `${
+          address?.street_address && (address?.postal_code || address?.locality)
+            ? `${address?.street_address},`
+            : address?.street_address
+        } ${postalCodeFormat(address?.postal_code)} ${address?.locality}`
+      : ''
+    : ''
   return (
     <div className="flex flex-col grow gap-6">
       {/* <UserProfileDetailViewRow label={t('profile_detail.titles_before_name')} /> */}