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
41 changes: 41 additions & 0 deletions packages/common/src/api/tan-query/coins/useArtistCoin.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { encodeHashId } from '@audius/sdk'
import { useQuery } from '@tanstack/react-query'

import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'

export type ArtistCoin = {
mint: string
owner_id: string
}

export type UseArtistCoinParams = {
mint?: string[]
owner_id?: ID[]
}

// TODO: PE-6542 Replace this with sdk call
export const useArtistCoin = (params: UseArtistCoinParams = {}) => {
return useQuery({
queryKey: [QUERY_KEYS.artistCoins, params],
queryFn: async () => {
const searchParams = new URLSearchParams()
if (params.mint) {
params.mint.forEach((m) => searchParams.append('mint', m))
}
if (params.owner_id) {
params.owner_id.forEach((id) => {
const encodedId = encodeHashId(id)
if (encodedId) {
searchParams.append('owner_id', encodedId)
}
})
}
const res = await fetch(`https://api.audius.co/v1/coins?${searchParams}`)
if (!res.ok) throw new Error('Failed to fetch coins')
const data = await res.json()
return data.coins as ArtistCoin[]
}
})
}
3 changes: 2 additions & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ export const QUERY_KEYS = {
entityReaction: 'entityReaction',
feelingLuckyTracks: 'feelingLuckyTracks',
recentlyPlayedTracks: 'recentlyPlayedTracks',
recentlyCommentedTracks: 'recentlyCommentedTracks'
recentlyCommentedTracks: 'recentlyCommentedTracks',
artistCoins: 'artistCoins'
} as const
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './useIsArtist'
export * from './useAnalytics'
export * from './useBuySellAnalytics'
export * from './useShareAction'
export * from './useArtistCoinMessageHeader'
44 changes: 44 additions & 0 deletions packages/common/src/hooks/useArtistCoinMessageHeader.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoin } from '~/api/tan-query/coins/useArtistCoin'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

import { useFeatureFlag } from './useFeatureFlag'

export const useArtistCoinMessageHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const { data: coins } = useArtistCoin({ owner_id: [userId] })

if (
!isArtistCoinEnabled ||
!audience ||
audience !== ChatBlastAudience.COIN_HOLDERS
) {
return null
}

let artistCoinSymbol
let artistCoin
if (!!coins && coins.length > 0) {
artistCoin = coins[0]
if (artistCoin.mint) {
const tokenRegistry = getTokenRegistry()
const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
artistCoinSymbol = token?.symbol
}
}

return artistCoinSymbol
}
56 changes: 56 additions & 0 deletions packages/mobile/src/screens/chat-screen/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import type { ID } from '@audius/common/models'
import type { ChatBlastAudience } from '@audius/sdk'
import { Platform } from 'react-native'

import { Flex, IconTokenBonk, Text } from '@audius/harmony-native'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

return (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
{/* TODO: Lookup artist coin icon from TOKENS */}
<IconTokenBonk size='xs' />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

any reason this is hardcoded? we have the ability to determine what Icon to show via SUPPORTED_TOKEN_PAIRS

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

oo didn't know that

{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
)
}
45 changes: 8 additions & 37 deletions packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
import { memo, useCallback, useState } from 'react'

import { useCurrentUserId } from '@audius/common/api'
import { useFeatureFlag } from '@audius/common/hooks'
import { Status } from '@audius/common/models'
import { FeatureFlags } from '@audius/common/services'
import { chatSelectors } from '@audius/common/store'
import {
formatMessageDate,
Expand All@@ -15,10 +13,10 @@ import type { ReactionTypes, ChatMessageReaction } from '@audius/sdk'
import { css } from '@emotion/native'
import { find } from 'linkifyjs'
import type { ViewStyle, StyleProp } from 'react-native'
import { Dimensions, Keyboard, Platform } from 'react-native'
import { Dimensions, Keyboard } from 'react-native'
import { useSelector } from 'react-redux'

import { Flex, IconTokenBonk, spacing, Text } from '@audius/harmony-native'
import { Flex, spacing, Text } from '@audius/harmony-native'
import ChatTail from 'app/assets/images/ChatTail.svg'
import { Pressable, UserGeneratedText } from 'app/components/core'
import { makeStyles } from 'app/styles'
Expand All@@ -27,6 +25,7 @@ import { zIndex } from 'app/utils/zIndex'

import { reactionMap } from '../notifications-screen/Reaction'

import { ArtistCoinHeader } from './ArtistCoinHeader'
import { ChatMessagePlaylist } from './ChatMessagePlaylist'
import { ChatMessageTrack } from './ChatMessageTrack'
import { LinkPreview } from './LinkPreview'
Expand All@@ -37,10 +36,6 @@ const { isIdEqualToReactionsPopupMessageId, getChatMessageById } = chatSelectors

const TAIL_HORIZONTAL_OFFSET = 7

const messages = {
membersOnly: 'Members Only'
}

const useStyles = makeStyles(({ spacing, palette, typography }) => ({
bubble: {
marginTop: spacing(2),
Expand DownExpand Up@@ -169,9 +164,6 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
} = props
const styles = useStyles()
const { data: userId } = useCurrentUserId()
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)
const message = useSelector((state) =>
getChatMessageById(state, chatId, messageId)
)
Expand DownExpand Up@@ -263,32 +255,11 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
itemsRef ? (el) => (itemsRef.current[messageId] = el) : null
}
>
{isArtistCoinEnabled ? (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
<IconTokenBonk size='xs' />
{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
$Bonk
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
{senderUserId ? (
<ArtistCoinHeader
userId={senderUserId}
audience={message?.audience}
/>
) : null}
{isCollection ? (
<ChatMessagePlaylist
Expand Down
9 changes: 6 additions & 3 deletions packages/sdk/src/sdk/api/chats/ChatsApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,8 @@ export class ChatsApi
sender_user_id: encodedSenderId,
created_at: blast.created_at,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: blast.audience
}
})
}
Expand DownExpand Up@@ -882,7 +883,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: !!data.rpc.params.is_plaintext
is_plaintext: !!data.rpc.params.is_plaintext,
audience: data.rpc.params.audience
}
})
} else if (data.rpc.method === 'chat.react') {
Expand All@@ -908,7 +910,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: data.rpc.params.audience
}
})
}
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/src/sdk/api/chats/serverTypes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ export type ChatMessageRPC = {
message: string
parent_message_id?: string
is_plaintext?: boolean
audience?: ChatBlastAudience
}
}

Expand DownExpand Up@@ -159,6 +160,7 @@ export type ChatMessage = {
created_at: string
message: string
is_plaintext: boolean
audience?: ChatBlastAudience
reactions: ChatMessageReaction[]
}

Expand Down
51 changes: 51 additions & 0 deletions packages/web/src/pages/chat-page/components/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import { ID } from '@audius/common/models'
import { Flex, Text } from '@audius/harmony'
import { ChatBlastAudience } from '@audius/sdk'

import { TOKENS } from 'components/buy-sell-modal/constants'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

const ArtistCoinIcon = TOKENS[artistCoinSymbol]?.icon

return (
<Flex
ph='l'
pv='xs'
gap='m'
justifyContent='space-between'
alignItems='center'
backgroundColor='surface1'
borderBottom='default'
>
<Flex gap='xs' alignItems='center'>
{ArtistCoinIcon ? <ArtistCoinIcon size='xs' /> : null}
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
)
}
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
41 changes: 41 additions & 0 deletions packages/common/src/api/tan-query/coins/useArtistCoin.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { encodeHashId } from '@audius/sdk'
import { useQuery } from '@tanstack/react-query'

