Skip to content
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.

Sign up for GitHub

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

Consume the back button press when processing. #6142

Merged
merged 3 commits into from
Jan 30, 2023
Merged

Consume the back button press when processing. #6142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a01db4
Consume the back button press when processing.
jaynewstrom-stripe Jan 30, 2023
92b8a43
Add changelog.
jaynewstrom-stripe Jan 30, 2023
17a1b14
Update CHANGELOG.md
jaynewstrom-stripe Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

### PaymentSheet
* [FIXED][6136](https://github.com/stripe/stripe-android/pull/6136) Fixed an issue where the primary button wouldn't show the amount for payment intents.

* [FIXED][6142](https://github.com/stripe/stripe-android/pull/6142) Fixed an issue where pressing the back button during processing would cause a `PaymentSheetResult.Canceled`.
## 20.19.0 - 2023-01-23

### PaymentSheet
Expand Down
3 changes: 1 addition & 2 deletions paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/BaseSheetActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,12 @@ internal abstract class BaseSheetActivity<ResultType> : AppCompatActivity() {
}
}

val onBackPressedCallback = onBackPressedDispatcher.addCallback {
onBackPressedDispatcher.addCallback {
viewModel.handleBackPressed()
}

viewModel.processing.launchAndCollectIn(this) { isProcessing ->
updateRootViewClickHandling(isProcessing)
onBackPressedCallback.isEnabled = !isProcessing
}

setupHeader()
Expand Down
3 changes: 3 additions & 0 deletions paymentsheet/src/main/java/com/stripe/android/paymentsheet/viewmodels/BaseSheetViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,9 @@ internal abstract class BaseSheetViewModel(
)

fun handleBackPressed() {
if (processing.value) {
return
}
if (backStack.value.size > 1) {
onUserBack()
} else {
Expand Down
36 changes: 36 additions & 0 deletions paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentSheetViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import com.stripe.android.paymentsheet.model.PaymentSelection
import com.stripe.android.paymentsheet.model.PaymentSheetViewState
import com.stripe.android.paymentsheet.model.SavedSelection
import com.stripe.android.paymentsheet.model.StripeIntentValidator
import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen.AddAnotherPaymentMethod
import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen.AddFirstPaymentMethod
import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen.SelectSavedPaymentMethods
import com.stripe.android.paymentsheet.paymentdatacollection.ach.ACHText
Expand Down Expand Up @@ -907,6 +908,41 @@ internal class PaymentSheetViewModelTest {
}
}

@Test
fun `handleBackPressed is consumed when processing is true`() = runTest {
val viewModel = createViewModel(customerPaymentMethods = emptyList())
viewModel.savedStateHandle[SAVE_PROCESSING] = true
viewModel.currentScreen.test {
assertThat(awaitItem()).isEqualTo(AddFirstPaymentMethod)
viewModel.handleBackPressed()
}
}

@Test
fun `handleBackPressed delivers cancelled when pressing back on last screen`() = runTest {
val viewModel = createViewModel(customerPaymentMethods = emptyList())
viewModel.currentScreen.test {
assertThat(awaitItem()).isEqualTo(AddFirstPaymentMethod)
viewModel.paymentSheetResult.test {
viewModel.handleBackPressed()
assertThat(awaitItem()).isEqualTo(PaymentSheetResult.Canceled)
}
}
}

@Test
fun `handleBackPressed goes from AddAnother to SelectSaved screen`() = runTest {
val viewModel = createViewModel(
customerPaymentMethods = listOf(PaymentMethodFixtures.CARD_PAYMENT_METHOD)
)
viewModel.transitionToAddPaymentScreen()
viewModel.currentScreen.test {
assertThat(awaitItem()).isEqualTo(AddAnotherPaymentMethod)
viewModel.handleBackPressed()
assertThat(awaitItem()).isEqualTo(SelectSavedPaymentMethods)
}
}

@Test
fun `current screen is AddFirstPaymentMethod if payment methods is empty`() = runTest {
val viewModel = createViewModel(customerPaymentMethods = emptyList())
Expand Down