Skip to content

Add unreportedExpense to report page #60352

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

sumo-slonik
Copy link
Contributor

@sumo-slonik sumo-slonik commented Apr 16, 2025

Explanation of Change

Added the ability to move unreported expenses to existing reports according to the design doc. For now, the view is only accessible via a direct link, as header buttons are not yet available on main. Recordings are from internal web environments only.

Fixed Issues

$ #57655
PROPOSAL:

Tests

  1. Create an expense for yourself
    Manually create a new expense entry where you are both the payer and the receiver.

  2. Create a report
    Generate a new report to ensure existing expenses are reported and separated from unreported ones.

  3. Use a direct link to access the unreported expenses tab
    Append /add-unreported-expense to the report URL to directly navigate to the "Unreported Expenses" tab, even if there’s no header button yet.

  4. Visit the link again and validate the behavior

  • Open the same link again.

  • Check if an empty state is shown for unreported expenses.

  • Verify that the "Add Expense" button works correctly from this view.

  • Verify that no errors appear in the JS console

Offline tests

Unnesesary

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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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
Android: mWeb Chrome
Screen.Recording.2025-04-23.at.11.37.36.2.mov
iOS: Native
iOS: mWeb Safari
Screen.Recording.2025-04-23.at.11.42.29.mov
MacOS: Chrome / Safari
desktop.mov
MacOS: Desktop

Comment on lines 32 to 37
const animatedHighlightStyle = useAnimatedHighlightStyle({
borderRadius: variables.componentBorderRadius,
shouldHighlight: item?.shouldAnimateInHighlight ?? false,
highlightColor: theme.messageHighlightBG,
backgroundColor: theme.highlightBG,
});
Copy link
Contributor

Choose a reason for hiding this comment

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

This hook is used for highlighting items that pop up on Search page, while the user is focused on it. Since we don't suppport highlighting new items on AddUnreportedExpense page(i hope :D), I think we can just remove this hook from here.

Suggested change
const animatedHighlightStyle = useAnimatedHighlightStyle({
borderRadius: variables.componentBorderRadius,
shouldHighlight: item?.shouldAnimateInHighlight ?? false,
highlightColor: theme.messageHighlightBG,
backgroundColor: theme.highlightBG,
});

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is used as the style of the currently selected components by an external checkbox.

…age_final_branch

# Conflicts:
#	src/components/MoneyRequestReportView/MoneyRequestReportView.tsx
#	src/styles/index.ts
@mountiny mountiny self-requested a review April 22, 2025 17:02
@sumo-slonik sumo-slonik force-pushed the feature/kuba-nowakowski/unreported_expense_page_final_branch branch from 99d23ff to f77f2a8 Compare April 23, 2025 11:44
@sumo-slonik
Copy link
Contributor Author

I'm still wrestling 🤼 with TypeScript here, but the code is probably ready for review.
On the backend side @mountiny , I think we could consider removing concierge messages from self-DMs after expenses are moved to reports.
Also, I’d like to suggest that when we move an expense, we could return the next steps for the report header as well.

@sumo-slonik sumo-slonik marked this pull request as ready for review April 23, 2025 12:03
@sumo-slonik sumo-slonik requested review from a team as code owners April 23, 2025 12:03
@melvin-bot melvin-bot bot removed the request for review from a team April 23, 2025 12:03
Copy link

melvin-bot bot commented Apr 23, 2025

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

@mountiny
Copy link
Contributor

I think we could consider removing concierge messages from self-DMs after expenses are moved to reports.

Can you post about this in a new thread in migrate please? I am not sure I exactly follow what you mean

@sumo-slonik
Copy link
Contributor Author

I think we could consider removing concierge messages from self-DMs after expenses are moved to reports.

Can you post about this in a new thread in migrate please? I am not sure I exactly follow what you mean

I'll record a video then, to provide better context.

…age_final_branch

# Conflicts:
#	src/components/MoneyRequestReportView/MoneyRequestReportView.tsx
#	src/pages/home/report/ReportActionItemContentCreated.tsx
@sumo-slonik
Copy link
Contributor Author

All check errors seem to be fixed, I think we can start the review.

…age_final_branch

# Conflicts:
#	src/SCREENS.ts
#	src/components/TransactionItemRow/index.tsx
#	src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
#	src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
#	src/libs/Navigation/types.ts
#	src/stories/TransactionItemRow.stories.tsx
@sumo-slonik sumo-slonik force-pushed the feature/kuba-nowakowski/unreported_expense_page_final_branch branch from 30fd8d0 to ed2ead3 Compare May 8, 2025 08:35
@sumo-slonik
Copy link
Contributor Author

@shawnborton This is what it looks like when we have a lot of transactions:
image

@shawnborton
Copy link
Contributor

Okay cool, and can you show that same screenshot but with no error? Just want to make sure we don't use any kind of padding or gap on top of the button when it's fixed to the bottom like that and we have a scrolling list behind it.

@sumo-slonik
Copy link
Contributor Author

image image

@shawnborton
Copy link
Contributor

Nice, looks good to me 👍

@dannymcclain
Copy link
Contributor

dannymcclain commented May 8, 2025

Why is there more padding on the bottom of these than on the top?

CleanShot 2025-05-08 at 10 24 52@2x

…age_final_branch

# Conflicts:
#	src/components/SelectionList/types.ts
#	src/styles/utils/spacing.ts
@shawnborton
Copy link
Contributor

Why is there more padding on the bottom of these than on the top?

Good shout! I think @Kicu is fixing that in a different PR, right?

@sumo-slonik
Copy link
Contributor Author

It seems to me that it's done here:
#61677

@sumo-slonik
Copy link
Contributor Author

There are some issues after adding the main, I'm already working on the fixes.

@sumo-slonik
Copy link
Contributor Author

If there’s nothing else here, I think this can be merged.

@sumo-slonik
Copy link
Contributor Author

sumo-slonik commented May 8, 2025

@sumo-slonik , lets fix the conflicts, I will post the checklist tomorrow morning

@allgandalf Would you have a chance to take a look at it today?

@allgandalf
Copy link
Contributor

Working on it right now

@melvin-bot melvin-bot bot requested a review from mountiny May 8, 2025 18:09
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

@luacmartins luacmartins merged commit b74a840 into Expensify:main May 8, 2025
18 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented May 8, 2025

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@vincdargento
Copy link

@sumo-slonik This PR is failing because of issue #62057
The issue is reproducible in: Web, mWeb

bug.mp4

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.

10 participants