import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'

export type ArtistCoin = {
mint: string
owner_id: string
}

export type UseArtistCoinParams = {
mint?: string[]
owner_id?: ID[]
}

// TODO: PE-6542 Replace this with sdk call
export const useArtistCoin = (params: UseArtistCoinParams = {}) => {
return useQuery({
queryKey: [QUERY_KEYS.artistCoins, params],
queryFn: async () => {
const searchParams = new URLSearchParams()
if (params.mint) {
params.mint.forEach((m) => searchParams.append('mint', m))
}
if (params.owner_id) {
params.owner_id.forEach((id) => {
const encodedId = encodeHashId(id)
if (encodedId) {
searchParams.append('owner_id', encodedId)
}
})
}
const res = await fetch(`https://api.audius.co/v1/coins?${searchParams}`)
if (!res.ok) throw new Error('Failed to fetch coins')
const data = await res.json()
return data.coins as ArtistCoin[]
}
})
}
3 changes: 2 additions & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ export const QUERY_KEYS = {
entityReaction: 'entityReaction',
feelingLuckyTracks: 'feelingLuckyTracks',
recentlyPlayedTracks: 'recentlyPlayedTracks',
recentlyCommentedTracks: 'recentlyCommentedTracks'
recentlyCommentedTracks: 'recentlyCommentedTracks',
artistCoins: 'artistCoins'
} as const
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './useIsArtist'
export * from './useAnalytics'
export * from './useBuySellAnalytics'
export * from './useShareAction'
export * from './useArtistCoinMessageHeader'
44 changes: 44 additions & 0 deletions packages/common/src/hooks/useArtistCoinMessageHeader.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoin } from '~/api/tan-query/coins/useArtistCoin'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

import { useFeatureFlag } from './useFeatureFlag'

export const useArtistCoinMessageHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const { data: coins } = useArtistCoin({ owner_id: [userId] })

if (
!isArtistCoinEnabled ||
!audience ||
audience !== ChatBlastAudience.COIN_HOLDERS
) {
return null
}

let artistCoinSymbol
let artistCoin
if (!!coins && coins.length > 0) {
artistCoin = coins[0]
if (artistCoin.mint) {
const tokenRegistry = getTokenRegistry()
const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
artistCoinSymbol = token?.symbol
}
}

return artistCoinSymbol
}
56 changes: 56 additions & 0 deletions packages/mobile/src/screens/chat-screen/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import type { ID } from '@audius/common/models'
import type { ChatBlastAudience } from '@audius/sdk'
import { Platform } from 'react-native'

import { Flex, IconTokenBonk, Text } from '@audius/harmony-native'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

return (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
{/* TODO: Lookup artist coin icon from TOKENS */}
<IconTokenBonk size='xs' />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

any reason this is hardcoded? we have the ability to determine what Icon to show via SUPPORTED_TOKEN_PAIRS

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

oo didn't know that

{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
)
}
45 changes: 8 additions & 37 deletions packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
import { memo, useCallback, useState } from 'react'

import { useCurrentUserId } from '@audius/common/api'
import { useFeatureFlag } from '@audius/common/hooks'
import { Status } from '@audius/common/models'
import { FeatureFlags } from '@audius/common/services'
import { chatSelectors } from '@audius/common/store'
import {
formatMessageDate,
Expand All@@ -15,10 +13,10 @@ import type { ReactionTypes, ChatMessageReaction } from '@audius/sdk'
import { css } from '@emotion/native'
import { find } from 'linkifyjs'
import type { ViewStyle, StyleProp } from 'react-native'
import { Dimensions, Keyboard, Platform } from 'react-native'
import { Dimensions, Keyboard } from 'react-native'
import { useSelector } from 'react-redux'

import { Flex, IconTokenBonk, spacing, Text } from '@audius/harmony-native'
import { Flex, spacing, Text } from '@audius/harmony-native'
import ChatTail from 'app/assets/images/ChatTail.svg'
import { Pressable, UserGeneratedText } from 'app/components/core'
import { makeStyles } from 'app/styles'
Expand All@@ -27,6 +25,7 @@ import { zIndex } from 'app/utils/zIndex'

import { reactionMap } from '../notifications-screen/Reaction'

import { ArtistCoinHeader } from './ArtistCoinHeader'
import { ChatMessagePlaylist } from './ChatMessagePlaylist'
import { ChatMessageTrack } from './ChatMessageTrack'
import { LinkPreview } from './LinkPreview'
Expand All@@ -37,10 +36,6 @@ const { isIdEqualToReactionsPopupMessageId, getChatMessageById } = chatSelectors

const TAIL_HORIZONTAL_OFFSET = 7

const messages = {
membersOnly: 'Members Only'
}

const useStyles = makeStyles(({ spacing, palette, typography }) => ({
bubble: {
marginTop: spacing(2),
Expand DownExpand Up@@ -169,9 +164,6 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
} = props
const styles = useStyles()
const { data: userId } = useCurrentUserId()
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)
const message = useSelector((state) =>
getChatMessageById(state, chatId, messageId)
)
Expand DownExpand Up@@ -263,32 +255,11 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
itemsRef ? (el) => (itemsRef.current[messageId] = el) : null
}
>
{isArtistCoinEnabled ? (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
<IconTokenBonk size='xs' />
{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
$Bonk
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
{senderUserId ? (
<ArtistCoinHeader
userId={senderUserId}
audience={message?.audience}
/>
) : null}
{isCollection ? (
<ChatMessagePlaylist
Expand Down
9 changes: 6 additions & 3 deletions packages/sdk/src/sdk/api/chats/ChatsApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,8 @@ export class ChatsApi
sender_user_id: encodedSenderId,
created_at: blast.created_at,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: blast.audience
}
})
}
Expand DownExpand Up@@ -882,7 +883,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: !!data.rpc.params.is_plaintext
is_plaintext: !!data.rpc.params.is_plaintext,
audience: data.rpc.params.audience
}
})
} else if (data.rpc.method === 'chat.react') {
Expand All@@ -908,7 +910,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: data.rpc.params.audience
}
})
}
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/src/sdk/api/chats/serverTypes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ export type ChatMessageRPC = {
message: string
parent_message_id?: string
is_plaintext?: boolean
audience?: ChatBlastAudience
}
}

Expand DownExpand Up@@ -159,6 +160,7 @@ export type ChatMessage = {
created_at: string
message: string
is_plaintext: boolean
audience?: ChatBlastAudience
reactions: ChatMessageReaction[]
}

Expand Down
51 changes: 51 additions & 0 deletions packages/web/src/pages/chat-page/components/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import { ID } from '@audius/common/models'
import { Flex, Text } from '@audius/harmony'
import { ChatBlastAudience } from '@audius/sdk'

import { TOKENS } from 'components/buy-sell-modal/constants'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

const ArtistCoinIcon = TOKENS[artistCoinSymbol]?.icon

return (
<Flex
ph='l'
pv='xs'
gap='m'
justifyContent='space-between'
alignItems='center'
backgroundColor='surface1'
borderBottom='default'
>
<Flex gap='xs' alignItems='center'>
{ArtistCoinIcon ? <ArtistCoinIcon size='xs' /> : null}
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
)
}
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
41 changes: 41 additions & 0 deletions packages/common/src/api/tan-query/coins/useArtistCoin.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { encodeHashId } from '@audius/sdk'
import { useQuery } from '@tanstack/react-query'

import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'

export type ArtistCoin = {
mint: string
owner_id: string
}

export type UseArtistCoinParams = {
mint?: string[]
owner_id?: ID[]
}

