Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

translate invite member to room #30927

Merged
merged 41 commits into from
Dec 6, 2023

Conversation

namhihi237
Copy link
Contributor

@namhihi237 namhihi237 commented Nov 6, 2023

Details

Fixed Issues

$ #30087
PROPOSAL: #30087 (comment)

Tests

  1. Create a room
  2. Go to room details
  3. Go to members
  4. Click Invite and invite 1 member
  5. Change language to Spanish, and verify that the Alternate text on LHN and the message invite members in the room are translated
  • Verify that no errors appear in the JS console

Offline tests

The same test

QA Steps

The same test

  • 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
    • MacOS: Desktop
  • 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 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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed 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 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 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.js 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
      • 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
and.mov
Android: mWeb Chrome
mweb.mov
iOS: Native
ios.mov
iOS: mWeb Safari
sa.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desk.mov

@cubuspl42
Copy link
Contributor

@namhihi237 Let me know if you need some help with making this ready for review

@namhihi237
Copy link
Contributor Author

yeah, @cubuspl42 during I implement PR I see we have the policy change log in the #admin room. Do you think we need to translate for invite member here, It has existed before and is different from the message room log.

Screenshot 2023-11-07 at 17 49 22

@cubuspl42
Copy link
Contributor

@namhihi237

Thanks for catching this!

I think it falls in the scope of our issue. From the user's perspective, the messages on your screenshot are essentially the same as our original ones. Won't this be a simple refactor to cover these cases using mostly re-used code?

@namhihi237
Copy link
Contributor Author

Yes we can reuses, but need to add the logic for room name and click redirect to room. I will try and update the logic

@cubuspl42
Copy link
Contributor

Thanks!

@cubuspl42
Copy link
Contributor

Actually, I think we'll need to hold on this PR...

As your PR was filed slightly later, and is still a draft, you'll have the luck to merge/rebase on top of that one.

@namhihi237
Copy link
Contributor Author

Yes, I think we should hold this PR.

@cubuspl42
Copy link
Contributor

@namhihi237 We can resume!

@cubuspl42
Copy link
Contributor

Please get familiar with the final shape of the PR we were holding on. We'll have to adjust our idea to what was implemented in that PR.

@namhihi237 namhihi237 marked this pull request as ready for review November 20, 2023 17:18
@namhihi237 namhihi237 requested a review from a team as a code owner November 20, 2023 17:18
@melvin-bot melvin-bot bot requested review from cubuspl42 and removed request for a team November 20, 2023 17:18
Copy link

melvin-bot bot commented Nov 20, 2023

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

src/libs/ReportUtils.js Outdated Show resolved Hide resolved
src/libs/ReportUtils.js Outdated Show resolved Hide resolved
@cubuspl42
Copy link
Contributor

Do you also get an exception when the message is copied to clipboard? I think something happened on main

Uncaught ReferenceError: ClipboardItem is not defined

@namhihi237
Copy link
Contributor Author

I don't see any errors when copying on this branch and main.

@cubuspl42
Copy link
Contributor

I don't see any errors when copying on this branch and main.

Oh, you're right! But would you try copying a standard, user-sent message? Just to confirm

@namhihi237
Copy link
Contributor Author

Yeah, nothing from me.

@mountiny
Copy link
Contributor

mountiny commented Dec 4, 2023

@cubuspl42 hasv eyou been able to resolve this issue?

@cubuspl42
Copy link
Contributor

cubuspl42 commented Dec 5, 2023

@cubuspl42 hasv eyou been able to resolve this issue?

Still happening on prod (for user-sent messages, so different from what's we're dealing with here), seems to be resolved on main.

Oh, no. It's a different story. This doesn't work on Firefox, but works on Chrome!

@cubuspl42
Copy link
Contributor

@namhihi237 Conflicts, sadly

@namhihi237
Copy link
Contributor Author

I merged main and fix conflict

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

@cubuspl42 @namhihi237 To confirm, did you test copy to clipboard in both languagges for various types of report actions?

@namhihi237
Copy link
Contributor Author

Yeah, I tested and work well.

Task action

Screen.Recording.2023-12-06.at.09.18.53.mov

Request money

Screen.Recording.2023-12-06.at.09.19.18.mov

Send money

Screen.Recording.2023-12-06.at.09.19.48.mov

@cubuspl42
Copy link
Contributor

@cubuspl42 @namhihi237 To confirm, did you test copy to clipboard in both languages for various types of report actions?

I tested copy-to-clipboard of the "invited @... (to #...)" message in both languages, but I just noticed I didn't include it in the videos. Worked well when I tested it.

I'll stress that the issue with copying "standard" user-sent messages on Firefox is still occurring, and is unrelated to this PR.

@mountiny
Copy link
Contributor

mountiny commented Dec 6, 2023

thanks for confirming, lets ship it then, please watch out for regressions!

Great job @namhihi237 @cubuspl42 🚀 ❤️

@mountiny mountiny merged commit 9b71f23 into Expensify:main Dec 6, 2023
15 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Dec 6, 2023

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

import Log from './Log';
import {MessageElementBase, MessageTextElement} from './MessageElement';
import * as PersonalDetailsUtils from './PersonalDetailsUtils';
Copy link
Contributor

Choose a reason for hiding this comment

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

This caused regression of dependency cycle

console

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see en.ts import ReportActionsUtils to use here

App/src/languages/en.ts

Lines 428 to 430 in 2feaac8

editAction: ({action}: EditActionParams) => `Edit ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
deleteAction: ({action}: DeleteActionParams) => `Delete ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
deleteConfirmation: ({action}: DeleteConfirmationParams) => `Are you sure you want to delete this ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}?`,

And in the ReportActionsUtils.ts we import Localize.ts
=> Resolve: we can in en.ts we can remove ReportActionsUtils and use logic check like this

editAction: ({action}: EditActionParams) => `Edit ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'request' : 'comment'}`,

What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

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

Agree. I also don't like importing any utils in language file

@OSBotify
Copy link
Contributor

OSBotify commented Dec 6, 2023

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.9-0 🚀

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

1 similar comment
@OSBotify
Copy link
Contributor

OSBotify commented Dec 6, 2023

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.9-0 🚀

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

@yuwenmemon
Copy link
Contributor

This was reverted in #32601 because it seemed to break Desktop (something about unparseable svgs - curious what it was 🤔 )

@mountiny
Copy link
Contributor

mountiny commented Dec 7, 2023

Thanks for help @namhihi237 lets create a new PR to fix this, thank you!

@namhihi237
Copy link
Contributor Author

@mountiny @cubuspl42 I created a new PR fix this here #32612. Please help to check.

@namhihi237 namhihi237 mentioned this pull request Dec 7, 2023
47 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Dec 8, 2023

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.9-5 🚀

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

@cubuspl42
Copy link
Contributor

#32612 is in review, all further conversation will be moved there or to the original issue

const fragment = ReportActionsUtils.getMemberChangeMessageFragment(props.action);

return (
<TextCommentFragment
Copy link
Contributor

Choose a reason for hiding this comment

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

This caused #33305 where long emails were overflowing the screen for the invite message. Wrapping this with a <View> that has the relevant chatItemMessage style fixes it (more details here).

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.

8 participants