Show blocked brands as disabled in CBC drop down #9979

porter-stripe · 2025-01-24T17:10:29Z

Summary

For card brand filtering, we now want to show blocked brands in the CBC dropdown as disabled rather than just hide them from the drop down.
This now shows blocked card brand as "not available"
Context here

Motivation

https://jira.corp.stripe.com/browse/MOBILESDK-3036

Testing

Manual
E2E test updated
New unit test

Screenshots

Changelog

N/A

github-actions · 2025-01-24T17:16:09Z

Diffuse output:

OLD: paymentsheet-example-release-master.apk (signature: V1, V2)
NEW: paymentsheet-example-release-pr.apk (signature: V1, V2)

          │            compressed            │          uncompressed          
          ├───────────┬───────────┬──────────┼──────────┬──────────┬──────────
 APK      │ old       │ new       │ diff     │ old      │ new      │ diff     
──────────┼───────────┼───────────┼──────────┼──────────┼──────────┼──────────
      dex │     4 MiB │     4 MiB │   +496 B │  8.7 MiB │  8.7 MiB │   +388 B 
     arsc │   2.3 MiB │   2.3 MiB │   +728 B │  2.3 MiB │  2.3 MiB │   +728 B 
 manifest │   5.1 KiB │   5.1 KiB │      0 B │ 25.7 KiB │ 25.7 KiB │      0 B 
      res │ 910.3 KiB │ 910.3 KiB │     -3 B │  1.4 MiB │  1.4 MiB │      0 B 
   native │   2.6 MiB │   2.6 MiB │      0 B │    6 MiB │    6 MiB │      0 B 
    asset │   1.6 MiB │   1.6 MiB │    -17 B │  1.6 MiB │  1.6 MiB │    -17 B 
    other │   1.4 MiB │   1.4 MiB │    -13 B │  1.6 MiB │  1.6 MiB │      0 B 
──────────┼───────────┼───────────┼──────────┼──────────┼──────────┼──────────
    total │  12.7 MiB │  12.7 MiB │ +1.2 KiB │ 21.6 MiB │ 21.6 MiB │ +1.1 KiB 

 DEX     │ old   │ new   │ diff         
─────────┼───────┼───────┼──────────────
   files │     1 │     1 │  0           
 strings │ 40955 │ 40956 │ +1 (+4 -3)   
   types │ 14144 │ 14144 │  0 (+0 -0)   
 classes │ 11805 │ 11805 │  0 (+0 -0)   
 methods │ 60127 │ 60129 │ +2 (+34 -32) 
  fields │ 40226 │ 40228 │ +2 (+9 -7)   

 ARSC    │ old  │ new  │ diff       
─────────┼──────┼──────┼────────────
 configs │  243 │  243 │  0         
 entries │ 6211 │ 6212 │ +1 (+1 -0)

APK

     compressed      │     uncompressed     │                                           
──────────┬──────────┼───────────┬──────────┤                                           
 size     │ diff     │ size      │ diff     │ path                                      
──────────┼──────────┼───────────┼──────────┼───────────────────────────────────────────
  2.3 MiB │   +728 B │   2.3 MiB │   +728 B │ ∆ resources.arsc                          
    4 MiB │   +496 B │   8.7 MiB │   +388 B │ ∆ classes.dex                             
  7.7 KiB │    -17 B │   7.6 KiB │    -17 B │ ∆ assets/dexopt/baseline.prof             
 53.6 KiB │     -8 B │ 118.8 KiB │      0 B │ ∆ META-INF/CERT.SF                        
 50.4 KiB │     -3 B │ 118.8 KiB │      0 B │ ∆ META-INF/MANIFEST.MF                    
    271 B │     -1 B │     120 B │      0 B │ ∆ META-INF/version-control-info.textproto 
  1.2 KiB │     -1 B │   3.9 KiB │      0 B │ ∆ res/2d.xml                              
  1.2 KiB │     -1 B │   3.7 KiB │      0 B │ ∆ res/BH.xml                              
  1.1 KiB │     -1 B │   3.2 KiB │      0 B │ ∆ res/nn.xml                              
  1.2 KiB │     -1 B │   1.2 KiB │      0 B │ ∆ META-INF/CERT.RSA                       
──────────┼──────────┼───────────┼──────────┼───────────────────────────────────────────
  6.3 MiB │ +1.2 KiB │  11.2 MiB │ +1.1 KiB │ (total)

DEX

STRINGS:

   old   │ new   │ diff       
  ───────┼───────┼────────────
   40955 │ 40956 │ +1 (+4 -3) 
  
  + VLLZJZLI
  + VLLZJZLLI
  + allChoices
  + ~~R8{"backend":"dex","compilation-mode":"release","has-checksums":false,"min-api":21,"pg-map-id":"2434e62","r8-mode":"full","version":"8.7.14"}
  
  - VLLZJLI
  - VLLZJLLI
  - ~~R8{"backend":"dex","compilation-mode":"release","has-checksums":false,"min-api":21,"pg-map-id":"7feffa3","r8-mode":"full","version":"8.7.14"}
  

