From bbd61347ce653332d2c755fff60301dc0d3c4b34 Mon Sep 17 00:00:00 2001 From: sahil Date: Wed, 19 Jan 2022 00:25:13 +0530 Subject: [PATCH 1/2] use preferred skin tone emoji when add using enter --- src/pages/home/report/EmojiPickerMenu/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/EmojiPickerMenu/index.js b/src/pages/home/report/EmojiPickerMenu/index.js index e934517717f36..644e07cf9623c 100755 --- a/src/pages/home/report/EmojiPickerMenu/index.js +++ b/src/pages/home/report/EmojiPickerMenu/index.js @@ -142,7 +142,11 @@ class EmojiPickerMenu extends Component { // Select the currently highlighted emoji if enter is pressed if (keyBoardEvent.key === 'Enter' && this.state.highlightedIndex !== -1) { - this.props.onEmojiSelected(this.state.filteredEmojis[this.state.highlightedIndex].code, this.state.filteredEmojis[this.state.highlightedIndex]); + const item = this.state.filteredEmojis[this.state.highlightedIndex]; + const emoji = item.types && item.types[this.props.preferredSkinTone] + ? item.types[this.props.preferredSkinTone] + : item.code; + this.props.onEmojiSelected(emoji, item); return; } From 440c85fd030029b7f038483e73e3a51e93ec354c Mon Sep 17 00:00:00 2001 From: sahil Date: Wed, 19 Jan 2022 21:54:58 +0530 Subject: [PATCH 2/2] use lodashGet --- src/pages/home/report/EmojiPickerMenu/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/home/report/EmojiPickerMenu/index.js b/src/pages/home/report/EmojiPickerMenu/index.js index 644e07cf9623c..5261bc5da7b85 100755 --- a/src/pages/home/report/EmojiPickerMenu/index.js +++ b/src/pages/home/report/EmojiPickerMenu/index.js @@ -2,6 +2,7 @@ import React, {Component} from 'react'; import {View, FlatList} from 'react-native'; import PropTypes from 'prop-types'; import _ from 'underscore'; +import lodashGet from 'lodash/get'; import CONST from '../../../../CONST'; import styles from '../../../../styles/styles'; import * as StyleUtils from '../../../../styles/StyleUtils'; @@ -143,9 +144,7 @@ class EmojiPickerMenu extends Component { // Select the currently highlighted emoji if enter is pressed if (keyBoardEvent.key === 'Enter' && this.state.highlightedIndex !== -1) { const item = this.state.filteredEmojis[this.state.highlightedIndex]; - const emoji = item.types && item.types[this.props.preferredSkinTone] - ? item.types[this.props.preferredSkinTone] - : item.code; + const emoji = lodashGet(item, ['types', this.props.preferredSkinTone], item.code); this.props.onEmojiSelected(emoji, item); return; }