Merge pull request #2468 from Expensify/stites-removeBrokenEmojis

Expensify · Apr 20, 2021 · de24540 · de24540
2 parents dd5adba + 6fc4e4b
commit de24540
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 52 deletions.
diff --git a/assets/emojis.js b/assets/emojis.js
@@ -1564,28 +1564,6 @@ const emojis = [
             'romance',
         ],
     },
-    {
-        code: '👩‍❤️‍💋‍👨',
-        keywords: [
-            'kiss',
-            'man',
-            'woman',
-        ],
-    },
-    {
-        code: '👨‍❤️‍💋‍👨',
-        keywords: [
-            'kiss',
-            'man',
-        ],
-    },
-    {
-        code: '👩‍❤️‍💋‍👩',
-        keywords: [
-            'kiss',
-            'woman',
-        ],
-    },
     {
         code: '💑',
         keywords: [
@@ -1595,28 +1573,6 @@ const emojis = [
             'romance',
         ],
     },
-    {
-        code: '👩‍❤️‍👨',
-        keywords: [
-            'couple',
-            'man',
-            'woman',
-        ],
-    },
-    {
-        code: '👨‍❤️‍👨',
-        keywords: [
-            'couple',
-            'man',
-        ],
-    },
-    {
-        code: '👩‍❤️‍👩',
-        keywords: [
-            'couple',
-            'woman',
-        ],
-    },
     {
         code: '👪',
         keywords: [
@@ -2824,12 +2780,6 @@ const emojis = [
             'romance',
         ],
     },
-    {
-        code: CONST.EMOJI_SPACER,
-    },
-    {
-        code: CONST.EMOJI_SPACER,
-    },
     {
         code: 'Animals & Nature',
         header: true,

diff --git a/src/pages/home/report/EmojiPickerMenu/index.js b/src/pages/home/report/EmojiPickerMenu/index.js
@@ -32,7 +32,7 @@ class EmojiPickerMenu extends Component {
         // The positions are static, and are calculated as index/numColumns (8 in our case)
         // This is because each row of 8 emojis counts as one index
         // If more emojis are ever added to emojis.js this will need to be updated or things will break
-        this.unfilteredHeaderIndices = [0, 34, 60, 88, 99, 121, 148];
+        this.unfilteredHeaderIndices = [0, 33, 59, 87, 98, 120, 147];
 
         this.filterEmojis = _.debounce(this.filterEmojis.bind(this), 300);
         this.renderItem = this.renderItem.bind(this);

diff --git a/src/pages/home/report/EmojiPickerMenu/index.native.js b/src/pages/home/report/EmojiPickerMenu/index.native.js
@@ -26,7 +26,7 @@ class EmojiPickerMenu extends Component {
         // The positions are static, and are calculated as index/numColumns (8 in our case)
         // This is because each row of 8 emojis counts as one index
         // If this emojis are ever added to emojis.js this will need to be updated or things will break
-        this.unfilteredHeaderIndices = [0, 34, 60, 88, 99, 121, 148];
+        this.unfilteredHeaderIndices = [0, 33, 59, 87, 98, 120, 147];
 
         this.renderItem = this.renderItem.bind(this);
     }