[CP Staging] Fix notification click through #31663

arosiclair · 2023-11-21T22:02:29Z

Details

Fixes notification click through navigation being canceled by a navigation back to the homescreen

Fixed Issues

$ #31625

Tests

Log in
Accept push notification prompt
Send yourself a message
Verify a push notification appears and click it
Verify you're navigated to the chat
Go back to the homescreen
Kill the app
Send yourself another message
Verify a push notification appears and click it
Verify the app opens and you're navigated to the chat

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as Tests

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(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 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 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

screen-20231121-170706.mp4

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2023-11-21T22:25:13Z

@aimane-chnaif 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]

aimane-chnaif · 2023-11-21T22:27:46Z

Reviewing

aimane-chnaif · 2023-11-21T22:58:44Z

@arosiclair can you please generate QR build? It seems push notification not working in dev build so going to test Adhoc build.

luacmartins · 2023-11-21T23:00:03Z

I triggered the adhoc build

OSBotify · 2023-11-21T23:34:40Z

🧪🧪 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/31663/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed
Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/31663/NewExpensify.dmg	https://31663.pr-testing.expensify.com

luacmartins · 2023-11-21T23:38:38Z

@aimane-chnaif can we test the android build? I'll test iOS internally

aimane-chnaif · 2023-11-21T23:40:19Z

yes on it

aimane-chnaif · 2023-11-21T23:46:04Z

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(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 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 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

Works well on android. Tested all app states - background, foreground, quit

android.notification.mp4

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

aimane-chnaif · 2023-11-21T23:47:42Z

src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js

-                if (Navigation.getActiveRoute().slice(1, 2) === ROUTES.REPORT && !Navigation.isActiveRoute(`r/${reportID}`)) {
-                    Navigation.goBack(ROUTES.HOME);
-                }
+        Navigation.isNavigationReady()


NAB: I think this is redundant as it's promised in Navigation.waitForProtectedRoutes already.
But let's leave as is for now for safety.

melvin-bot · 2023-11-21T23:48:22Z

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

luacmartins · 2023-11-21T23:48:41Z

Thanks for the review!

…hrough [CP Staging] Fix notification click through (cherry picked from commit 424bbfe)

OSBotify · 2023-11-21T23:52:38Z

✋ 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 · 2023-11-22T00:20:57Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 1.4.1-13 🚀

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

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

OSBotify · 2023-11-22T00:36:34Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 1.4.1-13 🚀

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-11-22T00:52:33Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.1-13 🚀

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

wait for protected routes

475ecff

arosiclair self-assigned this Nov 21, 2023

arosiclair marked this pull request as ready for review November 21, 2023 22:25

arosiclair requested a review from a team as a code owner November 21, 2023 22:25

melvin-bot bot requested review from aimane-chnaif and removed request for a team November 21, 2023 22:25

arosiclair changed the title ~~Fix notification click through~~ [CP Staging] Fix notification click through Nov 21, 2023

luacmartins approved these changes Nov 21, 2023

View reviewed changes

luacmartins added the Ready To Build label Nov 21, 2023

aimane-chnaif reviewed Nov 21, 2023

View reviewed changes

aimane-chnaif approved these changes Nov 21, 2023

View reviewed changes

melvin-bot bot requested a review from Gonals November 21, 2023 23:48

luacmartins merged commit 424bbfe into main Nov 21, 2023
20 of 22 checks passed

luacmartins deleted the arosiclair-fix-notif-click-through branch November 21, 2023 23:48

OSBotify pushed a commit that referenced this pull request Nov 21, 2023

Merge pull request #31663 from Expensify/arosiclair-fix-notif-click-t…

fa8d53b

…hrough [CP Staging] Fix notification click through (cherry picked from commit 424bbfe)

os-botify bot mentioned this pull request Nov 21, 2023

Deploy Checklist: New Expensify 2023-11-20 #31556

Closed

90 tasks

melvin-bot bot mentioned this pull request Nov 23, 2023

[HOLD for payment 2023-11-30] Notification - User is navigated to LHN after opening notification when app is closed #31625

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Fix notification click through #31663

[CP Staging] Fix notification click through #31663

arosiclair commented Nov 21, 2023 •

edited

Loading

melvin-bot bot commented Nov 21, 2023

aimane-chnaif commented Nov 21, 2023

aimane-chnaif commented Nov 21, 2023

luacmartins commented Nov 21, 2023 •

edited

Loading

OSBotify commented Nov 21, 2023

luacmartins commented Nov 21, 2023

aimane-chnaif commented Nov 21, 2023

aimane-chnaif commented Nov 21, 2023

aimane-chnaif Nov 21, 2023

melvin-bot bot commented Nov 21, 2023

luacmartins commented Nov 21, 2023

OSBotify commented Nov 21, 2023

OSBotify commented Nov 22, 2023

OSBotify commented Nov 22, 2023

OSBotify commented Nov 22, 2023

[CP Staging] Fix notification click through #31663

[CP Staging] Fix notification click through #31663

Conversation

arosiclair commented Nov 21, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 21, 2023

aimane-chnaif commented Nov 21, 2023

aimane-chnaif commented Nov 21, 2023

luacmartins commented Nov 21, 2023 • edited Loading

OSBotify commented Nov 21, 2023

luacmartins commented Nov 21, 2023

aimane-chnaif commented Nov 21, 2023

aimane-chnaif commented Nov 21, 2023

Reviewer Checklist

Screenshots/Videos

aimane-chnaif Nov 21, 2023

Choose a reason for hiding this comment

melvin-bot bot commented Nov 21, 2023

luacmartins commented Nov 21, 2023

OSBotify commented Nov 21, 2023

OSBotify commented Nov 22, 2023

OSBotify commented Nov 22, 2023

OSBotify commented Nov 22, 2023

arosiclair commented Nov 21, 2023 •

edited

Loading

luacmartins commented Nov 21, 2023 •

edited

Loading