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

Style notifications using onyxData, increase payload bandwidth #15857

Merged
merged 16 commits into from
Mar 22, 2023

Conversation

Julesssss
Copy link
Contributor

@Julesssss Julesssss commented Mar 10, 2023

Details

The notification payload size limit is 4kb and going over this causes the notification to be dropped by FCM. To resolve multiple issues we need to reduce the amount of payload data that is being sent unnecessarily. This PR prepares for this by switching the notification data source from reportComment to the onyxData, allowing us to remove lots of duplicate fields once this PR has been deployed to users.

Fixed Issues

$ #14849
$ https://github.com/Expensify/Expensify/issues/269103
$ https://github.com/Expensify/Expensify/issues/260142
$ #15423
[UNBLOCKS] #14715
[UNBLOCKS] https://github.com/Expensify/Expensify/issues/265452

Tests

Screenshots for each of these tests are at the bottom of this description.

Setup steps

  • Use this StackOverflow guide to build a debuggable Android release build
    • step 1 is optional
    • step 2 is NOT optional!
  • Start your dev environment and NGROK
  • Open the app and accept the 'Allow notifications' prompt if using a newish OS version
  • Sign into the Android app using one of your dev users
  • Feel free to DM me for help!

1) Verify that messages longer than 115 chars are no longer being truncated

  • From a separate client, send this message to the Android user:
    • this is a very very very very very very very very very very very very very very very very very very very very very very long message that wasn't previously possible! 😮😮😮😮😮😮😮😮
  • The full message should be displayed
  • The message should not contain a " symbol at the end

2) Verify that messages and 1:1 IOU requests are displayed correctly

  • From a separate client, send any message to the Android user
  • From a separate client, send an IOU request to the Android user for any amount
  • Both messages should be displayed correctly (ignoring the currency symbol issue)
  • Both messages should be part of the same thread/notification (this only applies to newer Android versions)
  • See the screenshot below for an example

3) Verify that bill split messages are displayed correctly

  • From a separate client, create a new group that includes the Android user
  • Send any message to the group
  • It should be received by the android user
  • Create a bill split between the group
  • It should be received by the android user and formatted correctly (ignoring the currency symbol issue)
  • These will not be threaded, as they are from two separate reports

Offline tests

N/A -- notifications cannot be received while the device is offline

QA Steps

Run the above tests, ignoring the setup steps

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 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 correct English and 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
    • 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 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

Notes:

  • ONLY ANDROID NATIVE CODE IS MODIFIED
  • CURRENCY SYMBOLS NOT RENDERING IS A SEPARATE PRE-EXISTING ISSUE

1) Verify that messages longer than 115 chars are no longer being truncated

Android 8 Android 13
long-android-8 long-android-13

2) Verify that messages and 1:1 IOU requests are displayed correctly

Android 8 Android 13
other-android-8 other-android-13

3) Verify that bill split messages are displayed correctly

Android 8 Android 13
noti-android-8 noti-android-13

@Julesssss Julesssss self-assigned this Mar 10, 2023
@Julesssss Julesssss marked this pull request as ready for review March 16, 2023 18:33
@Julesssss Julesssss requested a review from a team as a code owner March 16, 2023 18:33
@melvin-bot melvin-bot bot requested review from jasperhuangg and parasharrajat and removed request for a team March 16, 2023 18:34
@MelvinBot
Copy link

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

@Julesssss
Copy link
Contributor Author

@jasperhuangg @parasharrajat @arosiclair @cristipaval

Ready for testing now. I used physical devices, but I think these steps should work fine on an emulator. DM me if you want me to save you all the setup steps and I'll send you a signed release apk file you can install to any emulator or physical device!

@Julesssss
Copy link
Contributor Author

Julesssss commented Mar 16, 2023

I just realized @parasharrajat won't be able to complete the dev env tests. I'm pretty sure you can simply create a release build from this branch and just test against staging though 👍

@Julesssss
Copy link
Contributor Author

@jasperhuangg I'm preemptively sending you the signed apk file as I'm heading out now. Same you you @cristipaval @arosiclair, but no pressure to review if you're too busy

@jasperhuangg
Copy link
Contributor

jasperhuangg commented Mar 17, 2023

@parasharrajat I'll remove you for review from this, I'll handle screenshots

@jasperhuangg jasperhuangg removed the request for review from parasharrajat March 17, 2023 17:56
@jasperhuangg
Copy link
Contributor

jasperhuangg commented Mar 17, 2023

