Merge pull request #51011 from twilight2294/fixintegervalidation

Fix: Add integer validation to card limit
Expensify · Oct 28, 2024 · 2a3095e · 2a3095e
2 parents f9c15e6 + f832d7a
commit 2a3095e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -953,6 +953,7 @@ const translations = {
         error: {
             invalidCategoryLength: 'The category name exceeds 255 characters. Please shorten it or choose a different category.',
             invalidAmount: 'Please enter a valid amount before continuing.',
+            invalidIntegerAmount: 'Please enter a whole dollar amount before continuing.',
             invalidTaxAmount: ({amount}: RequestAmountParams) => `Maximum tax amount is ${amount}`,
             invalidSplit: 'The sum of splits must equal the total amount.',
             invalidSplitParticipants: 'Please enter an amount greater than zero for at least two participants.',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -950,6 +950,7 @@ const translations = {
         error: {
             invalidCategoryLength: 'La longitud de la categoría escogida excede el máximo permitido (255). Por favor, escoge otra categoría o acorta la categoría primero.',
             invalidAmount: 'Por favor, ingresa un importe válido antes de continuar.',
+            invalidIntegerAmount: 'Por favor, introduce una cantidad entera en dólares antes de continuar.',
             invalidTaxAmount: ({amount}: RequestAmountParams) => `El importe máximo del impuesto es ${amount}`,
             invalidSplit: 'La suma de las partes debe ser igual al importe total.',
             invalidSplitParticipants: 'Introduce un importe superior a cero para al menos dos participantes.',

diff --git a/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitPage.tsx
@@ -88,8 +88,10 @@ function WorkspaceEditCardLimitPage({route}: WorkspaceEditCardLimitPageProps) {
             const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.LIMIT]);
 
             // We only want integers to be sent as the limit
-            if (!Number.isInteger(Number(values.limit))) {
+            if (!Number(values.limit)) {
                 errors.limit = translate('iou.error.invalidAmount');
+            } else if (!Number.isInteger(Number(values.limit))) {
+                errors.limit = translate('iou.error.invalidIntegerAmount');
             }
 
             return errors;

diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
@@ -51,9 +51,12 @@ function LimitStep() {
             const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.LIMIT]);
 
             // We only want integers to be sent as the limit
-            if (!Number(values.limit) || !Number.isInteger(Number(values.limit))) {
+            if (!Number(values.limit)) {
                 errors.limit = translate('iou.error.invalidAmount');
+            } else if (!Number.isInteger(Number(values.limit))) {
+                errors.limit = translate('iou.error.invalidIntegerAmount');
             }
+
             return errors;
         },
         [translate],