// TODO: PE-6542 Replace this with sdk call
export const useArtistCoin = (params: UseArtistCoinParams = {}) => {
return useQuery({
queryKey: [QUERY_KEYS.artistCoins, params],
queryFn: async () => {
const searchParams = new URLSearchParams()
if (params.mint) {
params.mint.forEach((m) => searchParams.append('mint', m))
}
if (params.owner_id) {
params.owner_id.forEach((id) => {
const encodedId = encodeHashId(id)
if (encodedId) {
searchParams.append('owner_id', encodedId)
}
})
}
const res = await fetch(`https://api.audius.co/v1/coins?${searchParams}`)
if (!res.ok) throw new Error('Failed to fetch coins')
const data = await res.json()
return data.coins as ArtistCoin[]
}
})
}
3 changes: 2 additions & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ export const QUERY_KEYS = {
entityReaction: 'entityReaction',
feelingLuckyTracks: 'feelingLuckyTracks',
recentlyPlayedTracks: 'recentlyPlayedTracks',
recentlyCommentedTracks: 'recentlyCommentedTracks'
recentlyCommentedTracks: 'recentlyCommentedTracks',
artistCoins: 'artistCoins'
} as const
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './useIsArtist'
export * from './useAnalytics'
export * from './useBuySellAnalytics'
export * from './useShareAction'
export * from './useArtistCoinMessageHeader'
44 changes: 44 additions & 0 deletions packages/common/src/hooks/useArtistCoinMessageHeader.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoin } from '~/api/tan-query/coins/useArtistCoin'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

import { useFeatureFlag } from './useFeatureFlag'

export const useArtistCoinMessageHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const { data: coins } = useArtistCoin({ owner_id: [userId] })

if (
!isArtistCoinEnabled ||
!audience ||
audience !== ChatBlastAudience.COIN_HOLDERS
) {
return null
}

let artistCoinSymbol
let artistCoin
if (!!coins && coins.length > 0) {
artistCoin = coins[0]
if (artistCoin.mint) {
const tokenRegistry = getTokenRegistry()
const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
artistCoinSymbol = token?.symbol
}
}

return artistCoinSymbol
}
56 changes: 56 additions & 0 deletions packages/mobile/src/screens/chat-screen/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import type { ID } from '@audius/common/models'
import type { ChatBlastAudience } from '@audius/sdk'
import { Platform } from 'react-native'

import { Flex, IconTokenBonk, Text } from '@audius/harmony-native'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

return (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
{/* TODO: Lookup artist coin icon from TOKENS */}
<IconTokenBonk size='xs' />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

any reason this is hardcoded? we have the ability to determine what Icon to show via SUPPORTED_TOKEN_PAIRS

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

oo didn't know that

{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
)
}
45 changes: 8 additions & 37 deletions packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
import { memo, useCallback, useState } from 'react'

import { useCurrentUserId } from '@audius/common/api'
import { useFeatureFlag } from '@audius/common/hooks'
import { Status } from '@audius/common/models'
import { FeatureFlags } from '@audius/common/services'
import { chatSelectors } from '@audius/common/store'
import {
formatMessageDate,
Expand All@@ -15,10 +13,10 @@ import type { ReactionTypes, ChatMessageReaction } from '@audius/sdk'
import { css } from '@emotion/native'
import { find } from 'linkifyjs'
import type { ViewStyle, StyleProp } from 'react-native'
import { Dimensions, Keyboard, Platform } from 'react-native'
import { Dimensions, Keyboard } from 'react-native'
import { useSelector } from 'react-redux'

import { Flex, IconTokenBonk, spacing, Text } from '@audius/harmony-native'
import { Flex, spacing, Text } from '@audius/harmony-native'
import ChatTail from 'app/assets/images/ChatTail.svg'
import { Pressable, UserGeneratedText } from 'app/components/core'
import { makeStyles } from 'app/styles'
Expand All@@ -27,6 +25,7 @@ import { zIndex } from 'app/utils/zIndex'

import { reactionMap } from '../notifications-screen/Reaction'

import { ArtistCoinHeader } from './ArtistCoinHeader'
import { ChatMessagePlaylist } from './ChatMessagePlaylist'
import { ChatMessageTrack } from './ChatMessageTrack'
import { LinkPreview } from './LinkPreview'
Expand All@@ -37,10 +36,6 @@ const { isIdEqualToReactionsPopupMessageId, getChatMessageById } = chatSelectors

const TAIL_HORIZONTAL_OFFSET = 7

const messages = {
membersOnly: 'Members Only'
}

const useStyles = makeStyles(({ spacing, palette, typography }) => ({
bubble: {
marginTop: spacing(2),
Expand DownExpand Up@@ -169,9 +164,6 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
} = props
const styles = useStyles()
const { data: userId } = useCurrentUserId()
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)
const message = useSelector((state) =>
getChatMessageById(state, chatId, messageId)
)
Expand DownExpand Up@@ -263,32 +255,11 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
itemsRef ? (el) => (itemsRef.current[messageId] = el) : null
}
>
{isArtistCoinEnabled ? (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
<IconTokenBonk size='xs' />
{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
$Bonk
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
{senderUserId ? (
<ArtistCoinHeader
userId={senderUserId}
audience={message?.audience}
/>
) : null}
{isCollection ? (
<ChatMessagePlaylist
Expand Down
9 changes: 6 additions & 3 deletions packages/sdk/src/sdk/api/chats/ChatsApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,8 @@ export class ChatsApi
sender_user_id: encodedSenderId,
created_at: blast.created_at,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: blast.audience
}
})
}
Expand DownExpand Up@@ -882,7 +883,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: !!data.rpc.params.is_plaintext
is_plaintext: !!data.rpc.params.is_plaintext,
audience: data.rpc.params.audience
}
})
} else if (data.rpc.method === 'chat.react') {
Expand All@@ -908,7 +910,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: data.rpc.params.audience
}
})
}
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/src/sdk/api/chats/serverTypes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ export type ChatMessageRPC = {
message: string
parent_message_id?: string
is_plaintext?: boolean
audience?: ChatBlastAudience
}
}

Expand DownExpand Up@@ -159,6 +160,7 @@ export type ChatMessage = {
created_at: string
message: string
is_plaintext: boolean
audience?: ChatBlastAudience
reactions: ChatMessageReaction[]
}

Expand Down
51 changes: 51 additions & 0 deletions packages/web/src/pages/chat-page/components/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import { ID } from '@audius/common/models'
import { Flex, Text } from '@audius/harmony'
import { ChatBlastAudience } from '@audius/sdk'

import { TOKENS } from 'components/buy-sell-modal/constants'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

const ArtistCoinIcon = TOKENS[artistCoinSymbol]?.icon

return (
<Flex
ph='l'
pv='xs'
gap='m'
justifyContent='space-between'
alignItems='center'
backgroundColor='surface1'
borderBottom='default'
>
<Flex gap='xs' alignItems='center'>
{ArtistCoinIcon ? <ArtistCoinIcon size='xs' /> : null}
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
)
}
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
41 changes: 41 additions & 0 deletions packages/common/src/api/tan-query/coins/useArtistCoin.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { encodeHashId } from '@audius/sdk'
import { useQuery } from '@tanstack/react-query'

import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'

export type ArtistCoin = {
mint: string
owner_id: string
}

export type UseArtistCoinParams = {
mint?: string[]
owner_id?: ID[]
}

