ConfirmButton refactor 4/6 - Move update logic #5930
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gbirch-stripe
commented
Dec 18, 2025
Comment on lines
-71
to
-72
| private(set) var status: Status = .enabled | ||
| private(set) var callToAction: CallToActionType |
Collaborator
Author
There was a problem hiding this comment.
These properties are moved to the BuyButton
gbirch-stripe
commented
Dec 18, 2025
Comment on lines
-153
to
-174
| self.status = status | ||
| self.callToAction = callToAction | ||
|
|
||
| // Enable/disable | ||
| isUserInteractionEnabled = (status == .enabled || status == .disabled) | ||
|
|
||
| // Update the buy button; it has its own presentation logic | ||
| self.buyButton.update(status: status, callToAction: callToAction, animated: animated) | ||
|
|
||
| if let completion = completion { | ||
| let delay: TimeInterval = { | ||
| guard animated else { | ||
| return 0 | ||
| } | ||
|
|
||
| return status == .succeeded | ||
| ? PaymentSheetUI.delayBetweenSuccessAndDismissal | ||
| : PaymentSheetUI.defaultAnimationDuration | ||
| }() | ||
|
|
||
| DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: completion) | ||
| } |
Collaborator
Author
There was a problem hiding this comment.
This function and the old BuyButton.update functions are unified into a single BuyButton.update function. For now the ConfirmButton.update functions are just wrappers that pass the data to the BuyButton to complete all logic
gbirch-stripe
commented
Dec 18, 2025
| return appearance.primaryButton.successBackgroundColor | ||
| } | ||
|
|
||
| private var status: Status = .enabled |
Collaborator
Author
There was a problem hiding this comment.
Before, the ConfirmButton and BuyButton each had their own status property that needed to be kept in sync. Now there's only one, which is the BuyButton's
gbirch-stripe
commented
Dec 18, 2025
Comment on lines
+355
to
+358
| self.callToAction = callToAction | ||
|
|
||
| // Enable/disable | ||
| isUserInteractionEnabled = (status == .enabled || status == .disabled) |
Collaborator
Author
There was a problem hiding this comment.
This is from the old ConfirmButton.update function
gbirch-stripe
commented
Dec 18, 2025
Comment on lines
+493
to
+506
|
|
||
| if let completion = completion { | ||
| let delay: TimeInterval = { | ||
| guard animated else { | ||
| return 0 | ||
| } | ||
|
|
||
| return status == .succeeded | ||
| ? PaymentSheetUI.delayBetweenSuccessAndDismissal | ||
| : PaymentSheetUI.defaultAnimationDuration | ||
| }() | ||
|
|
||
| DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: completion) | ||
| } |
Collaborator
Author
There was a problem hiding this comment.
This is from the old ConfirmButton.update function
|
✅ Dead code has been resolved in this PR. [find-dead-code] |
gbirch-stripe
requested review from
davidme-stripe,
joyceqin-stripe and
porter-stripe
yuki-stripe
approved these changes
Jan 2, 2026
gbirch-stripe
changed the title
gbirch-stripe
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Part 4/x of a factor of the ConfirmButton. Previously the ConfirmButton class supported both the Apple Pay button and confirm buttons, but now it only supports confirm buttons and can be simplified, improve code clarity and SDK binary size.
Draft PR showing the whole change: #5678.
This PR flattens the update code to live directly in the BuyButton. This sets up the BuyButton implementation to replace the ConfirmButton wrapper and itself become the ConfirmButton
Motivation
Testing
Changelog