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

Support money request push notifications #41861

Merged
merged 9 commits into from
May 13, 2024

Conversation

arosiclair
Copy link
Contributor

@arosiclair arosiclair commented May 8, 2024

Details

Adds support for new moneyRequest push notifications. Re-uses logic from subscribeToReportCommentPushNotifications to be common between them.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/381189

Tests

Note

  • Money request push notifications cannot be tested externally yet. Instead, Applause will QA when backend changes for them are deployed. For now, we will just regression test report comment push notifications.
  • Only test iOS and Android
  1. Log into NewDot on web and mobile
  2. Accept push notification permission
  3. Send a chat message to mobile
  4. Verify a push notification is received
  5. Select the push notification
  6. Verify the report is opened

Android background updates

  1. Log in as a workspace member on two devices
  2. Join a room on Android and set the notification preference to mute
  3. Kill the app
  4. Send messages in the room to create missed onyx updates
  5. DM the Android user to trigger a push notification
  6. Verify a push notification is received
  7. Verify in logs that the app wakes and fetches missed onyx updates after a moment:
[info] [PushNotification] Applying onyx data in the background - {"reportID":2498013334625344,"reportActionID":"1691535872927344326"}
[info] [PushNotification] reliable onyx update received - {"lastUpdateID":6415,"previousUpdateID":6412,"onyxDataCount":2}

[info] Gap detected in update IDs from server so fetching incremental updates - {"lastUpdateIDFromServer":6415,"previousUpdateIDFromServer":6412,"lastUpdateIDFromClient":6407}
[info] Making API request - {"command":"GetMissingOnyxMessages"}

[OnyxUpdateManager] Done applying all updates

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 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
Android: mWeb Chrome
iOS: Native

IMG_F79C87713C5D-1

iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@arosiclair arosiclair self-assigned this May 8, 2024
* Otherwise, they will not be executed when the app is completely closed, and the push notification won't update the app data.
*/
PushNotification.init();
subscribeToReportCommentPushNotifications();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This subscription was a duplicate and has been unnecessary for a while

Copy link
Member

Choose a reason for hiding this comment

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

I didn't understand. The comment says that it is necessary to be executed in Headless process. Are you saying that it is not needed anymore? We are already executing it somewhere else? If so, do you have more insights on where it is called?

App currently calls this twice. One in Setup and other one in Expensify.tsx file. But this file is also called in headLess env where Expensify.tsx is not loaded so it is necessary here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We've been handling the subscription here so it's a dupe:

/**
* Manage push notification subscriptions on sign-in/sign-out.
*
* On Android, AuthScreens unmounts when the app is closed with the back button so we manage the
* push subscription when the session changes here.
*/
Onyx.connect({
key: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
callback: (notificationID) => {
if (notificationID) {
PushNotification.register(notificationID);
PushNotification.init();
// Subscribe handlers for different push notification types
PushNotification.onReceived(PushNotification.TYPE.REPORT_COMMENT, applyOnyxData);
PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, navigateToReport);
PushNotification.onReceived(PushNotification.TYPE.MONEY_REQUEST, applyOnyxData);
PushNotification.onSelected(PushNotification.TYPE.MONEY_REQUEST, navigateToReport);
} else {
PushNotification.deregister();
PushNotification.clearNotifications();
}
},
});

The callbacks should work there, but I haven't been able to build Android to test it. Can you build Android to test?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nvm I fixed the build here. Background updates are still working well on Android:

Screenshot 2024-05-10 at 10 40 26 AM

@arosiclair
Copy link
Contributor Author

Was not able to build Android, but iOS is looking good. This is ready for review.

@arosiclair arosiclair marked this pull request as ready for review May 10, 2024 02:18
@arosiclair arosiclair requested a review from a team as a code owner May 10, 2024 02:18
@melvin-bot melvin-bot bot requested review from parasharrajat and removed request for a team May 10, 2024 02:18
Copy link

melvin-bot bot commented May 10, 2024

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

@parasharrajat
Copy link
Member

Testing...

@parasharrajat
Copy link
Member

@arosiclair Could you please trigger adHoc build for notification testing?

* Otherwise, they will not be executed when the app is completely closed, and the push notification won't update the app data.
*/
PushNotification.init();
subscribeToReportCommentPushNotifications();
Copy link
Member

Choose a reason for hiding this comment

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

