From dfb9ae9516f17d2245e5e7533731ab5729a464a3 Mon Sep 17 00:00:00 2001 From: Blazej Kustra Date: Thu, 8 Feb 2024 09:58:47 +0100 Subject: [PATCH] Move form types to src/types/form --- src/ONYXKEYS.ts | 2 +- src/components/AddressForm.js | 2 +- src/libs/actions/PersonalDetails.ts | 2 +- src/pages/EditRequestCreatedPage.js | 2 +- src/pages/EditRequestMerchantPage.js | 2 +- src/pages/PrivateNotes/PrivateNotesEditPage.tsx | 2 +- src/pages/ReimbursementAccount/ACHContractStep.js | 2 +- src/pages/ReimbursementAccount/BankAccountManualStep.js | 2 +- src/pages/ReimbursementAccount/BankAccountPlaidStep.js | 2 +- src/pages/ReimbursementAccount/CompanyStep.js | 2 +- src/pages/ReimbursementAccount/RequestorStep.js | 2 +- src/pages/ReimbursementAccount/ValidationStep.js | 2 +- src/pages/RoomDescriptionPage.tsx | 2 +- src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx | 2 +- src/pages/TeachersUnite/KnowATeacherPage.tsx | 2 +- src/pages/iou/MoneyRequestDatePage.js | 2 +- src/pages/iou/MoneyRequestMerchantPage.js | 2 +- src/pages/iou/request/step/IOURequestStepDate.js | 2 +- src/pages/iou/request/step/IOURequestStepDescription.js | 2 +- src/pages/iou/request/step/IOURequestStepMerchant.js | 2 +- src/pages/settings/Profile/Contacts/NewContactMethodPage.js | 2 +- src/pages/settings/Profile/CustomStatus/SetDatePage.js | 2 +- src/pages/settings/Profile/DisplayNamePage.js | 2 +- src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js | 2 +- src/pages/settings/Profile/PersonalDetails/LegalNamePage.js | 2 +- src/pages/settings/Report/RoomNamePage.tsx | 2 +- src/pages/settings/Security/CloseAccountPage.tsx | 2 +- src/pages/settings/Wallet/AddDebitCardPage.js | 2 +- src/pages/settings/Wallet/Card/GetPhysicalCardName.js | 2 +- src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js | 2 +- src/pages/tasks/NewTaskDescriptionPage.js | 2 +- src/pages/tasks/NewTaskDetailsPage.js | 2 +- src/pages/tasks/NewTaskTitlePage.js | 2 +- src/pages/tasks/TaskDescriptionPage.js | 2 +- src/pages/tasks/TaskTitlePage.js | 2 +- src/pages/workspace/WorkspaceInviteMessagePage.js | 2 +- src/pages/workspace/WorkspaceNamePage.tsx | 2 +- src/pages/workspace/WorkspaceNewRoomPage.js | 2 +- src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js | 2 +- src/{components/Form/inputs => types/form}/AddDebitCardForm.ts | 0 src/{components/Form/inputs => types/form}/CloseAccountForm.ts | 0 src/{components/Form/inputs => types/form}/DateOfBirthForm.ts | 0 src/{components/Form/inputs => types/form}/DisplayNameForm.ts | 0 src/{components/Form/inputs => types/form}/EditTaskForm.ts | 0 .../Form/inputs => types/form}/GetPhysicalCardForm.ts | 0 src/{components/Form/inputs => types/form}/HomeAddressForm.ts | 0 src/{components/Form/inputs => types/form}/IKnowTeacherForm.ts | 0 .../Form/inputs => types/form}/IntroSchoolPrincipalForm.ts | 0 src/{components/Form/inputs => types/form}/LegalNameForm.ts | 0 .../Form/inputs => types/form}/MoneyRequestAmountForm.ts | 0 .../Form/inputs => types/form}/MoneyRequestCreatedForm.ts | 0 .../Form/inputs => types/form}/MoneyRequestDescriptionForm.ts | 0 .../Form/inputs => types/form}/MoneyRequestMerchantForm.ts | 0 .../Form/inputs => types/form}/NewContactMethodForm.ts | 0 src/{components/Form/inputs => types/form}/NewRoomForm.ts | 0 src/{components/Form/inputs => types/form}/NewTaskForm.ts | 0 .../Form/inputs => types/form}/PersonalBankAccountForm.ts | 0 src/{components/Form/inputs => types/form}/PrivateNotesForm.ts | 0 .../Form/inputs => types/form}/ProfileSettingsForm.ts | 0 .../Form/inputs => types/form}/ReimbursementAccountForm.ts | 0 .../Form/inputs => types/form}/ReportDescriptionForm.ts | 0 .../Form/inputs => types/form}/ReportFieldEditForm.ts | 0 .../Form/inputs => types/form}/ReportVirtualCardFraudForm.ts | 0 .../Form/inputs => types/form}/RequestPhysicalCardForm.ts | 0 src/{components/Form/inputs => types/form}/RoomNameForm.ts | 0 src/{components/Form/inputs => types/form}/RoomSettingsForm.ts | 0 .../Form/inputs => types/form}/SettingsStatusClearDateForm.ts | 0 .../inputs => types/form}/SettingsStatusSetClearAfterForm.ts | 0 .../Form/inputs => types/form}/SettingsStatusSetForm.ts | 0 src/{components/Form/inputs => types/form}/WaypointForm.ts | 0 .../Form/inputs => types/form}/WorkspaceInviteMessageForm.ts | 0 .../Form/inputs => types/form}/WorkspaceRateAndUnitForm.ts | 0 .../Form/inputs => types/form}/WorkspaceSettingsForm.ts | 0 src/{components/Form/inputs => types/form}/index.ts | 0 74 files changed, 39 insertions(+), 39 deletions(-) rename src/{components/Form/inputs => types/form}/AddDebitCardForm.ts (100%) rename src/{components/Form/inputs => types/form}/CloseAccountForm.ts (100%) rename src/{components/Form/inputs => types/form}/DateOfBirthForm.ts (100%) rename src/{components/Form/inputs => types/form}/DisplayNameForm.ts (100%) rename src/{components/Form/inputs => types/form}/EditTaskForm.ts (100%) rename src/{components/Form/inputs => types/form}/GetPhysicalCardForm.ts (100%) rename src/{components/Form/inputs => types/form}/HomeAddressForm.ts (100%) rename src/{components/Form/inputs => types/form}/IKnowTeacherForm.ts (100%) rename src/{components/Form/inputs => types/form}/IntroSchoolPrincipalForm.ts (100%) rename src/{components/Form/inputs => types/form}/LegalNameForm.ts (100%) rename src/{components/Form/inputs => types/form}/MoneyRequestAmountForm.ts (100%) rename src/{components/Form/inputs => types/form}/MoneyRequestCreatedForm.ts (100%) rename src/{components/Form/inputs => types/form}/MoneyRequestDescriptionForm.ts (100%) rename src/{components/Form/inputs => types/form}/MoneyRequestMerchantForm.ts (100%) rename src/{components/Form/inputs => types/form}/NewContactMethodForm.ts (100%) rename src/{components/Form/inputs => types/form}/NewRoomForm.ts (100%) rename src/{components/Form/inputs => types/form}/NewTaskForm.ts (100%) rename src/{components/Form/inputs => types/form}/PersonalBankAccountForm.ts (100%) rename src/{components/Form/inputs => types/form}/PrivateNotesForm.ts (100%) rename src/{components/Form/inputs => types/form}/ProfileSettingsForm.ts (100%) rename src/{components/Form/inputs => types/form}/ReimbursementAccountForm.ts (100%) rename src/{components/Form/inputs => types/form}/ReportDescriptionForm.ts (100%) rename src/{components/Form/inputs => types/form}/ReportFieldEditForm.ts (100%) rename src/{components/Form/inputs => types/form}/ReportVirtualCardFraudForm.ts (100%) rename src/{components/Form/inputs => types/form}/RequestPhysicalCardForm.ts (100%) rename src/{components/Form/inputs => types/form}/RoomNameForm.ts (100%) rename src/{components/Form/inputs => types/form}/RoomSettingsForm.ts (100%) rename src/{components/Form/inputs => types/form}/SettingsStatusClearDateForm.ts (100%) rename src/{components/Form/inputs => types/form}/SettingsStatusSetClearAfterForm.ts (100%) rename src/{components/Form/inputs => types/form}/SettingsStatusSetForm.ts (100%) rename src/{components/Form/inputs => types/form}/WaypointForm.ts (100%) rename src/{components/Form/inputs => types/form}/WorkspaceInviteMessageForm.ts (100%) rename src/{components/Form/inputs => types/form}/WorkspaceRateAndUnitForm.ts (100%) rename src/{components/Form/inputs => types/form}/WorkspaceSettingsForm.ts (100%) rename src/{components/Form/inputs => types/form}/index.ts (100%) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 37987992c3f8..eb39341add4d 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -1,7 +1,7 @@ import type {OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; -import type * as FormTypes from './components/Form/inputs'; import type CONST from './CONST'; +import type * as FormTypes from './types/form'; import type * as OnyxTypes from './types/onyx'; import type AssertTypesEqual from './types/utils/AssertTypesEqual'; import type DeepValueOf from './types/utils/DeepValueOf'; diff --git a/src/components/AddressForm.js b/src/components/AddressForm.js index 911af9c02126..a87b0900764b 100644 --- a/src/components/AddressForm.js +++ b/src/components/AddressForm.js @@ -9,10 +9,10 @@ import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; import * as ValidationUtils from '@libs/ValidationUtils'; import CONST from '@src/CONST'; +import INPUT_IDS from '@src/types/form/HomeAddressForm'; import AddressSearch from './AddressSearch'; import CountrySelector from './CountrySelector'; import FormProvider from './Form/FormProvider'; -import INPUT_IDS from './Form/inputs/HomeAddressForm'; import InputWrapper from './Form/InputWrapper'; import StatePicker from './StatePicker'; import TextInput from './TextInput'; diff --git a/src/libs/actions/PersonalDetails.ts b/src/libs/actions/PersonalDetails.ts index 904b61f2039f..51ee3669a74d 100644 --- a/src/libs/actions/PersonalDetails.ts +++ b/src/libs/actions/PersonalDetails.ts @@ -1,6 +1,5 @@ import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; -import type {DateOfBirthForm} from '@components/Form/inputs'; import * as API from '@libs/API'; import type { OpenPublicProfilePageParams, @@ -22,6 +21,7 @@ import * as UserUtils from '@libs/UserUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import type {DateOfBirthForm} from '@src/types/form'; import type {PersonalDetails, PersonalDetailsList, PrivatePersonalDetails} from '@src/types/onyx'; import type {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails'; import * as Session from './Session'; diff --git a/src/pages/EditRequestCreatedPage.js b/src/pages/EditRequestCreatedPage.js index 7d63904f8dab..c7c4f1945cff 100644 --- a/src/pages/EditRequestCreatedPage.js +++ b/src/pages/EditRequestCreatedPage.js @@ -2,7 +2,6 @@ import PropTypes from 'prop-types'; import React from 'react'; import DatePicker from '@components/DatePicker'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/MoneyRequestCreatedForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -10,6 +9,7 @@ import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/MoneyRequestCreatedForm'; const propTypes = { /** Transaction defailt created value */ diff --git a/src/pages/EditRequestMerchantPage.js b/src/pages/EditRequestMerchantPage.js index 284791266a71..420bcbc35630 100644 --- a/src/pages/EditRequestMerchantPage.js +++ b/src/pages/EditRequestMerchantPage.js @@ -3,7 +3,6 @@ import React, {useCallback, useRef} from 'react'; import {View} from 'react-native'; import _ from 'underscore'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/MoneyRequestMerchantForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -12,6 +11,7 @@ import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/MoneyRequestMerchantForm'; const propTypes = { /** Transaction default merchant value */ diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.tsx b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx index a056a5d29910..3516f370b5fb 100644 --- a/src/pages/PrivateNotes/PrivateNotesEditPage.tsx +++ b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx @@ -8,7 +8,6 @@ import {Keyboard} from 'react-native'; import type {OnyxCollection} from 'react-native-onyx'; import {withOnyx} from 'react-native-onyx'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/PrivateNotesForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; @@ -29,6 +28,7 @@ import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; +import INPUT_IDS from '@src/types/form/PrivateNotesForm'; import type {PersonalDetails, Report} from '@src/types/onyx'; import type {Note} from '@src/types/onyx/Report'; diff --git a/src/pages/ReimbursementAccount/ACHContractStep.js b/src/pages/ReimbursementAccount/ACHContractStep.js index 14bc86ff144a..0c50c2231986 100644 --- a/src/pages/ReimbursementAccount/ACHContractStep.js +++ b/src/pages/ReimbursementAccount/ACHContractStep.js @@ -6,7 +6,6 @@ import {View} from 'react-native'; import _ from 'underscore'; import CheckboxWithLabel from '@components/CheckboxWithLabel'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/ReimbursementAccountForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -19,6 +18,7 @@ import * as BankAccounts from '@userActions/BankAccounts'; import * as FormActions from '@userActions/FormActions'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/ReimbursementAccountForm'; import IdentityForm from './IdentityForm'; import StepPropTypes from './StepPropTypes'; diff --git a/src/pages/ReimbursementAccount/BankAccountManualStep.js b/src/pages/ReimbursementAccount/BankAccountManualStep.js index 16bdb09a07c7..e65fc68ab199 100644 --- a/src/pages/ReimbursementAccount/BankAccountManualStep.js +++ b/src/pages/ReimbursementAccount/BankAccountManualStep.js @@ -3,7 +3,6 @@ import React, {useCallback} from 'react'; import _ from 'underscore'; import CheckboxWithLabel from '@components/CheckboxWithLabel'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/ReimbursementAccountForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -18,6 +17,7 @@ import * as ValidationUtils from '@libs/ValidationUtils'; import * as BankAccounts from '@userActions/BankAccounts'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/ReimbursementAccountForm'; import ExampleCheck from './ExampleCheck'; import StepPropTypes from './StepPropTypes'; diff --git a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js index 97ae3db74fd0..7e41841aa350 100644 --- a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js +++ b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js @@ -7,7 +7,6 @@ import _ from 'underscore'; import AddPlaidBankAccount from '@components/AddPlaidBankAccount'; import CheckboxWithLabel from '@components/CheckboxWithLabel'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/ReimbursementAccountForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -20,6 +19,7 @@ import * as BankAccounts from '@userActions/BankAccounts'; import * as ReimbursementAccount from '@userActions/ReimbursementAccount'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/ReimbursementAccountForm'; import * as PlaidDataProps from './plaidDataPropTypes'; import StepPropTypes from './StepPropTypes'; diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js index 271dd6e4e8e0..e2ea7112127d 100644 --- a/src/pages/ReimbursementAccount/CompanyStep.js +++ b/src/pages/ReimbursementAccount/CompanyStep.js @@ -8,7 +8,6 @@ import _ from 'underscore'; import CheckboxWithLabel from '@components/CheckboxWithLabel'; import DatePicker from '@components/DatePicker'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/ReimbursementAccountForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import Picker from '@components/Picker'; @@ -25,6 +24,7 @@ import * as ValidationUtils from '@libs/ValidationUtils'; import * as BankAccounts from '@userActions/BankAccounts'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/ReimbursementAccountForm'; import AddressForm from './AddressForm'; import StepPropTypes from './StepPropTypes'; diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js index f973928ada0c..11eac38df904 100644 --- a/src/pages/ReimbursementAccount/RequestorStep.js +++ b/src/pages/ReimbursementAccount/RequestorStep.js @@ -4,7 +4,6 @@ import React, {useCallback, useMemo} from 'react'; import {View} from 'react-native'; import CheckboxWithLabel from '@components/CheckboxWithLabel'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/ReimbursementAccountForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -16,6 +15,7 @@ import * as ValidationUtils from '@libs/ValidationUtils'; import * as BankAccounts from '@userActions/BankAccounts'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/ReimbursementAccountForm'; import IdentityForm from './IdentityForm'; import {reimbursementAccountPropTypes} from './reimbursementAccountPropTypes'; import RequestorOnfidoStep from './RequestorOnfidoStep'; diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js index fc80d2532e8c..688f3a7a506a 100644 --- a/src/pages/ReimbursementAccount/ValidationStep.js +++ b/src/pages/ReimbursementAccount/ValidationStep.js @@ -7,7 +7,6 @@ import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; import Button from '@components/Button'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/ReimbursementAccountForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import * as Expensicons from '@components/Icon/Expensicons'; @@ -31,6 +30,7 @@ import * as BankAccounts from '@userActions/BankAccounts'; import * as Report from '@userActions/Report'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/ReimbursementAccountForm'; import Enable2FAPrompt from './Enable2FAPrompt'; import EnableStep from './EnableStep'; import * as ReimbursementAccountProps from './reimbursementAccountPropTypes'; diff --git a/src/pages/RoomDescriptionPage.tsx b/src/pages/RoomDescriptionPage.tsx index 9227961379c1..6300b8c4cdce 100644 --- a/src/pages/RoomDescriptionPage.tsx +++ b/src/pages/RoomDescriptionPage.tsx @@ -5,7 +5,6 @@ import {View} from 'react-native'; import type {OnyxCollection} from 'react-native-onyx'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/ReportDescriptionForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -21,6 +20,7 @@ import * as Report from '@userActions/Report'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/ReportDescriptionForm'; import type * as OnyxTypes from '@src/types/onyx'; type RoomDescriptionPageProps = { diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx index a6ad6e093368..c432b672f574 100644 --- a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx +++ b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx @@ -4,7 +4,6 @@ import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import type {OnyxEntry} from 'react-native-onyx'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/IntroSchoolPrincipalForm'; import InputWrapper from '@components/Form/InputWrapper'; import type {FormInputErrors, FormOnyxValues} from '@components/Form/types'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -22,6 +21,7 @@ import TeachersUnite from '@userActions/TeachersUnite'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/IntroSchoolPrincipalForm'; import type {LoginList} from '@src/types/onyx'; type IntroSchoolPrincipalPageOnyxProps = { diff --git a/src/pages/TeachersUnite/KnowATeacherPage.tsx b/src/pages/TeachersUnite/KnowATeacherPage.tsx index fe8fcbc52818..75b974ba1e83 100644 --- a/src/pages/TeachersUnite/KnowATeacherPage.tsx +++ b/src/pages/TeachersUnite/KnowATeacherPage.tsx @@ -4,7 +4,6 @@ import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import type {OnyxEntry} from 'react-native-onyx'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/IKnowTeacherForm'; import InputWrapper from '@components/Form/InputWrapper'; import type {FormOnyxValues} from '@components/Form/types'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -22,6 +21,7 @@ import TeachersUnite from '@userActions/TeachersUnite'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/IKnowTeacherForm'; import type {LoginList} from '@src/types/onyx'; type KnowATeacherPageOnyxProps = { diff --git a/src/pages/iou/MoneyRequestDatePage.js b/src/pages/iou/MoneyRequestDatePage.js index a17c29e6129d..7a31d85175ea 100644 --- a/src/pages/iou/MoneyRequestDatePage.js +++ b/src/pages/iou/MoneyRequestDatePage.js @@ -5,7 +5,6 @@ import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; import DatePicker from '@components/DatePicker'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/MoneyRequestCreatedForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -17,6 +16,7 @@ import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/MoneyRequestCreatedForm'; import {iouDefaultProps, iouPropTypes} from './propTypes'; const propTypes = { diff --git a/src/pages/iou/MoneyRequestMerchantPage.js b/src/pages/iou/MoneyRequestMerchantPage.js index 3820065d61e8..f079bde6c286 100644 --- a/src/pages/iou/MoneyRequestMerchantPage.js +++ b/src/pages/iou/MoneyRequestMerchantPage.js @@ -5,7 +5,6 @@ import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/MoneyRequestMerchantForm'; import InputWrapperWithRef from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -18,6 +17,7 @@ import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/MoneyRequestMerchantForm'; import {iouDefaultProps, iouPropTypes} from './propTypes'; const propTypes = { diff --git a/src/pages/iou/request/step/IOURequestStepDate.js b/src/pages/iou/request/step/IOURequestStepDate.js index c2312e9b3942..cd78117fb0c5 100644 --- a/src/pages/iou/request/step/IOURequestStepDate.js +++ b/src/pages/iou/request/step/IOURequestStepDate.js @@ -1,7 +1,6 @@ import React from 'react'; import DatePicker from '@components/DatePicker'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/MoneyRequestCreatedForm'; import InputWrapper from '@components/Form/InputWrapper'; import transactionPropTypes from '@components/transactionPropTypes'; import useLocalize from '@hooks/useLocalize'; @@ -13,6 +12,7 @@ import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/MoneyRequestCreatedForm'; import IOURequestStepRoutePropTypes from './IOURequestStepRoutePropTypes'; import StepScreenWrapper from './StepScreenWrapper'; import withFullTransactionOrNotFound from './withFullTransactionOrNotFound'; diff --git a/src/pages/iou/request/step/IOURequestStepDescription.js b/src/pages/iou/request/step/IOURequestStepDescription.js index 24c300bcbbf1..3a38e4fb25bc 100644 --- a/src/pages/iou/request/step/IOURequestStepDescription.js +++ b/src/pages/iou/request/step/IOURequestStepDescription.js @@ -5,7 +5,6 @@ import React, {useCallback, useRef} from 'react'; import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/MoneyRequestDescriptionForm'; import InputWrapperWithRef from '@components/Form/InputWrapper'; import TextInput from '@components/TextInput'; import transactionPropTypes from '@components/transactionPropTypes'; @@ -19,6 +18,7 @@ import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/MoneyRequestDescriptionForm'; import IOURequestStepRoutePropTypes from './IOURequestStepRoutePropTypes'; import StepScreenWrapper from './StepScreenWrapper'; import withFullTransactionOrNotFound from './withFullTransactionOrNotFound'; diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.js b/src/pages/iou/request/step/IOURequestStepMerchant.js index 86ae3f6c90b3..30ec07c00306 100644 --- a/src/pages/iou/request/step/IOURequestStepMerchant.js +++ b/src/pages/iou/request/step/IOURequestStepMerchant.js @@ -2,7 +2,6 @@ import React, {useCallback} from 'react'; import {View} from 'react-native'; import _ from 'underscore'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/MoneyRequestMerchantForm'; import InputWrapper from '@components/Form/InputWrapper'; import TextInput from '@components/TextInput'; import transactionPropTypes from '@components/transactionPropTypes'; @@ -15,6 +14,7 @@ import * as IOU from '@userActions/IOU'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/MoneyRequestMerchantForm'; import IOURequestStepRoutePropTypes from './IOURequestStepRoutePropTypes'; import StepScreenWrapper from './StepScreenWrapper'; import withFullTransactionOrNotFound from './withFullTransactionOrNotFound'; diff --git a/src/pages/settings/Profile/Contacts/NewContactMethodPage.js b/src/pages/settings/Profile/Contacts/NewContactMethodPage.js index 3611f209c314..2c23e588f6ea 100644 --- a/src/pages/settings/Profile/Contacts/NewContactMethodPage.js +++ b/src/pages/settings/Profile/Contacts/NewContactMethodPage.js @@ -6,7 +6,6 @@ import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/NewContactMethodForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -22,6 +21,7 @@ import * as User from '@userActions/User'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/NewContactMethodForm'; const propTypes = { /* Onyx Props */ diff --git a/src/pages/settings/Profile/CustomStatus/SetDatePage.js b/src/pages/settings/Profile/CustomStatus/SetDatePage.js index 8563b8212798..5b95ec757617 100644 --- a/src/pages/settings/Profile/CustomStatus/SetDatePage.js +++ b/src/pages/settings/Profile/CustomStatus/SetDatePage.js @@ -3,7 +3,6 @@ import React, {useCallback} from 'react'; import {withOnyx} from 'react-native-onyx'; import DatePicker from '@components/DatePicker'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/SettingsStatusClearDateForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -16,6 +15,7 @@ import Navigation from '@libs/Navigation/Navigation'; import * as ValidationUtils from '@libs/ValidationUtils'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/SettingsStatusClearDateForm'; const propTypes = { ...withLocalizePropTypes, diff --git a/src/pages/settings/Profile/DisplayNamePage.js b/src/pages/settings/Profile/DisplayNamePage.js index 2ac6548caf5d..e8a1b5a39cfb 100644 --- a/src/pages/settings/Profile/DisplayNamePage.js +++ b/src/pages/settings/Profile/DisplayNamePage.js @@ -4,7 +4,6 @@ import React from 'react'; import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/DisplayNameForm'; import InputWrapper from '@components/Form/InputWrapper'; import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -21,6 +20,7 @@ import * as ValidationUtils from '@libs/ValidationUtils'; import * as PersonalDetails from '@userActions/PersonalDetails'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/DisplayNameForm'; const propTypes = { ...withLocalizePropTypes, diff --git a/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js b/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js index d6a424f37133..3e5c0a13351c 100644 --- a/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js +++ b/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js @@ -5,7 +5,6 @@ import React, {useCallback} from 'react'; import {withOnyx} from 'react-native-onyx'; import DatePicker from '@components/DatePicker'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/DateOfBirthForm'; import InputWrapper from '@components/Form/InputWrapper'; import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -20,6 +19,7 @@ import * as PersonalDetails from '@userActions/PersonalDetails'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/DateOfBirthForm'; const propTypes = { /* Onyx Props */ diff --git a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js index 44e1f40c3ae4..989aab1faf37 100644 --- a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js +++ b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js @@ -5,7 +5,6 @@ import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/LegalNameForm'; import InputWrapper from '@components/Form/InputWrapper'; import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -22,6 +21,7 @@ import * as PersonalDetails from '@userActions/PersonalDetails'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/LegalNameForm'; const propTypes = { /* Onyx Props */ diff --git a/src/pages/settings/Report/RoomNamePage.tsx b/src/pages/settings/Report/RoomNamePage.tsx index 18a966683a58..b6ef2217954e 100644 --- a/src/pages/settings/Report/RoomNamePage.tsx +++ b/src/pages/settings/Report/RoomNamePage.tsx @@ -6,7 +6,6 @@ import {withOnyx} from 'react-native-onyx'; import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/RoomNameForm'; import InputWrapper from '@components/Form/InputWrapper'; import type {FormOnyxValues} from '@components/Form/types'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -27,6 +26,7 @@ import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; +import INPUT_IDS from '@src/types/form/RoomNameForm'; import type {Policy, Report} from '@src/types/onyx'; type RoomNamePageOnyxProps = { diff --git a/src/pages/settings/Security/CloseAccountPage.tsx b/src/pages/settings/Security/CloseAccountPage.tsx index f746d73467f5..a84694f6bf1e 100644 --- a/src/pages/settings/Security/CloseAccountPage.tsx +++ b/src/pages/settings/Security/CloseAccountPage.tsx @@ -6,7 +6,6 @@ import {withOnyx} from 'react-native-onyx'; import type {OnyxEntry} from 'react-native-onyx'; import ConfirmModal from '@components/ConfirmModal'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/CloseAccountForm'; import InputWrapper from '@components/Form/InputWrapper'; import type {FormOnyxValues} from '@components/Form/types'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -23,6 +22,7 @@ import * as User from '@userActions/User'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; +import INPUT_IDS from '@src/types/form/CloseAccountForm'; import type {Session} from '@src/types/onyx'; import type {Errors} from '@src/types/onyx/OnyxCommon'; diff --git a/src/pages/settings/Wallet/AddDebitCardPage.js b/src/pages/settings/Wallet/AddDebitCardPage.js index 8c9279360f17..768298318a5a 100644 --- a/src/pages/settings/Wallet/AddDebitCardPage.js +++ b/src/pages/settings/Wallet/AddDebitCardPage.js @@ -5,7 +5,6 @@ import {withOnyx} from 'react-native-onyx'; import AddressSearch from '@components/AddressSearch'; import CheckboxWithLabel from '@components/CheckboxWithLabel'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/AddDebitCardForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -21,6 +20,7 @@ import * as ValidationUtils from '@libs/ValidationUtils'; import * as PaymentMethods from '@userActions/PaymentMethods'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/AddDebitCardForm'; const propTypes = { /* Onyx Props */ diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardName.js b/src/pages/settings/Wallet/Card/GetPhysicalCardName.js index e51f6ead00e2..e428bea45f60 100644 --- a/src/pages/settings/Wallet/Card/GetPhysicalCardName.js +++ b/src/pages/settings/Wallet/Card/GetPhysicalCardName.js @@ -2,7 +2,6 @@ import PropTypes from 'prop-types'; import React from 'react'; import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; -import INPUT_IDS from '@components/Form/inputs/GetPhysicalCardForm'; import InputWrapper from '@components/Form/InputWrapper'; import TextInput from '@components/TextInput'; import useLocalize from '@hooks/useLocalize'; @@ -12,6 +11,7 @@ import * as ValidationUtils from '@libs/ValidationUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/GetPhysicalCardForm'; import BaseGetPhysicalCard from './BaseGetPhysicalCard'; const propTypes = { diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js b/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js index 24cb38fd7b40..5f7fdfe0ec14 100644 --- a/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js +++ b/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js @@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; import React from 'react'; import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; -import INPUT_IDS from '@components/Form/inputs/GetPhysicalCardForm'; import InputWrapper from '@components/Form/InputWrapper'; import TextInput from '@components/TextInput'; import useLocalize from '@hooks/useLocalize'; @@ -12,6 +11,7 @@ import {parsePhoneNumber} from '@libs/PhoneNumber'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/GetPhysicalCardForm'; import BaseGetPhysicalCard from './BaseGetPhysicalCard'; const propTypes = { diff --git a/src/pages/tasks/NewTaskDescriptionPage.js b/src/pages/tasks/NewTaskDescriptionPage.js index 20c73c024fab..990bad193800 100644 --- a/src/pages/tasks/NewTaskDescriptionPage.js +++ b/src/pages/tasks/NewTaskDescriptionPage.js @@ -4,7 +4,6 @@ import React from 'react'; import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/NewTaskForm'; import InputWrapperWithRef from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -20,6 +19,7 @@ import * as Task from '@userActions/Task'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/NewTaskForm'; const propTypes = { /** Grab the Share description of the Task */ diff --git a/src/pages/tasks/NewTaskDetailsPage.js b/src/pages/tasks/NewTaskDetailsPage.js index 9023ee6bf172..b540fef1743f 100644 --- a/src/pages/tasks/NewTaskDetailsPage.js +++ b/src/pages/tasks/NewTaskDetailsPage.js @@ -4,7 +4,6 @@ import React, {useEffect, useState} from 'react'; import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/NewTaskForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -20,6 +19,7 @@ import * as Task from '@userActions/Task'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/NewTaskForm'; const propTypes = { /** Task title and description data */ diff --git a/src/pages/tasks/NewTaskTitlePage.js b/src/pages/tasks/NewTaskTitlePage.js index f257da9c68c4..f01b1a748080 100644 --- a/src/pages/tasks/NewTaskTitlePage.js +++ b/src/pages/tasks/NewTaskTitlePage.js @@ -3,7 +3,6 @@ import React from 'react'; import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/NewTaskForm'; import InputWrapperWithRef from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -18,6 +17,7 @@ import * as Task from '@userActions/Task'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/NewTaskForm'; const propTypes = { /** Grab the Share title of the Task */ diff --git a/src/pages/tasks/TaskDescriptionPage.js b/src/pages/tasks/TaskDescriptionPage.js index a04d2a72c548..b3a4afef05c1 100644 --- a/src/pages/tasks/TaskDescriptionPage.js +++ b/src/pages/tasks/TaskDescriptionPage.js @@ -5,7 +5,6 @@ import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/EditTaskForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -24,6 +23,7 @@ import reportPropTypes from '@pages/reportPropTypes'; import * as Task from '@userActions/Task'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/EditTaskForm'; const propTypes = { /** The report currently being looked at */ diff --git a/src/pages/tasks/TaskTitlePage.js b/src/pages/tasks/TaskTitlePage.js index 2b6597f152f9..249f90fea42f 100644 --- a/src/pages/tasks/TaskTitlePage.js +++ b/src/pages/tasks/TaskTitlePage.js @@ -4,7 +4,6 @@ import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/EditTaskForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -20,6 +19,7 @@ import reportPropTypes from '@pages/reportPropTypes'; import * as Task from '@userActions/Task'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/EditTaskForm'; const propTypes = { /** The report currently being looked at */ diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.js index 5d66a689c2f4..91d4d639f289 100644 --- a/src/pages/workspace/WorkspaceInviteMessagePage.js +++ b/src/pages/workspace/WorkspaceInviteMessagePage.js @@ -6,7 +6,6 @@ import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/WorkspaceInviteMessageForm'; import InputWrapper from '@components/Form/InputWrapper'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import MultipleAvatars from '@components/MultipleAvatars'; @@ -28,6 +27,7 @@ import * as Policy from '@userActions/Policy'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/WorkspaceInviteMessageForm'; import SearchInputManager from './SearchInputManager'; import {policyDefaultProps, policyPropTypes} from './withPolicy'; import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading'; diff --git a/src/pages/workspace/WorkspaceNamePage.tsx b/src/pages/workspace/WorkspaceNamePage.tsx index 961bbfabd0a0..16b9e8082278 100644 --- a/src/pages/workspace/WorkspaceNamePage.tsx +++ b/src/pages/workspace/WorkspaceNamePage.tsx @@ -1,7 +1,6 @@ import React, {useCallback} from 'react'; import {Keyboard, View} from 'react-native'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/WorkspaceSettingsForm'; import InputWrapper from '@components/Form/InputWrapper'; import type {FormInputErrors, FormOnyxValues} from '@components/Form/types'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -14,6 +13,7 @@ import * as ValidationUtils from '@libs/ValidationUtils'; import * as Policy from '@userActions/Policy'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/WorkspaceSettingsForm'; import withPolicy from './withPolicy'; import type {WithPolicyProps} from './withPolicy'; diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js index 03eff2772e29..8e5491b65aab 100644 --- a/src/pages/workspace/WorkspaceNewRoomPage.js +++ b/src/pages/workspace/WorkspaceNewRoomPage.js @@ -6,7 +6,6 @@ import _ from 'underscore'; import BlockingView from '@components/BlockingViews/BlockingView'; import Button from '@components/Button'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/NewRoomForm'; import InputWrapper from '@components/Form/InputWrapper'; import * as Illustrations from '@components/Icon/Illustrations'; import KeyboardAvoidingView from '@components/KeyboardAvoidingView'; @@ -33,6 +32,7 @@ import * as Report from '@userActions/Report'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/NewRoomForm'; const propTypes = { /** All reports shared with the user */ diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js index 009041ffeb75..71846553a205 100644 --- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js +++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js @@ -4,7 +4,6 @@ import {Keyboard, View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import _ from 'underscore'; import FormProvider from '@components/Form/FormProvider'; -import INPUT_IDS from '@components/Form/inputs/WorkspaceRateAndUnitForm'; import InputWrapper from '@components/Form/InputWrapper'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; import {withNetwork} from '@components/OnyxProvider'; @@ -24,6 +23,7 @@ import * as BankAccounts from '@userActions/BankAccounts'; import * as Policy from '@userActions/Policy'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import INPUT_IDS from '@src/types/form/WorkspaceRateAndUnitForm'; const propTypes = { ...policyPropTypes, diff --git a/src/components/Form/inputs/AddDebitCardForm.ts b/src/types/form/AddDebitCardForm.ts similarity index 100% rename from src/components/Form/inputs/AddDebitCardForm.ts rename to src/types/form/AddDebitCardForm.ts diff --git a/src/components/Form/inputs/CloseAccountForm.ts b/src/types/form/CloseAccountForm.ts similarity index 100% rename from src/components/Form/inputs/CloseAccountForm.ts rename to src/types/form/CloseAccountForm.ts diff --git a/src/components/Form/inputs/DateOfBirthForm.ts b/src/types/form/DateOfBirthForm.ts similarity index 100% rename from src/components/Form/inputs/DateOfBirthForm.ts rename to src/types/form/DateOfBirthForm.ts diff --git a/src/components/Form/inputs/DisplayNameForm.ts b/src/types/form/DisplayNameForm.ts similarity index 100% rename from src/components/Form/inputs/DisplayNameForm.ts rename to src/types/form/DisplayNameForm.ts diff --git a/src/components/Form/inputs/EditTaskForm.ts b/src/types/form/EditTaskForm.ts similarity index 100% rename from src/components/Form/inputs/EditTaskForm.ts rename to src/types/form/EditTaskForm.ts diff --git a/src/components/Form/inputs/GetPhysicalCardForm.ts b/src/types/form/GetPhysicalCardForm.ts similarity index 100% rename from src/components/Form/inputs/GetPhysicalCardForm.ts rename to src/types/form/GetPhysicalCardForm.ts diff --git a/src/components/Form/inputs/HomeAddressForm.ts b/src/types/form/HomeAddressForm.ts similarity index 100% rename from src/components/Form/inputs/HomeAddressForm.ts rename to src/types/form/HomeAddressForm.ts diff --git a/src/components/Form/inputs/IKnowTeacherForm.ts b/src/types/form/IKnowTeacherForm.ts similarity index 100% rename from src/components/Form/inputs/IKnowTeacherForm.ts rename to src/types/form/IKnowTeacherForm.ts diff --git a/src/components/Form/inputs/IntroSchoolPrincipalForm.ts b/src/types/form/IntroSchoolPrincipalForm.ts similarity index 100% rename from src/components/Form/inputs/IntroSchoolPrincipalForm.ts rename to src/types/form/IntroSchoolPrincipalForm.ts diff --git a/src/components/Form/inputs/LegalNameForm.ts b/src/types/form/LegalNameForm.ts similarity index 100% rename from src/components/Form/inputs/LegalNameForm.ts rename to src/types/form/LegalNameForm.ts diff --git a/src/components/Form/inputs/MoneyRequestAmountForm.ts b/src/types/form/MoneyRequestAmountForm.ts similarity index 100% rename from src/components/Form/inputs/MoneyRequestAmountForm.ts rename to src/types/form/MoneyRequestAmountForm.ts diff --git a/src/components/Form/inputs/MoneyRequestCreatedForm.ts b/src/types/form/MoneyRequestCreatedForm.ts similarity index 100% rename from src/components/Form/inputs/MoneyRequestCreatedForm.ts rename to src/types/form/MoneyRequestCreatedForm.ts diff --git a/src/components/Form/inputs/MoneyRequestDescriptionForm.ts b/src/types/form/MoneyRequestDescriptionForm.ts similarity index 100% rename from src/components/Form/inputs/MoneyRequestDescriptionForm.ts rename to src/types/form/MoneyRequestDescriptionForm.ts diff --git a/src/components/Form/inputs/MoneyRequestMerchantForm.ts b/src/types/form/MoneyRequestMerchantForm.ts similarity index 100% rename from src/components/Form/inputs/MoneyRequestMerchantForm.ts rename to src/types/form/MoneyRequestMerchantForm.ts diff --git a/src/components/Form/inputs/NewContactMethodForm.ts b/src/types/form/NewContactMethodForm.ts similarity index 100% rename from src/components/Form/inputs/NewContactMethodForm.ts rename to src/types/form/NewContactMethodForm.ts diff --git a/src/components/Form/inputs/NewRoomForm.ts b/src/types/form/NewRoomForm.ts similarity index 100% rename from src/components/Form/inputs/NewRoomForm.ts rename to src/types/form/NewRoomForm.ts diff --git a/src/components/Form/inputs/NewTaskForm.ts b/src/types/form/NewTaskForm.ts similarity index 100% rename from src/components/Form/inputs/NewTaskForm.ts rename to src/types/form/NewTaskForm.ts diff --git a/src/components/Form/inputs/PersonalBankAccountForm.ts b/src/types/form/PersonalBankAccountForm.ts similarity index 100% rename from src/components/Form/inputs/PersonalBankAccountForm.ts rename to src/types/form/PersonalBankAccountForm.ts diff --git a/src/components/Form/inputs/PrivateNotesForm.ts b/src/types/form/PrivateNotesForm.ts similarity index 100% rename from src/components/Form/inputs/PrivateNotesForm.ts rename to src/types/form/PrivateNotesForm.ts diff --git a/src/components/Form/inputs/ProfileSettingsForm.ts b/src/types/form/ProfileSettingsForm.ts similarity index 100% rename from src/components/Form/inputs/ProfileSettingsForm.ts rename to src/types/form/ProfileSettingsForm.ts diff --git a/src/components/Form/inputs/ReimbursementAccountForm.ts b/src/types/form/ReimbursementAccountForm.ts similarity index 100% rename from src/components/Form/inputs/ReimbursementAccountForm.ts rename to src/types/form/ReimbursementAccountForm.ts diff --git a/src/components/Form/inputs/ReportDescriptionForm.ts b/src/types/form/ReportDescriptionForm.ts similarity index 100% rename from src/components/Form/inputs/ReportDescriptionForm.ts rename to src/types/form/ReportDescriptionForm.ts diff --git a/src/components/Form/inputs/ReportFieldEditForm.ts b/src/types/form/ReportFieldEditForm.ts similarity index 100% rename from src/components/Form/inputs/ReportFieldEditForm.ts rename to src/types/form/ReportFieldEditForm.ts diff --git a/src/components/Form/inputs/ReportVirtualCardFraudForm.ts b/src/types/form/ReportVirtualCardFraudForm.ts similarity index 100% rename from src/components/Form/inputs/ReportVirtualCardFraudForm.ts rename to src/types/form/ReportVirtualCardFraudForm.ts diff --git a/src/components/Form/inputs/RequestPhysicalCardForm.ts b/src/types/form/RequestPhysicalCardForm.ts similarity index 100% rename from src/components/Form/inputs/RequestPhysicalCardForm.ts rename to src/types/form/RequestPhysicalCardForm.ts diff --git a/src/components/Form/inputs/RoomNameForm.ts b/src/types/form/RoomNameForm.ts similarity index 100% rename from src/components/Form/inputs/RoomNameForm.ts rename to src/types/form/RoomNameForm.ts diff --git a/src/components/Form/inputs/RoomSettingsForm.ts b/src/types/form/RoomSettingsForm.ts similarity index 100% rename from src/components/Form/inputs/RoomSettingsForm.ts rename to src/types/form/RoomSettingsForm.ts diff --git a/src/components/Form/inputs/SettingsStatusClearDateForm.ts b/src/types/form/SettingsStatusClearDateForm.ts similarity index 100% rename from src/components/Form/inputs/SettingsStatusClearDateForm.ts rename to src/types/form/SettingsStatusClearDateForm.ts diff --git a/src/components/Form/inputs/SettingsStatusSetClearAfterForm.ts b/src/types/form/SettingsStatusSetClearAfterForm.ts similarity index 100% rename from src/components/Form/inputs/SettingsStatusSetClearAfterForm.ts rename to src/types/form/SettingsStatusSetClearAfterForm.ts diff --git a/src/components/Form/inputs/SettingsStatusSetForm.ts b/src/types/form/SettingsStatusSetForm.ts similarity index 100% rename from src/components/Form/inputs/SettingsStatusSetForm.ts rename to src/types/form/SettingsStatusSetForm.ts diff --git a/src/components/Form/inputs/WaypointForm.ts b/src/types/form/WaypointForm.ts similarity index 100% rename from src/components/Form/inputs/WaypointForm.ts rename to src/types/form/WaypointForm.ts diff --git a/src/components/Form/inputs/WorkspaceInviteMessageForm.ts b/src/types/form/WorkspaceInviteMessageForm.ts similarity index 100% rename from src/components/Form/inputs/WorkspaceInviteMessageForm.ts rename to src/types/form/WorkspaceInviteMessageForm.ts diff --git a/src/components/Form/inputs/WorkspaceRateAndUnitForm.ts b/src/types/form/WorkspaceRateAndUnitForm.ts similarity index 100% rename from src/components/Form/inputs/WorkspaceRateAndUnitForm.ts rename to src/types/form/WorkspaceRateAndUnitForm.ts diff --git a/src/components/Form/inputs/WorkspaceSettingsForm.ts b/src/types/form/WorkspaceSettingsForm.ts similarity index 100% rename from src/components/Form/inputs/WorkspaceSettingsForm.ts rename to src/types/form/WorkspaceSettingsForm.ts diff --git a/src/components/Form/inputs/index.ts b/src/types/form/index.ts similarity index 100% rename from src/components/Form/inputs/index.ts rename to src/types/form/index.ts