Merge pull request #48748 from Expensify/stites-updateFingerHeart

Move emoji to make thumbsup show up first
Expensify · Sep 8, 2024 · 9affb13 · 9affb13
2 parents 7ebfaa0 + 41d84e2
commit 9affb13
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 19 deletions.
diff --git a/assets/emojis/common.ts b/assets/emojis/common.ts
@@ -774,11 +774,6 @@ const emojis: PickerEmojis = [
         code: '🤞',
         types: ['🤞🏿', '🤞🏾', '🤞🏽', '🤞🏼', '🤞🏻'],
     },
-    {
-        name: 'hand_with_index_finger_and_thumb_crossed',
-        code: '🫰',
-        types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
-    },
     {
         name: 'love_you_gesture',
         code: '🤟',
@@ -844,6 +839,11 @@ const emojis: PickerEmojis = [
         code: '👎',
         types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
     },
+    {
+        name: 'hand_with_index_finger_and_thumb_crossed',
+        code: '🫰',
+        types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
+    },
     {
         name: 'fist_raised',
         code: '✊',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -289,6 +289,7 @@
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
     "html-webpack-plugin": "^5.5.0",
     "http-server": "^14.1.1",
+    "husky": "^9.1.5",
     "jest": "29.4.1",
     "jest-circus": "29.4.1",
     "jest-cli": "29.4.1",

diff --git a/tests/unit/EmojiTest.ts b/tests/unit/EmojiTest.ts
@@ -154,11 +154,6 @@ describe('EmojiTest', () => {
 
     it('correct suggests emojis accounting for keywords', () => {
         const thumbEmojisEn: Emoji[] = [
-            {
-                name: 'hand_with_index_finger_and_thumb_crossed',
-                code: '🫰',
-                types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
-            },
             {
                 code: '👍',
                 name: '+1',
@@ -169,14 +164,14 @@ describe('EmojiTest', () => {
                 name: '-1',
                 types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
             },
-        ];
-
-        const thumbEmojisEs: Emoji[] = [
             {
-                name: 'mano_con_dedos_cruzados',
+                name: 'hand_with_index_finger_and_thumb_crossed',
                 code: '🫰',
                 types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
             },
+        ];
+
+        const thumbEmojisEs: Emoji[] = [
             {
                 code: '👍',
                 name: '+1',
@@ -187,18 +182,18 @@ describe('EmojiTest', () => {
                 name: '-1',
                 types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
             },
+            {
+                name: 'mano_con_dedos_cruzados',
+                code: '🫰',
+                types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
+            },
         ];
 
         expect(EmojiUtils.suggestEmojis(':thumb', 'en')).toEqual(thumbEmojisEn);
 
         expect(EmojiUtils.suggestEmojis(':thumb', 'es')).toEqual(thumbEmojisEs);
 
         expect(EmojiUtils.suggestEmojis(':pulgar', 'es')).toEqual([
-            {
-                name: 'mano_con_dedos_cruzados',
-                code: '🫰',
-                types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
-            },
             {
                 code: '🤙',
                 name: 'mano_llámame',
@@ -214,6 +209,11 @@ describe('EmojiTest', () => {
                 name: '-1',
                 types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
             },
+            {
+                name: 'mano_con_dedos_cruzados',
+                code: '🫰',
+                types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
+            },
         ]);
     });
 });