[PaymentSheet] Fix issue when used with hyperion and mochi #5321
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
…ment is not on the top of the stack.
michelleb-stripe
requested review from
brnunes-stripe,
skyler-stripe and
jameswoo-stripe
as code owners
michelleb-stripe
requested review from
ccen-stripe and
awush-stripe
as code owners
michelleb-stripe
changed the title
| @@ -20,12 +20,5 @@ | |||
| "schema": { | |||
| "nameType": "city" | |||
| } | |||
| }, | |||
There was a problem hiding this comment.
THis is a duplicate field, removing the duplicate
| @@ -163,7 +163,12 @@ internal class PaymentSheetActivity : BaseSheetActivity<PaymentSheetResult>() { | |||
| if (config != null) { | |||
| // We only want to do this if the loading fragment is shown. Otherwise this causes | |||
| // a new fragment to be created if the activity was destroyed and recreated. | |||
| if (supportFragmentManager.fragments.firstOrNull() is PaymentSheetLoadingFragment) { | |||
| // If hyperion is an added dependency it is loaded on top of the | |||
There was a problem hiding this comment.
This is the fix for when hyperion is a dependency
| @@ -28,7 +28,7 @@ internal class LpmSerializer { | |||
| emptyList() | |||
| } else { | |||
| try { | |||
| format.decodeFromString<List<SharedDataSpec>>(serializer(), str) | |||
| format.decodeFromString<ArrayList<SharedDataSpec>>(serializer(), str) | |||
There was a problem hiding this comment.
ArrayList works for finding the deserializer
|
Diffuse output: APKDEX |
| @@ -103,7 +103,10 @@ class LpmRepository constructor( | |||
| serverLpmSpecs: String?, | |||
| force: Boolean = false | |||
| ) { | |||
| if (!isLoaded() || force) { | |||
| // If the expectedLpms is different form last time, we still need to reload. | |||
| var lpmsNotParsedFromServerSpec = expectedLpms | |||
There was a problem hiding this comment.
If we get passed two different PMs with different values, we might need to reparse in the library to deserialize the new LPMs that we need.
| showOptionalLabel = !addressField.required | ||
| val countryAddressElements = this | ||
| .filterNot { | ||
| it.type == FieldType.SortingCode || |
There was a problem hiding this comment.
These are two new types that are valid, but we don't support showing.
| import kotlinx.serialization.json.Json | ||
| import java.io.InputStream | ||
| import java.util.UUID | ||
|
|
||
| @Serializable(with = FieldTypeAsStringSerializer::class) | ||
| @Serializable |
There was a problem hiding this comment.
Refactored this so we don't require a special deserializer.
michelleb-stripe
changed the title
jameswoo-stripe
approved these changes
Jul 26, 2022
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
When hyperion is present PaymentSheetLoading is not at the top of the stack. So instead of checking if it is at the top of the stack, check to see if it is anywhere in the stack.
Motivation
RUN_MOBILESDK-1268
Testing
Changelog
[FIXED] Fixed issue when PaymentSheet never finishes loading.