Fix: Wrong text color for our mention #20845

tienifr · 2023-06-15T19:03:37Z

Details

Our mention is displayed with wrong color. This is a regression from #20447. This PR fixes that.

Fixed Issues

$ #19303
$ #20819

Tests

Issue 19303:

Open any report
Send a message with mention and text
Click and drag to highlight the whole message (including the mention)
Verify that the cursor is I beam while selecting the mention

Issue 20819:

Open any report
Type @ and enter the current account's email/phone number
Send the message
Verify that it's displayed with green background and light green text

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Issue 19303:

Open any report
Send a message with mention and text
Click and drag to highlight the whole message (including the mention)
Verify that the cursor is I beam while selecting the mention

Issue 20819:

Open any report
Type @ and enter the current account's email/phone number
Send the message
Verify that it's displayed with green background and light green text

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screencast.from.08-06-2023.18.04.33.webm

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-06-15T19:03:43Z

@youssef-lr @eVoloshchak 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]

marcaaron · 2023-06-15T21:19:55Z

@youssef-lr is offline. I can jump in to help test this one.

marcaaron · 2023-06-15T21:22:55Z

src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js

@@ -42,8 +42,7 @@ function MentionUserRenderer(props) {
                    // eslint-disable-next-line react/jsx-props-no-spreading
                    {...defaultRendererProps}
                    href={ROUTES.getDetailsRoute(loginWithoutLeadingAt)}
-                    color={StyleUtils.getMentionTextColor(isOurMention)}
-                    style={[_.omit(props.style, 'color'), StyleUtils.getMentionStyle(isOurMention)]}
+                    style={[_.omit(props.style, 'color'), StyleUtils.getMentionStyle(isOurMention), {color: StyleUtils.getMentionTextColor(isOurMention)}]}


NAB but I think it should go in the getMentionStyle() method or no?

marcaaron · 2023-06-15T21:23:43Z

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.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

github-actions · 2023-06-15T21:24:09Z

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

…-mention Fix: Wrong text color for our mention (cherry picked from commit 9fda6a5)

…-20845 🍒 Cherry pick PR #20845 to staging 🍒

OSBotify · 2023-06-15T22:58:12Z

🚀 Cherry-picked to staging by https://github.com/marcaaron in version: 1.3.28-5 🚀

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

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

OSBotify · 2023-06-16T18:39:28Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

OSBotify · 2023-06-23T22:18:04Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.3.32-1 🚀

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

OSBotify · 2023-06-26T20:48:41Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.32-5 🚀

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

fix: wrong text color for our mention

9518ac5

tienifr requested a review from a team as a code owner June 15, 2023 19:03

melvin-bot bot requested review from eVoloshchak and youssef-lr and removed request for a team June 15, 2023 19:03

tienifr mentioned this pull request Jun 15, 2023

Fix: Mention does not show beam on selection #20447

Merged

55 tasks

marcaaron reviewed Jun 15, 2023

View reviewed changes

marcaaron removed request for eVoloshchak and youssef-lr June 15, 2023 21:23

marcaaron added the CP Staging label Jun 15, 2023

marcaaron assigned tienifr Jun 15, 2023

marcaaron self-requested a review June 15, 2023 21:45

marcaaron approved these changes Jun 15, 2023

View reviewed changes

marcaaron merged commit 9fda6a5 into Expensify:main Jun 15, 2023

OSBotify pushed a commit that referenced this pull request Jun 15, 2023

Merge pull request #20845 from tienifr/fix/20819-wrong-text-color-our…

2dfe139

…-mention Fix: Wrong text color for our mention (cherry picked from commit 9fda6a5)

OSBotify mentioned this pull request Jun 15, 2023

🍒 Cherry pick PR #20845 to staging 🍒 #20877

Merged

OSBotify added a commit that referenced this pull request Jun 15, 2023

Merge pull request #20877 from Expensify/OSBotify-cherry-pick-staging…

dbf1a69

…-20845 🍒 Cherry pick PR #20845 to staging 🍒

OSBotify mentioned this pull request Jun 15, 2023

Deploy Checklist: New Expensify 2023-06-14 #20782

Closed

OSBotify mentioned this pull request Jun 16, 2023

Deploy Checklist: New Expensify 2023-06-16 #20928

Closed

OSBotify mentioned this pull request Jun 24, 2023

Deploy Checklist: New Expensify 2023-06-24 #21477

Closed

45 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Wrong text color for our mention #20845

Fix: Wrong text color for our mention #20845

tienifr commented Jun 15, 2023 •

edited

Loading

melvin-bot bot commented Jun 15, 2023

marcaaron commented Jun 15, 2023

marcaaron Jun 15, 2023

marcaaron commented Jun 15, 2023 •

edited

Loading

github-actions bot commented Jun 15, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

OSBotify commented Jun 23, 2023

OSBotify commented Jun 26, 2023

Fix: Wrong text color for our mention #20845

Fix: Wrong text color for our mention #20845

Conversation

tienifr commented Jun 15, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 15, 2023

marcaaron commented Jun 15, 2023

marcaaron Jun 15, 2023

Choose a reason for hiding this comment

marcaaron commented Jun 15, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

github-actions bot commented Jun 15, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

OSBotify commented Jun 23, 2023

OSBotify commented Jun 26, 2023

tienifr commented Jun 15, 2023 •

edited

Loading

marcaaron commented Jun 15, 2023 •

edited

Loading