Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/mobile/src/components/card/Card.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { LinearGradientProps } from 'react-native-linear-gradient'
import type { ImageProps } from '@audius/harmony-native'
import type { TileProps } from 'app/components/core'
import { Tile } from 'app/components/core'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import type { StylesProp } from 'app/styles'
import { flexRowCentered, makeStyles } from 'app/styles'

Expand DownExpand Up@@ -114,7 +114,7 @@ export const Card = (props: CardProps) => {
{primaryText}
</Text>
{props.type === 'user' ? (
<UserBadges user={props.user} badgeSize={12} hideName />
<UserBadges userId={props.user.user_id} badgeSize='xs' />
) : null}
</View>
<View style={styles.secondaryTextContainer}>
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/src/components/comments/CommentDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'

import { Box, Divider, Flex, Text, useTheme } from '@audius/harmony-native'
import { ProfilePicture } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { LoadingSpinner } from 'app/harmony-native/components/LoadingSpinner/LoadingSpinner'

import { CommentDrawerForm } from './CommentDrawerForm'
Expand All@@ -59,7 +59,7 @@ const UserListItem = (props: UserListItemProps) => {
<Flex direction='column'>
<Text variant='body' size='s'>
{user.name}
<UserBadges user={user} badgeSize={10} hideName />
<UserBadges userId={user.user_id} badgeSize='xs' />
</Text>
<Text variant='body' size='xs' color='default'>
@{user.handle}
Expand Down
13 changes: 2 additions & 11 deletions packages/mobile/src/components/details-tile/DeletedTile.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,7 @@ import type { ReactNode } from 'react'
import type { SearchUser, User } from '@audius/common/models'
import { TouchableOpacity } from 'react-native-gesture-handler'

import {
Button,
Flex,
IconUser,
Paper,
Text,
useTheme
} from '@audius/harmony-native'
import { Button, Flex, IconUser, Paper, Text } from '@audius/harmony-native'
import { UserBadges } from 'app/components/user-badges'

const messages = {
Expand All@@ -32,8 +25,6 @@ export const DeletedTile = ({
imageElement: ReactNode | ReactNode[]
handlePressArtistName: () => void
}) => {
const { spacing } = useTheme()

return (
<Paper alignItems='center' p='l' gap='l' w='100%'>
<Text variant='label' color='subdued' style={{ letterSpacing: 2 }}>
Expand All@@ -50,7 +41,7 @@ export const DeletedTile = ({
<Text variant='body' color='accent' size='l'>
{user.name}
</Text>
<UserBadges badgeSize={spacing.l} user={user} hideName />
<UserBadges userId={user.user_id} badgeSize='s' />
</Flex>
</TouchableOpacity>
) : null}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { LockedStatusBadge, Text, useLink } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useNavigation } from 'app/hooks/useNavigation'
import { flexRowCentered, makeStyles } from 'app/styles'
import { useColor } from 'app/utils/theme'
Expand DownExpand Up@@ -236,12 +236,7 @@ export const DetailsTileHasAccess = ({
>
{entity.name}
</Text>
<UserBadges
badgeSize={16}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import LogoEth from 'app/assets/images/logoEth.svg'
import LogoSol from 'app/assets/images/logoSol.svg'
import { LockedStatusBadge, useLink } from 'app/components/core'
import LoadingSpinner from 'app/components/loading-spinner'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useDrawer } from 'app/hooks/useDrawer'
import { useNavigation } from 'app/hooks/useNavigation'
import { make, track } from 'app/services/analytics'
Expand DownExpand Up@@ -255,12 +255,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
{suffix ? <Text style={styles.description}>{suffix}</Text> : null}
</View>
)
Expand DownExpand Up@@ -400,12 +395,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.followRequired(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand All@@ -214,11 +215,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.tipGated(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand DownExpand Up@@ -261,11 +263,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.noAction}
{user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</Text>
<Button
Expand Down
11 changes: 4 additions & 7 deletions packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { Remix } from '@audius/common/models'
import { StyleSheet, View } from 'react-native'

import Text from 'app/components/text'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered } from 'app/styles'

import { useStyles as useTrackTileStyles } from './styles'
Expand DownExpand Up@@ -58,12 +58,9 @@ export const LineupTileCoSign = ({ coSign }: Props) => {
<View style={styles.coSignText}>
<View style={styles.coSignName}>
<Text style={trackTileStyles.statText}>{coSign.user.name}</Text>
<UserBadges
user={coSign.user}
style={styles.coSignIcon}
badgeSize={8}
hideName
/>
<View style={styles.coSignIcon}>
<UserBadges userId={coSign.user.user_id} badgeSize='xs' />
</View>
</View>
<Text style={trackTileStyles.statText}>
{formatCoSign({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { View } from 'react-native'
import { Divider } from '@audius/harmony-native'
import AudiusLogo from 'app/assets/images/audiusLogoHorizontal.svg'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand DownExpand Up@@ -118,12 +118,9 @@ export const ShareToStorySticker = ({
>
{messages.by} {artist.name}
</Text>
<UserBadges
user={artist}
badgeSize={12}
style={styles.badges}
hideName
/>
<View style={styles.badges}>
<UserBadges userId={artist.user_id} badgeSize='xs' />
</View>
</View>
<Divider />
<View
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,12 @@ const SuggestedTrackRow = (props: SuggestedTrackProps) => {
{title}
</Text>
{user ? (
<UserBadges user={user} nameStyle={styles.artistName} />
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.artistName}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</View>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useIsUSDCEnabled } from 'app/hooks/useIsUSDCEnabled'
import { makeStyles, flexRowCentered, typography } from 'app/styles'
import { spacing } from 'app/styles/spacing'
Expand DownExpand Up@@ -66,10 +66,6 @@ const useStyles = makeStyles(({ spacing, palette }) => ({
streamContentLabel: {
letterSpacing: spacing(0.5)
},
trackOwnerContainer: {
...flexRowCentered(),
marginTop: spacing(1)
},
trackOwner: {
fontFamily: typography.fontByWeight.medium,
fontSize: typography.fontSize.medium
Expand DownExpand Up@@ -169,10 +165,10 @@ export const TrackDetailsTile = ({
>
{track.title}
</Text>
<View style={styles.trackOwnerContainer}>
<Flex row alignItems='center' gap='xs' mt='xs'>
<Text fontSize='medium'>{owner.name}</Text>
<UserBadges badgeSize={spacing(4)} user={owner} hideName />
</View>
<UserBadges userId={owner.user_id} badgeSize='xs' />
</Flex>
{earnAmount ? (
<Flex direction='row' alignItems='center' gap='xs' pt='xs'>
<IconCart size='s' color='premium' />
Expand Down
6 changes: 4 additions & 2 deletions packages/mobile/src/components/track-list/TrackListItem.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ import {
IconRemove,
IconVisibilityHidden
} from '@audius/harmony-native'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered, font, makeStyles } from 'app/styles'

import { TrackDownloadStatusIndicator } from '../offline-downloads/TrackDownloadStatusIndicator'
Expand DownExpand Up@@ -412,7 +412,9 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => {
</View>
<Text numberOfLines={1} style={styles.artistName}>
{name}
{user ? <UserBadges user={user} badgeSize={12} hideName /> : null}
{user ? (
<UserBadges userId={user.user_id} badgeSize='xs' />
) : null}
</Text>
</View>
{isUnlisted ? (
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/mobile/src/components/card/Card.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { LinearGradientProps } from 'react-native-linear-gradient'
import type { ImageProps } from '@audius/harmony-native'
import type { TileProps } from 'app/components/core'
import { Tile } from 'app/components/core'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import type { StylesProp } from 'app/styles'
import { flexRowCentered, makeStyles } from 'app/styles'

Expand DownExpand Up@@ -114,7 +114,7 @@ export const Card = (props: CardProps) => {
{primaryText}
</Text>
{props.type === 'user' ? (
<UserBadges user={props.user} badgeSize={12} hideName />
<UserBadges userId={props.user.user_id} badgeSize='xs' />
) : null}
</View>
<View style={styles.secondaryTextContainer}>
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/src/components/comments/CommentDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'

import { Box, Divider, Flex, Text, useTheme } from '@audius/harmony-native'
import { ProfilePicture } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { LoadingSpinner } from 'app/harmony-native/components/LoadingSpinner/LoadingSpinner'

import { CommentDrawerForm } from './CommentDrawerForm'
Expand All@@ -59,7 +59,7 @@ const UserListItem = (props: UserListItemProps) => {
<Flex direction='column'>
<Text variant='body' size='s'>
{user.name}
<UserBadges user={user} badgeSize={10} hideName />
<UserBadges userId={user.user_id} badgeSize='xs' />
</Text>
<Text variant='body' size='xs' color='default'>
@{user.handle}
Expand Down
13 changes: 2 additions & 11 deletions packages/mobile/src/components/details-tile/DeletedTile.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,7 @@ import type { ReactNode } from 'react'
import type { SearchUser, User } from '@audius/common/models'
import { TouchableOpacity } from 'react-native-gesture-handler'

import {
Button,
Flex,
IconUser,
Paper,
Text,
useTheme
} from '@audius/harmony-native'
import { Button, Flex, IconUser, Paper, Text } from '@audius/harmony-native'
import { UserBadges } from 'app/components/user-badges'

const messages = {
Expand All@@ -32,8 +25,6 @@ export const DeletedTile = ({
imageElement: ReactNode | ReactNode[]
handlePressArtistName: () => void
}) => {
const { spacing } = useTheme()

return (
<Paper alignItems='center' p='l' gap='l' w='100%'>
<Text variant='label' color='subdued' style={{ letterSpacing: 2 }}>
Expand All@@ -50,7 +41,7 @@ export const DeletedTile = ({
<Text variant='body' color='accent' size='l'>
{user.name}
</Text>
<UserBadges badgeSize={spacing.l} user={user} hideName />
<UserBadges userId={user.user_id} badgeSize='s' />
</Flex>
</TouchableOpacity>
) : null}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { LockedStatusBadge, Text, useLink } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useNavigation } from 'app/hooks/useNavigation'
import { flexRowCentered, makeStyles } from 'app/styles'
import { useColor } from 'app/utils/theme'
Expand DownExpand Up@@ -236,12 +236,7 @@ export const DetailsTileHasAccess = ({
>
{entity.name}
</Text>
<UserBadges
badgeSize={16}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import LogoEth from 'app/assets/images/logoEth.svg'
import LogoSol from 'app/assets/images/logoSol.svg'
import { LockedStatusBadge, useLink } from 'app/components/core'
import LoadingSpinner from 'app/components/loading-spinner'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useDrawer } from 'app/hooks/useDrawer'
import { useNavigation } from 'app/hooks/useNavigation'
import { make, track } from 'app/services/analytics'
Expand DownExpand Up@@ -255,12 +255,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
{suffix ? <Text style={styles.description}>{suffix}</Text> : null}
</View>
)
Expand DownExpand Up@@ -400,12 +395,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.followRequired(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand All@@ -214,11 +215,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.tipGated(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand DownExpand Up@@ -261,11 +263,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.noAction}
{user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</Text>
<Button
Expand Down
11 changes: 4 additions & 7 deletions packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { Remix } from '@audius/common/models'
import { StyleSheet, View } from 'react-native'

import Text from 'app/components/text'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered } from 'app/styles'

import { useStyles as useTrackTileStyles } from './styles'
Expand DownExpand Up@@ -58,12 +58,9 @@ export const LineupTileCoSign = ({ coSign }: Props) => {
<View style={styles.coSignText}>
<View style={styles.coSignName}>
<Text style={trackTileStyles.statText}>{coSign.user.name}</Text>
<UserBadges
user={coSign.user}
style={styles.coSignIcon}
badgeSize={8}
hideName
/>
<View style={styles.coSignIcon}>
<UserBadges userId={coSign.user.user_id} badgeSize='xs' />
</View>
</View>
<Text style={trackTileStyles.statText}>
{formatCoSign({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { View } from 'react-native'
import { Divider } from '@audius/harmony-native'
import AudiusLogo from 'app/assets/images/audiusLogoHorizontal.svg'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand DownExpand Up@@ -118,12 +118,9 @@ export const ShareToStorySticker = ({
>
{messages.by} {artist.name}
</Text>
<UserBadges
user={artist}
badgeSize={12}
style={styles.badges}
hideName
/>
<View style={styles.badges}>
<UserBadges userId={artist.user_id} badgeSize='xs' />
</View>
</View>
<Divider />
<View
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,12 @@ const SuggestedTrackRow = (props: SuggestedTrackProps) => {
{title}
</Text>
{user ? (
<UserBadges user={user} nameStyle={styles.artistName} />
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.artistName}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</View>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useIsUSDCEnabled } from 'app/hooks/useIsUSDCEnabled'
import { makeStyles, flexRowCentered, typography } from 'app/styles'
import { spacing } from 'app/styles/spacing'
Expand DownExpand Up@@ -66,10 +66,6 @@ const useStyles = makeStyles(({ spacing, palette }) => ({
streamContentLabel: {
letterSpacing: spacing(0.5)
},
trackOwnerContainer: {
...flexRowCentered(),
marginTop: spacing(1)
},
trackOwner: {
fontFamily: typography.fontByWeight.medium,
fontSize: typography.fontSize.medium
Expand DownExpand Up@@ -169,10 +165,10 @@ export const TrackDetailsTile = ({
>
{track.title}
</Text>
<View style={styles.trackOwnerContainer}>
<Flex row alignItems='center' gap='xs' mt='xs'>
<Text fontSize='medium'>{owner.name}</Text>
<UserBadges badgeSize={spacing(4)} user={owner} hideName />
</View>
<UserBadges userId={owner.user_id} badgeSize='xs' />
</Flex>
{earnAmount ? (
<Flex direction='row' alignItems='center' gap='xs' pt='xs'>
<IconCart size='s' color='premium' />
Expand Down
6 changes: 4 additions & 2 deletions packages/mobile/src/components/track-list/TrackListItem.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ import {
IconRemove,
IconVisibilityHidden
} from '@audius/harmony-native'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered, font, makeStyles } from 'app/styles'

import { TrackDownloadStatusIndicator } from '../offline-downloads/TrackDownloadStatusIndicator'
Expand DownExpand Up@@ -412,7 +412,9 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => {
</View>
<Text numberOfLines={1} style={styles.artistName}>
{name}
{user ? <UserBadges user={user} badgeSize={12} hideName /> : null}
{user ? (
<UserBadges userId={user.user_id} badgeSize='xs' />
) : null}
</Text>
</View>
{isUnlisted ? (
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/mobile/src/components/card/Card.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { LinearGradientProps } from 'react-native-linear-gradient'
import type { ImageProps } from '@audius/harmony-native'
import type { TileProps } from 'app/components/core'
import { Tile } from 'app/components/core'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import type { StylesProp } from 'app/styles'
import { flexRowCentered, makeStyles } from 'app/styles'

Expand DownExpand Up@@ -114,7 +114,7 @@ export const Card = (props: CardProps) => {
{primaryText}
</Text>
{props.type === 'user' ? (
<UserBadges user={props.user} badgeSize={12} hideName />
<UserBadges userId={props.user.user_id} badgeSize='xs' />
) : null}
</View>
<View style={styles.secondaryTextContainer}>
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/src/components/comments/CommentDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'

import { Box, Divider, Flex, Text, useTheme } from '@audius/harmony-native'
import { ProfilePicture } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { LoadingSpinner } from 'app/harmony-native/components/LoadingSpinner/LoadingSpinner'

import { CommentDrawerForm } from './CommentDrawerForm'
Expand All@@ -59,7 +59,7 @@ const UserListItem = (props: UserListItemProps) => {
<Flex direction='column'>
<Text variant='body' size='s'>
{user.name}
<UserBadges user={user} badgeSize={10} hideName />
<UserBadges userId={user.user_id} badgeSize='xs' />
</Text>
<Text variant='body' size='xs' color='default'>
@{user.handle}
Expand Down
13 changes: 2 additions & 11 deletions packages/mobile/src/components/details-tile/DeletedTile.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,7 @@ import type { ReactNode } from 'react'
import type { SearchUser, User } from '@audius/common/models'
import { TouchableOpacity } from 'react-native-gesture-handler'

import {
Button,
Flex,
IconUser,
Paper,
Text,
useTheme
} from '@audius/harmony-native'
import { Button, Flex, IconUser, Paper, Text } from '@audius/harmony-native'
import { UserBadges } from 'app/components/user-badges'

const messages = {
Expand All@@ -32,8 +25,6 @@ export const DeletedTile = ({
imageElement: ReactNode | ReactNode[]
handlePressArtistName: () => void
}) => {
const { spacing } = useTheme()

return (
<Paper alignItems='center' p='l' gap='l' w='100%'>
<Text variant='label' color='subdued' style={{ letterSpacing: 2 }}>
Expand All@@ -50,7 +41,7 @@ export const DeletedTile = ({
<Text variant='body' color='accent' size='l'>
{user.name}
</Text>
<UserBadges badgeSize={spacing.l} user={user} hideName />
<UserBadges userId={user.user_id} badgeSize='s' />
</Flex>
</TouchableOpacity>
) : null}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { LockedStatusBadge, Text, useLink } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useNavigation } from 'app/hooks/useNavigation'
import { flexRowCentered, makeStyles } from 'app/styles'
import { useColor } from 'app/utils/theme'
Expand DownExpand Up@@ -236,12 +236,7 @@ export const DetailsTileHasAccess = ({
>
{entity.name}
</Text>
<UserBadges
badgeSize={16}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import LogoEth from 'app/assets/images/logoEth.svg'
import LogoSol from 'app/assets/images/logoSol.svg'
import { LockedStatusBadge, useLink } from 'app/components/core'
import LoadingSpinner from 'app/components/loading-spinner'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useDrawer } from 'app/hooks/useDrawer'
import { useNavigation } from 'app/hooks/useNavigation'
import { make, track } from 'app/services/analytics'
Expand DownExpand Up@@ -255,12 +255,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
{suffix ? <Text style={styles.description}>{suffix}</Text> : null}
</View>
)
Expand DownExpand Up@@ -400,12 +395,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.followRequired(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand All@@ -214,11 +215,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.tipGated(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand DownExpand Up@@ -261,11 +263,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.noAction}
{user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</Text>
<Button
Expand Down
11 changes: 4 additions & 7 deletions packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { Remix } from '@audius/common/models'
import { StyleSheet, View } from 'react-native'

import Text from 'app/components/text'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered } from 'app/styles'

import { useStyles as useTrackTileStyles } from './styles'
Expand DownExpand Up@@ -58,12 +58,9 @@ export const LineupTileCoSign = ({ coSign }: Props) => {
<View style={styles.coSignText}>
<View style={styles.coSignName}>
<Text style={trackTileStyles.statText}>{coSign.user.name}</Text>
<UserBadges
user={coSign.user}
style={styles.coSignIcon}
badgeSize={8}
hideName
/>
<View style={styles.coSignIcon}>
<UserBadges userId={coSign.user.user_id} badgeSize='xs' />
</View>
</View>
<Text style={trackTileStyles.statText}>
{formatCoSign({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { View } from 'react-native'
import { Divider } from '@audius/harmony-native'
import AudiusLogo from 'app/assets/images/audiusLogoHorizontal.svg'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand DownExpand Up@@ -118,12 +118,9 @@ export const ShareToStorySticker = ({
>
{messages.by} {artist.name}
</Text>
<UserBadges
user={artist}
badgeSize={12}
style={styles.badges}
hideName
/>
<View style={styles.badges}>
<UserBadges userId={artist.user_id} badgeSize='xs' />
</View>
</View>
<Divider />
<View
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,12 @@ const SuggestedTrackRow = (props: SuggestedTrackProps) => {
{title}
</Text>
{user ? (
<UserBadges user={user} nameStyle={styles.artistName} />
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.artistName}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</View>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useIsUSDCEnabled } from 'app/hooks/useIsUSDCEnabled'
import { makeStyles, flexRowCentered, typography } from 'app/styles'
import { spacing } from 'app/styles/spacing'
Expand DownExpand Up@@ -66,10 +66,6 @@ const useStyles = makeStyles(({ spacing, palette }) => ({
streamContentLabel: {
letterSpacing: spacing(0.5)
},
trackOwnerContainer: {
...flexRowCentered(),
marginTop: spacing(1)
},
trackOwner: {
fontFamily: typography.fontByWeight.medium,
fontSize: typography.fontSize.medium
Expand DownExpand Up@@ -169,10 +165,10 @@ export const TrackDetailsTile = ({
>
{track.title}
</Text>
<View style={styles.trackOwnerContainer}>
<Flex row alignItems='center' gap='xs' mt='xs'>
<Text fontSize='medium'>{owner.name}</Text>
<UserBadges badgeSize={spacing(4)} user={owner} hideName />
</View>
<UserBadges userId={owner.user_id} badgeSize='xs' />
</Flex>
{earnAmount ? (
<Flex direction='row' alignItems='center' gap='xs' pt='xs'>
<IconCart size='s' color='premium' />
Expand Down
6 changes: 4 additions & 2 deletions packages/mobile/src/components/track-list/TrackListItem.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ import {
IconRemove,
IconVisibilityHidden
} from '@audius/harmony-native'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered, font, makeStyles } from 'app/styles'

import { TrackDownloadStatusIndicator } from '../offline-downloads/TrackDownloadStatusIndicator'
Expand DownExpand Up@@ -412,7 +412,9 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => {
</View>
<Text numberOfLines={1} style={styles.artistName}>
{name}
{user ? <UserBadges user={user} badgeSize={12} hideName /> : null}
{user ? (
<UserBadges userId={user.user_id} badgeSize='xs' />
) : null}
</Text>
</View>
{isUnlisted ? (
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/mobile/src/components/card/Card.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { LinearGradientProps } from 'react-native-linear-gradient'
import type { ImageProps } from '@audius/harmony-native'
import type { TileProps } from 'app/components/core'
import { Tile } from 'app/components/core'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import type { StylesProp } from 'app/styles'
import { flexRowCentered, makeStyles } from 'app/styles'

Expand DownExpand Up@@ -114,7 +114,7 @@ export const Card = (props: CardProps) => {
{primaryText}
</Text>
{props.type === 'user' ? (
<UserBadges user={props.user} badgeSize={12} hideName />
<UserBadges userId={props.user.user_id} badgeSize='xs' />
) : null}
</View>
<View style={styles.secondaryTextContainer}>
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/src/components/comments/CommentDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'

import { Box, Divider, Flex, Text, useTheme } from '@audius/harmony-native'
import { ProfilePicture } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { LoadingSpinner } from 'app/harmony-native/components/LoadingSpinner/LoadingSpinner'

import { CommentDrawerForm } from './CommentDrawerForm'
Expand All@@ -59,7 +59,7 @@ const UserListItem = (props: UserListItemProps) => {
<Flex direction='column'>
<Text variant='body' size='s'>
{user.name}
<UserBadges user={user} badgeSize={10} hideName />
<UserBadges userId={user.user_id} badgeSize='xs' />
</Text>
<Text variant='body' size='xs' color='default'>
@{user.handle}
Expand Down
13 changes: 2 additions & 11 deletions packages/mobile/src/components/details-tile/DeletedTile.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,7 @@ import type { ReactNode } from 'react'
import type { SearchUser, User } from '@audius/common/models'
import { TouchableOpacity } from 'react-native-gesture-handler'

import {
Button,
Flex,
IconUser,
Paper,
Text,
useTheme
} from '@audius/harmony-native'
import { Button, Flex, IconUser, Paper, Text } from '@audius/harmony-native'
import { UserBadges } from 'app/components/user-badges'

const messages = {
Expand All@@ -32,8 +25,6 @@ export const DeletedTile = ({
imageElement: ReactNode | ReactNode[]
handlePressArtistName: () => void
}) => {
const { spacing } = useTheme()

return (
<Paper alignItems='center' p='l' gap='l' w='100%'>
<Text variant='label' color='subdued' style={{ letterSpacing: 2 }}>
Expand All@@ -50,7 +41,7 @@ export const DeletedTile = ({
<Text variant='body' color='accent' size='l'>
{user.name}
</Text>
<UserBadges badgeSize={spacing.l} user={user} hideName />
<UserBadges userId={user.user_id} badgeSize='s' />
</Flex>
</TouchableOpacity>
) : null}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { LockedStatusBadge, Text, useLink } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useNavigation } from 'app/hooks/useNavigation'
import { flexRowCentered, makeStyles } from 'app/styles'
import { useColor } from 'app/utils/theme'
Expand DownExpand Up@@ -236,12 +236,7 @@ export const DetailsTileHasAccess = ({
>
{entity.name}
</Text>
<UserBadges
badgeSize={16}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import LogoEth from 'app/assets/images/logoEth.svg'
import LogoSol from 'app/assets/images/logoSol.svg'
import { LockedStatusBadge, useLink } from 'app/components/core'
import LoadingSpinner from 'app/components/loading-spinner'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useDrawer } from 'app/hooks/useDrawer'
import { useNavigation } from 'app/hooks/useNavigation'
import { make, track } from 'app/services/analytics'
Expand DownExpand Up@@ -255,12 +255,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
{suffix ? <Text style={styles.description}>{suffix}</Text> : null}
</View>
)
Expand DownExpand Up@@ -400,12 +395,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.followRequired(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand All@@ -214,11 +215,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.tipGated(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand DownExpand Up@@ -261,11 +263,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.noAction}
{user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</Text>
<Button
Expand Down
11 changes: 4 additions & 7 deletions packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { Remix } from '@audius/common/models'
import { StyleSheet, View } from 'react-native'

import Text from 'app/components/text'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered } from 'app/styles'

import { useStyles as useTrackTileStyles } from './styles'
Expand DownExpand Up@@ -58,12 +58,9 @@ export const LineupTileCoSign = ({ coSign }: Props) => {
<View style={styles.coSignText}>
<View style={styles.coSignName}>
<Text style={trackTileStyles.statText}>{coSign.user.name}</Text>
<UserBadges
user={coSign.user}
style={styles.coSignIcon}
badgeSize={8}
hideName
/>
<View style={styles.coSignIcon}>
<UserBadges userId={coSign.user.user_id} badgeSize='xs' />
</View>
</View>
<Text style={trackTileStyles.statText}>
{formatCoSign({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { View } from 'react-native'
import { Divider } from '@audius/harmony-native'
import AudiusLogo from 'app/assets/images/audiusLogoHorizontal.svg'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand DownExpand Up@@ -118,12 +118,9 @@ export const ShareToStorySticker = ({
>
{messages.by} {artist.name}
</Text>
<UserBadges
user={artist}
badgeSize={12}
style={styles.badges}
hideName
/>
<View style={styles.badges}>
<UserBadges userId={artist.user_id} badgeSize='xs' />
</View>
</View>
<Divider />
<View
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,12 @@ const SuggestedTrackRow = (props: SuggestedTrackProps) => {
{title}
</Text>
{user ? (
<UserBadges user={user} nameStyle={styles.artistName} />
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.artistName}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</View>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useIsUSDCEnabled } from 'app/hooks/useIsUSDCEnabled'
import { makeStyles, flexRowCentered, typography } from 'app/styles'
import { spacing } from 'app/styles/spacing'
Expand DownExpand Up@@ -66,10 +66,6 @@ const useStyles = makeStyles(({ spacing, palette }) => ({
streamContentLabel: {
letterSpacing: spacing(0.5)
},
trackOwnerContainer: {
...flexRowCentered(),
marginTop: spacing(1)
},
trackOwner: {
fontFamily: typography.fontByWeight.medium,
fontSize: typography.fontSize.medium
Expand DownExpand Up@@ -169,10 +165,10 @@ export const TrackDetailsTile = ({
>
{track.title}
</Text>
<View style={styles.trackOwnerContainer}>
<Flex row alignItems='center' gap='xs' mt='xs'>
<Text fontSize='medium'>{owner.name}</Text>
<UserBadges badgeSize={spacing(4)} user={owner} hideName />
</View>
<UserBadges userId={owner.user_id} badgeSize='xs' />
</Flex>
{earnAmount ? (
<Flex direction='row' alignItems='center' gap='xs' pt='xs'>
<IconCart size='s' color='premium' />
Expand Down
6 changes: 4 additions & 2 deletions packages/mobile/src/components/track-list/TrackListItem.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ import {
IconRemove,
IconVisibilityHidden
} from '@audius/harmony-native'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered, font, makeStyles } from 'app/styles'

import { TrackDownloadStatusIndicator } from '../offline-downloads/TrackDownloadStatusIndicator'
Expand DownExpand Up@@ -412,7 +412,9 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => {
</View>
<Text numberOfLines={1} style={styles.artistName}>
{name}
{user ? <UserBadges user={user} badgeSize={12} hideName /> : null}
{user ? (
<UserBadges userId={user.user_id} badgeSize='xs' />
) : null}
</Text>
</View>
{isUnlisted ? (
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/mobile/src/components/card/Card.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { LinearGradientProps } from 'react-native-linear-gradient'
import type { ImageProps } from '@audius/harmony-native'
import type { TileProps } from 'app/components/core'
import { Tile } from 'app/components/core'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import type { StylesProp } from 'app/styles'
import { flexRowCentered, makeStyles } from 'app/styles'

Expand DownExpand Up@@ -114,7 +114,7 @@ export const Card = (props: CardProps) => {
{primaryText}
</Text>
{props.type === 'user' ? (
<UserBadges user={props.user} badgeSize={12} hideName />
<UserBadges userId={props.user.user_id} badgeSize='xs' />
) : null}
</View>
<View style={styles.secondaryTextContainer}>
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/src/components/comments/CommentDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'

import { Box, Divider, Flex, Text, useTheme } from '@audius/harmony-native'
import { ProfilePicture } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { LoadingSpinner } from 'app/harmony-native/components/LoadingSpinner/LoadingSpinner'

import { CommentDrawerForm } from './CommentDrawerForm'
Expand All@@ -59,7 +59,7 @@ const UserListItem = (props: UserListItemProps) => {
<Flex direction='column'>
<Text variant='body' size='s'>
{user.name}
<UserBadges user={user} badgeSize={10} hideName />
<UserBadges userId={user.user_id} badgeSize='xs' />
</Text>
<Text variant='body' size='xs' color='default'>
@{user.handle}
Expand Down
13 changes: 2 additions & 11 deletions packages/mobile/src/components/details-tile/DeletedTile.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,7 @@ import type { ReactNode } from 'react'
import type { SearchUser, User } from '@audius/common/models'
import { TouchableOpacity } from 'react-native-gesture-handler'

import {
Button,
Flex,
IconUser,
Paper,
Text,
useTheme
} from '@audius/harmony-native'
import { Button, Flex, IconUser, Paper, Text } from '@audius/harmony-native'
import { UserBadges } from 'app/components/user-badges'

const messages = {
Expand All@@ -32,8 +25,6 @@ export const DeletedTile = ({
imageElement: ReactNode | ReactNode[]
handlePressArtistName: () => void
}) => {
const { spacing } = useTheme()

return (
<Paper alignItems='center' p='l' gap='l' w='100%'>
<Text variant='label' color='subdued' style={{ letterSpacing: 2 }}>
Expand All@@ -50,7 +41,7 @@ export const DeletedTile = ({
<Text variant='body' color='accent' size='l'>
{user.name}
</Text>
<UserBadges badgeSize={spacing.l} user={user} hideName />
<UserBadges userId={user.user_id} badgeSize='s' />
</Flex>
</TouchableOpacity>
) : null}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { LockedStatusBadge, Text, useLink } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useNavigation } from 'app/hooks/useNavigation'
import { flexRowCentered, makeStyles } from 'app/styles'
import { useColor } from 'app/utils/theme'
Expand DownExpand Up@@ -236,12 +236,7 @@ export const DetailsTileHasAccess = ({
>
{entity.name}
</Text>
<UserBadges
badgeSize={16}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import LogoEth from 'app/assets/images/logoEth.svg'
import LogoSol from 'app/assets/images/logoSol.svg'
import { LockedStatusBadge, useLink } from 'app/components/core'
import LoadingSpinner from 'app/components/loading-spinner'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useDrawer } from 'app/hooks/useDrawer'
import { useNavigation } from 'app/hooks/useNavigation'
import { make, track } from 'app/services/analytics'
Expand DownExpand Up@@ -255,12 +255,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
{suffix ? <Text style={styles.description}>{suffix}</Text> : null}
</View>
)
Expand DownExpand Up@@ -400,12 +395,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.followRequired(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand All@@ -214,11 +215,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.tipGated(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand DownExpand Up@@ -261,11 +263,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.noAction}
{user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</Text>
<Button
Expand Down
11 changes: 4 additions & 7 deletions packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { Remix } from '@audius/common/models'
import { StyleSheet, View } from 'react-native'

import Text from 'app/components/text'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered } from 'app/styles'

import { useStyles as useTrackTileStyles } from './styles'
Expand DownExpand Up@@ -58,12 +58,9 @@ export const LineupTileCoSign = ({ coSign }: Props) => {
<View style={styles.coSignText}>
<View style={styles.coSignName}>
<Text style={trackTileStyles.statText}>{coSign.user.name}</Text>
<UserBadges
user={coSign.user}
style={styles.coSignIcon}
badgeSize={8}
hideName
/>
<View style={styles.coSignIcon}>
<UserBadges userId={coSign.user.user_id} badgeSize='xs' />
</View>
</View>
<Text style={trackTileStyles.statText}>
{formatCoSign({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { View } from 'react-native'
import { Divider } from '@audius/harmony-native'
import AudiusLogo from 'app/assets/images/audiusLogoHorizontal.svg'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand DownExpand Up@@ -118,12 +118,9 @@ export const ShareToStorySticker = ({
>
{messages.by} {artist.name}
</Text>
<UserBadges
user={artist}
badgeSize={12}
style={styles.badges}
hideName
/>
<View style={styles.badges}>
<UserBadges userId={artist.user_id} badgeSize='xs' />
</View>
</View>
<Divider />
<View
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,12 @@ const SuggestedTrackRow = (props: SuggestedTrackProps) => {
{title}
</Text>
{user ? (
<UserBadges user={user} nameStyle={styles.artistName} />
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.artistName}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</View>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useIsUSDCEnabled } from 'app/hooks/useIsUSDCEnabled'
import { makeStyles, flexRowCentered, typography } from 'app/styles'
import { spacing } from 'app/styles/spacing'
Expand DownExpand Up@@ -66,10 +66,6 @@ const useStyles = makeStyles(({ spacing, palette }) => ({
streamContentLabel: {
letterSpacing: spacing(0.5)
},
trackOwnerContainer: {
...flexRowCentered(),
marginTop: spacing(1)
},
trackOwner: {
fontFamily: typography.fontByWeight.medium,
fontSize: typography.fontSize.medium
Expand DownExpand Up@@ -169,10 +165,10 @@ export const TrackDetailsTile = ({
>
{track.title}
</Text>
<View style={styles.trackOwnerContainer}>
<Flex row alignItems='center' gap='xs' mt='xs'>
<Text fontSize='medium'>{owner.name}</Text>
<UserBadges badgeSize={spacing(4)} user={owner} hideName />
</View>
<UserBadges userId={owner.user_id} badgeSize='xs' />
</Flex>
{earnAmount ? (
<Flex direction='row' alignItems='center' gap='xs' pt='xs'>
<IconCart size='s' color='premium' />
Expand Down
6 changes: 4 additions & 2 deletions packages/mobile/src/components/track-list/TrackListItem.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ import {
IconRemove,
IconVisibilityHidden
} from '@audius/harmony-native'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered, font, makeStyles } from 'app/styles'

import { TrackDownloadStatusIndicator } from '../offline-downloads/TrackDownloadStatusIndicator'
Expand DownExpand Up@@ -412,7 +412,9 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => {
</View>
<Text numberOfLines={1} style={styles.artistName}>
{name}
{user ? <UserBadges user={user} badgeSize={12} hideName /> : null}
{user ? (
<UserBadges userId={user.user_id} badgeSize='xs' />
) : null}
</Text>
</View>
{isUnlisted ? (
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/mobile/src/components/card/Card.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { LinearGradientProps } from 'react-native-linear-gradient'
import type { ImageProps } from '@audius/harmony-native'
import type { TileProps } from 'app/components/core'
import { Tile } from 'app/components/core'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import type { StylesProp } from 'app/styles'
import { flexRowCentered, makeStyles } from 'app/styles'

Expand DownExpand Up@@ -114,7 +114,7 @@ export const Card = (props: CardProps) => {
{primaryText}
</Text>
{props.type === 'user' ? (
<UserBadges user={props.user} badgeSize={12} hideName />
<UserBadges userId={props.user.user_id} badgeSize='xs' />
) : null}
</View>
<View style={styles.secondaryTextContainer}>
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/src/components/comments/CommentDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'

import { Box, Divider, Flex, Text, useTheme } from '@audius/harmony-native'
import { ProfilePicture } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { LoadingSpinner } from 'app/harmony-native/components/LoadingSpinner/LoadingSpinner'

import { CommentDrawerForm } from './CommentDrawerForm'
Expand All@@ -59,7 +59,7 @@ const UserListItem = (props: UserListItemProps) => {
<Flex direction='column'>
<Text variant='body' size='s'>
{user.name}
<UserBadges user={user} badgeSize={10} hideName />
<UserBadges userId={user.user_id} badgeSize='xs' />
</Text>
<Text variant='body' size='xs' color='default'>
@{user.handle}
Expand Down
13 changes: 2 additions & 11 deletions packages/mobile/src/components/details-tile/DeletedTile.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,7 @@ import type { ReactNode } from 'react'
import type { SearchUser, User } from '@audius/common/models'
import { TouchableOpacity } from 'react-native-gesture-handler'

import {
Button,
Flex,
IconUser,
Paper,
Text,
useTheme
} from '@audius/harmony-native'
import { Button, Flex, IconUser, Paper, Text } from '@audius/harmony-native'
import { UserBadges } from 'app/components/user-badges'

const messages = {
Expand All@@ -32,8 +25,6 @@ export const DeletedTile = ({
imageElement: ReactNode | ReactNode[]
handlePressArtistName: () => void
}) => {
const { spacing } = useTheme()

return (
<Paper alignItems='center' p='l' gap='l' w='100%'>
<Text variant='label' color='subdued' style={{ letterSpacing: 2 }}>
Expand All@@ -50,7 +41,7 @@ export const DeletedTile = ({
<Text variant='body' color='accent' size='l'>
{user.name}
</Text>
<UserBadges badgeSize={spacing.l} user={user} hideName />
<UserBadges userId={user.user_id} badgeSize='s' />
</Flex>
</TouchableOpacity>
) : null}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { LockedStatusBadge, Text, useLink } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useNavigation } from 'app/hooks/useNavigation'
import { flexRowCentered, makeStyles } from 'app/styles'
import { useColor } from 'app/utils/theme'
Expand DownExpand Up@@ -236,12 +236,7 @@ export const DetailsTileHasAccess = ({
>
{entity.name}
</Text>
<UserBadges
badgeSize={16}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import LogoEth from 'app/assets/images/logoEth.svg'
import LogoSol from 'app/assets/images/logoSol.svg'
import { LockedStatusBadge, useLink } from 'app/components/core'
import LoadingSpinner from 'app/components/loading-spinner'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useDrawer } from 'app/hooks/useDrawer'
import { useNavigation } from 'app/hooks/useNavigation'
import { make, track } from 'app/services/analytics'
Expand DownExpand Up@@ -255,12 +255,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
{suffix ? <Text style={styles.description}>{suffix}</Text> : null}
</View>
)
Expand DownExpand Up@@ -400,12 +395,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.followRequired(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand All@@ -214,11 +215,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.tipGated(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand DownExpand Up@@ -261,11 +263,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.noAction}
{user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</Text>
<Button
Expand Down
11 changes: 4 additions & 7 deletions packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { Remix } from '@audius/common/models'
import { StyleSheet, View } from 'react-native'

import Text from 'app/components/text'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered } from 'app/styles'

import { useStyles as useTrackTileStyles } from './styles'
Expand DownExpand Up@@ -58,12 +58,9 @@ export const LineupTileCoSign = ({ coSign }: Props) => {
<View style={styles.coSignText}>
<View style={styles.coSignName}>
<Text style={trackTileStyles.statText}>{coSign.user.name}</Text>
<UserBadges
user={coSign.user}
style={styles.coSignIcon}
badgeSize={8}
hideName
/>
<View style={styles.coSignIcon}>
<UserBadges userId={coSign.user.user_id} badgeSize='xs' />
</View>
</View>
<Text style={trackTileStyles.statText}>
{formatCoSign({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { View } from 'react-native'
import { Divider } from '@audius/harmony-native'
import AudiusLogo from 'app/assets/images/audiusLogoHorizontal.svg'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand DownExpand Up@@ -118,12 +118,9 @@ export const ShareToStorySticker = ({
>
{messages.by} {artist.name}
</Text>
<UserBadges
user={artist}
badgeSize={12}
style={styles.badges}
hideName
/>
<View style={styles.badges}>
<UserBadges userId={artist.user_id} badgeSize='xs' />
</View>
</View>
<Divider />
<View
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,12 @@ const SuggestedTrackRow = (props: SuggestedTrackProps) => {
{title}
</Text>
{user ? (
<UserBadges user={user} nameStyle={styles.artistName} />
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.artistName}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</View>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useIsUSDCEnabled } from 'app/hooks/useIsUSDCEnabled'
import { makeStyles, flexRowCentered, typography } from 'app/styles'
import { spacing } from 'app/styles/spacing'
Expand DownExpand Up@@ -66,10 +66,6 @@ const useStyles = makeStyles(({ spacing, palette }) => ({
streamContentLabel: {
letterSpacing: spacing(0.5)
},
trackOwnerContainer: {
...flexRowCentered(),
marginTop: spacing(1)
},
trackOwner: {
fontFamily: typography.fontByWeight.medium,
fontSize: typography.fontSize.medium
Expand DownExpand Up@@ -169,10 +165,10 @@ export const TrackDetailsTile = ({
>
{track.title}
</Text>
<View style={styles.trackOwnerContainer}>
<Flex row alignItems='center' gap='xs' mt='xs'>
<Text fontSize='medium'>{owner.name}</Text>
<UserBadges badgeSize={spacing(4)} user={owner} hideName />
</View>
<UserBadges userId={owner.user_id} badgeSize='xs' />
</Flex>
{earnAmount ? (
<Flex direction='row' alignItems='center' gap='xs' pt='xs'>
<IconCart size='s' color='premium' />
Expand Down
6 changes: 4 additions & 2 deletions packages/mobile/src/components/track-list/TrackListItem.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ import {
IconRemove,
IconVisibilityHidden
} from '@audius/harmony-native'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered, font, makeStyles } from 'app/styles'

import { TrackDownloadStatusIndicator } from '../offline-downloads/TrackDownloadStatusIndicator'
Expand DownExpand Up@@ -412,7 +412,9 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => {
</View>
<Text numberOfLines={1} style={styles.artistName}>
{name}
{user ? <UserBadges user={user} badgeSize={12} hideName /> : null}
{user ? (
<UserBadges userId={user.user_id} badgeSize='xs' />
) : null}
</Text>
</View>
{isUnlisted ? (
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/mobile/src/components/card/Card.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { LinearGradientProps } from 'react-native-linear-gradient'
import type { ImageProps } from '@audius/harmony-native'
import type { TileProps } from 'app/components/core'
import { Tile } from 'app/components/core'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import type { StylesProp } from 'app/styles'
import { flexRowCentered, makeStyles } from 'app/styles'

Expand DownExpand Up@@ -114,7 +114,7 @@ export const Card = (props: CardProps) => {
{primaryText}
</Text>
{props.type === 'user' ? (
<UserBadges user={props.user} badgeSize={12} hideName />
<UserBadges userId={props.user.user_id} badgeSize='xs' />
) : null}
</View>
<View style={styles.secondaryTextContainer}>
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/src/components/comments/CommentDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'

import { Box, Divider, Flex, Text, useTheme } from '@audius/harmony-native'
import { ProfilePicture } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { LoadingSpinner } from 'app/harmony-native/components/LoadingSpinner/LoadingSpinner'

import { CommentDrawerForm } from './CommentDrawerForm'
Expand All@@ -59,7 +59,7 @@ const UserListItem = (props: UserListItemProps) => {
<Flex direction='column'>
<Text variant='body' size='s'>
{user.name}
<UserBadges user={user} badgeSize={10} hideName />
<UserBadges userId={user.user_id} badgeSize='xs' />
</Text>
<Text variant='body' size='xs' color='default'>
@{user.handle}
Expand Down
13 changes: 2 additions & 11 deletions packages/mobile/src/components/details-tile/DeletedTile.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,7 @@ import type { ReactNode } from 'react'
import type { SearchUser, User } from '@audius/common/models'
import { TouchableOpacity } from 'react-native-gesture-handler'

import {
Button,
Flex,
IconUser,
Paper,
Text,
useTheme
} from '@audius/harmony-native'
import { Button, Flex, IconUser, Paper, Text } from '@audius/harmony-native'
import { UserBadges } from 'app/components/user-badges'

const messages = {
Expand All@@ -32,8 +25,6 @@ export const DeletedTile = ({
imageElement: ReactNode | ReactNode[]
handlePressArtistName: () => void
}) => {
const { spacing } = useTheme()

return (
<Paper alignItems='center' p='l' gap='l' w='100%'>
<Text variant='label' color='subdued' style={{ letterSpacing: 2 }}>
Expand All@@ -50,7 +41,7 @@ export const DeletedTile = ({
<Text variant='body' color='accent' size='l'>
{user.name}
</Text>
<UserBadges badgeSize={spacing.l} user={user} hideName />
<UserBadges userId={user.user_id} badgeSize='s' />
</Flex>
</TouchableOpacity>
) : null}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { LockedStatusBadge, Text, useLink } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useNavigation } from 'app/hooks/useNavigation'
import { flexRowCentered, makeStyles } from 'app/styles'
import { useColor } from 'app/utils/theme'
Expand DownExpand Up@@ -236,12 +236,7 @@ export const DetailsTileHasAccess = ({
>
{entity.name}
</Text>
<UserBadges
badgeSize={16}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import LogoEth from 'app/assets/images/logoEth.svg'
import LogoSol from 'app/assets/images/logoSol.svg'
import { LockedStatusBadge, useLink } from 'app/components/core'
import LoadingSpinner from 'app/components/loading-spinner'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useDrawer } from 'app/hooks/useDrawer'
import { useNavigation } from 'app/hooks/useNavigation'
import { make, track } from 'app/services/analytics'
Expand DownExpand Up@@ -255,12 +255,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
{suffix ? <Text style={styles.description}>{suffix}</Text> : null}
</View>
)
Expand DownExpand Up@@ -400,12 +395,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.followRequired(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand All@@ -214,11 +215,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.tipGated(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand DownExpand Up@@ -261,11 +263,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.noAction}
{user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</Text>
<Button
Expand Down
11 changes: 4 additions & 7 deletions packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { Remix } from '@audius/common/models'
import { StyleSheet, View } from 'react-native'

import Text from 'app/components/text'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered } from 'app/styles'

import { useStyles as useTrackTileStyles } from './styles'
Expand DownExpand Up@@ -58,12 +58,9 @@ export const LineupTileCoSign = ({ coSign }: Props) => {
<View style={styles.coSignText}>
<View style={styles.coSignName}>
<Text style={trackTileStyles.statText}>{coSign.user.name}</Text>
<UserBadges
user={coSign.user}
style={styles.coSignIcon}
badgeSize={8}
hideName
/>
<View style={styles.coSignIcon}>
<UserBadges userId={coSign.user.user_id} badgeSize='xs' />
</View>
</View>
<Text style={trackTileStyles.statText}>
{formatCoSign({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { View } from 'react-native'
import { Divider } from '@audius/harmony-native'
import AudiusLogo from 'app/assets/images/audiusLogoHorizontal.svg'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand DownExpand Up@@ -118,12 +118,9 @@ export const ShareToStorySticker = ({
>
{messages.by} {artist.name}
</Text>
<UserBadges
user={artist}
badgeSize={12}
style={styles.badges}
hideName
/>
<View style={styles.badges}>
<UserBadges userId={artist.user_id} badgeSize='xs' />
</View>
</View>
<Divider />
<View
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,12 @@ const SuggestedTrackRow = (props: SuggestedTrackProps) => {
{title}
</Text>
{user ? (
<UserBadges user={user} nameStyle={styles.artistName} />
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.artistName}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</View>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useIsUSDCEnabled } from 'app/hooks/useIsUSDCEnabled'
import { makeStyles, flexRowCentered, typography } from 'app/styles'
import { spacing } from 'app/styles/spacing'
Expand DownExpand Up@@ -66,10 +66,6 @@ const useStyles = makeStyles(({ spacing, palette }) => ({
streamContentLabel: {
letterSpacing: spacing(0.5)
},
trackOwnerContainer: {
...flexRowCentered(),
marginTop: spacing(1)
},
trackOwner: {
fontFamily: typography.fontByWeight.medium,
fontSize: typography.fontSize.medium
Expand DownExpand Up@@ -169,10 +165,10 @@ export const TrackDetailsTile = ({
>
{track.title}
</Text>
<View style={styles.trackOwnerContainer}>
<Flex row alignItems='center' gap='xs' mt='xs'>
<Text fontSize='medium'>{owner.name}</Text>
<UserBadges badgeSize={spacing(4)} user={owner} hideName />
</View>
<UserBadges userId={owner.user_id} badgeSize='xs' />
</Flex>
{earnAmount ? (
<Flex direction='row' alignItems='center' gap='xs' pt='xs'>
<IconCart size='s' color='premium' />
Expand Down
6 changes: 4 additions & 2 deletions packages/mobile/src/components/track-list/TrackListItem.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ import {
IconRemove,
IconVisibilityHidden
} from '@audius/harmony-native'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered, font, makeStyles } from 'app/styles'

import { TrackDownloadStatusIndicator } from '../offline-downloads/TrackDownloadStatusIndicator'
Expand DownExpand Up@@ -412,7 +412,9 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => {
</View>
<Text numberOfLines={1} style={styles.artistName}>
{name}
{user ? <UserBadges user={user} badgeSize={12} hideName /> : null}
{user ? (
<UserBadges userId={user.user_id} badgeSize='xs' />
) : null}
</Text>
</View>
{isUnlisted ? (
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/mobile/src/components/card/Card.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { LinearGradientProps } from 'react-native-linear-gradient'
import type { ImageProps } from '@audius/harmony-native'
import type { TileProps } from 'app/components/core'
import { Tile } from 'app/components/core'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import type { StylesProp } from 'app/styles'
import { flexRowCentered, makeStyles } from 'app/styles'

Expand DownExpand Up@@ -114,7 +114,7 @@ export const Card = (props: CardProps) => {
{primaryText}
</Text>
{props.type === 'user' ? (
<UserBadges user={props.user} badgeSize={12} hideName />
<UserBadges userId={props.user.user_id} badgeSize='xs' />
) : null}
</View>
<View style={styles.secondaryTextContainer}>
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/src/components/comments/CommentDrawer.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'

import { Box, Divider, Flex, Text, useTheme } from '@audius/harmony-native'
import { ProfilePicture } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { LoadingSpinner } from 'app/harmony-native/components/LoadingSpinner/LoadingSpinner'

import { CommentDrawerForm } from './CommentDrawerForm'
Expand All@@ -59,7 +59,7 @@ const UserListItem = (props: UserListItemProps) => {
<Flex direction='column'>
<Text variant='body' size='s'>
{user.name}
<UserBadges user={user} badgeSize={10} hideName />
<UserBadges userId={user.user_id} badgeSize='xs' />
</Text>
<Text variant='body' size='xs' color='default'>
@{user.handle}
Expand Down
13 changes: 2 additions & 11 deletions packages/mobile/src/components/details-tile/DeletedTile.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,7 @@ import type { ReactNode } from 'react'
import type { SearchUser, User } from '@audius/common/models'
import { TouchableOpacity } from 'react-native-gesture-handler'

import {
Button,
Flex,
IconUser,
Paper,
Text,
useTheme
} from '@audius/harmony-native'
import { Button, Flex, IconUser, Paper, Text } from '@audius/harmony-native'
import { UserBadges } from 'app/components/user-badges'

const messages = {
Expand All@@ -32,8 +25,6 @@ export const DeletedTile = ({
imageElement: ReactNode | ReactNode[]
handlePressArtistName: () => void
}) => {
const { spacing } = useTheme()

return (
<Paper alignItems='center' p='l' gap='l' w='100%'>
<Text variant='label' color='subdued' style={{ letterSpacing: 2 }}>
Expand All@@ -50,7 +41,7 @@ export const DeletedTile = ({
<Text variant='body' color='accent' size='l'>
{user.name}
</Text>
<UserBadges badgeSize={spacing.l} user={user} hideName />
<UserBadges userId={user.user_id} badgeSize='s' />
</Flex>
</TouchableOpacity>
) : null}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { LockedStatusBadge, Text, useLink } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useNavigation } from 'app/hooks/useNavigation'
import { flexRowCentered, makeStyles } from 'app/styles'
import { useColor } from 'app/utils/theme'
Expand DownExpand Up@@ -236,12 +236,7 @@ export const DetailsTileHasAccess = ({
>
{entity.name}
</Text>
<UserBadges
badgeSize={16}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import LogoEth from 'app/assets/images/logoEth.svg'
import LogoSol from 'app/assets/images/logoSol.svg'
import { LockedStatusBadge, useLink } from 'app/components/core'
import LoadingSpinner from 'app/components/loading-spinner'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useDrawer } from 'app/hooks/useDrawer'
import { useNavigation } from 'app/hooks/useNavigation'
import { make, track } from 'app/services/analytics'
Expand DownExpand Up@@ -255,12 +255,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
{suffix ? <Text style={styles.description}>{suffix}</Text> : null}
</View>
)
Expand DownExpand Up@@ -400,12 +395,7 @@ export const DetailsTileNoAccess = (props: DetailsTileNoAccessProps) => {
>
{entity.name}
</Text>
<UserBadges
badgeSize={spacing(4)}
user={entity}
nameStyle={styles.description}
hideName
/>
<UserBadges userId={entity.user_id} badgeSize='xs' />
<Text style={styles.description}>{suffix}</Text>
</Text>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.followRequired(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand All@@ -214,11 +215,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.tipGated(
user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null
)}
</Text>
Expand DownExpand Up@@ -261,11 +263,12 @@ const DrawerContent = ({ data, onClose }: DrawerContentProps) => {
<Text style={styles.callToActionText}>
{messages.noAction}
{user ? (
<UserBadges
user={user}
nameStyle={styles.callToActionText}
as={Text}
/>
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.callToActionText}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</Text>
<Button
Expand Down
11 changes: 4 additions & 7 deletions packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { Remix } from '@audius/common/models'
import { StyleSheet, View } from 'react-native'

import Text from 'app/components/text'
import UserBadges from 'app/components/user-badges/UserBadges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered } from 'app/styles'

import { useStyles as useTrackTileStyles } from './styles'
Expand DownExpand Up@@ -58,12 +58,9 @@ export const LineupTileCoSign = ({ coSign }: Props) => {
<View style={styles.coSignText}>
<View style={styles.coSignName}>
<Text style={trackTileStyles.statText}>{coSign.user.name}</Text>
<UserBadges
user={coSign.user}
style={styles.coSignIcon}
badgeSize={8}
hideName
/>
<View style={styles.coSignIcon}>
<UserBadges userId={coSign.user.user_id} badgeSize='xs' />
</View>
</View>
<Text style={trackTileStyles.statText}>
{formatCoSign({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { View } from 'react-native'
import { Divider } from '@audius/harmony-native'
import AudiusLogo from 'app/assets/images/audiusLogoHorizontal.svg'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { makeStyles } from 'app/styles'
import { useThemeColors } from 'app/utils/theme'

Expand DownExpand Up@@ -118,12 +118,9 @@ export const ShareToStorySticker = ({
>
{messages.by} {artist.name}
</Text>
<UserBadges
user={artist}
badgeSize={12}
style={styles.badges}
hideName
/>
<View style={styles.badges}>
<UserBadges userId={artist.user_id} badgeSize='xs' />
</View>
</View>
<Divider />
<View
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,12 @@ const SuggestedTrackRow = (props: SuggestedTrackProps) => {
{title}
</Text>
{user ? (
<UserBadges user={user} nameStyle={styles.artistName} />
<View
style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}
>
<Text style={styles.artistName}>{user.name}</Text>
<UserBadges userId={user.user_id} badgeSize='xs' />
</View>
) : null}
</View>
</View>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import {
IconSparkles
} from '@audius/harmony-native'
import { Text } from 'app/components/core'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { useIsUSDCEnabled } from 'app/hooks/useIsUSDCEnabled'
import { makeStyles, flexRowCentered, typography } from 'app/styles'
import { spacing } from 'app/styles/spacing'
Expand DownExpand Up@@ -66,10 +66,6 @@ const useStyles = makeStyles(({ spacing, palette }) => ({
streamContentLabel: {
letterSpacing: spacing(0.5)
},
trackOwnerContainer: {
...flexRowCentered(),
marginTop: spacing(1)
},
trackOwner: {
fontFamily: typography.fontByWeight.medium,
fontSize: typography.fontSize.medium
Expand DownExpand Up@@ -169,10 +165,10 @@ export const TrackDetailsTile = ({
>
{track.title}
</Text>
<View style={styles.trackOwnerContainer}>
<Flex row alignItems='center' gap='xs' mt='xs'>
<Text fontSize='medium'>{owner.name}</Text>
<UserBadges badgeSize={spacing(4)} user={owner} hideName />
</View>
<UserBadges userId={owner.user_id} badgeSize='xs' />
</Flex>
{earnAmount ? (
<Flex direction='row' alignItems='center' gap='xs' pt='xs'>
<IconCart size='s' color='premium' />
Expand Down
6 changes: 4 additions & 2 deletions packages/mobile/src/components/track-list/TrackListItem.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ import {
IconRemove,
IconVisibilityHidden
} from '@audius/harmony-native'
import UserBadges from 'app/components/user-badges'
import { UserBadges } from 'app/components/user-badges'
import { flexRowCentered, font, makeStyles } from 'app/styles'

import { TrackDownloadStatusIndicator } from '../offline-downloads/TrackDownloadStatusIndicator'
Expand DownExpand Up@@ -412,7 +412,9 @@ const TrackListItemComponent = (props: TrackListItemComponentProps) => {
</View>
<Text numberOfLines={1} style={styles.artistName}>
{name}
{user ? <UserBadges user={user} badgeSize={12} hideName /> : null}
{user ? (
<UserBadges userId={user.user_id} badgeSize='xs' />
) : null}
</Text>
</View>
{isUnlisted ? (
Expand Down
Loading