// TODO: PE-6542 Replace this with sdk call
export const useArtistCoin = (params: UseArtistCoinParams = {}) => {
return useQuery({
queryKey: [QUERY_KEYS.artistCoins, params],
queryFn: async () => {
const searchParams = new URLSearchParams()
if (params.mint) {
params.mint.forEach((m) => searchParams.append('mint', m))
}
if (params.owner_id) {
params.owner_id.forEach((id) => {
const encodedId = encodeHashId(id)
if (encodedId) {
searchParams.append('owner_id', encodedId)
}
})
}
const res = await fetch(`https://api.audius.co/v1/coins?${searchParams}`)
if (!res.ok) throw new Error('Failed to fetch coins')
const data = await res.json()
return data.coins as ArtistCoin[]
}
})
}
3 changes: 2 additions & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ export const QUERY_KEYS = {
entityReaction: 'entityReaction',
feelingLuckyTracks: 'feelingLuckyTracks',
recentlyPlayedTracks: 'recentlyPlayedTracks',
recentlyCommentedTracks: 'recentlyCommentedTracks'
recentlyCommentedTracks: 'recentlyCommentedTracks',
artistCoins: 'artistCoins'
} as const
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './useIsArtist'
export * from './useAnalytics'
export * from './useBuySellAnalytics'
export * from './useShareAction'
export * from './useArtistCoinMessageHeader'
44 changes: 44 additions & 0 deletions packages/common/src/hooks/useArtistCoinMessageHeader.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoin } from '~/api/tan-query/coins/useArtistCoin'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

import { useFeatureFlag } from './useFeatureFlag'

export const useArtistCoinMessageHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const { data: coins } = useArtistCoin({ owner_id: [userId] })

if (
!isArtistCoinEnabled ||
!audience ||
audience !== ChatBlastAudience.COIN_HOLDERS
) {
return null
}

let artistCoinSymbol
let artistCoin
if (!!coins && coins.length > 0) {
artistCoin = coins[0]
if (artistCoin.mint) {
const tokenRegistry = getTokenRegistry()
const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
artistCoinSymbol = token?.symbol
}
}

return artistCoinSymbol
}
56 changes: 56 additions & 0 deletions packages/mobile/src/screens/chat-screen/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import type { ID } from '@audius/common/models'
import type { ChatBlastAudience } from '@audius/sdk'
import { Platform } from 'react-native'

import { Flex, IconTokenBonk, Text } from '@audius/harmony-native'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

return (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
{/* TODO: Lookup artist coin icon from TOKENS */}
<IconTokenBonk size='xs' />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

any reason this is hardcoded? we have the ability to determine what Icon to show via SUPPORTED_TOKEN_PAIRS

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

oo didn't know that

{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
)
}
45 changes: 8 additions & 37 deletions packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
import { memo, useCallback, useState } from 'react'

import { useCurrentUserId } from '@audius/common/api'
import { useFeatureFlag } from '@audius/common/hooks'
import { Status } from '@audius/common/models'
import { FeatureFlags } from '@audius/common/services'
import { chatSelectors } from '@audius/common/store'
import {
formatMessageDate,
Expand All@@ -15,10 +13,10 @@ import type { ReactionTypes, ChatMessageReaction } from '@audius/sdk'
import { css } from '@emotion/native'
import { find } from 'linkifyjs'
import type { ViewStyle, StyleProp } from 'react-native'
import { Dimensions, Keyboard, Platform } from 'react-native'
import { Dimensions, Keyboard } from 'react-native'
import { useSelector } from 'react-redux'

import { Flex, IconTokenBonk, spacing, Text } from '@audius/harmony-native'
import { Flex, spacing, Text } from '@audius/harmony-native'
import ChatTail from 'app/assets/images/ChatTail.svg'
import { Pressable, UserGeneratedText } from 'app/components/core'
import { makeStyles } from 'app/styles'
Expand All@@ -27,6 +25,7 @@ import { zIndex } from 'app/utils/zIndex'

import { reactionMap } from '../notifications-screen/Reaction'

import { ArtistCoinHeader } from './ArtistCoinHeader'
import { ChatMessagePlaylist } from './ChatMessagePlaylist'
import { ChatMessageTrack } from './ChatMessageTrack'
import { LinkPreview } from './LinkPreview'
Expand All@@ -37,10 +36,6 @@ const { isIdEqualToReactionsPopupMessageId, getChatMessageById } = chatSelectors

const TAIL_HORIZONTAL_OFFSET = 7

const messages = {
membersOnly: 'Members Only'
}

const useStyles = makeStyles(({ spacing, palette, typography }) => ({
bubble: {
marginTop: spacing(2),
Expand DownExpand Up@@ -169,9 +164,6 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
} = props
const styles = useStyles()
const { data: userId } = useCurrentUserId()
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)
const message = useSelector((state) =>
getChatMessageById(state, chatId, messageId)
)
Expand DownExpand Up@@ -263,32 +255,11 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
itemsRef ? (el) => (itemsRef.current[messageId] = el) : null
}
>
{isArtistCoinEnabled ? (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
<IconTokenBonk size='xs' />
{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
$Bonk
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
{senderUserId ? (
<ArtistCoinHeader
userId={senderUserId}
audience={message?.audience}
/>
) : null}
{isCollection ? (
<ChatMessagePlaylist
Expand Down
9 changes: 6 additions & 3 deletions packages/sdk/src/sdk/api/chats/ChatsApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,8 @@ export class ChatsApi
sender_user_id: encodedSenderId,
created_at: blast.created_at,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: blast.audience
}
})
}
Expand DownExpand Up@@ -882,7 +883,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: !!data.rpc.params.is_plaintext
is_plaintext: !!data.rpc.params.is_plaintext,
audience: data.rpc.params.audience
}
})
} else if (data.rpc.method === 'chat.react') {
Expand All@@ -908,7 +910,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: data.rpc.params.audience
}
})
}
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/src/sdk/api/chats/serverTypes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ export type ChatMessageRPC = {
message: string
parent_message_id?: string
is_plaintext?: boolean
audience?: ChatBlastAudience
}
}

Expand DownExpand Up@@ -159,6 +160,7 @@ export type ChatMessage = {
created_at: string
message: string
is_plaintext: boolean
audience?: ChatBlastAudience
reactions: ChatMessageReaction[]
}

Expand Down
51 changes: 51 additions & 0 deletions packages/web/src/pages/chat-page/components/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import { ID } from '@audius/common/models'
import { Flex, Text } from '@audius/harmony'
import { ChatBlastAudience } from '@audius/sdk'

import { TOKENS } from 'components/buy-sell-modal/constants'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

const ArtistCoinIcon = TOKENS[artistCoinSymbol]?.icon

return (
<Flex
ph='l'
pv='xs'
gap='m'
justifyContent='space-between'
alignItems='center'
backgroundColor='surface1'
borderBottom='default'
>
<Flex gap='xs' alignItems='center'>
{ArtistCoinIcon ? <ArtistCoinIcon size='xs' /> : null}
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
)
}
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
41 changes: 41 additions & 0 deletions packages/common/src/api/tan-query/coins/useArtistCoin.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { encodeHashId } from '@audius/sdk'
import { useQuery } from '@tanstack/react-query'

import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'

export type ArtistCoin = {
mint: string
owner_id: string
}

export type UseArtistCoinParams = {
mint?: string[]
owner_id?: ID[]
}

