From 5c68d8b3ab9e3dad4b5dd10e1df4fb12828ab2ce Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Wed, 28 Feb 2024 16:31:07 -0500
Subject: [PATCH] Revert other pages

---
 src/components/OptionsSelector/index.android.js |  1 +
 src/pages/NewChatPage.tsx                       |  1 +
 tests/perf-test/OptionsSelector.perf-test.js    | 14 --------------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/components/OptionsSelector/index.android.js b/src/components/OptionsSelector/index.android.js
index 9f7c924e427f..ace5a5614ffb 100644
--- a/src/components/OptionsSelector/index.android.js
+++ b/src/components/OptionsSelector/index.android.js
@@ -6,6 +6,7 @@ const OptionsSelector = forwardRef((props, ref) => (
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
         ref={ref}
+        shouldDelayFocus
     />
 ));
 
diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index 054f229ac16a..72393e89ae1a 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -273,6 +273,7 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, isSearchingF
                             textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                             isLoadingNewOptions={isSearchingForReports}
+                            autoFocus={false}
                         />
                     </View>
                     {isSmallScreenWidth && <OfflineIndicator />}
diff --git a/tests/perf-test/OptionsSelector.perf-test.js b/tests/perf-test/OptionsSelector.perf-test.js
index 260a9da06c6b..6104ded05c6a 100644
--- a/tests/perf-test/OptionsSelector.perf-test.js
+++ b/tests/perf-test/OptionsSelector.perf-test.js
@@ -5,20 +5,6 @@ import _ from 'underscore';
 import OptionsSelector from '@src/components/OptionsSelector';
 import variables from '@src/styles/variables';
 
-jest.mock('@react-navigation/native', () => {
-    const actualNav = jest.requireActual('@react-navigation/native');
-    return {
-        ...actualNav,
-        useNavigation: () => ({
-            navigate: jest.fn(),
-            addListener: () => jest.fn(),
-        }),
-        useIsFocused: () => ({
-            navigate: jest.fn(),
-        }),
-    };
-});
-
 jest.mock('../../src/components/withLocalize', () => (Component) => {
     function WrappedComponent(props) {
         return (