I didn't understand. The comment says that it is necessary to be executed in Headless process. Are you saying that it is not needed anymore? We are already executing it somewhere else? If so, do you have more insights on where it is called?

App currently calls this twice. One in Setup and other one in Expensify.tsx file. But this file is also called in headLess env where Expensify.tsx is not loaded so it is necessary here.

@arosiclair
Copy link
Contributor Author

@arosiclair Could you please trigger adHoc build for notification testing?

Push notifications don't work in ad-hoc builds. You just need to test Android in dev. Make sure to follow these steps.

});
}

function applyOnyxData({reportID, reportActionID, onyxData, lastUpdateID, previousUpdateID}: ReportActionPushNotificationData): Promise<void> {
Copy link
Contributor

Choose a reason for hiding this comment

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

Additional function comments would be useful here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought about it, but I'm not sure there's anything to comment on. "Apply the onyx data" seems like a useless comment and we didn't have any comments for it before either

Comment on lines +128 to +129
PushNotification.onReceived(PushNotification.TYPE.MONEY_REQUEST, applyOnyxData);
PushNotification.onSelected(PushNotification.TYPE.MONEY_REQUEST, navigateToReport);
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you forsee other types? I assume the individual splits will be fine, but what about the parent split action for example

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah there will be other types in the future, but for now there is only reportComment and moneyRequest.

Copy link
Contributor

@Julesssss Julesssss left a comment

Choose a reason for hiding this comment

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

I don't know how easy this would be, but more App testing would make me more confident that the Web > App flow will remain stable

@parasharrajat
Copy link
Member

parasharrajat commented May 13, 2024

Failed Test: Android: Message does not show up while offline in the chat.

Screenshot 2024-05-13 at 4 05 49 PM

@arosiclair
Copy link
Contributor Author

Failed Test: Android: Message does not show up while offline in the chat.

This is actually a known issue that will be fixed here: #40227

@parasharrajat
Copy link
Member

parasharrajat commented May 13, 2024

Screenshots

🔲 iOS / native

Screen.Recording.2024-05-14.at.1.19.57.AM.mov

🔲 iOS / Safari

Screen.Recording.2024-05-14.at.1.19.13.AM.mov

🔲 MacOS / Desktop

Screen.Recording.2024-05-14.at.1.26.57.AM.mov

🔲 MacOS / Chrome

Screen.Recording.2024-05-14.at.1.10.50.AM.mov

🔲 Android / Chrome

Screen.Recording.2024-05-14.at.1.15.13.AM.mov

🔲 Android / native

Screen.Recording.2024-05-14.at.1.17.16.AM.mov

Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

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

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.

🎀 👀 🎀 C+ reviewed

@melvin-bot melvin-bot bot requested a review from jasperhuangg May 13, 2024 19:59
Copy link

melvin-bot bot commented May 13, 2024

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

Copy link

melvin-bot bot commented May 13, 2024

🎯 @parasharrajat, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #42107.

@jasperhuangg
Copy link
Contributor

jasperhuangg commented May 13, 2024

Don't have much context here but looked at the code and everything makes sense to me. Gonna run an AdHoc build to test on my Android/iOS devices.

https://github.com/Expensify/App/actions/runs/9069271736

@parasharrajat
Copy link
Member

I didn't test iOS Notifications because I can't. I don't have necessary keys.

@arosiclair
Copy link
Contributor Author

@jasperhuangg ad-hoc builds don't work with push notifications!! Just mentioned that up here.

You just need to test iOS in dev on a physical device.

@jasperhuangg
Copy link
Contributor

@arosiclair Ah shoot, my mistake! thanks for pointing that out–in that case I don't want to block this on me, feel free to merge if you think everything checks out.

Copy link
Contributor

@arosiclair arosiclair merged commit 159d4cb into main May 13, 2024
16 checks passed
@arosiclair arosiclair deleted the arosiclair-money-request-push-notif branch May 13, 2024 21:48
@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/arosiclair in version: 1.4.74-0 🚀

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

@kavimuru
Copy link

kavimuru commented May 16, 2024

@arosiclair can we skip onyx updates logs verification? We can't test at our end.

Android background updates
Verify in logs that the app wakes and fetches missed onyx updates after a moment:

@arosiclair
Copy link
Contributor Author

@arosiclair can we skip onyx updates logs verification? We can't test at our end.

Yes you can skip that section

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.4.74-6 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 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