Skip to content

Display company card consent warnings - #105944

Merged
robertjchen merged 7 commits into
mainfrom
cm/oauth-consent-warning-app-renderer
Nov 17, 2026
Merged

robertjchen merged 7 commits into
mainfrom
cm/oauth-consent-warning-app-renderer

Conversation

@carlosmiceli

@carlosmiceli carlosmiceli commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR renders the COMPANYCARDCONSENTEXPIRING report action delivered before an Amex company-card consent period expires. It adds typed original-message data, localized one-week/two-week copy, the Company Cards link, and compatible room-preview, thread-title, and clipboard text. If the payload is missing policyID, the warning displays without a Company Cards link.

Fixed Issues

https://github.com/Expensify/Expensify/issues/687058

AI Tests

Shared consent-warning threshold update:

  • Passed: full lint, changed-file lint, typecheck, and Storybook smoke test.
  • Passed: six targeted Jest suites (2,440 tests and 151 snapshots), including 33 new localization cases covering 14-day, 7-day, and fallback intervals across all 11 locales.
  • Passed: staged-diff review and the commit hook's Oxfmt check/format of all 13 changed files.
  • Full Jest run timed out after 10 minutes before completion; no failed suite was reported before timeout.
  • Spelling check reports eight existing Polish-fixture findings in tests/unit/LocalizeTests.ts:62–65; no new fixture spelling findings remain.
  • Translation dry-run could not complete: the matrix's ts-node command fails with TypeError: Cannot read properties of undefined (reading 'fileExists'); the Bun invocation was denied by the execution policy. The matrix's Prettier script is absent in this branch; Oxfmt ran successfully through the commit hook.
  • Web verification blocked: the browser page returned zero nodes and its session remained suspended after retry. Rendering, link navigation, threading, console, and offline assertions could not be verified. This is a test-environment blocker, not a confirmed product failure.

Browser state blocking warning verification

Tests

  1. Seed a COMPANYCARDCONSENTEXPIRING action in a workspace #admins room with feedName, policyID, and warningDaysBeforeExpiry: 14.
  2. Open the room in New Expensify.
  3. Verify the warning names the feed, says consent expires in two weeks, and shows the reconnect link which takes the admin to the Company Cards page.
Screenshot 2026-11-13 at 8 21 34 AM
  1. Repeat with warningDaysBeforeExpiry: 7 and verify the copy says one week and it's threaded.
Screenshot 2026-11-13 at 8 21 43 AM
  • Verify that no errors appear in the JS console

Offline tests

  1. Open the #admins room containing the consent warning while online.
  2. Go offline and reopen the room.
  3. Verify the warning is still displayed with the same copy.

QA Steps

Same as tests.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified any copy / text that was added to the app is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari Two-week consent warning in #admins One-week consent warning in a thread

@OSBotify

This comment has been minimized.

@codecov

codecov Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/CONST/index.ts 96.15% <ø> (+0.06%) ⬆️
src/libs/ReportActionsUtils.ts 86.00% <100.00%> (-0.12%) ⬇️
src/libs/computeReportName.ts 78.22% <100.00%> (+0.10%) ⬆️
...nbox/report/actionContents/ActionContentRouter.tsx 87.21% <100.00%> (+0.14%) ⬆️
src/libs/ReportAlternateTextUtils.ts 92.86% <50.00%> (+<0.01%) ⬆️
...es/inbox/report/ContextMenu/ContextMenuActions.tsx 45.85% <50.00%> (+0.01%) ⬆️
... and 301 files with indirect coverage changes

@carlosmiceli carlosmiceli changed the title [No QA] Render company card consent warnings Display company card consent warnings Nov 12, 2026
…ing-app-renderer

# Conflicts:
#	src/libs/ReportNameUtils.ts
#	tests/ui/ReportActionItemTest.tsx
#	tests/unit/ReportUtilsTest.ts
@OSBotify

This comment has been minimized.

@carlosmiceli
carlosmiceli marked this pull request as ready for review November 13, 2026 11:30
@carlosmiceli
carlosmiceli requested review from a team as code owners November 13, 2026 11:30
@melvin-bot
melvin-bot Bot requested review from flaviadefaria and removed request for a team November 13, 2026 11:30
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 13, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-13T11:44:15.347252Z 526cd3e Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@carlosmiceli
carlosmiceli requested review from a team, amyevans and robertjchen November 13, 2026 11:30
@melvin-bot
melvin-bot Bot requested review from heyjennahay and mollfpr and removed request for a team November 13, 2026 11:31
@melvin-bot

melvin-bot Bot commented Nov 13, 2026

Copy link
Copy Markdown

@mollfpr Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Comment thread src/languages/en.ts Resolved
@carlosmiceli
carlosmiceli removed the request for review from mollfpr November 13, 2026 11:41
Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>
@OSBotify

This comment has been minimized.

flaviadefaria
flaviadefaria previously approved these changes Nov 13, 2026

@flaviadefaria flaviadefaria left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From a product standpoint, this new message looks good to me.

@amyevans amyevans left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple quick thoughts! Also do you want to make this Internal QA or can you rewrite the steps so Applause can mock the report action?

Comment thread src/libs/ReportActionsUtils.ts Resolved
Comment thread src/types/onyx/OriginalMessage.ts Resolved
@amyevans
amyevans removed the request for review from heyjennahay November 13, 2026 16:17
@OSBotify

Copy link
Copy Markdown
Contributor

🦜 Polyglot Parrot! 🦜

Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues:

View the translation diff
diff --git a/src/languages/de.ts b/src/languages/de.ts
index cdae4b80..47e831e5 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -11381,15 +11381,15 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 }) => {
                     let warningTime = 'bald';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = 'in zwei Wochen';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = 'in einer Woche';
+                        warningTime = 'in one week';
                     }
                     const reconnectMessage = workspaceCompanyCardRoute
                         ? `<a href='${workspaceCompanyCardRoute}'>Stellen Sie die Kartenverbindung wieder her, bevor die Zustimmung abläuft</a>.`
                         : 'Stellen Sie die Kartenverbindung wieder her, bevor die Zustimmung abläuft.';
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, für Ihre ` : 'Für Ihre ';
-                    return `${intro}<strong>${feedName}</strong>-Kartenverbindung ist ${warningTime} eine erneute Zustimmung erforderlich. Transaktionen werden derzeit noch synchronisiert, könnten aber nicht mehr importiert werden, wenn die Zustimmung nicht erneuert wird. ${reconnectMessage}`;
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, Ihr` : 'Ihr';
+                    return `${intro}Für die Kartenverbindung <strong>${feedName}</strong> ist ${warningTime} eine erneute Zustimmung erforderlich. Umsätze werden derzeit noch synchronisiert, der Import kann jedoch stoppen, wenn die Verbindung nicht erneuert wird. ${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `Die Plaid-Verbindung zu Ihrem Geschäftskonto ist unterbrochen. Bitte <a href='${walletRoute}'>verbinden Sie Ihr Bankkonto ${maskedAccountNumber} erneut</a>, damit Sie Ihre Expensify Karten weiterhin verwenden können.`,
diff --git a/src/languages/el.ts b/src/languages/el.ts
index c7be9fe1..807294c0 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -11581,15 +11581,15 @@ ${reportName}`,
                 }) => {
                     let warningTime = 'σύντομα';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = 'σε δύο εβδομάδες';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = 'σε μία εβδομάδα';
+                        warningTime = 'in one week';
                     }
                     const reconnectMessage = workspaceCompanyCardRoute
