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
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ export * from './useFormattedTokenBalance'
export * from './useCurrentTrack'
export * from './useDebounce'
export * from './useIsArtist'
export * from './useOwnedTokens'

export * from './useAnalytics'
export * from './useBuySellAnalytics'
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/hooks/useFormattedTokenBalance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useTokenBalance, useArtistCoins } from '../api'
import { Status } from '../models/Status'
import {
getTokenDecimalPlaces,
formatCurrency,
formatCurrencyWithSubscript,
isNullOrUndefined
} from '../utils'

Expand DownExpand Up@@ -65,7 +65,7 @@ export const useFormattedTokenBalance = (
if (!tokenPrice) return '$0.00'

const priceNumber = Number(new FixedDecimal(tokenPrice).toString())
return formatCurrency(priceNumber)
return formatCurrencyWithSubscript(priceNumber)
}, [tokenPrice])

return {
Expand Down
52 changes: 52 additions & 0 deletions packages/common/src/hooks/useOwnedTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import { useMemo } from 'react'

import {
useCurrentUserId,
useUserCoins,
useQueryContext,
UserCoin
} from '~/api'
import { useFeatureFlag } from '~/hooks'
import { FeatureFlags } from '~/services'
import type { TokenInfo } from '~/store'
import { ownedCoinsFilter } from '~/utils'

/**
* Hook to filter tokens based on user ownership and positive balance
* Respects the ARTIST_COINS feature flag - when disabled, only shows AUDIO tokens
*/
export const useOwnedTokens = (allTokens: TokenInfo[]) => {

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.

what's going on with allTokens? it is an arg but then gets returned with no changes?
can we just select allTokens from some other hook inside this hook?
and maybe don't need to return it?

const { data: currentUserId } = useCurrentUserId()
const { data: userCoins } = useUserCoins({ userId: currentUserId })
const { env } = useQueryContext()
const { isEnabled: isArtistCoinsEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const ownedTokens = useMemo(() => {
if (!userCoins || !allTokens.length) {
return []
}

const filteredUserCoins = userCoins.filter(
ownedCoinsFilter(!!isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS)
)

// Create a map of user's owned tokens by mint address
const userOwnedMints = new Set(
filteredUserCoins.map((coin: UserCoin) => coin.mint)
)

// Filter available tokens to only include ones the user owns
const ownedTokensList = allTokens.filter((token) =>
userOwnedMints.has(token.address)
)

return ownedTokensList
}, [userCoins, allTokens, isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS])

return {
ownedTokens,
isLoading: !userCoins
}
}
1 change: 0 additions & 1 deletion packages/common/src/store/ui/buy-sell/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export * from './useTokenSwapForm'
export * from './useAvailableTokens'
export * from './useCurrentTokenPair'
export * from './useTokenStates'
export * from './useGroupCoinPairs'
65 changes: 0 additions & 65 deletions packages/common/src/store/ui/buy-sell/useGroupCoinPairs.ts

This file was deleted.

24 changes: 24 additions & 0 deletions packages/common/src/utils/coinUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { UserCoin } from '~/api'
Comment thread
faridsalau marked this conversation as resolved.

/**
* Creates a predicate function for filtering user coins based on the ARTIST_COINS feature flag and balance requirements
*
* @param isArtistCoinsEnabled - Whether the ARTIST_COINS feature flag is enabled
* @param wAudioMintAddress - The WAUDIO mint address from environment
* @returns Predicate function that can be used with Array.filter()
*/
export const ownedCoinsFilter =
(isArtistCoinsEnabled: boolean, wAudioMintAddress: string) =>
(coin: UserCoin): boolean => {
if (!isArtistCoinsEnabled) {
// When artist coins disabled, only show AUDIO
return coin.mint === wAudioMintAddress
}

// When artist coins enabled, show all non-USDC tokens with balance > 0
// OR AUDIO regardless of balance
return (
coin.ticker !== 'USDC' &&
(coin.balance > 0 || coin.mint === wAudioMintAddress)
)
}
72 changes: 72 additions & 0 deletions packages/common/src/utils/decimal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,78 @@ export const formatCurrency = (
}
}

/**
* Formats a number with subscript notation for many leading zeros after decimal.
* For example: 0.000068352 → 0.0₄68352
*
* @param num - The number to format
* @param locale - Locale for number formatting (defaults to 'en-US')
* @returns Formatted string with subscript notation for leading zeros
*/
export const formatCurrencyWithSubscript = (
num: number,
locale: string = 'en-US'
): string => {
if (num === 0) return '$0.00'

try {
const decimalPlaces = getCurrencyDecimalPlaces(num)
const formatted = new Intl.NumberFormat(locale, {
Comment thread
faridsalau marked this conversation as resolved.
style: 'currency',
currency: 'USD',
minimumFractionDigits: Math.min(decimalPlaces, 2),
maximumFractionDigits: decimalPlaces
}).format(num)

// Extract the number part (remove currency symbol and commas)
const numberPart = formatted.replace(/[^0-9.-]/g, '').replace(/,/g, '')

// Check if there are leading zeros after decimal that should be subscripted
const parts = numberPart.split('.')
if (parts.length === 2 && parts[0] === '0') {
const decimalPart = parts[1]

// Find consecutive zeros after the decimal
const zeroMatch = decimalPart.match(/^0+/)
if (zeroMatch) {
const zeroCount = zeroMatch[0].length
const remainingDigits = decimalPart.substring(zeroCount)

// Only apply subscript if there are 3 or more leading zeros
if (zeroCount >= 3 && remainingDigits.length > 0) {
// Create subscript number (Unicode subscript digits)
const subscriptDigits = zeroCount
.toString()
.split('')
.map((digit) => {
const subscripts = [
Comment thread
faridsalau marked this conversation as resolved.
'₀',
'₁',
'₂',
'₃',
'₄',
'₅',
'₆',
'₇',
'₈',
'₉'
]
return subscripts[parseInt(digit)]
})
.join('')

// Format as $0.0[subscript][remaining digits]
return `$0.0${subscriptDigits}${remainingDigits}`
}
}
}

return formatted
} catch {
return `$${num.toFixed(2)}`
}
}

export const formatCurrencyWithMax = (
num: number,
max: number,
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './handle'
export * from './comments'
export * from './quickSearch'
export * from './coinMetrics'
export * from './coinUtils'
47 changes: 32 additions & 15 deletions packages/mobile/src/screens/buy-sell-screen/BuySellFlow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useMemo, useCallback } from 'react'

import { useTokenPair, useTokens } from '@audius/common/api'
import { useBuySellAnalytics } from '@audius/common/hooks'
import { useBuySellAnalytics, useOwnedTokens } from '@audius/common/hooks'
import { buySellMessages as messages } from '@audius/common/messages'
import type { BuySellTab, TokenInfo } from '@audius/common/store'
import {
Expand DownExpand Up@@ -76,12 +76,42 @@ export const BuySellFlow = ({
})

const { tokens } = useTokens()
const availableBaseTokens: TokenInfo[] = useMemo(() => {

// Get all available tokens and owned tokens
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(tokens).filter(
(token) => token.symbol !== selectedQuoteToken
)
}, [tokens, selectedQuoteToken])

const { ownedTokens } = useOwnedTokens(allAvailableTokens)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Determine which tokens to show based on current tab
// For buy tab: "You Receive" section should show all tokens
// For sell tab: "You Sell" section should show only owned tokens
const availableBaseTokens: TokenInfo[] = useMemo(() => {
if (activeTab === 'sell') {
// In sell tab, the input section should only show owned tokens
return ownedTokens
} else {
// In buy tab, the output section should show all tokens
return allAvailableTokens
}
}, [activeTab, ownedTokens, allAvailableTokens])

const baseTokenOptions = useMemo(
() =>
availableBaseTokens.map((token) => ({
Expand All@@ -103,19 +133,6 @@ export const BuySellFlow = ({
[availableBaseTokens]
)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Reset screen state to 'input' when this screen comes into focus
// This handles the case where we navigate back from ConfirmSwapScreen
useFocusEffect(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@ import {
useArtistCoin,
useArtistCoins
} from '@audius/common/api'
import { useOwnedTokens } from '@audius/common/hooks'
import type { TokenInfo, TokenPair } from '@audius/common/store'
import { useTokenSwapForm } from '@audius/common/store'

import { Box, Flex, Skeleton, Text } from '@audius/harmony-native'
import { Box, Flex, Skeleton } from '@audius/harmony-native'
import { InputTokenSection } from 'app/components/buy-sell/InputTokenSection'
import { OutputTokenSection } from 'app/components/buy-sell/OutputTokenSection'

Expand DownExpand Up@@ -107,10 +108,18 @@ export const SellScreen = ({
}

const { data: coins } = useArtistCoins()
const availableInputTokens: TokenInfo[] = useMemo(() => {
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(transformArtistCoinsToTokenInfoMap(coins ?? []))
}, [coins])

// Use the owned tokens hook to get filtered tokens
const { ownedTokens } = useOwnedTokens(allAvailableTokens)

// For sell screen:
// - "You Sell" section (input): Should show only tokens the user owns
// - "You Receive" section (output): Should show all available tokens (but only USDC in practice)
const availableInputTokens = ownedTokens

if (!tokenPair) return null

// Extract the tokens from the pair
Expand DownExpand Up@@ -151,10 +160,6 @@ export const SellScreen = ({
/>
</>
)}
<Flex row gap='xs'>
<Text color='subdued'>Rate</Text>
<Text>{`1 ${baseToken.symbol} ≈ ${Number(tokenPrice).toFixed(8)} ${quoteToken.symbol}`}</Text>
</Flex>
</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
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ export * from './useFormattedTokenBalance'
export * from './useCurrentTrack'
export * from './useDebounce'
export * from './useIsArtist'
export * from './useOwnedTokens'

export * from './useAnalytics'
export * from './useBuySellAnalytics'
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/hooks/useFormattedTokenBalance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useTokenBalance, useArtistCoins } from '../api'
import { Status } from '../models/Status'
import {
getTokenDecimalPlaces,
formatCurrency,
formatCurrencyWithSubscript,
isNullOrUndefined
} from '../utils'

Expand DownExpand Up@@ -65,7 +65,7 @@ export const useFormattedTokenBalance = (
if (!tokenPrice) return '$0.00'

const priceNumber = Number(new FixedDecimal(tokenPrice).toString())
return formatCurrency(priceNumber)
return formatCurrencyWithSubscript(priceNumber)
}, [tokenPrice])

return {
Expand Down
52 changes: 52 additions & 0 deletions packages/common/src/hooks/useOwnedTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import { useMemo } from 'react'

import {
useCurrentUserId,
useUserCoins,
useQueryContext,
UserCoin
} from '~/api'
import { useFeatureFlag } from '~/hooks'
import { FeatureFlags } from '~/services'
import type { TokenInfo } from '~/store'
import { ownedCoinsFilter } from '~/utils'

/**
* Hook to filter tokens based on user ownership and positive balance
* Respects the ARTIST_COINS feature flag - when disabled, only shows AUDIO tokens
*/
export const useOwnedTokens = (allTokens: TokenInfo[]) => {

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.

what's going on with allTokens? it is an arg but then gets returned with no changes?
can we just select allTokens from some other hook inside this hook?
and maybe don't need to return it?

const { data: currentUserId } = useCurrentUserId()
const { data: userCoins } = useUserCoins({ userId: currentUserId })
const { env } = useQueryContext()
const { isEnabled: isArtistCoinsEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const ownedTokens = useMemo(() => {
if (!userCoins || !allTokens.length) {
return []
}

const filteredUserCoins = userCoins.filter(
ownedCoinsFilter(!!isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS)
)

// Create a map of user's owned tokens by mint address
const userOwnedMints = new Set(
filteredUserCoins.map((coin: UserCoin) => coin.mint)
)

// Filter available tokens to only include ones the user owns
const ownedTokensList = allTokens.filter((token) =>
userOwnedMints.has(token.address)
)

return ownedTokensList
}, [userCoins, allTokens, isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS])

return {
ownedTokens,
isLoading: !userCoins
}
}
1 change: 0 additions & 1 deletion packages/common/src/store/ui/buy-sell/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export * from './useTokenSwapForm'
export * from './useAvailableTokens'
export * from './useCurrentTokenPair'
export * from './useTokenStates'
export * from './useGroupCoinPairs'
65 changes: 0 additions & 65 deletions packages/common/src/store/ui/buy-sell/useGroupCoinPairs.ts

This file was deleted.

24 changes: 24 additions & 0 deletions packages/common/src/utils/coinUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { UserCoin } from '~/api'
Comment thread
faridsalau marked this conversation as resolved.

/**
* Creates a predicate function for filtering user coins based on the ARTIST_COINS feature flag and balance requirements
*
* @param isArtistCoinsEnabled - Whether the ARTIST_COINS feature flag is enabled
* @param wAudioMintAddress - The WAUDIO mint address from environment
* @returns Predicate function that can be used with Array.filter()
*/
export const ownedCoinsFilter =
(isArtistCoinsEnabled: boolean, wAudioMintAddress: string) =>
(coin: UserCoin): boolean => {
if (!isArtistCoinsEnabled) {
// When artist coins disabled, only show AUDIO
return coin.mint === wAudioMintAddress
}

// When artist coins enabled, show all non-USDC tokens with balance > 0
// OR AUDIO regardless of balance
return (
coin.ticker !== 'USDC' &&
(coin.balance > 0 || coin.mint === wAudioMintAddress)
)
}
72 changes: 72 additions & 0 deletions packages/common/src/utils/decimal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,78 @@ export const formatCurrency = (
}
}

/**
* Formats a number with subscript notation for many leading zeros after decimal.
* For example: 0.000068352 → 0.0₄68352
*
* @param num - The number to format
* @param locale - Locale for number formatting (defaults to 'en-US')
* @returns Formatted string with subscript notation for leading zeros
*/
export const formatCurrencyWithSubscript = (
num: number,
locale: string = 'en-US'
): string => {
if (num === 0) return '$0.00'

try {
const decimalPlaces = getCurrencyDecimalPlaces(num)
const formatted = new Intl.NumberFormat(locale, {
Comment thread
faridsalau marked this conversation as resolved.
style: 'currency',
currency: 'USD',
minimumFractionDigits: Math.min(decimalPlaces, 2),
maximumFractionDigits: decimalPlaces
}).format(num)

// Extract the number part (remove currency symbol and commas)
const numberPart = formatted.replace(/[^0-9.-]/g, '').replace(/,/g, '')

// Check if there are leading zeros after decimal that should be subscripted
const parts = numberPart.split('.')
if (parts.length === 2 && parts[0] === '0') {
const decimalPart = parts[1]

// Find consecutive zeros after the decimal
const zeroMatch = decimalPart.match(/^0+/)
if (zeroMatch) {
const zeroCount = zeroMatch[0].length
const remainingDigits = decimalPart.substring(zeroCount)

// Only apply subscript if there are 3 or more leading zeros
if (zeroCount >= 3 && remainingDigits.length > 0) {
// Create subscript number (Unicode subscript digits)
const subscriptDigits = zeroCount
.toString()
.split('')
.map((digit) => {
const subscripts = [
Comment thread
faridsalau marked this conversation as resolved.
'₀',
'₁',
'₂',
'₃',
'₄',
'₅',
'₆',
'₇',
'₈',
'₉'
]
return subscripts[parseInt(digit)]
})
.join('')

// Format as $0.0[subscript][remaining digits]
return `$0.0${subscriptDigits}${remainingDigits}`
}
}
}

return formatted
} catch {
return `$${num.toFixed(2)}`
}
}

export const formatCurrencyWithMax = (
num: number,
max: number,
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './handle'
export * from './comments'
export * from './quickSearch'
export * from './coinMetrics'
export * from './coinUtils'
47 changes: 32 additions & 15 deletions packages/mobile/src/screens/buy-sell-screen/BuySellFlow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useMemo, useCallback } from 'react'

import { useTokenPair, useTokens } from '@audius/common/api'
import { useBuySellAnalytics } from '@audius/common/hooks'
import { useBuySellAnalytics, useOwnedTokens } from '@audius/common/hooks'
import { buySellMessages as messages } from '@audius/common/messages'
import type { BuySellTab, TokenInfo } from '@audius/common/store'
import {
Expand DownExpand Up@@ -76,12 +76,42 @@ export const BuySellFlow = ({
})

const { tokens } = useTokens()
const availableBaseTokens: TokenInfo[] = useMemo(() => {

// Get all available tokens and owned tokens
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(tokens).filter(
(token) => token.symbol !== selectedQuoteToken
)
}, [tokens, selectedQuoteToken])

const { ownedTokens } = useOwnedTokens(allAvailableTokens)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Determine which tokens to show based on current tab
// For buy tab: "You Receive" section should show all tokens
// For sell tab: "You Sell" section should show only owned tokens
const availableBaseTokens: TokenInfo[] = useMemo(() => {
if (activeTab === 'sell') {
// In sell tab, the input section should only show owned tokens
return ownedTokens
} else {
// In buy tab, the output section should show all tokens
return allAvailableTokens
}
}, [activeTab, ownedTokens, allAvailableTokens])

const baseTokenOptions = useMemo(
() =>
availableBaseTokens.map((token) => ({
Expand All@@ -103,19 +133,6 @@ export const BuySellFlow = ({
[availableBaseTokens]
)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Reset screen state to 'input' when this screen comes into focus
// This handles the case where we navigate back from ConfirmSwapScreen
useFocusEffect(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@ import {
useArtistCoin,
useArtistCoins
} from '@audius/common/api'
import { useOwnedTokens } from '@audius/common/hooks'
import type { TokenInfo, TokenPair } from '@audius/common/store'
import { useTokenSwapForm } from '@audius/common/store'

import { Box, Flex, Skeleton, Text } from '@audius/harmony-native'
import { Box, Flex, Skeleton } from '@audius/harmony-native'
import { InputTokenSection } from 'app/components/buy-sell/InputTokenSection'
import { OutputTokenSection } from 'app/components/buy-sell/OutputTokenSection'

Expand DownExpand Up@@ -107,10 +108,18 @@ export const SellScreen = ({
}

const { data: coins } = useArtistCoins()
const availableInputTokens: TokenInfo[] = useMemo(() => {
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(transformArtistCoinsToTokenInfoMap(coins ?? []))
}, [coins])

// Use the owned tokens hook to get filtered tokens
const { ownedTokens } = useOwnedTokens(allAvailableTokens)

// For sell screen:
// - "You Sell" section (input): Should show only tokens the user owns
// - "You Receive" section (output): Should show all available tokens (but only USDC in practice)
const availableInputTokens = ownedTokens

if (!tokenPair) return null

// Extract the tokens from the pair
Expand DownExpand Up@@ -151,10 +160,6 @@ export const SellScreen = ({
/>
</>
)}
<Flex row gap='xs'>
<Text color='subdued'>Rate</Text>
<Text>{`1 ${baseToken.symbol} ≈ ${Number(tokenPrice).toFixed(8)} ${quoteToken.symbol}`}</Text>
</Flex>
</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
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ export * from './useFormattedTokenBalance'
export * from './useCurrentTrack'
export * from './useDebounce'
export * from './useIsArtist'
export * from './useOwnedTokens'

export * from './useAnalytics'
export * from './useBuySellAnalytics'
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/hooks/useFormattedTokenBalance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useTokenBalance, useArtistCoins } from '../api'
import { Status } from '../models/Status'
import {
getTokenDecimalPlaces,
formatCurrency,
formatCurrencyWithSubscript,
isNullOrUndefined
} from '../utils'

Expand DownExpand Up@@ -65,7 +65,7 @@ export const useFormattedTokenBalance = (
if (!tokenPrice) return '$0.00'

const priceNumber = Number(new FixedDecimal(tokenPrice).toString())
return formatCurrency(priceNumber)
return formatCurrencyWithSubscript(priceNumber)
}, [tokenPrice])

return {
Expand Down
52 changes: 52 additions & 0 deletions packages/common/src/hooks/useOwnedTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import { useMemo } from 'react'

import {
useCurrentUserId,
useUserCoins,
useQueryContext,
UserCoin
} from '~/api'
import { useFeatureFlag } from '~/hooks'
import { FeatureFlags } from '~/services'
import type { TokenInfo } from '~/store'
import { ownedCoinsFilter } from '~/utils'

/**
* Hook to filter tokens based on user ownership and positive balance
* Respects the ARTIST_COINS feature flag - when disabled, only shows AUDIO tokens
*/
export const useOwnedTokens = (allTokens: TokenInfo[]) => {

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.

what's going on with allTokens? it is an arg but then gets returned with no changes?
can we just select allTokens from some other hook inside this hook?
and maybe don't need to return it?

const { data: currentUserId } = useCurrentUserId()
const { data: userCoins } = useUserCoins({ userId: currentUserId })
const { env } = useQueryContext()
const { isEnabled: isArtistCoinsEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const ownedTokens = useMemo(() => {
if (!userCoins || !allTokens.length) {
return []
}

const filteredUserCoins = userCoins.filter(
ownedCoinsFilter(!!isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS)
)

// Create a map of user's owned tokens by mint address
const userOwnedMints = new Set(
filteredUserCoins.map((coin: UserCoin) => coin.mint)
)

// Filter available tokens to only include ones the user owns
const ownedTokensList = allTokens.filter((token) =>
userOwnedMints.has(token.address)
)

return ownedTokensList
}, [userCoins, allTokens, isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS])

return {
ownedTokens,
isLoading: !userCoins
}
}
1 change: 0 additions & 1 deletion packages/common/src/store/ui/buy-sell/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export * from './useTokenSwapForm'
export * from './useAvailableTokens'
export * from './useCurrentTokenPair'
export * from './useTokenStates'
export * from './useGroupCoinPairs'
65 changes: 0 additions & 65 deletions packages/common/src/store/ui/buy-sell/useGroupCoinPairs.ts

This file was deleted.

24 changes: 24 additions & 0 deletions packages/common/src/utils/coinUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { UserCoin } from '~/api'
Comment thread
faridsalau marked this conversation as resolved.

/**
* Creates a predicate function for filtering user coins based on the ARTIST_COINS feature flag and balance requirements
*
* @param isArtistCoinsEnabled - Whether the ARTIST_COINS feature flag is enabled
* @param wAudioMintAddress - The WAUDIO mint address from environment
* @returns Predicate function that can be used with Array.filter()
*/
export const ownedCoinsFilter =
(isArtistCoinsEnabled: boolean, wAudioMintAddress: string) =>
(coin: UserCoin): boolean => {
if (!isArtistCoinsEnabled) {
// When artist coins disabled, only show AUDIO
return coin.mint === wAudioMintAddress
}

// When artist coins enabled, show all non-USDC tokens with balance > 0
// OR AUDIO regardless of balance
return (
coin.ticker !== 'USDC' &&
(coin.balance > 0 || coin.mint === wAudioMintAddress)
)
}
72 changes: 72 additions & 0 deletions packages/common/src/utils/decimal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,78 @@ export const formatCurrency = (
}
}

/**
* Formats a number with subscript notation for many leading zeros after decimal.
* For example: 0.000068352 → 0.0₄68352
*
* @param num - The number to format
* @param locale - Locale for number formatting (defaults to 'en-US')
* @returns Formatted string with subscript notation for leading zeros
*/
export const formatCurrencyWithSubscript = (
num: number,
locale: string = 'en-US'
): string => {
if (num === 0) return '$0.00'

try {
const decimalPlaces = getCurrencyDecimalPlaces(num)
const formatted = new Intl.NumberFormat(locale, {
Comment thread
faridsalau marked this conversation as resolved.
style: 'currency',
currency: 'USD',
minimumFractionDigits: Math.min(decimalPlaces, 2),
maximumFractionDigits: decimalPlaces
}).format(num)

// Extract the number part (remove currency symbol and commas)
const numberPart = formatted.replace(/[^0-9.-]/g, '').replace(/,/g, '')

// Check if there are leading zeros after decimal that should be subscripted
const parts = numberPart.split('.')
if (parts.length === 2 && parts[0] === '0') {
const decimalPart = parts[1]

// Find consecutive zeros after the decimal
const zeroMatch = decimalPart.match(/^0+/)
if (zeroMatch) {
const zeroCount = zeroMatch[0].length
const remainingDigits = decimalPart.substring(zeroCount)

// Only apply subscript if there are 3 or more leading zeros
if (zeroCount >= 3 && remainingDigits.length > 0) {
// Create subscript number (Unicode subscript digits)
const subscriptDigits = zeroCount
.toString()
.split('')
.map((digit) => {
const subscripts = [
Comment thread
faridsalau marked this conversation as resolved.
'₀',
'₁',
'₂',
'₃',
'₄',
'₅',
'₆',
'₇',
'₈',
'₉'
]
return subscripts[parseInt(digit)]
})
.join('')

// Format as $0.0[subscript][remaining digits]
return `$0.0${subscriptDigits}${remainingDigits}`
}
}
}

return formatted
} catch {
return `$${num.toFixed(2)}`
}
}

export const formatCurrencyWithMax = (
num: number,
max: number,
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './handle'
export * from './comments'
export * from './quickSearch'
export * from './coinMetrics'
export * from './coinUtils'
47 changes: 32 additions & 15 deletions packages/mobile/src/screens/buy-sell-screen/BuySellFlow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useMemo, useCallback } from 'react'

import { useTokenPair, useTokens } from '@audius/common/api'
import { useBuySellAnalytics } from '@audius/common/hooks'
import { useBuySellAnalytics, useOwnedTokens } from '@audius/common/hooks'
import { buySellMessages as messages } from '@audius/common/messages'
import type { BuySellTab, TokenInfo } from '@audius/common/store'
import {
Expand DownExpand Up@@ -76,12 +76,42 @@ export const BuySellFlow = ({
})

const { tokens } = useTokens()
const availableBaseTokens: TokenInfo[] = useMemo(() => {

// Get all available tokens and owned tokens
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(tokens).filter(
(token) => token.symbol !== selectedQuoteToken
)
}, [tokens, selectedQuoteToken])

const { ownedTokens } = useOwnedTokens(allAvailableTokens)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Determine which tokens to show based on current tab
// For buy tab: "You Receive" section should show all tokens
// For sell tab: "You Sell" section should show only owned tokens
const availableBaseTokens: TokenInfo[] = useMemo(() => {
if (activeTab === 'sell') {
// In sell tab, the input section should only show owned tokens
return ownedTokens
} else {
// In buy tab, the output section should show all tokens
return allAvailableTokens
}
}, [activeTab, ownedTokens, allAvailableTokens])

const baseTokenOptions = useMemo(
() =>
availableBaseTokens.map((token) => ({
Expand All@@ -103,19 +133,6 @@ export const BuySellFlow = ({
[availableBaseTokens]
)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Reset screen state to 'input' when this screen comes into focus
// This handles the case where we navigate back from ConfirmSwapScreen
useFocusEffect(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@ import {
useArtistCoin,
useArtistCoins
} from '@audius/common/api'
import { useOwnedTokens } from '@audius/common/hooks'
import type { TokenInfo, TokenPair } from '@audius/common/store'
import { useTokenSwapForm } from '@audius/common/store'

import { Box, Flex, Skeleton, Text } from '@audius/harmony-native'
import { Box, Flex, Skeleton } from '@audius/harmony-native'
import { InputTokenSection } from 'app/components/buy-sell/InputTokenSection'
import { OutputTokenSection } from 'app/components/buy-sell/OutputTokenSection'

Expand DownExpand Up@@ -107,10 +108,18 @@ export const SellScreen = ({
}

const { data: coins } = useArtistCoins()
const availableInputTokens: TokenInfo[] = useMemo(() => {
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(transformArtistCoinsToTokenInfoMap(coins ?? []))
}, [coins])

// Use the owned tokens hook to get filtered tokens
const { ownedTokens } = useOwnedTokens(allAvailableTokens)

// For sell screen:
// - "You Sell" section (input): Should show only tokens the user owns
// - "You Receive" section (output): Should show all available tokens (but only USDC in practice)
const availableInputTokens = ownedTokens

if (!tokenPair) return null

// Extract the tokens from the pair
Expand DownExpand Up@@ -151,10 +160,6 @@ export const SellScreen = ({
/>
</>
)}
<Flex row gap='xs'>
<Text color='subdued'>Rate</Text>
<Text>{`1 ${baseToken.symbol} ≈ ${Number(tokenPrice).toFixed(8)} ${quoteToken.symbol}`}</Text>
</Flex>
</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
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ export * from './useFormattedTokenBalance'
export * from './useCurrentTrack'
export * from './useDebounce'
export * from './useIsArtist'
export * from './useOwnedTokens'

export * from './useAnalytics'
export * from './useBuySellAnalytics'
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/hooks/useFormattedTokenBalance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useTokenBalance, useArtistCoins } from '../api'
import { Status } from '../models/Status'
import {
getTokenDecimalPlaces,
formatCurrency,
formatCurrencyWithSubscript,
isNullOrUndefined
} from '../utils'

Expand DownExpand Up@@ -65,7 +65,7 @@ export const useFormattedTokenBalance = (
if (!tokenPrice) return '$0.00'

const priceNumber = Number(new FixedDecimal(tokenPrice).toString())
return formatCurrency(priceNumber)
return formatCurrencyWithSubscript(priceNumber)
}, [tokenPrice])

return {
Expand Down
52 changes: 52 additions & 0 deletions packages/common/src/hooks/useOwnedTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import { useMemo } from 'react'

import {
useCurrentUserId,
useUserCoins,
useQueryContext,
UserCoin
} from '~/api'
import { useFeatureFlag } from '~/hooks'
import { FeatureFlags } from '~/services'
import type { TokenInfo } from '~/store'
import { ownedCoinsFilter } from '~/utils'

/**
* Hook to filter tokens based on user ownership and positive balance
* Respects the ARTIST_COINS feature flag - when disabled, only shows AUDIO tokens
*/
export const useOwnedTokens = (allTokens: TokenInfo[]) => {

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.

what's going on with allTokens? it is an arg but then gets returned with no changes?
can we just select allTokens from some other hook inside this hook?
and maybe don't need to return it?

const { data: currentUserId } = useCurrentUserId()
const { data: userCoins } = useUserCoins({ userId: currentUserId })
const { env } = useQueryContext()
const { isEnabled: isArtistCoinsEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const ownedTokens = useMemo(() => {
if (!userCoins || !allTokens.length) {
return []
}

const filteredUserCoins = userCoins.filter(
ownedCoinsFilter(!!isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS)
)

// Create a map of user's owned tokens by mint address
const userOwnedMints = new Set(
filteredUserCoins.map((coin: UserCoin) => coin.mint)
)

// Filter available tokens to only include ones the user owns
const ownedTokensList = allTokens.filter((token) =>
userOwnedMints.has(token.address)
)

return ownedTokensList
}, [userCoins, allTokens, isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS])

return {
ownedTokens,
isLoading: !userCoins
}
}
1 change: 0 additions & 1 deletion packages/common/src/store/ui/buy-sell/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export * from './useTokenSwapForm'
export * from './useAvailableTokens'
export * from './useCurrentTokenPair'
export * from './useTokenStates'
export * from './useGroupCoinPairs'
65 changes: 0 additions & 65 deletions packages/common/src/store/ui/buy-sell/useGroupCoinPairs.ts

This file was deleted.

24 changes: 24 additions & 0 deletions packages/common/src/utils/coinUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { UserCoin } from '~/api'
Comment thread
faridsalau marked this conversation as resolved.

/**
* Creates a predicate function for filtering user coins based on the ARTIST_COINS feature flag and balance requirements
*
* @param isArtistCoinsEnabled - Whether the ARTIST_COINS feature flag is enabled
* @param wAudioMintAddress - The WAUDIO mint address from environment
* @returns Predicate function that can be used with Array.filter()
*/
export const ownedCoinsFilter =
(isArtistCoinsEnabled: boolean, wAudioMintAddress: string) =>
(coin: UserCoin): boolean => {
if (!isArtistCoinsEnabled) {
// When artist coins disabled, only show AUDIO
return coin.mint === wAudioMintAddress
}

// When artist coins enabled, show all non-USDC tokens with balance > 0
// OR AUDIO regardless of balance
return (
coin.ticker !== 'USDC' &&
(coin.balance > 0 || coin.mint === wAudioMintAddress)
)
}
72 changes: 72 additions & 0 deletions packages/common/src/utils/decimal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,78 @@ export const formatCurrency = (
}
}

/**
* Formats a number with subscript notation for many leading zeros after decimal.
* For example: 0.000068352 → 0.0₄68352
*
* @param num - The number to format
* @param locale - Locale for number formatting (defaults to 'en-US')
* @returns Formatted string with subscript notation for leading zeros
*/
export const formatCurrencyWithSubscript = (
num: number,
locale: string = 'en-US'
): string => {
if (num === 0) return '$0.00'

try {
const decimalPlaces = getCurrencyDecimalPlaces(num)
const formatted = new Intl.NumberFormat(locale, {
Comment thread
faridsalau marked this conversation as resolved.
style: 'currency',
currency: 'USD',
minimumFractionDigits: Math.min(decimalPlaces, 2),
maximumFractionDigits: decimalPlaces
}).format(num)

// Extract the number part (remove currency symbol and commas)
const numberPart = formatted.replace(/[^0-9.-]/g, '').replace(/,/g, '')

// Check if there are leading zeros after decimal that should be subscripted
const parts = numberPart.split('.')
if (parts.length === 2 && parts[0] === '0') {
const decimalPart = parts[1]

// Find consecutive zeros after the decimal
const zeroMatch = decimalPart.match(/^0+/)
if (zeroMatch) {
const zeroCount = zeroMatch[0].length
const remainingDigits = decimalPart.substring(zeroCount)

// Only apply subscript if there are 3 or more leading zeros
if (zeroCount >= 3 && remainingDigits.length > 0) {
// Create subscript number (Unicode subscript digits)
const subscriptDigits = zeroCount
.toString()
.split('')
.map((digit) => {
const subscripts = [
Comment thread
faridsalau marked this conversation as resolved.
'₀',
'₁',
'₂',
'₃',
'₄',
'₅',
'₆',
'₇',
'₈',
'₉'
]
return subscripts[parseInt(digit)]
})
.join('')

// Format as $0.0[subscript][remaining digits]
return `$0.0${subscriptDigits}${remainingDigits}`
}
}
}

return formatted
} catch {
return `$${num.toFixed(2)}`
}
}

export const formatCurrencyWithMax = (
num: number,
max: number,
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './handle'
export * from './comments'
export * from './quickSearch'
export * from './coinMetrics'
export * from './coinUtils'
47 changes: 32 additions & 15 deletions packages/mobile/src/screens/buy-sell-screen/BuySellFlow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useMemo, useCallback } from 'react'

import { useTokenPair, useTokens } from '@audius/common/api'
import { useBuySellAnalytics } from '@audius/common/hooks'
import { useBuySellAnalytics, useOwnedTokens } from '@audius/common/hooks'
import { buySellMessages as messages } from '@audius/common/messages'
import type { BuySellTab, TokenInfo } from '@audius/common/store'
import {
Expand DownExpand Up@@ -76,12 +76,42 @@ export const BuySellFlow = ({
})

const { tokens } = useTokens()
const availableBaseTokens: TokenInfo[] = useMemo(() => {

// Get all available tokens and owned tokens
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(tokens).filter(
(token) => token.symbol !== selectedQuoteToken
)
}, [tokens, selectedQuoteToken])

const { ownedTokens } = useOwnedTokens(allAvailableTokens)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Determine which tokens to show based on current tab
// For buy tab: "You Receive" section should show all tokens
// For sell tab: "You Sell" section should show only owned tokens
const availableBaseTokens: TokenInfo[] = useMemo(() => {
if (activeTab === 'sell') {
// In sell tab, the input section should only show owned tokens
return ownedTokens
} else {
// In buy tab, the output section should show all tokens
return allAvailableTokens
}
}, [activeTab, ownedTokens, allAvailableTokens])

const baseTokenOptions = useMemo(
() =>
availableBaseTokens.map((token) => ({
Expand All@@ -103,19 +133,6 @@ export const BuySellFlow = ({
[availableBaseTokens]
)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Reset screen state to 'input' when this screen comes into focus
// This handles the case where we navigate back from ConfirmSwapScreen
useFocusEffect(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@ import {
useArtistCoin,
useArtistCoins
} from '@audius/common/api'
import { useOwnedTokens } from '@audius/common/hooks'
import type { TokenInfo, TokenPair } from '@audius/common/store'
import { useTokenSwapForm } from '@audius/common/store'

import { Box, Flex, Skeleton, Text } from '@audius/harmony-native'
import { Box, Flex, Skeleton } from '@audius/harmony-native'
import { InputTokenSection } from 'app/components/buy-sell/InputTokenSection'
import { OutputTokenSection } from 'app/components/buy-sell/OutputTokenSection'

Expand DownExpand Up@@ -107,10 +108,18 @@ export const SellScreen = ({
}

const { data: coins } = useArtistCoins()
const availableInputTokens: TokenInfo[] = useMemo(() => {
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(transformArtistCoinsToTokenInfoMap(coins ?? []))
}, [coins])

// Use the owned tokens hook to get filtered tokens
const { ownedTokens } = useOwnedTokens(allAvailableTokens)

// For sell screen:
// - "You Sell" section (input): Should show only tokens the user owns
// - "You Receive" section (output): Should show all available tokens (but only USDC in practice)
const availableInputTokens = ownedTokens

if (!tokenPair) return null

// Extract the tokens from the pair
Expand DownExpand Up@@ -151,10 +160,6 @@ export const SellScreen = ({
/>
</>
)}
<Flex row gap='xs'>
<Text color='subdued'>Rate</Text>
<Text>{`1 ${baseToken.symbol} ≈ ${Number(tokenPrice).toFixed(8)} ${quoteToken.symbol}`}</Text>
</Flex>
</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
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ export * from './useFormattedTokenBalance'
export * from './useCurrentTrack'
export * from './useDebounce'
export * from './useIsArtist'
export * from './useOwnedTokens'

export * from './useAnalytics'
export * from './useBuySellAnalytics'
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/hooks/useFormattedTokenBalance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useTokenBalance, useArtistCoins } from '../api'
import { Status } from '../models/Status'
import {
getTokenDecimalPlaces,
formatCurrency,
formatCurrencyWithSubscript,
isNullOrUndefined
} from '../utils'

Expand DownExpand Up@@ -65,7 +65,7 @@ export const useFormattedTokenBalance = (
if (!tokenPrice) return '$0.00'

const priceNumber = Number(new FixedDecimal(tokenPrice).toString())
return formatCurrency(priceNumber)
return formatCurrencyWithSubscript(priceNumber)
}, [tokenPrice])

return {
Expand Down
52 changes: 52 additions & 0 deletions packages/common/src/hooks/useOwnedTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import { useMemo } from 'react'

import {
useCurrentUserId,
useUserCoins,
useQueryContext,
UserCoin
} from '~/api'
import { useFeatureFlag } from '~/hooks'
import { FeatureFlags } from '~/services'
import type { TokenInfo } from '~/store'
import { ownedCoinsFilter } from '~/utils'

/**
* Hook to filter tokens based on user ownership and positive balance
* Respects the ARTIST_COINS feature flag - when disabled, only shows AUDIO tokens
*/
export const useOwnedTokens = (allTokens: TokenInfo[]) => {

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.

what's going on with allTokens? it is an arg but then gets returned with no changes?
can we just select allTokens from some other hook inside this hook?
and maybe don't need to return it?

const { data: currentUserId } = useCurrentUserId()
const { data: userCoins } = useUserCoins({ userId: currentUserId })
const { env } = useQueryContext()
const { isEnabled: isArtistCoinsEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const ownedTokens = useMemo(() => {
if (!userCoins || !allTokens.length) {
return []
}

const filteredUserCoins = userCoins.filter(
ownedCoinsFilter(!!isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS)
)

// Create a map of user's owned tokens by mint address
const userOwnedMints = new Set(
filteredUserCoins.map((coin: UserCoin) => coin.mint)
)

// Filter available tokens to only include ones the user owns
const ownedTokensList = allTokens.filter((token) =>
userOwnedMints.has(token.address)
)

return ownedTokensList
}, [userCoins, allTokens, isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS])

return {
ownedTokens,
isLoading: !userCoins
}
}
1 change: 0 additions & 1 deletion packages/common/src/store/ui/buy-sell/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export * from './useTokenSwapForm'
export * from './useAvailableTokens'
export * from './useCurrentTokenPair'
export * from './useTokenStates'
export * from './useGroupCoinPairs'
65 changes: 0 additions & 65 deletions packages/common/src/store/ui/buy-sell/useGroupCoinPairs.ts

This file was deleted.

24 changes: 24 additions & 0 deletions packages/common/src/utils/coinUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { UserCoin } from '~/api'
Comment thread
faridsalau marked this conversation as resolved.

/**
* Creates a predicate function for filtering user coins based on the ARTIST_COINS feature flag and balance requirements
*
* @param isArtistCoinsEnabled - Whether the ARTIST_COINS feature flag is enabled
* @param wAudioMintAddress - The WAUDIO mint address from environment
* @returns Predicate function that can be used with Array.filter()
*/
export const ownedCoinsFilter =
(isArtistCoinsEnabled: boolean, wAudioMintAddress: string) =>
(coin: UserCoin): boolean => {
if (!isArtistCoinsEnabled) {
// When artist coins disabled, only show AUDIO
return coin.mint === wAudioMintAddress
}

// When artist coins enabled, show all non-USDC tokens with balance > 0
// OR AUDIO regardless of balance
return (
coin.ticker !== 'USDC' &&
(coin.balance > 0 || coin.mint === wAudioMintAddress)
)
}
72 changes: 72 additions & 0 deletions packages/common/src/utils/decimal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,78 @@ export const formatCurrency = (
}
}

/**
* Formats a number with subscript notation for many leading zeros after decimal.
* For example: 0.000068352 → 0.0₄68352
*
* @param num - The number to format
* @param locale - Locale for number formatting (defaults to 'en-US')
* @returns Formatted string with subscript notation for leading zeros
*/
export const formatCurrencyWithSubscript = (
num: number,
locale: string = 'en-US'
): string => {
if (num === 0) return '$0.00'

try {
const decimalPlaces = getCurrencyDecimalPlaces(num)
const formatted = new Intl.NumberFormat(locale, {
Comment thread
faridsalau marked this conversation as resolved.
style: 'currency',
currency: 'USD',
minimumFractionDigits: Math.min(decimalPlaces, 2),
maximumFractionDigits: decimalPlaces
}).format(num)

// Extract the number part (remove currency symbol and commas)
const numberPart = formatted.replace(/[^0-9.-]/g, '').replace(/,/g, '')

// Check if there are leading zeros after decimal that should be subscripted
const parts = numberPart.split('.')
if (parts.length === 2 && parts[0] === '0') {
const decimalPart = parts[1]

// Find consecutive zeros after the decimal
const zeroMatch = decimalPart.match(/^0+/)
if (zeroMatch) {
const zeroCount = zeroMatch[0].length
const remainingDigits = decimalPart.substring(zeroCount)

// Only apply subscript if there are 3 or more leading zeros
if (zeroCount >= 3 && remainingDigits.length > 0) {
// Create subscript number (Unicode subscript digits)
const subscriptDigits = zeroCount
.toString()
.split('')
.map((digit) => {
const subscripts = [
Comment thread
faridsalau marked this conversation as resolved.
'₀',
'₁',
'₂',
'₃',
'₄',
'₅',
'₆',
'₇',
'₈',
'₉'
]
return subscripts[parseInt(digit)]
})
.join('')

// Format as $0.0[subscript][remaining digits]
return `$0.0${subscriptDigits}${remainingDigits}`
}
}
}

return formatted
} catch {
return `$${num.toFixed(2)}`
}
}

export const formatCurrencyWithMax = (
num: number,
max: number,
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './handle'
export * from './comments'
export * from './quickSearch'
export * from './coinMetrics'
export * from './coinUtils'
47 changes: 32 additions & 15 deletions packages/mobile/src/screens/buy-sell-screen/BuySellFlow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useMemo, useCallback } from 'react'

import { useTokenPair, useTokens } from '@audius/common/api'
import { useBuySellAnalytics } from '@audius/common/hooks'
import { useBuySellAnalytics, useOwnedTokens } from '@audius/common/hooks'
import { buySellMessages as messages } from '@audius/common/messages'
import type { BuySellTab, TokenInfo } from '@audius/common/store'
import {
Expand DownExpand Up@@ -76,12 +76,42 @@ export const BuySellFlow = ({
})

const { tokens } = useTokens()
const availableBaseTokens: TokenInfo[] = useMemo(() => {

// Get all available tokens and owned tokens
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(tokens).filter(
(token) => token.symbol !== selectedQuoteToken
)
}, [tokens, selectedQuoteToken])

const { ownedTokens } = useOwnedTokens(allAvailableTokens)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Determine which tokens to show based on current tab
// For buy tab: "You Receive" section should show all tokens
// For sell tab: "You Sell" section should show only owned tokens
const availableBaseTokens: TokenInfo[] = useMemo(() => {
if (activeTab === 'sell') {
// In sell tab, the input section should only show owned tokens
return ownedTokens
} else {
// In buy tab, the output section should show all tokens
return allAvailableTokens
}
}, [activeTab, ownedTokens, allAvailableTokens])

const baseTokenOptions = useMemo(
() =>
availableBaseTokens.map((token) => ({
Expand All@@ -103,19 +133,6 @@ export const BuySellFlow = ({
[availableBaseTokens]
)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Reset screen state to 'input' when this screen comes into focus
// This handles the case where we navigate back from ConfirmSwapScreen
useFocusEffect(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@ import {
useArtistCoin,
useArtistCoins
} from '@audius/common/api'
import { useOwnedTokens } from '@audius/common/hooks'
import type { TokenInfo, TokenPair } from '@audius/common/store'
import { useTokenSwapForm } from '@audius/common/store'

import { Box, Flex, Skeleton, Text } from '@audius/harmony-native'
import { Box, Flex, Skeleton } from '@audius/harmony-native'
import { InputTokenSection } from 'app/components/buy-sell/InputTokenSection'
import { OutputTokenSection } from 'app/components/buy-sell/OutputTokenSection'

Expand DownExpand Up@@ -107,10 +108,18 @@ export const SellScreen = ({
}

const { data: coins } = useArtistCoins()
const availableInputTokens: TokenInfo[] = useMemo(() => {
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(transformArtistCoinsToTokenInfoMap(coins ?? []))
}, [coins])

// Use the owned tokens hook to get filtered tokens
const { ownedTokens } = useOwnedTokens(allAvailableTokens)

// For sell screen:
// - "You Sell" section (input): Should show only tokens the user owns
// - "You Receive" section (output): Should show all available tokens (but only USDC in practice)
const availableInputTokens = ownedTokens

if (!tokenPair) return null

// Extract the tokens from the pair
Expand DownExpand Up@@ -151,10 +160,6 @@ export const SellScreen = ({
/>
</>
)}
<Flex row gap='xs'>
<Text color='subdued'>Rate</Text>
<Text>{`1 ${baseToken.symbol} ≈ ${Number(tokenPrice).toFixed(8)} ${quoteToken.symbol}`}</Text>
</Flex>
</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
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ export * from './useFormattedTokenBalance'
export * from './useCurrentTrack'
export * from './useDebounce'
export * from './useIsArtist'
export * from './useOwnedTokens'

export * from './useAnalytics'
export * from './useBuySellAnalytics'
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/hooks/useFormattedTokenBalance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useTokenBalance, useArtistCoins } from '../api'
import { Status } from '../models/Status'
import {
getTokenDecimalPlaces,
formatCurrency,
formatCurrencyWithSubscript,
isNullOrUndefined
} from '../utils'

Expand DownExpand Up@@ -65,7 +65,7 @@ export const useFormattedTokenBalance = (
if (!tokenPrice) return '$0.00'

const priceNumber = Number(new FixedDecimal(tokenPrice).toString())
return formatCurrency(priceNumber)
return formatCurrencyWithSubscript(priceNumber)
}, [tokenPrice])

return {
Expand Down
52 changes: 52 additions & 0 deletions packages/common/src/hooks/useOwnedTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import { useMemo } from 'react'

import {
useCurrentUserId,
useUserCoins,
useQueryContext,
UserCoin
} from '~/api'
import { useFeatureFlag } from '~/hooks'
import { FeatureFlags } from '~/services'
import type { TokenInfo } from '~/store'
import { ownedCoinsFilter } from '~/utils'

/**
* Hook to filter tokens based on user ownership and positive balance
* Respects the ARTIST_COINS feature flag - when disabled, only shows AUDIO tokens
*/
export const useOwnedTokens = (allTokens: TokenInfo[]) => {

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.

what's going on with allTokens? it is an arg but then gets returned with no changes?
can we just select allTokens from some other hook inside this hook?
and maybe don't need to return it?

const { data: currentUserId } = useCurrentUserId()
const { data: userCoins } = useUserCoins({ userId: currentUserId })
const { env } = useQueryContext()
const { isEnabled: isArtistCoinsEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const ownedTokens = useMemo(() => {
if (!userCoins || !allTokens.length) {
return []
}

const filteredUserCoins = userCoins.filter(
ownedCoinsFilter(!!isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS)
)

// Create a map of user's owned tokens by mint address
const userOwnedMints = new Set(
filteredUserCoins.map((coin: UserCoin) => coin.mint)
)

// Filter available tokens to only include ones the user owns
const ownedTokensList = allTokens.filter((token) =>
userOwnedMints.has(token.address)
)

return ownedTokensList
}, [userCoins, allTokens, isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS])

return {
ownedTokens,
isLoading: !userCoins
}
}
1 change: 0 additions & 1 deletion packages/common/src/store/ui/buy-sell/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export * from './useTokenSwapForm'
export * from './useAvailableTokens'
export * from './useCurrentTokenPair'
export * from './useTokenStates'
export * from './useGroupCoinPairs'
65 changes: 0 additions & 65 deletions packages/common/src/store/ui/buy-sell/useGroupCoinPairs.ts

This file was deleted.

24 changes: 24 additions & 0 deletions packages/common/src/utils/coinUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { UserCoin } from '~/api'
Comment thread
faridsalau marked this conversation as resolved.

/**
* Creates a predicate function for filtering user coins based on the ARTIST_COINS feature flag and balance requirements
*
* @param isArtistCoinsEnabled - Whether the ARTIST_COINS feature flag is enabled
* @param wAudioMintAddress - The WAUDIO mint address from environment
* @returns Predicate function that can be used with Array.filter()
*/
export const ownedCoinsFilter =
(isArtistCoinsEnabled: boolean, wAudioMintAddress: string) =>
(coin: UserCoin): boolean => {
if (!isArtistCoinsEnabled) {
// When artist coins disabled, only show AUDIO
return coin.mint === wAudioMintAddress
}

// When artist coins enabled, show all non-USDC tokens with balance > 0
// OR AUDIO regardless of balance
return (
coin.ticker !== 'USDC' &&
(coin.balance > 0 || coin.mint === wAudioMintAddress)
)
}
72 changes: 72 additions & 0 deletions packages/common/src/utils/decimal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,78 @@ export const formatCurrency = (
}
}

/**
* Formats a number with subscript notation for many leading zeros after decimal.
* For example: 0.000068352 → 0.0₄68352
*
* @param num - The number to format
* @param locale - Locale for number formatting (defaults to 'en-US')
* @returns Formatted string with subscript notation for leading zeros
*/
export const formatCurrencyWithSubscript = (
num: number,
locale: string = 'en-US'
): string => {
if (num === 0) return '$0.00'

try {
const decimalPlaces = getCurrencyDecimalPlaces(num)
const formatted = new Intl.NumberFormat(locale, {
Comment thread
faridsalau marked this conversation as resolved.
style: 'currency',
currency: 'USD',
minimumFractionDigits: Math.min(decimalPlaces, 2),
maximumFractionDigits: decimalPlaces
}).format(num)

// Extract the number part (remove currency symbol and commas)
const numberPart = formatted.replace(/[^0-9.-]/g, '').replace(/,/g, '')

// Check if there are leading zeros after decimal that should be subscripted
const parts = numberPart.split('.')
if (parts.length === 2 && parts[0] === '0') {
const decimalPart = parts[1]

// Find consecutive zeros after the decimal
const zeroMatch = decimalPart.match(/^0+/)
if (zeroMatch) {
const zeroCount = zeroMatch[0].length
const remainingDigits = decimalPart.substring(zeroCount)

// Only apply subscript if there are 3 or more leading zeros
if (zeroCount >= 3 && remainingDigits.length > 0) {
// Create subscript number (Unicode subscript digits)
const subscriptDigits = zeroCount
.toString()
.split('')
.map((digit) => {
const subscripts = [
Comment thread
faridsalau marked this conversation as resolved.
'₀',
'₁',
'₂',
'₃',
'₄',
'₅',
'₆',
'₇',
'₈',
'₉'
]
return subscripts[parseInt(digit)]
})
.join('')

// Format as $0.0[subscript][remaining digits]
return `$0.0${subscriptDigits}${remainingDigits}`
}
}
}

return formatted
} catch {
return `$${num.toFixed(2)}`
}
}

export const formatCurrencyWithMax = (
num: number,
max: number,
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './handle'
export * from './comments'
export * from './quickSearch'
export * from './coinMetrics'
export * from './coinUtils'
47 changes: 32 additions & 15 deletions packages/mobile/src/screens/buy-sell-screen/BuySellFlow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useMemo, useCallback } from 'react'

import { useTokenPair, useTokens } from '@audius/common/api'
import { useBuySellAnalytics } from '@audius/common/hooks'
import { useBuySellAnalytics, useOwnedTokens } from '@audius/common/hooks'
import { buySellMessages as messages } from '@audius/common/messages'
import type { BuySellTab, TokenInfo } from '@audius/common/store'
import {
Expand DownExpand Up@@ -76,12 +76,42 @@ export const BuySellFlow = ({
})

const { tokens } = useTokens()
const availableBaseTokens: TokenInfo[] = useMemo(() => {

// Get all available tokens and owned tokens
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(tokens).filter(
(token) => token.symbol !== selectedQuoteToken
)
}, [tokens, selectedQuoteToken])

const { ownedTokens } = useOwnedTokens(allAvailableTokens)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Determine which tokens to show based on current tab
// For buy tab: "You Receive" section should show all tokens
// For sell tab: "You Sell" section should show only owned tokens
const availableBaseTokens: TokenInfo[] = useMemo(() => {
if (activeTab === 'sell') {
// In sell tab, the input section should only show owned tokens
return ownedTokens
} else {
// In buy tab, the output section should show all tokens
return allAvailableTokens
}
}, [activeTab, ownedTokens, allAvailableTokens])

const baseTokenOptions = useMemo(
() =>
availableBaseTokens.map((token) => ({
Expand All@@ -103,19 +133,6 @@ export const BuySellFlow = ({
[availableBaseTokens]
)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Reset screen state to 'input' when this screen comes into focus
// This handles the case where we navigate back from ConfirmSwapScreen
useFocusEffect(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@ import {
useArtistCoin,
useArtistCoins
} from '@audius/common/api'
import { useOwnedTokens } from '@audius/common/hooks'
import type { TokenInfo, TokenPair } from '@audius/common/store'
import { useTokenSwapForm } from '@audius/common/store'

import { Box, Flex, Skeleton, Text } from '@audius/harmony-native'
import { Box, Flex, Skeleton } from '@audius/harmony-native'
import { InputTokenSection } from 'app/components/buy-sell/InputTokenSection'
import { OutputTokenSection } from 'app/components/buy-sell/OutputTokenSection'

Expand DownExpand Up@@ -107,10 +108,18 @@ export const SellScreen = ({
}

const { data: coins } = useArtistCoins()
const availableInputTokens: TokenInfo[] = useMemo(() => {
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(transformArtistCoinsToTokenInfoMap(coins ?? []))
}, [coins])

// Use the owned tokens hook to get filtered tokens
const { ownedTokens } = useOwnedTokens(allAvailableTokens)

// For sell screen:
// - "You Sell" section (input): Should show only tokens the user owns
// - "You Receive" section (output): Should show all available tokens (but only USDC in practice)
const availableInputTokens = ownedTokens

if (!tokenPair) return null

// Extract the tokens from the pair
Expand DownExpand Up@@ -151,10 +160,6 @@ export const SellScreen = ({
/>
</>
)}
<Flex row gap='xs'>
<Text color='subdued'>Rate</Text>
<Text>{`1 ${baseToken.symbol} ≈ ${Number(tokenPrice).toFixed(8)} ${quoteToken.symbol}`}</Text>
</Flex>
</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
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ export * from './useFormattedTokenBalance'
export * from './useCurrentTrack'
export * from './useDebounce'
export * from './useIsArtist'
export * from './useOwnedTokens'

export * from './useAnalytics'
export * from './useBuySellAnalytics'
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/hooks/useFormattedTokenBalance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useTokenBalance, useArtistCoins } from '../api'
import { Status } from '../models/Status'
import {
getTokenDecimalPlaces,
formatCurrency,
formatCurrencyWithSubscript,
isNullOrUndefined
} from '../utils'

Expand DownExpand Up@@ -65,7 +65,7 @@ export const useFormattedTokenBalance = (
if (!tokenPrice) return '$0.00'

const priceNumber = Number(new FixedDecimal(tokenPrice).toString())
return formatCurrency(priceNumber)
return formatCurrencyWithSubscript(priceNumber)
}, [tokenPrice])

return {
Expand Down
52 changes: 52 additions & 0 deletions packages/common/src/hooks/useOwnedTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import { useMemo } from 'react'

import {
useCurrentUserId,
useUserCoins,
useQueryContext,
UserCoin
} from '~/api'
import { useFeatureFlag } from '~/hooks'
import { FeatureFlags } from '~/services'
import type { TokenInfo } from '~/store'
import { ownedCoinsFilter } from '~/utils'

/**
* Hook to filter tokens based on user ownership and positive balance
* Respects the ARTIST_COINS feature flag - when disabled, only shows AUDIO tokens
*/
export const useOwnedTokens = (allTokens: TokenInfo[]) => {

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.

what's going on with allTokens? it is an arg but then gets returned with no changes?
can we just select allTokens from some other hook inside this hook?
and maybe don't need to return it?

const { data: currentUserId } = useCurrentUserId()
const { data: userCoins } = useUserCoins({ userId: currentUserId })
const { env } = useQueryContext()
const { isEnabled: isArtistCoinsEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const ownedTokens = useMemo(() => {
if (!userCoins || !allTokens.length) {
return []
}

const filteredUserCoins = userCoins.filter(
ownedCoinsFilter(!!isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS)
)

// Create a map of user's owned tokens by mint address
const userOwnedMints = new Set(
filteredUserCoins.map((coin: UserCoin) => coin.mint)
)

// Filter available tokens to only include ones the user owns
const ownedTokensList = allTokens.filter((token) =>
userOwnedMints.has(token.address)
)

return ownedTokensList
}, [userCoins, allTokens, isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS])

return {
ownedTokens,
isLoading: !userCoins
}
}
1 change: 0 additions & 1 deletion packages/common/src/store/ui/buy-sell/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export * from './useTokenSwapForm'
export * from './useAvailableTokens'
export * from './useCurrentTokenPair'
export * from './useTokenStates'
export * from './useGroupCoinPairs'
65 changes: 0 additions & 65 deletions packages/common/src/store/ui/buy-sell/useGroupCoinPairs.ts

This file was deleted.

24 changes: 24 additions & 0 deletions packages/common/src/utils/coinUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { UserCoin } from '~/api'
Comment thread
faridsalau marked this conversation as resolved.

/**
* Creates a predicate function for filtering user coins based on the ARTIST_COINS feature flag and balance requirements
*
* @param isArtistCoinsEnabled - Whether the ARTIST_COINS feature flag is enabled
* @param wAudioMintAddress - The WAUDIO mint address from environment
* @returns Predicate function that can be used with Array.filter()
*/
export const ownedCoinsFilter =
(isArtistCoinsEnabled: boolean, wAudioMintAddress: string) =>
(coin: UserCoin): boolean => {
if (!isArtistCoinsEnabled) {
// When artist coins disabled, only show AUDIO
return coin.mint === wAudioMintAddress
}

// When artist coins enabled, show all non-USDC tokens with balance > 0
// OR AUDIO regardless of balance
return (
coin.ticker !== 'USDC' &&
(coin.balance > 0 || coin.mint === wAudioMintAddress)
)
}
72 changes: 72 additions & 0 deletions packages/common/src/utils/decimal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,78 @@ export const formatCurrency = (
}
}

/**
* Formats a number with subscript notation for many leading zeros after decimal.
* For example: 0.000068352 → 0.0₄68352
*
* @param num - The number to format
* @param locale - Locale for number formatting (defaults to 'en-US')
* @returns Formatted string with subscript notation for leading zeros
*/
export const formatCurrencyWithSubscript = (
num: number,
locale: string = 'en-US'
): string => {
if (num === 0) return '$0.00'

try {
const decimalPlaces = getCurrencyDecimalPlaces(num)
const formatted = new Intl.NumberFormat(locale, {
Comment thread
faridsalau marked this conversation as resolved.
style: 'currency',
currency: 'USD',
minimumFractionDigits: Math.min(decimalPlaces, 2),
maximumFractionDigits: decimalPlaces
}).format(num)

// Extract the number part (remove currency symbol and commas)
const numberPart = formatted.replace(/[^0-9.-]/g, '').replace(/,/g, '')

// Check if there are leading zeros after decimal that should be subscripted
const parts = numberPart.split('.')
if (parts.length === 2 && parts[0] === '0') {
const decimalPart = parts[1]

// Find consecutive zeros after the decimal
const zeroMatch = decimalPart.match(/^0+/)
if (zeroMatch) {
const zeroCount = zeroMatch[0].length
const remainingDigits = decimalPart.substring(zeroCount)

// Only apply subscript if there are 3 or more leading zeros
if (zeroCount >= 3 && remainingDigits.length > 0) {
// Create subscript number (Unicode subscript digits)
const subscriptDigits = zeroCount
.toString()
.split('')
.map((digit) => {
const subscripts = [
Comment thread
faridsalau marked this conversation as resolved.
'₀',
'₁',
'₂',
'₃',
'₄',
'₅',
'₆',
'₇',
'₈',
'₉'
]
return subscripts[parseInt(digit)]
})
.join('')

// Format as $0.0[subscript][remaining digits]
return `$0.0${subscriptDigits}${remainingDigits}`
}
}
}

return formatted
} catch {
return `$${num.toFixed(2)}`
}
}

export const formatCurrencyWithMax = (
num: number,
max: number,
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './handle'
export * from './comments'
export * from './quickSearch'
export * from './coinMetrics'
export * from './coinUtils'
47 changes: 32 additions & 15 deletions packages/mobile/src/screens/buy-sell-screen/BuySellFlow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useMemo, useCallback } from 'react'

import { useTokenPair, useTokens } from '@audius/common/api'
import { useBuySellAnalytics } from '@audius/common/hooks'
import { useBuySellAnalytics, useOwnedTokens } from '@audius/common/hooks'
import { buySellMessages as messages } from '@audius/common/messages'
import type { BuySellTab, TokenInfo } from '@audius/common/store'
import {
Expand DownExpand Up@@ -76,12 +76,42 @@ export const BuySellFlow = ({
})

const { tokens } = useTokens()
const availableBaseTokens: TokenInfo[] = useMemo(() => {

// Get all available tokens and owned tokens
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(tokens).filter(
(token) => token.symbol !== selectedQuoteToken
)
}, [tokens, selectedQuoteToken])

const { ownedTokens } = useOwnedTokens(allAvailableTokens)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Determine which tokens to show based on current tab
// For buy tab: "You Receive" section should show all tokens
// For sell tab: "You Sell" section should show only owned tokens
const availableBaseTokens: TokenInfo[] = useMemo(() => {
if (activeTab === 'sell') {
// In sell tab, the input section should only show owned tokens
return ownedTokens
} else {
// In buy tab, the output section should show all tokens
return allAvailableTokens
}
}, [activeTab, ownedTokens, allAvailableTokens])

const baseTokenOptions = useMemo(
() =>
availableBaseTokens.map((token) => ({
Expand All@@ -103,19 +133,6 @@ export const BuySellFlow = ({
[availableBaseTokens]
)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Reset screen state to 'input' when this screen comes into focus
// This handles the case where we navigate back from ConfirmSwapScreen
useFocusEffect(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@ import {
useArtistCoin,
useArtistCoins
} from '@audius/common/api'
import { useOwnedTokens } from '@audius/common/hooks'
import type { TokenInfo, TokenPair } from '@audius/common/store'
import { useTokenSwapForm } from '@audius/common/store'

import { Box, Flex, Skeleton, Text } from '@audius/harmony-native'
import { Box, Flex, Skeleton } from '@audius/harmony-native'
import { InputTokenSection } from 'app/components/buy-sell/InputTokenSection'
import { OutputTokenSection } from 'app/components/buy-sell/OutputTokenSection'

Expand DownExpand Up@@ -107,10 +108,18 @@ export const SellScreen = ({
}

const { data: coins } = useArtistCoins()
const availableInputTokens: TokenInfo[] = useMemo(() => {
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(transformArtistCoinsToTokenInfoMap(coins ?? []))
}, [coins])

// Use the owned tokens hook to get filtered tokens
const { ownedTokens } = useOwnedTokens(allAvailableTokens)

// For sell screen:
// - "You Sell" section (input): Should show only tokens the user owns
// - "You Receive" section (output): Should show all available tokens (but only USDC in practice)
const availableInputTokens = ownedTokens

if (!tokenPair) return null

// Extract the tokens from the pair
Expand DownExpand Up@@ -151,10 +160,6 @@ export const SellScreen = ({
/>
</>
)}
<Flex row gap='xs'>
<Text color='subdued'>Rate</Text>
<Text>{`1 ${baseToken.symbol} ≈ ${Number(tokenPrice).toFixed(8)} ${quoteToken.symbol}`}</Text>
</Flex>
</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
1 change: 1 addition & 0 deletions packages/common/src/hooks/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ export * from './useFormattedTokenBalance'
export * from './useCurrentTrack'
export * from './useDebounce'
export * from './useIsArtist'
export * from './useOwnedTokens'

export * from './useAnalytics'
export * from './useBuySellAnalytics'
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/hooks/useFormattedTokenBalance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useTokenBalance, useArtistCoins } from '../api'
import { Status } from '../models/Status'
import {
getTokenDecimalPlaces,
formatCurrency,
formatCurrencyWithSubscript,
isNullOrUndefined
} from '../utils'

Expand DownExpand Up@@ -65,7 +65,7 @@ export const useFormattedTokenBalance = (
if (!tokenPrice) return '$0.00'

const priceNumber = Number(new FixedDecimal(tokenPrice).toString())
return formatCurrency(priceNumber)
return formatCurrencyWithSubscript(priceNumber)
}, [tokenPrice])

return {
Expand Down
52 changes: 52 additions & 0 deletions packages/common/src/hooks/useOwnedTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import { useMemo } from 'react'

import {
useCurrentUserId,
useUserCoins,
useQueryContext,
UserCoin
} from '~/api'
import { useFeatureFlag } from '~/hooks'
import { FeatureFlags } from '~/services'
import type { TokenInfo } from '~/store'
import { ownedCoinsFilter } from '~/utils'

/**
* Hook to filter tokens based on user ownership and positive balance
* Respects the ARTIST_COINS feature flag - when disabled, only shows AUDIO tokens
*/
export const useOwnedTokens = (allTokens: TokenInfo[]) => {

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.

what's going on with allTokens? it is an arg but then gets returned with no changes?
can we just select allTokens from some other hook inside this hook?
and maybe don't need to return it?

const { data: currentUserId } = useCurrentUserId()
const { data: userCoins } = useUserCoins({ userId: currentUserId })
const { env } = useQueryContext()
const { isEnabled: isArtistCoinsEnabled } = useFeatureFlag(
FeatureFlags.ARTIST_COINS
)

const ownedTokens = useMemo(() => {
if (!userCoins || !allTokens.length) {
return []
}

const filteredUserCoins = userCoins.filter(
ownedCoinsFilter(!!isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS)
)

// Create a map of user's owned tokens by mint address
const userOwnedMints = new Set(
filteredUserCoins.map((coin: UserCoin) => coin.mint)
)

// Filter available tokens to only include ones the user owns
const ownedTokensList = allTokens.filter((token) =>
userOwnedMints.has(token.address)
)

return ownedTokensList
}, [userCoins, allTokens, isArtistCoinsEnabled, env.WAUDIO_MINT_ADDRESS])

return {
ownedTokens,
isLoading: !userCoins
}
}
1 change: 0 additions & 1 deletion packages/common/src/store/ui/buy-sell/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export * from './useTokenSwapForm'
export * from './useAvailableTokens'
export * from './useCurrentTokenPair'
export * from './useTokenStates'
export * from './useGroupCoinPairs'
65 changes: 0 additions & 65 deletions packages/common/src/store/ui/buy-sell/useGroupCoinPairs.ts

This file was deleted.

24 changes: 24 additions & 0 deletions packages/common/src/utils/coinUtils.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { UserCoin } from '~/api'
Comment thread
faridsalau marked this conversation as resolved.

/**
* Creates a predicate function for filtering user coins based on the ARTIST_COINS feature flag and balance requirements
*
* @param isArtistCoinsEnabled - Whether the ARTIST_COINS feature flag is enabled
* @param wAudioMintAddress - The WAUDIO mint address from environment
* @returns Predicate function that can be used with Array.filter()
*/
export const ownedCoinsFilter =
(isArtistCoinsEnabled: boolean, wAudioMintAddress: string) =>
(coin: UserCoin): boolean => {
if (!isArtistCoinsEnabled) {
// When artist coins disabled, only show AUDIO
return coin.mint === wAudioMintAddress
}

// When artist coins enabled, show all non-USDC tokens with balance > 0
// OR AUDIO regardless of balance
return (
coin.ticker !== 'USDC' &&
(coin.balance > 0 || coin.mint === wAudioMintAddress)
)
}
72 changes: 72 additions & 0 deletions packages/common/src/utils/decimal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,78 @@ export const formatCurrency = (
}
}

/**
* Formats a number with subscript notation for many leading zeros after decimal.
* For example: 0.000068352 → 0.0₄68352
*
* @param num - The number to format
* @param locale - Locale for number formatting (defaults to 'en-US')
* @returns Formatted string with subscript notation for leading zeros
*/
export const formatCurrencyWithSubscript = (
num: number,
locale: string = 'en-US'
): string => {
if (num === 0) return '$0.00'

try {
const decimalPlaces = getCurrencyDecimalPlaces(num)
const formatted = new Intl.NumberFormat(locale, {
Comment thread
faridsalau marked this conversation as resolved.
style: 'currency',
currency: 'USD',
minimumFractionDigits: Math.min(decimalPlaces, 2),
maximumFractionDigits: decimalPlaces
}).format(num)

// Extract the number part (remove currency symbol and commas)
const numberPart = formatted.replace(/[^0-9.-]/g, '').replace(/,/g, '')

// Check if there are leading zeros after decimal that should be subscripted
const parts = numberPart.split('.')
if (parts.length === 2 && parts[0] === '0') {
const decimalPart = parts[1]

// Find consecutive zeros after the decimal
const zeroMatch = decimalPart.match(/^0+/)
if (zeroMatch) {
const zeroCount = zeroMatch[0].length
const remainingDigits = decimalPart.substring(zeroCount)

// Only apply subscript if there are 3 or more leading zeros
if (zeroCount >= 3 && remainingDigits.length > 0) {
// Create subscript number (Unicode subscript digits)
const subscriptDigits = zeroCount
.toString()
.split('')
.map((digit) => {
const subscripts = [
Comment thread
faridsalau marked this conversation as resolved.
'₀',
'₁',
'₂',
'₃',
'₄',
'₅',
'₆',
'₇',
'₈',
'₉'
]
return subscripts[parseInt(digit)]
})
.join('')

// Format as $0.0[subscript][remaining digits]
return `$0.0${subscriptDigits}${remainingDigits}`
}
}
}

return formatted
} catch {
return `$${num.toFixed(2)}`
}
}

export const formatCurrencyWithMax = (
num: number,
max: number,
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,3 +49,4 @@ export * from './handle'
export * from './comments'
export * from './quickSearch'
export * from './coinMetrics'
export * from './coinUtils'
47 changes: 32 additions & 15 deletions packages/mobile/src/screens/buy-sell-screen/BuySellFlow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useMemo, useCallback } from 'react'

import { useTokenPair, useTokens } from '@audius/common/api'
import { useBuySellAnalytics } from '@audius/common/hooks'
import { useBuySellAnalytics, useOwnedTokens } from '@audius/common/hooks'
import { buySellMessages as messages } from '@audius/common/messages'
import type { BuySellTab, TokenInfo } from '@audius/common/store'
import {
Expand DownExpand Up@@ -76,12 +76,42 @@ export const BuySellFlow = ({
})

const { tokens } = useTokens()
const availableBaseTokens: TokenInfo[] = useMemo(() => {

// Get all available tokens and owned tokens
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(tokens).filter(
(token) => token.symbol !== selectedQuoteToken
)
}, [tokens, selectedQuoteToken])

const { ownedTokens } = useOwnedTokens(allAvailableTokens)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Determine which tokens to show based on current tab
// For buy tab: "You Receive" section should show all tokens
// For sell tab: "You Sell" section should show only owned tokens
const availableBaseTokens: TokenInfo[] = useMemo(() => {
if (activeTab === 'sell') {
// In sell tab, the input section should only show owned tokens
return ownedTokens
} else {
// In buy tab, the output section should show all tokens
return allAvailableTokens
}
}, [activeTab, ownedTokens, allAvailableTokens])

const baseTokenOptions = useMemo(
() =>
availableBaseTokens.map((token) => ({
Expand All@@ -103,19 +133,6 @@ export const BuySellFlow = ({
[availableBaseTokens]
)

const {
transactionData,
hasSufficientBalance,
handleTransactionDataChange,
resetTransactionData
} = useBuySellTransactionData()

const { activeTab, handleActiveTabChange } = useBuySellTabs({
setCurrentScreen,
resetTransactionData,
initialTab
})

// Reset screen state to 'input' when this screen comes into focus
// This handles the case where we navigate back from ConfirmSwapScreen
useFocusEffect(
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,11 @@ import {
useArtistCoin,
useArtistCoins
} from '@audius/common/api'
import { useOwnedTokens } from '@audius/common/hooks'
import type { TokenInfo, TokenPair } from '@audius/common/store'
import { useTokenSwapForm } from '@audius/common/store'

import { Box, Flex, Skeleton, Text } from '@audius/harmony-native'
import { Box, Flex, Skeleton } from '@audius/harmony-native'
import { InputTokenSection } from 'app/components/buy-sell/InputTokenSection'
import { OutputTokenSection } from 'app/components/buy-sell/OutputTokenSection'

Expand DownExpand Up@@ -107,10 +108,18 @@ export const SellScreen = ({
}

const { data: coins } = useArtistCoins()
const availableInputTokens: TokenInfo[] = useMemo(() => {
const allAvailableTokens: TokenInfo[] = useMemo(() => {
return Object.values(transformArtistCoinsToTokenInfoMap(coins ?? []))
}, [coins])

// Use the owned tokens hook to get filtered tokens
const { ownedTokens } = useOwnedTokens(allAvailableTokens)

// For sell screen:
// - "You Sell" section (input): Should show only tokens the user owns
// - "You Receive" section (output): Should show all available tokens (but only USDC in practice)
const availableInputTokens = ownedTokens

if (!tokenPair) return null

// Extract the tokens from the pair
Expand DownExpand Up@@ -151,10 +160,6 @@ export const SellScreen = ({
/>
</>
)}
<Flex row gap='xs'>
<Text color='subdued'>Rate</Text>
<Text>{`1 ${baseToken.symbol} ≈ ${Number(tokenPrice).toFixed(8)} ${quoteToken.symbol}`}</Text>
</Flex>
</Flex>
)
}
Loading