Add Card Metadata Service to CardNumberController #4573

epan-stripe · 2022-02-10T18:45:22Z

Summary

Add the card metadata service to the CardNumberController to account for longer card lengths.

Testing

Added tests
Modified tests
Manually verified

github-actions · 2022-02-10T18:52:20Z

Diffuse output:

skyler-stripe

I think some extra testings both in the unit tests and adding some notes in the top level description of this PR would be helpful.

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

paymentsheet/src/main/java/com/stripe/android/paymentsheet/forms/FormPreview.kt

michelleb-stripe · 2022-02-10T23:18:53Z

You should be able to remove the string: card_number_longer_than_expected

michelleb-stripe · 2022-02-10T23:21:09Z

Remove FormPreview, it isn't working anyway, and preview is probably better used on smaller units.

…-android into elena/card-metadataservice

michelleb-stripe · 2022-02-10T23:22:26Z

Let's just make sure the michelleb/credit-card-compose gets reviewed and approved before merging this branch in.

…-android into elena/card-metadataservice

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

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

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

epan-stripe · 2022-02-15T23:26:00Z

PTAL @michelleb-stripe

…ipe-android into elena/card-metadataservice

michelleb-stripe · 2022-02-18T02:40:57Z

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

+    private val cardAccountRangeRepository: CardAccountRangeRepository,
+    private val workContext: CoroutineContext,


These are no longer required as member variables, just parameters so you can remove the private val.

michelleb-stripe · 2022-02-18T02:42:49Z

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

    }
    override val fieldState: Flow<TextFieldState> = _fieldState

    private val _hasFocus = MutableStateFlow(false)

