From 810c0f28cd5e111c1dc00c41a1628664a3ac1378 Mon Sep 17 00:00:00 2001
From: Situ Chandra Shil <108292595+situchan@users.noreply.github.com>
Date: Thu, 8 Jan 2026 21:18:03 +1100
Subject: [PATCH] Revert "fix: User does not appears as suggestion in chat
 creation list when first have a chat offline"

---
 src/libs/OptionsListUtils/index.ts |  4 +---
 src/libs/OptionsListUtils/types.ts |  3 ---
 src/libs/ReportUtils.ts            |  1 -
 src/pages/NewChatPage.tsx          | 11 +----------
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/libs/OptionsListUtils/index.ts b/src/libs/OptionsListUtils/index.ts
index 339f1c9a81f89..7a3e40a13a5a9 100644
--- a/src/libs/OptionsListUtils/index.ts
+++ b/src/libs/OptionsListUtils/index.ts
@@ -892,7 +892,6 @@ function createOption(
         isSelfDM: report ? reportUtilsIsSelfDM(report) : false,
         isChatRoom: report ? reportUtilsIsChatRoom(report) : false,
         isInvoiceRoom: report ? isInvoiceRoom(report) : false,
-        isDM: report ? isDM(report) : false,
 
         // Status properties - used in SearchOption context
         private_isArchived: undefined, // Set from reportNameValuePairs below
@@ -1845,7 +1844,6 @@ function isValidReport(option: SearchOption<Report>, config: IsValidReportsConfi
         excludeNonAdminWorkspaces,
         isRestrictedToPreferredPolicy,
         preferredPolicyID,
-        shouldAlwaysIncludeDM,
     } = config;
     const topmostReportId = Navigation.getTopmostReportId();
 
@@ -1941,7 +1939,7 @@ function isValidReport(option: SearchOption<Report>, config: IsValidReportsConfi
     - It doesn't have a login
     - It is not an invoice room that should be shown
     */
-    if (!isCurrentUserOwnedPolicyExpenseChatThatCouldShow && !includeMultipleParticipantReports && !option.login && (!option.isDM || !shouldAlwaysIncludeDM) && !shouldShowInvoiceRoom) {
+    if (!isCurrentUserOwnedPolicyExpenseChatThatCouldShow && !includeMultipleParticipantReports && !option.login && !shouldShowInvoiceRoom) {
         return false;
     }
 
diff --git a/src/libs/OptionsListUtils/types.ts b/src/libs/OptionsListUtils/types.ts
index e56b75130757f..814cc47f115e8 100644
--- a/src/libs/OptionsListUtils/types.ts
+++ b/src/libs/OptionsListUtils/types.ts
@@ -68,7 +68,6 @@ type SearchOptionData = Pick<
     | 'isChatRoom'
     | 'isInvoiceRoom'
     | 'isDefaultRoom'
-    | 'isDM'
 
     // Status properties
     | 'private_isArchived'
@@ -156,7 +155,6 @@ type GetValidReportsConfig = {
     isRestrictedToPreferredPolicy?: boolean;
     preferredPolicyID?: string;
     shouldUnreadBeBold?: boolean;
-    shouldAlwaysIncludeDM?: boolean;
 } & GetValidOptionsSharedConfig;
 
 type IsValidReportsConfig = Pick<
@@ -178,7 +176,6 @@ type IsValidReportsConfig = Pick<
     | 'excludeNonAdminWorkspaces'
     | 'isRestrictedToPreferredPolicy'
     | 'preferredPolicyID'
-    | 'shouldAlwaysIncludeDM'
 >;
 
 type GetOptionsConfig = {
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index d74ac180b90ba..192a9868dfd12 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -857,7 +857,6 @@ type OptionData = {
     isDefaultRoom?: boolean;
     isInvoiceRoom?: boolean;
     isExpenseReport?: boolean;
-    isDM?: boolean;
     isOptimisticPersonalDetail?: boolean;
     selected?: boolean;
     isOptimisticAccount?: boolean;
diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index d572ddd366c45..52e05cf17f1dd 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -100,7 +100,6 @@ function useOptions() {
         {
             betas: betas ?? [],
             includeSelfDM: true,
-            shouldAlwaysIncludeDM: true,
         },
         countryCode,
     );
@@ -343,14 +342,6 @@ function NewChatPage({ref}: NewChatPageProps) {
                 Navigation.dismissModalWithReport({reportID: option.reportID});
                 return;
             }
-            if (option?.reportID) {
-                Navigation.dismissModal({
-                    callback: () => {
-                        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(option?.reportID));
-                    },
-                });
-                return;
-            }
             if (selectedOptions.length && option) {
                 // Prevent excluded emails from being added to groups
                 if (option?.login && excludedGroupEmails.has(option.login)) {
@@ -380,7 +371,7 @@ function NewChatPage({ref}: NewChatPageProps) {
 
     const itemRightSideComponent = useCallback(
         (item: ListItem & Option, isFocused?: boolean) => {
-            if (!!item.isSelfDM || (item.login && excludedGroupEmails.has(item.login)) || !item.login) {
+            if (!!item.isSelfDM || (item.login && excludedGroupEmails.has(item.login))) {
                 return null;
             }