// TODO: PE-6542 Replace this with sdk call
export const useArtistCoin = (params: UseArtistCoinParams = {}) => {
return useQuery({
queryKey: [QUERY_KEYS.artistCoins, params],
queryFn: async () => {
const searchParams = new URLSearchParams()
if (params.mint) {
params.mint.forEach((m) => searchParams.append('mint', m))
}
if (params.owner_id) {
params.owner_id.forEach((id) => {
const encodedId = encodeHashId(id)
if (encodedId) {
searchParams.append('owner_id', encodedId)
}
})
}
const res = await fetch(`https://api.audius.co/v1/coins?${searchParams}`)
if (!res.ok) throw new Error('Failed to fetch coins')
const data = await res.json()
return data.coins as ArtistCoin[]
}
})
}
3 changes: 2 additions & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ export const QUERY_KEYS = {
entityReaction: 'entityReaction',
feelingLuckyTracks: 'feelingLuckyTracks',
recentlyPlayedTracks: 'recentlyPlayedTracks',
recentlyCommentedTracks: 'recentlyCommentedTracks'
recentlyCommentedTracks: 'recentlyCommentedTracks',
artistCoins: 'artistCoins'
} as const
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './useIsArtist'
export * from './useAnalytics'
export * from './useBuySellAnalytics'
export * from './useShareAction'
export * from './useArtistCoinMessageHeader'
44 changes: 44 additions & 0 deletions packages/common/src/hooks/useArtistCoinMessageHeader.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoin } from '~/api/tan-query/coins/useArtistCoin'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

import { useFeatureFlag } from './useFeatureFlag'

export const useArtistCoinMessageHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const { data: coins } = useArtistCoin({ owner_id: [userId] })

if (
!isArtistCoinEnabled ||
!audience ||
audience !== ChatBlastAudience.COIN_HOLDERS
) {
return null
}

let artistCoinSymbol
let artistCoin
if (!!coins && coins.length > 0) {
artistCoin = coins[0]
if (artistCoin.mint) {
const tokenRegistry = getTokenRegistry()
const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
artistCoinSymbol = token?.symbol
}
}

return artistCoinSymbol
}
56 changes: 56 additions & 0 deletions packages/mobile/src/screens/chat-screen/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import type { ID } from '@audius/common/models'
import type { ChatBlastAudience } from '@audius/sdk'
import { Platform } from 'react-native'

import { Flex, IconTokenBonk, Text } from '@audius/harmony-native'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

return (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
{/* TODO: Lookup artist coin icon from TOKENS */}
<IconTokenBonk size='xs' />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

any reason this is hardcoded? we have the ability to determine what Icon to show via SUPPORTED_TOKEN_PAIRS

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

oo didn't know that

{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
)
}
45 changes: 8 additions & 37 deletions packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
import { memo, useCallback, useState } from 'react'

import { useCurrentUserId } from '@audius/common/api'
import { useFeatureFlag } from '@audius/common/hooks'
import { Status } from '@audius/common/models'
import { FeatureFlags } from '@audius/common/services'
import { chatSelectors } from '@audius/common/store'
import {
formatMessageDate,
Expand All@@ -15,10 +13,10 @@ import type { ReactionTypes, ChatMessageReaction } from '@audius/sdk'
import { css } from '@emotion/native'
import { find } from 'linkifyjs'
import type { ViewStyle, StyleProp } from 'react-native'
import { Dimensions, Keyboard, Platform } from 'react-native'
import { Dimensions, Keyboard } from 'react-native'
import { useSelector } from 'react-redux'

import { Flex, IconTokenBonk, spacing, Text } from '@audius/harmony-native'
import { Flex, spacing, Text } from '@audius/harmony-native'
import ChatTail from 'app/assets/images/ChatTail.svg'
import { Pressable, UserGeneratedText } from 'app/components/core'
import { makeStyles } from 'app/styles'
Expand All@@ -27,6 +25,7 @@ import { zIndex } from 'app/utils/zIndex'

import { reactionMap } from '../notifications-screen/Reaction'

import { ArtistCoinHeader } from './ArtistCoinHeader'
import { ChatMessagePlaylist } from './ChatMessagePlaylist'
import { ChatMessageTrack } from './ChatMessageTrack'
import { LinkPreview } from './LinkPreview'
Expand All@@ -37,10 +36,6 @@ const { isIdEqualToReactionsPopupMessageId, getChatMessageById } = chatSelectors

const TAIL_HORIZONTAL_OFFSET = 7

const messages = {
membersOnly: 'Members Only'
}

const useStyles = makeStyles(({ spacing, palette, typography }) => ({
bubble: {
marginTop: spacing(2),
Expand DownExpand Up@@ -169,9 +164,6 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
} = props
const styles = useStyles()
const { data: userId } = useCurrentUserId()
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)
const message = useSelector((state) =>
getChatMessageById(state, chatId, messageId)
)
Expand DownExpand Up@@ -263,32 +255,11 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
itemsRef ? (el) => (itemsRef.current[messageId] = el) : null
}
>
{isArtistCoinEnabled ? (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
<IconTokenBonk size='xs' />
{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
$Bonk
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
{senderUserId ? (
<ArtistCoinHeader
userId={senderUserId}
audience={message?.audience}
/>
) : null}
{isCollection ? (
<ChatMessagePlaylist
Expand Down
9 changes: 6 additions & 3 deletions packages/sdk/src/sdk/api/chats/ChatsApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,8 @@ export class ChatsApi
sender_user_id: encodedSenderId,
created_at: blast.created_at,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: blast.audience
}
})
}
Expand DownExpand Up@@ -882,7 +883,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: !!data.rpc.params.is_plaintext
is_plaintext: !!data.rpc.params.is_plaintext,
audience: data.rpc.params.audience
}
})
} else if (data.rpc.method === 'chat.react') {
Expand All@@ -908,7 +910,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: data.rpc.params.audience
}
})
}
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/src/sdk/api/chats/serverTypes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ export type ChatMessageRPC = {
message: string
parent_message_id?: string
is_plaintext?: boolean
audience?: ChatBlastAudience
}
}

Expand DownExpand Up@@ -159,6 +160,7 @@ export type ChatMessage = {
created_at: string
message: string
is_plaintext: boolean
audience?: ChatBlastAudience
reactions: ChatMessageReaction[]
}

Expand Down
51 changes: 51 additions & 0 deletions packages/web/src/pages/chat-page/components/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import { ID } from '@audius/common/models'
import { Flex, Text } from '@audius/harmony'
import { ChatBlastAudience } from '@audius/sdk'

import { TOKENS } from 'components/buy-sell-modal/constants'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

const ArtistCoinIcon = TOKENS[artistCoinSymbol]?.icon

return (
<Flex
ph='l'
pv='xs'
gap='m'
justifyContent='space-between'
alignItems='center'
backgroundColor='surface1'
borderBottom='default'
>
<Flex gap='xs' alignItems='center'>
{ArtistCoinIcon ? <ArtistCoinIcon size='xs' /> : null}
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
)
}
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
41 changes: 41 additions & 0 deletions packages/common/src/api/tan-query/coins/useArtistCoin.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { encodeHashId } from '@audius/sdk'
import { useQuery } from '@tanstack/react-query'

import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'

export type ArtistCoin = {
mint: string
owner_id: string
}

export type UseArtistCoinParams = {
mint?: string[]
owner_id?: ID[]
}

