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

Chat - File does not appear with strikethrough style when uploaded offline and deleted #47971

Merged
merged 22 commits into from
Oct 23, 2024

Conversation

Krishna2323
Copy link
Contributor

@Krishna2323 Krishna2323 commented Aug 24, 2024

Details

Fixed Issues

$ #46616
PROPOSAL: #46616 (comment)

Tests

  1. Go to any chat
  2. Upload a file (format: .txt/.html/.zip/)
  3. Upload image & video
  4. Go offline
  5. Right click on the file
  6. Click Delete comment
  7. Verify an overlay with trash icon is shown for deleted video & image and the filename is crossed for the other file. (format: .txt/.html/.zip/)
  8. Stay offline and repeat step 2 to 7
  • Verify that no errors appear in the JS console

Offline tests

  1. Go to any chat
  2. Upload a file (format: .txt/.html/.zip/)
  3. Upload image & video
  4. Go offline
  5. Right click on the file
  6. Click Delete comment
  7. Verify an overlay with trash icon is shown for deleted video & image and the filename is crossed for the other file. (format: .txt/.html/.zip/)
  8. Stay offline and repeat step 2 to 7

QA Steps

  1. Go to any chat
  2. Upload a file (format: .txt/.html/.zip/)
  3. Upload image & video
  4. Go offline
  5. Right click on the file
  6. Click Delete comment
  7. Verify an overlay with trash icon is shown for deleted video & image and the filename is crossed for the other file. (format: .txt/.html/.zip/)
  8. Stay offline and repeat step 2 to 7
  • 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design 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
Monosnap.screencast.2024-09-04.13-32-54.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.1.mp4
MacOS: Desktop
desktop_app.mp4

…ed offline and deleted.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323 Krishna2323 requested a review from a team as a code owner August 24, 2024 20:48
@melvin-bot melvin-bot bot requested review from dubielzyk-expensify and mananjadhav and removed request for a team August 24, 2024 20:48
Copy link

melvin-bot bot commented Aug 24, 2024

@dubielzyk-expensify @mananjadhav 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]

@Krishna2323 Krishna2323 marked this pull request as draft August 24, 2024 20:48
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@dubielzyk-expensify
Copy link
Contributor

Let me know when there's something visual to check out :)

@Krishna2323
Copy link
Contributor Author

The code changes are done, I will test last time today and upload the screenshots.

@Krishna2323
Copy link
Contributor Author

@dubielzyk-expensify, please check the recording and let me know if we want some changes.

Monosnap.screencast.2024-08-28.05-29-20.mp4

@dubielzyk-expensify
Copy link
Contributor

dubielzyk-expensify commented Aug 28, 2024

There seems to be something weird happening when you go into offline mode and it immediately showing this before you've even deleted anything:
CleanShot 2024-08-28 at 12 16 08@2x

The trash icon should only appear when something is deleted in offline mode. Which is does when you do your "Delete comment" action, but before that it shows a double or something?

Otherwise the rest of the recording looks good. cc @Expensify/design

@shawnborton
Copy link
Contributor

Yup, I'm also curious about what Jon is mentioning.

@dannymcclain
Copy link
Contributor

Same. Other than that weirdness Jon pointed out I think it's looking good.

@Krishna2323
Copy link
Contributor Author

Thanks for the review, I think that was already deleted action which might have failed that's why it was shown but I will double check that.

@Krishna2323
Copy link
Contributor Author

@Expensify/design, I apologize for forgetting to show the visuals in light mode 😅. Could you please confirm if the video looks correct in both modes?

Monosnap.screencast.2024-08-29.06-23-50.mp4

@dubielzyk-expensify
Copy link
Contributor

dubielzyk-expensify commented Aug 29, 2024

Thanks for providing video for light mode 😄

Is the icon using the icon color variable? Cause it looks to be the same icon color as in dark mode which is a darker than we want. In light mode it should appear a bit lighter. But it could be the recording screwing up with me here.

@shawnborton
Copy link
Contributor

I think the video might be correct? I think the color for icons is darker in light mode, and lighter in dark mode.

@dannymcclain
Copy link
Contributor

Haha, I'm with both of you—the icon color in light mode doesn't quite look right to me 🤨

Here's a Figma screenshot. The icon is just using our standard icons color variable.

CleanShot 2024-08-29 at 09 01 32@2x

@Krishna2323
Copy link
Contributor Author

Thanks, I will update and provide the result shortly.

@Krishna2323
Copy link
Contributor Author

@Expensify/design, does this look correct? The color code has been updated to the icon variable, but it will appear lighter than in this design because the report comment has an opacity of .5 when deleted offline. I find it very difficult to maintain the original icon color with the reduced opacity. The only viable solution I can think of is to update the color to a brighter version of the icon variable so that it appears closer to the original even with the reduced opacity.

