Skip to content

Fix: default currency now reflects user's system locale #13

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
Gurunath-S wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: default currency now reflects user's system locale #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 48 additions & 23 deletions src/components/InvoiceForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,31 @@ export default function InvoiceForm({ invoice, onInvoiceChange }: Props) {
const [errors, setErrors] = useState<Record<string, string>>({});

// Initialize taxes from template if available
useEffect(() => {
const templateConfig = TEMPLATE_CONFIGS[invoice.template];
// Always reset taxes when template changes
const initialTaxes = templateConfig.taxes.config.availableTaxes.map(tax => ({
id: tax.id,
name: tax.name,
rate: tax.defaultRate,
isPercentage: tax.isPercentage,
amount: 0,
enabled: false
})) || [];

if (initialTaxes.length > 0) {
initialTaxes[0].enabled = true;
}

onInvoiceChange({
...invoice,
currency: invoice.currency || '$', // Add default currency if not set
taxes: initialTaxes,
taxEnabled: templateConfig.taxes.enabled
});
}, [invoice.template]); // Trigger only on template change
useEffect(() => {
const templateConfig = TEMPLATE_CONFIGS[invoice.template];

const initialTaxes = templateConfig.taxes.config.availableTaxes.map(tax => ({
id: tax.id,
name: tax.name,
rate: tax.defaultRate,
isPercentage: tax.isPercentage,
amount: 0,
enabled: false
})) || [];

if (initialTaxes.length > 0) {
initialTaxes[0].enabled = true;
}

const defaultCurrency = getDefaultCurrencySymbol();

onInvoiceChange({
...invoice,
currency: invoice.currency === '$' ? defaultCurrency : invoice.currency,
taxes: initialTaxes,
taxEnabled: templateConfig.taxes.enabled
});
}, [invoice.template]);// Trigger only on template change

// Calculate tax amounts whenever items change
useEffect(() => {
Expand Down Expand Up @@ -209,6 +211,29 @@ export default function InvoiceForm({ invoice, onInvoiceChange }: Props) {
taxEnabled: newConfig.taxes.enabled
});
};
const getDefaultCurrencySymbol = (): string => {
try {
const locale = Intl.NumberFormat().resolvedOptions().locale;
const region = locale.split('-')[1] || 'US';

const regionToCurrency: Record<string, string> = {
US: '$',
IN: '₹',
GB: '£',
EU: '€',
JP: '¥',
AU: 'A$',
CA: 'C$',
CH: 'Fr',
CN: '¥',
SG: 'S$',
};

return regionToCurrency[region] || '$';
} catch {
return '$';
}
};

return (
<div className="bg-white p-6 pb-20">
Expand Down