+    @VisibleForTesting
+    val accountRangeService = CardAccountRangeService(


This is really cool, now all the logic for the service is tied up nicely in a bow in this CardAccountRangeService

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

michelleb-stripe · 2022-02-18T02:51:48Z

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


 internal class CardNumberController constructor(
    private val cardTextFieldConfig: CardNumberConfig,
+    private val cardAccountRangeRepository: CardAccountRangeRepository,
+    private val workContext: CoroutineContext,
+    private val staticCardAccountRanges: StaticCardAccountRanges = DefaultStaticCardAccountRanges(),


I think we can move StaticCardAccountRanges into the CardAccountRangeService. It feels like the CardNumberController shouldn't care about if it needs to query the StaticCardAccount or the server to get the AccountResult. All it needs to know is to call update (a new function) on CardAccountRangeService, and it will get updated on any required changes to the AccountResult through the callback.

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

michelleb-stripe

A few more comments, it is looking really good!

…ents/CardNumberController.kt Co-authored-by: michelleb-stripe <[email protected]>

…ipe-android into elena/card-metadataservice

…-android into elena/card-metadataservice

epan-stripe · 2022-02-24T00:39:03Z

PTAL @michelleb-stripe

michelleb-stripe · 2022-02-24T22:16:25Z

payments-core/src/main/java/com/stripe/android/cards/CardAccountRangeService.kt

+    val isLoading: Flow<Boolean> = cardAccountRangeRepository.loading.map {
+        it
+    }


Suggested change

val isLoading: Flow<Boolean> = cardAccountRangeRepository.loading.map {

it

}

val isLoading: Flow<Boolean> = cardAccountRangeRepository.loading

epan-stripe · 2022-02-24T22:20:36Z

payments-core/src/main/java/com/stripe/android/cards/CardAccountRangeService.kt

+        val staticAccountRange = staticCardAccountRanges.filter(cardNumber)
+            .let { accountRanges ->
+                if (accountRanges.size == 1) {
+                    accountRanges.first()
+                } else {
+                    null
+                }
+            }


We need the check for whether the accountRange.size is equal to 1

michelleb-stripe · 2022-02-24T22:45:47Z

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

@@ -3,5 +3,4 @@
    <!--
    Items here need to be entered in our translation tool
    -->
-    <string name="card_number_longer_than_expected" tools:ignore="ExtraTranslation">The card number is longer than expected, but you can still submit it.</string>


yay! excited to see this removed!

michelleb-stripe · 2022-02-24T23:26:46Z

We don't have to address it in this PR, but a couple of things I am seeing:

On master the card brand doesn't populate until the last zero of 6205 50 is entered. Not sure what exactly is causing that different behavior
The CVV icon in michelleb/credit-card-compose is not showing up, but the placeholder text does change.
Next field from the card number appears to be the CVV instead of the date
Only the card number shows a red line under the text when it loses focus, in dark mode, but all fields have the line under in light mode. It should be that the CVC and expiration text have a red line when the field is in error.
- When the CVC is in error it shows the card number error message
If only a CVC is entered the error message shows that the card number is valid. It should be blank, but not an error.

You can move these to the top level PR and address them as separate PRs. Thanks epan!

* [WIP] * Display and receive input for Credit Card number and CVC. * Add in the credit billing fields, need hidden visibility to work on address fields. * Billing code now shows the correct fields. * Billing now added to the credit element. * Credit card number length verification corrected. * Refactor Elements so each element (including sections) provide the form field values of it's elements. This simplifies the form quite a bit! * Add in the expiration date functionality. * Refactor so that each element returns a flow of FormFieldEntries, so that we don't have to iterate through section element fields to get the form field values. * Fix unit test * Rename class * More rework * Get ready for merge with master * Change from liveData to flow. * Row is working but not expiry date * Make the keypad just numbers. * Make the keypad just numbers. * Set the expiration month and date correctly in the formFieldValues * Update the focus to visit the CVC * Handle a full text field state. * Unit tests * ktlintFormat * Format card number based on max pan for card number * Cleanup date util for expiration month * Make the label flowable * Fix internals * Cleanup * Cleanup * Fix unit tests * ktlintFormat * Undos * ktlintFormat * Ignore tests that cause other failures * Working on the merge. * Almost building * Get closer to master * Update files. * Building * Fix unit tests * Cleanup * Remove extra comment * Fix failing tests * Fix linting * Fix SaveForFutureUseController.label not showing * Cleanup * apiDump * apiDump * Fix some failing tests, apiDump, ktlintFormat * Fix remaining failing tests, apiDump, ktlintFormat * Fix todo * Simplify and add DateConfig tests and cleanup commented out code in TextFieldController. * ktlintFormat apiDump * Add icons to the IBAN, credit card and CVC fields. (#4359) * Add Card Metadata Service to CardNumberController (#4573) * Add card metadataservice for CardNumberController * Add card metadataservice for CardNumberController * Minor fixes * Minor fixes * Make more methods internal * Fix tests * Minor fixes * Fix failing tests * Fix failing tests * Refactor CardNumberController and add tests * Don't hardcode visualTransformation panLength * Change interface to service * Fix tests * Update payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberController.kt Co-authored-by: michelleb-stripe <[email protected]> * Update payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberController.kt Co-authored-by: michelleb-stripe <[email protected]> * Move staticCardAccountRanges * Add loading icon * Add loading icon * Minor fix Co-authored-by: michelleb-stripe <[email protected]> * Don't show cardbrand if there are multiple possibilities * Don't show cardbrand if there are multiple possibilities * Material Theme information gathering. * Revert "Material Theme information gathering." This reverts commit 067ea3b. * Immediately detect invalid card numbers (no brand) * Fix invalid vs incomplete dateconfig error text * Fix CVC icon and next field focus * Fix expiry date accessibility reader * Fix merge issues * Add ability to move focus on delete * Fix dark mode error underline * Fix cursor and spacing position in card details * update icons and colors for future wardrobe work * Add card information title * Add tests for card number formatting * Revert "Add tests for card number formatting" This reverts commit 0c87580 * Add country list to card and sepa billing spec. (#4669) * Credit Card Address and focus bug fixes (#4665) * Fix width of rows (#4676) * Fix row max width calculation * Update visibleFields calculation method * Fix spacing for AMEX and Discover cards (#4672) * Fix card number spacing for AMEX and Discover * Add tests for card number formatting * Fix test fixtures * Fix tests * Don't show CVC error when CardBrand is unknown (#4681) * Don't show CVC error when cardbrand is unknown * Fix tests * Stop accessibility talkback reading textfields twice (#4683) * ktformat * Fix detekt * checkbox colors read from theme object now * Initial implementation * Fix camera icon * Move design changes to different branch * Update camera icon design * Add string resource for scan card text and remove "test" name * Use actual publishable key * Add removeCardScanFragment to StripeCardScanProxy * Restart fragment onResume and onPause * Restart fragment onResume and onPause * Update to match CardScanSheet changes * Fix scan card button styling * Fix scan card button styling * Update CHANGELOG * Move CARD_SCAN_PARCELABLE_NAME to companion object * Stop passing context in and delete CardDetailsSpec * Make CardScanActivity internal * Make code segment more functional * Fix comment * Add tests for StripeCardScanProxy * Fix tests * Fix tests * Stop setting Scan card button font weight * Add context back to TransformSpecToElements * Add CardDetailsSectionController so credit card form values are passed through * Update CardScanActivity package * Remove context from FormUI * Add clarifying comment * Remove unnecessary padding * Create ScanCardButtonUI composable * Move isStripeCardScan object to controller instead of Composable * Use material camera icon Co-authored-by: Michelle Brubaker <[email protected]> Co-authored-by: michelleb-stripe <[email protected]> Co-authored-by: James Woo <[email protected]> Co-authored-by: Skyler Reimer <[email protected]>

Add card metadataservice for CardNumberController

d88f39c

epan-stripe requested a review from michelleb-stripe February 10, 2022 18:45

epan-stripe assigned michelleb-stripe Feb 10, 2022

epan-stripe requested review from brnunes-stripe, skyler-stripe, ccen-stripe and awush-stripe as code owners February 10, 2022 18:45

epan-stripe self-assigned this Feb 10, 2022

epan-stripe removed request for brnunes-stripe, ccen-stripe, awush-stripe and skyler-stripe February 10, 2022 18:45

skyler-stripe suggested changes Feb 10, 2022

View reviewed changes

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberController.kt Outdated Show resolved Hide resolved

paymentsheet/src/main/java/com/stripe/android/paymentsheet/forms/FormPreview.kt Outdated Show resolved Hide resolved

stripe-ci unassigned michelleb-stripe Feb 10, 2022

epan-stripe assigned michelleb-stripe Feb 10, 2022

epan-stripe added 2 commits February 10, 2022 15:21

Add card metadataservice for CardNumberController

4d15133

Merge branch 'elena/card-metadataservice' of github.com:stripe/stripe…

5f8b87a

…-android into elena/card-metadataservice

epan-stripe added 3 commits February 10, 2022 15:30

Minor fixes

508d7b1

Minor fixes

0e42b61

Merge branch 'elena/card-metadataservice' of github.com:stripe/stripe…

dfd29ea

…-android into elena/card-metadataservice

michelleb-stripe reviewed Feb 10, 2022

View reviewed changes

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberController.kt Outdated Show resolved Hide resolved

michelleb-stripe reviewed Feb 11, 2022

View reviewed changes

...-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberVisualTransformation.kt Outdated Show resolved Hide resolved

epan-stripe added 2 commits February 10, 2022 17:07

Make more methods internal

af325cd

Fix tests

bab8c50

michelleb-stripe reviewed Feb 11, 2022

View reviewed changes

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CvcConfig.kt Outdated Show resolved Hide resolved

Minor fixes

448bfce

epan-stripe assigned michelleb-stripe Feb 15, 2022

epan-stripe added 3 commits February 17, 2022 17:58

Change interface to service

5de17a8

Fix tests

e5cc97a

Merge branch 'michelleb/credit-card-compose' of github.com:stripe/str…

2ec6979

…ipe-android into elena/card-metadataservice

michelleb-stripe reviewed Feb 18, 2022

View reviewed changes

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberController.kt Outdated Show resolved Hide resolved

michelleb-stripe reviewed Feb 18, 2022

View reviewed changes

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberController.kt Outdated Show resolved Hide resolved

michelleb-stripe suggested changes Feb 18, 2022

View reviewed changes

michelleb-stripe removed their assignment Feb 18, 2022

epan-stripe and others added 4 commits February 18, 2022 06:54

Update payments-ui-core/src/main/java/com/stripe/android/ui/core/elem…

2428d4e

…ents/CardNumberController.kt Co-authored-by: michelleb-stripe <[email protected]>

Update payments-ui-core/src/main/java/com/stripe/android/ui/core/elem…

ee0cc04

…ents/CardNumberController.kt Co-authored-by: michelleb-stripe <[email protected]>

Move staticCardAccountRanges

3296494

Merge branch 'michelleb/credit-card-compose' of github.com:stripe/str…

ed86098

…ipe-android into elena/card-metadataservice

Nourhazimhmaidi approved these changes Feb 20, 2022

View reviewed changes

epan-stripe added 3 commits February 23, 2022 13:39

Add loading icon

f84d0eb

Add loading icon

436ba6a

Merge branch 'elena/card-metadataservice' of github.com:stripe/stripe…

4785e39

…-android into elena/card-metadataservice

epan-stripe assigned michelleb-stripe Feb 24, 2022

michelleb-stripe reviewed Feb 24, 2022

View reviewed changes

epan-stripe commented Feb 24, 2022

View reviewed changes

Minor fix

21be63d

michelleb-stripe reviewed Feb 24, 2022

View reviewed changes

epan-stripe merged commit a18c6c2 into michelleb/credit-card-compose Feb 25, 2022

epan-stripe deleted the elena/card-metadataservice branch February 25, 2022 14:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Card Metadata Service to CardNumberController #4573

Add Card Metadata Service to CardNumberController #4573

epan-stripe commented Feb 10, 2022

github-actions bot commented Feb 10, 2022

skyler-stripe left a comment

michelleb-stripe commented Feb 10, 2022

michelleb-stripe commented Feb 10, 2022

michelleb-stripe commented Feb 10, 2022

epan-stripe commented Feb 15, 2022

michelleb-stripe Feb 18, 2022

michelleb-stripe Feb 18, 2022

michelleb-stripe Feb 18, 2022

michelleb-stripe left a comment

epan-stripe commented Feb 24, 2022

michelleb-stripe Feb 24, 2022

epan-stripe Feb 24, 2022

michelleb-stripe Feb 24, 2022

michelleb-stripe commented Feb 24, 2022 •

edited

Loading

		private val cardAccountRangeRepository: CardAccountRangeRepository,
		private val workContext: CoroutineContext,

Add Card Metadata Service to CardNumberController #4573

Add Card Metadata Service to CardNumberController #4573

Conversation

epan-stripe commented Feb 10, 2022

Summary

Testing

github-actions bot commented Feb 10, 2022

skyler-stripe left a comment

Choose a reason for hiding this comment

michelleb-stripe commented Feb 10, 2022

michelleb-stripe commented Feb 10, 2022

michelleb-stripe commented Feb 10, 2022

epan-stripe commented Feb 15, 2022

michelleb-stripe Feb 18, 2022

Choose a reason for hiding this comment

michelleb-stripe Feb 18, 2022

Choose a reason for hiding this comment

michelleb-stripe Feb 18, 2022

Choose a reason for hiding this comment

michelleb-stripe left a comment

Choose a reason for hiding this comment

epan-stripe commented Feb 24, 2022

michelleb-stripe Feb 24, 2022

Choose a reason for hiding this comment

epan-stripe Feb 24, 2022

Choose a reason for hiding this comment

michelleb-stripe Feb 24, 2022

Choose a reason for hiding this comment

michelleb-stripe commented Feb 24, 2022 • edited Loading

michelleb-stripe commented Feb 24, 2022 •

edited

Loading