-                        ? `<a href='${workspaceCompanyCardRoute}'>Επανασυνδέστε την κάρτα πριν λήξει η συγκατάθεση</a>.`
+                        ? `<a href='${workspaceCompanyCardRoute}'>Επανασυνδέστε τη σύνδεση της κάρτας πριν λήξει η συναίνεση</a>.`
                         : 'Επανασυνδέστε την κάρτα πριν λήξει η συγκατάθεση.';
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, η σύνδεση της κάρτας ` : 'Η σύνδεση της κάρτας ';
-                    return `${intro}<strong>${feedName}</strong> θα χρειαστεί ανανέωση συγκατάθεσης ${warningTime}. Οι συναλλαγές εξακολουθούν να συγχρονίζονται, αλλά μπορεί να σταματήσουν να εισάγονται αν δεν ανανεωθεί η συγκατάθεση. ${reconnectMessage}`;
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, το δικό σας` : 'Το';
+                    return `${intro}Η σύνδεση της κάρτας <strong>${feedName}</strong> θα χρειαστεί νέα συναίνεση ${warningTime}. Οι συναλλαγές συγχρονίζονται ακόμη τώρα, αλλά ενδέχεται να σταματήσουν να εισάγονται αν η σύνδεση δεν ανανεωθεί. ${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `η σύνδεση Plaid με τον επαγγελματικό σας τραπεζικό λογαριασμό έχει διακοπεί. Παρακαλούμε <a href='${walletRoute}'>συνδέστε ξανά τον τραπεζικό σας λογαριασμό ${maskedAccountNumber}</a> ώστε να μπορείτε να συνεχίσετε να χρησιμοποιείτε τις Κάρτες Expensify.`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 3355f3c1..2834893d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -11269,15 +11269,15 @@ ${reportName}`,
                 }) => {
                     let warningTime = 'pronto';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = 'en dos semanas';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = 'en una semana';
+                        warningTime = 'in one week';
                     }
                     const reconnectMessage = workspaceCompanyCardRoute
                         ? `<a href='${workspaceCompanyCardRoute}'>Vuelve a conectar la tarjeta antes de que caduque el consentimiento</a>.`
                         : 'Vuelve a conectar la tarjeta antes de que caduque el consentimiento.';
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, la conexión de tu tarjeta ` : 'La conexión de tu tarjeta ';
-                    return `${intro}<strong>${feedName}</strong> necesitará renovar el consentimiento ${warningTime}. Las transacciones se siguen sincronizando, pero podrían dejar de importarse si no renuevas el consentimiento. ${reconnectMessage}`;
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, tu` : 'Tu';
+                    return `${intro}La conexión de la tarjeta <strong>${feedName}</strong> necesitará un nuevo consentimiento ${warningTime}. Las transacciones siguen sincronizándose ahora, pero podrían dejar de importarse si no se renueva la conexión. ${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `la conexión Plaid con tu cuenta bancaria de empresa está rota. Por favor, <a href='${walletRoute}'>reconecta tu cuenta bancaria ${maskedAccountNumber}</a> para poder seguir usando tus Tarjetas Expensify.`,
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 970e4ed0..fda04d53 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -11415,15 +11415,15 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 }) => {
                     let warningTime = 'bientôt';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = 'dans deux semaines';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = 'dans une semaine';
+                        warningTime = 'in one week';
                     }
                     const reconnectMessage = workspaceCompanyCardRoute
-                        ? `<a href='${workspaceCompanyCardRoute}'>Reconnectez la carte avant l'expiration du consentement</a>.`
-                        : "Reconnectez la carte avant l'expiration du consentement.";
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, la connexion de votre carte ` : 'La connexion de votre carte ';
-                    return `${intro}<strong>${feedName}</strong> devra renouveler son consentement ${warningTime}. Les transactions sont encore synchronisées, mais elles pourraient ne plus être importées si le consentement n'est pas renouvelé. ${reconnectMessage}`;
+                        ? `<a href='${workspaceCompanyCardRoute}'>Reconnectez la connexion de carte avant l’expiration du consentement</a>.`
+                        : 'Reconnectez la connexion de la carte avant l’expiration du consentement.';
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, votre` : 'Votre';
+                    return `${intro}La connexion de la carte <strong>${feedName}</strong> nécessitera un nouveau consentement ${warningTime}. Les transactions se synchronisent toujours pour le moment, mais pourraient cesser d’être importées si la connexion n’est pas renouvelée. ${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `la connexion Plaid à votre compte bancaire professionnel est rompue. Veuillez <a href='${walletRoute}'>reconnecter votre compte bancaire ${maskedAccountNumber}</a> afin de pouvoir continuer à utiliser vos Cartes Expensify.`,
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 0e9d4d16..297de68b 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -11329,15 +11329,15 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 }) => {
                     let warningTime = 'presto';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = 'tra due settimane';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = 'tra una settimana';
+                        warningTime = 'in one week';
                     }
                     const reconnectMessage = workspaceCompanyCardRoute
-                        ? `<a href='${workspaceCompanyCardRoute}'>Riconnetti la carta prima della scadenza del consenso</a>.`
-                        : 'Riconnetti la carta prima della scadenza del consenso.';
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, la connessione della tua carta ` : 'La connessione della tua carta ';
-                    return `${intro}<strong>${feedName}</strong> dovrà rinnovare il consenso ${warningTime}. Le transazioni vengono ancora sincronizzate, ma potrebbero smettere di essere importate se il consenso non viene rinnovato. ${reconnectMessage}`;
+                        ? `<a href='${workspaceCompanyCardRoute}'>Ricollega la carta prima che il consenso scada</a>.`
+                        : 'Ricollega la connessione della carta prima che il consenso scada.';
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, il tuo` : 'Il tuo';
+                    return `${intro}La connessione della carta <strong>${feedName}</strong> richiederà un nuovo consenso ${warningTime}. Le transazioni si stanno ancora sincronizzando, ma potrebbero smettere di essere importate se la connessione non viene rinnovata. ${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `la connessione Plaid al conto bancario della tua azienda non funziona. Per favore, <a href='${walletRoute}'>ricollega il conto bancario ${maskedAccountNumber}</a> così puoi continuare a usare le tue Carte Expensify.`,
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index c7512f51..6ca86423 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -11139,15 +11139,15 @@ ${reportName}`,
                 }) => {
                     let warningTime = 'まもなく';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = '2週間後';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = '1週間後';
+                        warningTime = 'in one week';
                     }
                     const reconnectMessage = workspaceCompanyCardRoute
                         ? `<a href='${workspaceCompanyCardRoute}'>同意の有効期限が切れる前にカード接続を再接続してください</a>。`