METHODS:

   old   │ new   │ diff         
  ───────┼───────┼──────────────
   60127 │ 60129 │ +2 (+34 -32) 
  
  + N.L0 h() → P0
  + N.L0 i()
  + N.L0 j(Object, Object) → boolean
  + N.L0 k(Object)
  + N.L0 l(List)
  + P3.e i()
  + Q2.g i()
  + Q2.g k(Context)
  + R4.d l(List)
  + R4.h <init>(c, i, i, v, d, a)
  + R6.m e(String, Integer, boolean, long, boolean, a, p, int)
  + X8.R0 a() → boolean
  + X8.T0 <init>(String, Integer, boolean, long, boolean, a, int)
  + X8.X0 <init>(String, c, int, boolean)
  + X8.X0 a() → boolean
  + c2.g h(l)
  + c2.g i()
  + c2.g k(int, float)
  + c2.g l(List)
  + d8.h <init>(i, boolean)
  + d8.h a() → boolean
  + f2.e i()
  + h.F h(l)
  + h.N h(l)
  + h.T h(l)
  + h.T i()
  + h.t i(F)
  + m.b i()
  + m.e h(l)
  + m.e i()
  + n.j h(l)
  + o.Y0 h(l)
  + o.Y k(int, float)
  + o.a0 k(int, float)
  
  - N.L0 h(ArrayList)
  - N.L0 i() → P0
  - N.L0 j()
  - N.L0 k(Object, Object) → boolean
  - N.L0 l(Object)
  - P3.e k()
  - Q2.g i(Context)
  - Q2.g k()
  - R4.d h(ArrayList)
  - R4.h <init>(c, i, i, v, d, a, a)
  - R4.h d(List)
  - R6.m e(String, Integer, boolean, long, a, p, int)
  - X8.T0 <init>(String, Integer, boolean, long, a, int)
  - X8.X0 <init>(String, c, int)
  - c2.g h(ArrayList)
  - c2.g i(l)
  - c2.g k()
  - c2.g l(int, float)
  - d8.h <init>(i)
  - f2.e k()
  - h.F i(l)
  - h.N i(l)
  - h.T h()
  - h.T i(l)
  - h.t h(F)
  - m.b h()
  - m.e h()
  - m.e i(l)
  - n.j i(l)
  - o.Y0 i(l)
  - o.Y l(int, float)
  - o.a0 l(int, float)
  

FIELDS:

   old   │ new   │ diff       
  ───────┼───────┼────────────
   40226 │ 40228 │ +2 (+9 -7) 
  
  + R4.h g: d0
  + R4.h h: a
  + R4.h i: List
  + R4.h j: q0
  + X8.T0 h: boolean
  + X8.T0 i: a
  + X8.T0 j: int
  + X8.X0 d: boolean
  + d8.h b: boolean
  
  - R4.h g: a
  - R4.h h: d0
  - R4.h i: a
  - R4.h j: Object
  - R4.h k: q0
  - X8.T0 h: a
  - X8.T0 i: int

ARSC

ENTRIES:

   old  │ new  │ diff       
  ──────┼──────┼────────────
   6211 │ 6212 │ +1 (+1 -0) 
  + string/stripe_card_brand_not_accepted_with_brand

porter-stripe · 2025-01-24T18:20:54Z

paymentsheet/res/values/strings.xml

@@ -222,4 +222,6 @@
  <!-- A text notice shown when the user selects an expired card. -->
  <string name="stripe_wallet_update_expired_card_error">This card has expired. Update your card info or choose a different payment method.</string>
  <string name="stripe_wallet_expand_accessibility">Change selection</string>
+  <!-- Shown in a dropdown picker next to a card brand that is not accepted by a merchant. E.g. "Visa (not accepted)" -->
+  <string name="stripe_card_brand_not_accepted">(not accepted)</string>


Is there one file where I can put these rather than in two strings.xml files?

You can access the one in payments-core-ui in paymentsheet module. It'll just require a different import.

jaynewstrom-stripe · 2025-01-24T20:25:31Z

payments-ui-core/res/values/strings.xml

@@ -105,4 +105,6 @@
  <string name="stripe_setup_button_label">Set up</string>
  <!-- Label for UPI ID number field on form -->
  <string name="stripe_upi_id_label">UPI ID</string>
+  <!-- Shown in a dropdown picker next to a card brand that is not accepted by a merchant. E.g. "Visa (not accepted)" -->
+  <string name="stripe_card_brand_not_accepted">(not accepted)</string>


