Fix card rule issuing blockers#92009
Merged
Merged
Conversation
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 diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index 4011d313d2a..5e2e9798612 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -497,6 +497,7 @@ const translations: TranslationDeepObject<typeof en> = {
previousYear: 'Vorheriges Jahr',
nextYear: 'Nächstes Jahr',
avatar: 'Avatar',
+ restrictions: 'Beschränkungen',
},
socials: {
podcast: 'Folgen Sie uns auf Podcast',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 8229e694c96..ab841b81c20 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -449,6 +449,7 @@ const translations: TranslationDeepObject<typeof en> = {
expensifyLogo: 'Logo de Expensify',
approver: 'Aprobador',
enterDigitLabel: ({digitIndex, totalDigits}: {digitIndex: number; totalDigits: number}) => `introducir dígito ${digitIndex} de ${totalDigits}`,
+ restrictions: 'Restricciones',
},
socials: {
podcast: 'Síguenos en Podcast',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index dd10ab4d7e4..45d20c2fa78 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -497,6 +497,7 @@ const translations: TranslationDeepObject<typeof en> = {
previousYear: 'Année précédente',
nextYear: 'L’an prochain',
avatar: 'Avatar',
+ restrictions: 'Restrictions',
},
socials: {
podcast: 'Suivez-nous sur Podcast',
@@ -2808,9 +2809,9 @@ ${amount} pour ${merchant} - ${date}`,
title: 'Modifier l’agent',
agentName: 'Nom de l’agent',
instructions: 'Écrire des instructions personnalisées',
- chatWithAgent: 'Discuter avec l\u2019agent',
+ chatWithAgent: 'Discuter avec l’agent',
copilotIntoAccount: 'Copilote dans le compte',
- deleteAgent: 'Supprimer l\u2019agent',
+ deleteAgent: 'Supprimer l’agent',
deleteAgentTitle: 'Supprimer l’agent ?',
deleteAgentMessage: 'Voulez-vous vraiment supprimer cet agent ? Cette action est irréversible.',
},
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 61761df243f..52e4e537eb9 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -497,6 +497,7 @@ const translations: TranslationDeepObject<typeof en> = {
previousYear: 'Anno precedente',
nextYear: "L'anno prossimo",
avatar: 'Avatar',
+ restrictions: 'Restrizioni',
},
socials: {
podcast: 'Seguici su Podcast',
@@ -2796,8 +2797,8 @@ ${amount} per ${merchant} - ${date}`,
title: 'Modifica agente',
agentName: 'Nome agente',
instructions: 'Scrivi istruzioni personalizzate',
- chatWithAgent: 'Chatta con l\u2019agente',
- copilotIntoAccount: 'Copilot nell\u2019account',
+ chatWithAgent: 'Chatta con l’agente',
+ copilotIntoAccount: 'Copilot nell’account',
deleteAgent: 'Elimina agente',
deleteAgentTitle: 'Eliminare agente?',
deleteAgentMessage: 'Sei sicuro di voler eliminare questo agente? Questa azione non può essere annullata.',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index c4bc185299f..7bbd873f5a8 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -496,6 +496,7 @@ const translations: TranslationDeepObject<typeof en> = {
previousYear: '前年',
nextYear: '来年',
avatar: 'アバター',
+ restrictions: '制限',
},
socials: {
podcast: 'ポッドキャストでフォロー',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index b307a464d6b..3a02ea438b8 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -496,6 +496,7 @@ const translations: TranslationDeepObject<typeof en> = {
previousYear: 'Vorig jaar',
nextYear: 'Volgend jaar',
avatar: 'Avatar',
+ restrictions: 'Beperkingen',
},
socials: {
podcast: 'Volg ons op Podcast',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 5f36e09f17f..f08ea8cf4a7 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -496,6 +496,7 @@ const translations: TranslationDeepObject<typeof en> = {
previousYear: 'Poprzedni rok',
nextYear: 'W przyszłym roku',
avatar: 'Avatar',
+ restrictions: 'Ograniczenia',
},
socials: {
podcast: 'Śledź nas na Podcast',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index b7948902c11..074af0589ad 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -495,6 +495,7 @@ const translations: TranslationDeepObject<typeof en> = {
previousYear: 'Ano anterior',
nextYear: 'Ano que vem',
avatar: 'Avatar',
+ restrictions: 'Restrições',
},
socials: {
podcast: 'Siga-nos no Podcast',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 79540be738a..987c5c40800 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -492,6 +492,7 @@ const translations: TranslationDeepObject<typeof en> = {
previousYear: '上一年',
nextYear: '明年',
avatar: '头像',
+ restrictions: '限制',
},
socials: {
podcast: '在播客上关注我们',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
JS00001
changed the title
melvin-bot
Bot
requested review from
linhvovan29546 and
trjExpensify
and removed request for
a team
|
@linhvovan29546 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] |
luacmartins
requested changes
May 29, 2026
cead22
previously approved these changes
May 29, 2026
luacmartins
approved these changes
May 29, 2026
cead22
approved these changes
May 29, 2026
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppScreen.Recording.2026-05-31.at.22.46.31.movAndroid: mWeb ChromeScreen.Recording.2026-05-31.at.22.42.36.moviOS: HybridAppScreen.Recording.2026-05-31.at.22.35.51.moviOS: mWeb SafariScreen.Recording.2026-05-31.at.22.33.37.movMacOS: Chrome / SafariScreen.Recording.2026-05-31.at.17.26.18.mov |
MariaHCD
approved these changes
Jun 1, 2026
|
@JS00001 looks like this was merged without a test passing. Please add a note explaining why this was done and remove the |
Contributor
Author
|
Everything was passing when I merged 🤔 |
Contributor
|
🚧 @JS00001 has triggered a test Expensify/App build. You can view the workflow run here. |
Contributor
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
75 tasks
Contributor
|
🚀 Deployed to staging by https://github.com/JS00001 in version: 9.3.91-0 🚀
Bundle Size Analysis (Sentry): |
Contributor
|
🤖 Help site review complete — docs update needed. This PR fixes deploy blockers for applying a spend rule while issuing an Expensify Card (the Restrictions row on the confirmation screen, the Set card rules step layout, and a navigation guard). That step isn't documented on the help site today, so I drafted an update. Draft PR: #92316 What the docs update covers in
Important The spend rule step is currently gated to non-production environments (hidden in production). The drafted docs describe behavior that isn't live in production yet, so the PR is kept in draft and should be published only once the feature ships to production. @JS00001, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR |
7 tasks
|
Deploy Blocker #92391 was identified to be related to this PR. |
This was referenced Jun 2, 2026
Contributor
|
🚀 Deployed to staging by https://github.com/JS00001 in version: 9.3.94-0 🚀
Bundle Size Analysis (Sentry): |
Contributor
Help site review: no changes requiredI reviewed this PR against the help articles under Why: This PR clears three deploy blockers ( More importantly, the spend rules / restrictions UI in the card-issuance flow is gated behind
The help site documents live production behavior, so documenting this now would describe a flow users can't reach. What I checked
Heads-up for when this ships to production: once the @JS00001 I did not create a help site PR because this PR's changes aren't live in production yet (see the |
Contributor
|
🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.94-0 🚀
|
7 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Fixes deploy blockers related to issuing a card with rules
Fixed Issues
$ #91894
$ #91887
$ #91898
Tests
Validate that this PR fixes the three issues reported above
Offline tests
N/A
QA Steps
Same as tests
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Screen.Recording.2026-05-29.at.9.33.07.AM.mov