fix: billing dynamic correction payouts #1276

aritro2002 · 2025-10-31T19:34:34Z

Type of Change

Description

Fixed incorrect billing first name and last name population, along with related UI issues.
Issues ->

first_name and last_name are set different values, but while making confirm calls both are getting same values.
if first_name is set and other required fields too, and last_name is null then no billing field rendered. But still billing details header is appearing.

How did you test it?

assume except first_name and last_name all fields are set.

case 1: first_name: Doest, last_name: John

case 2: 'first_nameandlast_nameboth arenull`

case 3a: first_name: Doest is last_name is null, interac (first_name and last_name is required)

case 3b: first_name: Doest is last_name is null, sepa (first_name is required)

case 4a: first_name: null is last_name : John, interac (first_name and last_name is required)

case 4b: first_name: null is last_name : John, sepa (first_name is required)

Checklist

I ran npm run re:build
I reviewed submitted code
I added unit tests for my changes where possible

semanticdiff-com · 2025-10-31T19:34:37Z

Review changes with

github-actions · 2025-10-31T19:34:43Z

🚫 Missing Linked Issue

Hi 👋 This pull request does not appear to be linked to any open issue yet.

Linking your PR to an issue helps keep the project tidy and ensures the issue is closed automatically.

✔️ How to fix this

Add a keyword like Fixes #123 or Closes #456 to your PR description or a commit message.
Or link it manually using the "Linked issues" panel in the PR sidebar.

✅ Tip: You can link multiple issues.
🚫 Note: If only one issue is linked, it must be open for this check to pass.

Once linked, this check will pass automatically on your next push or when you re-run the workflow.

Thanks for helping maintainers! 🙌

github-actions · 2025-11-03T09:41:43Z

🚫 Missing Linked Issue

Hi 👋 This pull request does not appear to be linked to any open issue yet.

Linking your PR to an issue helps keep the project tidy and ensures the issue is closed automatically.

✔️ How to fix this

Add a keyword like Fixes #123 or Closes #456 to your PR description or a commit message.
Or link it manually using the "Linked issues" panel in the PR sidebar.

✅ Tip: You can link multiple issues.
🚫 Note: If only one issue is linked, it must be open for this check to pass.

Once linked, this check will pass automatically on your next push or when you re-run the workflow.

Thanks for helping maintainers! 🙌

kashif-m · 2025-11-03T09:47:30Z

src/FormViewJourney.res

          {renderHeader(localeString.billingDetailsText, true)}
          <div className=contentSubHeaderClasses>
-            {React.string(localeString.formSubheaderBillingDetailsText)}
+            {incompleteAddressFieldsCount == 0


Can we skip billing address screen in case nothing has to be entered?

For journey view - skip the billing address screen
For tabs view - don't render the billing address section

Yes, we can

kashif-m

Skip billing address screen / section if all fields are available

src/CollectWidget.res

github-actions · 2025-11-04T07:32:32Z

🚫 Missing Linked Issue

Hi 👋 This pull request does not appear to be linked to any open issue yet.

Linking your PR to an issue helps keep the project tidy and ensures the issue is closed automatically.

✔️ How to fix this

Add a keyword like Fixes #123 or Closes #456 to your PR description or a commit message.
Or link it manually using the "Linked issues" panel in the PR sidebar.

✅ Tip: You can link multiple issues.
🚫 Note: If only one issue is linked, it must be open for this check to pass.

Once linked, this check will pass automatically on your next push or when you re-run the workflow.

Thanks for helping maintainers! 🙌

github-actions · 2025-11-04T14:10:33Z

🚫 Missing Linked Issue

Hi 👋 This pull request does not appear to be linked to any open issue yet.

Linking your PR to an issue helps keep the project tidy and ensures the issue is closed automatically.

✔️ How to fix this

Add a keyword like Fixes #123 or Closes #456 to your PR description or a commit message.
Or link it manually using the "Linked issues" panel in the PR sidebar.

✅ Tip: You can link multiple issues.
🚫 Note: If only one issue is linked, it must be open for this check to pass.

Once linked, this check will pass automatically on your next push or when you re-run the workflow.

Thanks for helping maintainers! 🙌

github-actions · 2025-11-04T14:12:23Z

🚫 Missing Linked Issue

Hi 👋 This pull request does not appear to be linked to any open issue yet.

Linking your PR to an issue helps keep the project tidy and ensures the issue is closed automatically.

✔️ How to fix this

Add a keyword like Fixes #123 or Closes #456 to your PR description or a commit message.
Or link it manually using the "Linked issues" panel in the PR sidebar.

✅ Tip: You can link multiple issues.
🚫 Note: If only one issue is linked, it must be open for this check to pass.

Once linked, this check will pass automatically on your next push or when you re-run the workflow.

Thanks for helping maintainers! 🙌

kashif-m · 2025-11-06T12:00:00Z

src/Utilities/PaymentMethodCollectUtils.res

+        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(" ")
+              dataArr->Array.push((info, lastName))
+            })
            ->ignore
