[4/4] DropIn Actions: Present PaymentAction from the DropInRouter - #2744
Merged
nauaros merged 17 commits intoOct 1, 2026
Merged
Conversation
nauaros
added
the
chore
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
|
ℹ️ No baseline data found for 'develop'.
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the presentation and handling of payment actions within the Drop-In component. It replaces the ActionPresenter protocol with a centralized routing mechanism via DropInFlowRouting and PaymentActionPresenting, allowing actions to be presented on the deepest active module of the drop-in. Additionally, DropInFlowManager now manages submission tasks asynchronously, and several router protocols have been simplified by removing redundant action presentation methods. While the refactoring is well-tested, a critical bug was identified in DropInRouter.swift where an assertion condition is inverted, which would cause unexpected assertion failures during normal execution.
nauaros
marked this pull request as draft
September 24, 2026 14:58
nauaros
changed the title
nauaros
force-pushed
the
feature/dropin-payment-action-4
branch
from
September 24, 2026 15:56
c038692 to
5a8b071
Compare
nauaros
added this pull request to stack #2746
September 24, 2026 16:15
nauaros
marked this pull request as ready for review
September 25, 2026 11:29
nauaros
force-pushed
the
feature/dropin-payment-action-4
branch
from
September 25, 2026 12:21
5a8b071 to
7e0ca50
Compare
nauaros
force-pushed
the
feature/dropin-payment-action-4
branch
3 times, most recently
from
September 29, 2026 09:58
a31968d to
f167f9b
Compare
nauaros
force-pushed
the
feature/dropin-payment-action-4
branch
from
September 29, 2026 14:44
f167f9b to
85b79b0
Compare
Sourcery scanned the repository root, including the gitignored TempProject directory that the Carthage integration tests leave behind. That directory holds a stale copy of the SDK, so mocks were generated from the wrong declarations, for example emitting `public` where the source says `package`. Exclude it. Also mark the generated mocks as generated so they collapse in review. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Introduces the module that hosts an action produced by a submitted payment: assembler, router, view model and a container view controller. Action components that manage their own navigation, such as the redirect web view, are used as is. Everything else is embedded in a container that owns the navigation item. The container offers a single trailing Done button and suppresses back navigation, since the payment has already been submitted and there is no way back to the payment details. The module is not wired into the drop in flow yet. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…nt progress leftovers The flow manager kept its own weak reference to the merchant delegate, which goes stale when the delegate is set after the manager is built. It now reads it from the drop in it already holds. `paymentInProgress` had no writers and `userDidCancel` no callers left after the cancellation moved into the flow manager, as did the `stopLoading` call, which became a no-op once the drop in stopped conforming to `LoadingComponent`.
Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
nauaros
force-pushed
the
feature/dropin-payment-action-4
branch
from
September 30, 2026 10:11
85b79b0 to
a1604ad
Compare
nauaros
force-pushed
the
feature/dropin-payment-action-4
branch
from
September 30, 2026 11:58
a1604ad to
b94f426
Compare
The flow manager now presents actions on the root router itself, so the view model no longer needs to act as an action presenter or route action view controllers. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
robertdalmeida
approved these changes
Oct 1, 2026
robertdalmeida
left a comment
robertdalmeida
left a comment
Contributor
There was a problem hiding this comment.
Nice, looking forward to this being merged as i think the StoredPayment Screen also would need to redirect its action handling to to the DropinRouter.
erenbesel
reviewed
Oct 1, 2026
erenbesel
left a comment
erenbesel
left a comment
Contributor
There was a problem hiding this comment.
Much better looking this way! some comments
# Conflicts: # AdyenDropIn/Modules/DropInFlowManager.swift
…yment-action-4 # Conflicts: # AdyenDropIn/Modules/ComponentContainer/ComponentContainerRouter.swift # AdyenDropIn/Modules/DropInFlowManager.swift # AdyenDropIn/Modules/GenericPaymentMethod/GenericPaymentMethodRouter.swift # AdyenDropIn/Modules/Root/DropInRouter.swift # AdyenDropIn/Modules/StoredPaymentMethodContent/StoredPaymentMethodContentView.swift # Tests/GeneratedMocks/AutoMockable.generated.swift # Tests/IntegrationTests/DropIn Tests/DropInFlowManagerTests.swift # Tests/IntegrationTests/DropIn Tests/DropInRouterTests.swift # Tests/IntegrationTests/DropIn Tests/PaymentMethodList/PaymentMethodListRouterTests.swift
erenbesel
approved these changes
Oct 1, 2026
Contributor
✅ No changes detectedComparing Analyzed targets: Adyen, AdyenActions, AdyenCard, AdyenCardScanner, AdyenCashAppPay, AdyenCheckout, AdyenComponents, AdyenDelegatedAuthentication, AdyenDropIn, AdyenEncryption, AdyenSession, AdyenSwiftUI, AdyenTwint, AdyenUI, AdyenWeChatPay |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Last of four PRs splitting the drop-in payment action work. Stacked on #2743 — review #2741, #2742 and #2743 first.
Summary
ActionPresenterand building its own container. The root router now owns action presentation through the payment action module added in [1/4] DropIn Actions: Add PaymentAction module to DropIn #2741, and the action is pushed onto the existing navigation stack instead of being presented on top of it. A web view manages its own navigation, so it is still presented modally.childRouter, so presenting it does not release the module hierarchy below the root.DropInFlowManagertracks the submission: the task is cancelled when the flow moves on, and an action that arrives when none is expected is ignored, for example when the drop in was closed while the payment was in flight.ActionNavigationController,ActionPresentationHelperand the per-moduleActionPresenterconformances, sosubmit(_:from:)no longer carries a presenter.Test plan
DropInRouterTestscovers pushing onto the deepest module, the modal web view, that the child router is kept, and the dismissalDropInFlowManagerTestscovers the submission lifecycle, the ignored stale actions and the action presentationxcodebuild test -testPlan CIgreen: 970 XCTest and 262 Swift Testing tests, with one pre-existing flake (FormCardNumberValidationTests.testUC7_ReenteringFieldRestoresLogos, passes in isolation and CI retries)Ticket
CO-276