// TODO: PE-6542 Replace this with sdk call
export const useArtistCoin = (params: UseArtistCoinParams = {}) => {
return useQuery({
queryKey: [QUERY_KEYS.artistCoins, params],
queryFn: async () => {
const searchParams = new URLSearchParams()
if (params.mint) {
params.mint.forEach((m) => searchParams.append('mint', m))
}
if (params.owner_id) {
params.owner_id.forEach((id) => {
const encodedId = encodeHashId(id)
if (encodedId) {
searchParams.append('owner_id', encodedId)
}
})
}
const res = await fetch(`https://api.audius.co/v1/coins?${searchParams}`)
if (!res.ok) throw new Error('Failed to fetch coins')
const data = await res.json()
return data.coins as ArtistCoin[]
}
})
}
3 changes: 2 additions & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ export const QUERY_KEYS = {
entityReaction: 'entityReaction',
feelingLuckyTracks: 'feelingLuckyTracks',
recentlyPlayedTracks: 'recentlyPlayedTracks',
recentlyCommentedTracks: 'recentlyCommentedTracks'
recentlyCommentedTracks: 'recentlyCommentedTracks',
artistCoins: 'artistCoins'
} as const
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './useIsArtist'
export * from './useAnalytics'
export * from './useBuySellAnalytics'
export * from './useShareAction'
export * from './useArtistCoinMessageHeader'
44 changes: 44 additions & 0 deletions packages/common/src/hooks/useArtistCoinMessageHeader.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoin } from '~/api/tan-query/coins/useArtistCoin'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

import { useFeatureFlag } from './useFeatureFlag'

export const useArtistCoinMessageHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const { data: coins } = useArtistCoin({ owner_id: [userId] })

if (
!isArtistCoinEnabled ||
!audience ||
audience !== ChatBlastAudience.COIN_HOLDERS
) {
return null
}

let artistCoinSymbol
let artistCoin
if (!!coins && coins.length > 0) {
artistCoin = coins[0]
if (artistCoin.mint) {
const tokenRegistry = getTokenRegistry()
const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
artistCoinSymbol = token?.symbol
}
}

return artistCoinSymbol
}
56 changes: 56 additions & 0 deletions packages/mobile/src/screens/chat-screen/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import type { ID } from '@audius/common/models'
import type { ChatBlastAudience } from '@audius/sdk'
import { Platform } from 'react-native'

import { Flex, IconTokenBonk, Text } from '@audius/harmony-native'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

return (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
{/* TODO: Lookup artist coin icon from TOKENS */}
<IconTokenBonk size='xs' />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

any reason this is hardcoded? we have the ability to determine what Icon to show via SUPPORTED_TOKEN_PAIRS

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

oo didn't know that

{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
)
}
45 changes: 8 additions & 37 deletions packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
import { memo, useCallback, useState } from 'react'

import { useCurrentUserId } from '@audius/common/api'
import { useFeatureFlag } from '@audius/common/hooks'
import { Status } from '@audius/common/models'
import { FeatureFlags } from '@audius/common/services'
import { chatSelectors } from '@audius/common/store'
import {
formatMessageDate,
Expand All@@ -15,10 +13,10 @@ import type { ReactionTypes, ChatMessageReaction } from '@audius/sdk'
import { css } from '@emotion/native'
import { find } from 'linkifyjs'
import type { ViewStyle, StyleProp } from 'react-native'
import { Dimensions, Keyboard, Platform } from 'react-native'
import { Dimensions, Keyboard } from 'react-native'
import { useSelector } from 'react-redux'

import { Flex, IconTokenBonk, spacing, Text } from '@audius/harmony-native'
import { Flex, spacing, Text } from '@audius/harmony-native'
import ChatTail from 'app/assets/images/ChatTail.svg'
import { Pressable, UserGeneratedText } from 'app/components/core'
import { makeStyles } from 'app/styles'
Expand All@@ -27,6 +25,7 @@ import { zIndex } from 'app/utils/zIndex'

import { reactionMap } from '../notifications-screen/Reaction'

import { ArtistCoinHeader } from './ArtistCoinHeader'
import { ChatMessagePlaylist } from './ChatMessagePlaylist'
import { ChatMessageTrack } from './ChatMessageTrack'
import { LinkPreview } from './LinkPreview'
Expand All@@ -37,10 +36,6 @@ const { isIdEqualToReactionsPopupMessageId, getChatMessageById } = chatSelectors

const TAIL_HORIZONTAL_OFFSET = 7

const messages = {
membersOnly: 'Members Only'
}

const useStyles = makeStyles(({ spacing, palette, typography }) => ({
bubble: {
marginTop: spacing(2),
Expand DownExpand Up@@ -169,9 +164,6 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
} = props
const styles = useStyles()
const { data: userId } = useCurrentUserId()
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)
const message = useSelector((state) =>
getChatMessageById(state, chatId, messageId)
)
Expand DownExpand Up@@ -263,32 +255,11 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
itemsRef ? (el) => (itemsRef.current[messageId] = el) : null
}
>
{isArtistCoinEnabled ? (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
<IconTokenBonk size='xs' />
{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
$Bonk
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
{senderUserId ? (
<ArtistCoinHeader
userId={senderUserId}
audience={message?.audience}
/>
) : null}
{isCollection ? (
<ChatMessagePlaylist
Expand Down
9 changes: 6 additions & 3 deletions packages/sdk/src/sdk/api/chats/ChatsApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,8 @@ export class ChatsApi
sender_user_id: encodedSenderId,
created_at: blast.created_at,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: blast.audience
}
})
}
Expand DownExpand Up@@ -882,7 +883,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: !!data.rpc.params.is_plaintext
is_plaintext: !!data.rpc.params.is_plaintext,
audience: data.rpc.params.audience
}
})
} else if (data.rpc.method === 'chat.react') {
Expand All@@ -908,7 +910,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: data.rpc.params.audience
}
})
}
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/src/sdk/api/chats/serverTypes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ export type ChatMessageRPC = {
message: string
parent_message_id?: string
is_plaintext?: boolean
audience?: ChatBlastAudience
}
}

Expand DownExpand Up@@ -159,6 +160,7 @@ export type ChatMessage = {
created_at: string
message: string
is_plaintext: boolean
audience?: ChatBlastAudience
reactions: ChatMessageReaction[]
}

Expand Down
51 changes: 51 additions & 0 deletions packages/web/src/pages/chat-page/components/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import { ID } from '@audius/common/models'
import { Flex, Text } from '@audius/harmony'
import { ChatBlastAudience } from '@audius/sdk'

import { TOKENS } from 'components/buy-sell-modal/constants'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

const ArtistCoinIcon = TOKENS[artistCoinSymbol]?.icon

return (
<Flex
ph='l'
pv='xs'
gap='m'
justifyContent='space-between'
alignItems='center'
backgroundColor='surface1'
borderBottom='default'
>
<Flex gap='xs' alignItems='center'>
{ArtistCoinIcon ? <ArtistCoinIcon size='xs' /> : null}
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
)
}
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
41 changes: 41 additions & 0 deletions packages/common/src/api/tan-query/coins/useArtistCoin.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { encodeHashId } from '@audius/sdk'
import { useQuery } from '@tanstack/react-query'

import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'

export type ArtistCoin = {
mint: string
owner_id: string
}

export type UseArtistCoinParams = {
mint?: string[]
owner_id?: ID[]
}