+            keys->Array.push(lastNameFieldKey)
          }
-        })
-        ->ignore
-        keys->Array.push(fieldKey)
+        }


Can we invert this logic and check for FirstName first?

Any specific reason to check for lastName?

We can't invert the logic because suppose I have set first_name: "alex", last_name: "john", in create call, then it will send wrong names in confirm call. As it will check from the first name and will assign last name same as first name. Therefore, I am first checking with LastName.

kashif-m · 2025-11-06T12:01:52Z

src/CollectWidget.res

      pattern
    />
  }
+  let checkIfLastNameRequiredAndNone = (addressFields: array<dynamicFieldForAddress>) => {


Suggested change

let checkIfLastNameRequiredAndNone = (addressFields: array<dynamicFieldForAddress>) => {

let checkIfNameRequired = (addressFields: array<dynamicFieldForAddress>) => {

kashif-m · 2025-11-06T12:02:27Z

src/CollectWidget.res

    }
  }
+
+  let getErrorStringAndClasses = (field: dynamicFieldType) => {


Can we move this to some utility file?

aritro2002 added 3 commits October 31, 2025 18:51

fix: billing dynamic correction payouts

7abe1ff

refactor: first name and last name mapping and setting values

d7ed3b5

refactor: better text for formNoFieldsToEnterText

2d8db10

aritro2002 self-assigned this Oct 31, 2025

aritro2002 requested review from AbhishekChorotiya, ArushKapoorJuspay, sakksham7 and seekshiva as code owners October 31, 2025 19:34

aritro2002 added the Ready for Review PR with label Ready for Review should only be reviewed. label Oct 31, 2025

aritro2002 had a problem deploying to Testing October 31, 2025 19:34 — with GitHub Actions Failure

Merge branch 'main' into payout-billing

0ad364f

aritro2002 had a problem deploying to Testing November 3, 2025 09:40 — with GitHub Actions Failure

kashif-m reviewed Nov 3, 2025

View reviewed changes

kashif-m requested changes Nov 3, 2025

View reviewed changes

kashif-m reviewed Nov 3, 2025

View reviewed changes

src/CollectWidget.res Show resolved Hide resolved

refactor: apply suggested changes

5a9360f

aritro2002 had a problem deploying to Testing November 4, 2025 07:30 — with GitHub Actions Failure

aritro2002 had a problem deploying to Testing November 4, 2025 14:12 — with GitHub Actions Failure

aritro2002 linked an issue Nov 4, 2025 that may be closed by this pull request

fix: billing dynamic correction payouts #1279

Open

aritro2002 force-pushed the payout-billing branch from 494a61e to d68a51a Compare November 4, 2025 14:23

aritro2002 had a problem deploying to Testing November 4, 2025 14:23 — with GitHub Actions Failure

refactor: apply suggested changes

3036057

aritro2002 force-pushed the payout-billing branch from d68a51a to 3036057 Compare November 4, 2025 14:34

aritro2002 had a problem deploying to Testing November 4, 2025 14:34 — with GitHub Actions Failure

refactor: update comment

666796c

aritro2002 had a problem deploying to Testing November 4, 2025 14:39 — with GitHub Actions Failure

kashif-m reviewed Nov 6, 2025

View reviewed changes

refactor: apply suggested changes

59bf445

aritro2002 had a problem deploying to Testing November 6, 2025 12:49 — with GitHub Actions Failure

	let checkIfLastNameRequiredAndNone = (addressFields: array<dynamicFieldForAddress>) => {
	let checkIfNameRequired = (addressFields: array<dynamicFieldForAddress>) => {

fix: billing dynamic correction payouts #1276

Are you sure you want to change the base?

fix: billing dynamic correction payouts #1276

Uh oh!

Conversation

aritro2002 commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Type of Change

Description

How did you test it?

Checklist

Uh oh!

semanticdiff-com bot commented Oct 31, 2025

Uh oh!

github-actions bot commented Oct 31, 2025

🚫 Missing Linked Issue

✔️ How to fix this

Uh oh!

github-actions bot commented Nov 3, 2025

🚫 Missing Linked Issue

✔️ How to fix this

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kashif-m left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Nov 4, 2025

🚫 Missing Linked Issue

✔️ How to fix this

Uh oh!

github-actions bot commented Nov 4, 2025

🚫 Missing Linked Issue

✔️ How to fix this

Uh oh!

github-actions bot commented Nov 4, 2025

🚫 Missing Linked Issue

✔️ How to fix this

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aritro2002 Nov 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

aritro2002 commented Oct 31, 2025 •

edited

Loading

aritro2002 Nov 6, 2025 •

edited

Loading