From 25a3970a10670fddab57c83556f1ee3ffd0dcbd9 Mon Sep 17 00:00:00 2001 From: Katelyn Grimes Date: Fri, 22 May 2026 11:58:16 -0400 Subject: [PATCH 1/2] Fix salary calc page title --- .../salaryCalculator/[calculationId]/index.page.tsx | 4 ++-- .../hrTools/salaryCalculator/index.page.tsx | 2 +- .../salaryCalculator/salaryCalculator.page.test.tsx | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pages/accountLists/[accountListId]/hrTools/salaryCalculator/[calculationId]/index.page.tsx b/pages/accountLists/[accountListId]/hrTools/salaryCalculator/[calculationId]/index.page.tsx index e6013ac46c..733f64144e 100644 --- a/pages/accountLists/[accountListId]/hrTools/salaryCalculator/[calculationId]/index.page.tsx +++ b/pages/accountLists/[accountListId]/hrTools/salaryCalculator/[calculationId]/index.page.tsx @@ -55,7 +55,7 @@ const SalaryCalculatorEditInnerPage: React.FC = () => { return ( <> - {`${appName} | ${t('Salary Calculator')}`} + {`${appName} | ${t('HR Tools | Salary Calculation Form')}`} { } /> diff --git a/pages/accountLists/[accountListId]/hrTools/salaryCalculator/index.page.tsx b/pages/accountLists/[accountListId]/hrTools/salaryCalculator/index.page.tsx index 7acb3e09e8..174e1745c0 100644 --- a/pages/accountLists/[accountListId]/hrTools/salaryCalculator/index.page.tsx +++ b/pages/accountLists/[accountListId]/hrTools/salaryCalculator/index.page.tsx @@ -56,7 +56,7 @@ const SalaryCalculatorPage: React.FC = () => { diff --git a/pages/accountLists/[accountListId]/hrTools/salaryCalculator/salaryCalculator.page.test.tsx b/pages/accountLists/[accountListId]/hrTools/salaryCalculator/salaryCalculator.page.test.tsx index 3dd2ccf72b..971e1f5ca6 100644 --- a/pages/accountLists/[accountListId]/hrTools/salaryCalculator/salaryCalculator.page.test.tsx +++ b/pages/accountLists/[accountListId]/hrTools/salaryCalculator/salaryCalculator.page.test.tsx @@ -20,10 +20,10 @@ const TestComponent: React.FC = ({ describe('SalaryCalculatorPage', () => { it('renders the Salary Calculator header', async () => { - const { findByRole } = render(); + const { findAllByRole } = render(); expect( - await findByRole('heading', { name: /Salary Calculator/i }), - ).toBeInTheDocument(); + await findAllByRole('heading', { name: /Salary Calculation Form/i }), + ).toHaveLength(2); }); it('uses blockImpersonatingNonDevelopers for server-side props', () => { @@ -44,15 +44,15 @@ describe('SalaryCalculatorPage', () => { }); it('renders NewSalaryCalculatorLanding when shouldShowPending is false', async () => { - const { findByRole } = render( + const { findAllByRole } = render( , ); expect( - await findByRole('heading', { name: 'Salary Calculator' }), - ).toBeInTheDocument(); + await findAllByRole('heading', { name: 'Salary Calculation Form' }), + ).toHaveLength(2); }); }); From 6b67f155295083c1d5928849f9900486ff036cb7 Mon Sep 17 00:00:00 2001 From: Katelyn Grimes Date: Fri, 22 May 2026 13:11:23 -0400 Subject: [PATCH 2/2] Fixed wrong menu options showing --- .../hrTools/salaryCalculator/[calculationId]/index.page.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/accountLists/[accountListId]/hrTools/salaryCalculator/[calculationId]/index.page.tsx b/pages/accountLists/[accountListId]/hrTools/salaryCalculator/[calculationId]/index.page.tsx index 733f64144e..0da2b002f2 100644 --- a/pages/accountLists/[accountListId]/hrTools/salaryCalculator/[calculationId]/index.page.tsx +++ b/pages/accountLists/[accountListId]/hrTools/salaryCalculator/[calculationId]/index.page.tsx @@ -68,7 +68,7 @@ const SalaryCalculatorEditInnerPage: React.FC = () => { isOpen={isNavListOpen} selectedId="salaryCalculator" onClose={handleNavListToggle} - navType={NavTypeEnum.Reports} + navType={NavTypeEnum.HrTools} /> } leftOpen={isNavListOpen} @@ -79,7 +79,7 @@ const SalaryCalculatorEditInnerPage: React.FC = () => { isNavListOpen={isNavListOpen} onNavListToggle={handleNavListToggle} title={t('Salary Calculation Form')} - headerType={HeaderTypeEnum.Report} + headerType={HeaderTypeEnum.HrTools} rightExtra={} />