Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move emoji to make thumbsup show up first #48748

Merged
merged 4 commits into from
Sep 8, 2024
Merged

Move emoji to make thumbsup show up first #48748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a89db66
Update name
stitesExpensify Sep 6, 2024
a5c9176
Move emoji below other thumbs:
stitesExpensify Sep 6, 2024
e15c713
Update test to match emoji order
stitesExpensify Sep 6, 2024
41d84e2
Fix order
stitesExpensify Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions assets/emojis/common.ts
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, why did we need to reintroduce this package for just changing the order of a couple emojis? This was the package that modified everyone's git hooks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We did not need to and this shouldn't have been merged. I was getting the error from the git hooks so I added the package and the change accidentally got pushed 😬

"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
View file
Open in desktop
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: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
},
]);
});
});
Loading