-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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.
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
[HOLD for payment 2023-02-28] [$1000] Emoji skin tone colors aren't working/updating #14876
Comments
Triggered auto assignment to @adelekennedy ( |
Bug0 Triage Checklist (Main S/O)
|
I was able to reproduce this, but it is not consistent. I also noticed that when searching in the picker, skin tone is not reflected ( |
Job added to Upwork: https://www.upwork.com/jobs/~01fcdc6fa826648131 |
Triggered auto assignment to @joekaufmanexpensify ( |
Triggered auto assignment to Contributor-plus team member for initial proposal review - @Santhosh-Sellavel ( |
Current assignee @stitesExpensify is eligible for the External assigner, not assigning anyone new. |
ProposalProblemIn App/src/components/EmojiPicker/EmojiPickerMenu/index.js Lines 449 to 452 in f8d7a3a
We need types to render the emojiCode with preferredSkinTone But in Lines 20 to 30 in f8d7a3a
when add emoji to emojisTrie but we don't pass the types
Solutiondiff --git a/src/libs/EmojiTrie.js b/src/libs/EmojiTrie.js
index 5d7a15dbf..6e3618c7b 100644
--- a/src/libs/EmojiTrie.js
+++ b/src/libs/EmojiTrie.js
@@ -6,25 +6,24 @@ import CONST from '../CONST';
Timing.start(CONST.TIMING.TRIE_INITIALIZATION);
const emojisTrie = new Trie();
// Inserting all emojis into the Trie object
for (let i = 0; i < emojis.length; i++) {
if (emojis[i].name) {
const node = emojisTrie.search(emojis[i].name);
if (!node) {
- emojisTrie.add(emojis[i].name, {code: emojis[i].code, suggestions: []});
+ emojisTrie.add(emojis[i].name, {code: emojis[i].code, suggestions: [],types:emojis[i].types});
} else {
- emojisTrie.update(emojis[i].name, {code: emojis[i].code, suggestions: node.metaData.suggestions});
+ emojisTrie.update(emojis[i].name, {code: emojis[i].code, suggestions: node.metaData.suggestions,types:emojis[i].types});
}
if (emojis[i].keywords) {
for (let j = 0; j < emojis[i].keywords.length; j++) {
const keywordNode = emojisTrie.search(emojis[i].keywords[j]);
if (!keywordNode) {
- emojisTrie.add(emojis[i].keywords[j], {suggestions: [{code: emojis[i].code, name: emojis[i].name}]});
+ emojisTrie.add(emojis[i].keywords[j], {suggestions: [{code: emojis[i].code, name: emojis[i].name,types:emojis[i].types}],types:emojis[i].types});
} else {
emojisTrie.update(emojis[i].keywords[j],
- {...keywordNode.metaData, suggestions: [...keywordNode.metaData.suggestions, {code: emojis[i].code, name: emojis[i].name}]});
+ {...keywordNode.metaData, suggestions: [...keywordNode.metaData.suggestions, {code: emojis[i].code, name: emojis[i].name,types:emojis[i].types}]});
}
}
}
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index d6ed8875e..98b46f1d8 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -228,7 +228,7 @@ function suggestEmojis(text, limit = 5) {
if (matching.length === limit) {
return matching;
}
- matching.push({code: nodes[j].metaData.code, name: nodes[j].name});
+ matching.push({code: nodes[j].metaData.code, name: nodes[j].name,types:nodes[j].metaData.types});
}
const suggestions = nodes[j].metaData.suggestions;
for (let i = 0; i < suggestions.length; i++) {
Result |
ProposalPlease re-state the problem that we are trying to solve in this issue.Emoji skin tone colors aren't applied to filtered emoji . when you try to search for emoji , the list of filtered emoji doesn’t have the skin tone color applied to it. What is the root cause of that problem?Bug 1 :when we search for an emoji we use the default emoji list, the App/src/components/EmojiPicker/EmojiPickerMenu/index.js Lines 449 to 451 in f8d7a3a
Bug 2 :This i the bug that @mallenexpensify reported here. Here is the Explanation :
Here is demo before the fixScreen.Recording.2023-02-09.at.8.02.57.PM.movAfter the FixScreen.Recording.2023-02-09.at.8.05.14.PM.movWhat changes do you think we should make in order to solve the problem?Bug 1
emojisTrie.add(
emojis[i].name,
{
code: emojis[i].code,
types: emojis[i].types, // we should add this line and add it in other places too
suggestions: [],
},
);
matching.push({
code: nodes[j].metaData.code,
name: nodes[j].name,
types: nodes[j].metaData.types,// we should add this line
}); ResultScreen.Recording.2023-02-08.at.2.01.46.AM.movBug 2We should add the missing const emojiMap = new Map(_.map(emojis, emoji => [emoji.code, emoji]));
const emojisWithTypes = _.map(
this.props.frequentlyUsedEmojis,
emoji => lodashMerge(emoji, emojiMap.get(emoji.code)),
);
const allEmojis = EmojiUtils.mergeEmojisWithFrequentlyUsedEmojis(emojis, emojisWithTypes); What alternative solutions did you explore? (Optional) |
I will not be able to get this sooner, so unassigning it. Please reapply |
Current assignee @joekaufmanexpensify is eligible for the External assigner, not assigning anyone new. |
Triggered auto assignment to Contributor-plus team member for initial proposal review - @parasharrajat ( |
Current assignee @stitesExpensify is eligible for the External assigner, not assigning anyone new. |
@stitesExpensify Are there specific steps you were able to follow to reproduce what Matt sent in the video? I can't reproduce the aspect where we show emojis with the default skin tone in the emoji picker after changing the skin tone setting.
I can reproduce this specific aspect of the issue though. |
@parasharrajat #15191 ready for review |
|
The solution for this issue has been 🚀 deployed to production 🚀 in version 1.2.74-0 and is now subject to a 7-day regression period 📆. Here is the list of pull requests that resolve this issue: If no regressions arise, payment will be issued on 2023-02-28. 🎊 After the hold period is over and BZ checklist items are completed, please complete any of the applicable payments for this issue, and check them off once done.
As a reminder, here are the bonuses/penalties that should be applied for any External issue:
|
BugZero Checklist: The PR fixing this issue has been merged! The following checklist (instructions) will need to be completed before the issue can be closed:
|
Regression Test Proposal
|
Regression test steps look good to me! I'll work on adding it. Besides that, all that's left before we can issue payment is for @parasharrajat / @stitesExpensify to complete the other BZ checklist items. |
Regression test is here! |
All that's left before we can issue payment here are the remaining engineering BZ checklist steps. |
bump @parasharrajat @bstites, could you fill out the remaining portion of the BZ checklist when you have a chance? |
Still pending completion of remaining BZ checklist. |
BugZero Checklist: The PR fixing this issue has been merged! The following checklist (instructions) will need to be completed before the issue can be closed:
It is clearly a failure scenario for testing a feature completely. I guess we already have steps in place so nothing is needed. We should make sure to test the feature completely during reviews. |
Awesome, ty! Updated that info into the BZ checklist. |
All set to issue payment here. @fedirjh was assigned to this issue on 2023-02-15 and the PR was merged on 2023-02-17, so this qualifies for a 50% speed bonus. Great job! We need to issue the following payment:
|
@fedirjh offer sent for $1,000 (we'll add $500 as a bonus when paying)! |
@parasharrajat offer sent for $1,000 (we'll add $500 as a bonus when paying)! |
@joekaufmanexpensify Thank you, accepted. |
@parasharrajat $1,500 sent and contract ended! |
@fedirjh $1,500 sent and contract ended! |
Upwork job closed. |
Bug is fixed, BZ checklist complete, and all payment issued. This is all set. Thanks everyone! |
If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!
Action Performed:
Expected Result:
New skin tone to show
Actual Result:
Old skin tone shows
Workaround:
unknown
Platforms:
Which of our officially supported platforms is this issue occurring on?
Version Number: 1.2.65-2
Reproducible in staging?: y
Reproducible in production?: y
If this was caught during regression testing, add the test name, ID and link from TestRail:
Email or phone of affected tester (no customers):
Logs: https://stackoverflow.com/c/expensify/questions/4856
Notes/Photos/Videos:
2023-02-02_16-01-32.mp4
Recording.90.mp4
Expensify/Expensify Issue URL:
Issue reported by: @mallenexpensify
Slack conversation: https://expensify.slack.com/archives/C049HHMV9SM/p1675437076355079
View all open jobs on GitHub
Upwork Automation - Do Not Edit
The text was updated successfully, but these errors were encountered: