fix: regressions of flat translations #27358

BeeMargarida · 2023-09-13T14:41:37Z

Details

Fix places where it was using a translation object.

Fixed Issues

$ #27325, #27326, #27343, #27334, #27366

Tests

Open chat settings
Change the priority mode
Go to reimbursements -> Company Step
Change incorporation type
Go to pronouns
Select one
Switch language
Check that the search bar appears with the translated value
In Profile settings, choose a city different than "United states" and write a state
Switch the city to united states
Should allow to select a state of the united states with no error

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Open chat settings
Change the priority mode
Go to reimbursements -> Company Step
Change incorporation type
Go to pronouns
Select one
Switch language
Check that the search bar appears with the translated value
In Profile settings, choose a city different than "United states" and write a state
Switch the city to united states
Should allow to select a state of the united states with no error

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

web_t.mp4

Mobile Web - Chrome

mchr_t.mp4

Mobile Web - Safari

msaf_t.mp4

Desktop

desktop_t.mp4

iOS

ios_t.mp4

Android

android_t.mp4

melvin-bot · 2023-09-13T14:41:41Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

melvin-bot · 2023-09-13T15:13:24Z

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

parasharrajat · 2023-09-13T15:29:54Z

Reviewing,.

parasharrajat · 2023-09-13T15:44:15Z

src/components/StatePicker/index.js

@@ -51,7 +52,7 @@ function StatePicker({value, errorText, onInputChange, forwardedRef, label}) {
        hidePickerModal();
    };

-    const title = value ? translate(`allStates.${value}.stateName`) : '';
+    const title = value && CONST.ALL_US_ISO_STATES.includes(value) ? translate(`allStates.${value}.stateName`) : '';


I think we should just use COMMON_CONST.STATES, from common repo. I don't see an advantage of recreating the same in App codebase.

Oh, I didn't know that existed. If so, I can remove this const entirely

@parasharrajat Fixed

AndrewGable · 2023-09-13T17:28:25Z

Can you see if this will fix #27366 (another deploy blocker)?

parasharrajat · 2023-09-13T17:56:29Z

@AndrewGable Yes, it fixes that issue as well.

parasharrajat · 2023-09-13T17:57:45Z

@BeeMargarida Let's add the #27366 to the fix issue list.

Also, each issue will go in its own line as follows.

$ issueid
$ issueid

parasharrajat · 2023-09-13T18:05:05Z

src/pages/settings/Report/NotificationPreferencePage.js

+    const notificationPreferenceOptions = _.map(
+        _.filter(_.values(CONST.REPORT.NOTIFICATION_PREFERENCE), (pref) => pref !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN),
+        (preference) => ({


This is more readable and fast with _.chain chaining.

const notificationPreferenceOptions = _.chain(CONST.REPORT.NOTIFICATION_PREFERENCE) .values() .filter(pref => pref !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) .map((preference) => ({

parasharrajat · 2023-09-13T18:07:41Z

Screenshots

🔲 iOS / native

Screen.Recording.2023-09-14.at.12.16.41.AM.mov

🔲 iOS / Safari

Screen.Recording.2023-09-14.at.12.28.14.AM.mov

🔲 MacOS / Desktop

Screen.Recording.2023-09-14.at.12.10.38.AM.mov

🔲 MacOS / Chrome

Screen.Recording.2023-09-13.at.11.40.46.PM.mov

Screen.Recording.2023-09-14.at.12.05.59.AM.mov

🔲 Android / Chrome

Screen.Recording.2023-09-14.at.12.20.00.AM.mov

Screen.Recording.2023-09-14.at.12.27.45.AM.mov

🔲 Android / native

Screen.Recording.2023-09-14.at.12.53.56.AM.mov

parasharrajat

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 tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
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
I verified proper code patterns were followed (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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 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)
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.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 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(themeColors.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 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.
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.

🎀 👀 🎀 C+ reviewed

parasharrajat · 2023-09-13T19:41:06Z

I approved as #27358 (comment) is not a blocker and the author seems to be offline. This PR solves many deploy blockers.

@madmax330 Could you please fix the description #27358 (comment)?

AndrewGable · 2023-09-13T19:48:39Z

Updated description, going to merge!

…late fix: regressions of flat translations (cherry picked from commit c9580da)

OSBotify · 2023-09-13T19:55:38Z

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

OSBotify · 2023-09-13T20:54:40Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.69-1 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-09-14T10:26:40Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.69-2 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

BeeMargarida added 2 commits September 13, 2023 15:29

fix: regressions of flat translations

ace6545

fix: missing translate in pronouns

3cd2e9c

BeeMargarida marked this pull request as ready for review September 13, 2023 15:13

BeeMargarida requested a review from a team as a code owner September 13, 2023 15:13

melvin-bot bot requested review from parasharrajat and removed request for a team September 13, 2023 15:13

This was referenced Sep 13, 2023

Improve translations - flatten translation objects #25846

Merged

[HOLD for payment 2023-09-21] [Performance] Improve translations #25466

Closed

parasharrajat suggested changes Sep 13, 2023

View reviewed changes

Pluto0104 mentioned this pull request Sep 13, 2023

Home Address - Incorrect input appear in State field when input value than select US country #27366

Closed

6 tasks

fix: remove const and use from expensify-common instead

62b96d7

This was referenced Sep 13, 2023

Web - App crashes on click of priority mode #27326

Closed

Pronouns - pronoun not translated when language changes #27343

Closed

Workspace - Company type dropdown in Adding bank account page (Step 2) is broken #27334

Closed

parasharrajat reviewed Sep 13, 2023

View reviewed changes

parasharrajat approved these changes Sep 13, 2023

View reviewed changes

melvin-bot bot requested a review from madmax330 September 13, 2023 19:39

AndrewGable approved these changes Sep 13, 2023

View reviewed changes

AndrewGable merged commit c9580da into Expensify:main Sep 13, 2023

OSBotify pushed a commit that referenced this pull request Sep 13, 2023

Merge pull request #27358 from BeeMargarida/fix/regression-flat-trans…

b761cbf

…late fix: regressions of flat translations (cherry picked from commit c9580da)

OSBotify mentioned this pull request Sep 13, 2023

Deploy Checklist: New Expensify 2023-09-13 #27313

Closed

72 tasks

melvin-bot bot mentioned this pull request Sep 14, 2023

[$500] [HOLD for payment 2023-09-21] Web - allStates.Greater London.stateName appears on select United state as Country #27325

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: regressions of flat translations #27358

fix: regressions of flat translations #27358

BeeMargarida commented Sep 13, 2023 •

edited by AndrewGable

Loading

melvin-bot bot commented Sep 13, 2023

melvin-bot bot commented Sep 13, 2023

parasharrajat commented Sep 13, 2023

parasharrajat Sep 13, 2023

BeeMargarida Sep 13, 2023

BeeMargarida Sep 13, 2023

AndrewGable commented Sep 13, 2023

parasharrajat commented Sep 13, 2023

parasharrajat commented Sep 13, 2023 •

edited

Loading

parasharrajat Sep 13, 2023

parasharrajat commented Sep 13, 2023 •

edited

Loading

parasharrajat left a comment

parasharrajat commented Sep 13, 2023

AndrewGable commented Sep 13, 2023

OSBotify commented Sep 13, 2023

OSBotify commented Sep 13, 2023

OSBotify commented Sep 14, 2023

fix: regressions of flat translations #27358

fix: regressions of flat translations #27358

Conversation

BeeMargarida commented Sep 13, 2023 • edited by AndrewGable Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 13, 2023

melvin-bot bot commented Sep 13, 2023

parasharrajat commented Sep 13, 2023

parasharrajat Sep 13, 2023

Choose a reason for hiding this comment

BeeMargarida Sep 13, 2023

Choose a reason for hiding this comment

BeeMargarida Sep 13, 2023

Choose a reason for hiding this comment

AndrewGable commented Sep 13, 2023

parasharrajat commented Sep 13, 2023

parasharrajat commented Sep 13, 2023 • edited Loading

parasharrajat Sep 13, 2023

Choose a reason for hiding this comment

parasharrajat commented Sep 13, 2023 • edited Loading

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

parasharrajat commented Sep 13, 2023

AndrewGable commented Sep 13, 2023

OSBotify commented Sep 13, 2023

OSBotify commented Sep 13, 2023

OSBotify commented Sep 14, 2023

BeeMargarida commented Sep 13, 2023 •

edited by AndrewGable

Loading

parasharrajat commented Sep 13, 2023 •

edited

Loading

parasharrajat commented Sep 13, 2023 •

edited

Loading