A local-first personal finance app
Update regex for `looselyParseAmount` for 5-9 decimal places (#2799)
Sreetam Das2959054d0cb7
diff --git a/packages/loot-core/src/shared/util.test.ts b/packages/loot-core/src/shared/util.test.tsindex d236a6652a..6d1945b298 100644--- a/packages/loot-core/src/shared/util.test.ts+++ b/packages/loot-core/src/shared/util.test.ts@@ -2,7 +2,7 @@ import { looselyParseAmount, getNumberFormat, setNumberFormat } from './util';describe('utility functions', () => {test('looseParseAmount works with basic numbers', () => {- // Parsing is currently limited to 1,2 decimal places or 5.+ // Parsing is currently limited to 1,2 decimal places or 5-9.// Ignoring 3 places removes the possibility of improper parse// of amounts without decimal amounts included.expect(looselyParseAmount('3')).toBe(3);@@ -10,12 +10,20 @@ describe('utility functions', () => {expect(looselyParseAmount('3.45')).toBe(3.45);expect(looselyParseAmount('3.456')).toBe(3456);expect(looselyParseAmount('3.45000')).toBe(3.45);+ expect(looselyParseAmount('3.450000')).toBe(3.45);+ expect(looselyParseAmount('3.4500000')).toBe(3.45);+ expect(looselyParseAmount('3.45000000')).toBe(3.45);+ expect(looselyParseAmount('3.450000000')).toBe(3.45);});test('looseParseAmount works with alternate formats', () => {expect(looselyParseAmount('3,45')).toBe(3.45);expect(looselyParseAmount('3,456')).toBe(3456);expect(looselyParseAmount('3,45000')).toBe(3.45);+ expect(looselyParseAmount('3,450000')).toBe(3.45);+ expect(looselyParseAmount('3,4500000')).toBe(3.45);+ expect(looselyParseAmount('3,45000000')).toBe(3.45);+ expect(looselyParseAmount('3,450000000')).toBe(3.45);});test('looseParseAmount works with negative numbers', () => {diff --git a/packages/loot-core/src/shared/util.ts b/packages/loot-core/src/shared/util.tsindex 7429e58ef1..4602177457 100644--- a/packages/loot-core/src/shared/util.ts+++ b/packages/loot-core/src/shared/util.ts@@ -409,9 +409,9 @@ export function looselyParseAmount(amount: string) {amount = amount.replace('(', '-').replace(')', '');}- //look for a decimal marker, then look for either 5 or 1-2 decimal places.+ // Look for a decimal marker, then look for either 1-2 or 5-9 decimal places.// This avoids matching against 3 places which may not actually be decimal- const m = amount.match(/[.,]([^.,]{5}|[^.,]{1,2})$/);+ const m = amount.match(/[.,]([^.,]{5,9}|[^.,]{1,2})$/);if (!m || m.index === undefined || m.index === 0) {return safeNumber(parseFloat(extractNumbers(amount)));}diff --git a/upcoming-release-notes/2799.md b/upcoming-release-notes/2799.mdnew file mode 100644index 0000000000..a54578e360--- /dev/null+++ b/upcoming-release-notes/2799.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [sreetamdas]+---++Fix amount parsing with 6-9 decimal places