-
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
Update use of allPolicies variable and push notification subscription to fix inconsistency in deep link routing #14588
Conversation
@ctkochan22 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 please make sure to link the issue correctly when the PR is marked as raedy for a reivew, so the correct people are assigned for a review @ctkochan22 assigning myself for a review since I helped as CME on that linked issue. |
@mountiny sorry for the inconvenience, I'll note that for next time |
@tienifr can you also update the PR title so that it explains what is being changed/fixed? Its hard to keep track now, but clear titles will be helpful in the future when debugging changes and git blames in the future |
@tienifr aand also some short details section explaining you changes in plain English is also great if someone comes to this PR some time in future 🙌 Thanks! |
@mountiny @ctkochan22 PR title and details are updated! |
src/libs/actions/Welcome.js
Outdated
Onyx.connect({ | ||
key: ONYXKEYS.COLLECTION.POLICY, | ||
callback: (val, key) => { | ||
if (!val || !key) { | ||
return; | ||
} | ||
|
||
allPolicies[key] = {...allPolicies[key], ...val}; | ||
Policy.allPolicies[key] = {...Policy.allPolicies[key], ...val}; |
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.
@tienifr FYI, I prefer the delete all policies solution over reusing from Policy.js
it feels less coupled. can we implement that instead?
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.
@rushatgabhane I'm sorrry, but did you mean that you prefer Solution 1 for the 2) Magic sign in Failure issue
, in which I added the clearing logic for the variable? You said in the issue comment that you prefer the delete allPolicies
solution, which I believe was more similar to Solution 2
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.
@rushatgabhane New commit with Solution 1 for the Magic sign in Failure issue
has been uploaded
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.
@tienifr sorry for the ambiguity. Yes, I meant the solution # 1
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.
@rushatgabhane I have updated a new commit, and posted a comment to explain your concert below
I'm sorry, I'm lost here. Is there an issue for this? |
@rushatgabhane Both this and adding Sorry for not being clear. |
src/libs/actions/Policy.js
Outdated
@@ -1027,4 +1027,5 @@ export { | |||
openWorkspaceMembersPage, | |||
openWorkspaceInvitePage, | |||
removeWorkspace, | |||
allPolicies, |
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.
@tienifr this export can be removed, right?
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.
@rushatgabhane Yes indeed, that's a nice catch. I have updated it in the latest commit.
f2a52fc
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 / 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 notonIconClick
). - 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
- 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(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 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 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. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
Screenshots/Videos
Web
Screen.Recording.2023-01-30.at.5.20.39.PM.mov
Mobile Web - Chrome
WhatsApp.Video.2023-01-30.at.23.14.34.mp4
Mobile Web - Safari
Screen.Recording.2023-01-30.at.11.09.04.PM.mov
Desktop
Screen.Recording.2023-01-30.at.11.06.34.PM.mov
iOS
Screen.Recording.2023-01-30.at.11.03.47.PM.mov
Android
WhatsApp.Video.2023-01-30.at.22.49.28.mp4
Hey |
@rushatgabhane Example with Android: In https://github.com/Expensify/App/blob/main/android/app/src/debug/assets/airshipconfig.properties - appKey = uulSSfTDQJ2r0PMpjRrhmQ
- appSecret = D4Bhf0HrQEehrPua74Tyiw
+ appKey = 55vypj0ARc6cN09MX7ogtQ
+ appSecret = EsSaqbdLSvmyC6kSBFJCtQ
inProduction = false
developmentLogLevel = VERBOSE
# Notification Customization
notificationIcon = ic_notification
notificationAccentColor = #2EAAE2 Same thing goes for IOS with this file: https://github.com/Expensify/App/blob/main/ios/AirshipConfig.plist |
Removing my review request here since Jules is back |
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.
@Julesssss LGTM!
@tienifr Thanks for the speedy help on getting the notification sorted ⚡
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.
👍 all yours @Julesssss
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
Performance Comparison Report 📊Significant Changes To DurationThere are no entries Meaningless Changes To DurationShow entries
Show details
|
There's a new warning showing on iOS against these changes. I don't think this is a regression, but it would be great to clear this up: |
actually, I’ll just fix this quickly |
thanks @Julesssss, please tag me for a review since i missed it |
🚀 Deployed to staging by https://github.com/Julesssss in version: 1.2.63-0 🚀
|
🚀 Deployed to production by https://github.com/thienlnam in version: 1.2.63-0 🚀
|
Details
allPolicies
variable inApp/src/libs/actions/Welcome.js
Lines 68 to 78 in df90010
and reuse the same variable in
App/src/libs/actions/Policy.js
Line 18 in 21486cd
Navigation.isDrawerReady()
before navigating inApp/src/libs/actions/Report.js
Lines 72 to 82 in a59825c
register()
function like in https://github.com/Expensify/App/pull/14588/files#diff-24c7a3c4dd0b7b7cb20e0e8cb485e27259b55286e6395fc6ae92727c7bb8741fThis function is then called each time the user try to login to the app, but the logic will only be triggered for new user logging in the app only (logged in users are not affected)
Fixed Issues
$ #13691
#13691 (comment)
#13691 (comment)
Tests
4.1. Keep the app in background
4.2. Kill the app in background
9.1. Keep the app in background
9.2. Kill the app in background
Offline tests
4.1. Keep the app in background
4.2. Kill the app in background
12.1. Keep the app in background
12.2. Kill the app in background
QA Steps
4.1. Keep the app in background
4.2. Kill the app in background
9.1. Keep the app in background
9.2. Kill the app in background
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
files and using the translation methodWaiting for Copy
label for a copy review on the original GH to get the correct copy.STYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)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
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)ScrollView
component to make it scrollable when more elements are added to the page.Screenshots/Videos
Web
web.mp4
Mobile Web - Chrome
az_recorder_20230127_203510.mp4
Mobile Web - Safari
Screen.Recording.2023-01-27.at.00.21.16.mp4
Desktop
Screen.Recording.2023-01-27.at.12.15.12.mp4
iOS
Screen.Recording.2023-01-26.at.21.46.23.mov
Android
android_native_compressed.mp4