From 6dbaac6d5e9a66c358cbe6a933a8ef28bbd4229d Mon Sep 17 00:00:00 2001
From: Pujan <shahpujan1992@gmail.com>
Date: Wed, 28 Feb 2024 22:06:40 +0530
Subject: [PATCH 1/2] scrollPaddingTop applied to emoji flashlist

---
 .../EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js    | 8 ++++++++
 src/components/EmojiPicker/EmojiPickerMenu/index.js       | 2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js b/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js
index 1d2d15e4564c..fddd205b19e5 100644
--- a/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js
@@ -143,6 +143,14 @@ function BaseEmojiPickerMenu({headerEmojis, scrollToHeader, isFiltered, listWrap
                     contentContainerStyle={styles.ph4}
                     extraData={extraData}
                     getItemType={getItemType}
+                    overrideProps={{
+                        // scrollPaddingTop set to consider sticky header while scrolling, https://github.com/Expensify/App/issues/36883
+                        style: {
+                            minHeight: 1, 
+                            minWidth: 1,
+                            scrollPaddingTop: isFiltered ? 0 : CONST.EMOJI_PICKER_ITEM_HEIGHT
+                        }
+                    }}
                 />
             </View>
             <EmojiSkinToneList />
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js
index b08d2106ff93..ab3d90be7b23 100755
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js
@@ -336,8 +336,6 @@ function EmojiPickerMenu({forwardedRef, onEmojiSelected, activeEmoji}) {
                 scrollToHeader={scrollToHeader}
                 listWrapperStyle={[
                     listStyle,
-                    // Set scrollPaddingTop to consider sticky headers while scrolling
-                    {scrollPaddingTop: isListFiltered ? 0 : CONST.EMOJI_PICKER_ITEM_HEIGHT},
                     styles.flexShrink1,
                 ]}
                 ref={emojiListRef}

From a15579c05875e2bfe0f78bcfe25f1786de0739ec Mon Sep 17 00:00:00 2001
From: Pujan <shahpujan1992@gmail.com>
Date: Wed, 28 Feb 2024 22:25:56 +0530
Subject: [PATCH 2/2] prettier

---
 .../EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js      | 6 +++---
 src/components/EmojiPicker/EmojiPickerMenu/index.js         | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js b/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js
index fddd205b19e5..a9bc1eeac8b6 100644
--- a/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.js
@@ -146,10 +146,10 @@ function BaseEmojiPickerMenu({headerEmojis, scrollToHeader, isFiltered, listWrap
                     overrideProps={{
                         // scrollPaddingTop set to consider sticky header while scrolling, https://github.com/Expensify/App/issues/36883
                         style: {
-                            minHeight: 1, 
+                            minHeight: 1,
                             minWidth: 1,
-                            scrollPaddingTop: isFiltered ? 0 : CONST.EMOJI_PICKER_ITEM_HEIGHT
-                        }
+                            scrollPaddingTop: isFiltered ? 0 : CONST.EMOJI_PICKER_ITEM_HEIGHT,
+                        },
                     }}
                 />
             </View>
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js
index ab3d90be7b23..25a40a709658 100755
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js
@@ -334,10 +334,7 @@ function EmojiPickerMenu({forwardedRef, onEmojiSelected, activeEmoji}) {
                 isFiltered={isListFiltered}
                 headerEmojis={headerEmojis}
                 scrollToHeader={scrollToHeader}
-                listWrapperStyle={[
-                    listStyle,
-                    styles.flexShrink1,
-                ]}
+                listWrapperStyle={[listStyle, styles.flexShrink1]}
                 ref={emojiListRef}
                 data={filteredEmojis}
                 renderItem={renderItem}