Updated unit and screenshot tests

Author: jeans-stripe

crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt

@@ -1171,5 +1171,8 @@ internal fun LinkController.PaymentMethodType.toDisplayType(): PaymentMethodDisp
 
         LinkController.PaymentMethodType.BankAccount ->
             PaymentMethodDisplayData.Type.BankAccount
+
+        LinkController.PaymentMethodType.Generic ->
+            PaymentMethodDisplayData.Type.Card
     }
 }

payments-core/src/test/java/com/stripe/android/model/ConsumerFixtures.kt

@@ -264,7 +264,7 @@ object ConsumerFixtures {
         """.trimIndent()
     )
 
-    val CONSUMER_SINGLE_UNKNOWN_PAYMENT_DETAILS_JSON = JSONObject(
+    val CONSUMER_SINGLE_GENERIC_PAYMENT_DETAILS_JSON = JSONObject(
         """
             {
               "redacted_payment_details": [
@@ -281,14 +281,14 @@ object ConsumerFixtures {
                       "default": "https://example.com/crypto-icon.png"
                     }
                   },
-                  "next_action_types": ["STRIPE_REDIRECT"]
+                  "next_action_types": ["redirect_to_url"]
                 }
               ]
             }
         """.trimIndent()
     )
 
-    val CONSUMER_UNKNOWN_PAYMENT_DETAILS_NO_SUBLABEL_ICON_JSON = JSONObject(
+    val CONSUMER_GENERIC_PAYMENT_DETAILS_NO_SUBLABEL_ICON_JSON = JSONObject(
         """
             {
               "redacted_payment_details": [
@@ -307,7 +307,7 @@ object ConsumerFixtures {
         """.trimIndent()
     )
 
-    val CONSUMER_UNKNOWN_PAYMENT_DETAILS_NO_DISPLAY_JSON = JSONObject(
+    val CONSUMER_GENERIC_PAYMENT_DETAILS_NO_DISPLAY_JSON = JSONObject(
         """
             {
               "redacted_payment_details": [

payments-core/src/test/java/com/stripe/android/model/parsers/ConsumerPaymentDetailsJsonParserTest.kt

@@ -223,7 +223,7 @@ class ConsumerPaymentDetailsJsonParserTest {
     }
 
     @Test
-    fun `parse unknown payment type`() {
+    fun `parse generic payment type`() {
         assertEquals(
             ConsumerPaymentDetails(
                 listOf(
@@ -247,12 +247,12 @@ class ConsumerPaymentDetailsJsonParserTest {
                 )
             ),
             ConsumerPaymentDetailsJsonParser
-                .parse(ConsumerFixtures.CONSUMER_SINGLE_UNKNOWN_PAYMENT_DETAILS_JSON),
+                .parse(ConsumerFixtures.CONSUMER_SINGLE_GENERIC_PAYMENT_DETAILS_JSON),
         )
     }
 
     @Test
-    fun `parse unknown payment type without sublabel or icon`() {
+    fun `parse generic payment type without sublabel or icon`() {
         assertEquals(
             ConsumerPaymentDetails(
                 listOf(
@@ -274,21 +274,21 @@ class ConsumerPaymentDetailsJsonParserTest {
                 )
             ),
             ConsumerPaymentDetailsJsonParser
-                .parse(ConsumerFixtures.CONSUMER_UNKNOWN_PAYMENT_DETAILS_NO_SUBLABEL_ICON_JSON),
+                .parse(ConsumerFixtures.CONSUMER_GENERIC_PAYMENT_DETAILS_NO_SUBLABEL_ICON_JSON),
         )
     }
 
     @Test
-    fun `parse unknown payment type without display is dropped`() {
+    fun `parse generic payment type without display is dropped`() {
         assertEquals(
             ConsumerPaymentDetails(emptyList()),
             ConsumerPaymentDetailsJsonParser
-                .parse(ConsumerFixtures.CONSUMER_UNKNOWN_PAYMENT_DETAILS_NO_DISPLAY_JSON),
+                .parse(ConsumerFixtures.CONSUMER_GENERIC_PAYMENT_DETAILS_NO_DISPLAY_JSON),
         )
     }
 
     @Test
-    fun `parse card with unrecognized funding defaults to Unknown`() {
+    fun `parse card with unrecognized funding defaults to Generic`() {
         val json = createCardJsonWithFunding("INVALID")
         val expected = createExpectedCardWithFunding(ConsumerPaymentDetails.Card.Funding.Unknown)
         assertEquals(expected, ConsumerPaymentDetailsJsonParser.parse(json))

paymentsheet/src/main/java/com/stripe/android/link/ui/wallet/Icon.kt

@@ -1,6 +1,6 @@
 package com.stripe.android.link.ui.wallet
 
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.BoxWithConstraintsScope
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
@@ -13,9 +13,9 @@ import com.stripe.android.uicore.image.StripeImage
 fun Icon(
     iconUrl: String?,
     modifier: Modifier = Modifier,
-    errorContent: @Composable (BoxWithConstraintsScope.() -> Unit) = {},
+    errorContent: @Composable BoxWithConstraintsScope.() -> Unit = {},
 ) {
-    Box(modifier = modifier) {
+    BoxWithConstraints(modifier = modifier) {
         iconUrl?.let {
                 StripeImage(
                     url = iconUrl,
@@ -25,6 +25,6 @@ fun Icon(
                     contentScale = ContentScale.Fit,
                     errorContent = errorContent
                 )
-        } ?: errorContent
+        } ?: errorContent()
     }
 }

paymentsheet/src/main/java/com/stripe/android/link/ui/wallet/WalletPaymentMethodMenu.kt

@@ -59,6 +59,6 @@ private val ConsumerPaymentDetails.PaymentDetails.canBeSetAsDefault
     get() = when (this) {
         is ConsumerPaymentDetails.BankAccount,
         is ConsumerPaymentDetails.Card,
-        is ConsumerPaymentDetails.Passthrough -> isDefault
+        is ConsumerPaymentDetails.Passthrough -> !isDefault
         is ConsumerPaymentDetails.Generic -> false
     }