From e10b10575639316309f2113a75a5285440c77bcd Mon Sep 17 00:00:00 2001
From: Julian Dominguez-Schatz <julian.dominguezschatz@gmail.com>
Date: Sun, 2 Mar 2025 12:18:27 -0500
Subject: [PATCH] Fix number input on mobile with hidden decimals (#4503)

* Fix number input on mobile with hidden decimals

* Add release notes
---
 packages/loot-core/src/shared/util.test.ts | 66 +++++++++++++++++++++-
 packages/loot-core/src/shared/util.ts      |  2 +-
 upcoming-release-notes/4503.md             |  6 ++
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 upcoming-release-notes/4503.md

diff --git a/packages/loot-core/src/shared/util.test.ts b/packages/loot-core/src/shared/util.test.ts
index c18689963de..63a599e6297 100644
--- a/packages/loot-core/src/shared/util.test.ts
+++ b/packages/loot-core/src/shared/util.test.ts
@@ -1,4 +1,9 @@
-import { looselyParseAmount, getNumberFormat, setNumberFormat } from './util';
+import {
+  looselyParseAmount,
+  getNumberFormat,
+  setNumberFormat,
+  currencyToAmount,
+} from './util';
 
 describe('utility functions', () => {
   test('looseParseAmount works with basic numbers', () => {
@@ -108,4 +113,63 @@ describe('utility functions', () => {
     formatter = getNumberFormat().formatter;
     expect(formatter.format(Number('1234.56'))).toBe('1’235');
   });
+
+  test('currencyToAmount works with basic numbers', () => {
+    expect(currencyToAmount('3')).toBe(3);
+    expect(currencyToAmount('3.4')).toBe(3.4);
+    expect(currencyToAmount('3.45')).toBe(3.45);
+    expect(currencyToAmount('3.45060')).toBe(3.4506);
+  });
+
+  test('currencyToAmount works with varied formats', () => {
+    setNumberFormat({ format: 'comma-dot', hideFraction: true });
+    expect(currencyToAmount('3,45')).toBe(3.45);
+    expect(currencyToAmount('3,456')).toBe(3456);
+    expect(currencyToAmount('3,45000')).toBe(345000);
+    expect(currencyToAmount("3'456.78")).toBe(3456.78);
+    expect(currencyToAmount("3'456.78000")).toBe(3456.78);
+    expect(currencyToAmount('1,00,000.99')).toBe(100000.99);
+    expect(currencyToAmount('1,00,000.99000')).toBe(100000.99);
+  });
+
+  test('currencyToAmount works with leading decimal characters', () => {
+    expect(currencyToAmount('.45')).toBe(0.45);
+    expect(currencyToAmount(',45')).toBe(0.45);
+  });
+
+  test('currencyToAmount works with negative numbers', () => {
+    expect(currencyToAmount('-3')).toBe(-3);
+    expect(currencyToAmount('-3.45')).toBe(-3.45);
+    expect(currencyToAmount('-3,45')).toBe(-3.45);
+  });
+
+  test('currencyToAmount works with non-fractional numbers', () => {
+    setNumberFormat({ format: 'comma-dot', hideFraction: false });
+    expect(currencyToAmount('3.')).toBe(3);
+    expect(currencyToAmount('3,')).toBe(3);
+    expect(currencyToAmount('3,000')).toBe(3000);
+    expect(currencyToAmount('3,000.')).toBe(3000);
+  });
+
+  test('currencyToAmount works with hidden fractions', () => {
+    setNumberFormat({ format: 'comma-dot', hideFraction: true });
+    expect(currencyToAmount('3.45')).toBe(3.45);
+    expect(currencyToAmount('3.456')).toBe(3.456);
+    expect(currencyToAmount('3.4500')).toBe(3.45);
+    expect(currencyToAmount('3.')).toBe(3);
+    expect(currencyToAmount('3,')).toBe(3);
+    expect(currencyToAmount('3,000')).toBe(3000);
+    expect(currencyToAmount('3,000.')).toBe(3000);
+  });
+
+  test('currencyToAmount works with dot-comma', () => {
+    setNumberFormat({ format: 'dot-comma', hideFraction: false });
+    expect(currencyToAmount('3,45')).toBe(3.45);
+    expect(currencyToAmount('3,456')).toBe(3.456);
+    expect(currencyToAmount('3,4500')).toBe(3.45);
+    expect(currencyToAmount('3,')).toBe(3);
+    expect(currencyToAmount('3.')).toBe(3);
+    expect(currencyToAmount('3.000')).toBe(3000);
+    expect(currencyToAmount('3.000,')).toBe(3000);
+  });
 });
diff --git a/packages/loot-core/src/shared/util.ts b/packages/loot-core/src/shared/util.ts
index 7e78485bc50..52ff5652795 100644
--- a/packages/loot-core/src/shared/util.ts
+++ b/packages/loot-core/src/shared/util.ts
@@ -396,7 +396,7 @@ export function currencyToAmount(currencyAmount: string): Amount | null {
   if (
     !match ||
     (match[0] === getNumberFormat().thousandsSeparator &&
-      match.index + 4 === currencyAmount.length)
+      match.index + 4 <= currencyAmount.length)
   ) {
     fraction = null;
     integer = currencyAmount.replace(/[^\d-]/g, '');
diff --git a/upcoming-release-notes/4503.md b/upcoming-release-notes/4503.md
new file mode 100644
index 00000000000..677f3e67904
--- /dev/null
+++ b/upcoming-release-notes/4503.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [jfdoming]
+---
+
+Fix number input on mobile with hidden decimals