deleted_indicator_updated_color.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Copy link
Collaborator

@mananjadhav mananjadhav left a comment

Choose a reason for hiding this comment

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

Left a few comments.

src/components/ThumbnailImage.tsx Outdated Show resolved Hide resolved
src/components/Attachments/AttachmentView/index.tsx Outdated Show resolved Hide resolved
src/components/VideoPlayerPreview/VideoPlayerThumbnail.tsx Outdated Show resolved Hide resolved
src/styles/index.ts Outdated Show resolved Hide resolved
src/components/AttachmentDeletedIndicator.tsx Outdated Show resolved Hide resolved
src/components/AttachmentDeletedIndicator.tsx Outdated Show resolved Hide resolved
src/components/AttachmentDeletedIndicator.tsx Outdated Show resolved Hide resolved
return (
<>
<View
style={[styles.pAbsolute, styles.alignItemsCenter, styles.justifyContentCenter, styles.highlightBG, styles.deletedIndicatorOverlay, styles.deletedIndicator, containerStyles]}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Still going through these styles.

@neil-marcellini
Copy link
Contributor

@Krishna2323 I think we'll need to fix the eslint issues even if they're unrelated to the PR. It is because we're touching those files and the new lint rules are failing.

@neil-marcellini can you please confirm?

Hi, thanks for asking. The latest I've heard is that if the ES Lint checks are related to files touched in the current PR, then we require them to be fixed before the issue can be considered complete and paid. If the fixes are small then we like to see the changes in the current PR. Otherwise, like in this case where we need to migrate to useOnyx, we should handle it in a separate PR. You could also search to see if there is already an issue to migrate to useOnyx for these files.

@Krishna2323
Copy link
Contributor Author

@mananjadhav, I have fixed other files but I'm no sure what to do with ImageRenderer file since the onyx value is used in the memo.

export default withOnyx<ImageRendererProps, ImageRendererWithOnyxProps>({
user: {
key: ONYXKEYS.USER,
},
})(
memo(
ImageRenderer,
(prevProps, nextProps) => prevProps.tnode.attributes === nextProps.tnode.attributes && prevProps.user?.shouldUseStagingServer === nextProps.user?.shouldUseStagingServer,
),
);

@Krishna2323
Copy link
Contributor Author

@mananjadhav, friendly bump on the comment above ^

@Krishna2323
Copy link
Contributor Author

@mananjadhav, any updates?

@mananjadhav
Copy link
Collaborator

I couldn't check this over the weekend, but I'll try to check today. I think it's best to post on open-source channel to get more eyes.

@Krishna2323
Copy link
Contributor Author

@mananjadhav, we no longer need to make this change, I guess it has been done somewhere else. You can continue with the checklist.

@mananjadhav
Copy link
Collaborator

Thanks for the update @Krishna2323. I will check this out today.

@mananjadhav
Copy link
Collaborator

mananjadhav commented Oct 15, 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design 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 android-delete-attachment
Android: mWeb Chrome mweb-chrome-delete-attachment
iOS: Native
iOS: mWeb Safari mweb-safari-delete-attachment
MacOS: Chrome / Safari
web-delete-attachment.mov
MacOS: Desktop
desktop-delete-attachment.mov

@mananjadhav
Copy link
Collaborator

Did the latest review, left with the QA on mobile devices. Will finish the checklist today.

@mananjadhav
Copy link
Collaborator

@Krishna2323 Can you please fix conflicts? Also there's a recent node and npm change that causes the performance tests to fail.

I am having some trouble with my Xcode, rest screenshots updated.

Copy link
Collaborator

@mananjadhav mananjadhav left a comment

Choose a reason for hiding this comment

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

I am having issues with iOS so skipping that one. Screenshots for the rest are uploaded and I verified iOS on the author checklist.

Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

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

The code looks fine and looks like it tests well. Thank you for the hard work.

@neil-marcellini neil-marcellini merged commit b8a0202 into Expensify:main Oct 23, 2024
18 checks passed
@OSBotify
Copy link
Contributor

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

Copy link
Contributor

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.0.54-0 🚀

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

Copy link
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.54-11 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 failure ❌
🍎 iOS 🍎 failure ❌
🕸 web 🕸 success ✅
🤖🔄 android HybridApp 🤖🔄 skipped 🚫
🍎🔄 iOS HybridApp 🍎🔄 skipped 🚫

Copy link
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.54-11 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 web 🕸 success ✅
🤖🔄 android HybridApp 🤖🔄 skipped 🚫
🍎🔄 iOS HybridApp 🍎🔄 skipped 🚫

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.

7 participants