Skip to content

Add 2MB per-file size limit for Corpay document uploads#88426

Merged
MariaHCD merged 6 commits into
mainfrom
claude-addCorpayPerFileUploadSizeLimit
May 8, 2026
Merged

Add 2MB per-file size limit for Corpay document uploads#88426
MariaHCD merged 6 commits into
mainfrom
claude-addCorpayPerFileUploadSizeLimit

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

The UploadFile component validates total cumulative file size (totalFilesSizeLimit) but has no per-file size validation. The Corpay onboarding document upload pages (Signer and BeneficialOwner) don't pass totalFilesSizeLimit either, so there's no frontend size enforcement at all. This allows files larger than the backend's limit to be uploaded to S3, which then fail when the UploadCorpayOnboardingDocuments backend job tries to forward them to Corpay.

This PR:

  • Adds a MAX_FILE_SIZE constant of 2MB (2,097,152 bytes) to CONST.NON_USD_BANK_ACCOUNT
  • Adds a maxFileSize prop to the UploadFile component that validates each individual file's size before upload
  • Passes maxFileSize to all UploadFile instances in both the Signer and BeneficialOwner document upload pages

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/568619

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

  • Verify that no errors appear in the JS console

  • Create a new account in ND

  • Create a non usd workspace

  • Go to the workspace and wokflows and add a bank account and go through the flow until you get to a file upload. Then try to add a file > 2MB and you should see the following error:

Screenshot 2026-05-06 at 6 46 52 PM

Offline tests

N/A - file size validation is a client-side check that does not depend on network state.

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

The UploadFile component had a totalFilesSizeLimit prop but no per-file
size validation, allowing individual files larger than the backend's
limit to be uploaded. This adds a maxFileSize prop to UploadFile and
passes it (2MB) in both the Signer and BeneficialOwner upload pages.

Co-authored-by: madmax330 <madmax330@users.noreply.github.com>
Co-authored-by: Maxence Coulibaly <madmax330@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team April 21, 2026 12:44
@codecov

codecov Bot commented Apr 21, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/CONST/index.ts 92.30% <ø> (ø)
...count/EnterSignerInfo/subSteps/UploadDocuments.tsx 0.00% <ø> (ø)
...o/BeneficialOwnerDetailsFormSubSteps/Documents.tsx 0.00% <0.00%> (ø)
...unt/NonUSD/SignerInfo/subSteps/UploadDocuments.tsx 0.00% <0.00%> (ø)
src/components/SubStepForms/DocusignFullStep.tsx 0.00% <0.00%> (ø)
src/components/UploadFile.tsx 0.00% <0.00%> (ø)
... and 172 files with indirect coverage changes

@madmax330 madmax330 changed the title Add 2MB per-file size limit for Corpay document uploads [NoQA] Add 2MB per-file size limit for Corpay document uploads Apr 27, 2026
@madmax330 madmax330 changed the title [NoQA] Add 2MB per-file size limit for Corpay document uploads Add 2MB per-file size limit for Corpay document uploads Apr 27, 2026
@MelvinBot

Copy link
Copy Markdown
Contributor Author

The only failing check is checklist (PR Author Checklist), which is expected — all code checks (ESLint, typecheck, tests, prettier, builds, spellcheck, etc.) are passing.

The checklist failure requires the human co-author to fill out the test steps, QA steps, and screenshots sections in the PR body. No code fix is needed.

@madmax330 madmax330 marked this pull request as ready for review May 6, 2026 18:51
@madmax330 madmax330 requested a review from a team as a code owner May 6, 2026 18:51
@melvin-bot melvin-bot Bot requested review from Ollyws and joekaufmanexpensify and removed request for a team May 6, 2026 18:51
@melvin-bot

melvin-bot Bot commented May 6, 2026

Copy link
Copy Markdown

@Ollyws Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@madmax330 madmax330 requested a review from a team May 6, 2026 18:52
@melvin-bot melvin-bot Bot requested review from dmkt9 and removed request for a team May 6, 2026 18:52
@melvin-bot

melvin-bot Bot commented May 6, 2026

Copy link
Copy Markdown

@dmkt9 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@madmax330 madmax330 requested review from a team and MrMuzyk May 6, 2026 18:52
@melvin-bot melvin-bot Bot requested review from jayeshmangwani and removed request for a team May 6, 2026 18:52
@melvin-bot

