Skip to content

fix: Add the "Add expense" button to two areas of the product.#71267

Merged
JS00001 merged 26 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue/69198-2
Oct 22, 2025
Merged

fix: Add the "Add expense" button to two areas of the product.#71267
JS00001 merged 26 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue/69198-2

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Sep 25, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #68772
PROPOSAL: #68772 (comment)

Tests

  • Test 1
  • Should have a report with some transactions and one with no transactions
  1. Open a report with some transactions
  2. Verify "Add expense" button is shown after the transaction list ends
  3. Add some transactions using the options in "Add expense" button dropdown
  4. Verify transaction is created and app navigates back correctly
  • Test 2
  1. Submit two expenses to any user.
  2. Open the expense report.
  3. Mention another user and send it.
  4. Click Invite to chat only.
  5. Open the expense report as the invited member.
  6. Verify add expense button is not shown for the invited member and the "Total" row is aligned to right
  • Test 3
  1. Go to workspace chat
  2. Go offline
  3. Create two expenses in workspace chat
  4. Open the expense report
  5. Verify the add expense button after transaction is is also greyed out
  • Test 4
  1. Go to workspace settings
  2. Tap more features & Enable per diem and upload per diem file
  3. Create a manual expense
  4. Create a per diem expense with large qty with maximum digits allowed to enter
  5. Tap add expense - Unreported expense
  6. Select a expense
  7. Tap add to report
  8. Verify out of pocket, company spend and Total row is shown correctly without being cut out.
  • Verify that no errors appear in the JS console

Offline tests

  • Test 3
  1. Go to workspace chat
  2. Go offline
  3. Create two expenses in workspace chat
  4. Open the expense report
  5. Verify the add expense button after transaction is is also greyed out

QA Steps

  • Test 1
  • Should have a report with some transactions and one with no transactions
  1. Open a report with some transactions
  2. Verify "Add expense" button is shown after the transaction list ends
  3. Add some transactions using the options in "Add expense" button dropdown
  4. Verify transaction is created and app navigates back correctly
  • Test 2
  1. Submit two expenses to any user.
  2. Open the expense report.
  3. Mention another user and send it.
  4. Click Invite to chat only.
  5. Open the expense report as the invited member.
  6. Verify add expense button is not shown for the invited member and the "Total" row is aligned to right
  • Test 3
  1. Go to workspace chat
  2. Go offline
  3. Create two expenses in workspace chat
  4. Open the expense report
  5. Verify the add expense button after transaction is is also greyed out
  • Test 4
  1. Go to workspace settings
  2. Tap more features & Enable per diem and upload per diem file
  3. Create a manual expense
  4. Create a per diem expense with large qty with maximum digits allowed to enter
  5. Tap add expense - Unreported expense
  6. Select a expense
  7. Tap add to report
  8. Verify out of pocket, company spend and Total row is shown correctly without being cut out.
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.1.mp4
MacOS: Desktop
desktop_app.1.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@codecov

codecov Bot commented Sep 25, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 7.31707% with 38 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
src/libs/ReportUtils.ts 9.52% 19 Missing ⚠️
...stReportView/MoneyRequestReportTransactionList.tsx 0.00% 15 Missing ⚠️
src/components/MoneyReportHeader.tsx 0.00% 2 Missing ⚠️
...RequestReportView/MoneyRequestReportTotalSpend.tsx 0.00% 2 Missing ⚠️
Files with missing lines Coverage Δ
...equestReportView/MoneyRequestReportActionsList.tsx 1.49% <ø> (+<0.01%) ⬆️
...ReportPreview/MoneyRequestReportPreviewContent.tsx 63.13% <100.00%> (+4.09%) ⬆️
src/components/MoneyReportHeader.tsx 0.19% <0.00%> (+<0.01%) ⬆️
...RequestReportView/MoneyRequestReportTotalSpend.tsx 20.00% <0.00%> (ø)
...stReportView/MoneyRequestReportTransactionList.tsx 2.46% <0.00%> (-0.18%) ⬇️
src/libs/ReportUtils.ts 74.19% <9.52%> (-0.28%) ⬇️

... and 4 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323 Krishna2323 force-pushed the krishna2323/issue/69198-2 branch 3 times, most recently from d677484 to 2a39dbe Compare September 27, 2025 21:02
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323 Krishna2323 marked this pull request as ready for review October 2, 2025 11:03
@Krishna2323 Krishna2323 requested review from a team as code owners October 2, 2025 11:03
@melvin-bot melvin-bot Bot requested review from brunovjk and removed request for a team October 2, 2025 11:03
@melvin-bot

melvin-bot Bot commented Oct 2, 2025

Copy link
Copy Markdown

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

@Krishna2323

Copy link
Copy Markdown
Contributor Author

@JS00001 should we allow adding expenses from reports page when the app if offline? I experienced a weird behaviour while testing (starts from 1:52):

desktop_app.1.mp4

@JS00001

JS00001 commented Oct 2, 2025

Copy link
Copy Markdown
Contributor

I would think we could add expenses offline, what is the issue when offline? I'm not sure I follow

@shawnborton

Copy link
Copy Markdown
Contributor

Yeah I agree with that. You can currently add expenses while offline, no?

@github-actions

github-actions Bot commented Oct 2, 2025

Copy link
Copy Markdown
Contributor

🚧 @shawnborton has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

github-actions Bot commented Oct 2, 2025

Copy link
Copy Markdown
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
Built from App PR #71267.

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/71267/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/71267/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/71267/NewExpensify.dmg https://71267.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@melvin-bot melvin-bot Bot requested a review from JS00001 October 20, 2025 11:13
@JS00001

JS00001 commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

@Krishna2323 to fix the "Validate Github Actions and WorkflowsExpected — Waiting for workflow to run"

action, you need to push a commit (this is a known issue) 😢 Could you add a comment or something haha

JS00001
JS00001 previously approved these changes Oct 21, 2025
@Krishna2323

Copy link
Copy Markdown
Contributor Author

Will this comment run the workflow??? If not I will push a commit.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
JS00001
JS00001 previously approved these changes Oct 21, 2025
@JS00001

JS00001 commented Oct 21, 2025

Copy link
Copy Markdown
Contributor

A bunch of eslint errors now 😢

@Krishna2323

Copy link
Copy Markdown
Contributor Author

@JS00001 I think the ESLint errors are not related to this PR.

@JS00001

JS00001 commented Oct 21, 2025

Copy link
Copy Markdown
Contributor

@Krishna2323 Can you see this thread? https://expensify.slack.com/archives/C01GTK53T8Q/p1761047705937759?thread_ts=1761040802.004759&cid=C01GTK53T8Q

If so, could you follow those steps and suppress the warnings for now?

@JS00001

JS00001 commented Oct 21, 2025

Copy link
Copy Markdown
Contributor

@Krishna2323

Copy link
Copy Markdown
Contributor Author

@JS00001 ESLint issues are fixed.

@JS00001 JS00001 merged commit e7a8d34 into Expensify:main Oct 22, 2025
25 checks passed
@OSBotify

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.2.37-1 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.2.37-8 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

const session = useSession();
const isReportArchived = useReportIsArchived(report?.reportID);
const shouldShowAddExpenseButton = canAddTransaction(report, isReportArchived) && isCurrentUserSubmitter(report);
const addExpenseDropdownOptions = useMemo(() => getAddExpenseDropdownOptions(report?.reportID, policy), [report?.reportID, policy]);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Coming from #75479, we should lastDistanceExpenseType to getAddExpenseDropdownOptions

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.