fix: billing dynamic correction payouts

src/CollectWidget.res

@@ -42,7 +42,21 @@ let make = (
       getDefaultsAndValidity(payoutDynamicFields, supportedCardBrands)
     })
     ->Option.map(((values, validity)) => {
-      setFormData(_ => values)
+      let last_name =
+        values
+        ->Dict.get(BillingAddress(FullName(LastName))->getPaymentMethodDataFieldKey)
+        ->Option.getOr("")
+      let first_name =
+        values
+        ->Dict.get(BillingAddress(FullName(FirstName))->getPaymentMethodDataFieldKey)
+        ->Option.getOr("")
+      let copy = values->Dict.copy
+      if last_name->String.length == 0 {
+        copy->Dict.set(BillingAddress(FullName(LastName))->getPaymentMethodDataFieldKey, first_name)
+      } else if first_name->String.length == 0 {
+        copy->Dict.set(BillingAddress(FullName(FirstName))->getPaymentMethodDataFieldKey, last_name)
+      }
+      setFormData(_ => copy)
       setValidityDict(_ => validity)
     })
     ->ignore
@@ -161,6 +175,22 @@ let make = (
           }
           setFormData(PayoutMethodData(CardBrand)->getPaymentMethodDataFieldKey, newCardBrand)
         }
+      | BillingAddress(FullName(FirstName)) => {
+          let firstNameKey = BillingAddress(FullName(FirstName))->getPaymentMethodDataFieldKey
+          let lastNameKey = BillingAddress(FullName(LastName))->getPaymentMethodDataFieldKey
+          let nameSplits = value->String.trim->String.split(" ")
+          let firstName = nameSplits->Array.get(0)->Option.getOr("")
+          let lastName =
+            nameSplits
+            ->Array.slice(~start=1, ~end=nameSplits->Array.length)
+            ->Array.join(" ")
+          setFormData(firstNameKey, firstName)
+          if lastName->String.length > 0 {
+            setFormData(lastNameKey, lastName)
+          } else {
+            setFormData(lastNameKey, firstName)
+          }
+        }
       | _ => ()
       }
       setFormData(key->getPaymentMethodDataFieldKey, updatedValue)

src/FormViewJourney.res

