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: Attachment modal is not closed when click notification #30968

Merged
merged 13 commits into from
Jan 23, 2024

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Nov 7, 2023

Details

Attachment modal is not closed when click notification, and later we can't reopen that attachment. This PR closes any modal when navigate from notification.

Fixed Issues

$ #30446
PROPOSAL: #30446 (comment)

Tests

  1. Login with 2 accounts (A & B) on different browsers/apps
  2. [A] Open an image attachment in any chat EXCEPT the one with B
  3. Put the app in background
  4. [B] Send a message to A
  5. [A] Press the message notification
  6. Verify that the attachment modal closes and A gets navigated to the chat with B
  7. Open the chat from Step 2 >> Open an image attachment
  8. Verify that the attachment modal opens
  • Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

  1. Login with 2 accounts (A & B) on different browsers/apps
  2. [A] Open an image attachment in any chat EXCEPT the one with B
  3. Put the app in background
  4. [B] Send a message to A
  5. [A] Press the message notification
  6. Verify that the attachment modal closes and A gets navigated to the chat with B
  7. Open the chat from Step 2 >> Open an image attachment
  8. Verify that the attachment modal opens
  • 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 / Chrome
    • iOS / native
    • iOS / 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 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
      • 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Untitled.mp4
MacOS: Chrome / Safari
Screen.Recording.2023-11-08.at.15.25.45-compressed.mov
MacOS: Desktop
Screen.Recording.2023-11-08.at.15.28.30-compressed.mov

@mananjadhav
Copy link
Collaborator

@tienifr Please ping me once the PR is ready for review.

@tienifr
Copy link
Contributor Author

tienifr commented Nov 8, 2023

I can't test push notification on native devices, including both browsers and native apps. When I test on mobile Chrome, here's what I faced:

Screenshot 2023-11-08 at 16 00 01

@tienifr tienifr marked this pull request as ready for review November 8, 2023 09:01
@tienifr tienifr requested a review from a team as a code owner November 8, 2023 09:01
@melvin-bot melvin-bot bot requested review from mananjadhav and removed request for a team November 8, 2023 09:01
Copy link

melvin-bot bot commented Nov 8, 2023

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

@tienifr
Copy link
Contributor Author

tienifr commented Nov 14, 2023

@mananjadhav Can we continue?

@mananjadhav
Copy link
Collaborator

I didn't review because I thought this was still blocked. @tienifr Are you still facing issues with the notifications? I think it makes sense to add videos from all the platforms?

@tienifr
Copy link
Contributor Author

tienifr commented Nov 14, 2023

There's no way we can test notification on native.

@tienifr
Copy link
Contributor Author

tienifr commented Nov 17, 2023

@mananjadhav Or we can request build to test on physical devices.

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.

The change looks fine, and it's best that we test with the adhoc build.

@melvin-bot melvin-bot bot requested a review from joelbettner November 18, 2023 17:30
@mananjadhav
Copy link
Collaborator

@joelbettner Can you help trigger the adhoc build to test this one?

@tienifr
Copy link
Contributor Author

tienifr commented Nov 22, 2023

@joelbettner Can you help trigger adhoc build? Thanks!

@tienifr
Copy link
Contributor Author

tienifr commented Nov 22, 2023

We might need to include this test case: #31625 to cover the case when app was quit and notification was received in the background.

@mananjadhav
Copy link
Collaborator

@joelbettner did you get a chance to look at the previous comments for adhoc build?

@OSBotify

This comment has been minimized.

@joelbettner
Copy link
Contributor

joelbettner commented Nov 27, 2023

Sorry @mananjadhav and @tienifr. I was OOO last week (and one unexpected day of being OOO because I was sick). Catching up on things now.

Thanks for triggering that build @tgolen.

@OSBotify
Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/30968/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/30968/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/30968/NewExpensify.dmg https://30968.pr-testing.expensify.com
Desktop Web

@mananjadhav
Copy link
Collaborator

@tienifr Are you able to run this the adhoc builds?

The build are not loading for me.

Screen.Recording.2023-12-01.at.1.28.33.AM.mov

@tienifr
Copy link
Contributor Author

tienifr commented Dec 1, 2023

@mananjadhav It's working fine one my side.

@tienifr
Copy link
Contributor Author

tienifr commented Dec 1, 2023

@mananjadhav This is what I faced when receiving notifications on mWeb Chrome, both production and main:

Screenshot 2023-12-01 at 15 20 39

Seems like notification is broken on mWeb.

Also I could not test on physical iOS as it required Apple developer's account to run adhoc build. Can you suggest any process for that? Or we can ask QA team for help.

But it worked fine on Android. I've updated screenshot.

@mananjadhav
Copy link
Collaborator

mananjadhav commented Jan 4, 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
android-attachment-notification.mp4
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
web-notification-modal.mov
MacOS: Desktop
desktop-notification-modal.mov

@mananjadhav
Copy link
Collaborator

mananjadhav commented Jan 4, 2024

@tienifr Can you please merge the latest main and resolve conflicts?

@joelbettner I've tried multiple times, and different ways to enable notifications on my emulators but it's in vain. Can you please help with the remaining platforms? or if you can trigger another adhoc build to see it works on the latest changes?

@tienifr
Copy link
Contributor Author

tienifr commented Jan 9, 2024

I've replied earlier here that:

  • Notifications on mWeb have broken
  • Testing notifications on iOS is forbidden as it requires Apple's developer account
  • Testing on Android is fine (included recording)

@mananjadhav
Copy link
Collaborator

Yes agreed. Hence I've asked @joelbettner to see if they can help. I can still see merge conflicts @tienifr.

@tienifr
Copy link
Contributor Author

tienifr commented Jan 9, 2024

@mananjadhav GH server was having issues several minutes ago. That's why you can't see the latest changes. They've all been resolved.

Copy link
Contributor

github-actions bot commented Jan 9, 2024

@joelbettner
Copy link
Contributor

@mananjadhav @tienifr I've just posted the adhoc builds.

@mananjadhav
Copy link
Collaborator

@joelbettner Do adhoc builds support push notifications?

@joelbettner
Copy link
Contributor

@joelbettner Do adhoc builds support push notifications?

I asked in Slack, and no, push notifications do not work in ad-hoc builds.

@joelbettner
Copy link
Contributor

@mananjadhav you should be able to test push notifications in dev on Android. Correct @arosiclair?

@tienifr
Copy link
Contributor Author

tienifr commented Jan 12, 2024

Tested again today and worked fine:

video_2024-01-12_13-06-27.mp4

@mananjadhav Did you allow notifications for the Adhoc app?

@mananjadhav
Copy link
Collaborator

Okay I finally managed to test this on my friend's android device. Uploaded the video.

@mananjadhav
Copy link
Collaborator

@joelbettner Can we please move this forward?

@tienifr Can you sync the latest main?

@tienifr
Copy link
Contributor Author

tienifr commented Jan 19, 2024

All done.

@joelbettner
Copy link
Contributor

Looks good. Just need the last items on the checklist checked off, @mananjadhav.

@tienifr
Copy link
Contributor Author

tienifr commented Jan 22, 2024

@mananjadhav Can you check off the rest platforms? We have problems testing those so I think that's fine. We can delegate the work to QA once it's on staging.

@mananjadhav
Copy link
Collaborator

@joelbettner @tienifr Done.

@joelbettner joelbettner merged commit cfea515 into Expensify:main Jan 23, 2024
14 of 15 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.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.31-7 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants