Skip to content

Commit 149f8ab

Browse files
authored
Merge pull request #87045 from truph01/fix/80427
fix: default emoji doesn't render
2 parents 5151463 + 94e2442 commit 149f8ab

1 file changed

Lines changed: 15 additions & 14 deletions

File tree

src/components/EmojiPicker/EmojiPickerButtonDropdown.tsx

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,21 @@ function EmojiPickerButtonDropdown(
7878
>
7979
{({hovered, pressed}) => (
8080
<View style={styles.emojiPickerButtonDropdownContainer}>
81-
<Text
82-
style={styles.emojiPickerButtonDropdownIcon}
83-
numberOfLines={1}
84-
>
85-
{
86-
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
87-
value || (
88-
<Icon
89-
src={icons.Emoji}
90-
fill={StyleUtils.getIconFillColor(CONST.BUTTON_STATES.DISABLED)}
91-
/>
92-
)
93-
}
94-
</Text>
81+
{value ? (
82+
<Text
83+
style={styles.emojiPickerButtonDropdownIcon}
84+
numberOfLines={1}
85+
>
86+
{value}
87+
</Text>
88+
) : (
89+
<View style={styles.emojiPickerButtonDropdownIcon}>
90+
<Icon
91+
src={icons.Emoji}
92+
fill={StyleUtils.getIconFillColor(CONST.BUTTON_STATES.DISABLED)}
93+
/>
94+
</View>
95+
)}
9596
<View style={[styles.popoverMenuIcon, styles.pointerEventsAuto, disabled && styles.cursorDisabled, styles.rotate90]}>
9697
<Icon
9798
src={icons.ArrowRight}

0 commit comments

Comments
 (0)