From 1d632c691370882e48ce49e9a40bb50540fe3073 Mon Sep 17 00:00:00 2001 From: Pavlo Tsimura Date: Tue, 26 Dec 2023 23:36:58 +0100 Subject: [PATCH 1/3] Make the "@here" mention icon green --- src/components/MentionSuggestions.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/MentionSuggestions.tsx b/src/components/MentionSuggestions.tsx index 9550a22c15fd..ff9813e7f1e3 100644 --- a/src/components/MentionSuggestions.tsx +++ b/src/components/MentionSuggestions.tsx @@ -1,6 +1,7 @@ import React, {useCallback} from 'react'; import {View} from 'react-native'; import useStyleUtils from '@hooks/useStyleUtils'; +import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import getStyledTextArray from '@libs/GetStyledTextArray'; import CONST from '@src/CONST'; @@ -51,6 +52,7 @@ type MentionSuggestionsProps = { const keyExtractor = (item: Mention) => item.alternateText; function MentionSuggestions({prefix, mentions, highlightedMentionIndex = 0, onSelect, isMentionPickerLarge, measureParentContainer = () => {}}: MentionSuggestionsProps) { + const theme = useTheme(); const styles = useThemeStyles(); const StyleUtils = useStyleUtils(); /** @@ -70,6 +72,7 @@ function MentionSuggestions({prefix, mentions, highlightedMentionIndex = 0, onSe size={isIcon ? CONST.AVATAR_SIZE.MENTION_ICON : CONST.AVATAR_SIZE.SMALLER} name={item.icons[0].name} type={item.icons[0].type} + fill={theme.success} fallbackIcon={item.icons[0].fallbackIcon} /> From e98e2c81aa08b921272e42efaf0cdf0d224c43d7 Mon Sep 17 00:00:00 2001 From: Pavlo Tsimura Date: Tue, 26 Dec 2023 23:45:19 +0100 Subject: [PATCH 2/3] Lint fix --- src/components/MentionSuggestions.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/MentionSuggestions.tsx b/src/components/MentionSuggestions.tsx index ff9813e7f1e3..f1daaaa229be 100644 --- a/src/components/MentionSuggestions.tsx +++ b/src/components/MentionSuggestions.tsx @@ -120,6 +120,7 @@ function MentionSuggestions({prefix, mentions, highlightedMentionIndex = 0, onSe styles.flex1, styles.mentionSuggestionsDisplayName, styles.mentionSuggestionsHandle, + theme.success, StyleUtils, ], ); From ed24b29b1494b7c37f41514226333f2bdf262cf3 Mon Sep 17 00:00:00 2001 From: Pavlo Tsimura Date: Tue, 26 Dec 2023 23:46:33 +0100 Subject: [PATCH 3/3] Fix comments --- src/components/MentionSuggestions.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MentionSuggestions.tsx b/src/components/MentionSuggestions.tsx index f1daaaa229be..72dfd177dd1e 100644 --- a/src/components/MentionSuggestions.tsx +++ b/src/components/MentionSuggestions.tsx @@ -31,7 +31,7 @@ type MentionSuggestionsProps = { /** Array of suggested mentions */ mentions: Mention[]; - /** Fired when the user selects an mention */ + /** Fired when the user selects a mention */ onSelect: () => void; /** Mention prefix that follows the @ sign */ @@ -42,7 +42,7 @@ type MentionSuggestionsProps = { * When this value is false, the suggester will have a height of 2.5 items. When this value is true, the height can be up to 5 items. */ isMentionPickerLarge: boolean; - /** Meaures the parent container's position and dimensions. */ + /** Measures the parent container's position and dimensions. */ measureParentContainer: () => void; };