From d164b7ac3ebb6e9e5dc28f38a0bc5d1ef3600624 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 19 Jun 2024 11:46:37 +0700
Subject: [PATCH 01/11] Workspace member has option to edit categories, which
 leads to not here page

---
 src/languages/en.ts                           |  4 ++
 src/languages/es.ts                           |  4 ++
 .../request/step/IOURequestStepCategory.tsx   | 61 ++++++++++++++-----
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index e3eaafc54bd3..96d037128474 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2193,7 +2193,11 @@ export default {
             subtitle: 'Get a better overview of where money is being spent. Use our default categories or add your own.',
             emptyCategories: {
                 title: "You haven't created any categories",
+                memberTitle: (workspaceName: string) => `${workspaceName} doesn' have any categories enabled.`,
                 subtitle: 'Add a category to organize your spend.',
+                otherWorkspace: 'Categorize this expense by choosing a different workspace, or ',
+                askYourAdmin: 'ask your admin',
+                enableForThisWorkspace: ' to enable categories for this workspace.',
             },
             updateFailureMessage: 'An error occurred while updating the category, please try again.',
             createFailureMessage: 'An error occurred while creating the category, please try again.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index ece0f7f70cdb..1136b827ec45 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2230,6 +2230,10 @@ export default {
             emptyCategories: {
                 title: 'No has creado ninguna categoría',
                 subtitle: 'Añade una categoría para organizar tu gasto.',
+                memberTitle: (workspaceName: string) => `${workspaceName} no tiene ninguna categoría activada.`,
+                otherWorkspace: 'Categorice este gasto eligiendo un espacio de trabajo diferente, o ',
+                askYourAdmin: 'pida a su administrador',
+                enableForThisWorkspace: ' que habilite categorías para este espacio de trabajo.',
             },
             updateFailureMessage: 'Se ha producido un error al intentar eliminar la categoría. Por favor, inténtalo más tarde.',
             createFailureMessage: 'Se ha producido un error al intentar crear la categoría. Por favor, inténtalo más tarde.',
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.tsx b/src/pages/iou/request/step/IOURequestStepCategory.tsx
index 18ddc19644ef..12032b07fd65 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCategory.tsx
@@ -1,17 +1,20 @@
 import lodashIsEmpty from 'lodash/isEmpty';
 import React, {useEffect} from 'react';
+import type {ReactNode} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import CategoryPicker from '@components/CategoryPicker';
 import FixedFooter from '@components/FixedFooter';
+import Icon from '@components/Icon';
 import * as Illustrations from '@components/Icon/Illustrations';
 import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
-import WorkspaceEmptyStateSection from '@components/WorkspaceEmptyStateSection';
+import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
@@ -85,6 +88,8 @@ function IOURequestStepCategory({
     const {translate} = useLocalize();
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     const isEditingSplitBill = isEditing && iouType === CONST.IOU.TYPE.SPLIT;
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const transactionCategory = ReportUtils.getTransactionDetails(isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction)?.category;
 
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -151,6 +156,36 @@ function IOURequestStepCategory({
         navigateBack();
     };
 
+    const renderCategoriesEmptyStateSection = (): ReactNode => (
+        <View style={[styles.pageWrapper, styles.workspaceSection, styles.ph8, shouldUseNarrowLayout ? styles.pv10 : styles.pv12, styles.flex1, styles.justifyContentCenter]}>
+            <Icon
+                src={Illustrations.EmptyStateExpenses}
+                width={184}
+                height={116}
+            />
+
+            <View style={[styles.w100, styles.pt5]}>
+                <View style={[styles.flexRow, styles.justifyContentCenter, styles.w100, styles.mh1, styles.flexShrink1]}>
+                    <Text style={[styles.textHeadline, styles.emptyCardSectionTitle]}>
+                        {isAdmin ? translate('workspace.categories.emptyCategories.title') : translate('workspace.categories.emptyCategories.memberTitle', policy?.name ?? '')}
+                    </Text>
+                </View>
+
+                <View style={[styles.flexRow, styles.justifyContentCenter, styles.w100, styles.mt1, styles.mh1]}>
+                    {isAdmin ? (
+                        <Text style={[styles.textNormal, styles.emptyCardSectionSubtitle]}>{translate('workspace.categories.emptyCategories.subtitle')}</Text>
+                    ) : (
+                        <Text style={[styles.textNormal, styles.emptyCardSectionSubtitle]}>
+                            {translate('workspace.categories.emptyCategories.otherWorkspace')}
+                            <TextLink onPress={() => {}}>{translate('workspace.categories.emptyCategories.askYourAdmin')}</TextLink>
+                            {translate('workspace.categories.emptyCategories.enableForThisWorkspace')}
+                        </Text>
+                    )}
+                </View>
+            </View>
+        </View>
+    );
+
     return (
         <StepScreenWrapper
             headerTitle={translate('common.category')}
@@ -168,27 +203,23 @@ function IOURequestStepCategory({
             )}
             {shouldShowEmptyState && (
                 <View style={[styles.flex1]}>
-                    <WorkspaceEmptyStateSection
-                        shouldStyleAsCard={false}
-                        icon={Illustrations.EmptyStateExpenses}
-                        title={translate('workspace.categories.emptyCategories.title')}
-                        subtitle={translate('workspace.categories.emptyCategories.subtitle')}
-                        containerStyle={[styles.flex1, styles.justifyContentCenter]}
-                    />
+                    {renderCategoriesEmptyStateSection()}
                     <FixedFooter style={[styles.mtAuto, styles.pt5]}>
                         <Button
                             large
                             success
                             style={[styles.w100]}
                             onPress={() =>
-                                Navigation.navigate(
-                                    ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(
-                                        policy?.id ?? '-1',
-                                        ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, report?.reportID ?? '-1', backTo, reportActionID),
-                                    ),
-                                )
+                                isAdmin
+                                    ? Navigation.navigate(
+                                          ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(
+                                              policy?.id ?? '-1',
+                                              ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, report?.reportID ?? '-1', backTo, reportActionID),
+                                          ),
+                                      )
+                                    : Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID ?? '-1', undefined, action))
                             }
-                            text={translate('workspace.categories.editCategories')}
+                            text={isAdmin ? translate('workspace.categories.editCategories') : translate('common.buttonConfirm')}
                             pressOnEnter
                         />
                     </FixedFooter>

From e40ee9be761fb651e27f6c326af6c9f511f76abe Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 19 Jun 2024 15:26:37 +0700
Subject: [PATCH 02/11] add link ask to admin

---
 src/pages/iou/request/step/IOURequestStepCategory.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepCategory.tsx b/src/pages/iou/request/step/IOURequestStepCategory.tsx
index 12032b07fd65..bf4c2dff1761 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCategory.tsx
@@ -91,7 +91,6 @@ function IOURequestStepCategory({
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const transactionCategory = ReportUtils.getTransactionDetails(isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction)?.category;
-
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const reportAction = reportActions?.[report?.parentReportActionID || reportActionID] ?? null;
 
@@ -177,7 +176,13 @@ function IOURequestStepCategory({
                     ) : (
                         <Text style={[styles.textNormal, styles.emptyCardSectionSubtitle]}>
                             {translate('workspace.categories.emptyCategories.otherWorkspace')}
-                            <TextLink onPress={() => {}}>{translate('workspace.categories.emptyCategories.askYourAdmin')}</TextLink>
+                            <TextLink
+                                onPress={() => {
+                                    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? '-1'));
+                                }}
+                            >
+                                {translate('workspace.categories.emptyCategories.askYourAdmin')}
+                            </TextLink>
                             {translate('workspace.categories.emptyCategories.enableForThisWorkspace')}
                         </Text>
                     )}

From 4add17c46158454efee979b9d2011db3efc58823 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Mon, 24 Jun 2024 14:57:05 +0700
Subject: [PATCH 03/11] revert link ask to admin

---
 src/pages/iou/request/step/IOURequestStepCategory.tsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepCategory.tsx b/src/pages/iou/request/step/IOURequestStepCategory.tsx
index bf4c2dff1761..12032b07fd65 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCategory.tsx
@@ -91,6 +91,7 @@ function IOURequestStepCategory({
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const transactionCategory = ReportUtils.getTransactionDetails(isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction)?.category;
+
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const reportAction = reportActions?.[report?.parentReportActionID || reportActionID] ?? null;
 
@@ -176,13 +177,7 @@ function IOURequestStepCategory({
                     ) : (
                         <Text style={[styles.textNormal, styles.emptyCardSectionSubtitle]}>
                             {translate('workspace.categories.emptyCategories.otherWorkspace')}
-                            <TextLink
-                                onPress={() => {
-                                    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? '-1'));
-                                }}
-                            >
-                                {translate('workspace.categories.emptyCategories.askYourAdmin')}
-                            </TextLink>
+                            <TextLink onPress={() => {}}>{translate('workspace.categories.emptyCategories.askYourAdmin')}</TextLink>
                             {translate('workspace.categories.emptyCategories.enableForThisWorkspace')}
                         </Text>
                     )}

From 80bf94704af9e30080085cf09876c12d4b220cf8 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Mon, 24 Jun 2024 14:57:25 +0700
Subject: [PATCH 04/11] Revert "Workspace member has option to edit categories,
 which leads to not here page"

This reverts commit d164b7ac3ebb6e9e5dc28f38a0bc5d1ef3600624.
---
 src/languages/en.ts                           |  4 --
 src/languages/es.ts                           |  4 --
 .../request/step/IOURequestStepCategory.tsx   | 61 +++++--------------
 3 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 96d037128474..e3eaafc54bd3 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2193,11 +2193,7 @@ export default {
             subtitle: 'Get a better overview of where money is being spent. Use our default categories or add your own.',
             emptyCategories: {
                 title: "You haven't created any categories",
-                memberTitle: (workspaceName: string) => `${workspaceName} doesn' have any categories enabled.`,
                 subtitle: 'Add a category to organize your spend.',
-                otherWorkspace: 'Categorize this expense by choosing a different workspace, or ',
-                askYourAdmin: 'ask your admin',
-                enableForThisWorkspace: ' to enable categories for this workspace.',
             },
             updateFailureMessage: 'An error occurred while updating the category, please try again.',
             createFailureMessage: 'An error occurred while creating the category, please try again.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1136b827ec45..ece0f7f70cdb 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2230,10 +2230,6 @@ export default {
             emptyCategories: {
                 title: 'No has creado ninguna categoría',
                 subtitle: 'Añade una categoría para organizar tu gasto.',
-                memberTitle: (workspaceName: string) => `${workspaceName} no tiene ninguna categoría activada.`,
-                otherWorkspace: 'Categorice este gasto eligiendo un espacio de trabajo diferente, o ',
-                askYourAdmin: 'pida a su administrador',
-                enableForThisWorkspace: ' que habilite categorías para este espacio de trabajo.',
             },
             updateFailureMessage: 'Se ha producido un error al intentar eliminar la categoría. Por favor, inténtalo más tarde.',
             createFailureMessage: 'Se ha producido un error al intentar crear la categoría. Por favor, inténtalo más tarde.',
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.tsx b/src/pages/iou/request/step/IOURequestStepCategory.tsx
index 12032b07fd65..18ddc19644ef 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCategory.tsx
@@ -1,20 +1,17 @@
 import lodashIsEmpty from 'lodash/isEmpty';
 import React, {useEffect} from 'react';
-import type {ReactNode} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import CategoryPicker from '@components/CategoryPicker';
 import FixedFooter from '@components/FixedFooter';
-import Icon from '@components/Icon';
 import * as Illustrations from '@components/Icon/Illustrations';
 import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
-import TextLink from '@components/TextLink';
+import WorkspaceEmptyStateSection from '@components/WorkspaceEmptyStateSection';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
@@ -88,8 +85,6 @@ function IOURequestStepCategory({
     const {translate} = useLocalize();
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     const isEditingSplitBill = isEditing && iouType === CONST.IOU.TYPE.SPLIT;
-    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const transactionCategory = ReportUtils.getTransactionDetails(isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction)?.category;
 
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -156,36 +151,6 @@ function IOURequestStepCategory({
         navigateBack();
     };
 
-    const renderCategoriesEmptyStateSection = (): ReactNode => (
-        <View style={[styles.pageWrapper, styles.workspaceSection, styles.ph8, shouldUseNarrowLayout ? styles.pv10 : styles.pv12, styles.flex1, styles.justifyContentCenter]}>
-            <Icon
-                src={Illustrations.EmptyStateExpenses}
-                width={184}
-                height={116}
-            />
-
-            <View style={[styles.w100, styles.pt5]}>
-                <View style={[styles.flexRow, styles.justifyContentCenter, styles.w100, styles.mh1, styles.flexShrink1]}>
-                    <Text style={[styles.textHeadline, styles.emptyCardSectionTitle]}>
-                        {isAdmin ? translate('workspace.categories.emptyCategories.title') : translate('workspace.categories.emptyCategories.memberTitle', policy?.name ?? '')}
-                    </Text>
-                </View>
-
-                <View style={[styles.flexRow, styles.justifyContentCenter, styles.w100, styles.mt1, styles.mh1]}>
-                    {isAdmin ? (
-                        <Text style={[styles.textNormal, styles.emptyCardSectionSubtitle]}>{translate('workspace.categories.emptyCategories.subtitle')}</Text>
-                    ) : (
-                        <Text style={[styles.textNormal, styles.emptyCardSectionSubtitle]}>
-                            {translate('workspace.categories.emptyCategories.otherWorkspace')}
-                            <TextLink onPress={() => {}}>{translate('workspace.categories.emptyCategories.askYourAdmin')}</TextLink>
-                            {translate('workspace.categories.emptyCategories.enableForThisWorkspace')}
-                        </Text>
-                    )}
-                </View>
-            </View>
-        </View>
-    );
-
     return (
         <StepScreenWrapper
             headerTitle={translate('common.category')}
@@ -203,23 +168,27 @@ function IOURequestStepCategory({
             )}
             {shouldShowEmptyState && (
                 <View style={[styles.flex1]}>
-                    {renderCategoriesEmptyStateSection()}
+                    <WorkspaceEmptyStateSection
+                        shouldStyleAsCard={false}
+                        icon={Illustrations.EmptyStateExpenses}
+                        title={translate('workspace.categories.emptyCategories.title')}
+                        subtitle={translate('workspace.categories.emptyCategories.subtitle')}
+                        containerStyle={[styles.flex1, styles.justifyContentCenter]}
+                    />
                     <FixedFooter style={[styles.mtAuto, styles.pt5]}>
                         <Button
                             large
                             success
                             style={[styles.w100]}
                             onPress={() =>
-                                isAdmin
-                                    ? Navigation.navigate(
-                                          ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(
-                                              policy?.id ?? '-1',
-                                              ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, report?.reportID ?? '-1', backTo, reportActionID),
-                                          ),
-                                      )
-                                    : Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID ?? '-1', undefined, action))
+                                Navigation.navigate(
+                                    ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(
+                                        policy?.id ?? '-1',
+                                        ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, report?.reportID ?? '-1', backTo, reportActionID),
+                                    ),
+                                )
                             }
-                            text={isAdmin ? translate('workspace.categories.editCategories') : translate('common.buttonConfirm')}
+                            text={translate('workspace.categories.editCategories')}
                             pressOnEnter
                         />
                     </FixedFooter>

From d4f52c545c241bca79aa98ee9a132d5a0b83d01c Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Mon, 24 Jun 2024 14:58:31 +0700
Subject: [PATCH 05/11] filter policy don't have any enabled categories

---
 src/libs/OptionsListUtils.ts                  | 23 ++++++++++++++++---
 .../MoneyRequestParticipantsSelector.tsx      |  8 ++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index ad0cf6974f70..78fb83a5b25c 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -175,6 +175,7 @@ type GetOptionsConfig = {
     recentlyUsedPolicyReportFieldOptions?: string[];
     transactionViolations?: OnyxCollection<TransactionViolation[]>;
     includeInvoiceRooms?: boolean;
+    isCategorizeAction?: boolean;
 };
 
 type GetUserToInviteConfig = {
@@ -268,6 +269,13 @@ Onyx.connect({
     },
 });
 
+let allPolicyCategories: OnyxCollection<PolicyCategories> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_CATEGORIES,
+    waitForCollectionCallback: true,
+    callback: (val) => (allPolicyCategories = val),
+});
+
 const lastReportActions: ReportActions = {};
 const allSortedReportActions: Record<string, ReportAction[]> = {};
 let allReportActions: OnyxCollection<ReportActions>;
@@ -1730,6 +1738,7 @@ function getOptions(
         policyReportFieldOptions = [],
         recentlyUsedPolicyReportFieldOptions = [],
         includeInvoiceRooms = false,
+        isCategorizeAction = false,
     }: GetOptionsConfig,
 ): Options {
     if (includeCategories) {
@@ -1970,8 +1979,15 @@ function getOptions(
             }
 
             reportOption.isSelected = isReportSelected(reportOption, selectedOptions);
-
-            recentReportOptions.push(reportOption);
+            if (isCategorizeAction) {
+                const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${reportOption.policyID}`] ?? {};
+                const count = getEnabledCategoriesCount(policyCategories);
+                if (count !== 0) {
+                    recentReportOptions.push(reportOption);
+                }
+            } else {
+                recentReportOptions.push(reportOption);
+            }
 
             // Add this login to the exclude list so it won't appear when we process the personal details
             if (reportOption.login) {
@@ -2025,7 +2041,6 @@ function getOptions(
         personalDetailsOptions = [];
         recentReportOptions = orderOptions(recentReportOptions, searchValue, {preferChatroomsOverThreads: true});
     }
-
     return {
         personalDetails: personalDetailsOptions,
         recentReports: recentReportOptions,
@@ -2131,6 +2146,7 @@ function getFilteredOptions(
     recentlyUsedPolicyReportFieldOptions: string[] = [],
     maxRecentReportsToShow = 5,
     includeInvoiceRooms = false,
+    isCategorizeAction = false,
 ) {
     return getOptions(
         {reports, personalDetails},
@@ -2158,6 +2174,7 @@ function getFilteredOptions(
             policyReportFieldOptions,
             recentlyUsedPolicyReportFieldOptions,
             includeInvoiceRooms,
+            isCategorizeAction,
         },
     );
 }
diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
index 0caa8b6cd7a6..bd9d825bccb1 100644
--- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -69,7 +69,7 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic
 
     const isIOUSplit = iouType === CONST.IOU.TYPE.SPLIT;
     const isCategorizeOrShareAction = [CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].some((option) => option === action);
-
+    const isCategorizeAction = CONST.IOU.ACTION.CATEGORIZE == action;
     const shouldShowReferralBanner = !isDismissed && iouType !== CONST.IOU.TYPE.INVOICE;
 
     useEffect(() => {
@@ -117,6 +117,7 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic
             undefined,
             isCategorizeOrShareAction ? 0 : undefined,
             iouType === CONST.IOU.TYPE.INVOICE,
+            isCategorizeAction,
         );
 
         const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(
@@ -159,6 +160,7 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic
         return [newSections, chatOptions];
     }, [
         areOptionsInitialized,
+        didScreenTransitionEnd,
         options.reports,
         options.personalDetails,
         betas,
@@ -168,10 +170,10 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic
         action,
         canUseP2PDistanceRequests,
         iouRequestType,
+        isCategorizeOrShareAction,
+        isCategorizeAction,
         personalDetails,
         translate,
-        didScreenTransitionEnd,
-        isCategorizeOrShareAction,
     ]);
 
     /**

From 0f9ca5eb52af5a176066c3d4e15a9982cfb8b36f Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Mon, 24 Jun 2024 15:16:44 +0700
Subject: [PATCH 06/11] fix lint

---
 src/pages/iou/request/MoneyRequestParticipantsSelector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
index 0d3be048778a..4f094f98a9e9 100644
--- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -68,7 +68,7 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic
 
     const isIOUSplit = iouType === CONST.IOU.TYPE.SPLIT;
     const isCategorizeOrShareAction = [CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].some((option) => option === action);
-    const isCategorizeAction = CONST.IOU.ACTION.CATEGORIZE == action;
+    const isCategorizeAction = CONST.IOU.ACTION.CATEGORIZE === action;
     const shouldShowReferralBanner = !isDismissed && iouType !== CONST.IOU.TYPE.INVOICE;
 
     useEffect(() => {

From c60d9af2bfcf498fcae9f576550691546868f75a Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Mon, 1 Jul 2024 16:15:34 +0700
Subject: [PATCH 07/11] Update
 src/pages/iou/request/MoneyRequestParticipantsSelector.tsx

Co-authored-by: Gandalf <whogandalf@gmail.com>
---
 src/pages/iou/request/MoneyRequestParticipantsSelector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
index 55c089f0fcbc..2a9a502ae1a0 100644
--- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -69,7 +69,7 @@ function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onF
 
     const isIOUSplit = iouType === CONST.IOU.TYPE.SPLIT;
     const isCategorizeOrShareAction = [CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].some((option) => option === action);
-    const isCategorizeAction = CONST.IOU.ACTION.CATEGORIZE === action;
+    const isCategorizeAction = action === CONST.IOU.ACTION.CATEGORIZE;
     const shouldShowReferralBanner = !isDismissed && iouType !== CONST.IOU.TYPE.INVOICE;
 
     useEffect(() => {

From a42e94623c438f619df327d896aec9ab61db9cf8 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Fri, 5 Jul 2024 10:20:30 +0700
Subject: [PATCH 08/11] fix logic get action name

---
 src/libs/OptionsListUtils.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 0d640511ccc7..ff550bd1a54f 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -9,6 +9,7 @@ import Onyx from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import {FallbackAvatar} from '@components/Icon/Expensicons';
 import type {SelectedTagOption} from '@components/TagPicker';
+import type {IOUAction} from '@src/CONST';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -175,8 +176,8 @@ type GetOptionsConfig = {
     recentlyUsedPolicyReportFieldOptions?: string[];
     transactionViolations?: OnyxCollection<TransactionViolation[]>;
     includeInvoiceRooms?: boolean;
-    isCategorizeAction?: boolean;
     includeDomainEmail?: boolean;
+    action?: IOUAction;
 };
 
 type GetUserToInviteConfig = {
@@ -1811,8 +1812,8 @@ function getOptions(
         policyReportFieldOptions = [],
         recentlyUsedPolicyReportFieldOptions = [],
         includeInvoiceRooms = false,
-        isCategorizeAction = false,
         includeDomainEmail = false,
+        action,
     }: GetOptionsConfig,
 ): Options {
     if (includeCategories) {
@@ -2051,10 +2052,9 @@ function getOptions(
             }
 
             reportOption.isSelected = isReportSelected(reportOption, selectedOptions);
-            if (isCategorizeAction) {
+            if (action === CONST.IOU.ACTION.CATEGORIZE) {
                 const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${reportOption.policyID}`] ?? {};
-                const count = getEnabledCategoriesCount(policyCategories);
-                if (count !== 0) {
+                if (getEnabledCategoriesCount(policyCategories) !== 0) {
                     recentReportOptions.push(reportOption);
                 }
             } else {
@@ -2221,7 +2221,7 @@ function getFilteredOptions(
     policyReportFieldOptions: string[] = [],
     recentlyUsedPolicyReportFieldOptions: string[] = [],
     includeInvoiceRooms = false,
-    isCategorizeAction = false,
+    action: IOUAction | undefined = undefined,
 ) {
     return getOptions(
         {reports, personalDetails},
@@ -2249,7 +2249,7 @@ function getFilteredOptions(
             policyReportFieldOptions,
             recentlyUsedPolicyReportFieldOptions,
             includeInvoiceRooms,
-            isCategorizeAction,
+            action,
         },
     );
 }

From 4b8305ceae08306287359b8e905d964711003100 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Fri, 5 Jul 2024 10:23:56 +0700
Subject: [PATCH 09/11] fix lint

---
 src/pages/iou/request/MoneyRequestParticipantsSelector.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
index e2e83c84b7a4..ae041963331d 100644
--- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -72,7 +72,6 @@ function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onF
 
     const isIOUSplit = iouType === CONST.IOU.TYPE.SPLIT;
     const isCategorizeOrShareAction = [CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].some((option) => option === action);
-    const isCategorizeAction = action === CONST.IOU.ACTION.CATEGORIZE;
     const shouldShowReferralBanner = !isDismissed && iouType !== CONST.IOU.TYPE.INVOICE;
 
     useEffect(() => {
@@ -124,7 +123,7 @@ function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onF
             undefined,
             undefined,
             iouType === CONST.IOU.TYPE.INVOICE,
-            isCategorizeAction,
+            action,
         );
 
         return optionList;
@@ -136,7 +135,6 @@ function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onF
         didScreenTransitionEnd,
         iouRequestType,
         iouType,
-        isCategorizeAction,
         isCategorizeOrShareAction,
         options.personalDetails,
         options.reports,

From 10d0e5d73bbe8c34597a091784dbde9bcebc4ef4 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 10 Jul 2024 06:01:00 +0700
Subject: [PATCH 10/11] fix lint

---
 src/libs/OptionsListUtils.ts                               | 2 ++
 src/pages/iou/request/MoneyRequestParticipantsSelector.tsx | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 3673b97c4aeb..05c8eab13811 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -2050,6 +2050,7 @@ function getOptions(
             }
 
             reportOption.isSelected = isReportSelected(reportOption, selectedOptions);
+
             if (action === CONST.IOU.ACTION.CATEGORIZE) {
                 const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${reportOption.policyID}`] ?? {};
                 if (getEnabledCategoriesCount(policyCategories) !== 0) {
@@ -2114,6 +2115,7 @@ function getOptions(
         personalDetailsOptions = [];
         recentReportOptions = orderOptions(recentReportOptions, searchValue, {preferChatroomsOverThreads: true});
     }
+    
     return {
         personalDetails: personalDetailsOptions,
         recentReports: recentReportOptions,
diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
index df736c47746d..8c3554d47e7a 100644
--- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -210,6 +210,7 @@ function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onF
                 shouldShow: true,
             });
         }
+        
         const headerMessage = OptionsListUtils.getHeaderMessage(
             (chatOptions.personalDetails ?? []).length + (chatOptions.recentReports ?? []).length !== 0,
             !!chatOptions?.userToInvite,

From dcb160f5771c203fa1280ab07ec7463475603fb4 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 10 Jul 2024 06:04:22 +0700
Subject: [PATCH 11/11] fix lint

---
 src/libs/OptionsListUtils.ts                               | 2 +-
 src/pages/iou/request/MoneyRequestParticipantsSelector.tsx | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 05c8eab13811..2507c8e24e6b 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -2115,7 +2115,7 @@ function getOptions(
         personalDetailsOptions = [];
         recentReportOptions = orderOptions(recentReportOptions, searchValue, {preferChatroomsOverThreads: true});
     }
-    
+
     return {
         personalDetails: personalDetailsOptions,
         recentReports: recentReportOptions,
diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
index 8c3554d47e7a..5f10b403f5e9 100644
--- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -72,6 +72,7 @@ function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onF
 
     const isIOUSplit = iouType === CONST.IOU.TYPE.SPLIT;
     const isCategorizeOrShareAction = [CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].some((option) => option === action);
+
     const shouldShowReferralBanner = !isDismissed && iouType !== CONST.IOU.TYPE.INVOICE;
 
     useEffect(() => {
@@ -210,7 +211,7 @@ function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onF
                 shouldShow: true,
             });
         }
-        
+
         const headerMessage = OptionsListUtils.getHeaderMessage(
             (chatOptions.personalDetails ?? []).length + (chatOptions.recentReports ?? []).length !== 0,
             !!chatOptions?.userToInvite,