Merge pull request #55321 from CyberAndrii/55240-Improve-checks-for-r…

…eceipt-file-detection
Expensify · Jan 31, 2025 · fcb0605 · fcb0605
2 parents 3e932ed + 26a0cb6
commit fcb0605
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -46,6 +46,7 @@ import {
     navigateToStartMoneyRequestStep,
     updateIOUOwnerAndTotal,
 } from '@libs/IOUUtils';
+import isFileUploadable from '@libs/isFileUploadable';
 import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import * as Localize from '@libs/Localize';
 import Log from '@libs/Log';
@@ -4430,7 +4431,7 @@ function requestMoney(requestMoneyInformation: RequestMoneyInformation) {
             const workspaceParams =
                 isPolicyExpenseChatReportUtil(chatReport) && chatReport.policyID
                     ? {
-                          receipt: receipt instanceof Blob ? receipt : undefined,
+                          receipt: isFileUploadable(receipt) ? receipt : undefined,
                           category,
                           tag,
                           taxCode,
@@ -4482,7 +4483,7 @@ function requestMoney(requestMoneyInformation: RequestMoneyInformation) {
                 createdChatReportActionID,
                 createdIOUReportActionID,
                 reportPreviewReportActionID: reportPreviewAction.reportActionID,
-                receipt: receipt instanceof Blob ? receipt : undefined,
+                receipt: isFileUploadable(receipt) ? receipt : undefined,
                 receiptState: receipt?.state,
                 category,
                 tag,
@@ -4752,7 +4753,7 @@ function trackExpense(
                 category,
                 tag,
                 billable,
-                receipt: trackedReceipt instanceof Blob ? trackedReceipt : undefined,
+                receipt: isFileUploadable(trackedReceipt) ? trackedReceipt : undefined,
                 waypoints: sanitizedWaypoints,
                 customUnitRateID: mileageRate,
             };
@@ -4797,7 +4798,7 @@ function trackExpense(
                 category,
                 tag,
                 billable,
-                receipt: trackedReceipt instanceof Blob ? trackedReceipt : undefined,
+                receipt: isFileUploadable(trackedReceipt) ? trackedReceipt : undefined,
                 waypoints: sanitizedWaypoints,
                 customUnitRateID: mileageRate,
             };
@@ -4838,7 +4839,7 @@ function trackExpense(
                 createdChatReportActionID,
                 createdIOUReportActionID,
                 reportPreviewReportActionID: reportPreviewAction?.reportActionID,
-                receipt: trackedReceipt instanceof Blob ? trackedReceipt : undefined,
+                receipt: isFileUploadable(trackedReceipt) ? trackedReceipt : undefined,
                 receiptState: trackedReceipt?.state,
                 category,
                 tag,

diff --git a/src/libs/isFileUploadable/index.native.ts b/src/libs/isFileUploadable/index.native.ts
@@ -0,0 +1,10 @@
+import type {FileObject} from '@components/AttachmentModal';
+
+function isFileUploadable(file: FileObject | undefined): boolean {
+    // Native platforms only require the object to include the `uri` property.
+    // Optionally, it can also have a `name` and `type` properties.
+    // On other platforms, the file must be an instance of `Blob` or one of its subclasses.
+    return !!file && 'uri' in file && !!file.uri && typeof file.uri === 'string';
+}
+
+export default isFileUploadable;
diff --git a/src/libs/isFileUploadable/index.ts b/src/libs/isFileUploadable/index.ts
@@ -0,0 +1,7 @@
+import type {FileObject} from '@components/AttachmentModal';
+
+function isFileUploadable(file: FileObject | undefined): boolean {
+    return file instanceof Blob;
+}
+
+export default isFileUploadable;
diff --git a/src/libs/validateFormDataParameter.ts b/src/libs/validateFormDataParameter.ts
@@ -1,8 +1,4 @@
-import CONST from '@src/CONST';
-import getPlatform from './getPlatform';
-
-const platform = getPlatform();
-const isNativePlatform = platform === CONST.PLATFORM.ANDROID || platform === CONST.PLATFORM.IOS;
+import isFileUploadable from './isFileUploadable';
 
 /**
  * Ensures no value of type `object` other than null, Blob, its subclasses, or {uri: string} (native platforms only) is passed to XMLHttpRequest.
@@ -19,10 +15,7 @@ function validateFormDataParameter(command: string, key: string, value: unknown)
             return value.every((element) => isValid(element, false));
         }
         if (isTopLevel) {
-            // Native platforms only require the value to include the `uri` property.
-            // Optionally, it can also have a `name` and `type` props.
-            // On other platforms, the value must be an instance of `Blob`.
-            return isNativePlatform ? 'uri' in value && !!value.uri : value instanceof Blob;
+            return isFileUploadable(value);
         }
         return false;
     };