From 08a9660155a75fc753e2216dd6fdf36bb1573b90 Mon Sep 17 00:00:00 2001
From: Robert Chen <robert@expensify.com>
Date: Wed, 13 Oct 2021 14:59:39 -0700
Subject: [PATCH] Pass in error message, pre-format addresses

---
 .../ReimbursementAccount/IdentityForm.js      | 20 ++++++++++++++++++-
 .../ReimbursementAccount/RequestorStep.js     |  1 -
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/pages/ReimbursementAccount/IdentityForm.js b/src/pages/ReimbursementAccount/IdentityForm.js
index 14494f4cd1a9..52f3386137ac 100644
--- a/src/pages/ReimbursementAccount/IdentityForm.js
+++ b/src/pages/ReimbursementAccount/IdentityForm.js
@@ -76,6 +76,23 @@ const IdentityForm = ({
     const dobErrorText = (errors.dob ? translate('bankAccount.error.dob') : '')
         || (errors.dobAge ? translate('bankAccount.error.age') : '');
 
+    const getFormattedAddressValue = () => {
+        let addressString = '';
+        if (street) {
+            addressString += `${street}, `;
+        }
+        if (city) {
+            addressString += `${city}, `;
+        }
+        if (state) {
+            addressString += `${state}, `;
+        }
+        if (zipCode) {
+            addressString += `${zipCode}`;
+        }
+        return addressString;
+    };
+
     return (
         <View style={style}>
             <View style={[styles.flexRow]}>
@@ -118,8 +135,9 @@ const IdentityForm = ({
             <AddressSearch
                 label={translate('common.personalAddress')}
                 containerStyles={[styles.mt4]}
-                value={`${street} ${city} ${state} ${zipCode}`}
+                value={getFormattedAddressValue()}
                 onChangeText={(fieldName, value) => onFieldChange(fieldName, value)}
+                errorText={errors.street ? translate('bankAccount.error.addressStreet') : ''}
             />
         </View>
     );
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index c4ac842a6f4f..c66558962eea 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -92,7 +92,6 @@ class RequestorStep extends React.Component {
             city: 'requestorAddressCity',
             state: 'requestorAddressState',
             zipCode: 'requestorAddressZipCode',
-
             addressStreet: 'requestorAddressStreet',
             addressCity: 'requestorAddressCity',
             addressState: 'requestorAddressState',