-
Notifications
You must be signed in to change notification settings - Fork 3k
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
[No QA] 17885 custom user mentions renderer #18167
[No QA] 17885 custom user mentions renderer #18167
Conversation
9a9f781
to
b237150
Compare
@puneetlath @parasharrajat One of you needs to 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] |
// eslint-disable-next-line react/jsx-props-no-spreading | ||
{...defaultRendererProps} | ||
color={themeColors.textSupporting} | ||
style={[props.style, {backgroundColor}]} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No inline styles, we can move the whole logic of bg calculation to the Styleutils and use it here.
const backgroundColor = isOurMention ? themeColors.ourMentionBG : themeColors.mentionBG; | ||
|
||
return ( | ||
<Tooltip containerStyles={[styles.dInline]} text={loginWhithoutLeadingAt}> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<Tooltip containerStyles={[styles.dInline]} text={loginWhithoutLeadingAt}> | |
<Tooltip containerStyles={[styles.dInline]} text={loginWhithoutLeadingAt}> |
Instead of containerStyles
you can use absolute
prop.
src/styles/styles.js
Outdated
'mention-user': { | ||
borderRadius: variables.componentBorderRadiusSmall, | ||
paddingHorizontal: 2, | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't have to define the styles for this tag instead just use it in the Text element in the Rendered as it seems. Not sure if this works the same but if yes why not.
@shawnborton could you review as well for design please 😄 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just some minor comments. Overall looking really good!
<Text | ||
// eslint-disable-next-line react/jsx-props-no-spreading | ||
{...defaultRendererProps} | ||
color={themeColors.textSupporting} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should use mentionText
or ourMentionText
right?
src/styles/themes/default.js
Outdated
mentionText: colors.blue200, | ||
mentionBG: colors.blue700, | ||
ourMentionText: colors.green200, | ||
ourMentionBG: colors.green700, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the design doc we said these should be:
mentionText: colors.blue100
mentionBG: colors.blue600
ourMentionText: colors.green100
ourMentionBG: colors.green600
In case those aren't defined:
- blue100: #BOD9FF
- blue600: #0164BF
- green100: #B1F2D6
- green600: #008C59
It also seems like the baseline of the text inside of the mention doesn't align to the baseline of the text outside of the mention. Ideally they should line up perfectly. |
@robertKozik you shouldn't need to test in offline mode anymore. The update to make it so that we don't strip the |
@shawnborton here's a screenshot from web from my own testing in non-offline mode. |
This will be solved with #18167 (comment) |
Web looks pretty good other than the colors being off. |
Why blueish color is removed after a few secs? I don't see the yellow color when I mention my email. |
@parasharrajat can you include a video of what you're seeing? |
@parasharrajat also, are you making sure to use staging server. |
Here is the video. I missed using the staging server. Can we please add that step to the Tests? and I don't think QA can test this due to code changes being needed. Should this be No QA? Now I can't tag myself. Screen.Recording.2023-05-04.at.12.01.00.AM.mov |
Good call
Yes, sounds good. Whenever the next back-end deploy happens (hopefully today) you'll be able to test this on staging or production
Ah interesting. @getusha it looks like our regex doesn't like email addresses with periods in them |
I see, I also thought that the mention parsing is not part of this PR. Let me see if I can test it with a different account. |
Sure i will update it once more, |
@getusha maybe we should just use the isValidEmail regex since it should already account for these cases. |
Update JsDoc comment for MentionUserRenderer propTypes Co-authored-by: Rajat Parashar <parasharrajat@users.noreply.github.com>
Code looks good to me. So if the checklist tests well for you @parasharrajat I think we'll be good to merge. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 verified the steps for local testing are in the
- 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 notonIconClick
). - 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
- 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.
- 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 usingAvatar
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. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor) - Any internal methods bound to
this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
) - 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 thatAvatar
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 theTest
steps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
cc: @puneetlath
🎀 👀 🎀 C+ reviewed
Awesome! |
Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks! |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
Lol, I am not seeing the strings on the Android App. Is it only me? |
What do you mean? |
Sorry, I mean I am not seeing. Trying to clean build the app. It might be a cache because it was working fine 2 hours before. |
@robertKozik Can you please check this? |
Yes, there is an issue a text using WrapperText is not appearing on android |
@getusha Why is that? Any idea? |
@parasharrajat here is the issue #17441 |
Ok, I found the issue #17441. Damn it! I think we will have to revert the PR because mentions won't work on Android. I remember that it was rendering on Android perfectly fine a few months back. What changed? |
Ah, damn! |
PR to revert: #18490 |
Tried to investigate and it doesn't seem to be a change from our codebase it might be from our react-native fork. i am not sure |
Something changed with RN upgrades. Not sure which PR or version but def an RN upgrade. |
That escalated quickly 😮 I don't know how that happened, but sorry for that all reverting problem 😢 |
🚀 Deployed to staging by https://github.com/puneetlath in version: 1.3.11-0 🚀
|
🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.12-0 🚀
|
Details
This PR adds custom renderer used for user mentions inside chats
Fixed Issues
$ #17885
PROPOSAL:https://docs.google.com/document/d/1vhvpwQDStA0lcsI0Z33pXOKPM6nXGRuplvQTFBWvCyA/edit#heading=h.5lyudapet5j6
Tests
Prerequisites: ExpensiMark changes are applied locally and app is in offline mode
Offline tests
same as above
QA Steps
same as above
In addition to mention testing, we need to check that code is rendering in chat properly, to check that there is no regression problems:
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodWaiting for Copy
label for a copy review on the original GH to get the correct copy.STYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Web
Mobile Web - Chrome
Mobile Web - Safari
Desktop
iOS
Android