-
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
fix: loading indicator display when deleting vague distance Expense #51940
base: main
Are you sure you want to change the base?
Conversation
@rayane-djouah 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] |
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.
Tests are failing, but I think this is unrelated to this PR. Could you please merge the main
branch?
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.
Please clarify the tests as follows:
1. Click on Global Create > 'Submit Expense'.
2. Select the 'Distance' option.
3. Disable the internet connection.
4. Enter a vague start location using random characters.
5. Enter a vague end location using random characters.
6. Complete the expense submission flow.
7. Enable the internet connection.
8. Open the distance expense report.
9. Click on the close icon of the displayed error message.
10. Verify that the app navigates back to the workspace IOU report without displaying any intermediate screens such as a loading screen or a "Hmm it's not here".
11. Verify that the vague distance expense is deleted.
For the "QA Steps", please write "Same as tests" as required here:
App/.github/PULL_REQUEST_TEMPLATE.md
Lines 55 to 57 in 8fc023f
It's acceptable to write "Same as tests" if the QA team is able to run the tests in the above "Tests" section. | |
---> | |
// TODO: These must be filled out, or the issue title must include "[No QA]." |
Screenshots/VideosAndroid: NativeScreen.Recording.2024-11-06.at.12.52.48.PM.movAndroid: mWeb ChromeScreen.Recording.2024-11-06.at.12.50.27.PM.moviOS: NativeSimulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-11-06.at.13.00.47.mp4iOS: mWeb SafariSimulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-11-06.at.12.54.34.mp4MacOS: Chrome / SafariScreen.Recording.2024-11-06.at.12.45.21.PM.movMacOS: DesktopScreen.Recording.2024-11-06.at.12.46.20.PM.mov |
@rayane-djouah I updated the PR based on your suggestion |
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 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 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
- 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 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 theTest
steps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
@rayane-djouah @flodnv After we click on "x" button, the report preview is displayed for a while before it is removed. Do we treat it as a regression: Screen.Recording.2024-11-04.at.14.26.42.mov |
InteractionManager.runAfterInteractions(() => { | ||
IOU.cleanUpMoneyRequest(transaction?.transactionID ?? linkedTransactionID, parentReportAction, true); | ||
}); |
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.
@rayane-djouah @flodnv After we click on "x" button, the report preview is displayed for a while before it is removed. Do we treat it as a regression
I believe it's not necessary to wait for all interactions to complete in this case. We can modify the behavior so that the report preview is removed immediately:
Screen.Recording.2024-11-09.at.8.48.54.PM.mov
InteractionManager.runAfterInteractions(() => { | |
IOU.cleanUpMoneyRequest(transaction?.transactionID ?? linkedTransactionID, parentReportAction, true); | |
}); | |
IOU.cleanUpMoneyRequest(transaction?.transactionID ?? linkedTransactionID, parentReportAction, true); |
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.
@rayane-djouah I applied your fix, so the original bug is still appeared:
Screen.Recording.2024-11-11.at.11.51.05.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.
@rayane-djouah In my opinion, in the proposed solution here, we prioritize navigation over updating Onyx data. As a result, there's a case where the user navigates successfully, but the Onyx data hasn't yet updated. This makes the behavior noted here an acceptable outcome. cc @flodnv
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'm a bit confused -- it seems like we should optimistically set the onyx data, which ensures that it's in an expected state before we navigate, no?
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.
it seems like we should optimistically set the onyx data, which ensures that it's in an expected state before we navigate, no?
@flodnv This decision depends on our priorities, as each approach has its trade-offs:
-
Optimistically setting Onyx data before navigating: While this ensures the data is in the expected state before navigating, it reintroduces the bug we're currently addressing.
-
Navigating without waiting for Onyx data to update (current PR's approach): This approach resolves the bug but introduces a potential behavioral issue.
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 tried a few solutions but there is no way to both:
- optimistically set the onyx data
- don't display the loading indicator.
Each approach has its own trade-offs, as outlined here. In other parts of the NewDot app, we sometimes use the first approach and other times the second.
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.
So if we want to follow the 1st approach, we just need to close this PR. What do you think @rayane-djouah
@flodnv?
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.
@truph01 I think a potential solution would involve:
- Cleaning up the transaction preview report action.
- Navigating back to the IOU report.
- Cleaning up the remaining money request data afterward.
This approach assumes that the root cause of the loading indicator bug is the transaction thread data being cleared before navigation.
Could you try implementing this approach?
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.
Thanks @rayane-djouah. I am trying your approach
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.
@truph01 Could you please share an update?
@rayane-djouah I updated PR to fix issue:
Screen.Recording.2024-12-03.at.10.44.33.mov
Screen.Recording.2024-12-03.at.10.45.56.mov |
if (isWeb) { | ||
Navigation.goBack(urlToNavigateBack); | ||
} | ||
InteractionManager.runAfterInteractions(() => { | ||
if (!isWeb) { | ||
Navigation.goBack(urlToNavigateBack); | ||
} |
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.
@truph01 Is there any specific reason for handling web differently?
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.
During testing, I noticed differences in processing speed in Onyx and navigation between web versus native platforms. Therefore, I need to account for the specific platform in this case.
src/libs/actions/IOU.ts
Outdated
* @return the url to navigate back once the money request is deleted | ||
*/ | ||
function cleanUpMoneyRequest(transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) { | ||
function cleanUpMoneyRequest(transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false, onlyCleanupActions = false) { |
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.
Instead of calling cleanUpMoneyRequest
twice with onlyCleanupActions
toggled between true
and false
, it would be more efficient to manage the Onyx updates within a single invocation of cleanUpMoneyRequest
. The method should first prepare and apply updates relevant to report actions using Onyx.update(onyxReportActionsUpdates)
. After navigating back with Navigation.goBack(urlToNavigateBack);
, it should then prepare and apply the remaining updates with Onyx.update(onyxRemainingUpdates)
. This change eliminates the need for cleanUpMoneyRequest
to return urlToNavigateBack
, as navigation can be handled directly after the initial Onyx update, simplifying the flow and enhancing readability. A comment should be added within the code to clarify the sequence of operations.
@rayane-djouah I applied your suggestion. Here is result: Screen.Recording.2024-12-06.at.09.56.07.movScreen.Recording.2024-12-06.at.09.49.43.mov |
@rayane-djouah I updated PR |
Screenshots/VideosAndroid: NativeScreen.Recording.2024-12-10.at.12.20.06.PM.movAndroid: mWeb ChromeScreen.Recording.2024-12-10.at.12.15.20.PM.moviOS: NativeSimulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-12-10.at.12.16.59.mp4iOS: mWeb SafariSimulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-12-10.at.12.11.55.mp4MacOS: Chrome / SafariScreen.Recording.2024-12-10.at.12.06.18.PM.movMacOS: DesktopScreen.Recording.2024-12-10.at.12.08.00.PM.mov |
@flodnv all yours! |
Explanation of Change
Fixed Issues
$ #50022
PROPOSAL: #50022 (comment)
Tests
Offline tests
QA Steps
Same as tests
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)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-11-04.at.14.26.42.mov
Android: mWeb Chrome
Screen.Recording.2024-11-04.at.14.32.46.mov
iOS: Native
Screen.Recording.2024-11-04.at.14.22.59.mov
iOS: mWeb Safari
Screen.Recording.2024-11-04.at.14.11.48.mov
MacOS: Chrome / Safari
Screen.Recording.2024-11-04.at.14.16.47.mov
MacOS: Desktop
Screen.Recording.2024-11-04.at.14.24.02.mov