melvin-bot Bot commented May 6, 2026

Copy link
Copy Markdown

@jayeshmangwani Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@madmax330

Copy link
Copy Markdown
Contributor

@MrMuzyk can you review this since you worked on the Non USD flow?

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c6c62864a0

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/CONST/index.ts
@MelvinBot

Copy link
Copy Markdown
Contributor Author

The only failing check is checklist (PR Author Checklist), which requires the human co-author to fill in test steps, QA steps, and screenshots. All code checks (ESLint, typecheck, tests, prettier, builds) are passing. No code fix is needed here.

@melvin-bot melvin-bot Bot removed the request for review from a team May 6, 2026 19:06
@melvin-bot

melvin-bot Bot commented May 6, 2026

Copy link
Copy Markdown

@abzokhattab Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Comment thread src/components/SubStepForms/DocusignFullStep.tsx Outdated
Comment thread src/CONST/index.ts
ALLOWED_FILE_TYPES: ['pdf', 'jpg', 'jpeg', 'png'],
FILE_LIMIT: 1,
MAX_FILE_SIZE: 2097152,
TOTAL_FILES_SIZE_LIMIT: 5242880,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 'Explanation of change' in the PRs description already touches on that but this PR doesn't fix it - I think it could've but its outside of the scope of this issue.

CONST is defined but it's not referenced anywhere and despite the texts on the pages we do not enforce this total 5mb file size, anywhere, at all.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I will fix this in another PR

@MrMuzyk

MrMuzyk commented May 7, 2026

Copy link
Copy Markdown
Contributor

@madmax330 Do you also want me to do review checklist here?

Move ALLOWED_FILE_TYPES, FILE_LIMIT, MAX_FILE_SIZE, and TOTAL_FILES_SIZE_LIMIT
to a new CORPAY_DOCUMENT const group since these consts are used in both
USD and non-USD flows (e.g., DocusignFullStep is also used on the wallet page
for global reimbursements).

Co-authored-by: Maxence Coulibaly <madmax330@users.noreply.github.com>
@madmax330

Copy link
Copy Markdown
Contributor

Do you also want me to do review checklist here?

That would be great!

@MrMuzyk

MrMuzyk commented May 7, 2026

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
android-native.mp4
Android: mWeb Chrome
android.web.mp4
iOS: HybridApp
ios-native.mp4
iOS: mWeb Safari
ios-web.mp4
MacOS: Chrome / Safari
web.mp4

@MrMuzyk

MrMuzyk commented May 7, 2026

Copy link
Copy Markdown
Contributor

@madmax330 Noticed one small thing. When we try to submit without any file we get an error 'Field is required'. If we then try to upload file that exceeds the limit we still get the same error.

Not sure whether we want to block on this - other cases work fine

minor-issue.mov

@madmax330

Copy link
Copy Markdown
Contributor

Noticed one small thing. When we try to submit without any file we get an error 'Field is required'. If we then try to upload file that exceeds the limit we still get the same error.

Not sure whether we want to block on this - other cases work fine

@MelvinBot can you address this?

When a form has a 'Field is required' validation error and the user then
picks an oversized file, the size error was hidden because form validation
errors (errors[inputID]) take precedence over errorFields in FormProvider.
Clear form validation errors before setting upload-specific error fields.

Co-authored-by: Maxence Coulibaly <madmax330@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Fixed — the issue was that form validation errors (errors[inputID]) take precedence over errorFields in FormProvider. When the user submits without a file, "Field is required" gets set in errors. Then when they pick an oversized file, setUploadError writes to errorFields, but the validation error still takes priority. Added clearErrors(formID) before setErrorFields() in all three upload components so the upload-specific error can display. Pushed in cf666f7.

@MrMuzyk

MrMuzyk commented May 7, 2026

Copy link
Copy Markdown
Contributor

Didnt work.

Here is the diff that works

index ffe41a3984e..cb461095c5b 100644
--- a/src/components/SubStepForms/DocusignFullStep.tsx
+++ b/src/components/SubStepForms/DocusignFullStep.tsx
@@ -1,8 +1,8 @@
-import React, {useCallback, useState} from 'react';
+import React, {useCallback, useRef, useState} from 'react';
 import Button from '@components/Button';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