-                        : '同意の有効期限が切れる前にカード接続を再接続してください。';
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/> さん、` : '';
-                    return `${intro}<strong>${feedName}</strong>カード接続は${warningTime}に同意の更新が必要になります。取引は現在も同期されていますが、同意を更新しない場合はインポートが停止する可能性があります。${reconnectMessage}`;
+                        : '同意の有効期限が切れる前にカード連携を再接続してください。';
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>さん、あなたの` : 'あなたの';
+                    return `${intro}<strong>${feedName}</strong> カード接続には${warningTime}に再同意が必要になります。現在も取引は同期されていますが、接続を更新しないと取引の取込が停止する可能性があります。${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `Plaid によるビジネス銀行口座との接続が切断されています。Expensify カードを引き続きご利用いただくために、<a href='${walletRoute}'>銀行口座 ${maskedAccountNumber} を再接続</a>してください。`,
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 61714498..91f6765d 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -11301,15 +11301,15 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 }) => {
                     let warningTime = 'binnenkort';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = 'over twee weken';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = 'over een week';
+                        warningTime = 'in one week';
                     }
                     const reconnectMessage = workspaceCompanyCardRoute
                         ? `<a href='${workspaceCompanyCardRoute}'>Verbind de kaart opnieuw voordat de toestemming verloopt</a>.`
-                        : 'Verbind de kaart opnieuw voordat de toestemming verloopt.';
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, voor je ` : 'Voor je ';
-                    return `${intro}<strong>${feedName}</strong>-kaartverbinding is ${warningTime} opnieuw toestemming nodig. Transacties worden nog gesynchroniseerd, maar worden mogelijk niet meer geïmporteerd als de toestemming niet wordt vernieuwd. ${reconnectMessage}`;
+                        : 'Maak de kaartverbinding opnieuw voordat de toestemming verloopt.';
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, je` : 'Je';
+                    return `${intro}de kaartkoppeling van <strong>${feedName}</strong> heeft ${warningTime} opnieuw toestemming nodig. Transacties worden nu nog gesynchroniseerd, maar mogelijk niet meer geïmporteerd als de koppeling niet wordt vernieuwd. ${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `de Plaid-verbinding met je zakelijke bankrekening is verbroken. <a href='${walletRoute}'>Verbind je bankrekening ${maskedAccountNumber} opnieuw</a> zodat je je Expensify Kaarten kunt blijven gebruiken.`,
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index f466c43e..9aec17ed 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -11335,15 +11335,15 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 }) => {
                     let warningTime = 'wkrótce';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = 'za dwa tygodnie';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = 'za tydzień';
+                        warningTime = 'in one week';
                     }
                     const reconnectMessage = workspaceCompanyCardRoute
