-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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
Conversation
fixes push notifications not being shown when their payload was stripped
* 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(); |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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:
App/src/libs/Notification/PushNotification/subscribePushNotification/index.ts
Lines 111 to 135 in 5642411
/** | |
* 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?
There was a problem hiding this comment.
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:
Was not able to build Android, but iOS is looking good. This is ready for review. |
@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] |
Testing... |
@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(); |
There was a problem hiding this comment.
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.
src/libs/Notification/PushNotification/subscribePushNotification/index.ts
Show resolved
Hide resolved
src/libs/Notification/PushNotification/subscribePushNotification/index.ts
Show resolved
Hide resolved
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> { |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
PushNotification.onReceived(PushNotification.TYPE.MONEY_REQUEST, applyOnyxData); | ||
PushNotification.onSelected(PushNotification.TYPE.MONEY_REQUEST, navigateToReport); |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
.
There was a problem hiding this 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
This is actually a known issue that will be fixed here: #40227 |
Screenshots🔲 iOS / nativeScreen.Recording.2024-05-14.at.1.19.57.AM.mov🔲 iOS / SafariScreen.Recording.2024-05-14.at.1.19.13.AM.mov🔲 MacOS / DesktopScreen.Recording.2024-05-14.at.1.26.57.AM.mov🔲 MacOS / ChromeScreen.Recording.2024-05-14.at.1.10.50.AM.mov🔲 Android / ChromeScreen.Recording.2024-05-14.at.1.15.13.AM.mov🔲 Android / nativeScreen.Recording.2024-05-14.at.1.17.16.AM.mov |
There was a problem hiding this 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 verified the steps for local testing are in the
- 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 notonIconClick
). - 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
- 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.
- 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 usingAvatar
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. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor) - Any internal methods bound to
this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
) - 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 thatAvatar
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 theTest
steps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
@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] |
🎯 @parasharrajat, thanks for reviewing and testing this PR! 🎉 An E/App issue has been created to issue payment here: #42107. |
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 |
I didn't test iOS Notifications because I can't. I don't have necessary keys. |
@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. |
@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. |
🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪 |
🚀 Deployed to staging by https://github.com/arosiclair in version: 1.4.74-0 🚀
|
@arosiclair can we skip onyx updates logs verification? We can't test at our end.
|
Yes you can skip that section |
🚀 Deployed to production by https://github.com/chiragsalian in version: 1.4.74-6 🚀
|
Details
Adds support for new
moneyRequest
push notifications. Re-uses logic fromsubscribeToReportCommentPushNotifications
to be common between them.Fixed Issues
$ https://github.com/Expensify/Expensify/issues/381189
Tests
Note
Android background updates
Offline tests
None
QA Steps
Same as Tests
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop