Skip to content

Migrate workspace per diem page to the new Table component - #94912

Merged
luacmartins merged 5 commits into
Expensify:mainfrom
Krishna2323:krishna2323-update-per-diem-table-86209
Jun 30, 2026
Merged

Migrate workspace per diem page to the new Table component#94912
luacmartins merged 5 commits into
Expensify:mainfrom
Krishna2323:krishna2323-update-per-diem-table-86209

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #86209
PROPOSAL:

Tests

Setup

Use a workspace with Per Diem enabled and admin/control access. Ideally test with:

  • A workspace with 0 per diem rates (empty)
  • A workspace with 1–11 rates (no search bar)
  • A workspace with 12+ rates (search bar visible)

Web – wide layout

  1. Open Workspace → Per Diem.
  2. Confirm the page title is Per Diem, the subtitle HTML renders above the table, and columns are Destination, Subrate, and Amount.
  3. Click a row and confirm navigation to the per diem details screen.
  4. Click each column header (Destination, Subrate, Amount) and confirm rows sort correctly; toggle asc/desc and confirm order updates.
  5. When two rows share the same primary sort value, confirm tie-break sorting is stable (e.g. same destination → sorted by subrate).
  6. Select one or more rows via the row checkboxes and confirm the header shows Selected (N) with a Delete bulk action.
  7. Delete selected rates, confirm the modal, and verify rates are removed and selection clears.
  8. Open More and verify Import spreadsheet, Download CSV, and Settings (if categories are enabled) still work.

Web – narrow layout (resize browser or use narrow pane)

  1. Repeat steps 1–4 and confirm the table uses the compact row layout (destination on top, subrate + amount below).
  2. Long-press a row (or use the table’s mobile selection entry) to enter selection mode and confirm the header title changes to Select multiple.
  3. Tap rows to toggle selection and confirm the bulk Delete action appears.
  4. Press browser/device Back while in selection mode and confirm selection clears and selection mode exits.

Search (12+ rates required)

  1. Confirm the Find per diem rate search bar appears only when there are 12 or more rates.
  2. Search by destination and confirm matching rows appear.
  3. Search by subrate name and confirm matching rows appear.
  4. Enter a query with no matches and confirm a No results found message appears (table header/search remain visible).

Empty & loading states

  1. On a workspace with no per diem rates, confirm the subtitle still shows, the empty state appears with Import spreadsheet, and import navigates correctly.
  2. On a workspace with rates, refresh/reopen the page and confirm a loading spinner appears with the subtitle; after load, the table renders normally.

Bulk delete & selection cleanup

  1. Select several rates and delete them all; confirm selection clears and you exit mobile selection mode (narrow layout).
  2. Select rates, then press the header Back button; confirm selection clears and selection mode exits without deleting.
  3. Select rates, clear the search filter (if active), and confirm selected items are not dropped from the selection count.

backTo navigation (expense flow)

  1. Start creating a Per Diem expense and navigate to Workspace → Per Diem from that flow (e.g. destination picker linking to workspace rates).
  2. Press Back and confirm you return to the expense creation screen, not an unrelated page.

Read-only / non-admin member (if available)

  1. Log in as a member without per diem write access and open Per Diem.
  2. Confirm rows are visible and tappable for details, but no checkboxes, no bulk delete, and no long-press selection appear.

Native (iOS / Android) – additional checks

  1. Repeat steps 9–12 on a physical device or simulator.
  2. Press the hardware/gesture back button while in selection mode and confirm selection clears and the page navigates back correctly.
  3. Scroll the table and confirm rows, header, and search bar scroll/perform smoothly with no layout clipping.
  • Verify that no errors appear in the JS console

Offline tests

  1. Go offline, open Per Diem, and confirm existing rates still display.
  2. While offline, open More → Import spreadsheet or Download CSV and confirm the offline modal appears.

QA Steps

  • Same as tests

  • 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_hybrid.mp4
Android: mWeb Chrome
android_mWeb.mp4
iOS: Native
ios_hybrid.mp4
iOS: mWeb Safari
ios_mWeb.mp4
MacOS: Chrome / Safari
web_chrome.mp4

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

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 11b45a1c9a

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx Outdated
@codecov

codecov Bot commented Jun 29, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/CONST/index.ts 94.02% <ø> (ø)
...WorkspacePerDiemTable/WorkspacePerDiemTableRow.tsx 0.00% <0.00%> (ø)
...c/pages/workspace/perDiem/WorkspacePerDiemPage.tsx 0.00% <0.00%> (ø)
.../components/Tables/WorkspacePerDiemTable/index.tsx 0.00% <0.00%> (ø)
... and 11 files with indirect coverage changes

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

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. 🎉

Reviewed commit: 69d1a6384b

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@Krishna2323
Krishna2323 marked this pull request as ready for review June 30, 2026 00:05
@Krishna2323
Krishna2323 requested review from a team as code owners June 30, 2026 00:05
@melvin-bot
melvin-bot Bot requested review from heyjennahay and situchan and removed request for a team June 30, 2026 00:05
@melvin-bot

melvin-bot Bot commented Jun 30, 2026

Copy link
Copy Markdown

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

The failing test isn't related.

@situchan

situchan commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

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 checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • 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 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 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)
  • 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 using Avatar have been tested & I retested again)
  • 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. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • 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 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
android.mov
Android: mWeb Chrome
iOS: HybridApp
ios.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mov

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Swish!

Reviewed commit: 1237008d9d

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@luacmartins
luacmartins self-requested a review June 30, 2026 15:55

@luacmartins luacmartins left a comment

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.

LGTM

@melvin-bot
melvin-bot Bot requested review from JS00001 and luacmartins June 30, 2026 18:23
@luacmartins

Copy link
Copy Markdown
Contributor

@JS00001 is OOO, so I'll merge

@luacmartins
luacmartins merged commit e6307b9 into Expensify:main Jun 30, 2026
34 of 35 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@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

OSBotify commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.4.26-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: no docs/articles changes required.

This PR migrates the workspace Per Diem page to the new Table component (WorkspacePerDiemTable/index.tsx, WorkspacePerDiemPage.tsx). It's a presentational/component refactor — every documented workflow still behaves the same, so I did not open a draft PR.

I checked the one article that covers this surface, Configure-Per-Diem-in-a-workspace.md, against the diff:

  • Import spreadsheet / Download CSV (three‑dot / More menu) — unchanged.
  • Edit / delete rates, incl. selecting rows and bulk delete — unchanged.
  • Settings → Default category — unchanged.

The only new, undocumented behaviors are generic to the shared table — sortable Destination / Subrate / Amount columns and a Find per diem rate search bar that appears at 12+ rates. These aren't workflow changes and the current article doesn't document table mechanics, so I don't think they warrant a doc update. If you'd like the article to call out sorting/search, let me know and I'll draft it.

@Krishna2323, since no help site PR was needed, there's nothing to link or mark Ready for review. If you disagree and want doc updates, reply with @MelvinBot <what to document> and I'll create the draft PR.

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #95092 was identified to be related to this PR.

@jponikarchuk

Copy link
Copy Markdown

This PR failing because of the issue #95118
This issue is reproducible in: Web

@jponikarchuk

Copy link
Copy Markdown

This PR failing because of the issue #95128
This issue is reproducible in: All platforms

@OSBotify

OSBotify commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.4.27-2 🚀

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

Bundle Size Analysis (Sentry):

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.

6 participants