diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 596e4a1a09de..c3c1c5ef94f3 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -1192,7 +1192,7 @@ type OnyxValuesMapping = { [ONYXKEYS.PERSONAL_BANK_ACCOUNT]: OnyxTypes.PersonalBankAccount; [ONYXKEYS.REIMBURSEMENT_ACCOUNT]: OnyxTypes.ReimbursementAccount; [ONYXKEYS.REIMBURSEMENT_ACCOUNT_OPTION_PRESSED]: ValueOf; - [ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE]: number; + [ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE]: string | number; [ONYXKEYS.FREQUENTLY_USED_EMOJIS]: OnyxTypes.FrequentlyUsedEmoji[]; [ONYXKEYS.REIMBURSEMENT_ACCOUNT_WORKSPACE_ID]: string; [ONYXKEYS.IS_LOADING_PAYMENT_METHODS]: boolean; diff --git a/src/components/EmojiPicker/EmojiPicker.tsx b/src/components/EmojiPicker/EmojiPicker.tsx index 552ab1b2ec8f..4e56ce64daab 100644 --- a/src/components/EmojiPicker/EmojiPicker.tsx +++ b/src/components/EmojiPicker/EmojiPicker.tsx @@ -183,7 +183,7 @@ function EmojiPicker({viewportOffsetTop, ref}: EmojiPickerProps) { /** * Callback for the emoji picker to add whatever emoji is chosen into the main input */ - const selectEmoji = (emoji: string, emojiObject: Emoji, preferredSkinTone: number) => { + const selectEmoji = (emoji: string, emojiObject: Emoji) => { // Prevent fast click / multiple emoji selection; // The first click will hide the emoji picker by calling the hideEmojiPicker() function if (!isEmojiPickerVisible) { @@ -192,7 +192,7 @@ function EmojiPicker({viewportOffsetTop, ref}: EmojiPickerProps) { hideEmojiPicker(false); if (typeof onEmojiSelected.current === 'function') { - onEmojiSelected.current(emoji, emojiObject, preferredSkinTone); + onEmojiSelected.current(emoji, emojiObject); } }; diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx b/src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx index 92fb036ce7a0..9f71caa5032a 100644 --- a/src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx +++ b/src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx @@ -107,7 +107,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji, ref}: EmojiPickerMenuPro if (!('name' in item)) { return; } - onEmojiSelected(emoji, item, preferredSkinTone); + onEmojiSelected(emoji, item); })} emoji={emojiCode ?? ''} isHighlighted={shouldEmojiBeHighlighted} diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.tsx b/src/components/EmojiPicker/EmojiPickerMenu/index.tsx index d04822b42ead..542f615e686b 100755 --- a/src/components/EmojiPicker/EmojiPickerMenu/index.tsx +++ b/src/components/EmojiPicker/EmojiPickerMenu/index.tsx @@ -174,7 +174,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji, ref}: EmojiPickerMenuPro } if ('types' in item || 'name' in item) { const emoji = typeof preferredSkinTone === 'number' && preferredSkinTone !== -1 && item?.types?.at(preferredSkinTone) ? item.types.at(preferredSkinTone) : item.code; - onEmojiSelected(emoji ?? '', item, preferredSkinTone); + onEmojiSelected(emoji ?? '', item); // On web, avoid this Enter default input action; otherwise, it will add a new line in the subsequently focused composer. keyBoardEvent.preventDefault(); // On mWeb, avoid propagating this Enter keystroke to Pressable child component; otherwise, it will trigger the onEmojiSelected callback again. @@ -282,7 +282,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji, ref}: EmojiPickerMenuPro if (!('name' in item)) { return; } - onEmojiSelected(emoji, item, preferredSkinTone); + onEmojiSelected(emoji, item); })} onHoverIn={() => { setHighlightEmoji(false); diff --git a/src/components/EmojiPicker/EmojiPickerMenu/types.ts b/src/components/EmojiPicker/EmojiPickerMenu/types.ts index 5f150c4541d8..7db5821d2e12 100644 --- a/src/components/EmojiPicker/EmojiPickerMenu/types.ts +++ b/src/components/EmojiPicker/EmojiPickerMenu/types.ts @@ -4,7 +4,7 @@ import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types'; type EmojiPickerMenuProps = { /** Function to add the selected emoji to the main compose text input */ - onEmojiSelected: (emoji: string, emojiObject: Emoji, preferredSkinTone: number) => void; + onEmojiSelected: (emoji: string, emojiObject: Emoji) => void; activeEmoji?: string; diff --git a/src/components/Reactions/AddReactionBubble.tsx b/src/components/Reactions/AddReactionBubble.tsx index d98e2ac9ecf7..5bfa95ede5d4 100644 --- a/src/components/Reactions/AddReactionBubble.tsx +++ b/src/components/Reactions/AddReactionBubble.tsx @@ -38,7 +38,7 @@ type AddReactionBubbleProps = { /** * Called when the user selects an emoji. */ - onSelectEmoji: (emoji: Emoji, preferredSkinTone: number) => void; + onSelectEmoji: (emoji: Emoji) => void; /** * ReportAction for EmojiPicker. @@ -63,8 +63,8 @@ function AddReactionBubble({onSelectEmoji, reportAction, onPressOpenPicker, onWi onModalHide: () => { setIsEmojiPickerActive?.(false); }, - onEmojiSelected: (emojiCode, emojiObject, preferredSkinTone) => { - onSelectEmoji(emojiObject, preferredSkinTone); + onEmojiSelected: (emojiCode, emojiObject) => { + onSelectEmoji(emojiObject); }, emojiPopoverAnchor: refParam ?? ref, anchorOrigin, diff --git a/src/components/Reactions/MiniQuickEmojiReactions.tsx b/src/components/Reactions/MiniQuickEmojiReactions.tsx index bbadbe7d46f9..493a059a33d0 100644 --- a/src/components/Reactions/MiniQuickEmojiReactions.tsx +++ b/src/components/Reactions/MiniQuickEmojiReactions.tsx @@ -1,4 +1,4 @@ -import React, {useCallback, useRef} from 'react'; +import React, {useRef} from 'react'; import {View} from 'react-native'; import type {Emoji} from '@assets/emojis/types'; import BaseMiniContextMenuItem from '@components/BaseMiniContextMenuItem'; @@ -42,19 +42,12 @@ function MiniQuickEmojiReactions({reportAction, reportActionID, onEmojiSelected, const [preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {canBeMissing: true}); const [emojiReactions = getEmptyObject()] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`, {canBeMissing: true}); - const onEmojiSelectedWithReactions = useCallback( - (emoji: Emoji, skinTone: number) => { - onEmojiSelected(emoji, emojiReactions, skinTone); - }, - [onEmojiSelected, emojiReactions], - ); - const openEmojiPicker = () => { onPressOpenPicker(); showEmojiPicker({ onModalHide: onEmojiPickerClosed, - onEmojiSelected: (_emojiCode, emojiObject, skinTone) => { - onEmojiSelectedWithReactions(emojiObject, skinTone); + onEmojiSelected: (_emojiCode, emojiObject) => { + onEmojiSelected(emojiObject, emojiReactions); }, emojiPopoverAnchor: ref, id: reportAction.reportActionID, @@ -68,7 +61,7 @@ function MiniQuickEmojiReactions({reportAction, reportActionID, onEmojiSelected, key={emoji.name} isDelayButtonStateComplete={false} tooltipText={`:${getLocalizedEmojiName(emoji.name, preferredLocale)}:`} - onPress={callFunctionIfActionIsAllowed(() => onEmojiSelected(emoji, emojiReactions, preferredSkinTone))} + onPress={callFunctionIfActionIsAllowed(() => onEmojiSelected(emoji, emojiReactions))} > ()] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`, {canBeMissing: true}); - const onEmojiSelectedWithReactions = useCallback( - (emoji: Emoji, skinTone: number) => { - onEmojiSelected(emoji, emojiReactions, skinTone); - }, - [onEmojiSelected, emojiReactions], - ); - return ( {CONST.QUICK_REACTIONS.map((emoji: Emoji) => ( @@ -46,7 +39,7 @@ function BaseQuickEmojiReactions({ onEmojiSelected(emoji, emojiReactions, preferredSkinTone))} + onPress={callFunctionIfActionIsAllowed(() => onEmojiSelected(emoji, emojiReactions))} /> @@ -55,7 +48,7 @@ function BaseQuickEmojiReactions({ isContextMenu onPressOpenPicker={onPressOpenPicker} onWillShowPicker={onWillShowPicker} - onSelectEmoji={onEmojiSelectedWithReactions} + onSelectEmoji={(emoji) => onEmojiSelected(emoji, emojiReactions)} reportAction={reportAction} setIsEmojiPickerActive={setIsEmojiPickerActive} /> diff --git a/src/components/Reactions/QuickEmojiReactions/types.ts b/src/components/Reactions/QuickEmojiReactions/types.ts index 7197b317ba03..d3b377099c7c 100644 --- a/src/components/Reactions/QuickEmojiReactions/types.ts +++ b/src/components/Reactions/QuickEmojiReactions/types.ts @@ -13,7 +13,7 @@ type CloseContextMenuCallback = () => void; type BaseReactionsProps = { /** Callback to fire when an emoji is selected. */ - onEmojiSelected: (emoji: Emoji, emojiReactions: OnyxEntry, preferredSkinTone: number) => void; + onEmojiSelected: (emoji: Emoji, emojiReactions: OnyxEntry) => void; /** * Will be called when the emoji picker is about to show. diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.tsx b/src/components/Reactions/ReportActionItemEmojiReactions.tsx index 905595277d6d..930a5ee2e984 100644 --- a/src/components/Reactions/ReportActionItemEmojiReactions.tsx +++ b/src/components/Reactions/ReportActionItemEmojiReactions.tsx @@ -7,13 +7,11 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback'; import Tooltip from '@components/Tooltip/PopoverAnchorTooltip'; import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails'; import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails'; -import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import {getEmojiReactionDetails, getLocalizedEmojiName} from '@libs/EmojiUtils'; import {ReactionListContext} from '@pages/home/ReportScreenContext'; import type {ReactionListAnchor, ReactionListEvent} from '@pages/home/ReportScreenContext'; import CONST from '@src/CONST'; -import ONYXKEYS from '@src/ONYXKEYS'; import type {Locale, ReportAction, ReportActionReactions} from '@src/types/onyx'; import type {PendingAction} from '@src/types/onyx/OnyxCommon'; import AddReactionBubble from './AddReactionBubble'; @@ -35,7 +33,7 @@ type ReportActionItemEmojiReactionsProps = WithCurrentUserPersonalDetailsProps & * This can also be an emoji the user already reacted with, * hence this function asks to toggle the reaction by emoji. */ - toggleReaction: (emoji: Emoji, preferredSkinTone: number, ignoreSkinToneOnCompare?: boolean) => void; + toggleReaction: (emoji: Emoji, ignoreSkinToneOnCompare?: boolean) => void; /** We disable reacting with emojis on report actions that have errors */ shouldBlockReactions?: boolean; @@ -89,7 +87,6 @@ function ReportActionItemEmojiReactions({ const styles = useThemeStyles(); const reactionListRef = useContext(ReactionListContext); const popoverReactionListAnchors = useRef({}); - const [preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {canBeMissing: true}); const reportActionID = reportAction.reportActionID; @@ -107,7 +104,7 @@ function ReportActionItemEmojiReactions({ } const onPress = () => { - toggleReaction(emoji, preferredSkinTone, true); + toggleReaction(emoji, true); }; const onReactionListOpen = (event: ReactionListEvent) => { diff --git a/src/hooks/usePreferredEmojiSkinTone.ts b/src/hooks/usePreferredEmojiSkinTone.ts index b833d0c2b79b..36d7c04e520e 100644 --- a/src/hooks/usePreferredEmojiSkinTone.ts +++ b/src/hooks/usePreferredEmojiSkinTone.ts @@ -1,11 +1,10 @@ import {useCallback} from 'react'; import {updatePreferredSkinTone as updatePreferredSkinToneAction} from '@userActions/User'; -import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import useOnyx from './useOnyx'; export default function usePreferredEmojiSkinTone() { - const [preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {canBeMissing: true}); + const [preferredSkinTone] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {canBeMissing: true}); const updatePreferredSkinTone = useCallback( (skinTone: number) => { diff --git a/src/libs/EmojiUtils.tsx b/src/libs/EmojiUtils.tsx index ba0c73ba0eca..7658da6c6a44 100644 --- a/src/libs/EmojiUtils.tsx +++ b/src/libs/EmojiUtils.tsx @@ -436,6 +436,17 @@ function suggestEmojis(text: string, locale: Locale = CONST.LOCALES.DEFAULT, lim return lodashSortBy(matching, (emoji) => sortByName(emoji, emojiData)); } +/** + * Retrieve preferredSkinTone as Number to prevent legacy 'default' String value + */ +const getPreferredSkinToneIndex = (value: OnyxEntry): number => { + if (value !== null && Number.isInteger(Number(value))) { + return Number(value); + } + + return CONST.EMOJI_DEFAULT_SKIN_TONE; +}; + /** * Given an emoji object it returns the correct emoji code * based on the users preferred skin tone. @@ -675,6 +686,7 @@ export { replaceEmojis, suggestEmojis, getEmojiCodeWithSkinColor, + getPreferredSkinToneIndex, getPreferredEmojiCode, getUniqueEmojiCodes, getEmojiReactionDetails, diff --git a/src/libs/actions/EmojiPickerAction.ts b/src/libs/actions/EmojiPickerAction.ts index 4c691e63d5ab..e7a65a436d17 100644 --- a/src/libs/actions/EmojiPickerAction.ts +++ b/src/libs/actions/EmojiPickerAction.ts @@ -40,7 +40,7 @@ type EmojiPickerRef = { resetEmojiPopoverAnchor: () => void; }; -type OnEmojiSelected = (emojiCode: string, emojiObject: Emoji, preferredSkinTone: number) => void; +type OnEmojiSelected = (emojiCode: string, emojiObject: Emoji) => void; const emojiPickerRef = React.createRef(); diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index bbded313c5c6..68c1f3c77189 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -297,6 +297,14 @@ Onyx.connect({ callback: (value) => (conciergeReportID = value), }); +let preferredSkinTone: number = CONST.EMOJI_DEFAULT_SKIN_TONE; +Onyx.connect({ + key: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, + callback: (value) => { + preferredSkinTone = EmojiUtils.getPreferredSkinToneIndex(value); + }, +}); + // map of reportID to all reportActions for that report const allReportActions: OnyxCollection = {}; @@ -3379,7 +3387,7 @@ function clearIOUError(reportID: string | undefined) { * Adds a reaction to the report action. * Uses the NEW FORMAT for "emojiReactions" */ -function addEmojiReaction(reportID: string, reportActionID: string, emoji: Emoji, skinTone: number) { +function addEmojiReaction(reportID: string, reportActionID: string, emoji: Emoji, skinTone: string | number = preferredSkinTone) { const createdAt = timezoneFormat(toZonedTime(new Date(), 'UTC'), CONST.DATE.FNS_DB_FORMAT_STRING); const optimisticData: OnyxUpdate[] = [ { @@ -3392,7 +3400,7 @@ function addEmojiReaction(reportID: string, reportActionID: string, emoji: Emoji users: { [currentUserAccountID]: { skinTones: { - [skinTone]: createdAt, + [skinTone ?? CONST.EMOJI_DEFAULT_SKIN_TONE]: createdAt, }, }, }, @@ -3473,7 +3481,7 @@ function toggleEmojiReaction( reportAction: ReportAction, reactionObject: Emoji, existingReactions: OnyxEntry, - paramSkinTone: number, + paramSkinTone: number = preferredSkinTone, ignoreSkinToneOnCompare = false, ) { const originalReportID = getOriginalReportID(reportID, reportAction); @@ -3494,7 +3502,7 @@ function toggleEmojiReaction( const existingReactionObject = existingReactions?.[emoji.name]; // Only use skin tone if emoji supports it - const skinTone = emoji.types === undefined ? CONST.EMOJI_DEFAULT_SKIN_TONE : paramSkinTone; + const skinTone = emoji.types === undefined ? -1 : paramSkinTone; if (existingReactionObject && EmojiUtils.hasAccountIDEmojiReacted(currentUserAccountID, existingReactionObject.users, ignoreSkinToneOnCompare ? undefined : skinTone)) { removeEmojiReaction(originalReportID, reportAction.reportActionID, emoji); diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx index 4d95b9a63be7..0e8245459f1b 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx @@ -256,8 +256,8 @@ const ContextMenuActions: ContextMenuAction[] = [ } }; - const toggleEmojiAndCloseMenu = (emoji: Emoji, existingReactions: OnyxEntry, preferredSkinTone: number) => { - toggleEmojiReaction(reportID, reportAction, emoji, existingReactions, preferredSkinTone); + const toggleEmojiAndCloseMenu = (emoji: Emoji, existingReactions: OnyxEntry) => { + toggleEmojiReaction(reportID, reportAction, emoji, existingReactions); closeContextMenu(); setIsEmojiPickerActive?.(false); }; diff --git a/src/pages/home/report/PureReportActionItem.tsx b/src/pages/home/report/PureReportActionItem.tsx index 9526372d9591..2224e2267bbd 100644 --- a/src/pages/home/report/PureReportActionItem.tsx +++ b/src/pages/home/report/PureReportActionItem.tsx @@ -317,7 +317,7 @@ type PureReportActionItemProps = { reportAction: OnyxTypes.ReportAction, reactionObject: Emoji, existingReactions: OnyxEntry, - paramSkinTone: number, + paramSkinTone: number | undefined, ignoreSkinToneOnCompare: boolean | undefined, ) => void; @@ -711,8 +711,8 @@ function PureReportActionItem({ ); const toggleReaction = useCallback( - (emoji: Emoji, preferredSkinTone: number, ignoreSkinToneOnCompare?: boolean) => { - toggleEmojiReaction(reportID, action, emoji, emojiReactions, preferredSkinTone, ignoreSkinToneOnCompare); + (emoji: Emoji, ignoreSkinToneOnCompare?: boolean) => { + toggleEmojiReaction(reportID, action, emoji, emojiReactions, undefined, ignoreSkinToneOnCompare); }, [reportID, action, emojiReactions, toggleEmojiReaction], ); @@ -1535,7 +1535,7 @@ function PureReportActionItem({ reportAction={action} emojiReactions={isOnSearch ? {} : emojiReactions} shouldBlockReactions={hasErrors} - toggleReaction={(emoji, preferredSkinTone, ignoreSkinToneOnCompare) => { + toggleReaction={(emoji, ignoreSkinToneOnCompare) => { if (isAnonymousUser()) { hideContextMenu(false); @@ -1544,7 +1544,7 @@ function PureReportActionItem({ signOutAndRedirectToSignIn(); }); } else { - toggleReaction(emoji, preferredSkinTone, ignoreSkinToneOnCompare); + toggleReaction(emoji, ignoreSkinToneOnCompare); } }} setIsEmojiPickerActive={setIsEmojiPickerActive} diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx index b7b8193ef34e..3c062deaadbd 100644 --- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx +++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx @@ -25,7 +25,7 @@ import canFocusInputOnScreenFocus from '@libs/canFocusInputOnScreenFocus'; import {forceClearInput} from '@libs/ComponentUtils'; import {canSkipTriggerHotkeys, findCommonSuffixLength, insertText, insertWhiteSpaceAtIndex} from '@libs/ComposerUtils'; import convertToLTRForComposer from '@libs/convertToLTRForComposer'; -import {containsOnlyEmojis, extractEmojis, getAddedEmojis, replaceAndExtractEmojis} from '@libs/EmojiUtils'; +import {containsOnlyEmojis, extractEmojis, getAddedEmojis, getPreferredSkinToneIndex, replaceAndExtractEmojis} from '@libs/EmojiUtils'; import focusComposerWithDelay from '@libs/focusComposerWithDelay'; import getPlatform from '@libs/getPlatform'; import {addKeyDownPressListener, removeKeyDownPressListener} from '@libs/KeyboardShortcut/KeyDownPressListener'; @@ -249,7 +249,7 @@ function ComposerWithSuggestions({ const commentRef = useRef(value); const [modal] = useOnyx(ONYXKEYS.MODAL, {canBeMissing: true}); - const [preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {canBeMissing: true}); + const [preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {selector: getPreferredSkinToneIndex, canBeMissing: true}); const [editFocused] = useOnyx(ONYXKEYS.INPUT_FOCUSED, {canBeMissing: true}); const lastTextRef = useRef(value); diff --git a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx index c875e96ea970..f8670512f7ed 100644 --- a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx +++ b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx @@ -4,7 +4,7 @@ import EmojiSuggestions from '@components/EmojiSuggestions'; import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; -import {suggestEmojis} from '@libs/EmojiUtils'; +import {getPreferredSkinToneIndex, suggestEmojis} from '@libs/EmojiUtils'; import {trimLeadingSpace} from '@libs/SuggestionUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -47,7 +47,7 @@ function SuggestionEmoji({ isComposerFocused, ref, }: SuggestionEmojiProps) { - const [preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {canBeMissing: true}); + const [preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {canBeMissing: true, selector: getPreferredSkinToneIndex}); const [suggestionValues, setSuggestionValues] = useState(defaultSuggestionsValues); const suggestionValuesRef = useRef(suggestionValues); // eslint-disable-next-line react-compiler/react-compiler diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts index 82d22b2cb376..7b87242f9b90 100644 --- a/tests/actions/ReportTest.ts +++ b/tests/actions/ReportTest.ts @@ -697,7 +697,7 @@ describe('actions/Report', () => { if (reportAction) { // Add a reaction to the comment - Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionsReactions[0], CONST.EMOJI_DEFAULT_SKIN_TONE); + Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionsReactions[0]); } return waitForBatchedUpdates(); }) @@ -717,7 +717,7 @@ describe('actions/Report', () => { if (reportAction) { // Now we remove the reaction - Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionReaction, CONST.EMOJI_DEFAULT_SKIN_TONE); + Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionReaction); } return waitForBatchedUpdates(); }) @@ -732,7 +732,7 @@ describe('actions/Report', () => { if (reportAction) { // Add the same reaction to the same report action with a different skin tone - Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionsReactions[0], CONST.EMOJI_DEFAULT_SKIN_TONE); + Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionsReactions[0]); } return waitForBatchedUpdates() .then(() => { @@ -765,7 +765,7 @@ describe('actions/Report', () => { if (reportAction) { // Now we remove the reaction, and expect that both variations are removed - Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionReaction, CONST.EMOJI_DEFAULT_SKIN_TONE); + Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionReaction); } return waitForBatchedUpdates(); }) @@ -824,7 +824,7 @@ describe('actions/Report', () => { if (resultAction) { // Add a reaction to the comment - Report.toggleEmojiReaction(REPORT_ID, resultAction, EMOJI, {}, CONST.EMOJI_DEFAULT_SKIN_TONE); + Report.toggleEmojiReaction(REPORT_ID, resultAction, EMOJI, {}); } return waitForBatchedUpdates(); }) @@ -1333,7 +1333,7 @@ describe('actions/Report', () => { await waitForBatchedUpdates(); - Report.toggleEmojiReaction(REPORT_ID, newReportAction, {name: 'smile', code: '😄'}, {}, CONST.EMOJI_DEFAULT_SKIN_TONE); + Report.toggleEmojiReaction(REPORT_ID, newReportAction, {name: 'smile', code: '😄'}, {}); Report.toggleEmojiReaction( REPORT_ID, newReportAction, @@ -1353,7 +1353,6 @@ describe('actions/Report', () => { }, }, }, - CONST.EMOJI_DEFAULT_SKIN_TONE, ); await waitForBatchedUpdates(); @@ -1433,7 +1432,7 @@ describe('actions/Report', () => { // wait for Onyx.connect execute the callback and start processing the queue await Promise.resolve(); - Report.toggleEmojiReaction(REPORT_ID, reportAction, {name: 'smile', code: '😄'}, {}, CONST.EMOJI_DEFAULT_SKIN_TONE); + Report.toggleEmojiReaction(REPORT_ID, reportAction, {name: 'smile', code: '😄'}, {}); Report.toggleEmojiReaction( REPORT_ID, reportAction, @@ -1453,7 +1452,6 @@ describe('actions/Report', () => { }, }, }, - CONST.EMOJI_DEFAULT_SKIN_TONE, ); await waitForBatchedUpdates();