-
Notifications
You must be signed in to change notification settings - Fork 657
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Simplify bank form screen state #9587
Merged
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8bd35b9
Simplify bank form screen state
tillh-stripe c070788
Update tests
tillh-stripe ebb44b7
Clean up state and logic
tillh-stripe b1d5bdf
Fix lint
tillh-stripe 92fd556
Update screenshots and lint
tillh-stripe eeaa86a
Minor code tweaks
tillh-stripe 63738f0
Remove duplicate `fillMaxWidth` application
tillh-stripe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
50 changes: 50 additions & 0 deletions
50
...ain/java/com/stripe/android/paymentsheet/paymentdatacollection/ach/BankFormScreenState.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package com.stripe.android.paymentsheet.paymentdatacollection.ach | ||
|
|
||
| import android.os.Parcelable | ||
| import com.stripe.android.core.strings.ResolvableString | ||
| import kotlinx.parcelize.Parcelize | ||
| import com.stripe.android.model.PaymentMethod as PaymentMethodModel | ||
|
|
||
| @Parcelize | ||
| internal data class BankFormScreenState( | ||
| private val _isProcessing: Boolean = false, | ||
| val linkedBankAccount: LinkedBankAccount? = null, | ||
| val error: ResolvableString? = null, | ||
| ) : Parcelable { | ||
|
|
||
| val isProcessing: Boolean | ||
| get() = _isProcessing && linkedBankAccount == null | ||
|
|
||
| fun processing(): BankFormScreenState { | ||
| return copy(_isProcessing = true) | ||
| } | ||
|
|
||
| @Parcelize | ||
| data class LinkedBankAccount( | ||
| val resultIdentifier: ResultIdentifier, | ||
| val bankName: String?, | ||
| val last4: String?, | ||
| val intentId: String?, | ||
| val financialConnectionsSessionId: String?, | ||
| val mandateText: ResolvableString, | ||
| val isVerifyingWithMicrodeposits: Boolean, | ||
| ) : Parcelable | ||
|
|
||
| sealed interface ResultIdentifier : Parcelable { | ||
| @Parcelize | ||
| data class Session(val id: String) : ResultIdentifier | ||
|
|
||
| @Parcelize | ||
| data class PaymentMethod(val paymentMethod: PaymentMethodModel) : ResultIdentifier | ||
| } | ||
| } | ||
|
|
||
| internal fun BankFormScreenState.updateWithMandate( | ||
| mandate: ResolvableString?, | ||
| ): BankFormScreenState { | ||
| return if (linkedBankAccount != null && mandate != null) { | ||
| copy(linkedBankAccount = linkedBankAccount.copy(mandateText = mandate)) | ||
| } else { | ||
| this | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to restrict this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately no.