Skip to content

Commit

Permalink
Merge pull request Expensify#48748 from Expensify/stites-updateFinger…
Browse files Browse the repository at this point in the history
…Heart

Move emoji to make thumbsup show up first
  • Loading branch information
carlosmiceli committed Sep 8, 2024
2 parents 7ebfaa0 + 41d84e2 commit 9affb13
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 19 deletions.
10 changes: 5 additions & 5 deletions assets/emojis/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -774,11 +774,6 @@ const emojis: PickerEmojis = [
code: '🤞',
types: ['🤞🏿', '🤞🏾', '🤞🏽', '🤞🏼', '🤞🏻'],
},
{
name: 'hand_with_index_finger_and_thumb_crossed',
code: '🫰',
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
},
{
name: 'love_you_gesture',
code: '🤟',
Expand Down Expand Up @@ -844,6 +839,11 @@ const emojis: PickerEmojis = [
code: '👎',
types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
},
{
name: 'hand_with_index_finger_and_thumb_crossed',
code: '🫰',
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
},
{
name: 'fist_raised',
code: '✊',
Expand Down
16 changes: 16 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
28 changes: 14 additions & 14 deletions tests/unit/EmojiTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -214,6 +209,11 @@ describe('EmojiTest', () => {
name: '-1',
types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
},
{
name: 'mano_con_dedos_cruzados',
code: '🫰',
types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
},
]);
});
});

0 comments on commit 9affb13

Please sign in to comment.