Skip to content

fix: add additional copy to remove secondary jobs warning #2005

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.

Sign up for GitHub

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

Merged
aaronlee777 merged 2 commits into from
Jun 3, 2026
+53 −43
Merged

fix: add additional copy to remove secondary jobs warning #2005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34dd33a
fix: only render alert container when secondary-jobs warning or commi…
aaronlee777 Jun 3, 2026
8ccf1e8
chore: regenerate i18n types
aaronlee777 Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 51 additions & 43 deletions src/components/Employee/Compensation/management/ManagementCompensationFormBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@ export function ManagementCompensationFormBody({
<Flex flexDirection="column" gap={32}>
<Components.Heading as="h2">{title}</Components.Heading>

{compensationForm.status.willDeleteSecondaryJobs && (
<Components.Alert
label={t('validations.classificationChangeNotification')}
status="warning"
/>
)}

<Flex flexDirection="column" gap={20}>
<CompFields.Title
label={t('management.jobTitleLabel')}
Expand Down Expand Up @@ -87,42 +80,57 @@ export function ManagementCompensationFormBody({
getOptionLabel={(status: FlsaStatusType) => t(`flsaStatusLabels.${status}`)}
formHookResult={compensationForm}
/>
{compensationForm.status.showCommissionFederalMinimumPayAlert && (
<Components.Alert
status="warning"
label={t('commissionAlerts.federalMinimumPay.label')}
disableScrollIntoView
>
{t('commissionAlerts.federalMinimumPay.body')}
</Components.Alert>
)}
{compensationForm.status.showCommissionMinimumWageAlert && (
<Components.Alert
status="warning"
label={t('commissionAlerts.minimumWage.label')}
disableScrollIntoView
>
<Trans
t={t}
i18nKey="commissionAlerts.minimumWage.body"
components={{
minimumWageLink: (
<Components.Link
href="https://support.gusto.com/article/112472520100000/manage-tip-wages-distributed-service-charges-and-tip-credits-in-gusto-for-admins"
target="_blank"
rel="noopener noreferrer"
/>
),
}}
/>
</Components.Alert>
)}
{compensationForm.status.showOwnerSalaryAlert && (
<Components.Alert
status="info"
label={t('commissionAlerts.ownerSalary.label')}
disableScrollIntoView
/>
{(compensationForm.status.showCommissionFederalMinimumPayAlert ||
compensationForm.status.showCommissionMinimumWageAlert ||
compensationForm.status.showOwnerSalaryAlert ||
compensationForm.status.willDeleteSecondaryJobs) && (
<Flex flexDirection="column" gap={0}>
{compensationForm.status.willDeleteSecondaryJobs && (
<Components.Alert
label={t('validations.classificationChangeNotification')}
status="warning"
>
{t('validations.classificationChangeRemovesSecondaryJobs')}
</Components.Alert>
)}
{compensationForm.status.showCommissionFederalMinimumPayAlert && (
<Components.Alert
status="info"
label={t('commissionAlerts.federalMinimumPay.label')}
disableScrollIntoView
>
{t('commissionAlerts.federalMinimumPay.body')}
</Components.Alert>
)}
{compensationForm.status.showCommissionMinimumWageAlert && (
<Components.Alert
status="info"
label={t('commissionAlerts.minimumWage.label')}
disableScrollIntoView
>
<Trans
t={t}
i18nKey="commissionAlerts.minimumWage.body"
components={{
minimumWageLink: (
<Components.Link
href="https://support.gusto.com/article/112472520100000/manage-tip-wages-distributed-service-charges-and-tip-credits-in-gusto-for-admins"
target="_blank"
rel="noopener noreferrer"
/>
),
}}
/>
</Components.Alert>
)}
{compensationForm.status.showOwnerSalaryAlert && (
<Components.Alert
status="info"
label={t('commissionAlerts.ownerSalary.label')}
disableScrollIntoView
/>
)}
</Flex>
)}
</>
)}
Expand Down
1 change: 1 addition & 0 deletions src/i18n/en/Employee.Compensation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"effectiveDateBeforeHire": "Effective date cannot be before the hire date",
"hireDate": "Start date is required",
"classificationChangeNotification": "Changing this employee's classification will immediately delete their additional jobs.",
"classificationChangeRemovesSecondaryJobs": "Only employees that are paid by the hour can have multiple jobs.",
"exemptThreshold": "Most employees who make under {{limit}}/year should be eligible for overtime.",
"paymentUnit": "Payment unit must be one of Hour, Week, Month, or Year",
"rate": "Amount is a required field",
Expand Down
1 change: 1 addition & 0 deletions src/types/i18next.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,7 @@ export interface EmployeeCompensation{
"effectiveDateBeforeHire":string;
"hireDate":string;
"classificationChangeNotification":string;
"classificationChangeRemovesSecondaryJobs":string;
"exemptThreshold":string;
"paymentUnit":string;
"rate":string;
Expand Down
Loading