Skip to content

Commit 9affb13

Browse files
authored
Merge pull request #48748 from Expensify/stites-updateFingerHeart
Move emoji to make thumbsup show up first
2 parents 7ebfaa0 + 41d84e2 commit 9affb13

File tree

4 files changed

+36
-19
lines changed

4 files changed

+36
-19
lines changed

assets/emojis/common.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -774,11 +774,6 @@ const emojis: PickerEmojis = [
774774
code: '🤞',
775775
types: ['🤞🏿', '🤞🏾', '🤞🏽', '🤞🏼', '🤞🏻'],
776776
},
777-
{
778-
name: 'hand_with_index_finger_and_thumb_crossed',
779-
code: '🫰',
780-
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
781-
},
782777
{
783778
name: 'love_you_gesture',
784779
code: '🤟',
@@ -844,6 +839,11 @@ const emojis: PickerEmojis = [
844839
code: '👎',
845840
types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
846841
},
842+
{
843+
name: 'hand_with_index_finger_and_thumb_crossed',
844+
code: '🫰',
845+
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
846+
},
847847
{
848848
name: 'fist_raised',
849849
code: '✊',

package-lock.json

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@
289289
"eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
290290
"html-webpack-plugin": "^5.5.0",
291291
"http-server": "^14.1.1",
292+
"husky": "^9.1.5",
292293
"jest": "29.4.1",
293294
"jest-circus": "29.4.1",
294295
"jest-cli": "29.4.1",

tests/unit/EmojiTest.ts

+14-14
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,6 @@ describe('EmojiTest', () => {
154154

155155
it('correct suggests emojis accounting for keywords', () => {
156156
const thumbEmojisEn: Emoji[] = [
157-
{
158-
name: 'hand_with_index_finger_and_thumb_crossed',
159-
code: '🫰',
160-
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
161-
},
162157
{
163158
code: '👍',
164159
name: '+1',
@@ -169,14 +164,14 @@ describe('EmojiTest', () => {
169164
name: '-1',
170165
types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
171166
},
172-
];
173-
174-
const thumbEmojisEs: Emoji[] = [
175167
{
176-
name: 'mano_con_dedos_cruzados',
168+
name: 'hand_with_index_finger_and_thumb_crossed',
177169
code: '🫰',
178170
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
179171
},
172+
];
173+
174+
const thumbEmojisEs: Emoji[] = [
180175
{
181176
code: '👍',
182177
name: '+1',
@@ -187,18 +182,18 @@ describe('EmojiTest', () => {
187182
name: '-1',
188183
types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
189184
},
185+
{
186+
name: 'mano_con_dedos_cruzados',
187+
code: '🫰',
188+
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
189+
},
190190
];
191191

192192
expect(EmojiUtils.suggestEmojis(':thumb', 'en')).toEqual(thumbEmojisEn);
193193

194194
expect(EmojiUtils.suggestEmojis(':thumb', 'es')).toEqual(thumbEmojisEs);
195195

196196
expect(EmojiUtils.suggestEmojis(':pulgar', 'es')).toEqual([
197-
{
198-
name: 'mano_con_dedos_cruzados',
199-
code: '🫰',
200-
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
201-
},
202197
{
203198
code: '🤙',
204199
name: 'mano_llámame',
@@ -214,6 +209,11 @@ describe('EmojiTest', () => {
214209
name: '-1',
215210
types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
216211
},
212+
{
213+
name: 'mano_con_dedos_cruzados',
214+
code: '🫰',
215+
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
216+
},
217217
]);
218218
});
219219
});

0 commit comments

Comments
 (0)