From f44ff2c1f3ef217eb70cabf0dc79c8cbc72ed209 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Tue, 21 Oct 2025 19:03:18 +0530 Subject: [PATCH 1/2] Remove translate locale from BankAccounts --- src/components/Form/FormProvider.tsx | 5 +++-- src/libs/actions/BankAccounts.ts | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/Form/FormProvider.tsx b/src/components/Form/FormProvider.tsx index c4dddcb92c74f..dc07db8d4239f 100644 --- a/src/components/Form/FormProvider.tsx +++ b/src/components/Form/FormProvider.tsx @@ -5,6 +5,7 @@ import React, {createRef, useCallback, useEffect, useImperativeHandle, useMemo, import {InteractionManager} from 'react-native'; import type {NativeSyntheticEvent, StyleProp, TextInputSubmitEditingEventData, ViewStyle} from 'react-native'; import {useInputBlurContext} from '@components/InputBlurContext'; +import {LocalizedTranslate} from '@components/LocaleContextProvider'; import useDebounceNonReactive from '@hooks/useDebounceNonReactive'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; @@ -52,7 +53,7 @@ type FormProviderProps = FormProps}) => ReactNode) | ReactNode; /** Callback to validate the form */ - validate?: (values: FormOnyxValues) => FormInputErrors; + validate?: (values: FormOnyxValues, translate: LocalizedTranslate) => FormInputErrors; /** Should validate function be called when input loose focus */ shouldValidateOnBlur?: boolean; @@ -149,7 +150,7 @@ function FormProvider({ } clearErrorFields(formID); - const validateErrors: GenericFormInputErrors = validate?.(trimmedStringValues) ?? {}; + const validateErrors: GenericFormInputErrors = validate?.(trimmedStringValues, translate) ?? {}; if (!allowHTML) { // Validate the input for html tags. It should supersede any other error diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts index 1e4c2b99fdb36..94841fd5224f6 100644 --- a/src/libs/actions/BankAccounts.ts +++ b/src/libs/actions/BankAccounts.ts @@ -1,6 +1,7 @@ import type {OnyxEntry} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import type {FormInputErrors, FormOnyxValues} from '@components/Form/types'; +import {LocalizedTranslate} from '@components/LocaleContextProvider'; import type {OnfidoDataWithApplicantID} from '@components/Onfido/types'; import * as API from '@libs/API'; import type { @@ -21,7 +22,6 @@ import type {SaveCorpayOnboardingCompanyDetails} from '@libs/API/parameters/Save import type SaveCorpayOnboardingDirectorInformationParams from '@libs/API/parameters/SaveCorpayOnboardingDirectorInformationParams'; import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils'; -import {translateLocal} from '@libs/Localize'; import Navigation from '@libs/Navigation/Navigation'; import {getPersonalPolicy} from '@libs/PolicyUtils'; import CONST from '@src/CONST'; @@ -1170,11 +1170,11 @@ function setReimbursementAccountLoading(isLoading: boolean) { Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isLoading}); } -function validatePlaidSelection(values: FormOnyxValues): FormInputErrors { +function validatePlaidSelection(values: FormOnyxValues, translate: LocalizedTranslate): FormInputErrors { const errorFields: FormInputErrors = {}; if (!values.selectedPlaidAccountID) { - errorFields.selectedPlaidAccountID = translateLocal('bankAccount.error.youNeedToSelectAnOption'); + errorFields.selectedPlaidAccountID = translate('bankAccount.error.youNeedToSelectAnOption'); } return errorFields; From c403d9ca6dd706182a6abc3550357d0849090096 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Tue, 4 Nov 2025 01:13:05 +0530 Subject: [PATCH 2/2] fix imports --- src/components/Form/FormProvider.tsx | 2 +- src/libs/actions/BankAccounts.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Form/FormProvider.tsx b/src/components/Form/FormProvider.tsx index 4c9d2fa48d9c6..177128b7cfa19 100644 --- a/src/components/Form/FormProvider.tsx +++ b/src/components/Form/FormProvider.tsx @@ -5,7 +5,7 @@ import React, {createRef, useCallback, useEffect, useImperativeHandle, useMemo, import {InteractionManager} from 'react-native'; import type {StyleProp, TextInputSubmitEditingEvent, ViewStyle} from 'react-native'; import {useInputBlurContext} from '@components/InputBlurContext'; -import {LocalizedTranslate} from '@components/LocaleContextProvider'; +import type {LocalizedTranslate} from '@components/LocaleContextProvider'; import useDebounceNonReactive from '@hooks/useDebounceNonReactive'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts index 71cc71cb85507..6c135097e9e5c 100644 --- a/src/libs/actions/BankAccounts.ts +++ b/src/libs/actions/BankAccounts.ts @@ -1,7 +1,7 @@ import type {OnyxEntry} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import type {FormInputErrors, FormOnyxValues} from '@components/Form/types'; -import {LocalizedTranslate} from '@components/LocaleContextProvider'; +import type {LocalizedTranslate} from '@components/LocaleContextProvider'; import type {OnfidoDataWithApplicantID} from '@components/Onfido/types'; import * as API from '@libs/API'; import type {