-import type {FormInputErrors, FormOnyxKeys, FormOnyxValues} from '@components/Form/types';
+import type {FormInputErrors, FormOnyxKeys, FormOnyxValues, FormRef} from '@components/Form/types';
 import InteractiveStepWrapper from '@components/InteractiveStepWrapper';
 import Text from '@components/Text';
 import UploadFile from '@components/UploadFile';
@@ -61,6 +61,8 @@ function DocusignFullStep<TFormID extends keyof OnyxFormValuesMapping>({
     const styles = useThemeStyles();
     const {environmentURL} = useEnvironment();
 
+    const formRef = useRef<FormRef | null>(null);
+
     const [uploadedFiles, setUploadedFiles] = useState<FileObject[]>(defaultValue);
 
     const validate = useCallback(
@@ -87,6 +89,7 @@ function DocusignFullStep<TFormID extends keyof OnyxFormValuesMapping>({
             return;
         }
 
+        formRef.current?.resetFormFieldError(inputID as string);
         clearErrors(formID);
         setErrorFields(formID, {[inputID]: {onUpload: error}});
     };
@@ -107,6 +110,7 @@ function DocusignFullStep<TFormID extends keyof OnyxFormValuesMapping>({
             startStepIndex={startStepIndex}
         >
             <FormProvider
+                ref={formRef}
                 formID={formID}
                 submitButtonText={translate('common.submit')}
                 onSubmit={onSubmit}
diff --git a/src/pages/ReimbursementAccount/NonUSD/BeneficialOwnerInfo/BeneficialOwnerDetailsFormSubSteps/Documents.tsx b/src/pages/ReimbursementAccount/NonUSD/BeneficialOwnerInfo/BeneficialOwnerDetailsFormSubSteps/Documents.tsx
index 0be181053d5..5f6395c3f56 100644
--- a/src/pages/ReimbursementAccount/NonUSD/BeneficialOwnerInfo/BeneficialOwnerDetailsFormSubSteps/Documents.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/BeneficialOwnerInfo/BeneficialOwnerDetailsFormSubSteps/Documents.tsx
@@ -1,8 +1,8 @@
-import React, {useCallback, useMemo, useState} from 'react';
+import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
-import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import type {FormInputErrors, FormOnyxValues, FormRef} from '@components/Form/types';
 import Text from '@components/Text';
 import UploadFile from '@components/UploadFile';
 import useLocalize from '@hooks/useLocalize';
@@ -45,6 +45,8 @@ function Documents({onNext, isEditing, ownerBeingModifiedID}: DocumentsProps) {
         [codiceFiscaleInputID]: Array.isArray(reimbursementAccountDraft?.[codiceFiscaleInputID]) ? (reimbursementAccountDraft?.[codiceFiscaleInputID] ?? []) : [],
     };
 
+    const formRef = useRef<FormRef | null>(null);
+
     const [uploadedProofOfOwnership, setUploadedProofOfOwnership] = useState<FileObject[]>(defaultValues[proofOfOwnershipInputID]);
     const [uploadedCopyOfID, setUploadedCopyOfID] = useState<FileObject[]>(defaultValues[copyOfIDInputID]);
     const [uploadedAddressProof, setUploadedAddressProof] = useState<FileObject[]>(defaultValues[addressProofInputID]);
@@ -78,6 +80,7 @@ function Documents({onNext, isEditing, ownerBeingModifiedID}: DocumentsProps) {
             return;
         }
 
+        formRef.current?.resetFormFieldError(inputID);
         clearErrors(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM);
         setErrorFields(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM, {[inputID]: {onUpload: error}});
     };
@@ -98,6 +101,7 @@ function Documents({onNext, isEditing, ownerBeingModifiedID}: DocumentsProps) {
 
     return (
         <FormProvider
+            ref={formRef}
             formID={ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM}
             submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
             validate={validate}
diff --git a/src/pages/ReimbursementAccount/NonUSD/SignerInfo/subSteps/UploadDocuments.tsx b/src/pages/ReimbursementAccount/NonUSD/SignerInfo/subSteps/UploadDocuments.tsx
index f413e08a6df..b36fc2eab87 100644
--- a/src/pages/ReimbursementAccount/NonUSD/SignerInfo/subSteps/UploadDocuments.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/SignerInfo/subSteps/UploadDocuments.tsx
@@ -1,10 +1,10 @@
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import Button from '@components/Button';
 import DotIndicatorMessage from '@components/DotIndicatorMessage';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
-import type {FormInputErrors, FormOnyxKeys, FormOnyxValues} from '@components/Form/types';
+import type {FormInputErrors, FormOnyxKeys, FormOnyxValues, FormRef} from '@components/Form/types';
 import Text from '@components/Text';
 import UploadFile from '@components/UploadFile';
 import useLocalize from '@hooks/useLocalize';
@@ -50,6 +50,8 @@ function UploadDocuments({onNext, isEditing}: UploadDocumentsProps) {
         [CODICE_FISCALE]: Array.isArray(reimbursementAccountDraft?.[CODICE_FISCALE]) ? (reimbursementAccountDraft?.[CODICE_FISCALE] ?? []) : [],
     };
 
+    const formRef = useRef<FormRef | null>(null);
+
     const [uploadedIDs, setUploadedID] = useState<FileObject[]>(defaultValues[COPY_OF_ID]);
     const [uploadedProofsOfAddress, setUploadedProofOfAddress] = useState<FileObject[]>(defaultValues[ADDRESS_PROOF]);
     const [uploadedProofsOfDirectors, setUploadedProofsOfDirectors] = useState<FileObject[]>(defaultValues[PROOF_OF_DIRECTORS]);
@@ -97,6 +99,7 @@ function UploadDocuments({onNext, isEditing}: UploadDocumentsProps) {
             return;
         }
 
+        formRef.current?.resetFormFieldError(inputID);
         clearErrors(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM);
         setErrorFields(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM, {[inputID]: {onUpload: error}});
     };
@@ -109,6 +112,7 @@ function UploadDocuments({onNext, isEditing}: UploadDocumentsProps) {
 
     return (
         <FormProvider
+            ref={formRef}
             formID={ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM}
             submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
             onSubmit={handleSubmitWithDownload}```

@madmax330

Copy link
Copy Markdown
Contributor

@MelvinBot can you undo your fix and apply the diff mentioned above? #88426 (comment)

…wing upload errors

Replace the clearErrors-only approach with formRef.resetFormFieldError
to properly clear per-field validation errors (e.g. 'Field is required')
before setting upload-specific errorFields. This ensures the upload
size error is displayed when a form validation error was already present.

Diff provided by MrMuzyk.

Co-authored-by: Maxence Coulibaly <madmax330@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Applied MrMuzyk's diff — added formRef + resetFormFieldError to DocusignFullStep, Documents, and SignerInfo/UploadDocuments so per-field validation errors are cleared before setting upload-specific error fields. Pushed in fe2f998.

@joekaufmanexpensify joekaufmanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good for product

@MrMuzyk

MrMuzyk commented May 8, 2026

Copy link
Copy Markdown
Contributor

Tests well, approved

@MariaHCD MariaHCD merged commit 338777e into main May 8, 2026
46 checks passed
@MariaHCD MariaHCD deleted the claude-addCorpayPerFileUploadSizeLimit branch May 8, 2026 08:47
@OSBotify

OSBotify commented May 8, 2026

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions

github-actions Bot commented May 8, 2026

Copy link
Copy Markdown
Contributor

🚧 @MariaHCD has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

OSBotify commented May 8, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/MariaHCD in version: 9.3.69-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Yes — help site changes are required. The PR adds a 2 MB per-file size limit for Corpay document uploads, but none of the global reimbursement help articles mention this constraint.

I've created a draft PR with the updates: #90015

Changes made to 5 articles:

  • Canada, Europe, UK, US — added the 2 MB per-file size limit wherever accepted file types (PDF, PNG, JPEG) are referenced
  • Australia — added an accepted file types line with the size limit (was previously missing file type info entirely)

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.69-18 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

wildan-m pushed a commit to wildan-m/App that referenced this pull request May 16, 2026
Update all global reimbursement help site articles to document the new
2 MB per-file size limit for Corpay document uploads introduced in
Expensify#88426.

Co-authored-by: Maxence Coulibaly <madmax330@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants