Skip to content

Conversation

@canac
Copy link
Contributor

@canac canac commented Jan 12, 2026

Description

The Salary Request card was mistakenly on step 4. This PR moves it to step 4 and implements the Request Summary card.

Also includes a few minor fixups on the receipt page - migrating the color and fixing a calculation field typo.

Figma link: https://www.figma.com/design/JInpKB7SkTEcJ3pI3dSzYh/MPDX-8585-Staffweb-migrations-to-MPDX?node-id=7797-12174&m=dev

Screenshot 2026-01-12 at 3 25 12 PM

MPDX-9193

Testing

  • Case 1
    • Go to a salary calculation
    • Go to step 3
    • Check that UI matches the design
      • Success/warning message at the top
      • Progress bar showing breakdown
      • Summary table (except for local taxes - the API doesn't support it yet)
  • Case 2 (user over cap - Figma link)
    • In the requested salary box on step 3, change one person's requested salary to be over their individual cap but make sure that the combined requested salary is under $135K
    • Check that a warning message appears
  • Case 3 (combined over cap - Figma link)
    • In the requested salary box on step 3, change one person's requested salary to be really high, like $1,000,000
    • Check that a different warning message appears
    • Check that some amounts show up in red

Checklist:

  • I have given my PR a title with the format "MPDX-(JIRA#) (summary sentence max 80 chars)"
  • I have applied the appropriate labels (Add the label "Preview" to automatically create a preview environment)
  • I have run the Claude Code /pr-review command locally and fixed any relevant suggestions
  • I have requested a review from another person on the project
  • I have tested my changes in preview or in staging
  • I have cleaned up my commit history

@canac canac requested a review from wjames111 January 12, 2026 21:30
@canac canac self-assigned this Jan 12, 2026
@canac canac added the Preview Environment Add this label to create an Amplify Preview label Jan 12, 2026
@github-actions
Copy link
Contributor

Preview branch generated at https://9193-salary-calculation-step.d3dytjb8adxkk5.amplifyapp.com

@github-actions
Copy link
Contributor

github-actions bot commented Jan 12, 2026

Bundle sizes [mpdx-react]

Compared against d3296ef

Route Size (gzipped) Diff
/accountLists/[accountListId]/reports/salaryCalculator/edit 156.02 KB +1.94 KB

Copy link
Contributor

@wjames111 wjames111 left a comment

Choose a reason for hiding this comment

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

This looks really good, didn't find any issues and seems to match the designs well.

Comment on lines +1 to +5
export interface Category {
label: string;
amount: number;
color: string;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Are we using this in a lot of places, could we just put it in Distribution.tsx?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's used in the legend, the distribution, and the main card components

@canac canac force-pushed the 9193-salary-calculation-step branch from 311a578 to 767b4c9 Compare January 13, 2026 21:00
@canac canac enabled auto-merge January 13, 2026 21:00
@canac canac merged commit 3e01774 into main Jan 13, 2026
23 of 24 checks passed
@canac canac deleted the 9193-salary-calculation-step branch January 13, 2026 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Preview Environment Add this label to create an Amplify Preview

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants