Fix bug on add button.

stripe · Feb 2, 2022 · 78d1113 · 78d1113
1 parent 040b914
commit 78d1113
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...eet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetAddPaymentMethodFragment.kt b/...eet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetAddPaymentMethodFragment.kt
@@ -56,6 +56,7 @@ internal class PaymentSheetAddPaymentMethodFragment() : BaseAddPaymentMethodFrag
         addPaymentMethodHeader.isVisible = !shouldShowGooglePayButton
 
         sheetViewModel.selection.observe(viewLifecycleOwner) { paymentSelection ->
+            // Last selection is saved and restore, and when that is google pay it will trigger it
             updateErrorMessage(null)
             if (paymentSelection == PaymentSelection.GooglePay) {
                 sheetViewModel.checkout(CheckoutIdentifier.AddFragmentTopGooglePay)

diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/viewmodels/BaseSheetViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/viewmodels/BaseSheetViewModel.kt
@@ -120,7 +120,11 @@ internal abstract class BaseSheetViewModel<TransitionTargetType>(
      * card fragment is determined to be valid (not necessarily selected)
      * On [BasePaymentMethodsListFragment] this is set when a user selects one of the options
      */
-    private val _selection = savedStateHandle.getLiveData<PaymentSelection>(SAVE_SELECTION)
+    private val _selection = savedStateHandle.getLiveData<PaymentSelection>(
+        SAVE_SELECTION, savedStateHandle.get(
+            SAVE_SELECTION
+        )
+    )
     internal val selection: LiveData<PaymentSelection?> = _selection
 
     private val editing = MutableLiveData(false)