improve TypeSelector props

rezkiy37 · Jun 20, 2024 · 206f3d6 · 206f3d6
1 parent 6a4342c
commit 206f3d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/pages/workspace/reportFields/CreatePolicyReportFieldPage.tsx b/src/pages/workspace/reportFields/CreatePolicyReportFieldPage.tsx
@@ -87,11 +87,9 @@ function CreatePolicyReportFieldPage({
                         />
                         <InputWrapper
                             InputComponent={TypeSelector}
+                            inputID={INPUT_IDS.TYPE}
                             label={translate('common.type')}
-                            description={translate('common.type')}
                             rightLabel={translate('common.required')}
-                            accessibilityLabel={translate('workspace.editor.typeInputLabel')}
-                            inputID={INPUT_IDS.TYPE}
                         />
                         <InputWrapper
                             InputComponent={TextPicker}

diff --git a/src/pages/workspace/reportFields/TypeSelector/index.tsx b/src/pages/workspace/reportFields/TypeSelector/index.tsx
@@ -1,14 +1,15 @@
 import {Str} from 'expensify-common';
 import React, {useState} from 'react';
 import {View} from 'react-native';
+import type {MenuItemBaseProps} from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import type {ReportFieldItemType} from '@components/ReportFieldTypePicker';
 import useLocalize from '@hooks/useLocalize';
 import {getReportFieldTypeTranslationKey} from '@libs/WorkspaceReportFieldsUtils';
 import type {PolicyReportFieldType} from '@src/types/onyx/Policy';
 import TypeSelectorModal from './TypeSelectorModal';
 
-type TypeSelectorProps = {
+type TypeSelectorProps = Pick<MenuItemBaseProps, 'label' | 'rightLabel'> & {
     /** Function to call when the user selects a type */
     onInputChange?: (value: string) => void;
 
@@ -19,7 +20,7 @@ type TypeSelectorProps = {
     label: string;
 };
 
-function TypeSelector({value, label, onInputChange}: TypeSelectorProps) {
+function TypeSelector({value, label, rightLabel, onInputChange}: TypeSelectorProps) {
     const {translate} = useLocalize();
 
     const [isPickerVisible, setIsPickerVisible] = useState(false);
@@ -43,6 +44,7 @@ function TypeSelector({value, label, onInputChange}: TypeSelectorProps) {
                 shouldShowRightIcon
                 title={value ? Str.recapitalize(translate(getReportFieldTypeTranslationKey(value as PolicyReportFieldType))) : ''}
                 description={label}
+                rightLabel={rightLabel}
                 onPress={showPickerModal}
             />
             <TypeSelectorModal