From 4be5bb247457315d805d5674f46a29663013da9d Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 30 Jan 2024 11:15:22 +0800
Subject: [PATCH 1/2] don't apply the hovered color when the option is focused

---
 src/components/OptionRow.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/OptionRow.tsx b/src/components/OptionRow.tsx
index 97e85cacf42d..8cba73a11b5d 100644
--- a/src/components/OptionRow.tsx
+++ b/src/components/OptionRow.tsx
@@ -209,14 +209,14 @@ function OptionRow({
                                         <SubscriptAvatar
                                             mainAvatar={option.icons[0]}
                                             secondaryAvatar={option.icons[1]}
-                                            backgroundColor={hovered ? hoveredBackgroundColor : subscriptColor}
+                                            backgroundColor={(hovered && !optionIsFocused) ? hoveredBackgroundColor : subscriptColor}
                                             size={CONST.AVATAR_SIZE.DEFAULT}
                                         />
                                     ) : (
                                         <MultipleAvatars
                                             icons={option.icons}
                                             size={CONST.AVATAR_SIZE.DEFAULT}
-                                            secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle(hovered ? hoveredBackgroundColor : subscriptColor)]}
+                                            secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle((hovered && !optionIsFocused) ? hoveredBackgroundColor : subscriptColor)]}
                                             shouldShowTooltip={showTitleTooltip && OptionsListUtils.shouldOptionShowTooltip(option)}
                                         />
                                     ))}

From 2be8a48c56ea58a17b86ebd448d840cfe72dc494 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 1 Feb 2024 10:57:19 +0800
Subject: [PATCH 2/2] prettier

---
 src/components/OptionRow.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/OptionRow.tsx b/src/components/OptionRow.tsx
index 8cba73a11b5d..2790ea750d15 100644
--- a/src/components/OptionRow.tsx
+++ b/src/components/OptionRow.tsx
@@ -209,14 +209,14 @@ function OptionRow({
                                         <SubscriptAvatar
                                             mainAvatar={option.icons[0]}
                                             secondaryAvatar={option.icons[1]}
-                                            backgroundColor={(hovered && !optionIsFocused) ? hoveredBackgroundColor : subscriptColor}
+                                            backgroundColor={hovered && !optionIsFocused ? hoveredBackgroundColor : subscriptColor}
                                             size={CONST.AVATAR_SIZE.DEFAULT}
                                         />
                                     ) : (
                                         <MultipleAvatars
                                             icons={option.icons}
                                             size={CONST.AVATAR_SIZE.DEFAULT}
-                                            secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle((hovered && !optionIsFocused) ? hoveredBackgroundColor : subscriptColor)]}
+                                            secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle(hovered && !optionIsFocused ? hoveredBackgroundColor : subscriptColor)]}
                                             shouldShowTooltip={showTitleTooltip && OptionsListUtils.shouldOptionShowTooltip(option)}
                                         />
                                     ))}