-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Show not found for invalid report or transaction in review duplicates confirmation page #45965
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
Conversation
…cate confirmation page
@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] |
} | ||
|
||
// eslint-disable-next-line rulesdir/no-negated-variables | ||
const shouldShowNotFoundPage = isEmptyObject(report) || ReportUtils.isReportNotFound(report) || (!isExiting && status === 'loaded' && !transaction?.transactionID); |
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.
When reportID
is invalid, report
can either be undefined
or have errorFields.notFound
(on large screens only since the underneath ReportScreen
would fetch report data by OpenReport
).
REVIEW_DUPLICATES
entry takes a long time to load, we need to wait for it by status
.
When we close the confirmation page RHP, it would be reset due to:
abandonReviewDuplicateTransactions(); |
so not found page would briefly show when the RHP is closing. isExiting
check was added for that.
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 see. Is there a better way to manage the abandonReviewDuplicateTransactions();
without mixing navigation logic on this component? Maybe we delegate this function call when navigation is completed. For example, using transitionEnd
event instead of blur
if that go hand-in-hand replacement for that.
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.
@parasharrajat As you've reviewed the duplicate confirmation PR, could you let me know what these lines are for?
if ( | |
// @ts-expect-error There is something wrong with a types here and it's don't see the params list | |
navigation.getState().routes.find((routes) => routes.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR)?.params?.screen === | |
SCREENS.RIGHT_MODAL.TRANSACTION_DUPLICATE || | |
route.params?.screen !== SCREENS.RIGHT_MODAL.TRANSACTION_DUPLICATE | |
) { | |
return; | |
} |
In other words, when exactly should abandonReviewDuplicateTransactions
be called?
I just want to confirm if transitionEnd
could replace blur
.
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 tells that If user is leaving from TRANSACTION_DUPLICATE
Modal Stack from RHN view.
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.
@parasharrajat transitionEnd
does not fire when closing the RHP. Last resort may be setTimeout
?
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.
Even if transitionEnd
worked, the page would unmount then so we couldn't find it in navigation state.
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.
OK. I am fine with the approach for now.
}, [navigation]); | ||
|
||
if (status === 'loading') { | ||
return <FullScreenLoadingIndicator />; |
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.
Due to the isExiting
check as explained above, we should show a loading indicator when the data is loading, otherwise we would have empty data shows briefly.
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.
@gijoe0295 There is a comment above.
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.
Looks good but there are conflicts
@gijoe0295 There are some conflicts to resolve and I have a comment #45965 (comment). |
Yeah I knew that. Been investigating since ytd. |
Updated. |
@gijoe0295 This PR is not solving #45835 properly. It takes some time before the not found page is shown. 01.08.2024_23.50.37_REC.mp4 |
@parasharrajat Solved it. |
// eslint-disable-next-line rulesdir/no-negated-variables | ||
const shouldShowNotFoundPage = | ||
isEmptyObject(report) || | ||
!ReportUtils.isValidReport(report) || |
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.
When report
has been loaded from Onyx but was still loading from the BE, it's prefilled with reportName
without reportID
.
@parasharrajat I updated. Detailed test steps for this case are:
It should not show not found page. |
Now, There is another issue where the confirm page data is shown for a moment while closing. Steps:
13.08.2024_20.05.39_REC.mp4 |
Thanks, taking a look now. |
Please run the test cases from both issues and a couple of edge scenarios before requesting next review. |
@gijoe0295 when can we expect this to be ready for another round of reviews, taking in @parasharrajat's comment above? |
…isExitingPage check
@parasharrajat The minimal reproducible steps for your issue are:
Expected behavior: Keep showing not found page ✅ Reason is due to the So root cause leads back to the My proposed solution is to forcefully delay that function call by |
I found another issue that paid expenses are included in review duplicates and if we chose to keep it, we would have not found page: ![]() However, paid expenses should not be there and would be handled in #46372. So NAB. |
Paid expenses will show on this page. That is expected. But we are changing the resolution behavior around them. Anyways, that is a separate issue. Does that affect your changes on this PR? |
Why can't we depend on the |
Yes it does. The current behavior on
Based on #46372 (comment), are we going to hide |
const shouldShowNotFoundPage = !isExtingPage && ... |
Ok so we used |
@parasharrajat That's correct. But one problem is that |
Screenshots🔲 iOS / native15.08.2024_20.48.25_REC.mp4🔲 iOS / Safari15.08.2024_20.51.04_REC.mp4🔲 MacOS / Desktop15.08.2024_20.41.26_REC.mp4🔲 MacOS / Chrome15.08.2024_20.38.13_REC.mp4🔲 Android / Chrome15.08.2024_21.00.31_REC.mp4🔲 Android / native15.08.2024_20.58.40_REC.mp4 |
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
@gijoe0295 Good job on the PR. Thanks for your patience. |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by https://github.com/stitesExpensify in version: 9.0.22-0 🚀
|
🚀 Deployed to staging by https://github.com/stitesExpensify in version: 9.0.22-1 🚀
|
🚀 Deployed to production by https://github.com/chiragsalian in version: 9.0.22-9 🚀
|
Details
Fixed Issues
$ #46179
$ #45835
PROPOSAL: #45835 (comment)
Tests
For Web & mWeb:
Offline tests
NA
QA Steps
See 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
Screen.Recording.2024-07-25.at.07.28.40-source.mov
Android: mWeb Chrome
Screen.Recording.2024-07-25.at.07.27.27-source.mov
iOS: Native
iOS: mWeb Safari
Untitled.mov
Screen.Recording.2024-07-25.at.07.31.59-source.mov
MacOS: Chrome / Safari
Screen.Recording.2024-07-25.at.07.08.14-source.mov
MacOS: Desktop