Update tooltip text for all locked default rules - #98844
Conversation
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
Hey, I noticed you changed If you want to automatically generate translations for other locales, an Expensify employee will have to:
Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running: npx bun ./scripts/generateTranslations.ts --helpTypically, you'd want to translate only what you changed by running |
|
I'm checking #98823. If the fix turns out to be straightforward, I'll include it in this PR. |
|
@JS00001 please run translations script when you get a chance. |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: c44db7e310
ℹ️ 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".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@MelvinBot review |
|
🤖 Review The code changes are correct and address both linked issues — but the PR currently has two failing checks that are caused directly by this change and block merge. 🔴 Blocking: missing locale keys break
|
|
@JS00001, please run the translations generation script when you get a chance. |
|
Ran |
🦜 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 8c05f803..da06cd18 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7935,6 +7935,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
'Gebühren werden genehmigt, wenn sie in zulässigen Währungen erfolgen und einen Höchstbetrag nicht überschreiten oder wenn das Geschäft bzw. die Geschäftsart übereinstimmt.',
summaryCurrencies: ({currencies, hiddenCount, shownCount}: {currencies: string; hiddenCount: number; shownCount: number}) =>
`Erlaubt ${shownCount > 1 ? 'Währungen' : 'Währung'}: ${currencies}${hiddenCount > 0 ? `, +${hiddenCount} weitere` : ''}`,
+ defaultRulesCannotBeDeleted: 'Standardregeln können nicht gelöscht werden',
},
agentRules: {
title: 'Agentenregeln',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 31947dc2..a5bd20a6 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8346,6 +8346,7 @@ ${reportName}`,
[CONST.SPEND_RULES.CATEGORIES.TRANSIT_AND_RIDESHARE]: 'Δημόσιες συγκοινωνίες και υπηρεσίες κοινής μετακίνησης',
[CONST.SPEND_RULES.CATEGORIES.TRAVEL_AGENCIES]: 'Ταξιδιωτικά πρακτορεία',
},
+ defaultRulesCannotBeDeleted: 'Οι προεπιλεγμένοι κανόνες δεν μπορούν να διαγραφούν',
},
agentRules: {
title: 'Κανόνες αντιπροσώπου',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 0ee050a2..4cfae96e 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7878,6 +7878,7 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
restrictMerchantsBlockSubtitle: 'Los cargos se aprueban para monedas permitidas que no superen un importe máximo, o cuando el comercio o el tipo de comercio coinciden.',
summaryCurrencies: ({currencies, hiddenCount, shownCount}: {currencies: string; hiddenCount: number; shownCount: number}) =>
`Permitido ${shownCount > 1 ? 'divisas' : 'moneda'}: ${currencies}${hiddenCount > 0 ? `, +${hiddenCount} más` : ''}`,
+ defaultRulesCannotBeDeleted: 'Las reglas predeterminadas no se pueden eliminar',
},
agentRules: {
title: 'Reglas del agente',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index cfb38371..48048c9d 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7963,6 +7963,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
'Les dépenses sont approuvées pour les devises autorisées qui ne dépassent pas un montant maximal, ou lorsque le commerçant ou le type de commerçant correspond.',
summaryCurrencies: ({currencies, hiddenCount, shownCount}: {currencies: string; hiddenCount: number; shownCount: number}) =>
`Autorisé ${shownCount > 1 ? 'devises' : 'devise'} : ${currencies}${hiddenCount > 0 ? `, +${hiddenCount} de plus` : ''}`,
+ defaultRulesCannotBeDeleted: 'Les règles par défaut ne peuvent pas être supprimées',
},
agentRules: {
title: 'Règles d’agent',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 9325e542..d305a595 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7904,6 +7904,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
'Gli addebiti vengono approvati per le valute consentite che non superano un importo massimo oppure quando l’esercente o il tipo di esercente corrispondono.',
summaryCurrencies: ({currencies, hiddenCount, shownCount}: {currencies: string; hiddenCount: number; shownCount: number}) =>
`Consentito ${shownCount > 1 ? 'valute' : 'valuta'}: ${currencies}${hiddenCount > 0 ? `, +${hiddenCount} altri` : ''}`,
+ defaultRulesCannotBeDeleted: 'Le regole predefinite non possono essere eliminate',
},
agentRules: {
title: 'Regole agente',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 239a3821..e1388123 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7808,6 +7808,7 @@ ${reportName}`,
restrictMerchantsBlockSubtitle: '承認される支出は、許可された通貨で上限金額を超えないもの、または加盟店または加盟店の種類が条件に一致するものです。',
summaryCurrencies: ({currencies, hiddenCount, shownCount}: {currencies: string; hiddenCount: number; shownCount: number}) =>
`許可された ${shownCount > 1 ? '通貨' : '通貨'}:${currencies}${hiddenCount > 0 ? `、ほか +${hiddenCount} 件` : ''}`,
+ defaultRulesCannotBeDeleted: '既定のルールは削除できません',
},
agentRules: {
title: 'エージェントルール',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 4c29626b..f5be0e1d 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7885,6 +7885,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
'Kosten worden goedgekeurd voor toegestane valuta’s die een maximumbedrag niet overschrijden, of wanneer de handelaar of het handelaarstype overeenkomt.',
summaryCurrencies: ({currencies, hiddenCount, shownCount}: {currencies: string; hiddenCount: number; shownCount: number}) =>
`Toegestaan ${shownCount > 1 ? 'valuta’s' : 'valuta'}: ${currencies}${hiddenCount > 0 ? `, +${hiddenCount} meer` : ''}`,
+ defaultRulesCannotBeDeleted: 'Standaardregels kunnen niet worden verwijderd',
},
agentRules: {
title: 'Agentregels',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index c4c91751..04a9af41 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7863,6 +7863,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
restrictMerchantsBlockSubtitle: 'Obciążenia są zatwierdzane dla dozwolonych walut, które nie przekraczają maksymalnej kwoty, lub gdy pasuje sprzedawca albo typ sprzedawcy.',
summaryCurrencies: ({currencies, hiddenCount, shownCount}: {currencies: string; hiddenCount: number; shownCount: number}) =>
`Dozwolone ${shownCount > 1 ? 'waluty' : 'waluta'}: ${currencies}${hiddenCount > 0 ? `, +${hiddenCount} więcej` : ''}`,
+ defaultRulesCannotBeDeleted: 'Domyślnych reguł nie można usunąć',
},
agentRules: {
title: 'Zasady agenta',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index dbe28546..0b32bec4 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7884,6 +7884,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
'As cobranças são aprovadas para moedas permitidas que não ultrapassem um valor máximo ou quando o comerciante ou o tipo de comerciante correspondem.',
summaryCurrencies: ({currencies, hiddenCount, shownCount}: {currencies: string; hiddenCount: number; shownCount: number}) =>
`Permitido ${shownCount > 1 ? 'moedas' : 'moeda'}: ${currencies}${hiddenCount > 0 ? `, +${hiddenCount} mais` : ''}`,
+ defaultRulesCannotBeDeleted: 'Regras padrão não podem ser excluídas',
},
agentRules: {
title: 'Regras do agente',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 726c8f95..417d1312 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7621,6 +7621,7 @@ ${reportName}`,
restrictMerchantsBlockSubtitle: '对于允许的币种中,若消费金额未超过最高限额,或商户或商户类型匹配,则该笔消费将被批准。',
summaryCurrencies: ({currencies, hiddenCount, shownCount}: {currencies: string; hiddenCount: number; shownCount: number}) =>
`已允许 ${shownCount > 1 ? '货币' : '货币'}:${currencies}${hiddenCount > 0 ? `,还有 +${hiddenCount} 项` : ''}`,
+ defaultRulesCannotBeDeleted: '默认规则无法删除',
},
agentRules: {
title: '代理规则',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
joekaufmanexpensify
left a comment
There was a problem hiding this comment.
Good for product
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Explanation of Change
Fixed Issues
$ #95836
$ #98823
$ #98932
PROPOSAL:
Tests
Prerequisites
rulesRevampbeta enabled1. Card restrictions
2. Expense defaults
3. Narrow/mobile layout
4. "Show GL codes when categorizing expenses" is accessible
5. No checkboxes for multilevel tags #98932
Offline tests
QA Steps
Same as tests
Verify that no errors appear in the JS console
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
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Monosnap.screencast.2026-08-18.12-05-54.mp4