Should this be a parameterized string (I know some languages won't have the same ordering as english).

Ah, that's a good idea. I should do this on iOS too.

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberController.kt

jaynewstrom-stripe · 2025-01-24T20:27:43Z

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberController.kt

+                    label = if (enabled) {
+                        brand.displayName.resolvableString
+                    } else {
+                        brand.displayName.resolvableString +


This should be pretty easy to parameterize, let me know if you want to pair on it!

jaynewstrom-stripe · 2025-01-24T20:28:46Z

paymentsheet/res/values/strings.xml

@@ -222,4 +222,6 @@
  <!-- A text notice shown when the user selects an expired card. -->
  <string name="stripe_wallet_update_expired_card_error">This card has expired. Update your card info or choose a different payment method.</string>
  <string name="stripe_wallet_expand_accessibility">Change selection</string>
+  <!-- Shown in a dropdown picker next to a card brand that is not accepted by a merchant. E.g. "Visa (not accepted)" -->
+  <string name="stripe_card_brand_not_accepted">(not accepted)</string>


You can access the one in payments-core-ui in paymentsheet module. It'll just require a different import.

jaynewstrom-stripe · 2025-01-24T20:30:21Z

...tsheet/src/test/java/com/stripe/android/paymentsheet/VerticalModePaymentSheetActivityTest.kt

@@ -446,6 +446,7 @@ internal class VerticalModePaymentSheetActivityTest {
        // Verify that the error message appears
        formPage.assertErrorExists("American Express is not accepted")
        verticalModePage.assertPrimaryButton(isNotEnabled())
+        formPage.fillCardNumber("")


Why is this necessary?

I notice some flaks occasionally, where when entering an Amex the CVC field changing from CVC to CVV, then "pasting" in an entire card doesn't update it back to CVC. Seems like an unrelated bug/test quirk.

The solution here is probably to just remove CVV usage for Amex, we did this on iOS and web no longer uses CVV.

paymentsheet/src/test/java/com/stripe/android/paymentsheet/EditPage.kt

jaynewstrom-stripe

Overall this looks good to me. But I do worry about the test changes.

jaynewstrom-stripe · 2025-01-24T21:54:42Z

payments-ui-core/src/test/java/com/stripe/android/ui/core/elements/CardNumberControllerTest.kt

@@ -481,7 +481,8 @@ internal class CardNumberControllerTest {
            val secondReported = awaitItem()
            assertEquals(CardBrand.MasterCard, secondReported, "MasterCard should be reported once")

-            // Simulate entering an invalid card number
+            // Simulate clearing the input and entering an invalid card number
+            cardNumberController.onValueChange("")


These test changes do worry me a bit.

porter-stripe added 6 commits January 24, 2025 08:45

Show "not available" next to block brands in CBC dropdown

1ad03a3

Give enabled a default value for Item

40c64b1

Update E2E CBC test to assert disabled

a2a3721

Update/add tests

e527569

Fix test

147efff

Add not available to card field

401fb0d

porter-stripe changed the title ~~Porter/mobilesdk 3036~~ Show blocked brands as disabled in CBC drop down Jan 24, 2025

porter-stripe added 5 commits January 24, 2025 10:32

Fix copy to (not accepted)

3e6cf4b

Update comment

564ce84

Lint

02f2e88

Merge branch 'master' into porter/MOBILESDK-3036

58c3ed8

Fix test

ae24beb

porter-stripe commented Jan 24, 2025

View reviewed changes

porter-stripe added 3 commits January 24, 2025 11:22

Lint

b445665

Fix tests

7b5b154

Auto select if CBC only has one allowed choice

a4ebd98

porter-stripe added the card brand filtering label Jan 24, 2025

porter-stripe marked this pull request as ready for review January 24, 2025 20:12

porter-stripe requested review from a team as code owners January 24, 2025 20:12

porter-stripe requested review from amk-stripe and jaynewstrom-stripe and removed request for amk-stripe January 24, 2025 20:12

jaynewstrom-stripe reviewed Jan 24, 2025

View reviewed changes

porter-stripe added 3 commits January 24, 2025 13:57

Parameterize string

6c9b10c

Test brand selection

7e36e22

Ensure other dropdown item is still enabled

053f854

porter-stripe requested a review from jaynewstrom-stripe January 24, 2025 21:51

jaynewstrom-stripe reviewed Jan 24, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Show blocked brands as disabled in CBC drop down #9979

Show blocked brands as disabled in CBC drop down #9979

porter-stripe commented Jan 24, 2025

github-actions bot commented Jan 24, 2025 •

edited

Loading

porter-stripe Jan 24, 2025

jaynewstrom-stripe Jan 24, 2025

jaynewstrom-stripe Jan 24, 2025

porter-stripe Jan 24, 2025

jaynewstrom-stripe Jan 24, 2025

jaynewstrom-stripe Jan 24, 2025

jaynewstrom-stripe Jan 24, 2025

porter-stripe Jan 24, 2025 •

edited

Loading

jaynewstrom-stripe left a comment

jaynewstrom-stripe Jan 24, 2025

Show blocked brands as disabled in CBC drop down #9979

Are you sure you want to change the base?

Show blocked brands as disabled in CBC drop down #9979

Conversation

porter-stripe commented Jan 24, 2025

Summary

Motivation

Testing

Screenshots

Changelog

github-actions bot commented Jan 24, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

porter-stripe Jan 24, 2025 • edited Loading

Choose a reason for hiding this comment

jaynewstrom-stripe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jan 24, 2025 •

edited

Loading

porter-stripe Jan 24, 2025 •

edited

Loading