Skip to content

[QA-1448] Fix user badge spacing#9302

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
Kyle-Shanks merged 2 commits into from
Jul 30, 2024
Merged

[QA-1448] Fix user badge spacing #9302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5109c8
Fix user badge spacing
Kyle-Shanks Jul 30, 2024
2b5eca6
fix lint
Kyle-Shanks Jul 30, 2024
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
20 changes: 11 additions & 9 deletions packages/web/src/components/track/GatedContentSection.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -639,20 +639,22 @@ export const GatedContentSection = ({
mouseEnterDelay={0.1}
component='span'
>
<h2
className={styles.gatedContentOwner}
onClick={() =>
dispatch(pushRoute(profilePage(emptyStringGuard(entity.handle))))
}
>
{entity.name}
<Flex gap='xs' alignItems='center'>
<h2
className={styles.gatedContentOwner}
onClick={() =>
dispatch(pushRoute(profilePage(emptyStringGuard(entity.handle))))
}
>
{entity.name}
</h2>
<UserBadges
userId={entity.user_id}
className={styles.badgeIcon}
badgeSize={14}
useSVGTiers
/>
</h2>
</Flex>
</ArtistPopover>
),
[dispatch]
Expand All@@ -661,7 +663,7 @@ export const GatedContentSection = ({
if (!streamConditions) return null
if (!shouldDisplay) return null

if (hasStreamAccess) {
if (!hasStreamAccess) {
return (
<div className={cn(styles.gatedContentSection, fadeIn, wrapperClassName)}>
<UnlockedGatedContentSection
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/components/user-badges/UserBadges.module.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
.container {
display: flex;
overflow: visible;
gap: 4px;
}

.container svg,
.inlineContainer svg {
.inlineContainer svg:first-child {
margin-right: 4px !important;
}
21 changes: 9 additions & 12 deletions packages/web/src/components/user-badges/UserBadges.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,19 +101,16 @@ const UserBadges = ({

if (!hasContent) return null

if (inline) {
return (
<span className={cn(styles.inlineContainer, className)}>
{(isVerifiedOverride ?? isVerified) && (
<IconVerified height={badgeSize} width={badgeSize} />
)}
{audioBadge &&
cloneElement(audioBadge, { height: badgeSize, width: badgeSize })}
</span>
)
}
return (
<span className={cn(styles.container, className)}>
<span
className={cn(
{
[styles.inlineContainer]: inline,
[styles.container]: !inline
},
className
)}
>
{(isVerifiedOverride ?? isVerified) && (
<IconVerified height={badgeSize} width={badgeSize} />
)}
Expand Down