@@ -248,6 +248,12 @@ 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),
@@ -269,10 +275,14 @@ let make = (
         <>
           {renderHeader(localeString.billingDetailsText, true)}
           <div className=contentSubHeaderClasses>
-            {React.string(localeString.formSubheaderBillingDetailsText)}
+            {incompleteAddressFieldsCount == 0
+              ? React.string(localeString.formNoFieldsToEnterText)
+              : React.string(localeString.formSubheaderBillingDetailsText)}
           </div>
           <div className="mt-2.5">
-            {addressFields->renderAddressForm->React.array}
+            {incompleteAddressFieldsCount == 0
+              ? React.null
+              : addressFields->renderAddressForm->React.array}
             {renderSaveButton(_ => onSaveHandler())}
           </div>
         </>

src/FormViewTabs.res

@@ -250,7 +250,9 @@ let make = (
           {payoutDynamicFields.address
           ->Option.map(addressFields => {
             let fieldsToCollect =
-              addressFields->Array.filter(addressField => addressField.value == None)
+              addressFields->Array.filter(addressField =>
+                addressField.value == None && addressField.fieldType != FullName(LastName)
+              )
             if fieldsToCollect->Array.length > 0 {
               let formFields = addressFields->renderAddressForm
               <>

src/LocaleStrings/ArabicLocale.res

@@ -110,6 +110,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `إرسال`,
   formSubmittingText: `جاري الإرسال`,
   formSubheaderBillingDetailsText: `أدخل عنوان الفوترة الخاص بك`,
+  formNoFieldsToEnterText: `لا توجد حقول للإدخال، يرجى الانتقال إلى الخطوة التالية.`,
   formSubheaderCardText: `تفاصيل بطاقتك`,
   formSubheaderAccountText: pmLabel => ` ${pmLabel} الخاصة بك`,
   formHeaderReviewText: `مراجعة`,

src/LocaleStrings/CatalanLocale.res

@@ -110,6 +110,7 @@ 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`,

src/LocaleStrings/ChineseLocale.res

@@ -109,6 +109,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `提交`,
   formSubmittingText: `提交中`,
   formSubheaderBillingDetailsText: `输入您的账单地址`,
+  formNoFieldsToEnterText: `没有要输入的字段，请继续下一步。`,
   formSubheaderCardText: `您的卡信息`,
   formSubheaderAccountText: pmLabel => `您的${pmLabel}`,
   formHeaderReviewText: `审核`,

src/LocaleStrings/DeutschLocale.res

@@ -110,6 +110,7 @@ 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`,

src/LocaleStrings/DutchLocale.res

@@ -109,6 +109,7 @@ 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`,

src/LocaleStrings/EnglishGBLocale.res

@@ -109,6 +109,7 @@ 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`,

src/LocaleStrings/EnglishLocale.res

@@ -109,6 +109,7 @@ 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`,

src/LocaleStrings/FrenchBelgiumLocale.res

@@ -110,6 +110,7 @@ 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`,

src/LocaleStrings/FrenchLocale.res

@@ -110,6 +110,7 @@ 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`,

src/LocaleStrings/HebrewLocale.res

@@ -109,6 +109,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `שלח`,
   formSubmittingText: `שולח`,
   formSubheaderBillingDetailsText: `הזן את כתובת החיוב שלך`,
+  formNoFieldsToEnterText: `אין שדות להזנה, אנא המשך לשלב הבא.`,
   formSubheaderCardText: `פרטי הכרטיס שלך`,
   formSubheaderAccountText: pmLabel => `ה-${pmLabel} שלך`,
   formHeaderReviewText: `סקירה`,

src/LocaleStrings/ItalianLocale.res

@@ -110,6 +110,7 @@ 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`,

src/LocaleStrings/JapaneseLocale.res

@@ -109,6 +109,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `提出`,
   formSubmittingText: `提出中`,
   formSubheaderBillingDetailsText: `請輸入您的帳單地址`,
+  formNoFieldsToEnterText: `入力するフィールドはありません。次のステップに進んでください。`,
   formSubheaderCardText: `カードの詳細`,
   formSubheaderAccountText: pmLabel => `あなたの${pmLabel}`,
   formHeaderReviewText: `レビュー`,

src/LocaleStrings/LocaleStringTypes.res

@@ -98,6 +98,7 @@ type localeStrings = {
   formSubmitText: string,
   formSubmittingText: string,
   formSubheaderBillingDetailsText: string,
+  formNoFieldsToEnterText: string,
   formSubheaderCardText: string,
   formSubheaderAccountText: string => string,
   formHeaderReviewText: string,

src/LocaleStrings/PolishLocale.res

@@ -110,6 +110,7 @@ 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`,

src/LocaleStrings/PortugueseLocale.res

@@ -109,6 +109,7 @@ 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`,

src/LocaleStrings/RussianLocale.res

@@ -114,6 +114,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: `Отправить`,
   formSubmittingText: `Отправка`,
   formSubheaderBillingDetailsText: `Введите ваш адрес для выставления счета`,
+  formNoFieldsToEnterText: `Нет полей для ввода. Пожалуйста, переходите к следующему шагу.`,
   formSubheaderCardText: `Данные вашей карты`,
   formSubheaderAccountText: pmLabel => `Ваш ${pmLabel}`,
   formHeaderReviewText: `Обзор`,

src/LocaleStrings/SpanishLocale.res

@@ -109,6 +109,7 @@ 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`,

src/LocaleStrings/SwedishLocale.res

@@ -109,6 +109,7 @@ 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`,

src/LocaleStrings/TraditionalChineseLocale.res

@@ -109,6 +109,7 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   formSubmitText: "提交",
   formSubmittingText: "提交中",
   formSubheaderBillingDetailsText: "輸入您的帳單地址",
+  formNoFieldsToEnterText: "沒有欄位需要輸入，請繼續下一步。",
   formSubheaderCardText: "您的卡片詳細信息",
   formSubheaderAccountText: pmLabel => `您的 ${pmLabel}`,
   formHeaderReviewText: "審核",

src/Utilities/PaymentMethodCollectUtils.res

@@ -185,7 +185,8 @@ let getPaymentMethodDataFieldKey = (key): string =>
   | BillingAddress(b) =>
     switch b {
     | Email => "billing.address.email"
-    | FullName(_) => "billing.address.fullName"
+    | FullName(FirstName) => "billing.address.firstName"
+    | FullName(LastName) => "billing.address.lastName"
     | CountryCode => "billing.address.countryCode"
     | PhoneNumber => "billing.address.phoneNumber"
     | PhoneCountryCode => "billing.address.phoneCountryCode"
@@ -425,6 +426,12 @@ let getPaymentMethodDataErrorString = (
   | (PayoutMethodData(CardExpDate(_)), false) => localeString.inCompleteExpiryErrorText
   | (PayoutMethodData(CardExpDate(_)), true) => localeString.pastExpiryErrorText
   | (PayoutMethodData(ACHRoutingNumber), false) => localeString.formFieldInvalidRoutingNumber
+  | (PayoutMethodData(ACHAccountNumber), _) =>
+    if value->String.trim->String.length === 0 {
+      localeString.accountNumberText->localeString.nameEmptyText
+    } else {
+      localeString.accountNumberInvalidText
+    }
   | (PayoutMethodData(BacsSortCode), _) =>
     if value->String.trim->String.length === 0 {
       localeString.sortCodeText->localeString.nameEmptyText
@@ -922,33 +929,43 @@ let processAddressFields = (
         (dataArr, keys)
       }
     | FullName(LastName) => {
-        let key = BillingAddress(FullName(FirstName))
+        let lastNameKey = BillingAddress(FullName(LastName))
         let info: dynamicFieldInfo = BillingAddress(dynamicFieldInfo)
-        let fieldKey = key->getPaymentMethodDataFieldKey
-        paymentMethodDataDict
-        ->Dict.get(fieldKey)
-        ->Option.map(value => {
-          let nameSplits = value->String.split(" ")
-          let lastName =
-            nameSplits
-            ->Array.slice(~start=1, ~end=nameSplits->Array.length)
-            ->Array.join(" ")
-          if lastName->String.length > 0 {
-            dataArr->Array.push((info, lastName))
-            // Use first name as last name ?
-          } else {
-            nameSplits
-            ->Array.get(0)
-            ->Option.map(
-              firstName => {
-                dataArr->Array.push((info, firstName))
-              },
-            )
+        let lastNameFieldKey = lastNameKey->getPaymentMethodDataFieldKey
+
+        // First try to get lastName from direct lastName field
+        let lastNameValue = paymentMethodDataDict->Dict.get(lastNameFieldKey)
+
+        switch lastNameValue {
+        | Some(lastName) if lastName->String.trim->String.length > 0 => {
+            dataArr->Array.push((info, lastName->String.trim))
+            keys->Array.push(lastNameFieldKey)
+          }
+        | _ => {
+            // Fallback: split firstName field if lastName is empty
+            let firstNameKey = BillingAddress(FullName(FirstName))
+            let firstNameFieldKey = firstNameKey->getPaymentMethodDataFieldKey
+            paymentMethodDataDict
+            ->Dict.get(firstNameFieldKey)
+            ->Option.map(value => {
+              let nameSplits = value->String.split(" ")
+              let lastName =
+                nameSplits
+                ->Array.slice(~start=1, ~end=nameSplits->Array.length)
+                ->Array.join(" ")
+              if lastName->String.length > 0 {
+                dataArr->Array.push((info, lastName))
+              } else {
+                nameSplits
+                ->Array.get(0)
+                ->Option.map(firstName => dataArr->Array.push((info, firstName)))
+                ->ignore
+              }
+            })
             ->ignore
+            keys->Array.push(firstNameFieldKey)
           }
-        })
-        ->ignore
-        keys->Array.push(fieldKey)
+        }
         (dataArr, keys)
       }
     | _ => {