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

Fix: Expense - Not here page shows up briefly when deleting the expense #52740

Open
wants to merge 50 commits into
base: main
Choose a base branch
from

Conversation

wildan-m
Copy link
Contributor

Explanation of Change

This PR will not here page briefly appears when deleting the expense by navigating to target url then perform actual delete when the report details unmounted.

Fixed Issues

$ #45576
PROPOSAL: #45576 (comment)

Tests

  1. Open App
  2. Go to DM.
  3. Submit two expenses to the user.
  4. Open any of the transaction thread.
  5. Tap on the report header.
  6. Tap Delete expense..
  7. Delete the expense.
  8. Verify Not here page will not show up when deleting the expense.
  9. Verify [Deleted Expense] text not shown in report details page
  • Verify that no errors appear in the JS console

Offline tests

Same as test

QA Steps

Same as test

  • Verify that no errors appear in the JS console

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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb 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 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
  • 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 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 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 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 the Test steps.

Screenshots/Videos

Android: Native
Kapture.2024-11-19.at.12.55.58.mp4
Android: mWeb Chrome
Kapture.2024-11-19.at.12.53.50.mp4
iOS: Native
Kapture.2024-11-19.at.11.07.05.mp4
iOS: mWeb Safari
Kapture.2024-11-19.at.11.13.30.mp4
MacOS: Chrome / Safari
Kapture.2024-11-19.at.11.10.45.mp4
MacOS: Desktop
Kapture.2024-11-19.at.12.39.18.mp4

…t, to resolve not found page briefly appeared
@luacmartins luacmartins self-requested a review November 19, 2024 16:02
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

Left a few comments. TS is also failing

src/ONYXKEYS.ts Outdated Show resolved Hide resolved
Comment on lines +1745 to +1754
value: {
reportID: null,
stateNum: CONST.REPORT.STATE_NUM.APPROVED,
statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
participants: {
[userAccountID]: {
notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
},
},
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are we changing this? When the transaction is deleted we should delete the transaction thread, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@luacmartins We switched from using SET to MERGE to prevent the appearance of the not found page due to platforms updating the value too quickly. This change has already been made for leaveRoom and leaveGroupChat to address a similar issue #49468.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for clarifying. I think that makes sense, it just feels a bit odd to do that. Let's add a comment explaining why we're doing it so people don't try to revert this change

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Comment on lines +1794 to +1804
if (shouldDeleteTransactionThread && transactionThread) {
successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`,
value: Object.keys(transactionThread).reduce<Record<string, null>>((acc, key) => {
acc[key] = null;
return acc;
}, {}),
});
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@luacmartins Ensure that any remaining data is removed upon successful completion, even if the server sends a report removal response. This is done to prevent the removal update from lingering in the applyHTTPSOnyxUpdates function. #50846 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

Same here, let's add a comment about it. We should add a comment for all instances to make sure people don't revert this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved
Comment on lines +5740 to +5749
value: {
reportID: null,
stateNum: CONST.REPORT.STATE_NUM.APPROVED,
statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
participants: {
[userAccountID]: {
notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
},
},
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Comment on lines +5840 to +5850
if (shouldDeleteTransactionThread && transactionThread) {
successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`,
value: Object.keys(transactionThread).reduce<Record<string, null>>((acc, key) => {
acc[key] = null;
return acc;
}, {}),
});
}

Copy link
Contributor

Choose a reason for hiding this comment

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

and here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved
src/libs/actions/Task.ts Outdated Show resolved Hide resolved
src/pages/ReportDetailsPage.tsx Outdated Show resolved Hide resolved
src/pages/ReportDetailsPage.tsx Outdated Show resolved Hide resolved
luacmartins
luacmartins previously approved these changes Nov 22, 2024
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

LGTM. @alitoshmatov all yours

Comment on lines +1745 to +1754
value: {
reportID: null,
stateNum: CONST.REPORT.STATE_NUM.APPROVED,
statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
participants: {
[userAccountID]: {
notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
},
},
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for clarifying. I think that makes sense, it just feels a bit odd to do that. Let's add a comment explaining why we're doing it so people don't try to revert this change

Comment on lines +1794 to +1804
if (shouldDeleteTransactionThread && transactionThread) {
successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`,
value: Object.keys(transactionThread).reduce<Record<string, null>>((acc, key) => {
acc[key] = null;
return acc;
}, {}),
});
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Same here, let's add a comment about it. We should add a comment for all instances to make sure people don't revert this

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

Thanks for addressing the change requests. LGTM. @alitoshmatov all yours

@alitoshmatov
Copy link
Contributor

@wildan-m
When expense has a comment, navigation is behaving a little bit different. When you delete the expense:

  1. Modal is closing
  2. Existing expense page is shown
  3. Then Expense report is shown

I think this is too much, can't we just navigate to the final page instantly?

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-11-26.at.12.34.41.mp4
Screen.Recording.2024-11-26.at.12.32.48.PM.mov

@wildan-m
Copy link
Contributor Author

@alitoshmatov Thanks for your feedback I've got this loading error in dev and staging

Seems BE?
Unexpected error deleting this expense. Please try again later

Kapture.2024-11-26.at.14.51.26.mp4

I'll try to fix the issue after that BE issue resolved

@luacmartins
Copy link
Contributor

@wildan-m is that consistently reproducible? Do you have a requestID for a failing request?

@wildan-m
Copy link
Contributor Author

@luacmartins yes, it consistently reproduced, I think it's FE.

Asking if anyone else has experienced the same.
https://expensify.slack.com/archives/C01GTK53T8Q/p1732632553483729

@wildan-m
Copy link
Contributor Author

@alitoshmatov can you retest with this new merged main? I can't reproduce your mentioned issue I can only reproduce the loading issue which is also occurred in staging.

@wildan-m
Copy link
Contributor Author

wildan-m commented Nov 28, 2024

@wildan-m When expense has a comment, navigation is behaving a little bit different. When you delete the expense:

  1. Modal is closing
  2. Existing expense page is shown
  3. Then Expense report is shown

@alitoshmatov actually that behavior is current staging behavior, we can't see that clearly because it's deleting and navigation fast. If we throttle the CPU, we'll see it better

IIRC the expected behavior if there is a comment when deleting expense is -- it should navigate to the existing expense page, not the parent report. @luacmartins do you know if the expected behavior changes?

Kapture.2024-11-28.at.10.07.04.mp4

Should we fix that here?

edit:

I've found the offending PR, this PR cause the change of behavior

#45563

Also, I've noticed that isDeletedParentAction returned by DeleteMoneyRequest API is false, where it expected to be true

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants