feat: Pay later button by saralvasquez · Pull Request #1753 · braintree/braintree_android

saralvasquez · 2026-11-07T01:01:00Z

Summary of changes

Adds XML and compose version of the PayPal PayLater button
Adds test coverage for the new functionality
Adds additional UIComponent test coverage where lacking

XML

Screen_recording_20261109_112348.webm

Compose

Screen_recording_20261109_112526.webm

AI Usage

Which AI Agent Was Used?

Copilot
Claude
Other (Type Name Here)

How was AI used?
Aided in the development of this feature in many ways

Estimated AI Code Contribution

less than 30%
30 - 60%
60 - 100%

Checklist

Added a changelog entry
Tested and confirmed payment flows affected by this change are functioning as expected

Authors

…od name (#1732) Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>

* feat: add pay later wordmark assets * feat: add basic pay later button * fix: remove analytic constants and render PayPalResult as non-optional * refactor: set `offerPayLater` to true * feat: clean-up Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add basic pay later button * fix: remove analytic constants and render PayPalResult as non-optional * refactor: set `offerPayLater` to true * feat: clean-up Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: share button style mapping between paypal and pay later colors Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor(demo): handle pay later return in onResume with separate slots Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * style: fix trailing space and missing final newline Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: extract shared drawing logic into PaymentButtonRenderer Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: disable payment buttons while a flow is in progress Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: re-enable payment buttons when a flow fails or finishes Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: address pr feedback Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: fix lint warnings Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>

* feat: add pay later wordmark assets * feat: add basic pay later button * fix: remove analytic constants and render PayPalResult as non-optional * refactor: set `offerPayLater` to true * feat: clean-up Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add basic pay later button * fix: remove analytic constants and render PayPalResult as non-optional * refactor: set `offerPayLater` to true * feat: clean-up Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: share button style mapping between paypal and pay later colors Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor(demo): handle pay later return in onResume with separate slots Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * style: fix trailing space and missing final newline Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add composable paylaterbuttonview Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * style: add new line Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: extract shared drawing logic into PaymentButtonRenderer Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: update pay later button composable Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add compose pay later button Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add pay later composable to demo app Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: disable payment buttons while a flow is in progress Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: re-enable payment buttons when a flow fails or finishes Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: address lint warning Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: address pr feedback Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: fix lint warnings Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add composable paylaterbuttonview Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * style: add new line Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: update pay later button composable Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add compose pay later button Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add pay later composable to demo app Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: address lint warning Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: persist compose pay later flow state across activity recreation Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: re-enable compose pay later button when the flow fails to launch Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: adding missing } Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: deliver compose pay later missing-registry failure from a LaunchedEffect Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: extract shared paypal flow for compose paypal and pay laterbuttons Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * test: add unit tests for compose PayPal flow helpers Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: lint issues Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * test: add compose pay later button test Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * test: add test to make sure the flag is only set for pay later request Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>

* test: add UIComponents unit test coverage for buttons and card field inputs Add unit tests for the View PayPalButton, Compose PayPal/Venmo buttons, button colors, activity/context extensions, PendingRequestException, Compose button views, Compose CardFields CVV truncation, and BaseTextInputView. To make the buttons testable, add an internal constructor to the View PayPalButton and route the Compose buttons through internal PayPalButtonContent/VenmoButtonContent composables that accept factories. Public APIs are unchanged. Add Compose UI test dependencies to the unit test classpath and remove the placeholder ExampleUnitTest. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * test: cover View VenmoButton, PayLaterButton flows and PaymentButtonRenderer Add unit tests for the View VenmoButton, PayLaterButton launch/return flows, PaymentButtonRenderer appearance states and PaymentButtonStyle mappings. Add an internal constructor to the View VenmoButton for dependency injection in tests; the public API is unchanged. Remove the ActivityExtensions and ContextExtensions unit tests, which are covered through the button tests. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * test: merge PayLaterButton and PaymentButtonRenderer tests into existing files Move the PayLaterButton flow tests into PayLaterButtonUnitTest and the renderer appearance tests into PaymentButtonRendererUnitTest so each class has a single test file. Replace the weak pressed-state renderer test with fill-color assertions. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * test: remove vacuous and duplicate UIComponents tests Delete tests that restated source constants or could not fail (focus fill, same-color setButtonColor, color keys, PaymentButtonStyleUnitTest, repeated loading cycle, Compose color-style count). Fold error assertions into the existing PayLaterButton failure tests and strengthen click, NPE, hint and icon tests with argument, message and direction checks. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * fix: remove test bloat * test: merge CardFields CVV truncation tests into CardFieldsUnitTest Move the Compose CardFields CVV truncation tests into the existing CardFieldsUnitTest so the composable has a single test file. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * fix: remove more test bloat * fix: removing PayPal compose tests since refactor is coming * refactor: restore compose PayPalButton to match the base branch Remove the internal PayPalButtonContent seam added for unit tests, since the compose PayPalButton tests were removed ahead of an upcoming refactor. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * test: add compose PayPalButton unit tests Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * fix: resolve lint issue --------- Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>

