Merge pull request #38958 from Expensify/aldo_fix-disabled-option-filter

Fix filter based on reportField.disabledOptions
Expensify · Mar 25, 2024 · b6d2c59 · b6d2c59
2 parents e18dd5f + cd7d814
commit b6d2c59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/pages/EditReportFieldDropdownPage.tsx b/src/pages/EditReportFieldDropdownPage.tsx
@@ -89,7 +89,7 @@ function EditReportFieldDropdownPage({fieldName, onSubmit, fieldKey, fieldValue,
                 });
             }
 
-            const filteredRecentlyUsedOptions = recentlyUsedOptions.filter((option) => option !== selectedValue);
+            const filteredRecentlyUsedOptions = recentlyUsedOptions.filter((option) => option !== selectedValue && fieldOptions.includes(option));
             if (filteredRecentlyUsedOptions.length > 0) {
                 newSections.push({
                     title: translate('common.recents'),

diff --git a/src/pages/EditReportFieldPage.tsx b/src/pages/EditReportFieldPage.tsx
@@ -106,7 +106,7 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps)
                 fieldKey={fieldKey}
                 fieldName={Str.UCFirst(reportField.name)}
                 fieldValue={fieldValue}
-                fieldOptions={reportField.values.filter((value) => !(value in reportField.disabledOptions))}
+                fieldOptions={reportField.values.filter((_value: string, index: number) => !reportField.disabledOptions[index])}
                 onSubmit={handleReportFieldChange}
             />
         );