From 5f2b3fec38b3562ec2231044c2843fe1ade97aeb Mon Sep 17 00:00:00 2001 From: Codrut Topliceanu <60002907+codrut-topliceanu@users.noreply.github.com> Date: Tue, 25 May 2021 14:32:17 +0300 Subject: [PATCH] For #18270 - Adds ellipses+last 4 digits to CC display (#19420) * For #18270 - Adds ellipses+last 4 digits to CC display --- .../settings/creditcards/view/CreditCardItemViewHolder.kt | 4 +--- .../settings/creditcards/CreditCardItemViewHolderTest.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardItemViewHolder.kt index 7f91398a8..0ac77e17a 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardItemViewHolder.kt @@ -23,9 +23,7 @@ class CreditCardItemViewHolder( ) : ViewHolder(view) { fun bind(creditCard: CreditCard) { - // TODO this should be last4 instead... - // and option to explicitly decrypt if necessary to show full number - credit_card_number.text = creditCard.encryptedCardNumber.number + credit_card_number.text = creditCard.obfuscatedCardNumber bindCreditCardExpiryDate(creditCard) diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardItemViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardItemViewHolderTest.kt index 0940e5659..16a31a31d 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardItemViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardItemViewHolderTest.kt @@ -50,7 +50,7 @@ class CreditCardItemViewHolderTest { fun `GIVEN a new credit card item on bind THEN set the card number and expiry date text`() { CreditCardItemViewHolder(view, interactor).bind(creditCard) - assertEquals(creditCard.encryptedCardNumber.number, view.credit_card_number.text) + assertEquals(creditCard.obfuscatedCardNumber, view.credit_card_number.text) assertEquals("0${creditCard.expiryMonth}/${creditCard.expiryYear}", view.expiry_date.text) }