* feat: add pay later wordmark assets * feat: add basic pay later button * fix: remove analytic constants and render PayPalResult as non-optional * refactor: set `offerPayLater` to true * feat: clean-up Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add basic pay later button * fix: remove analytic constants and render PayPalResult as non-optional * refactor: set `offerPayLater` to true * feat: clean-up Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: share button style mapping between paypal and pay later colors Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor(demo): handle pay later return in onResume with separate slots Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * style: fix trailing space and missing final newline Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * refactor: extract shared drawing logic into PaymentButtonRenderer Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix: disable payment buttons while a flow is in progress Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: add analytics events to PayLaterButton Sends PAY_LATER_BUTTON_PRESENTED on initialize and PAY_LATER_BUTTON_SELECTED when the PayPal flow is launched, mirroring the existing PayPalButton/VenmoButton pattern. Adds a UIComponentsAnalyticsUnitTest pinning the event name constants. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * fix: resolve lint issue * fix: remove unnecessary hideLoading * test: mock AnalyticsClient in PayLaterButtonUnitTest The launch failure test reaches the analytics call in completePayPalFlow, which built a real AnalyticsClient and threw because SdkComponent is not initialized in unit tests. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * test: verify Pay Later selected analytics event Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * feat: add analytics events to compose PayLaterButton Sends PAY_LATER_BUTTON_PRESENTED once when the composable is first shown and PAY_LATER_BUTTON_SELECTED on click, with the compose UI type, mirroring the compose PayPalButton. Adds unit tests for the compose and XML Pay Later button analytics, and Compose UI test dependencies to the UIComponents unit test classpath. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> --------- Co-authored-by: Alekhya Geddam <ageddam@paypal.com> Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>

* test: add PayLaterButton instrumentation tests Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * test: Expand PayLaterButton UI and unit test coverage Add XML inflation, drawing, initialize and click instrumentation tests, compose PayLaterButtonView and click-failure tests, and compose PayLaterButton unit tests. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * test: Prune redundant PayLaterButton instrumentation tests Remove tests that duplicate PayPalButtonTest coverage of the shared renderer or repeat each other. Fix compose PayLaterButton crashing when it is the first SDK use by resolving AnalyticsClient lazily after PayPalClient is created. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * fix: remove useless comment --------- Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

github-actions · 2026-11-07T01:01:45Z

Dependency Review

✅ No vulnerabilities found.

Scanned Files

settings.gradle

noguier · 2026-11-09T15:41:34Z

I think it would be useful to add end-to-end recording of the flow to this PR ❤️

saralvasquez · 2026-11-09T17:40:25Z

Ah yup! I forgot again! I'll get that up soon

…eation (#1755) * feat: fix paypal button compose flows not returning a result when activity is recreated Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: update browser-switch version and add change-log entry Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat: update changelog.md Co-authored-by: Jax DesMarais-Leder <jdesmarais@paypal.com> Signed-off-by: agedd <ageddam@paypal.com> * doc: update browser-switch version in DEPENDENCIES.md Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> --------- Signed-off-by: agedd <ageddam@paypal.com> Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> Co-authored-by: Jax DesMarais-Leder <jdesmarais@paypal.com>

noguier · 2026-11-10T16:51:12Z

Hey so with Do Not Keep Activities the flow still results in cancellation result? is the fix be implemented in the different branch?
--- Nevermind the fix is now in Main, I will test again once the conflicts are resolved :)

mzlangreder

Looking good, just a few questions

Do we have any tests that verify resuming after a launched flow?

mzlangreder · 2026-11-10T16:55:59Z

 * UIComponents
+    * Fix Compose `PayPalButton` and `PayLaterButton` not returning a result when the Activity is recreated while the browser is open
    * Fix `VenmoButton` not re-enabling after failure in `createPaymentAuthRequest`, `venmoLauncher.launch()`, or when the hosting Activity is null
+    * Add `PayLaterButton` and compose support to generate a PayPal-PayLater branded button for launching the PayLater flow


Should we mention the fixes to the existing PayPalButton behavior, such as:

XML re-enabling after createPaymentAuthRequest failure, payPalLauncher.launch() failure, or a null hosting Activity

XML keeping the loading indicator until tokenize completes, rather than re-enabling immediately after dispatching tokenization

Compose re-enabling after payPalLauncher.launch() failure

Yeah that's a good callout. I'll add that to the CHANGELOG

mzlangreder · 2026-11-10T16:55:59Z

