Fix issue where continue button is disabled when canceling account selection #7464
Conversation
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
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
from
bf2c2e5 to
329b462
Compare
jameswoo-stripe
commented
Oct 20, 2023
...va/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormScreenState.kt
Outdated
Show resolved
Hide resolved
jameswoo-stripe
changed the title
samer-stripe
previously approved these changes
Oct 20, 2023
paymentsheet-example/src/androidTest/java/com/stripe/android/test/core/PlaygroundTestDriver.kt
Outdated
Show resolved
Hide resolved
...va/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormScreenState.kt
Outdated
Show resolved
Hide resolved
samer-stripe
previously approved these changes
Oct 20, 2023
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
from
3abed5c to
0e5927c
Compare
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
3 times, most recently
from
22150da to
42a2554
Compare
| merchantName = viewModel.formattedMerchantName(), | ||
| onPrimaryButtonClick = viewModel::handlePrimaryButtonClick, | ||
| onPrimaryButtonStateChanged = viewModel::handlePrimaryButtonStateChanged |
There was a problem hiding this comment.
Can we just call handlePrimaryButtonStateChanged(StartProcessing) from inside handlePrimaryButtonClick?
We also don’t seem to reset the processing state. Do we need to do that?
There was a problem hiding this comment.
Ping about whether or not we need to reset the state
There was a problem hiding this comment.
We don't need to, it is handled when the bank account is returned from FC SDK, by setting the isProcessing flag to false.
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
from
42a2554 to
81f43a4
Compare
...java/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormViewModel.kt
Outdated
Show resolved
Hide resolved
...java/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormViewModel.kt
Outdated
Show resolved
Hide resolved
...va/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormScreenState.kt
Outdated
Show resolved
Hide resolved
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
from
81f43a4 to
0c6357d
Compare
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
from
2598cd0 to
6e9642e
Compare
Comment on lines
149
to
152
| val currentScreenState = viewModel.currentScreenState.stateIn(viewModel.viewModelScope).value | ||
| viewModel.handlePrimaryButtonClick(currentScreenState as USBankAccountFormScreenState.VerifyWithMicrodeposits) | ||
|
|
||
| assertThat(awaitItem().screenState).isEqualTo(currentScreenState.copy(isProcessing = true)) | ||
| assertThat(awaitItem().screenState).isEqualTo(currentScreenState) |
There was a problem hiding this comment.
Not sure what this is testing now. We confirm that the screen state doesn‘t change?
There was a problem hiding this comment.
The screenstate should no longer change since we moved the isProcessing update to BillingDetails collection flow
...java/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormViewModel.kt
Outdated
Show resolved
Hide resolved
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
from
6e9642e to
c2e0754
Compare
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
from
c2e0754 to
f3529d2
Compare
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
from
f3529d2 to
d9458d5
Compare
jameswoo-stripe
force-pushed
the
jameswoo/us-bank-account-cancel-fix
branch
from
d9458d5 to
4f7ec64
Compare
tillh-stripe
approved these changes
Oct 30, 2023
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
Motivation
Allow users to launch bank account selection again.
Testing
Changelog