From a38a254f940308286c2584e86ae624511c323f0e Mon Sep 17 00:00:00 2001 From: "Brandon Stites (via MelvinBot)" Date: Mon, 10 Aug 2026 18:54:34 +0000 Subject: [PATCH 1/6] Surface Expensify Card monthly settlement date on card settings page Co-authored-by: Brandon Stites --- src/languages/de.ts | 1 + src/languages/el.ts | 1 + src/languages/en.ts | 1 + src/languages/es.ts | 1 + src/languages/fr.ts | 1 + src/languages/it.ts | 1 + src/languages/ja.ts | 1 + src/languages/nl.ts | 1 + src/languages/pl.ts | 1 + src/languages/pt-BR.ts | 1 + src/languages/zh-hans.ts | 1 + .../expensifyCard/WorkspaceCardSettingsPage.tsx | 9 ++++++++- 12 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index 9de8a6238564..99e51d68766c 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -5980,6 +5980,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU settlementFrequencyDescription: 'Wählen Sie, wie oft Sie den Saldo Ihrer Expensify Karte begleichen.', settlementFrequencyInfo: 'Wenn du zur monatlichen Abrechnung wechseln möchtest, musst du dein Bankkonto über Plaid verbinden und eine positive Kontohistorie der letzten 90 Tage haben.', + monthlySettlementDate: (date) => `Abrechnung am ${date} jedes Monats.`, applyCashbackToBill: 'Cashback auf meine Expensify-Rechnung anwenden', applyCashbackToBillDescription: 'Das Cashback von der Expensify-Karte wird zur Begleichung deiner Expensify-Rechnung verwendet.', frequency: { diff --git a/src/languages/el.ts b/src/languages/el.ts index 81d3aeb08997..35e4f0ab4f07 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -6102,6 +6102,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ settlementFrequencyDescription: 'Επιλέξτε πόσο συχνά θα εξοφλείτε το υπόλοιπο της Κάρτας Expensify.', settlementFrequencyInfo: 'Αν θέλετε να μεταβείτε σε μηνιαίο διακανονισμό, θα πρέπει να συνδέσετε τον τραπεζικό σας λογαριασμό μέσω Plaid και να έχετε θετικό ιστορικό υπολοίπου 90 ημερών.', + monthlySettlementDate: (date) => `Διακανονισμός στις ${date} κάθε μήνα.`, applyCashbackToBill: 'Εφαρμογή επιστροφής μετρητών στον λογαριασμό μου στο Expensify', applyCashbackToBillDescription: 'Η επιστροφή μετρητών από την Κάρτα Expensify θα χρησιμοποιηθεί για την πληρωμή του λογαριασμού σας στην Expensify.', frequency: { diff --git a/src/languages/en.ts b/src/languages/en.ts index 774e7a4b5a93..73279227ad64 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -6069,6 +6069,7 @@ const translations = { settlementFrequency: 'Settlement frequency', settlementFrequencyDescription: 'Choose how often you’ll pay your Expensify Card balance.', settlementFrequencyInfo: 'If you’d like to switch to monthly settlement, you’ll need to connect your bank account via Plaid and have a positive 90-day balance history.', + monthlySettlementDate: (date: string) => `Settles on the ${date} of each month.`, applyCashbackToBill: 'Apply cash back to my Expensify bill', applyCashbackToBillDescription: 'Cash back from the Expensify Card will be used towards payment for your Expensify bill.', frequency: { diff --git a/src/languages/es.ts b/src/languages/es.ts index d0af721f6450..9f0291f88ec6 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5857,6 +5857,7 @@ ${amount} para ${merchant} - ${date}`, settlementFrequencyDescription: 'Elige con qué frecuencia pagarás el saldo de tu Tarjeta Expensify', settlementFrequencyInfo: 'Si deseas cambiar a la liquidación mensual, deberás conectar tu cuenta bancaria a través de Plaid y tener un historial de saldo positivo en los últimos 90 días.', + monthlySettlementDate: (date) => `Se liquida el ${date} de cada mes.`, applyCashbackToBill: 'Aplicar reembolso a mi factura de Expensify', applyCashbackToBillDescription: 'El reembolso de la Tarjeta Expensify se utilizará para el pago de tu factura de Expensify.', frequency: { diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 42787610f428..8debac01591f 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -5993,6 +5993,7 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST. settlementFrequencyDescription: 'Choisissez la fréquence à laquelle vous réglerez le solde de votre Carte Expensify.', settlementFrequencyInfo: 'Si vous souhaitez passer à un règlement mensuel, vous devrez connecter votre compte bancaire via Plaid et disposer d’un historique de solde positif sur 90 jours.', + monthlySettlementDate: (date) => `Règlement le ${date} de chaque mois.`, applyCashbackToBill: 'Appliquer le cashback à ma facture Expensify', applyCashbackToBillDescription: 'Le cashback de la carte Expensify sera utilisé pour le paiement de votre facture Expensify.', frequency: { diff --git a/src/languages/it.ts b/src/languages/it.ts index 6a362596b501..409415f064bb 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -5946,6 +5946,7 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST. settlementFrequencyDescription: 'Scegli con quale frequenza pagherai il saldo della tua Carta Expensify.', settlementFrequencyInfo: 'Se desideri passare alla liquidazione mensile, dovrai collegare il tuo conto bancario tramite Plaid e avere uno storico del saldo positivo di 90 giorni.', + monthlySettlementDate: (date) => `Liquidazione il ${date} di ogni mese.`, applyCashbackToBill: 'Applica il cashback alla mia fattura Expensify', applyCashbackToBillDescription: 'Il cashback della Carta Expensify verrà utilizzato per il pagamento della tua fattura Expensify.', frequency: { diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 9a5267c3cefe..8547de3d997a 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -5883,6 +5883,7 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO settlementFrequency: '清算頻度', settlementFrequencyDescription: 'Expensify カードの残高を支払う頻度を選択してください。', settlementFrequencyInfo: '月次清算に切り替えるには、Plaid を通じて銀行口座を連携し、直近90日間の残高履歴がプラスである必要があります。', + monthlySettlementDate: (date) => `毎月${date}に清算されます。`, applyCashbackToBill: 'キャッシュバックを Expensify 請求書に適用する', applyCashbackToBillDescription: 'Expensify カードのキャッシュバックは、Expensify 請求書の支払いに使用されます。', frequency: { diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 3cd6ee5a3860..2971d2c10d6b 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -5940,6 +5940,7 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_ settlementFrequency: 'Uitbetalingsfrequentie', settlementFrequencyDescription: 'Kies hoe vaak je het saldo van je Expensify Kaart betaalt.', settlementFrequencyInfo: 'Als je wilt overschakelen naar maandelijkse afrekening, moet je je bankrekening koppelen via Plaid en een positieve saldohistorie van 90 dagen hebben.', + monthlySettlementDate: (date) => `Wordt op de ${date} van elke maand afgerekend.`, applyCashbackToBill: 'Cashback toepassen op mijn Expensify-factuur', applyCashbackToBillDescription: 'De cashback van de Expensify Kaart wordt gebruikt voor het betalen van je Expensify-factuur.', frequency: { diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 303b2c3eb23d..552c8521996a 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -5918,6 +5918,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy settlementFrequency: 'Częstotliwość rozliczeń', settlementFrequencyDescription: 'Wybierz, jak często będziesz spłacać saldo swojej Karty Expensify.', settlementFrequencyInfo: 'Jeśli chcesz przejść na miesięczne rozliczenie, musisz podłączyć swoje konto bankowe przez Plaid i mieć dodatnią historię salda z ostatnich 90 dni.', + monthlySettlementDate: (date) => `Rozliczenie ${date} każdego miesiąca.`, applyCashbackToBill: 'Zastosuj zwrot gotówki do mojego rachunku Expensify', applyCashbackToBillDescription: 'Zwrot gotówki z Karty Expensify zostanie wykorzystany do opłacenia Twojego rachunku Expensify.', frequency: { diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 8f41bd76602d..a760e3759bd2 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -5936,6 +5936,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS settlementFrequency: 'Frequência de liquidação', settlementFrequencyDescription: 'Escolha com que frequência você vai pagar o saldo do seu Cartão Expensify.', settlementFrequencyInfo: 'Se quiser mudar para liquidação mensal, você precisará conectar sua conta bancária via Plaid e ter um histórico de saldo positivo de 90 dias.', + monthlySettlementDate: (date) => `Liquidação no dia ${date} de cada mês.`, applyCashbackToBill: 'Aplicar reembolso à minha fatura do Expensify', applyCashbackToBillDescription: 'O reembolso do Cartão Expensify será usado para o pagamento da sua fatura do Expensify.', frequency: { diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index e09675eb46e8..a451ef035477 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -5752,6 +5752,7 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM settlementFrequency: '结算频率', settlementFrequencyDescription: '选择支付 Expensify 卡余额的频率。', settlementFrequencyInfo: '如果你想切换为按月结算,你需要通过 Plaid 连接你的银行账户,并且拥有过去 90 天为正数的余额记录。', + monthlySettlementDate: (date) => `每月 ${date} 结算。`, applyCashbackToBill: '将返现用于抵扣我的 Expensify 账单', applyCashbackToBillDescription: 'Expensify 卡的返现将用于支付你的 Expensify 账单。', frequency: { diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx index 5683d4260b29..1683745c424a 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx @@ -29,6 +29,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; +import {format} from 'date-fns'; import React from 'react'; import {View} from 'react-native'; @@ -55,6 +56,10 @@ function WorkspaceCardSettingsPage({route}: WorkspaceCardSettingsPageProps) { const settlementFrequency = settings?.monthlySettlementDate ? CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY : CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY; const isSettlementFrequencyBlocked = !isMonthlySettlementAllowed && settlementFrequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY; const bankAccountNumber = bankAccountList?.[paymentBankAccountID?.toString() ?? '']?.accountData?.accountNumber ?? paymentBankAccountNumber ?? ''; + const monthlySettlementDateText = + settlementFrequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY && settings?.monthlySettlementDate + ? translate('workspace.expensifyCard.monthlySettlementDate', format(new Date(settings.monthlySettlementDate), CONST.DATE.ORDINAL_DAY_OF_MONTH)) + : undefined; return ( . - ) : undefined + ) : ( + monthlySettlementDateText + ) } /> From 488fd3afe38aaf7b19a4948083caa4b00d18da00 Mon Sep 17 00:00:00 2001 From: "Linh Vo (via MelvinBot)" Date: Wed, 12 Aug 2026 15:07:02 +0000 Subject: [PATCH 2/6] Update monthly settlement hint copy to 'Expensify cards will settle on the...' Co-authored-by: Linh Vo --- src/languages/de.ts | 2 +- src/languages/el.ts | 2 +- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- src/languages/fr.ts | 2 +- src/languages/it.ts | 2 +- src/languages/ja.ts | 2 +- src/languages/nl.ts | 2 +- src/languages/pl.ts | 2 +- src/languages/pt-BR.ts | 2 +- src/languages/zh-hans.ts | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index 99e51d68766c..1fc3b8322cb5 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -5980,7 +5980,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU settlementFrequencyDescription: 'Wählen Sie, wie oft Sie den Saldo Ihrer Expensify Karte begleichen.', settlementFrequencyInfo: 'Wenn du zur monatlichen Abrechnung wechseln möchtest, musst du dein Bankkonto über Plaid verbinden und eine positive Kontohistorie der letzten 90 Tage haben.', - monthlySettlementDate: (date) => `Abrechnung am ${date} jedes Monats.`, + monthlySettlementDate: (date) => `Expensify Cards werden am ${date} jedes Monats abgerechnet.`, applyCashbackToBill: 'Cashback auf meine Expensify-Rechnung anwenden', applyCashbackToBillDescription: 'Das Cashback von der Expensify-Karte wird zur Begleichung deiner Expensify-Rechnung verwendet.', frequency: { diff --git a/src/languages/el.ts b/src/languages/el.ts index 35e4f0ab4f07..5fe64887b99d 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -6102,7 +6102,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ settlementFrequencyDescription: 'Επιλέξτε πόσο συχνά θα εξοφλείτε το υπόλοιπο της Κάρτας Expensify.', settlementFrequencyInfo: 'Αν θέλετε να μεταβείτε σε μηνιαίο διακανονισμό, θα πρέπει να συνδέσετε τον τραπεζικό σας λογαριασμό μέσω Plaid και να έχετε θετικό ιστορικό υπολοίπου 90 ημερών.', - monthlySettlementDate: (date) => `Διακανονισμός στις ${date} κάθε μήνα.`, + monthlySettlementDate: (date) => `Οι κάρτες Expensify διακανονίζονται στις ${date} κάθε μήνα.`, applyCashbackToBill: 'Εφαρμογή επιστροφής μετρητών στον λογαριασμό μου στο Expensify', applyCashbackToBillDescription: 'Η επιστροφή μετρητών από την Κάρτα Expensify θα χρησιμοποιηθεί για την πληρωμή του λογαριασμού σας στην Expensify.', frequency: { diff --git a/src/languages/en.ts b/src/languages/en.ts index 73279227ad64..e2d16da7a49b 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -6069,7 +6069,7 @@ const translations = { settlementFrequency: 'Settlement frequency', settlementFrequencyDescription: 'Choose how often you’ll pay your Expensify Card balance.', settlementFrequencyInfo: 'If you’d like to switch to monthly settlement, you’ll need to connect your bank account via Plaid and have a positive 90-day balance history.', - monthlySettlementDate: (date: string) => `Settles on the ${date} of each month.`, + monthlySettlementDate: (date: string) => `Expensify cards will settle on the ${date} of each month.`, applyCashbackToBill: 'Apply cash back to my Expensify bill', applyCashbackToBillDescription: 'Cash back from the Expensify Card will be used towards payment for your Expensify bill.', frequency: { diff --git a/src/languages/es.ts b/src/languages/es.ts index 9f0291f88ec6..425903057a7e 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5857,7 +5857,7 @@ ${amount} para ${merchant} - ${date}`, settlementFrequencyDescription: 'Elige con qué frecuencia pagarás el saldo de tu Tarjeta Expensify', settlementFrequencyInfo: 'Si deseas cambiar a la liquidación mensual, deberás conectar tu cuenta bancaria a través de Plaid y tener un historial de saldo positivo en los últimos 90 días.', - monthlySettlementDate: (date) => `Se liquida el ${date} de cada mes.`, + monthlySettlementDate: (date) => `Las tarjetas Expensify se liquidan el ${date} de cada mes.`, applyCashbackToBill: 'Aplicar reembolso a mi factura de Expensify', applyCashbackToBillDescription: 'El reembolso de la Tarjeta Expensify se utilizará para el pago de tu factura de Expensify.', frequency: { diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 8debac01591f..dafe5988339b 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -5993,7 +5993,7 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST. settlementFrequencyDescription: 'Choisissez la fréquence à laquelle vous réglerez le solde de votre Carte Expensify.', settlementFrequencyInfo: 'Si vous souhaitez passer à un règlement mensuel, vous devrez connecter votre compte bancaire via Plaid et disposer d’un historique de solde positif sur 90 jours.', - monthlySettlementDate: (date) => `Règlement le ${date} de chaque mois.`, + monthlySettlementDate: (date) => `Les cartes Expensify seront réglées le ${date} de chaque mois.`, applyCashbackToBill: 'Appliquer le cashback à ma facture Expensify', applyCashbackToBillDescription: 'Le cashback de la carte Expensify sera utilisé pour le paiement de votre facture Expensify.', frequency: { diff --git a/src/languages/it.ts b/src/languages/it.ts index 409415f064bb..e185218969c6 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -5946,7 +5946,7 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST. settlementFrequencyDescription: 'Scegli con quale frequenza pagherai il saldo della tua Carta Expensify.', settlementFrequencyInfo: 'Se desideri passare alla liquidazione mensile, dovrai collegare il tuo conto bancario tramite Plaid e avere uno storico del saldo positivo di 90 giorni.', - monthlySettlementDate: (date) => `Liquidazione il ${date} di ogni mese.`, + monthlySettlementDate: (date) => `Le carte Expensify vengono liquidate il ${date} di ogni mese.`, applyCashbackToBill: 'Applica il cashback alla mia fattura Expensify', applyCashbackToBillDescription: 'Il cashback della Carta Expensify verrà utilizzato per il pagamento della tua fattura Expensify.', frequency: { diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 8547de3d997a..e62f64baca6f 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -5883,7 +5883,7 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO settlementFrequency: '清算頻度', settlementFrequencyDescription: 'Expensify カードの残高を支払う頻度を選択してください。', settlementFrequencyInfo: '月次清算に切り替えるには、Plaid を通じて銀行口座を連携し、直近90日間の残高履歴がプラスである必要があります。', - monthlySettlementDate: (date) => `毎月${date}に清算されます。`, + monthlySettlementDate: (date) => `Expensifyカードは毎月${date}に清算されます。`, applyCashbackToBill: 'キャッシュバックを Expensify 請求書に適用する', applyCashbackToBillDescription: 'Expensify カードのキャッシュバックは、Expensify 請求書の支払いに使用されます。', frequency: { diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 2971d2c10d6b..c2002ec21783 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -5940,7 +5940,7 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_ settlementFrequency: 'Uitbetalingsfrequentie', settlementFrequencyDescription: 'Kies hoe vaak je het saldo van je Expensify Kaart betaalt.', settlementFrequencyInfo: 'Als je wilt overschakelen naar maandelijkse afrekening, moet je je bankrekening koppelen via Plaid en een positieve saldohistorie van 90 dagen hebben.', - monthlySettlementDate: (date) => `Wordt op de ${date} van elke maand afgerekend.`, + monthlySettlementDate: (date) => `Expensify-kaarten worden op de ${date} van elke maand afgerekend.`, applyCashbackToBill: 'Cashback toepassen op mijn Expensify-factuur', applyCashbackToBillDescription: 'De cashback van de Expensify Kaart wordt gebruikt voor het betalen van je Expensify-factuur.', frequency: { diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 552c8521996a..3385c9774ed0 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -5918,7 +5918,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy settlementFrequency: 'Częstotliwość rozliczeń', settlementFrequencyDescription: 'Wybierz, jak często będziesz spłacać saldo swojej Karty Expensify.', settlementFrequencyInfo: 'Jeśli chcesz przejść na miesięczne rozliczenie, musisz podłączyć swoje konto bankowe przez Plaid i mieć dodatnią historię salda z ostatnich 90 dni.', - monthlySettlementDate: (date) => `Rozliczenie ${date} każdego miesiąca.`, + monthlySettlementDate: (date) => `Karty Expensify są rozliczane ${date} każdego miesiąca.`, applyCashbackToBill: 'Zastosuj zwrot gotówki do mojego rachunku Expensify', applyCashbackToBillDescription: 'Zwrot gotówki z Karty Expensify zostanie wykorzystany do opłacenia Twojego rachunku Expensify.', frequency: { diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index a760e3759bd2..bd70f358540b 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -5936,7 +5936,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS settlementFrequency: 'Frequência de liquidação', settlementFrequencyDescription: 'Escolha com que frequência você vai pagar o saldo do seu Cartão Expensify.', settlementFrequencyInfo: 'Se quiser mudar para liquidação mensal, você precisará conectar sua conta bancária via Plaid e ter um histórico de saldo positivo de 90 dias.', - monthlySettlementDate: (date) => `Liquidação no dia ${date} de cada mês.`, + monthlySettlementDate: (date) => `Os cartões Expensify serão liquidados no dia ${date} de cada mês.`, applyCashbackToBill: 'Aplicar reembolso à minha fatura do Expensify', applyCashbackToBillDescription: 'O reembolso do Cartão Expensify será usado para o pagamento da sua fatura do Expensify.', frequency: { diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index a451ef035477..d79d7e5266f0 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -5752,7 +5752,7 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM settlementFrequency: '结算频率', settlementFrequencyDescription: '选择支付 Expensify 卡余额的频率。', settlementFrequencyInfo: '如果你想切换为按月结算,你需要通过 Plaid 连接你的银行账户,并且拥有过去 90 天为正数的余额记录。', - monthlySettlementDate: (date) => `每月 ${date} 结算。`, + monthlySettlementDate: (date) => `Expensify 卡每月 ${date} 结算。`, applyCashbackToBill: '将返现用于抵扣我的 Expensify 账单', applyCashbackToBillDescription: 'Expensify 卡的返现将用于支付你的 Expensify 账单。', frequency: { From e2751a104bf61ad7d24f34a02ab599fb1bacc53c Mon Sep 17 00:00:00 2001 From: "Linh Vo (via MelvinBot)" Date: Wed, 12 Aug 2026 15:21:48 +0000 Subject: [PATCH 3/6] Apply Polyglot Parrot translation suggestions for monthlySettlementDate Co-authored-by: Linh Vo --- src/languages/de.ts | 2 +- src/languages/el.ts | 2 +- src/languages/es.ts | 2 +- src/languages/fr.ts | 2 +- src/languages/it.ts | 2 +- src/languages/ja.ts | 2 +- src/languages/nl.ts | 2 +- src/languages/pl.ts | 2 +- src/languages/pt-BR.ts | 2 +- src/languages/zh-hans.ts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index 1fc3b8322cb5..3495364b0501 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -5980,7 +5980,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU settlementFrequencyDescription: 'Wählen Sie, wie oft Sie den Saldo Ihrer Expensify Karte begleichen.', settlementFrequencyInfo: 'Wenn du zur monatlichen Abrechnung wechseln möchtest, musst du dein Bankkonto über Plaid verbinden und eine positive Kontohistorie der letzten 90 Tage haben.', - monthlySettlementDate: (date) => `Expensify Cards werden am ${date} jedes Monats abgerechnet.`, + monthlySettlementDate: (date: string) => `Expensify Karten werden am ${date} jedes Monats abgerechnet.`, applyCashbackToBill: 'Cashback auf meine Expensify-Rechnung anwenden', applyCashbackToBillDescription: 'Das Cashback von der Expensify-Karte wird zur Begleichung deiner Expensify-Rechnung verwendet.', frequency: { diff --git a/src/languages/el.ts b/src/languages/el.ts index 5fe64887b99d..950889839855 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -6102,7 +6102,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ settlementFrequencyDescription: 'Επιλέξτε πόσο συχνά θα εξοφλείτε το υπόλοιπο της Κάρτας Expensify.', settlementFrequencyInfo: 'Αν θέλετε να μεταβείτε σε μηνιαίο διακανονισμό, θα πρέπει να συνδέσετε τον τραπεζικό σας λογαριασμό μέσω Plaid και να έχετε θετικό ιστορικό υπολοίπου 90 ημερών.', - monthlySettlementDate: (date) => `Οι κάρτες Expensify διακανονίζονται στις ${date} κάθε μήνα.`, + monthlySettlementDate: (date: string) => `Οι Κάρτες Expensify θα εκκαθαρίζονται στις ${date} κάθε μήνα.`, applyCashbackToBill: 'Εφαρμογή επιστροφής μετρητών στον λογαριασμό μου στο Expensify', applyCashbackToBillDescription: 'Η επιστροφή μετρητών από την Κάρτα Expensify θα χρησιμοποιηθεί για την πληρωμή του λογαριασμού σας στην Expensify.', frequency: { diff --git a/src/languages/es.ts b/src/languages/es.ts index 425903057a7e..33ea43b71132 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5857,7 +5857,7 @@ ${amount} para ${merchant} - ${date}`, settlementFrequencyDescription: 'Elige con qué frecuencia pagarás el saldo de tu Tarjeta Expensify', settlementFrequencyInfo: 'Si deseas cambiar a la liquidación mensual, deberás conectar tu cuenta bancaria a través de Plaid y tener un historial de saldo positivo en los últimos 90 días.', - monthlySettlementDate: (date) => `Las tarjetas Expensify se liquidan el ${date} de cada mes.`, + monthlySettlementDate: (date: string) => `Las Tarjetas Expensify se liquidarán el ${date} de cada mes.`, applyCashbackToBill: 'Aplicar reembolso a mi factura de Expensify', applyCashbackToBillDescription: 'El reembolso de la Tarjeta Expensify se utilizará para el pago de tu factura de Expensify.', frequency: { diff --git a/src/languages/fr.ts b/src/languages/fr.ts index dafe5988339b..1988026cb866 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -5993,7 +5993,7 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST. settlementFrequencyDescription: 'Choisissez la fréquence à laquelle vous réglerez le solde de votre Carte Expensify.', settlementFrequencyInfo: 'Si vous souhaitez passer à un règlement mensuel, vous devrez connecter votre compte bancaire via Plaid et disposer d’un historique de solde positif sur 90 jours.', - monthlySettlementDate: (date) => `Les cartes Expensify seront réglées le ${date} de chaque mois.`, + monthlySettlementDate: (date: string) => `Les règlements des Cartes Expensify auront lieu le ${date} de chaque mois.`, applyCashbackToBill: 'Appliquer le cashback à ma facture Expensify', applyCashbackToBillDescription: 'Le cashback de la carte Expensify sera utilisé pour le paiement de votre facture Expensify.', frequency: { diff --git a/src/languages/it.ts b/src/languages/it.ts index e185218969c6..1de7ca6b516e 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -5946,7 +5946,7 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST. settlementFrequencyDescription: 'Scegli con quale frequenza pagherai il saldo della tua Carta Expensify.', settlementFrequencyInfo: 'Se desideri passare alla liquidazione mensile, dovrai collegare il tuo conto bancario tramite Plaid e avere uno storico del saldo positivo di 90 giorni.', - monthlySettlementDate: (date) => `Le carte Expensify vengono liquidate il ${date} di ogni mese.`, + monthlySettlementDate: (date: string) => `Le Carte Expensify verranno saldate il ${date} di ogni mese.`, applyCashbackToBill: 'Applica il cashback alla mia fattura Expensify', applyCashbackToBillDescription: 'Il cashback della Carta Expensify verrà utilizzato per il pagamento della tua fattura Expensify.', frequency: { diff --git a/src/languages/ja.ts b/src/languages/ja.ts index e62f64baca6f..bb4d377901b5 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -5883,7 +5883,7 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO settlementFrequency: '清算頻度', settlementFrequencyDescription: 'Expensify カードの残高を支払う頻度を選択してください。', settlementFrequencyInfo: '月次清算に切り替えるには、Plaid を通じて銀行口座を連携し、直近90日間の残高履歴がプラスである必要があります。', - monthlySettlementDate: (date) => `Expensifyカードは毎月${date}に清算されます。`, + monthlySettlementDate: (date: string) => `Expensify カードの精算は毎月${date}に行われます。`, applyCashbackToBill: 'キャッシュバックを Expensify 請求書に適用する', applyCashbackToBillDescription: 'Expensify カードのキャッシュバックは、Expensify 請求書の支払いに使用されます。', frequency: { diff --git a/src/languages/nl.ts b/src/languages/nl.ts index c2002ec21783..6efc52aa35a6 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -5940,7 +5940,7 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_ settlementFrequency: 'Uitbetalingsfrequentie', settlementFrequencyDescription: 'Kies hoe vaak je het saldo van je Expensify Kaart betaalt.', settlementFrequencyInfo: 'Als je wilt overschakelen naar maandelijkse afrekening, moet je je bankrekening koppelen via Plaid en een positieve saldohistorie van 90 dagen hebben.', - monthlySettlementDate: (date) => `Expensify-kaarten worden op de ${date} van elke maand afgerekend.`, + monthlySettlementDate: (date: string) => `Expensify kaarten worden op de ${date} van elke maand vereffend.`, applyCashbackToBill: 'Cashback toepassen op mijn Expensify-factuur', applyCashbackToBillDescription: 'De cashback van de Expensify Kaart wordt gebruikt voor het betalen van je Expensify-factuur.', frequency: { diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 3385c9774ed0..52fdfd8bc8b1 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -5918,7 +5918,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy settlementFrequency: 'Częstotliwość rozliczeń', settlementFrequencyDescription: 'Wybierz, jak często będziesz spłacać saldo swojej Karty Expensify.', settlementFrequencyInfo: 'Jeśli chcesz przejść na miesięczne rozliczenie, musisz podłączyć swoje konto bankowe przez Plaid i mieć dodatnią historię salda z ostatnich 90 dni.', - monthlySettlementDate: (date) => `Karty Expensify są rozliczane ${date} każdego miesiąca.`, + monthlySettlementDate: (date: string) => `Karty Expensify będą rozliczane ${date} dnia każdego miesiąca.`, applyCashbackToBill: 'Zastosuj zwrot gotówki do mojego rachunku Expensify', applyCashbackToBillDescription: 'Zwrot gotówki z Karty Expensify zostanie wykorzystany do opłacenia Twojego rachunku Expensify.', frequency: { diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index bd70f358540b..5b7b0474f0dc 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -5936,7 +5936,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS settlementFrequency: 'Frequência de liquidação', settlementFrequencyDescription: 'Escolha com que frequência você vai pagar o saldo do seu Cartão Expensify.', settlementFrequencyInfo: 'Se quiser mudar para liquidação mensal, você precisará conectar sua conta bancária via Plaid e ter um histórico de saldo positivo de 90 dias.', - monthlySettlementDate: (date) => `Os cartões Expensify serão liquidados no dia ${date} de cada mês.`, + monthlySettlementDate: (date: string) => `Os Cartões Expensify serão liquidados no dia ${date} de cada mês.`, applyCashbackToBill: 'Aplicar reembolso à minha fatura do Expensify', applyCashbackToBillDescription: 'O reembolso do Cartão Expensify será usado para o pagamento da sua fatura do Expensify.', frequency: { diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index d79d7e5266f0..e6d0950c5213 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -5752,7 +5752,7 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM settlementFrequency: '结算频率', settlementFrequencyDescription: '选择支付 Expensify 卡余额的频率。', settlementFrequencyInfo: '如果你想切换为按月结算,你需要通过 Plaid 连接你的银行账户,并且拥有过去 90 天为正数的余额记录。', - monthlySettlementDate: (date) => `Expensify 卡每月 ${date} 结算。`, + monthlySettlementDate: (date: string) => `Expensify 卡将在每月的 ${date} 结算。`, applyCashbackToBill: '将返现用于抵扣我的 Expensify 账单', applyCashbackToBillDescription: 'Expensify 卡的返现将用于支付你的 Expensify 账单。', frequency: { From 609efd665ce9bf6b789e0ea69a87cd949b946b98 Mon Sep 17 00:00:00 2001 From: "Brandon Stites (via MelvinBot)" Date: Wed, 12 Aug 2026 15:54:01 +0000 Subject: [PATCH 4/6] Fix ESLint: pass dateFnsLocale to date-fns format for monthly settlement date Co-authored-by: Brandon Stites --- .../workspace/expensifyCard/WorkspaceCardSettingsPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx index 1683745c424a..4916e060691c 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx @@ -37,7 +37,7 @@ type WorkspaceCardSettingsPageProps = PlatformStackScreenProps Date: Thu, 13 Aug 2026 02:54:25 +0000 Subject: [PATCH 5/6] Add UI test for Expensify Card monthly settlement date hint Co-authored-by: Linh Vo --- tests/ui/WorkspaceCardSettingsPageTest.tsx | 149 +++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 tests/ui/WorkspaceCardSettingsPageTest.tsx diff --git a/tests/ui/WorkspaceCardSettingsPageTest.tsx b/tests/ui/WorkspaceCardSettingsPageTest.tsx new file mode 100644 index 000000000000..4c270956638d --- /dev/null +++ b/tests/ui/WorkspaceCardSettingsPageTest.tsx @@ -0,0 +1,149 @@ +import {act, render, screen} from '@testing-library/react-native'; + +import ComposeProviders from '@components/ComposeProviders'; +import {LocaleContextProvider} from '@components/LocaleContextProvider'; +import OnyxListItemProvider from '@components/OnyxListItemProvider'; + +import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import type {SettingsNavigatorParamList} from '@navigation/types'; + +import WorkspaceCardSettingsPage from '@pages/workspace/expensifyCard/WorkspaceCardSettingsPage'; + +import ONYXKEYS from '@src/ONYXKEYS'; +import SCREENS from '@src/SCREENS'; + +import React from 'react'; +import Onyx from 'react-native-onyx'; + +import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct'; + +// Test constants - these values MUST match the literals used in jest.mock() below +// because jest.mock() is hoisted before variable declarations are evaluated +const POLICY_ID = 'policy123'; +const WORKSPACE_ACCOUNT_ID = 424242; + +// jest.mock() factories are hoisted and run before imports/variables are defined, so they cannot +// reference the constants above. Keep the literals in both places in sync. +jest.mock('@react-navigation/native', () => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment + const actualNav = jest.requireActual('@react-navigation/native'); + // eslint-disable-next-line @typescript-eslint/no-unsafe-return + return { + ...actualNav, + useIsFocused: () => true, + useRoute: () => ({ + key: 'test-route', + name: 'Workspace_ExpensifyCard_Settings', + params: {policyID: 'policy123'}, // Must match POLICY_ID + }), + usePreventRemove: jest.fn(), + }; +}); + +jest.mock('@src/hooks/useResponsiveLayout'); + +// The default fund ID falls back to the workspace account ID when there is no last-selected feed. +jest.mock('@hooks/useWorkspaceAccountID', () => ({ + __esModule: true, + default: () => 424242, // Must match WORKSPACE_ACCOUNT_ID +})); + +jest.mock('@hooks/useScreenWrapperTransitionStatus', () => ({ + __esModule: true, + default: () => ({didScreenTransitionEnd: true}), +})); + +jest.mock('@libs/Navigation/Navigation', () => ({ + __esModule: true, + default: { + navigate: jest.fn(), + getActiveRoute: jest.fn(() => ''), + getActiveRouteWithoutParams: jest.fn(() => ''), + isNavigationReady: jest.fn(() => Promise.resolve()), + isTopmostRouteModalScreen: jest.fn(() => false), + }, +})); + +// Bypass the policy access gate so the test can focus on the settlement-frequency row. +jest.mock( + '@pages/workspace/AccessOrNotFoundWrapper', + () => + ({children}: {children: React.ReactNode}) => + children, +); + +const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${WORKSPACE_ACCOUNT_ID}` as const; + +const route: PlatformStackScreenProps['route'] = { + key: 'workspace-expensify-card-settings', + name: SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS, + params: {policyID: POLICY_ID}, +}; +// The screen does not read navigation; this inert test double only satisfies the navigator-provided prop. +// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion +const navigation = {} as PlatformStackScreenProps['navigation']; + +const renderWorkspaceCardSettingsPage = () => + render( + + + , + ); + +describe('WorkspaceCardSettingsPage', () => { + beforeAll(() => { + Onyx.init({keys: ONYXKEYS}); + }); + + afterEach(async () => { + jest.clearAllMocks(); + await act(async () => { + await Onyx.clear(); + await waitForBatchedUpdatesWithAct(); + }); + }); + + describe('Settlement frequency row', () => { + it('shows the monthly settlement date hint when the card settles monthly', async () => { + // Given a card whose settlement frequency is Monthly with a known settlement date + await act(async () => { + await Onyx.merge(cardSettingsKey, { + isMonthlySettlementAllowed: true, + monthlySettlementDate: new Date('2024-01-27'), + }); + await waitForBatchedUpdatesWithAct(); + }); + + // When the card settings page is rendered + renderWorkspaceCardSettingsPage(); + await waitForBatchedUpdatesWithAct(); + + // Then the settlement frequency row shows "Monthly" with the settlement-date hint below it + expect(screen.getByText('Settlement frequency')).toBeTruthy(); + expect(screen.getByText('Monthly')).toBeTruthy(); + expect(screen.getByText('Expensify cards will settle on the 27th of each month.')).toBeTruthy(); + }); + + it('does not show the monthly settlement date hint when the card settles daily', async () => { + // Given a card that settles daily (no monthlySettlementDate) and can switch to monthly + await act(async () => { + await Onyx.merge(cardSettingsKey, { + isMonthlySettlementAllowed: true, + }); + await waitForBatchedUpdatesWithAct(); + }); + + // When the card settings page is rendered + renderWorkspaceCardSettingsPage(); + await waitForBatchedUpdatesWithAct(); + + // Then the row shows "Daily" and no settlement-date hint is rendered + expect(screen.getByText('Settlement frequency')).toBeTruthy(); + expect(screen.getByText('Daily')).toBeTruthy(); + expect(screen.queryByText(/Expensify cards will settle on the .* of each month\./)).toBeNull(); + }); + }); +}); From d5bfb422a84b28297705779b31868c59a87d30cc Mon Sep 17 00:00:00 2001 From: "Linh Vo (via MelvinBot)" Date: Thu, 13 Aug 2026 03:35:22 +0000 Subject: [PATCH 6/6] Apply oxfmt formatting to WorkspaceCardSettingsPageTest Co-authored-by: Linh Vo --- tests/ui/WorkspaceCardSettingsPageTest.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ui/WorkspaceCardSettingsPageTest.tsx b/tests/ui/WorkspaceCardSettingsPageTest.tsx index 4c270956638d..c41dbc7d0d4f 100644 --- a/tests/ui/WorkspaceCardSettingsPageTest.tsx +++ b/tests/ui/WorkspaceCardSettingsPageTest.tsx @@ -5,6 +5,7 @@ import {LocaleContextProvider} from '@components/LocaleContextProvider'; import OnyxListItemProvider from '@components/OnyxListItemProvider'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; + import type {SettingsNavigatorParamList} from '@navigation/types'; import WorkspaceCardSettingsPage from '@pages/workspace/expensifyCard/WorkspaceCardSettingsPage';