Skip to content

handle asterisk (*) after backtick (`)#463

Merged
srikarparsi merged 2 commits intoExpensify:mainfrom
aimane-chnaif:fix-app-9822
Sep 15, 2022
Merged

handle asterisk (*) after backtick (`)#463
srikarparsi merged 2 commits intoExpensify:mainfrom
aimane-chnaif:fix-app-9822

Conversation

@aimane-chnaif
Copy link
Copy Markdown
Contributor

@aimane-chnaif aimane-chnaif commented Sep 8, 2022

@rushatgabhane @chiragsalian will you please review this?

Expensify/App#9822 (comment)
This was original proposal but I updated logic below because some browsers (i.e. safari) do not support negative lookbehind
regex (?<!) (details here: https://javascript.info/regexp-lookahead-lookbehind)

Updated logic:

  • update regex to still validate true if <pre> or <code> or <a> exists as a prefix (if not exist, of course validated as before)
  • In replacement callback, if prefix is <pre> or <code> or <a>, don't convert considering as not bold. If not, consider as bold and convert as before
    So actually the idea is same as original proposal

Fixed Issues

$ Expensify/App#9822

Tests

  1. Open any chat
  2. In the chat input, enter some text inside the backticks (`) to quote it
  3. After each backtick, append an asterisk like this:
`*test`*
  1. Send the message
  2. Verify that message is displayed correctly as *test*

QA

  1. Open any chat
  2. In the chat input, enter some text inside the backticks (`) to quote it
  3. After each backtick, append an asterisk like this:
`*test`*
  1. Send the message
  2. Verify that message is displayed correctly as *test*

Screenshots

1. quote only: `test`
2. asterisk only: *test*
3. asterisk after quote: `*test`*
4. quote after asterisk: *`test*`
5. *`test`* and `*test*`

Web

web

Mobile Web

mweb

Desktop

desktop

iOS

ios

Android

android

@aimane-chnaif aimane-chnaif requested a review from a team as a code owner September 8, 2022 06:17
@github-actions
Copy link
Copy Markdown

github-actions bot commented Sep 8, 2022

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@aimane-chnaif
Copy link
Copy Markdown
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@melvin-bot melvin-bot bot requested review from srikarparsi and removed request for a team September 8, 2022 06:18
regex: /\B\*((?!\s).*?\S)\*\B(?![^<]*(<\/pre>|<\/code>|<\/a>))/g,
replacement: '<strong>$1</strong>',
regex: /(<pre>|<code>|<a>)*\B\*((?!\s).*?\S)\*\B(?![^<]*(<\/pre>|<\/code>|<\/a>))/g,
replacement: (match, g1, g2) => g1 ? match : `<strong>${g2}</strong>`,
Copy link
Copy Markdown
Member

@rushatgabhane rushatgabhane Sep 9, 2022

Choose a reason for hiding this comment

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

@aimane-chnaif tests well, can you please fix the lint errors?

npx eslint .

Copy link
Copy Markdown
Member

@rushatgabhane rushatgabhane left a comment

Choose a reason for hiding this comment

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

@chiragsalian LGTM! 🎉

PR 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 */
    • Any functional components have the displayName property
    • 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 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 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Copy link
Copy Markdown
Contributor

@srikarparsi srikarparsi left a comment

Choose a reason for hiding this comment

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

looks good

@srikarparsi srikarparsi merged commit a9e791c into Expensify:main Sep 15, 2022
@rushatgabhane
Copy link
Copy Markdown
Member

rushatgabhane commented Sep 15, 2022

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.

3 participants