From aa30d35c70823693e4bb1477ee03010ef317f2f0 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 8 Dec 2023 09:37:02 -0500
Subject: [PATCH 1/5] fix split button highlight color

---
 src/components/OptionRow.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index 8d100b466d1b..9618b894c90f 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -196,7 +196,7 @@ function OptionRow(props) {
                         accessibilityLabel={props.option.text}
                         role={CONST.ACCESSIBILITY_ROLE.BUTTON}
                         hoverDimmingValue={1}
-                        hoverStyle={props.hoverStyle || styles.sidebarLinkHover}
+                        hoverStyle={!props.optionIsFocused ? (props.hoverStyle || styles.sidebarLinkHover) : undefined}
                         needsOffscreenAlphaCompositing={lodashGet(props.option, 'icons.length', 0) >= 2}
                         onMouseDown={props.shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
                     >
@@ -264,6 +264,10 @@ function OptionRow(props) {
                                                 text={props.selectedStateButtonText}
                                                 onPress={() => props.onSelectedStatePressed(props.option)}
                                                 small
+                                                innerStyles={[
+                                                    hovered && !isDisabled ? StyleUtils.getBackgroundColorStyle(theme.buttonDefaultBG) : undefined,
+                                                    props.optionIsFocused && !isDisabled ? styles.buttonDefaultHovered : undefined,
+                                                ]}
                                             />
                                         ) : (
                                             <PressableWithFeedback

From 7d62412b455a2663b3f2e32fc1ca8a56fb7decab Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 8 Dec 2023 09:44:27 -0500
Subject: [PATCH 2/5] prettier

---
 src/components/OptionRow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index 9618b894c90f..1bb9fee72a73 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -196,7 +196,7 @@ function OptionRow(props) {
                         accessibilityLabel={props.option.text}
                         role={CONST.ACCESSIBILITY_ROLE.BUTTON}
                         hoverDimmingValue={1}
-                        hoverStyle={!props.optionIsFocused ? (props.hoverStyle || styles.sidebarLinkHover) : undefined}
+                        hoverStyle={!props.optionIsFocused ? props.hoverStyle || styles.sidebarLinkHover : undefined}
                         needsOffscreenAlphaCompositing={lodashGet(props.option, 'icons.length', 0) >= 2}
                         onMouseDown={props.shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
                     >

From 87fd4de17fba18844cb9750c35c05cc0ad30764d Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 8 Dec 2023 10:42:30 -0500
Subject: [PATCH 3/5] do not change button color, modify appBG menuItem hover
 color to use product500

---
 src/components/OptionRow.js | 5 +----
 src/styles/styles.ts        | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index 1bb9fee72a73..eaf3ccc7ead2 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -264,10 +264,7 @@ function OptionRow(props) {
                                                 text={props.selectedStateButtonText}
                                                 onPress={() => props.onSelectedStatePressed(props.option)}
                                                 small
-                                                innerStyles={[
-                                                    hovered && !isDisabled ? StyleUtils.getBackgroundColorStyle(theme.buttonDefaultBG) : undefined,
-                                                    props.optionIsFocused && !isDisabled ? styles.buttonDefaultHovered : undefined,
-                                                ]}
+                                                shouldUseDefaultHover={false}
                                             />
                                         ) : (
                                             <PressableWithFeedback
diff --git a/src/styles/styles.ts b/src/styles/styles.ts
index 76674b26c65c..614b564075ea 100644
--- a/src/styles/styles.ts
+++ b/src/styles/styles.ts
@@ -1514,7 +1514,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         sidebarLinkActive: {
-            backgroundColor: theme.border,
+            backgroundColor: theme.buttonHoveredBG,
             textDecorationLine: 'none',
         },
 

From d94c1e3ce2ab634e741284c954c3524cf3a35adb Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 8 Dec 2023 10:48:05 -0500
Subject: [PATCH 4/5] revert skeleton UI color

---
 src/styles/themes/default.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/themes/default.ts b/src/styles/themes/default.ts
index 891eb1e9bf8e..00ff9d05cbff 100644
--- a/src/styles/themes/default.ts
+++ b/src/styles/themes/default.ts
@@ -79,7 +79,7 @@ const darkTheme = {
     tooltipSupportingText: colors.productLight800,
     tooltipPrimaryText: colors.productLight900,
     skeletonLHNIn: colors.productDark400,
-    skeletonLHNOut: colors.productDark400,
+    skeletonLHNOut: colors.productDark600,
     QRLogo: colors.green400,
     starDefaultBG: 'rgb(254, 228, 94)',
     loungeAccessOverlay: colors.blue800,

From 8472d23bc3e69e7cdf673aacb2571c3c68053079 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 8 Dec 2023 11:04:28 -0500
Subject: [PATCH 5/5] fix eReceipt image crash

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

diff --git a/src/components/EReceiptThumbnail.js b/src/components/EReceiptThumbnail.js
index 5eb35538af80..1f719862412b 100644
--- a/src/components/EReceiptThumbnail.js
+++ b/src/components/EReceiptThumbnail.js
@@ -72,7 +72,7 @@ function EReceiptThumbnail({transaction}) {
         receiptMCCSize = variables.eReceiptMCCHeightWidthMedium;
     }
 
-    const getBackgroundImage = useMemo((trans) => backgroundImages[StyleUtils.getEReceiptColorCode(trans)], [StyleUtils]);
+    const backgroundImage = useMemo(() => backgroundImages[StyleUtils.getEReceiptColorCode(transaction)], [StyleUtils, transaction]);
 
     return (
         <View
@@ -86,7 +86,7 @@ function EReceiptThumbnail({transaction}) {
             onLayout={onContainerLayout}
         >
             <Image
-                source={getBackgroundImage(transaction)}
+                source={backgroundImage}
                 style={styles.eReceiptBackgroundThumbnail}
                 resizeMode="cover"
             />