@Julesssss

All the test cases seem to work as expected for me except for test case 3.

It seems the split bill notification appears in the same thread for me as the message that I sent into that same group. Could I be missing something?

Screenshot 2023-03-17 at 2 52 55 PM

if (message.containsKey(PAYLOAD_KEY)) {
try {
JsonMap payload = JsonValue.parseString(message.getExtra(PAYLOAD_KEY)).optMap();

// Apply message style only for report comments
if (REPORT_COMMENT_TYPE.equals(payload.get(TYPE_KEY).getString())) {
// Apply message style when onyxData is present
Copy link
Contributor

Choose a reason for hiding this comment

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

to clarify, this has to be Onyx data that we receive from Pusher? Urban Airship? just curious

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For Android/iOS we receive the onyxData update from both Pusher (only when the app is open) and Airship (we get the push notification regardless of whether the app is alive/killed).

So in this code we only care that the notification data includes onyxData. I'll update the comment to make this a bit clearer.

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 updated this and another comment, hope that clarifies things a bit!

cristipaval
cristipaval previously approved these changes Mar 20, 2023
@Julesssss Julesssss dismissed stale reviews from cristipaval and arosiclair via 577ceab March 20, 2023 12:35
@Julesssss
Copy link
Contributor Author

Julesssss commented Mar 20, 2023

All the test cases seem to work as expected for me except for test case 3.

It seems the split bill notification appears in the same thread for me as the message that I sent into that same group. Could I be missing something?

Hey @jasperhuangg thanks for thorough testing. I should have explained better, but that is expected because you sent that message from the group chat. This is the logic for showing in multiple threads:

DM

  • All my 1:1 dm messages with you should be in a single notification thread
  • If I request money from you, that should show in the same thread

Group chat

  • Messaged in a group chat between me you and Gandalf will show in a separate notification thread
  • Group split notifications will show in the same group chat thread

There are some existing bugs which break the thread logic, but based on what you said I think this is totally expected 👍

@Julesssss
Copy link
Contributor Author

@jasperhuangg please take another look, I think we're good here now. What you saw was expected.

@jasperhuangg
Copy link
Contributor

@Julesssss Thanks for your patience was OOO, grabbing screenshots now and will merge when done!

@jasperhuangg
Copy link
Contributor

@Julesssss

Ahh sorry, I can't seem to get any notifications on my android emulator and I can't figure out why, can someone else help with screenshots?

cc @arosiclair @cristipaval

@Julesssss
Copy link
Contributor Author

@jasperhuangg I'd ask for help from someone with a physical deice, or to use browser stack (though I haven't tested notifications using that service). It's much easier using a compiled build on a physical device.

@jasperhuangg
Copy link
Contributor

Tried a number of things and still am not getting any notifications on my Android emulator

@cristipaval @arosiclair Reached out on NewDot DMs for help with this, let's get this merged!

@arosiclair
Copy link
Contributor

arosiclair commented Mar 22, 2023

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 / Chrome
    • iOS / native
    • iOS / 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 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 correct English and 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 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 reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

N/A

Mobile Web - Chrome

N/A

Mobile Web - Safari

N/A

Desktop

N/A

iOS

N/A

Android

Screenshot_20230322-112726

Copy link
Contributor

@arosiclair arosiclair left a comment

Choose a reason for hiding this comment

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

Tests well for me 👍🏽

@Julesssss
Copy link
Contributor Author

Thanks, I'm going to merge as we've had two successful tests now.

@jasperhuangg do you remember if you switched the airship keys? That might be the missing step.

@Julesssss Julesssss merged commit 75798f5 into main Mar 22, 2023
@Julesssss Julesssss deleted the jules-styleNotificationWithOnyxData branch March 22, 2023 16:40
@Julesssss Julesssss added the InternalQA This pull request required internal QA label Mar 22, 2023
@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.

@jasperhuangg
Copy link
Contributor

@Julesssss

do you remember if you switched the airship keys? That might be the missing step.

I'm pretty sure I did, I took everything you removed from this commit and added it back locally: 3d816d3

@Julesssss
Copy link
Contributor Author

Ah cool, next time we can try debugging together 👍

@Julesssss
Copy link
Contributor Author

Verified on staging ✅

Screenshot_20230324-184559
Screenshot_20230324-184628
Screenshot_20230324-184452

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.2.89-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.2.89-0 🚀

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
Labels
InternalQA This pull request required internal QA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants