From d2fa10e3c9e48bb8c9488cc3fcf044b7c05dd301 Mon Sep 17 00:00:00 2001
From: Praful Koppalkar <126236898+prafulkoppalkar@users.noreply.github.com>
Date: Sat, 17 Feb 2024 00:20:46 +0530
Subject: [PATCH] fix: HS-222: Address line2 optional in case of
 isUseBillingAddress (#174)

---
 src/Utilities/DynamicFieldsUtils.res | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
index 2ab8d2be..ec601b9f 100644
--- a/src/Utilities/DynamicFieldsUtils.res
+++ b/src/Utilities/DynamicFieldsUtils.res
@@ -135,7 +135,7 @@ let useRequiredFieldsEmptyAndValid = (
       | AddressCountry(countryArr) => country !== "" || countryArr->Belt.Array.length === 0
       | BillingName => checkIfNameIsValid(requiredFields, paymentMethodFields, billingName)
       | AddressLine1 => line1.value !== ""
-      | AddressLine2 => line2.value !== ""
+      | AddressLine2 => billingAddress.isUseBillingAddress ? true : line2.value !== ""
       | Bank => selectedBank !== "" || bankNames->Belt.Array.length === 0
       | PhoneNumber => phone.value !== ""
       | StateAndCity => state.value !== "" && city.value !== ""
@@ -172,7 +172,7 @@ let useRequiredFieldsEmptyAndValid = (
         | AddressCountry(countryArr) => country === "" && countryArr->Belt.Array.length > 0
         | BillingName => billingName.value === ""
         | AddressLine1 => line1.value === ""
-        | AddressLine2 => line2.value === ""
+        | AddressLine2 => billingAddress.isUseBillingAddress ? false : line2.value === ""
         | Bank => selectedBank === "" && bankNames->Belt.Array.length > 0
         | StateAndCity => city.value === "" || state.value === ""
         | CountryAndPincode(countryArr) =>
@@ -656,7 +656,7 @@ let useSubmitCallback = () => {
     logger,
   )
   let (city, setCity) = Recoil.useLoggedRecoilState(RecoilAtoms.userAddressCity, "city", logger)
-
+  let {billingAddress} = Recoil.useRecoilValueFromAtom(RecoilAtoms.optionAtom)
   React.useCallback5((ev: Window.event) => {
     let json = ev.data->Js.Json.parseExn
     let confirm = json->Utils.getDictFromJson->ConfirmType.itemToObjMapper
@@ -670,7 +670,7 @@ let useSubmitCallback = () => {
       if line2.value == "" {
         setLine2(.prev => {
           ...prev,
-          errorString: "Address line 2 cannot be empty",
+          errorString: billingAddress.isUseBillingAddress ? "" : "Address line 2 cannot be empty",
         })
       }
       if state.value == "" {