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
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
SelectablePill,
Text
} from '@audius/harmony-native'
import { UserGeneratedText } from 'app/components/core'
import { VideoEmbed } from 'app/components/video-embed/VideoEmbed'

import { ActionDrawerWithoutRedux } from '../../components/action-drawer'
Expand Down Expand Up @@ -475,9 +476,13 @@ const ContestCommentRow = ({
/>
) : null}
</Flex>
<Text variant='body' size='s'>
<UserGeneratedText
variant='body'
size='s'
mentions={comment.mentions ?? []}
>
{comment.message}
</Text>
</UserGeneratedText>
{videoUrl ? (
<View style={{ marginTop: 4 }}>
{/* Updates store YouTube / Vimeo URLs (set via the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import {
} from '@audius/harmony'

import { UserLink } from 'components/link/UserLink'
import { UserGeneratedTextV2 } from 'components/user-generated-text/UserGeneratedTextV2'
import { VideoEmbed } from 'components/video-embed/VideoEmbed'

const messages = {
heading: 'Contest Feed',
Expand Down Expand Up @@ -358,20 +360,17 @@ const ContestCommentRow = ({
</Text>
) : null}
</Flex>
<Text variant='body' size='m'>
<UserGeneratedTextV2
variant='body'
size='m'
mentions={comment.mentions ?? []}
>
{comment.message}
</Text>
</UserGeneratedTextV2>
{videoUrl ? (
<video
controls
src={videoUrl}
style={{
width: '100%',
maxHeight: 340,
borderRadius: 8,
backgroundColor: '#000'
}}
/>
<Box mt='xs'>
<VideoEmbed url={videoUrl} />
</Box>
) : null}
</Paper>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { useQueryClient } from '@tanstack/react-query'

import { ComposerInput } from 'components/composer-input/ComposerInput'
import { UserLink } from 'components/link/UserLink'
import { UserGeneratedTextV2 } from 'components/user-generated-text/UserGeneratedTextV2'
import { VideoEmbed } from 'components/video-embed/VideoEmbed'
import { useProfilePicture } from 'hooks/useProfilePicture'
import { useRequiresAccountCallback } from 'hooks/useRequiresAccount'
Expand Down Expand Up @@ -637,9 +638,13 @@ const ContestCommentRow = ({
</Box>
) : null}
</Flex>
<Text variant='body' size='s'>
<UserGeneratedTextV2
variant='body'
size='s'
mentions={comment.mentions ?? []}
>
{comment.message}
</Text>
</UserGeneratedTextV2>
{videoUrl ? (
<Box mt='xs'>
{/* Updates only accept YouTube / Vimeo URLs (set via the
Expand Down Expand Up @@ -867,9 +872,13 @@ const ContestCommentReplyRow = ({
) : null}
</Flex>
</Flex>
<Text variant='body' size='s'>
<UserGeneratedTextV2
variant='body'
size='s'
mentions={reply.mentions ?? []}
>
{reply.message}
</Text>
</UserGeneratedTextV2>
<Flex gap='m' alignItems='center' pt='xs'>
<Flex
gap='xs'
Expand Down
Loading