Skip to content

[Deploy Blocker Fix] Fix Split/Add to Group Button Highlight Color and Skeleton UI #32721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hayata-suenaga merged 5 commits into from
Dec 8, 2023
Merged

[Deploy Blocker Fix] Fix Split/Add to Group Button Highlight Color and Skeleton UI #32721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa30d35
fix split button highlight color
grgia Dec 8, 2023
7d62412
prettier
grgia Dec 8, 2023
87fd4de
do not change button color, modify appBG menuItem hover color to use …
grgia Dec 8, 2023
d94c1e3
revert skeleton UI color
grgia Dec 8, 2023
8472d23
fix eReceipt image crash
grgia Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/EReceiptThumbnail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -86,7 +86,7 @@ function EReceiptThumbnail({transaction}) {
onLayout={onContainerLayout}
>
<Image
source={getBackgroundImage(transaction)}
source={backgroundImage}
style={styles.eReceiptBackgroundThumbnail}
resizeMode="cover"
/>
Expand Down
3 changes: 2 additions & 1 deletion src/components/OptionRow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Copy link
Copy Markdown
Contributor Author

@grgia grgia Dec 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change favors the active color over hover (same pattern as LHN)

needsOffscreenAlphaCompositing={lodashGet(props.option, 'icons.length', 0) >= 2}
onMouseDown={props.shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
>
Expand Down Expand Up @@ -264,6 +264,7 @@ function OptionRow(props) {
text={props.selectedStateButtonText}
onPress={() => props.onSelectedStatePressed(props.option)}
small
shouldUseDefaultHover={false}
/>
) : (
<PressableWithFeedback
Expand Down
2 changes: 1 addition & 1 deletion src/styles/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,7 +1514,7 @@ const styles = (theme: ThemeColors) =>
},

sidebarLinkActive: {
backgroundColor: theme.border,
backgroundColor: theme.buttonHoveredBG,
textDecorationLine: 'none',
},

Expand Down
2 changes: 1 addition & 1 deletion src/styles/themes/default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down