From c8e2a66f9f79d8f18c0399a9806218c3b6b797e4 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 7 Oct 2019 09:11:53 +0300
Subject: [PATCH] Fix native emojis being cutoff in emoji picker (#3358)

---
 app/components/emoji_picker/emoji_picker_base.js | 6 +++---
 app/components/emoji_picker/emoji_picker_row.js  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/components/emoji_picker/emoji_picker_base.js b/app/components/emoji_picker/emoji_picker_base.js
index a8843a8ab..05a3afb61 100644
--- a/app/components/emoji_picker/emoji_picker_base.js
+++ b/app/components/emoji_picker/emoji_picker_base.js
@@ -72,7 +72,7 @@ export default class EmojiPicker extends PureComponent {
 
         this.sectionListGetItemLayout = sectionListGetItemLayout({
             getItemHeight: () => {
-                return (EMOJI_SIZE + 5) + (EMOJI_GUTTER * 2);
+                return (EMOJI_SIZE + 7) + (EMOJI_GUTTER * 2);
             },
             getSectionHeaderHeight: () => SECTION_HEADER_HEIGHT,
         });
@@ -161,7 +161,7 @@ export default class EmojiPicker extends PureComponent {
         let lastOffset = 0;
         return emojiSections.map((section) => {
             const start = lastOffset;
-            const nextOffset = (section.data.length * (EMOJI_SIZE + (EMOJI_GUTTER * 2))) + SECTION_HEADER_HEIGHT;
+            const nextOffset = (section.data.length * ((EMOJI_SIZE + 7) + (EMOJI_GUTTER * 2))) + SECTION_HEADER_HEIGHT;
             lastOffset += nextOffset;
 
             return start;
@@ -216,7 +216,7 @@ export default class EmojiPicker extends PureComponent {
 
     getNumberOfColumns = (deviceWidth) => {
         const shorten = DeviceTypes.IS_IPHONE_WITH_INSETS && this.props.isLandscape ? 4 : 2;
-        return Math.floor(Number(((deviceWidth - (SECTION_MARGIN * shorten)) / (EMOJI_SIZE + (EMOJI_GUTTER * shorten)))));
+        return Math.floor(Number(((deviceWidth - (SECTION_MARGIN * shorten)) / ((EMOJI_SIZE + 7) + (EMOJI_GUTTER * shorten)))));
     };
 
     renderItem = ({item}) => {
diff --git a/app/components/emoji_picker/emoji_picker_row.js b/app/components/emoji_picker/emoji_picker_row.js
index af0ae6bef..5527845f9 100644
--- a/app/components/emoji_picker/emoji_picker_row.js
+++ b/app/components/emoji_picker/emoji_picker_row.js
@@ -27,7 +27,7 @@ export default class EmojiPickerRow extends Component {
     renderEmojis = (emoji, index, emojis) => {
         const {emojiGutter, emojiSize} = this.props;
 
-        const size = emojiSize + 5;
+        const size = emojiSize + 7;
         const style = [
             styles.emoji,
             {