+    fun setUp() {
+        context = ApplicationProvider.getApplicationContext()
+        every { mockPayPalClient.createPaymentAuthRequest(any(), any(), capture(authCallback)) } just runs
+        mockkObject(AnalyticsClient.Companion)


Should this test unmock AnalyticsClient.Companion in an @After, like PayPalButtonUnitTest does?

Ah! Yes it should. Fix incoming

saralvasquez · 2026-11-10T18:05:02Z

Do we have any tests that verify resuming after a launched flow?

What exactly do you mean by resuming after a launched flow? Like handling return to app or are you talking about the process death and recreation case?

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

…nitTest Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

noguier

I have tested everything end-to-end on emulators and physical device! everything functioning as expected! Great work @saralvasquez and @agedd

saralvasquez · 2026-11-10T19:03:36Z

Just a heads up, @agedd is gonna be pushing a commit for the venmo button fix to this PR since it's super easy and quick so we'll ask for one last check through on this once that's up

…hangelog Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

mzlangreder · 2026-11-10T19:22:07Z

Do we have any tests that verify resuming after a launched flow?

What exactly do you mean by resuming after a launched flow? Like handling return to app or are you talking about the process death and recreation case?

Backgrounding/resuming I was more my thinking.

noguier · 2026-11-10T19:29:39Z

@agedd venmo with do not keep activities work in UI components compose, but not XML, can we fix the XML venmo button too :)

saralvasquez · 2026-11-10T19:31:00Z

Backgrounding/resuming I was more my thinking.

Ah interesting... no I don't think we have tests like that for any of the buttons. I can try and put together a test like, but I'll at least test that manually to make sure everything works as expects

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

agedd · 2026-11-10T19:55:57Z

@agedd venmo with do not keep activities work in UI components compose, but not XML, can we fix the XML venmo button too :)

good catch! xml venmo button was missing the restorePendingRequest call, added it with tests and changelog in 23b50db

agedd and others added 10 commits October 15, 2026 18:17

feat: add pay later wordmark assets (#1722)

760d0b4

docs(readme): add Pay Later button section and fix PayPal button meth…

42a7198

…od name (#1732) Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>

Merge branch 'main' into pay-later-button-feature

6c3984a

Merge branch 'main' into pay-later-button-feature

7767a0d

docs: Add Compose PayLater button integration instructions to README

0dde39a

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

saralvasquez requested review from a team and agedd November 7, 2026 01:01

saralvasquez requested a review from a team as a code owner November 7, 2026 01:01

saralvasquez requested a review from noguier November 7, 2026 01:01

fix: add CHANGELOG entry

448f791

mzlangreder reviewed Nov 10, 2026

View reviewed changes

Merge branch 'main' into pay-later-button-feature

f9595fc

saralvasquez and others added 3 commits November 10, 2026 10:07

pr-feedback: update CHANGELOG and add test tear down

ddab0dd

fix: restore pending request before completing xml pay-later-button flow

78af4ac

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

test: stub restorePendingRequest and cover restore in PayLaterButtonU…

4f9f57f

…nitTest Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

noguier approved these changes Nov 10, 2026

View reviewed changes

fix: deliver compose venmo result after activity recreation and add c…

02a955b

…hangelog Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

mzlangreder reviewed Nov 10, 2026

View reviewed changes

Comment thread UIComponents/src/main/java/com/braintreepayments/api/uicomponents/compose/VenmoButton.kt Resolved

agedd and others added 2 commits November 10, 2026 13:44

refactor: inline pending request restore in compose buttons

b8f42ce

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

fix: restore pending request before completing xml venmo button flow

23b50db

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

mzlangreder approved these changes Nov 10, 2026

View reviewed changes

saralvasquez merged commit ad45dc6 into main Nov 10, 2026
31 of 34 checks passed

saralvasquez deleted the pay-later-button-feature branch November 10, 2026 21:43

Conversation

saralvasquez commented Nov 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of changes

AI Usage

Checklist

Authors

Uh oh!

github-actions Bot commented Nov 7, 2026

Dependency Review

Scanned Files

Uh oh!

noguier commented Nov 9, 2026

Uh oh!

saralvasquez commented Nov 9, 2026

Uh oh!

noguier commented Nov 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mzlangreder left a comment

Choose a reason for hiding this comment

Uh oh!

mzlangreder Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

saralvasquez Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

mzlangreder Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

saralvasquez Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

saralvasquez commented Nov 10, 2026

Uh oh!

noguier left a comment

Choose a reason for hiding this comment

Uh oh!

saralvasquez commented Nov 10, 2026

Uh oh!

Uh oh!

mzlangreder commented Nov 10, 2026

Uh oh!

noguier commented Nov 10, 2026

Uh oh!

saralvasquez commented Nov 10, 2026

Uh oh!

agedd commented Nov 10, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

saralvasquez commented Nov 7, 2026 •

edited

Loading

noguier commented Nov 10, 2026 •

edited

Loading