Skip to content

remove unneccesary custom types from translations batch15 - #96605

Open
jakubstec wants to merge 8 commits into
Expensify:mainfrom
software-mansion-labs:jakubstec/remove-unneccesary-custom-types-from-translations-batch15_at2
Open

remove unneccesary custom types from translations batch15#96605
jakubstec wants to merge 8 commits into
Expensify:mainfrom
software-mansion-labs:jakubstec/remove-unneccesary-custom-types-from-translations-batch15_at2

Conversation

@jakubstec

@jakubstec jakubstec commented Jul 21, 2026

Copy link
Copy Markdown
Member

Explanation of Change

Continue the work of removing unnecessary custom types from translations. Last PR:
#84399.
This is the last batch.

Fixed Issues

$ #76429

PROPOSAL: #76429 (comment)

Tests

Testing every modified component is not necessary since the changes are all related to types only, and TypeScript already checks types and enforces correct parameter usage.

Below is an example place where the changes can be observed in the UI.

1.

  1. Open Account -> Profile
  2. Click on Edit photo icon
    3.1 Upload small resolution photo (below 80x80) and verify that error message is visible correctly.
    3.2 Upload wrong format image (e.g webp) and verify that error message is visible correctly.

2.

  1. Open a workspace where you are admin.
  2. Go to Members
  3. Click on a member who has Member role.
  4. Change their role to Admin.
  5. Go to an admin workspace chat and verify, that the message is visible correctly (to "workspace admin (previously member)", not “to member (previously workspace admin)”)
  • Verify that no errors appear in the JS console

Offline tests

N/A

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 followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and 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)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • 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)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • 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 a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • 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

MacOS: Chrome / Safari
Screen.Recording.2026-07-21.at.12.46.11.mov
Screen.Recording.2026-07-21.at.12.54.30.mov

@jakubstec
jakubstec requested review from a team as code owners July 21, 2026 09:04
@melvin-bot

melvin-bot Bot commented Jul 21, 2026

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

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 ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@melvin-bot
melvin-bot Bot requested review from trjExpensify and removed request for a team July 21, 2026 09:04
@jakubstec
jakubstec marked this pull request as draft July 21, 2026 09:04
@melvin-bot
melvin-bot Bot requested review from mjasikowski and removed request for a team July 21, 2026 09:04
@melvin-bot

melvin-bot Bot commented Jul 21, 2026

Copy link
Copy Markdown

@mjasikowski 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]

@jakubstec

jakubstec commented Jul 21, 2026

Copy link
Copy Markdown
Member Author

please don't review yet, pr was created automatically being open and it has triggered the review, sorry!

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 78e7d53c9f

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/languages/en.ts Outdated
Comment thread src/libs/OptionsListUtils/index.ts
Comment thread src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx Outdated
Comment thread src/pages/settings/Profile/Avatar/AvatarPreview.tsx Outdated
@codecov

codecov Bot commented Jul 21, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/components/AccountSwitcher.tsx 80.39% <ø> (ø)
src/components/HeaderWithBackButton/index.tsx 89.32% <100.00%> (+0.10%) ⬆️
src/components/InteractiveStepSubHeader.tsx 6.66% <ø> (ø)
src/components/InteractiveStepSubPageHeader.tsx 88.00% <ø> (ø)
src/components/ParentNavigationSubtitle.tsx 66.30% <ø> (ø)
src/hooks/useExportActions.ts 59.52% <ø> (ø)
src/hooks/useExportAgainModal.ts 0.00% <ø> (ø)
src/hooks/useLifecycleActions.tsx 57.66% <100.00%> (ø)
src/hooks/useSearchBulkActions.ts 56.14% <ø> (ø)
src/libs/AvatarUtils.ts 100.00% <ø> (ø)
... and 41 more
... and 9 files with indirect coverage changes

@jakubstec

Copy link
Copy Markdown
Member Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. 🚀

Reviewed commit: 060e66f8c4

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/languages/en.ts Outdated
description: "Choose a plan that's right for you.",
subscriptionLink: 'Learn more',
lockedPlanDescription: ({count, annualSubscriptionEndDate}: WorkspaceLockedPlanTypeParams) => ({
lockedPlanDescription: ({count}: {count: number}, annualSubscriptionEndDate: string) => ({

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

object type left here on purpose, lockedPlanDescription returns PluralForm which requires an object with count as first param.

Comment thread src/libs/ReportActionsUtils.ts Outdated
Comment thread src/components/AvatarWithImagePicker.tsx Outdated
Comment thread src/components/HeaderWithBackButton/index.tsx Outdated
@sumo-slonik

Copy link
Copy Markdown
Contributor

I left a few NAB, but overall it looks good to me. LGTM 🚀

@jakubstec
jakubstec marked this pull request as ready for review July 22, 2026 10:24
@jakubstec

Copy link
Copy Markdown
Member Author

opened for review. previous batches were reviewed by @QichenZhu, so I think we could reassign him here! 😁

@trjExpensify

Copy link
Copy Markdown
Contributor

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

@trjExpensify
trjExpensify removed their request for review July 22, 2026 23:16
@mjasikowski

Copy link
Copy Markdown
Contributor

@QichenZhu can you comment here, so I can assign you as a reviewer?

@QichenZhu

Copy link
Copy Markdown
Contributor

@mjasikowski, sorry for the late reply. I'm back from OOO and I'll start reviewing this asap.

@mjasikowski
mjasikowski requested a review from QichenZhu July 31, 2026 08:23
@QichenZhu

QichenZhu commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
    https://expensify.slack.com/archives/C049HHMV9SM/p1778663561704459
    https://expensify.slack.com/archives/C049HHMV9SM/p1764642854883869
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and 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 verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp Screenshot_20260803_194718 Screenshot_20260803_210955
Screen_recording_20260803_211011.webm
Android: mWeb Chrome Screenshot_20260803_195826 Screenshot_20260803_205147
Screen_recording_20260803_205505.webm
iOS: HybridApp Simulator Screenshot - iPhone 17 - 2026-08-03 at 19 45 41 Simulator Screenshot - iPhone 17 - 2026-08-03 at 21 10 50
Simulator.Screen.Recording.-.iPhone.17.-.2026-08-03.at.21.11.27.mov
iOS: mWeb Safari Screenshot 2026-08-03 at 8 42 36 PM
Screen.Recording.2026-08-03.at.8.47.59.PM.mov
Screen.Recording.2026-08-03.at.8.49.05.PM.mov
MacOS: Chrome / Safari Screenshot 2026-08-03 at 7 48 07 PM mac-web
mac-web.mov

@QichenZhu

Copy link
Copy Markdown
Contributor

@jakubstec, please merge main. Thanks!

…neccesary-custom-types-from-translations-batch15_at2
@jakubstec

Copy link
Copy Markdown
Member Author

done! @QichenZhu

@melvin-bot
melvin-bot Bot requested a review from iwiznia August 3, 2026 13:45
Comment thread src/components/ArchivedReportFooter.tsx Outdated
const oldDisplayNameHtml = `<strong>${oldDisplayName}</strong>`;
const policyNameHtml = `<strong>${policyName}</strong>`;
const shouldUseYou = actorPersonalDetails?.accountID === currentUserAccountID;
switch (archiveReason) {

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.

I see this one and another above that we are replacing the single line version with a switch, which is more verbose and less flexible (as we need to add a case for every new version).
Could we keep the non switch version if we made the params be an object (that does not require a type, but instead we document each type separately using string, number, etc)?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

yeah, we can make an exception for that, look's much simpler. Then I'll refactor other cases of translations like this (probably just a few)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

done, @QichenZhu could you take a look at 45e285b? Thanks!

Comment thread src/languages/es.ts
Comment on lines +875 to +884
[CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}: {displayName: string}) => `Este chat está desactivado porque ${displayName} ha cerrado tu cuenta.`,
[CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}: {displayName: string; oldDisplayName: string}) =>
`Este chat está desactivado porque ${oldDisplayName} ha combinado tu cuenta con ${displayName}`,
[CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName, shouldUseYou = false}: {displayName: string; policyName: string; shouldUseYou?: boolean}) =>
shouldUseYou
? `Este chat ya no está activo porque <strong>tu</strong> ya no eres miembro del espacio de trabajo ${policyName}.`
: `Este chat está desactivado porque ${displayName} ha dejado de ser miembro del espacio de trabajo ${policyName}.`,
[CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}) => `Este chat está desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
[CONST.REPORT.ARCHIVE_REASON.INVOICE_RECEIVER_POLICY_DELETED]: ({policyName}) => `Este chat está desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
[CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}: {policyName: string}) => `Este chat está desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
[CONST.REPORT.ARCHIVE_REASON.INVOICE_RECEIVER_POLICY_DELETED]: ({policyName}: {policyName: string}) =>
`Este chat está desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,

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.

NAB: es.ts usually doesn't specify types.

Comment on lines 16 to -36
@@ -32,8 +32,6 @@ function AvatarPageFooter({validationError, phraseParam = {}, isDirty, onSave}:
{!!validationError && (
<DotIndicatorMessage
style={styles.mv5}
// `phraseParam` is an open record but `translate` accepts only the params shape for the
// given key; the cast is safe because callers always pass params matching `validationError`.

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.

NAB: this change is no longer needed.

@melvin-bot
melvin-bot Bot requested a review from iwiznia August 5, 2026 13:43
@QichenZhu

Copy link
Copy Markdown
Contributor

@jakubstec there is a new Greek translation now, so we need to merge our changes or regenerate it.

@iwiznia

iwiznia commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

CI failed @jakubstec

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants