refactor: apply suggested changes

aritro2002 · aritro2002 · commit 5a9360f66858 · 2025-11-04T13:00:45.000+05:30
diff --git a/src/CollectWidget.res b/src/CollectWidget.res
@@ -51,9 +51,15 @@ let make = (
         ->Dict.get(BillingAddress(FullName(FirstName))->getPaymentMethodDataFieldKey)
         ->Option.getOr("")
       let copy = values->Dict.copy
+
+      // Synchronize first_name and last_name to avoid different values during confirm call
+      // Case 1: If last_name exists but first_name is empty, use last_name as first_name
+      // (full name field uses first_name for tracking, so this ensures proper population)
       if last_name->String.length == 0 {
         copy->Dict.set(BillingAddress(FullName(LastName))->getPaymentMethodDataFieldKey, first_name)
-      } else if first_name->String.length == 0 {
+      } // Case 2: If first_name exists but last_name is empty, use first_name as last_name
+      // (since full name field is not rendered, we need this sync to maintain consistency)
+      else if first_name->String.length == 0 {
         copy->Dict.set(BillingAddress(FullName(FirstName))->getPaymentMethodDataFieldKey, last_name)
       }
       setFormData(_ => copy)
diff --git a/src/FormViewJourney.res b/src/FormViewJourney.res
@@ -182,7 +182,9 @@ let make = (
             payoutDynamicFields.address
             ->Option.map(address => {
               let fieldsToCollect =
-                address->Array.filter(addressField => addressField.value == None)
+                address->Array.filter(addressField =>
+                  addressField.value == None && addressField.fieldType != FullName(LastName)
+                )
               if fieldsToCollect->Array.length > 0 {
                 AddressForm(address)
               } else {
@@ -248,12 +250,6 @@ let make = (
 
     /// SCREEN #3 - ADDRESS COLLECION (OPTIONAL)
     | AddressForm(addressFields) => {
-        let incompleteAddressFieldsCount =
-          addressFields
-          ->Array.filter(addressField =>
-            addressField.value == None && addressField.fieldType != FullName(LastName)
-          )
-          ->Array.length
         let onSaveHandler = () => {
           let (fieldValidity, isAddressValid) = addressFields->Array.reduce((Dict.make(), true), (
             (fieldValidity, isAddressValid),
@@ -275,14 +271,10 @@ let make = (
         <>
           {renderHeader(localeString.billingDetailsText, true)}
           <div className=contentSubHeaderClasses>
-            {incompleteAddressFieldsCount == 0
-              ? React.string(localeString.formNoFieldsToEnterText)
-              : React.string(localeString.formSubheaderBillingDetailsText)}
+            {React.string(localeString.formSubheaderBillingDetailsText)}
           </div>
           <div className="mt-2.5">
-            {incompleteAddressFieldsCount == 0
-              ? React.null
-              : addressFields->renderAddressForm->React.array}
+            {addressFields->renderAddressForm->React.array}
             {renderSaveButton(_ => onSaveHandler())}
           </div>
         </>
diff --git a/src/LocaleStrings/ArabicLocale.res b/src/LocaleStrings/ArabicLocale.res
@@ -110,7 +110,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `إرسال`,
   formSubmittingText: `جاري الإرسال`,
   formSubheaderBillingDetailsText: `أدخل عنوان الفوترة الخاص بك`,
-  formNoFieldsToEnterText: `لا توجد حقول للإدخال، يرجى الانتقال إلى الخطوة التالية.`,
   formSubheaderCardText: `تفاصيل بطاقتك`,
   formSubheaderAccountText: pmLabel => ` ${pmLabel} الخاصة بك`,
   formHeaderReviewText: `مراجعة`,
diff --git a/src/LocaleStrings/CatalanLocale.res b/src/LocaleStrings/CatalanLocale.res
@@ -110,7 +110,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Enviar`,
   formSubmittingText: `Enviant`,
   formSubheaderBillingDetailsText: `Introdueix la teva adreça de facturació`,
-  formNoFieldsToEnterText: `No hi ha camps per introduir, si us plau continua al següent pas.`,
   formSubheaderCardText: `Detalls de la teva targeta`,
   formSubheaderAccountText: pmLabel => `El teu ${pmLabel}`,
   formHeaderReviewText: `Revisar`,
diff --git a/src/LocaleStrings/ChineseLocale.res b/src/LocaleStrings/ChineseLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `提交`,
   formSubmittingText: `提交中`,
   formSubheaderBillingDetailsText: `输入您的账单地址`,
-  formNoFieldsToEnterText: `没有要输入的字段，请继续下一步。`,
   formSubheaderCardText: `您的卡信息`,
   formSubheaderAccountText: pmLabel => `您的${pmLabel}`,
   formHeaderReviewText: `审核`,
diff --git a/src/LocaleStrings/DeutschLocale.res b/src/LocaleStrings/DeutschLocale.res
@@ -110,7 +110,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Absenden`,
   formSubmittingText: `Wird gesendet`,
   formSubheaderBillingDetailsText: `Geben Sie Ihre Rechnungsadresse ein`,
-  formNoFieldsToEnterText: `Keine Felder einzugeben. Bitte fahren Sie mit dem nächsten Schritt fort.`,
   formSubheaderCardText: `Ihre Kartendetails`,
   formSubheaderAccountText: pmLabel => `Ihr ${pmLabel}`,
   formHeaderReviewText: `Überprüfen`,
diff --git a/src/LocaleStrings/DutchLocale.res b/src/LocaleStrings/DutchLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Indienen`,
   formSubmittingText: `Indienen`,
   formSubheaderBillingDetailsText: `Voer uw factuuradres in`,
-  formNoFieldsToEnterText: `Geen velden om in te voeren, ga alstublieft naar de volgende stap.`,
   formSubheaderCardText: `Uw kaartgegevens`,
   formSubheaderAccountText: pmLabel => `Uw ${pmLabel}`,
   formHeaderReviewText: `Beoordelen`,
diff --git a/src/LocaleStrings/EnglishGBLocale.res b/src/LocaleStrings/EnglishGBLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Submit`,
   formSubmittingText: `Submitting`,
   formSubheaderBillingDetailsText: `Enter your billing address`,
-  formNoFieldsToEnterText: `No fields to enter, please proceed to the next step.`,
   formSubheaderCardText: `Your card details`,
   formSubheaderAccountText: pmLabel => `Your ${pmLabel}`,
   formHeaderReviewText: `Review`,
diff --git a/src/LocaleStrings/EnglishLocale.res b/src/LocaleStrings/EnglishLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Submit`,
   formSubmittingText: `Submitting`,
   formSubheaderBillingDetailsText: `Enter your billing address`,
-  formNoFieldsToEnterText: `No fields to enter, please proceed to next step.`,
   formSubheaderCardText: `Your card details`,
   formSubheaderAccountText: pmLabel => `Your ${pmLabel}`,
   formHeaderReviewText: `Review`,
diff --git a/src/LocaleStrings/FrenchBelgiumLocale.res b/src/LocaleStrings/FrenchBelgiumLocale.res
@@ -110,7 +110,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Soumettre`,
   formSubmittingText: `En cours de soumission`,
   formSubheaderBillingDetailsText: `Entrez votre adresse de facturation`,
-  formNoFieldsToEnterText: `Aucun champ à saisir, veuillez passer à l'étape suivante.`,
   formSubheaderCardText: `Les détails de votre carte`,
   formSubheaderAccountText: pmLabel => `Votre ${pmLabel}`,
   formHeaderReviewText: `Réviser`,
diff --git a/src/LocaleStrings/FrenchLocale.res b/src/LocaleStrings/FrenchLocale.res
@@ -110,7 +110,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Soumettre`,
   formSubmittingText: `En cours de soumission`,
   formSubheaderBillingDetailsText: `Entrez votre adresse de facturation`,
-  formNoFieldsToEnterText: `Aucun champ à saisir, veuillez passer à l'étape suivante.`,
   formSubheaderCardText: `Les détails de votre carte`,
   formSubheaderAccountText: pmLabel => `Votre ${pmLabel}`,
   formHeaderReviewText: `Réviser`,
diff --git a/src/LocaleStrings/HebrewLocale.res b/src/LocaleStrings/HebrewLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `שלח`,
   formSubmittingText: `שולח`,
   formSubheaderBillingDetailsText: `הזן את כתובת החיוב שלך`,
-  formNoFieldsToEnterText: `אין שדות להזנה, אנא המשך לשלב הבא.`,
   formSubheaderCardText: `פרטי הכרטיס שלך`,
   formSubheaderAccountText: pmLabel => `ה-${pmLabel} שלך`,
   formHeaderReviewText: `סקירה`,
diff --git a/src/LocaleStrings/ItalianLocale.res b/src/LocaleStrings/ItalianLocale.res
@@ -110,7 +110,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Invia`,
   formSubmittingText: `Invio in corso`,
   formSubheaderBillingDetailsText: `Inserisci il tuo indirizzo di fatturazione`,
-  formNoFieldsToEnterText: `Nessun campo da inserire, per favore procedi al passaggio successivo.`,
   formSubheaderCardText: `Dettagli della tua carta`,
   formSubheaderAccountText: pmLabel => `Il tuo ${pmLabel}`,
   formHeaderReviewText: `Rivedi`,
diff --git a/src/LocaleStrings/JapaneseLocale.res b/src/LocaleStrings/JapaneseLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `提出`,
   formSubmittingText: `提出中`,
   formSubheaderBillingDetailsText: `請輸入您的帳單地址`,
-  formNoFieldsToEnterText: `入力するフィールドはありません。次のステップに進んでください。`,
   formSubheaderCardText: `カードの詳細`,
   formSubheaderAccountText: pmLabel => `あなたの${pmLabel}`,
   formHeaderReviewText: `レビュー`,
diff --git a/src/LocaleStrings/LocaleStringTypes.res b/src/LocaleStrings/LocaleStringTypes.res
@@ -98,7 +98,6 @@ type localeStrings = {
   formSubmitText: string,
   formSubmittingText: string,
   formSubheaderBillingDetailsText: string,
-  formNoFieldsToEnterText: string,
   formSubheaderCardText: string,
   formSubheaderAccountText: string => string,
   formHeaderReviewText: string,
diff --git a/src/LocaleStrings/PolishLocale.res b/src/LocaleStrings/PolishLocale.res
@@ -110,7 +110,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Zatwierdź`,
   formSubmittingText: `Zatwierdzanie`,
   formSubheaderBillingDetailsText: `Wprowadź swój adres rozliczeniowy`,
-  formNoFieldsToEnterText: `Brak pól do wprowadzenia, przejdź proszę do następnego kroku.`,
   formSubheaderCardText: `Dane twojej karty`,
   formSubheaderAccountText: pmLabel => `Twoje ${pmLabel}`,
   formHeaderReviewText: `Przegląd`,
diff --git a/src/LocaleStrings/PortugueseLocale.res b/src/LocaleStrings/PortugueseLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Enviar`,
   formSubmittingText: `Enviando`,
   formSubheaderBillingDetailsText: `Insira o seu endereço de faturamento`,
-  formNoFieldsToEnterText: `Nenhum campo para inserir, por favor prossiga para o próximo passo.`,
   formSubheaderCardText: `Detalhes do seu cartão`,
   formSubheaderAccountText: pmLabel => `O seu ${pmLabel}`,
   formHeaderReviewText: `Revisar`,
diff --git a/src/LocaleStrings/RussianLocale.res b/src/LocaleStrings/RussianLocale.res
@@ -114,7 +114,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Отправить`,
   formSubmittingText: `Отправка`,
   formSubheaderBillingDetailsText: `Введите ваш адрес для выставления счета`,
-  formNoFieldsToEnterText: `Нет полей для ввода. Пожалуйста, переходите к следующему шагу.`,
   formSubheaderCardText: `Данные вашей карты`,
   formSubheaderAccountText: pmLabel => `Ваш ${pmLabel}`,
   formHeaderReviewText: `Обзор`,
diff --git a/src/LocaleStrings/SpanishLocale.res b/src/LocaleStrings/SpanishLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Enviar`,
   formSubmittingText: `Enviando`,
   formSubheaderBillingDetailsText: `Ingrese su dirección de facturación`,
-  formNoFieldsToEnterText: `No hay campos que introducir, por favor continúe al siguiente paso.`,
   formSubheaderCardText: `Detalles de tu tarjeta`,
   formSubheaderAccountText: pmLabel => `Tu ${pmLabel}`,
   formHeaderReviewText: `Revisar`,
diff --git a/src/LocaleStrings/SwedishLocale.res b/src/LocaleStrings/SwedishLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Skicka`,
   formSubmittingText: `Skickar`,
   formSubheaderBillingDetailsText: `Ange din faktureringsadress`,
-  formNoFieldsToEnterText: `Inga fält att fylla i, vänligen fortsätt till nästa steg.`,
   formSubheaderCardText: `Dina kortdetaljer`,
   formSubheaderAccountText: pmLabel => `Ditt ${pmLabel}`,
   formHeaderReviewText: `Granska`,
diff --git a/src/LocaleStrings/TraditionalChineseLocale.res b/src/LocaleStrings/TraditionalChineseLocale.res
@@ -109,7 +109,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: "提交",
   formSubmittingText: "提交中",
   formSubheaderBillingDetailsText: "輸入您的帳單地址",
-  formNoFieldsToEnterText: "沒有欄位需要輸入，請繼續下一步。",
   formSubheaderCardText: "您的卡片詳細信息",
   formSubheaderAccountText: pmLabel => `您的 ${pmLabel}`,
   formHeaderReviewText: "審核",
