Merge pull request #53744 from nyomanjyotisa/issue-52918

Fix: Two emoji skin tones are displayed after changing tone in browser

Author: jasperhuangg

src/components/EmojiPicker/EmojiSkinToneList.tsx

@@ -42,6 +42,11 @@ function EmojiSkinToneList() {
     }, [preferredSkinTone]);
 
     const currentSkinTone = getSkinToneEmojiFromIndex(preferredSkinTone);
+
+    useEffect(() => {
+        setHighlightedIndex(currentSkinTone.skinTone);
+    }, [currentSkinTone.skinTone]);
+
     return (
         <View style={[styles.flexRow, styles.p3, styles.ph4, styles.emojiPickerContainer]}>
             {!isSkinToneListVisible && (