// TODO: PE-6542 Replace this with sdk call
export const useArtistCoin = (params: UseArtistCoinParams = {}) => {
return useQuery({
queryKey: [QUERY_KEYS.artistCoins, params],
queryFn: async () => {
const searchParams = new URLSearchParams()
if (params.mint) {
params.mint.forEach((m) => searchParams.append('mint', m))
}
if (params.owner_id) {
params.owner_id.forEach((id) => {
const encodedId = encodeHashId(id)
if (encodedId) {
searchParams.append('owner_id', encodedId)
}
})
}
const res = await fetch(`https://api.audius.co/v1/coins?${searchParams}`)
if (!res.ok) throw new Error('Failed to fetch coins')
const data = await res.json()
return data.coins as ArtistCoin[]
}
})
}
3 changes: 2 additions & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ export const QUERY_KEYS = {
entityReaction: 'entityReaction',
feelingLuckyTracks: 'feelingLuckyTracks',
recentlyPlayedTracks: 'recentlyPlayedTracks',
recentlyCommentedTracks: 'recentlyCommentedTracks'
recentlyCommentedTracks: 'recentlyCommentedTracks',
artistCoins: 'artistCoins'
} as const
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './useIsArtist'
export * from './useAnalytics'
export * from './useBuySellAnalytics'
export * from './useShareAction'
export * from './useArtistCoinMessageHeader'
44 changes: 44 additions & 0 deletions packages/common/src/hooks/useArtistCoinMessageHeader.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoin } from '~/api/tan-query/coins/useArtistCoin'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

import { useFeatureFlag } from './useFeatureFlag'

export const useArtistCoinMessageHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const { data: coins } = useArtistCoin({ owner_id: [userId] })

if (
!isArtistCoinEnabled ||
!audience ||
audience !== ChatBlastAudience.COIN_HOLDERS
) {
return null
}

let artistCoinSymbol
let artistCoin
if (!!coins && coins.length > 0) {
artistCoin = coins[0]
if (artistCoin.mint) {
const tokenRegistry = getTokenRegistry()
const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
artistCoinSymbol = token?.symbol
}
}

return artistCoinSymbol
}
56 changes: 56 additions & 0 deletions packages/mobile/src/screens/chat-screen/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import type { ID } from '@audius/common/models'
import type { ChatBlastAudience } from '@audius/sdk'
import { Platform } from 'react-native'

import { Flex, IconTokenBonk, Text } from '@audius/harmony-native'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

return (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
{/* TODO: Lookup artist coin icon from TOKENS */}
<IconTokenBonk size='xs' />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

any reason this is hardcoded? we have the ability to determine what Icon to show via SUPPORTED_TOKEN_PAIRS

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

oo didn't know that

{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
)
}
45 changes: 8 additions & 37 deletions packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
import { memo, useCallback, useState } from 'react'

import { useCurrentUserId } from '@audius/common/api'
import { useFeatureFlag } from '@audius/common/hooks'
import { Status } from '@audius/common/models'
import { FeatureFlags } from '@audius/common/services'
import { chatSelectors } from '@audius/common/store'
import {
formatMessageDate,
Expand All@@ -15,10 +13,10 @@ import type { ReactionTypes, ChatMessageReaction } from '@audius/sdk'
import { css } from '@emotion/native'
import { find } from 'linkifyjs'
import type { ViewStyle, StyleProp } from 'react-native'
import { Dimensions, Keyboard, Platform } from 'react-native'
import { Dimensions, Keyboard } from 'react-native'
import { useSelector } from 'react-redux'

import { Flex, IconTokenBonk, spacing, Text } from '@audius/harmony-native'
import { Flex, spacing, Text } from '@audius/harmony-native'
import ChatTail from 'app/assets/images/ChatTail.svg'
import { Pressable, UserGeneratedText } from 'app/components/core'
import { makeStyles } from 'app/styles'
Expand All@@ -27,6 +25,7 @@ import { zIndex } from 'app/utils/zIndex'

import { reactionMap } from '../notifications-screen/Reaction'

import { ArtistCoinHeader } from './ArtistCoinHeader'
import { ChatMessagePlaylist } from './ChatMessagePlaylist'
import { ChatMessageTrack } from './ChatMessageTrack'
import { LinkPreview } from './LinkPreview'
Expand All@@ -37,10 +36,6 @@ const { isIdEqualToReactionsPopupMessageId, getChatMessageById } = chatSelectors

const TAIL_HORIZONTAL_OFFSET = 7

const messages = {
membersOnly: 'Members Only'
}

const useStyles = makeStyles(({ spacing, palette, typography }) => ({
bubble: {
marginTop: spacing(2),
Expand DownExpand Up@@ -169,9 +164,6 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
} = props
const styles = useStyles()
const { data: userId } = useCurrentUserId()
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)
const message = useSelector((state) =>
getChatMessageById(state, chatId, messageId)
)
Expand DownExpand Up@@ -263,32 +255,11 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
itemsRef ? (el) => (itemsRef.current[messageId] = el) : null
}
>
{isArtistCoinEnabled ? (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
<IconTokenBonk size='xs' />
{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
$Bonk
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
{senderUserId ? (
<ArtistCoinHeader
userId={senderUserId}
audience={message?.audience}
/>
) : null}
{isCollection ? (
<ChatMessagePlaylist
Expand Down
9 changes: 6 additions & 3 deletions packages/sdk/src/sdk/api/chats/ChatsApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,8 @@ export class ChatsApi
sender_user_id: encodedSenderId,
created_at: blast.created_at,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: blast.audience
}
})
}
Expand DownExpand Up@@ -882,7 +883,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: !!data.rpc.params.is_plaintext
is_plaintext: !!data.rpc.params.is_plaintext,
audience: data.rpc.params.audience
}
})
} else if (data.rpc.method === 'chat.react') {
Expand All@@ -908,7 +910,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: data.rpc.params.audience
}
})
}
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/src/sdk/api/chats/serverTypes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ export type ChatMessageRPC = {
message: string
parent_message_id?: string
is_plaintext?: boolean
audience?: ChatBlastAudience
}
}

Expand DownExpand Up@@ -159,6 +160,7 @@ export type ChatMessage = {
created_at: string
message: string
is_plaintext: boolean
audience?: ChatBlastAudience
reactions: ChatMessageReaction[]
}

Expand Down
51 changes: 51 additions & 0 deletions packages/web/src/pages/chat-page/components/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import { ID } from '@audius/common/models'
import { Flex, Text } from '@audius/harmony'
import { ChatBlastAudience } from '@audius/sdk'

import { TOKENS } from 'components/buy-sell-modal/constants'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

const ArtistCoinIcon = TOKENS[artistCoinSymbol]?.icon

return (
<Flex
ph='l'
pv='xs'
gap='m'
justifyContent='space-between'
alignItems='center'
backgroundColor='surface1'
borderBottom='default'
>
<Flex gap='xs' alignItems='center'>
{ArtistCoinIcon ? <ArtistCoinIcon size='xs' /> : null}
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
)
}
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
41 changes: 41 additions & 0 deletions packages/common/src/api/tan-query/coins/useArtistCoin.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { encodeHashId } from '@audius/sdk'
import { useQuery } from '@tanstack/react-query'

import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'

export type ArtistCoin = {
mint: string
owner_id: string
}

export type UseArtistCoinParams = {
mint?: string[]
owner_id?: ID[]
}

// TODO: PE-6542 Replace this with sdk call
export const useArtistCoin = (params: UseArtistCoinParams = {}) => {
return useQuery({
queryKey: [QUERY_KEYS.artistCoins, params],
queryFn: async () => {
const searchParams = new URLSearchParams()
if (params.mint) {
params.mint.forEach((m) => searchParams.append('mint', m))
}
if (params.owner_id) {
params.owner_id.forEach((id) => {
const encodedId = encodeHashId(id)
if (encodedId) {
searchParams.append('owner_id', encodedId)
}
})
}
const res = await fetch(`https://api.audius.co/v1/coins?${searchParams}`)
if (!res.ok) throw new Error('Failed to fetch coins')
const data = await res.json()
return data.coins as ArtistCoin[]
}
})
}
3 changes: 2 additions & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ export const QUERY_KEYS = {
entityReaction: 'entityReaction',
feelingLuckyTracks: 'feelingLuckyTracks',
recentlyPlayedTracks: 'recentlyPlayedTracks',
recentlyCommentedTracks: 'recentlyCommentedTracks'
recentlyCommentedTracks: 'recentlyCommentedTracks',
artistCoins: 'artistCoins'
} as const
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './useIsArtist'
export * from './useAnalytics'
export * from './useBuySellAnalytics'
export * from './useShareAction'
export * from './useArtistCoinMessageHeader'
44 changes: 44 additions & 0 deletions packages/common/src/hooks/useArtistCoinMessageHeader.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoin } from '~/api/tan-query/coins/useArtistCoin'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