-                        ? `<a href='${workspaceCompanyCardRoute}'>Połącz kartę ponownie, zanim zgoda wygaśnie</a>.`
-                        : 'Połącz kartę ponownie, zanim zgoda wygaśnie.';
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, połączenie karty ` : 'Połączenie karty ';
-                    return `${intro}<strong>${feedName}</strong> będzie wymagało odnowienia zgody ${warningTime}. Transakcje są nadal synchronizowane, ale mogą przestać być importowane, jeśli zgoda nie zostanie odnowiona. ${reconnectMessage}`;
+                        ? `<a href='${workspaceCompanyCardRoute}'>Ponownie połącz kartę, zanim zgoda wygaśnie</a>.`
+                        : 'Połącz ponownie kartę, zanim zgoda wygaśnie.';
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, twój` : 'Twój';
+                    return `${intro}Połączenie karty <strong>${feedName}</strong> będzie wymagało odnowienia zgody ${warningTime}. Transakcje nadal się synchronizują, ale mogą przestać się importować, jeśli połączenie nie zostanie odnowione. ${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `połączenie Plaid z twoim firmowym kontem bankowym jest przerwane. Proszę, <a href='${walletRoute}'>połącz ponownie swoje konto bankowe ${maskedAccountNumber}</a>, aby móc dalej używać Kart Expensify.`,
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 86925e2f..c2eddcf1 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -11307,15 +11307,15 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 }) => {
                     let warningTime = 'em breve';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = 'em duas semanas';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = 'em uma semana';
+                        warningTime = 'in one week';
                     }
                     const reconnectMessage = workspaceCompanyCardRoute
-                        ? `<a href='${workspaceCompanyCardRoute}'>Reconecte o cartão antes que o consentimento expire</a>.`
-                        : 'Reconecte o cartão antes que o consentimento expire.';
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, a conexão do seu cartão ` : 'A conexão do seu cartão ';
-                    return `${intro}<strong>${feedName}</strong> precisará renovar o consentimento ${warningTime}. As transações ainda estão sendo sincronizadas, mas podem deixar de ser importadas se o consentimento não for renovado. ${reconnectMessage}`;
+                        ? `<a href='${workspaceCompanyCardRoute}'>Reconecte a conexão do cartão antes que o consentimento expire</a>.`
+                        : 'Reconecte a conexão do cartão antes que o consentimento expire.';
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>, seu` : 'Seu';
+                    return `${intro}A conexão do cartão <strong>${feedName}</strong> vai precisar de um novo consentimento ${warningTime}. As transações ainda estão sendo sincronizadas agora, mas podem parar de ser importadas se a conexão não for renovada. ${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `a conexão Plaid com a sua conta bancária empresarial foi interrompida. Por favor, <a href='${walletRoute}'>reconecte sua conta bancária ${maskedAccountNumber}</a> para continuar usando seus Cartões Expensify.`,
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index e5b7cafe..2095e7a3 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -10843,15 +10843,15 @@ ${reportName}`,
                     workspaceCompanyCardRoute: string;
                     mentionedAccountID?: number;
                 }) => {
-                    let warningTime = '即将';
+                    let warningTime = '很快';
                     if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.TWO_WEEKS) {
-                        warningTime = '两周后';
+                        warningTime = 'in two weeks';
                     } else if (warningDaysBeforeExpiry === CONST.COMPANY_CARDS.CONSENT_EXPIRY_WARNING_DAYS.ONE_WEEK) {
-                        warningTime = '一周后';
+                        warningTime = 'in one week';
                     }
-                    const reconnectMessage = workspaceCompanyCardRoute ? `<a href='${workspaceCompanyCardRoute}'>请在同意到期前重新连接卡片</a>。` : '请在同意到期前重新连接卡片。';
-                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>,您的` : '您的';
-                    return `${intro}<strong>${feedName}</strong>卡片连接将在${warningTime}需要重新同意。交易目前仍在同步,但如果不续订同意,交易可能会停止导入。${reconnectMessage}`;
+                    const reconnectMessage = workspaceCompanyCardRoute ? `<a href='${workspaceCompanyCardRoute}'>在授权过期前重新连接该卡</a>。` : '在授权过期前重新连接此卡。';
+                    const intro = mentionedAccountID ? `<mention-user accountID="${mentionedAccountID}"/>,你的` : '你的';
+                    return `${intro}<strong>${feedName}</strong> 卡连接将在 ${warningTime} 需要重新授权。交易目前仍在同步,但如果不重新连接,导入可能会停止。${reconnectMessage}`;
                 },
                 plaidBalanceFailure: ({maskedAccountNumber, walletRoute}: {maskedAccountNumber: string; walletRoute: string}) =>
                     `您与企业银行账户的 Plaid 连接已中断。请<a href='${walletRoute}'>重新连接您的银行账户 ${maskedAccountNumber}</a>,以便继续使用 Expensify 卡。`,

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply 😉

View workflow run

@carlosmiceli carlosmiceli added the InternalQA This pull request required internal QA label Nov 14, 2026
@carlosmiceli

carlosmiceli commented Nov 14, 2026 •

Copy link
Copy Markdown
Contributor Author

@amyevans going to with internal QA for this one 👍
Implemented suggestions, ready for another review! cc @robertjchen

@amyevans amyevans left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, all yours @robertjchen

@robertjchen robertjchen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, LGTM!

@robertjchen
robertjchen merged commit 39be28c into main Nov 17, 2026
48 of 52 checks passed
@robertjchen
robertjchen deleted the cm/oauth-consent-warning-app-renderer branch November 17, 2026 01:23
@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions

Copy link
Copy Markdown
Contributor

🚧 robertjchen has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/robertjchen in version: 9.5.41-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — this PR adds a self-explanatory consent-expiry reminder linking to the existing card reconnection workflow, without making any existing article incorrect.


view run

@carlosmiceli

Copy link
Copy Markdown
Contributor Author

QA passed.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.5.41-2 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

InternalQA This pull request required internal QA

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants