From 8105c9f098fd8e0bb1d910554ab208793e11cd01 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Fri, 15 Jul 2022 05:24:26 +0530
Subject: [PATCH 1/2] shouldDelayFocus added for android issue

---
 src/pages/SearchPage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js
index 30212fc2c711..9a5756240e50 100755
--- a/src/pages/SearchPage.js
+++ b/src/pages/SearchPage.js
@@ -177,6 +177,7 @@ class SearchPage extends Component {
                         />
                         <View style={[styles.flex1, styles.w100, styles.pRelative]}>
                             <OptionsSelector
+                                shouldDelayFocus
                                 sections={sections}
                                 value={this.state.searchValue}
                                 onSelectRow={this.selectReport}

From a34d47af6dc450cb880d3f8b153d417ac39ab324 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Fri, 15 Jul 2022 08:20:06 +0530
Subject: [PATCH 2/2] shouldDelayFocus added for android new group/chat

---
 src/pages/NewChatPage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
index 610782ba0d33..0e55bdbccfbc 100755
--- a/src/pages/NewChatPage.js
+++ b/src/pages/NewChatPage.js
@@ -224,6 +224,7 @@ class NewChatPage extends Component {
                             {!didScreenTransitionEnd && <FullScreenLoadingIndicator />}
                             {didScreenTransitionEnd && (
                                 <OptionsSelector
+                                    shouldDelayFocus
                                     canSelectMultipleOptions={this.props.isGroupChat}
                                     sections={sections}
                                     selectedOptions={this.state.selectedOptions}