From 20dd73a0664f981b5ddbffb016d65ff366f908d3 Mon Sep 17 00:00:00 2001
From: Anjana Mendiratta <expertsquarrel@gmail.com>
Date: Wed, 12 Jul 2023 00:43:30 +0530
Subject: [PATCH 1/2] fix: no scrolling on no results text

Signed-off-by: Anjana Mendiratta <expertsquarrel@gmail.com>
---
 src/components/EmojiPicker/EmojiPickerMenu/index.native.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.native.js b/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
index 2f9c0ce25660..0c2df7f35a4b 100644
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
@@ -223,6 +223,7 @@ class EmojiPickerMenu extends Component {
                     removeClippedSubviews={false}
                     contentContainerStyle={styles.flexGrow1}
                     ListEmptyComponent={<Text style={[styles.disabledText]}>{this.props.translate('common.noResultsFound')}</Text>}
+                    scrollEnabled={this.state.filteredEmojis.length !== 0}
                 />
                 <EmojiSkinToneList
                     updatePreferredSkinTone={this.updatePreferredSkinTone}

From 0e7f151f0a99da84e009bcfae6de0d3be3a01f5d Mon Sep 17 00:00:00 2001
From: Anjana Mendiratta <expertsquarrel@gmail.com>
Date: Wed, 12 Jul 2023 14:41:24 +0530
Subject: [PATCH 2/2] fix: use alwaysBounceVertical instead

Signed-off-by: Anjana Mendiratta <expertsquarrel@gmail.com>
---
 src/components/EmojiPicker/EmojiPickerMenu/index.native.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.native.js b/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
index 0c2df7f35a4b..88e1c7df6986 100644
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
@@ -223,7 +223,7 @@ class EmojiPickerMenu extends Component {
                     removeClippedSubviews={false}
                     contentContainerStyle={styles.flexGrow1}
                     ListEmptyComponent={<Text style={[styles.disabledText]}>{this.props.translate('common.noResultsFound')}</Text>}
-                    scrollEnabled={this.state.filteredEmojis.length !== 0}
+                    alwaysBounceVertical={this.state.filteredEmojis.length !== 0}
                 />
                 <EmojiSkinToneList
                     updatePreferredSkinTone={this.updatePreferredSkinTone}