Refactor Link shippingValues to use AddressDetails (#9869)

stripe · Jan 7, 2025 · 8c69d08 · 8c69d08
1 parent a23d0a6
commit 8c69d08
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 32 deletions.
diff --git a/paymentsheet/src/main/java/com/stripe/android/link/LinkConfiguration.kt b/paymentsheet/src/main/java/com/stripe/android/link/LinkConfiguration.kt
@@ -2,7 +2,7 @@ package com.stripe.android.link
 
 import android.os.Parcelable
 import com.stripe.android.model.StripeIntent
-import com.stripe.android.uicore.elements.IdentifierSpec
+import com.stripe.android.paymentsheet.addresselement.AddressDetails
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -11,7 +11,7 @@ internal data class LinkConfiguration(
     val merchantName: String,
     val merchantCountryCode: String?,
     val customerInfo: CustomerInfo,
-    val shippingValues: Map<IdentifierSpec, String?>?,
+    val shippingDetails: AddressDetails?,
     val passthroughModeEnabled: Boolean,
     val flags: Map<String, Boolean>,
     val cardBrandChoice: CardBrandChoice?,

diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/PaymentElementLoader.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/PaymentElementLoader.kt
@@ -27,7 +27,6 @@ import com.stripe.android.paymentsheet.PaymentSheet
 import com.stripe.android.paymentsheet.PaymentSheet.IntentConfiguration
 import com.stripe.android.paymentsheet.PrefsRepository
 import com.stripe.android.paymentsheet.addresselement.AddressDetails
-import com.stripe.android.paymentsheet.addresselement.toIdentifierMap
 import com.stripe.android.paymentsheet.analytics.EventReporter
 import com.stripe.android.paymentsheet.cvcrecollection.CvcRecollectionHandler
 import com.stripe.android.paymentsheet.model.PaymentIntentClientSecret
@@ -471,12 +470,6 @@ internal class DefaultPaymentElementLoader @Inject constructor(
             configuration.defaultBillingDetails?.phone
         }
 
-        val shippingAddress = if (shippingDetails?.isCheckboxSelected == true) {
-            shippingDetails.toIdentifierMap(configuration.defaultBillingDetails)
-        } else {
-            null
-        }
-
         val customerEmail = configuration.defaultBillingDetails?.email ?: customer?.let {
             customerRepository.retrieveCustomer(
                 CustomerRepository.CustomerInfo(
@@ -508,7 +501,7 @@ internal class DefaultPaymentElementLoader @Inject constructor(
             merchantName = merchantName,
             merchantCountryCode = merchantCountry,
             customerInfo = customerInfo,
-            shippingValues = shippingAddress,
+            shippingDetails = shippingDetails?.takeIf { it.isCheckboxSelected == true },
             passthroughModeEnabled = passthroughModeEnabled,
             cardBrandChoice = cardBrandChoice,
             flags = flags,

diff --git a/paymentsheet/src/test/java/com/stripe/android/link/LinkActivityContractTest.kt b/paymentsheet/src/test/java/com/stripe/android/link/LinkActivityContractTest.kt
@@ -53,7 +53,7 @@ class LinkActivityContractTest {
                 phone = "1234567890",
                 billingCountryCode = "US",
             ),
-            shippingValues = null,
+            shippingDetails = null,
             passthroughModeEnabled = false,
             flags = emptyMap(),
             cardBrandChoice = null,
@@ -85,7 +85,7 @@ class LinkActivityContractTest {
                 phone = "1234567890",
                 billingCountryCode = "US",
             ),
-            shippingValues = null,
+            shippingDetails = null,
             passthroughModeEnabled = false,
             flags = emptyMap(),
             cardBrandChoice = null,

diff --git a/paymentsheet/src/test/java/com/stripe/android/link/LinkConfigurationCoordinatorTest.kt b/paymentsheet/src/test/java/com/stripe/android/link/LinkConfigurationCoordinatorTest.kt
@@ -27,7 +27,7 @@ class LinkConfigurationCoordinatorTest {
             phone = CUSTOMER_PHONE,
             billingCountryCode = CUSTOMER_BILLING_COUNTRY_CODE,
         ),
-        shippingValues = null,
+        shippingDetails = null,
         passthroughModeEnabled = false,
         flags = emptyMap(),
         cardBrandChoice = null,

diff --git a/paymentsheet/src/test/java/com/stripe/android/link/TestFactory.kt b/paymentsheet/src/test/java/com/stripe/android/link/TestFactory.kt
@@ -122,7 +122,7 @@ internal object TestFactory {
             phone = CUSTOMER_PHONE,
             billingCountryCode = CUSTOMER_BILLING_COUNTRY_CODE
         ),
-        shippingValues = null,
+        shippingDetails = null,
         flags = emptyMap(),
         cardBrandChoice = null,
         passthroughModeEnabled = false

diff --git a/paymentsheet/src/test/java/com/stripe/android/link/account/DefaultLinkAccountManagerTest.kt b/paymentsheet/src/test/java/com/stripe/android/link/account/DefaultLinkAccountManagerTest.kt
@@ -828,7 +828,7 @@ class DefaultLinkAccountManagerTest {
             ),
             merchantName = "Merchant",
             merchantCountryCode = "US",
-            shippingValues = null,
+            shippingDetails = null,
             passthroughModeEnabled = passthroughModeEnabled,
             flags = emptyMap(),
             cardBrandChoice = null,

diff --git a/paymentsheet/src/test/java/com/stripe/android/link/serialization/PopupPayloadTest.kt b/paymentsheet/src/test/java/com/stripe/android/link/serialization/PopupPayloadTest.kt
@@ -221,7 +221,7 @@ internal class PopupPayloadTest {
             ),
             flags = emptyMap(),
             passthroughModeEnabled = true,
-            shippingValues = emptyMap(),
+            shippingDetails = null,
             cardBrandChoice = cardBrandChoice,
             stripeIntent = intent
         )

diff --git a/paymentsheet/src/test/java/com/stripe/android/link/ui/inline/InlineSignupViewModelTest.kt b/paymentsheet/src/test/java/com/stripe/android/link/ui/inline/InlineSignupViewModelTest.kt
@@ -66,7 +66,7 @@ class InlineSignupViewModelTest {
                         name = CUSTOMER_NAME,
                         billingCountryCode = CUSTOMER_BILLING_COUNTRY_CODE,
                     ),
-                    shippingValues = null,
+                    shippingDetails = null,
                     passthroughModeEnabled = false,
                     flags = emptyMap(),
                     cardBrandChoice = null,
@@ -429,7 +429,7 @@ class InlineSignupViewModelTest {
                 name = prefilledName,
                 billingCountryCode = null,
             ),
-            shippingValues = null,
+            shippingDetails = null,
             passthroughModeEnabled = false,
             flags = emptyMap(),
             cardBrandChoice = null,

diff --git a/paymentsheet/src/test/java/com/stripe/android/link/ui/inline/InlineSignupViewStateTest.kt b/paymentsheet/src/test/java/com/stripe/android/link/ui/inline/InlineSignupViewStateTest.kt
@@ -91,7 +91,7 @@ class InlineSignupViewStateTest {
                 phone = "+15555555555",
                 billingCountryCode = "usd",
             ),
-            shippingValues = null,
+            shippingDetails = null,
             passthroughModeEnabled = false,
             flags = emptyMap(),
             cardBrandChoice = null,

diff --git a/paymentsheet/src/test/java/com/stripe/android/link/ui/signup/SignUpScreenTest.kt b/paymentsheet/src/test/java/com/stripe/android/link/ui/signup/SignUpScreenTest.kt
@@ -43,7 +43,7 @@ internal class SignUpScreenTest {
         merchantCountryCode = "US",
         passthroughModeEnabled = false,
         cardBrandChoice = null,
-        shippingValues = mapOf(),
+        shippingDetails = null,
     )
     private val linkAccountManager = FakeLinkAccountManager()
     private val linkEventsReporter = object : FakeLinkEventsReporter() {

diff --git a/...rc/test/java/com/stripe/android/lpmfoundations/paymentmethod/PaymentMethodMetadataTest.kt b/...rc/test/java/com/stripe/android/lpmfoundations/paymentmethod/PaymentMethodMetadataTest.kt
@@ -1303,7 +1303,7 @@ internal class PaymentMethodMetadataTest {
                 ),
                 merchantName = "Merchant Inc.",
                 merchantCountryCode = "CA",
-                shippingValues = mapOf(),
+                shippingDetails = null,
                 flags = mapOf(),
                 cardBrandChoice = LinkConfiguration.CardBrandChoice(
                     eligible = true,

diff --git a/...st/java/com/stripe/android/lpmfoundations/paymentmethod/definitions/CardDefinitionTest.kt b/...st/java/com/stripe/android/lpmfoundations/paymentmethod/definitions/CardDefinitionTest.kt
@@ -171,7 +171,7 @@ class CardDefinitionTest {
             flags = mapOf(),
             passthroughModeEnabled = false,
             cardBrandChoice = null,
-            shippingValues = mapOf()
+            shippingDetails = null
         )
     }
 

diff --git a/...t/java/com/stripe/android/paymentelement/confirmation/ConfirmationHandlerOptionKtxTest.kt b/...t/java/com/stripe/android/paymentelement/confirmation/ConfirmationHandlerOptionKtxTest.kt
@@ -360,7 +360,7 @@ class ConfirmationHandlerOptionKtxTest {
                 phone = null,
                 billingCountryCode = "CA",
             ),
-            shippingValues = mapOf(),
+            shippingDetails = null,
             passthroughModeEnabled = false,
             cardBrandChoice = null,
             flags = mapOf()

diff --git a/.../java/com/stripe/android/paymentelement/confirmation/link/LinkConfirmationActivityTest.kt b/.../java/com/stripe/android/paymentelement/confirmation/link/LinkConfirmationActivityTest.kt
@@ -222,7 +222,7 @@ internal class LinkConfirmationActivityTest(private val nativeLinkEnabled: Boole
                     phone = "+1234567890",
                     billingCountryCode = "CA",
                 ),
-                shippingValues = mapOf(),
+                shippingDetails = null,
                 passthroughModeEnabled = false,
                 flags = mapOf(),
                 cardBrandChoice = null,

diff --git a/...ava/com/stripe/android/paymentelement/confirmation/link/LinkConfirmationDefinitionTest.kt b/...ava/com/stripe/android/paymentelement/confirmation/link/LinkConfirmationDefinitionTest.kt
@@ -278,7 +278,7 @@ internal class LinkConfirmationDefinitionTest {
                     phone = "+1123456789",
                     billingCountryCode = "CA"
                 ),
-                shippingValues = mapOf(),
+                shippingDetails = null,
                 passthroughModeEnabled = false,
                 flags = mapOf(),
                 cardBrandChoice = null,

diff --git a/...test/java/com/stripe/android/paymentelement/confirmation/link/LinkConfirmationFlowTest.kt b/...test/java/com/stripe/android/paymentelement/confirmation/link/LinkConfirmationFlowTest.kt
@@ -156,7 +156,7 @@ class LinkConfirmationFlowTest {
                     phone = "+1123456789",
                     billingCountryCode = "CA"
                 ),
-                shippingValues = mapOf(),
+                shippingDetails = null,
                 passthroughModeEnabled = false,
                 flags = mapOf(),
                 cardBrandChoice = null,

diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/LinkHandlerTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/LinkHandlerTest.kt
@@ -562,7 +562,7 @@ private fun defaultLinkConfiguration(
             phone = "1234567890",
             billingCountryCode = "US",
         ),
-        shippingValues = null,
+        shippingDetails = null,
         passthroughModeEnabled = false,
         cardBrandChoice = null,
         flags = emptyMap(),

diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentSheetViewModelTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentSheetViewModelTest.kt
@@ -948,7 +948,7 @@ internal class PaymentSheetViewModelTest {
                 merchantCountryCode = "US",
                 passthroughModeEnabled = false,
                 cardBrandChoice = null,
-                shippingValues = mapOf(),
+                shippingDetails = null,
             )
 
             val viewModel = createViewModel(
@@ -3335,7 +3335,7 @@ internal class PaymentSheetViewModelTest {
                 phone = null,
                 billingCountryCode = "US",
             ),
-            shippingValues = null,
+            shippingDetails = null,
             passthroughModeEnabled = false,
             cardBrandChoice = null,
             flags = emptyMap()

diff --git a/...et/src/test/java/com/stripe/android/paymentsheet/state/DefaultPaymentElementLoaderTest.kt b/...et/src/test/java/com/stripe/android/paymentsheet/state/DefaultPaymentElementLoaderTest.kt
@@ -579,7 +579,7 @@ internal class DefaultPaymentElementLoaderTest {
                 phone = null,
                 billingCountryCode = "CA",
             ),
-            shippingValues = null,
+            shippingDetails = null,
             passthroughModeEnabled = false,
             cardBrandChoice = null,
             flags = emptyMap(),
@@ -606,7 +606,7 @@ internal class DefaultPaymentElementLoaderTest {
             initializedViaCompose = false,
         ).getOrThrow()
 
-        assertThat(result.linkState?.configuration?.shippingValues).isNotNull()
+        assertThat(result.linkState?.configuration?.shippingDetails).isNotNull()
     }
 
     @Test

diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/utils/LinkTestUtils.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/utils/LinkTestUtils.kt
@@ -59,7 +59,7 @@ internal object LinkTestUtils {
             merchantCountryCode = "US",
             passthroughModeEnabled = false,
             cardBrandChoice = null,
-            shippingValues = mapOf(),
+            shippingDetails = null,
         )
     }
 }