Skip to content

fix(cost-calculator) - fix currency #718

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

Open
gabrielseco wants to merge 7 commits into
base: main
Choose a base branch
from
Open

fix(cost-calculator) - fix currency #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e9e4991
fix(cost-calculator) - fix currency
gabrielseco Jan 30, 2026
8f9ff08
fix e2e test
gabrielseco Jan 30, 2026
1fac5e2
fix spec
gabrielseco Jan 30, 2026
ebe817f
fix spaces
gabrielseco Jan 30, 2026
20c8020
fix spacing
gabrielseco Jan 30, 2026
754a0b4
fix number
gabrielseco Jan 30, 2026
00f8afe
fix spacing
gabrielseco Jan 30, 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
2 changes: 1 addition & 1 deletion example/e2e/annual-gross-salary.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ test.describe('annual gross salary', () => {

// Using getByText for static text + regex for dynamic part
const headerAmount = page.getByText(
/Employee annual gross salary: kr\d+\.\d\d/,
/Employee annual gross salary: SEK\s\d+\.\d\d/,
);
await expect(headerAmount).toBeVisible();
});
Expand Down
2 changes: 1 addition & 1 deletion example/e2e/hiring-budget.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ test.describe('hiring budget', () => {
});

const headerAmount = page.getByText(
/Employee annual gross salary: kr\d{1,3}(,\d{3})*\.\d{2}/,
/Employee annual gross salary: SEK\s\d{1,3}(,\d{3})*\.\d{2}/,
);

await expect(headerAmount).toBeVisible();
Expand Down
2 changes: 1 addition & 1 deletion src/flows/ContractorOnboarding/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export const useContractorSubscriptionSchemaField = (
if (opts.price.amount) {
formattedPrice = formatCurrency(
opts.price.amount,
opts.currency.symbol,
opts.currency.code,
);
}
const product = opts.product;
Expand Down
70 changes: 35 additions & 35 deletions src/flows/CostCalculator/EstimationResults/EstimationResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ export const EstimationResults = ({

const formattedSalary = formatCurrency(
estimation.regional_currency_costs.annual_gross_salary,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
);

return (
Expand Down Expand Up @@ -642,16 +642,16 @@ export const EstimationResults = ({
? [
formatCurrency(
estimation.regional_currency_costs.monthly_total,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
formatCurrency(
estimation.employer_currency_costs.monthly_total,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
]
: formatCurrency(
estimation.regional_currency_costs.monthly_total,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
)
}
>
Expand All @@ -661,11 +661,11 @@ export const EstimationResults = ({
label: 'Gross monthly salary',
regionalAmount: formatCurrency(
estimation.regional_currency_costs.monthly_gross_salary,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
estimation.employer_currency_costs.monthly_gross_salary,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
zendeskId: zendeskArticles.extraPayments.toString(),
tooltip:
Expand All @@ -676,12 +676,12 @@ export const EstimationResults = ({
regionalAmount: formatCurrency(
estimation.regional_currency_costs
.monthly_contributions_total,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
estimation.employer_currency_costs
.monthly_contributions_total,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
children:
estimation.employer_currency_costs.monthly_contributions_breakdown?.map(
Expand All @@ -691,11 +691,11 @@ export const EstimationResults = ({
regionalAmount: formatCurrency(
estimation.regional_currency_costs
.monthly_contributions_breakdown?.[index]?.amount,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
item.amount,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
zendeskId: item.zendesk_article_id || undefined,
tooltip: item.description || undefined,
Expand All @@ -707,11 +707,11 @@ export const EstimationResults = ({
label: 'Benefits',
regionalAmount: formatCurrency(
estimation.regional_currency_costs.monthly_benefits_total,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
estimation.employer_currency_costs.monthly_benefits_total,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
children:
estimation.employer_currency_costs.monthly_benefits_breakdown?.map(
Expand All @@ -720,11 +720,11 @@ export const EstimationResults = ({
regionalAmount: formatCurrency(
estimation.regional_currency_costs
.monthly_benefits_breakdown?.[index]?.amount,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
item.amount,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
zendeskId: item.zendesk_article_id || undefined,
tooltip: item.description || undefined,
Expand All @@ -738,12 +738,12 @@ export const EstimationResults = ({
regionalAmount: formatCurrency(
estimation.regional_currency_costs
.monthly_management_fee,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
estimation.employer_currency_costs
.monthly_management_fee,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
tooltip:
'Discounts may be available based on your commitment and team size. Speak to your account or customer success manager to learn more.',
Expand All @@ -763,16 +763,16 @@ export const EstimationResults = ({
? [
formatCurrency(
estimation.regional_currency_costs.annual_total,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
formatCurrency(
estimation.employer_currency_costs.annual_total,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
]
: formatCurrency(
estimation.regional_currency_costs.annual_total,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
)
}
>
Expand All @@ -783,22 +783,22 @@ export const EstimationResults = ({
dataSelector: 'annual-gross-salary',
regionalAmount: formatCurrency(
estimation.regional_currency_costs.annual_gross_salary,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
estimation.employer_currency_costs.annual_gross_salary,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
},
{
label: 'Mandatory employer costs',
regionalAmount: formatCurrency(
estimation.regional_currency_costs.annual_contributions_total,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
estimation.employer_currency_costs.annual_contributions_total,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
children:
estimation.employer_currency_costs.annual_contributions_breakdown?.map(
Expand All @@ -807,11 +807,11 @@ export const EstimationResults = ({
regionalAmount: formatCurrency(
estimation.regional_currency_costs
.annual_contributions_breakdown?.[index]?.amount,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
item.amount,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
zendeskId: item.zendesk_article_id || undefined,
tooltip: item.description || undefined,
Expand All @@ -822,11 +822,11 @@ export const EstimationResults = ({
label: 'Benefits',
regionalAmount: formatCurrency(
estimation.regional_currency_costs.annual_benefits_total,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
estimation.employer_currency_costs.annual_benefits_total,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
children:
estimation.employer_currency_costs.annual_benefits_breakdown?.map(
Expand All @@ -835,11 +835,11 @@ export const EstimationResults = ({
regionalAmount: formatCurrency(
estimation.regional_currency_costs
.annual_benefits_breakdown?.[index]?.amount,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
item.amount,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
zendeskId: item.zendesk_article_id || undefined,
tooltip: item.description || undefined,
Expand All @@ -851,12 +851,12 @@ export const EstimationResults = ({
regionalAmount: formatCurrency(
estimation.regional_currency_costs
.extra_statutory_payments_total,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
estimation.employer_currency_costs
.extra_statutory_payments_total,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
children:
estimation.employer_currency_costs.extra_statutory_payments_breakdown?.map(
Expand All @@ -865,11 +865,11 @@ export const EstimationResults = ({
regionalAmount: formatCurrency(
estimation.regional_currency_costs
.extra_statutory_payments_breakdown?.[index]?.amount,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
item.amount,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
zendeskId: item.zendesk_article_id || undefined,
tooltip: item.description || undefined,
Expand All @@ -883,12 +883,12 @@ export const EstimationResults = ({
regionalAmount: formatCurrency(
estimation.regional_currency_costs
.annual_management_fee,
estimation.regional_currency_costs.currency.symbol,
estimation.regional_currency_costs.currency.code,
),
employerAmount: formatCurrency(
estimation.employer_currency_costs
.annual_management_fee,
estimation.employer_currency_costs.currency.symbol,
estimation.employer_currency_costs.currency.code,
),
tooltip:
'Discounts may be available based on your commitment and team size. Speak to your account or customer success manager to learn more.',
Expand Down
8 changes: 4 additions & 4 deletions src/flows/CostCalculator/SummaryResults/SummaryResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ const useSummaryResults = (estimations: CostCalculatorEstimation[]) => {
const groupedCostsPerCountry = Object.values(costsPerCountry).map(
({ country, monthlyTotal, annualTotal }) => ({
country,
monthlyCost: formatCurrency(monthlyTotal, currency.symbol),
annualCost: formatCurrency(annualTotal, currency.symbol),
monthlyCost: formatCurrency(monthlyTotal, currency.code),
annualCost: formatCurrency(annualTotal, currency.code),
}),
);

Expand All @@ -59,13 +59,13 @@ const useSummaryResults = (estimations: CostCalculatorEstimation[]) => {
estimations.reduce((acc, estimation) => {
return acc + estimation.employer_currency_costs.monthly_total;
}, 0),
currency.symbol,
currency.code,
),
annualTotal: formatCurrency(
estimations.reduce((acc, estimation) => {
return acc + estimation.employer_currency_costs.annual_total;
}, 0),
currency.symbol,
currency.code,
),
};
return { currency, costsPerCountry: groupedCostsPerCountry, employeesCost };
Expand Down
14 changes: 7 additions & 7 deletions src/flows/CostCalculator/tests/EstimationResults.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ describe('EstimationResults', () => {
// Check if annual gross salary is rendered
const formattedSalary = formatCurrency(
mockEstimation.regional_currency_costs.annual_gross_salary,
mockEstimation.regional_currency_costs.currency.symbol,
mockEstimation.regional_currency_costs.currency.code,
);

const salaryContainer = screen.getByTestId(
Expand Down Expand Up @@ -209,11 +209,11 @@ describe('EstimationResults', () => {
// Check monthly total amounts
const monthlyRegionalTotal = formatCurrency(
mockEstimation.regional_currency_costs.monthly_total,
mockEstimation.regional_currency_costs.currency.symbol,
mockEstimation.regional_currency_costs.currency.code,
);
const monthlyEmployerTotal = formatCurrency(
mockEstimation.employer_currency_costs.monthly_total,
mockEstimation.employer_currency_costs.currency.symbol,
mockEstimation.employer_currency_costs.currency.code,
);

expect(screen.getByText(monthlyRegionalTotal)).toBeInTheDocument();
Expand Down Expand Up @@ -284,12 +284,12 @@ describe('EstimationResults', () => {
const expectedRegionalAmount = formatCurrency(
mockEstimation.regional_currency_costs.monthly_benefits_breakdown[0]
.amount,
mockEstimation.regional_currency_costs.currency.symbol,
mockEstimation.regional_currency_costs.currency.code,
);
const expectedEmployerAmount = formatCurrency(
mockEstimation.employer_currency_costs.monthly_benefits_breakdown[0]
.amount,
mockEstimation.employer_currency_costs.currency.symbol,
mockEstimation.employer_currency_costs.currency.code,
);

// Find the amounts in the document
Expand All @@ -299,11 +299,11 @@ describe('EstimationResults', () => {
// Also verify the total core benefits
const totalRegionalAmount = formatCurrency(
mockEstimation.regional_currency_costs.monthly_benefits_total,
mockEstimation.regional_currency_costs.currency.symbol,
mockEstimation.regional_currency_costs.currency.code,
);
const totalEmployerAmount = formatCurrency(
mockEstimation.employer_currency_costs.monthly_benefits_total,
mockEstimation.employer_currency_costs.currency.symbol,
mockEstimation.employer_currency_costs.currency.code,
);

expect(screen.getByText(totalRegionalAmount)).toBeInTheDocument();
Expand Down
24 changes: 24 additions & 0 deletions src/lib/__tests__/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { JSFFields } from '@/src/types/remoteFlows';
import {
formatCurrency,
prettifyFormValues,
sanitizeHtml,
sanitizeHtmlWithImageErrorHandling,
Expand Down Expand Up @@ -350,4 +351,27 @@ describe('utils lib', () => {
});
});
});

describe('formatCurrency', () => {
it('should return "-" for undefined or null amount', () => {
expect(formatCurrency(null)).toBe('-');
expect(formatCurrency(undefined)).toBe('-');
});

it('should format amount in EUR by default', () => {
expect(formatCurrency(5000)).toBe('€50.00');
});

it('should format amount in specified currency', () => {
expect(formatCurrency(10000, 'USD')).toBe('$100.00');
});

it('should format amount with currency code', () => {
expect(formatCurrency(10000, 'ARS')).toBe('ARS\u00A0100.00');
});

it('should handle zero amount', () => {
expect(formatCurrency(0, 'USD')).toBe('$0.00');
});
});
});
Loading
Loading