Skip to content

Commit

Permalink
Merge pull request Expensify#36794 from software-mansion-labs/update-…
Browse files Browse the repository at this point in the history
…account-settings/wallet-page-badge-fix

[Update Account Settings] Fix Wallet Page default badge style
  • Loading branch information
mountiny authored Feb 21, 2024
2 parents 52b6d70 + f67a9b2 commit 61d9dfe
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/components/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -573,10 +573,12 @@ function MenuItem(
{badgeText && (
<Badge
text={badgeText}
textStyles={styles.textStrong}
badgeStyles={[
styles.alignSelfCenter,
styles.badgeBordered,
brickRoadIndicator ? styles.mr2 : undefined,
focused || isHovered || pressed ? styles.buttonHoveredBG : {},
focused || isHovered || pressed ? styles.activeItemBadge : {},
badgeStyle,
]}
/>
Expand Down
6 changes: 6 additions & 0 deletions src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,8 @@ const styles = (theme: ThemeColors) =>
borderWidth: 1,
borderRadius: variables.componentBorderRadiusSmall,
borderColor: theme.border,
paddingHorizontal: 12,
minHeight: 28,
},

badgeText: {
Expand All @@ -835,6 +837,10 @@ const styles = (theme: ThemeColors) =>
...whiteSpace.noWrap,
},

activeItemBadge: {
borderColor: theme.buttonHoveredBG,
},

border: {
borderWidth: 1,
borderRadius: variables.componentBorderRadius,
Expand Down

0 comments on commit 61d9dfe

Please sign in to comment.