import { useFeatureFlag } from './useFeatureFlag'

export const useArtistCoinMessageHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const { data: coins } = useArtistCoin({ owner_id: [userId] })

if (
!isArtistCoinEnabled ||
!audience ||
audience !== ChatBlastAudience.COIN_HOLDERS
) {
return null
}

let artistCoinSymbol
let artistCoin
if (!!coins && coins.length > 0) {
artistCoin = coins[0]
if (artistCoin.mint) {
const tokenRegistry = getTokenRegistry()
const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
artistCoinSymbol = token?.symbol
}
}

return artistCoinSymbol
}
56 changes: 56 additions & 0 deletions packages/mobile/src/screens/chat-screen/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import type { ID } from '@audius/common/models'
import type { ChatBlastAudience } from '@audius/sdk'
import { Platform } from 'react-native'

import { Flex, IconTokenBonk, Text } from '@audius/harmony-native'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

return (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
{/* TODO: Lookup artist coin icon from TOKENS */}
<IconTokenBonk size='xs' />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

any reason this is hardcoded? we have the ability to determine what Icon to show via SUPPORTED_TOKEN_PAIRS

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

oo didn't know that

{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
)
}
45 changes: 8 additions & 37 deletions packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
import { memo, useCallback, useState } from 'react'

import { useCurrentUserId } from '@audius/common/api'
import { useFeatureFlag } from '@audius/common/hooks'
import { Status } from '@audius/common/models'
import { FeatureFlags } from '@audius/common/services'
import { chatSelectors } from '@audius/common/store'
import {
formatMessageDate,
Expand All@@ -15,10 +13,10 @@ import type { ReactionTypes, ChatMessageReaction } from '@audius/sdk'
import { css } from '@emotion/native'
import { find } from 'linkifyjs'
import type { ViewStyle, StyleProp } from 'react-native'
import { Dimensions, Keyboard, Platform } from 'react-native'
import { Dimensions, Keyboard } from 'react-native'
import { useSelector } from 'react-redux'

import { Flex, IconTokenBonk, spacing, Text } from '@audius/harmony-native'
import { Flex, spacing, Text } from '@audius/harmony-native'
import ChatTail from 'app/assets/images/ChatTail.svg'
import { Pressable, UserGeneratedText } from 'app/components/core'
import { makeStyles } from 'app/styles'
Expand All@@ -27,6 +25,7 @@ import { zIndex } from 'app/utils/zIndex'

import { reactionMap } from '../notifications-screen/Reaction'

import { ArtistCoinHeader } from './ArtistCoinHeader'
import { ChatMessagePlaylist } from './ChatMessagePlaylist'
import { ChatMessageTrack } from './ChatMessageTrack'
import { LinkPreview } from './LinkPreview'
Expand All@@ -37,10 +36,6 @@ const { isIdEqualToReactionsPopupMessageId, getChatMessageById } = chatSelectors

const TAIL_HORIZONTAL_OFFSET = 7

const messages = {
membersOnly: 'Members Only'
}

const useStyles = makeStyles(({ spacing, palette, typography }) => ({
bubble: {
marginTop: spacing(2),
Expand DownExpand Up@@ -169,9 +164,6 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
} = props
const styles = useStyles()
const { data: userId } = useCurrentUserId()
const { isEnabled: isArtistCoinEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)
const message = useSelector((state) =>
getChatMessageById(state, chatId, messageId)
)
Expand DownExpand Up@@ -263,32 +255,11 @@ export const ChatMessageListItem = memo(function ChatMessageListItem(
itemsRef ? (el) => (itemsRef.current[messageId] = el) : null
}
>
{isArtistCoinEnabled ? (
<Flex
row
ph='l'
pv='xs'
gap='m'
alignItems='center'
justifyContent='space-between'
backgroundColor='surface1'
borderBottom='default'
>
<Flex row gap='xs' alignItems='center'>
<IconTokenBonk size='xs' />
{/* Alignment bug for label text variant on iOS */}
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s'>
$Bonk
</Text>
</Flex>
</Flex>
<Flex mt={Platform.OS === 'ios' ? '2xs' : 'none'}>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
</Flex>
{senderUserId ? (
<ArtistCoinHeader
userId={senderUserId}
audience={message?.audience}
/>
) : null}
{isCollection ? (
<ChatMessagePlaylist
Expand Down
9 changes: 6 additions & 3 deletions packages/sdk/src/sdk/api/chats/ChatsApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,8 @@ export class ChatsApi
sender_user_id: encodedSenderId,
created_at: blast.created_at,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: blast.audience
}
})
}
Expand DownExpand Up@@ -882,7 +883,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: !!data.rpc.params.is_plaintext
is_plaintext: !!data.rpc.params.is_plaintext,
audience: data.rpc.params.audience
}
})
} else if (data.rpc.method === 'chat.react') {
Expand All@@ -908,7 +910,8 @@ export class ChatsApi
sender_user_id: data.metadata.senderUserId,
created_at: data.metadata.timestamp,
reactions: [],
is_plaintext: true
is_plaintext: true,
audience: data.rpc.params.audience
}
})
}
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/src/sdk/api/chats/serverTypes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ export type ChatMessageRPC = {
message: string
parent_message_id?: string
is_plaintext?: boolean
audience?: ChatBlastAudience
}
}

Expand DownExpand Up@@ -159,6 +160,7 @@ export type ChatMessage = {
created_at: string
message: string
is_plaintext: boolean
audience?: ChatBlastAudience
reactions: ChatMessageReaction[]
}

Expand Down
51 changes: 51 additions & 0 deletions packages/web/src/pages/chat-page/components/ArtistCoinHeader.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { useArtistCoinMessageHeader } from '@audius/common/hooks'
import { walletMessages } from '@audius/common/messages'
import { ID } from '@audius/common/models'
import { Flex, Text } from '@audius/harmony'
import { ChatBlastAudience } from '@audius/sdk'

import { TOKENS } from 'components/buy-sell-modal/constants'

const messages = {
membersOnly: 'Members Only'
}

export const ArtistCoinHeader = ({
userId,
audience
}: {
userId: ID
audience?: ChatBlastAudience
}) => {
const artistCoinSymbol = useArtistCoinMessageHeader({
userId,
audience
})

if (!artistCoinSymbol) return null

const ArtistCoinIcon = TOKENS[artistCoinSymbol]?.icon

return (
<Flex
ph='l'
pv='xs'
gap='m'
justifyContent='space-between'
alignItems='center'
backgroundColor='surface1'
borderBottom='default'
>
<Flex gap='xs' alignItems='center'>
{ArtistCoinIcon ? <ArtistCoinIcon size='xs' /> : null}
<Text variant='label' size='s'>
{walletMessages.dollarSign}
{artistCoinSymbol}
</Text>
</Flex>
<Text variant='label' size='s' color='accent'>
{messages.membersOnly}
</Text>
</Flex>
)
}
Loading