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

Fix strikethrough markdown is not copied from Slack #36995

Closed

Conversation

bernhardoj
Copy link
Contributor

Details

The strikethrough markdown from Slack only copies the plain text when pasted in NewDot.

Fixed Issues

$ #35370
PROPOSAL: #35370 (comment)

Tests

Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Web/Desktop/iOS mWeb

  1. Open any chat
  2. From Slack, copy a strikethrough message
  3. Paste it into the composer
  4. Verify the strikethrough text is wrapped with ~ markdown

Android/iOS/Android mWeb
Can't paste an HTML

  • 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 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(theme.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 the PR modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
Screen.Recording.2024-02-18.at.14.09.29.mov
MacOS: Chrome / Safari
Screen.Recording.2024-02-18.at.14.02.16.mov
MacOS: Desktop
Screen.Recording.2024-02-18.at.14.07.29.mov

@bernhardoj bernhardoj requested a review from a team as a code owner February 21, 2024 05:26
@melvin-bot melvin-bot bot requested review from abdulrahuman5196 and removed request for a team February 21, 2024 05:27
Copy link

melvin-bot bot commented Feb 21, 2024

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

@abdulrahuman5196
Copy link
Contributor

@bernhardoj Verify podfile step is failing. Could you kindly check on the same?

@bernhardoj
Copy link
Contributor Author

@abdulrahuman5196 it should be unrelated
image

@abdulrahuman5196
Copy link
Contributor

And this upgrade has changes from different PR, tagging those owners to confirm if the changes are good for merge.

Or is any other expensify-common upgrade is in progress?

Expensify/expensify-common#650 - @amyevans
Expensify/expensify-common#651 - @aswin-s

@bernhardoj We have a snyk change as well in this upgrade. Could be related to that as well. Can we re-run the check to confirm if we still face the issue?

Because I am not seeing this failure even in recent PRs.

@bernhardoj
Copy link
Contributor Author

And this upgrade has changes from different PR

Oh, you're right, I missed it.

Expensify/expensify-common#650 only updates devDependencies, so it should be fine.
The app PR for Expensify/expensify-common#651 is here

Or is any other expensify-common upgrade is in progress?

I think only those 2 above

Can we re-run the check

Merged with main.

@abdulrahuman5196
Copy link
Contributor

@bernhardoj Since one of the previous changes have its own App PR. We have wait for it to merge or make that PR bump a level up so that it would include our changes.

@bernhardoj
Copy link
Contributor Author

make that PR bump a level up so that it would include our changes.

I think it would be out of scope for them. Let's just wait for that PR. It shouldn't take long I guess.

@abdulrahuman5196
Copy link
Contributor

@bernhardoj Seems the other app PR is merged. Could you kindly update this PR?

@bernhardoj
Copy link
Contributor Author

@abdulrahuman5196 merged with main

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Feb 29, 2024

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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb 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(theme.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 the PR modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • 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

Android: Native

N/A

Android: mWeb Chrome

N/A

iOS: Native

N/A

iOS: mWeb Safari
Screen.Recording.2024-02-29.at.12.53.38.PM.mp4
MacOS: Chrome / Safari
Screen.Recording.2024-02-29.at.12.49.45.PM.mp4
MacOS: Desktop
Screen.Recording.2024-02-29.at.12.51.18.PM.mp4

@bernhardoj
Copy link
Contributor Author

Please hold the merge, there is an issue with the previous expensify-common version here

@abdulrahuman5196
Copy link
Contributor

Please hold the merge, there is an issue with the previous expensify-common version here

@bernhardoj This issue is happening in staging testing right? Why should we need to block this issue?

@bernhardoj
Copy link
Contributor Author

@abdulrahuman5196 I was thinking if the previous expensify-common is reverted, we need to recreate our expensify-common PR again, but I think I'm wrong because the reverted expensify-common will still include our changes.

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Feb 29, 2024

@abdulrahuman5196 I was thinking if the previous expensify-common is reverted, we need to recreate our expensify-common PR again, but I think I'm wrong because the reverted expensify-common will still include our changes.

Got it. Anyway regardless of that. I wouldn't want to stop PR progress here for a different PR which has a chance of revert or potential fix

Copy link
Contributor

@abdulrahuman5196 abdulrahuman5196 left a comment

Choose a reason for hiding this comment

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

Changes looks good and works well. Reviewers checklist is also complete.

All yours. @mountiny

🎀 👀 🎀
C+ Reviewed

@melvin-bot melvin-bot bot requested a review from mountiny February 29, 2024 08:24
@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Mar 1, 2024

@mountiny How do we go about here? We just want to update the expensify-common version for this PR - Expensify/expensify-common#653 . We have already tested our changes in common and app packages and attached the videos.

But a different PR present in the expensify-common before our PR, now got reverted as mentioned here - #36995 (comment)

I am not sure on how to update the expensify-common here?
There seems to multiple changes in expensify-common if we where to pick the latest commit. And not possible just to pick our PR commit, since it has un-reverted version of the PR mentioned which could cause the bug.

@abdulrahuman5196
Copy link
Contributor

Yet again another PR was reverted and the expensify-common commit went back more. Not sure how to proceed here @mountiny - #36995 (comment)

@mountiny
Copy link
Contributor

@bernhardoj @abdulrahuman5196 sorry I was ooo, do we just need to point to the latest merge commit? that will include the reverted changes but this change should still be in there, no?

@bernhardoj
Copy link
Contributor Author

@mountiny you're right. I think we don't need this App PR anymore as another PR already bumps the expensify-common version which already includes our changes.

Tested on staging.

Screen.Recording.2024-03-13.at.21.44.56.mov

@mountiny mountiny closed this Mar 13, 2024
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