Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,20 @@
import { Chain } from '@audius/common/models'
import type { AssociatedWallet } from '@audius/common/store'
import {
tokenDashboardPageSelectors,
walletSelectors
} from '@audius/common/store'
import type { AudioWei } from '@audius/fixed-decimal'
import { AUDIO } from '@audius/fixed-decimal'
import { View } from 'react-native'
import { useSelector } from 'react-redux'
useAudioBalance,
useConnectedWallets,
useWalletAudioBalances
} from '@audius/common/api'
import { Chain } from '@audius/common/models'
import { formatNumberCommas } from '@audius/common/utils'
import { AUDIO, type AudioWei } from '@audius/fixed-decimal'

import { Divider, Flex, spacing, Text } from '@audius/harmony-native'
import { GradientText } from 'app/components/core'
import { AppDrawer } from 'app/components/drawer'
import Text from 'app/components/text'
import { makeStyles } from 'app/styles'

import { Wallet } from './Wallet'
const { getAccountBalance } = walletSelectors
const { getAssociatedWallets } = tokenDashboardPageSelectors

const AUDIO_BREAKDOWN_MODAL_NAME = 'AudioBreakdown'

const useStyles = makeStyles(({ palette, spacing, typography }) => ({
drawer: {
flexDirection: 'column',
alignItems: 'center',
padding: spacing(6),
paddingTop: spacing(3),
height: '100%'
},
amount: {
fontSize: 48
},
total: {
marginTop: spacing(2),
marginBottom: spacing(6),
fontSize: typography.fontSize.large,
color: palette.neutralLight4
},
section: {
width: '100%',
marginBottom: spacing(6),
padding: spacing(6),
borderRadius: spacing(4),
borderWidth: 2,
borderColor: palette.neutralLight7,
backgroundColor: palette.neutralLight10
},
sectionTitle: {
flexDirection: 'row',
justifyContent: 'center'
},
titleLabel: {
fontSize: typography.fontSize.large,
color: palette.neutral
},
titleAmount: {
marginLeft: spacing(3),
fontSize: typography.fontSize.large
},
sectionDescription: {
marginTop: spacing(3)
},
description: {
textAlign: 'center',
textTransform: 'uppercase',
color: palette.neutralLight4,
fontSize: spacing(3)
},
walletsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingTop: spacing(6),
paddingHorizontal: spacing(6),
paddingBottom: 14,
fontSize: spacing(4)
},
headerLabel: {
color: palette.neutralLight4
},
walletsBody: {
paddingLeft: spacing(6),
paddingRight: spacing(6),
borderTopWidth: 1,
borderTopColor: palette.neutralLight8
}
}))

const messages = {
modalTitle: '$AUDIO BREAKDOWN',
total: 'TOTAL $AUDIO',
Expand All@@ -100,105 +29,135 @@ const messages = {
}

export const AudioBreakdownDrawer = () => {
const styles = useStyles()
const { accountBalance, connectedWalletsBalance, totalBalance } =
useAudioBalance()

const accountBalance =
useSelector(getAccountBalance, (a, b) => Boolean(a && b && a === b)) ??
(BigInt(0) as AudioWei)
const { data: connectedWallets = [] } = useConnectedWallets()
const connectedWalletsBalances = useWalletAudioBalances({

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.

Isn't there a use balances hook where you can pass an include associated flag?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah but it doesn't include the individual wallet balances which we also need for this view.
the flag only specifies whether to include the associated wallet balances in the total balance that's returned

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.

wait not sure i understand, why can't we just edit the useAudioBalance hook for this? this works tho

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

we could but didn't wanna do that now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@DejayJD for vis

wallets: connectedWallets
})

const associatedWallets = useSelector(getAssociatedWallets)
const { connectedEthWallets: ethWallets, connectedSolWallets: solWallets } =
associatedWallets ?? {
ethWallets: null,
solWallets: null
}

const linkedWalletsBalance = (ethWallets ?? [])
.concat(solWallets ?? [])
.reduce((total, wallet) => {
return total + BigInt(wallet.balance as unknown as string)
}, BigInt(0)) as AudioWei
const ethWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Eth
)
const solWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Sol
)

const totalBalance = (accountBalance + linkedWalletsBalance) as AudioWei
const getWalletBalance = (address: string, chain: Chain): AudioWei => {
const balanceResult = connectedWalletsBalances.find(
(_, index) =>
connectedWallets[index]?.address === address &&
connectedWallets[index]?.chain === chain
)
return balanceResult?.data
}

return (
<AppDrawer
modalName={AUDIO_BREAKDOWN_MODAL_NAME}
title={messages.modalTitle}
isFullscreen
>
<View style={styles.drawer}>
<GradientText style={styles.amount}>
{AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
</GradientText>

<Text style={styles.total} weight='bold'>
{messages.total}
</Text>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
<Flex alignItems='center' p='xl' pt='l' gap='xl'>
<Flex gap='s'>
<GradientText style={{ fontSize: spacing.unit12 }}>
{formatNumberCommas(
AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>

<Text variant='title' size='l' color='subdued'>
{messages.total}
</Text>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.audiusWallet}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
<Flex mt='l'>
<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.audiusWalletDescription}
</Text>
</View>
</View>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
</Flex>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
gap='l'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.linkedWallets}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(linkedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(connectedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.walletsHeader}>
<Text style={styles.headerLabel} weight='bold'>
<Flex row justifyContent='space-between'>
<Text variant='label' color='subdued'>
{messages.linkedWallets}
</Text>
<Text style={styles.headerLabel} weight='bold'>
<Text variant='label' color='subdued'>
{messages.audio}
</Text>
</View>

<View style={styles.walletsBody}>
{ethWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Eth} key={wallet.address} {...wallet} />
))}
{solWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Sol} key={wallet.address} {...wallet} />
))}
</View>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
{messages.linkedWalletsDescription}
</Text>
</View>
</View>
</View>
</Flex>

<Divider orientation='horizontal' />

{ethWallets.map((wallet) => (
<Wallet
chain={Chain.Eth}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Eth)}
/>
))}
{solWallets.map((wallet) => (
<Wallet
chain={Chain.Sol}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Sol)}
/>
))}

<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.linkedWalletsDescription}
</Text>
</Flex>
</Flex>
</AppDrawer>
)
}
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
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,20 @@
import { Chain } from '@audius/common/models'
import type { AssociatedWallet } from '@audius/common/store'
import {
tokenDashboardPageSelectors,
walletSelectors
} from '@audius/common/store'
import type { AudioWei } from '@audius/fixed-decimal'
import { AUDIO } from '@audius/fixed-decimal'
import { View } from 'react-native'
import { useSelector } from 'react-redux'
useAudioBalance,
useConnectedWallets,
useWalletAudioBalances
} from '@audius/common/api'
import { Chain } from '@audius/common/models'
import { formatNumberCommas } from '@audius/common/utils'
import { AUDIO, type AudioWei } from '@audius/fixed-decimal'

import { Divider, Flex, spacing, Text } from '@audius/harmony-native'
import { GradientText } from 'app/components/core'
import { AppDrawer } from 'app/components/drawer'
import Text from 'app/components/text'
import { makeStyles } from 'app/styles'

import { Wallet } from './Wallet'
const { getAccountBalance } = walletSelectors
const { getAssociatedWallets } = tokenDashboardPageSelectors

const AUDIO_BREAKDOWN_MODAL_NAME = 'AudioBreakdown'

const useStyles = makeStyles(({ palette, spacing, typography }) => ({
drawer: {
flexDirection: 'column',
alignItems: 'center',
padding: spacing(6),
paddingTop: spacing(3),
height: '100%'
},
amount: {
fontSize: 48
},
total: {
marginTop: spacing(2),
marginBottom: spacing(6),
fontSize: typography.fontSize.large,
color: palette.neutralLight4
},
section: {
width: '100%',
marginBottom: spacing(6),
padding: spacing(6),
borderRadius: spacing(4),
borderWidth: 2,
borderColor: palette.neutralLight7,
backgroundColor: palette.neutralLight10
},
sectionTitle: {
flexDirection: 'row',
justifyContent: 'center'
},
titleLabel: {
fontSize: typography.fontSize.large,
color: palette.neutral
},
titleAmount: {
marginLeft: spacing(3),
fontSize: typography.fontSize.large
},
sectionDescription: {
marginTop: spacing(3)
},
description: {
textAlign: 'center',
textTransform: 'uppercase',
color: palette.neutralLight4,
fontSize: spacing(3)
},
walletsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingTop: spacing(6),
paddingHorizontal: spacing(6),
paddingBottom: 14,
fontSize: spacing(4)
},
headerLabel: {
color: palette.neutralLight4
},
walletsBody: {
paddingLeft: spacing(6),
paddingRight: spacing(6),
borderTopWidth: 1,
borderTopColor: palette.neutralLight8
}
}))

const messages = {
modalTitle: '$AUDIO BREAKDOWN',
total: 'TOTAL $AUDIO',
Expand All@@ -100,105 +29,135 @@ const messages = {
}

export const AudioBreakdownDrawer = () => {
const styles = useStyles()
const { accountBalance, connectedWalletsBalance, totalBalance } =
useAudioBalance()

const accountBalance =
useSelector(getAccountBalance, (a, b) => Boolean(a && b && a === b)) ??
(BigInt(0) as AudioWei)
const { data: connectedWallets = [] } = useConnectedWallets()
const connectedWalletsBalances = useWalletAudioBalances({

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.

Isn't there a use balances hook where you can pass an include associated flag?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah but it doesn't include the individual wallet balances which we also need for this view.
the flag only specifies whether to include the associated wallet balances in the total balance that's returned

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.

wait not sure i understand, why can't we just edit the useAudioBalance hook for this? this works tho

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

we could but didn't wanna do that now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@DejayJD for vis

wallets: connectedWallets
})

const associatedWallets = useSelector(getAssociatedWallets)
const { connectedEthWallets: ethWallets, connectedSolWallets: solWallets } =
associatedWallets ?? {
ethWallets: null,
solWallets: null
}

const linkedWalletsBalance = (ethWallets ?? [])
.concat(solWallets ?? [])
.reduce((total, wallet) => {
return total + BigInt(wallet.balance as unknown as string)
}, BigInt(0)) as AudioWei
const ethWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Eth
)
const solWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Sol
)

const totalBalance = (accountBalance + linkedWalletsBalance) as AudioWei
const getWalletBalance = (address: string, chain: Chain): AudioWei => {
const balanceResult = connectedWalletsBalances.find(
(_, index) =>
connectedWallets[index]?.address === address &&
connectedWallets[index]?.chain === chain
)
return balanceResult?.data
}

return (
<AppDrawer
modalName={AUDIO_BREAKDOWN_MODAL_NAME}
title={messages.modalTitle}
isFullscreen
>
<View style={styles.drawer}>
<GradientText style={styles.amount}>
{AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
</GradientText>

<Text style={styles.total} weight='bold'>
{messages.total}
</Text>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
<Flex alignItems='center' p='xl' pt='l' gap='xl'>
<Flex gap='s'>
<GradientText style={{ fontSize: spacing.unit12 }}>
{formatNumberCommas(
AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>

<Text variant='title' size='l' color='subdued'>
{messages.total}
</Text>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.audiusWallet}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
<Flex mt='l'>
<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.audiusWalletDescription}
</Text>
</View>
</View>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
</Flex>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
gap='l'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.linkedWallets}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(linkedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(connectedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.walletsHeader}>
<Text style={styles.headerLabel} weight='bold'>
<Flex row justifyContent='space-between'>
<Text variant='label' color='subdued'>
{messages.linkedWallets}
</Text>
<Text style={styles.headerLabel} weight='bold'>
<Text variant='label' color='subdued'>
{messages.audio}
</Text>
</View>

<View style={styles.walletsBody}>
{ethWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Eth} key={wallet.address} {...wallet} />
))}
{solWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Sol} key={wallet.address} {...wallet} />
))}
</View>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
{messages.linkedWalletsDescription}
</Text>
</View>
</View>
</View>
</Flex>

<Divider orientation='horizontal' />

{ethWallets.map((wallet) => (
<Wallet
chain={Chain.Eth}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Eth)}
/>
))}
{solWallets.map((wallet) => (
<Wallet
chain={Chain.Sol}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Sol)}
/>
))}

<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.linkedWalletsDescription}
</Text>
</Flex>
</Flex>
</AppDrawer>
)
}
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
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,20 @@
import { Chain } from '@audius/common/models'
import type { AssociatedWallet } from '@audius/common/store'
import {
tokenDashboardPageSelectors,
walletSelectors
} from '@audius/common/store'
import type { AudioWei } from '@audius/fixed-decimal'
import { AUDIO } from '@audius/fixed-decimal'
import { View } from 'react-native'
import { useSelector } from 'react-redux'
useAudioBalance,
useConnectedWallets,
useWalletAudioBalances
} from '@audius/common/api'
import { Chain } from '@audius/common/models'
import { formatNumberCommas } from '@audius/common/utils'
import { AUDIO, type AudioWei } from '@audius/fixed-decimal'

import { Divider, Flex, spacing, Text } from '@audius/harmony-native'
import { GradientText } from 'app/components/core'
import { AppDrawer } from 'app/components/drawer'
import Text from 'app/components/text'
import { makeStyles } from 'app/styles'

import { Wallet } from './Wallet'
const { getAccountBalance } = walletSelectors
const { getAssociatedWallets } = tokenDashboardPageSelectors

const AUDIO_BREAKDOWN_MODAL_NAME = 'AudioBreakdown'

const useStyles = makeStyles(({ palette, spacing, typography }) => ({
drawer: {
flexDirection: 'column',
alignItems: 'center',
padding: spacing(6),
paddingTop: spacing(3),
height: '100%'
},
amount: {
fontSize: 48
},
total: {
marginTop: spacing(2),
marginBottom: spacing(6),
fontSize: typography.fontSize.large,
color: palette.neutralLight4
},
section: {
width: '100%',
marginBottom: spacing(6),
padding: spacing(6),
borderRadius: spacing(4),
borderWidth: 2,
borderColor: palette.neutralLight7,
backgroundColor: palette.neutralLight10
},
sectionTitle: {
flexDirection: 'row',
justifyContent: 'center'
},
titleLabel: {
fontSize: typography.fontSize.large,
color: palette.neutral
},
titleAmount: {
marginLeft: spacing(3),
fontSize: typography.fontSize.large
},
sectionDescription: {
marginTop: spacing(3)
},
description: {
textAlign: 'center',
textTransform: 'uppercase',
color: palette.neutralLight4,
fontSize: spacing(3)
},
walletsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingTop: spacing(6),
paddingHorizontal: spacing(6),
paddingBottom: 14,
fontSize: spacing(4)
},
headerLabel: {
color: palette.neutralLight4
},
walletsBody: {
paddingLeft: spacing(6),
paddingRight: spacing(6),
borderTopWidth: 1,
borderTopColor: palette.neutralLight8
}
}))

const messages = {
modalTitle: '$AUDIO BREAKDOWN',
total: 'TOTAL $AUDIO',
Expand All@@ -100,105 +29,135 @@ const messages = {
}

export const AudioBreakdownDrawer = () => {
const styles = useStyles()
const { accountBalance, connectedWalletsBalance, totalBalance } =
useAudioBalance()

const accountBalance =
useSelector(getAccountBalance, (a, b) => Boolean(a && b && a === b)) ??
(BigInt(0) as AudioWei)
const { data: connectedWallets = [] } = useConnectedWallets()
const connectedWalletsBalances = useWalletAudioBalances({

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.

Isn't there a use balances hook where you can pass an include associated flag?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah but it doesn't include the individual wallet balances which we also need for this view.
the flag only specifies whether to include the associated wallet balances in the total balance that's returned

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.

wait not sure i understand, why can't we just edit the useAudioBalance hook for this? this works tho

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

we could but didn't wanna do that now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@DejayJD for vis

wallets: connectedWallets
})

const associatedWallets = useSelector(getAssociatedWallets)
const { connectedEthWallets: ethWallets, connectedSolWallets: solWallets } =
associatedWallets ?? {
ethWallets: null,
solWallets: null
}

const linkedWalletsBalance = (ethWallets ?? [])
.concat(solWallets ?? [])
.reduce((total, wallet) => {
return total + BigInt(wallet.balance as unknown as string)
}, BigInt(0)) as AudioWei
const ethWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Eth
)
const solWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Sol
)

const totalBalance = (accountBalance + linkedWalletsBalance) as AudioWei
const getWalletBalance = (address: string, chain: Chain): AudioWei => {
const balanceResult = connectedWalletsBalances.find(
(_, index) =>
connectedWallets[index]?.address === address &&
connectedWallets[index]?.chain === chain
)
return balanceResult?.data
}

return (
<AppDrawer
modalName={AUDIO_BREAKDOWN_MODAL_NAME}
title={messages.modalTitle}
isFullscreen
>
<View style={styles.drawer}>
<GradientText style={styles.amount}>
{AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
</GradientText>

<Text style={styles.total} weight='bold'>
{messages.total}
</Text>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
<Flex alignItems='center' p='xl' pt='l' gap='xl'>
<Flex gap='s'>
<GradientText style={{ fontSize: spacing.unit12 }}>
{formatNumberCommas(
AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>

<Text variant='title' size='l' color='subdued'>
{messages.total}
</Text>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.audiusWallet}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
<Flex mt='l'>
<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.audiusWalletDescription}
</Text>
</View>
</View>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
</Flex>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
gap='l'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.linkedWallets}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(linkedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(connectedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.walletsHeader}>
<Text style={styles.headerLabel} weight='bold'>
<Flex row justifyContent='space-between'>
<Text variant='label' color='subdued'>
{messages.linkedWallets}
</Text>
<Text style={styles.headerLabel} weight='bold'>
<Text variant='label' color='subdued'>
{messages.audio}
</Text>
</View>

<View style={styles.walletsBody}>
{ethWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Eth} key={wallet.address} {...wallet} />
))}
{solWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Sol} key={wallet.address} {...wallet} />
))}
</View>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
{messages.linkedWalletsDescription}
</Text>
</View>
</View>
</View>
</Flex>

<Divider orientation='horizontal' />

{ethWallets.map((wallet) => (
<Wallet
chain={Chain.Eth}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Eth)}
/>
))}
{solWallets.map((wallet) => (
<Wallet
chain={Chain.Sol}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Sol)}
/>
))}

<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.linkedWalletsDescription}
</Text>
</Flex>
</Flex>
</AppDrawer>
)
}
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
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,20 @@
import { Chain } from '@audius/common/models'
import type { AssociatedWallet } from '@audius/common/store'
import {
tokenDashboardPageSelectors,
walletSelectors
} from '@audius/common/store'
import type { AudioWei } from '@audius/fixed-decimal'
import { AUDIO } from '@audius/fixed-decimal'
import { View } from 'react-native'
import { useSelector } from 'react-redux'
useAudioBalance,
useConnectedWallets,
useWalletAudioBalances
} from '@audius/common/api'
import { Chain } from '@audius/common/models'
import { formatNumberCommas } from '@audius/common/utils'
import { AUDIO, type AudioWei } from '@audius/fixed-decimal'

import { Divider, Flex, spacing, Text } from '@audius/harmony-native'
import { GradientText } from 'app/components/core'
import { AppDrawer } from 'app/components/drawer'
import Text from 'app/components/text'
import { makeStyles } from 'app/styles'

import { Wallet } from './Wallet'
const { getAccountBalance } = walletSelectors
const { getAssociatedWallets } = tokenDashboardPageSelectors

const AUDIO_BREAKDOWN_MODAL_NAME = 'AudioBreakdown'

const useStyles = makeStyles(({ palette, spacing, typography }) => ({
drawer: {
flexDirection: 'column',
alignItems: 'center',
padding: spacing(6),
paddingTop: spacing(3),
height: '100%'
},
amount: {
fontSize: 48
},
total: {
marginTop: spacing(2),
marginBottom: spacing(6),
fontSize: typography.fontSize.large,
color: palette.neutralLight4
},
section: {
width: '100%',
marginBottom: spacing(6),
padding: spacing(6),
borderRadius: spacing(4),
borderWidth: 2,
borderColor: palette.neutralLight7,
backgroundColor: palette.neutralLight10
},
sectionTitle: {
flexDirection: 'row',
justifyContent: 'center'
},
titleLabel: {
fontSize: typography.fontSize.large,
color: palette.neutral
},
titleAmount: {
marginLeft: spacing(3),
fontSize: typography.fontSize.large
},
sectionDescription: {
marginTop: spacing(3)
},
description: {
textAlign: 'center',
textTransform: 'uppercase',
color: palette.neutralLight4,
fontSize: spacing(3)
},
walletsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingTop: spacing(6),
paddingHorizontal: spacing(6),
paddingBottom: 14,
fontSize: spacing(4)
},
headerLabel: {
color: palette.neutralLight4
},
walletsBody: {
paddingLeft: spacing(6),
paddingRight: spacing(6),
borderTopWidth: 1,
borderTopColor: palette.neutralLight8
}
}))

const messages = {
modalTitle: '$AUDIO BREAKDOWN',
total: 'TOTAL $AUDIO',
Expand All@@ -100,105 +29,135 @@ const messages = {
}

export const AudioBreakdownDrawer = () => {
const styles = useStyles()
const { accountBalance, connectedWalletsBalance, totalBalance } =
useAudioBalance()

const accountBalance =
useSelector(getAccountBalance, (a, b) => Boolean(a && b && a === b)) ??
(BigInt(0) as AudioWei)
const { data: connectedWallets = [] } = useConnectedWallets()
const connectedWalletsBalances = useWalletAudioBalances({

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.

Isn't there a use balances hook where you can pass an include associated flag?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah but it doesn't include the individual wallet balances which we also need for this view.
the flag only specifies whether to include the associated wallet balances in the total balance that's returned

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.

wait not sure i understand, why can't we just edit the useAudioBalance hook for this? this works tho

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

we could but didn't wanna do that now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@DejayJD for vis

wallets: connectedWallets
})

const associatedWallets = useSelector(getAssociatedWallets)
const { connectedEthWallets: ethWallets, connectedSolWallets: solWallets } =
associatedWallets ?? {
ethWallets: null,
solWallets: null
}

const linkedWalletsBalance = (ethWallets ?? [])
.concat(solWallets ?? [])
.reduce((total, wallet) => {
return total + BigInt(wallet.balance as unknown as string)
}, BigInt(0)) as AudioWei
const ethWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Eth
)
const solWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Sol
)

const totalBalance = (accountBalance + linkedWalletsBalance) as AudioWei
const getWalletBalance = (address: string, chain: Chain): AudioWei => {
const balanceResult = connectedWalletsBalances.find(
(_, index) =>
connectedWallets[index]?.address === address &&
connectedWallets[index]?.chain === chain
)
return balanceResult?.data
}

return (
<AppDrawer
modalName={AUDIO_BREAKDOWN_MODAL_NAME}
title={messages.modalTitle}
isFullscreen
>
<View style={styles.drawer}>
<GradientText style={styles.amount}>
{AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
</GradientText>

<Text style={styles.total} weight='bold'>
{messages.total}
</Text>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
<Flex alignItems='center' p='xl' pt='l' gap='xl'>
<Flex gap='s'>
<GradientText style={{ fontSize: spacing.unit12 }}>
{formatNumberCommas(
AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>

<Text variant='title' size='l' color='subdued'>
{messages.total}
</Text>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.audiusWallet}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
<Flex mt='l'>
<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.audiusWalletDescription}
</Text>
</View>
</View>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
</Flex>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
gap='l'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.linkedWallets}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(linkedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(connectedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.walletsHeader}>
<Text style={styles.headerLabel} weight='bold'>
<Flex row justifyContent='space-between'>
<Text variant='label' color='subdued'>
{messages.linkedWallets}
</Text>
<Text style={styles.headerLabel} weight='bold'>
<Text variant='label' color='subdued'>
{messages.audio}
</Text>
</View>

<View style={styles.walletsBody}>
{ethWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Eth} key={wallet.address} {...wallet} />
))}
{solWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Sol} key={wallet.address} {...wallet} />
))}
</View>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
{messages.linkedWalletsDescription}
</Text>
</View>
</View>
</View>
</Flex>

<Divider orientation='horizontal' />

{ethWallets.map((wallet) => (
<Wallet
chain={Chain.Eth}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Eth)}
/>
))}
{solWallets.map((wallet) => (
<Wallet
chain={Chain.Sol}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Sol)}
/>
))}

<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.linkedWalletsDescription}
</Text>
</Flex>
</Flex>
</AppDrawer>
)
}
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
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,20 @@
import { Chain } from '@audius/common/models'
import type { AssociatedWallet } from '@audius/common/store'
import {
tokenDashboardPageSelectors,
walletSelectors
} from '@audius/common/store'
import type { AudioWei } from '@audius/fixed-decimal'
import { AUDIO } from '@audius/fixed-decimal'
import { View } from 'react-native'
import { useSelector } from 'react-redux'
useAudioBalance,
useConnectedWallets,
useWalletAudioBalances
} from '@audius/common/api'
import { Chain } from '@audius/common/models'
import { formatNumberCommas } from '@audius/common/utils'
import { AUDIO, type AudioWei } from '@audius/fixed-decimal'

import { Divider, Flex, spacing, Text } from '@audius/harmony-native'
import { GradientText } from 'app/components/core'
import { AppDrawer } from 'app/components/drawer'
import Text from 'app/components/text'
import { makeStyles } from 'app/styles'

import { Wallet } from './Wallet'
const { getAccountBalance } = walletSelectors
const { getAssociatedWallets } = tokenDashboardPageSelectors

const AUDIO_BREAKDOWN_MODAL_NAME = 'AudioBreakdown'

const useStyles = makeStyles(({ palette, spacing, typography }) => ({
drawer: {
flexDirection: 'column',
alignItems: 'center',
padding: spacing(6),
paddingTop: spacing(3),
height: '100%'
},
amount: {
fontSize: 48
},
total: {
marginTop: spacing(2),
marginBottom: spacing(6),
fontSize: typography.fontSize.large,
color: palette.neutralLight4
},
section: {
width: '100%',
marginBottom: spacing(6),
padding: spacing(6),
borderRadius: spacing(4),
borderWidth: 2,
borderColor: palette.neutralLight7,
backgroundColor: palette.neutralLight10
},
sectionTitle: {
flexDirection: 'row',
justifyContent: 'center'
},
titleLabel: {
fontSize: typography.fontSize.large,
color: palette.neutral
},
titleAmount: {
marginLeft: spacing(3),
fontSize: typography.fontSize.large
},
sectionDescription: {
marginTop: spacing(3)
},
description: {
textAlign: 'center',
textTransform: 'uppercase',
color: palette.neutralLight4,
fontSize: spacing(3)
},
walletsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingTop: spacing(6),
paddingHorizontal: spacing(6),
paddingBottom: 14,
fontSize: spacing(4)
},
headerLabel: {
color: palette.neutralLight4
},
walletsBody: {
paddingLeft: spacing(6),
paddingRight: spacing(6),
borderTopWidth: 1,
borderTopColor: palette.neutralLight8
}
}))

const messages = {
modalTitle: '$AUDIO BREAKDOWN',
total: 'TOTAL $AUDIO',
Expand All@@ -100,105 +29,135 @@ const messages = {
}

export const AudioBreakdownDrawer = () => {
const styles = useStyles()
const { accountBalance, connectedWalletsBalance, totalBalance } =
useAudioBalance()

const accountBalance =
useSelector(getAccountBalance, (a, b) => Boolean(a && b && a === b)) ??
(BigInt(0) as AudioWei)
const { data: connectedWallets = [] } = useConnectedWallets()
const connectedWalletsBalances = useWalletAudioBalances({

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.

Isn't there a use balances hook where you can pass an include associated flag?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah but it doesn't include the individual wallet balances which we also need for this view.
the flag only specifies whether to include the associated wallet balances in the total balance that's returned

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.

wait not sure i understand, why can't we just edit the useAudioBalance hook for this? this works tho

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

we could but didn't wanna do that now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@DejayJD for vis

wallets: connectedWallets
})

const associatedWallets = useSelector(getAssociatedWallets)
const { connectedEthWallets: ethWallets, connectedSolWallets: solWallets } =
associatedWallets ?? {
ethWallets: null,
solWallets: null
}

const linkedWalletsBalance = (ethWallets ?? [])
.concat(solWallets ?? [])
.reduce((total, wallet) => {
return total + BigInt(wallet.balance as unknown as string)
}, BigInt(0)) as AudioWei
const ethWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Eth
)
const solWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Sol
)

const totalBalance = (accountBalance + linkedWalletsBalance) as AudioWei
const getWalletBalance = (address: string, chain: Chain): AudioWei => {
const balanceResult = connectedWalletsBalances.find(
(_, index) =>
connectedWallets[index]?.address === address &&
connectedWallets[index]?.chain === chain
)
return balanceResult?.data
}

return (
<AppDrawer
modalName={AUDIO_BREAKDOWN_MODAL_NAME}
title={messages.modalTitle}
isFullscreen
>
<View style={styles.drawer}>
<GradientText style={styles.amount}>
{AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
</GradientText>

<Text style={styles.total} weight='bold'>
{messages.total}
</Text>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
<Flex alignItems='center' p='xl' pt='l' gap='xl'>
<Flex gap='s'>
<GradientText style={{ fontSize: spacing.unit12 }}>
{formatNumberCommas(
AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>

<Text variant='title' size='l' color='subdued'>
{messages.total}
</Text>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.audiusWallet}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
<Flex mt='l'>
<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.audiusWalletDescription}
</Text>
</View>
</View>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
</Flex>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
gap='l'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.linkedWallets}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(linkedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(connectedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.walletsHeader}>
<Text style={styles.headerLabel} weight='bold'>
<Flex row justifyContent='space-between'>
<Text variant='label' color='subdued'>
{messages.linkedWallets}
</Text>
<Text style={styles.headerLabel} weight='bold'>
<Text variant='label' color='subdued'>
{messages.audio}
</Text>
</View>

<View style={styles.walletsBody}>
{ethWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Eth} key={wallet.address} {...wallet} />
))}
{solWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Sol} key={wallet.address} {...wallet} />
))}
</View>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
{messages.linkedWalletsDescription}
</Text>
</View>
</View>
</View>
</Flex>

<Divider orientation='horizontal' />

{ethWallets.map((wallet) => (
<Wallet
chain={Chain.Eth}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Eth)}
/>
))}
{solWallets.map((wallet) => (
<Wallet
chain={Chain.Sol}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Sol)}
/>
))}

<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.linkedWalletsDescription}
</Text>
</Flex>
</Flex>
</AppDrawer>
)
}
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
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,20 @@
import { Chain } from '@audius/common/models'
import type { AssociatedWallet } from '@audius/common/store'
import {
tokenDashboardPageSelectors,
walletSelectors
} from '@audius/common/store'
import type { AudioWei } from '@audius/fixed-decimal'
import { AUDIO } from '@audius/fixed-decimal'
import { View } from 'react-native'
import { useSelector } from 'react-redux'
useAudioBalance,
useConnectedWallets,
useWalletAudioBalances
} from '@audius/common/api'
import { Chain } from '@audius/common/models'
import { formatNumberCommas } from '@audius/common/utils'
import { AUDIO, type AudioWei } from '@audius/fixed-decimal'

import { Divider, Flex, spacing, Text } from '@audius/harmony-native'
import { GradientText } from 'app/components/core'
import { AppDrawer } from 'app/components/drawer'
import Text from 'app/components/text'
import { makeStyles } from 'app/styles'

import { Wallet } from './Wallet'
const { getAccountBalance } = walletSelectors
const { getAssociatedWallets } = tokenDashboardPageSelectors

const AUDIO_BREAKDOWN_MODAL_NAME = 'AudioBreakdown'

const useStyles = makeStyles(({ palette, spacing, typography }) => ({
drawer: {
flexDirection: 'column',
alignItems: 'center',
padding: spacing(6),
paddingTop: spacing(3),
height: '100%'
},
amount: {
fontSize: 48
},
total: {
marginTop: spacing(2),
marginBottom: spacing(6),
fontSize: typography.fontSize.large,
color: palette.neutralLight4
},
section: {
width: '100%',
marginBottom: spacing(6),
padding: spacing(6),
borderRadius: spacing(4),
borderWidth: 2,
borderColor: palette.neutralLight7,
backgroundColor: palette.neutralLight10
},
sectionTitle: {
flexDirection: 'row',
justifyContent: 'center'
},
titleLabel: {
fontSize: typography.fontSize.large,
color: palette.neutral
},
titleAmount: {
marginLeft: spacing(3),
fontSize: typography.fontSize.large
},
sectionDescription: {
marginTop: spacing(3)
},
description: {
textAlign: 'center',
textTransform: 'uppercase',
color: palette.neutralLight4,
fontSize: spacing(3)
},
walletsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingTop: spacing(6),
paddingHorizontal: spacing(6),
paddingBottom: 14,
fontSize: spacing(4)
},
headerLabel: {
color: palette.neutralLight4
},
walletsBody: {
paddingLeft: spacing(6),
paddingRight: spacing(6),
borderTopWidth: 1,
borderTopColor: palette.neutralLight8
}
}))

const messages = {
modalTitle: '$AUDIO BREAKDOWN',
total: 'TOTAL $AUDIO',
Expand All@@ -100,105 +29,135 @@ const messages = {
}

export const AudioBreakdownDrawer = () => {
const styles = useStyles()
const { accountBalance, connectedWalletsBalance, totalBalance } =
useAudioBalance()

const accountBalance =
useSelector(getAccountBalance, (a, b) => Boolean(a && b && a === b)) ??
(BigInt(0) as AudioWei)
const { data: connectedWallets = [] } = useConnectedWallets()
const connectedWalletsBalances = useWalletAudioBalances({

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.

Isn't there a use balances hook where you can pass an include associated flag?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah but it doesn't include the individual wallet balances which we also need for this view.
the flag only specifies whether to include the associated wallet balances in the total balance that's returned

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.

wait not sure i understand, why can't we just edit the useAudioBalance hook for this? this works tho

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

we could but didn't wanna do that now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@DejayJD for vis

wallets: connectedWallets
})

const associatedWallets = useSelector(getAssociatedWallets)
const { connectedEthWallets: ethWallets, connectedSolWallets: solWallets } =
associatedWallets ?? {
ethWallets: null,
solWallets: null
}

const linkedWalletsBalance = (ethWallets ?? [])
.concat(solWallets ?? [])
.reduce((total, wallet) => {
return total + BigInt(wallet.balance as unknown as string)
}, BigInt(0)) as AudioWei
const ethWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Eth
)
const solWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Sol
)

const totalBalance = (accountBalance + linkedWalletsBalance) as AudioWei
const getWalletBalance = (address: string, chain: Chain): AudioWei => {
const balanceResult = connectedWalletsBalances.find(
(_, index) =>
connectedWallets[index]?.address === address &&
connectedWallets[index]?.chain === chain
)
return balanceResult?.data
}

return (
<AppDrawer
modalName={AUDIO_BREAKDOWN_MODAL_NAME}
title={messages.modalTitle}
isFullscreen
>
<View style={styles.drawer}>
<GradientText style={styles.amount}>
{AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
</GradientText>

<Text style={styles.total} weight='bold'>
{messages.total}
</Text>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
<Flex alignItems='center' p='xl' pt='l' gap='xl'>
<Flex gap='s'>
<GradientText style={{ fontSize: spacing.unit12 }}>
{formatNumberCommas(
AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>

<Text variant='title' size='l' color='subdued'>
{messages.total}
</Text>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.audiusWallet}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
<Flex mt='l'>
<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.audiusWalletDescription}
</Text>
</View>
</View>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
</Flex>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
gap='l'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.linkedWallets}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(linkedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(connectedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.walletsHeader}>
<Text style={styles.headerLabel} weight='bold'>
<Flex row justifyContent='space-between'>
<Text variant='label' color='subdued'>
{messages.linkedWallets}
</Text>
<Text style={styles.headerLabel} weight='bold'>
<Text variant='label' color='subdued'>
{messages.audio}
</Text>
</View>

<View style={styles.walletsBody}>
{ethWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Eth} key={wallet.address} {...wallet} />
))}
{solWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Sol} key={wallet.address} {...wallet} />
))}
</View>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
{messages.linkedWalletsDescription}
</Text>
</View>
</View>
</View>
</Flex>

<Divider orientation='horizontal' />

{ethWallets.map((wallet) => (
<Wallet
chain={Chain.Eth}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Eth)}
/>
))}
{solWallets.map((wallet) => (
<Wallet
chain={Chain.Sol}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Sol)}
/>
))}

<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.linkedWalletsDescription}
</Text>
</Flex>
</Flex>
</AppDrawer>
)
}
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
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,20 @@
import { Chain } from '@audius/common/models'
import type { AssociatedWallet } from '@audius/common/store'
import {
tokenDashboardPageSelectors,
walletSelectors
} from '@audius/common/store'
import type { AudioWei } from '@audius/fixed-decimal'
import { AUDIO } from '@audius/fixed-decimal'
import { View } from 'react-native'
import { useSelector } from 'react-redux'
useAudioBalance,
useConnectedWallets,
useWalletAudioBalances
} from '@audius/common/api'
import { Chain } from '@audius/common/models'
import { formatNumberCommas } from '@audius/common/utils'
import { AUDIO, type AudioWei } from '@audius/fixed-decimal'

import { Divider, Flex, spacing, Text } from '@audius/harmony-native'
import { GradientText } from 'app/components/core'
import { AppDrawer } from 'app/components/drawer'
import Text from 'app/components/text'
import { makeStyles } from 'app/styles'

import { Wallet } from './Wallet'
const { getAccountBalance } = walletSelectors
const { getAssociatedWallets } = tokenDashboardPageSelectors

const AUDIO_BREAKDOWN_MODAL_NAME = 'AudioBreakdown'

const useStyles = makeStyles(({ palette, spacing, typography }) => ({
drawer: {
flexDirection: 'column',
alignItems: 'center',
padding: spacing(6),
paddingTop: spacing(3),
height: '100%'
},
amount: {
fontSize: 48
},
total: {
marginTop: spacing(2),
marginBottom: spacing(6),
fontSize: typography.fontSize.large,
color: palette.neutralLight4
},
section: {
width: '100%',
marginBottom: spacing(6),
padding: spacing(6),
borderRadius: spacing(4),
borderWidth: 2,
borderColor: palette.neutralLight7,
backgroundColor: palette.neutralLight10
},
sectionTitle: {
flexDirection: 'row',
justifyContent: 'center'
},
titleLabel: {
fontSize: typography.fontSize.large,
color: palette.neutral
},
titleAmount: {
marginLeft: spacing(3),
fontSize: typography.fontSize.large
},
sectionDescription: {
marginTop: spacing(3)
},
description: {
textAlign: 'center',
textTransform: 'uppercase',
color: palette.neutralLight4,
fontSize: spacing(3)
},
walletsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingTop: spacing(6),
paddingHorizontal: spacing(6),
paddingBottom: 14,
fontSize: spacing(4)
},
headerLabel: {
color: palette.neutralLight4
},
walletsBody: {
paddingLeft: spacing(6),
paddingRight: spacing(6),
borderTopWidth: 1,
borderTopColor: palette.neutralLight8
}
}))

const messages = {
modalTitle: '$AUDIO BREAKDOWN',
total: 'TOTAL $AUDIO',
Expand All@@ -100,105 +29,135 @@ const messages = {
}

export const AudioBreakdownDrawer = () => {
const styles = useStyles()
const { accountBalance, connectedWalletsBalance, totalBalance } =
useAudioBalance()

const accountBalance =
useSelector(getAccountBalance, (a, b) => Boolean(a && b && a === b)) ??
(BigInt(0) as AudioWei)
const { data: connectedWallets = [] } = useConnectedWallets()
const connectedWalletsBalances = useWalletAudioBalances({

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.

Isn't there a use balances hook where you can pass an include associated flag?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah but it doesn't include the individual wallet balances which we also need for this view.
the flag only specifies whether to include the associated wallet balances in the total balance that's returned

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.

wait not sure i understand, why can't we just edit the useAudioBalance hook for this? this works tho

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

we could but didn't wanna do that now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@DejayJD for vis

wallets: connectedWallets
})

const associatedWallets = useSelector(getAssociatedWallets)
const { connectedEthWallets: ethWallets, connectedSolWallets: solWallets } =
associatedWallets ?? {
ethWallets: null,
solWallets: null
}

const linkedWalletsBalance = (ethWallets ?? [])
.concat(solWallets ?? [])
.reduce((total, wallet) => {
return total + BigInt(wallet.balance as unknown as string)
}, BigInt(0)) as AudioWei
const ethWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Eth
)
const solWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Sol
)

const totalBalance = (accountBalance + linkedWalletsBalance) as AudioWei
const getWalletBalance = (address: string, chain: Chain): AudioWei => {
const balanceResult = connectedWalletsBalances.find(
(_, index) =>
connectedWallets[index]?.address === address &&
connectedWallets[index]?.chain === chain
)
return balanceResult?.data
}

return (
<AppDrawer
modalName={AUDIO_BREAKDOWN_MODAL_NAME}
title={messages.modalTitle}
isFullscreen
>
<View style={styles.drawer}>
<GradientText style={styles.amount}>
{AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
</GradientText>

<Text style={styles.total} weight='bold'>
{messages.total}
</Text>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
<Flex alignItems='center' p='xl' pt='l' gap='xl'>
<Flex gap='s'>
<GradientText style={{ fontSize: spacing.unit12 }}>
{formatNumberCommas(
AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>

<Text variant='title' size='l' color='subdued'>
{messages.total}
</Text>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.audiusWallet}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
<Flex mt='l'>
<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.audiusWalletDescription}
</Text>
</View>
</View>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
</Flex>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
gap='l'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.linkedWallets}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(linkedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(connectedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.walletsHeader}>
<Text style={styles.headerLabel} weight='bold'>
<Flex row justifyContent='space-between'>
<Text variant='label' color='subdued'>
{messages.linkedWallets}
</Text>
<Text style={styles.headerLabel} weight='bold'>
<Text variant='label' color='subdued'>
{messages.audio}
</Text>
</View>

<View style={styles.walletsBody}>
{ethWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Eth} key={wallet.address} {...wallet} />
))}
{solWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Sol} key={wallet.address} {...wallet} />
))}
</View>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
{messages.linkedWalletsDescription}
</Text>
</View>
</View>
</View>
</Flex>

<Divider orientation='horizontal' />

{ethWallets.map((wallet) => (
<Wallet
chain={Chain.Eth}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Eth)}
/>
))}
{solWallets.map((wallet) => (
<Wallet
chain={Chain.Sol}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Sol)}
/>
))}

<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.linkedWalletsDescription}
</Text>
</Flex>
</Flex>
</AppDrawer>
)
}
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
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,20 @@
import { Chain } from '@audius/common/models'
import type { AssociatedWallet } from '@audius/common/store'
import {
tokenDashboardPageSelectors,
walletSelectors
} from '@audius/common/store'
import type { AudioWei } from '@audius/fixed-decimal'
import { AUDIO } from '@audius/fixed-decimal'
import { View } from 'react-native'
import { useSelector } from 'react-redux'
useAudioBalance,
useConnectedWallets,
useWalletAudioBalances
} from '@audius/common/api'
import { Chain } from '@audius/common/models'
import { formatNumberCommas } from '@audius/common/utils'
import { AUDIO, type AudioWei } from '@audius/fixed-decimal'

import { Divider, Flex, spacing, Text } from '@audius/harmony-native'
import { GradientText } from 'app/components/core'
import { AppDrawer } from 'app/components/drawer'
import Text from 'app/components/text'
import { makeStyles } from 'app/styles'

import { Wallet } from './Wallet'
const { getAccountBalance } = walletSelectors
const { getAssociatedWallets } = tokenDashboardPageSelectors

const AUDIO_BREAKDOWN_MODAL_NAME = 'AudioBreakdown'

const useStyles = makeStyles(({ palette, spacing, typography }) => ({
drawer: {
flexDirection: 'column',
alignItems: 'center',
padding: spacing(6),
paddingTop: spacing(3),
height: '100%'
},
amount: {
fontSize: 48
},
total: {
marginTop: spacing(2),
marginBottom: spacing(6),
fontSize: typography.fontSize.large,
color: palette.neutralLight4
},
section: {
width: '100%',
marginBottom: spacing(6),
padding: spacing(6),
borderRadius: spacing(4),
borderWidth: 2,
borderColor: palette.neutralLight7,
backgroundColor: palette.neutralLight10
},
sectionTitle: {
flexDirection: 'row',
justifyContent: 'center'
},
titleLabel: {
fontSize: typography.fontSize.large,
color: palette.neutral
},
titleAmount: {
marginLeft: spacing(3),
fontSize: typography.fontSize.large
},
sectionDescription: {
marginTop: spacing(3)
},
description: {
textAlign: 'center',
textTransform: 'uppercase',
color: palette.neutralLight4,
fontSize: spacing(3)
},
walletsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingTop: spacing(6),
paddingHorizontal: spacing(6),
paddingBottom: 14,
fontSize: spacing(4)
},
headerLabel: {
color: palette.neutralLight4
},
walletsBody: {
paddingLeft: spacing(6),
paddingRight: spacing(6),
borderTopWidth: 1,
borderTopColor: palette.neutralLight8
}
}))

const messages = {
modalTitle: '$AUDIO BREAKDOWN',
total: 'TOTAL $AUDIO',
Expand All@@ -100,105 +29,135 @@ const messages = {
}

export const AudioBreakdownDrawer = () => {
const styles = useStyles()
const { accountBalance, connectedWalletsBalance, totalBalance } =
useAudioBalance()

const accountBalance =
useSelector(getAccountBalance, (a, b) => Boolean(a && b && a === b)) ??
(BigInt(0) as AudioWei)
const { data: connectedWallets = [] } = useConnectedWallets()
const connectedWalletsBalances = useWalletAudioBalances({

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.

Isn't there a use balances hook where you can pass an include associated flag?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah but it doesn't include the individual wallet balances which we also need for this view.
the flag only specifies whether to include the associated wallet balances in the total balance that's returned

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.

wait not sure i understand, why can't we just edit the useAudioBalance hook for this? this works tho

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

we could but didn't wanna do that now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@DejayJD for vis

wallets: connectedWallets
})

const associatedWallets = useSelector(getAssociatedWallets)
const { connectedEthWallets: ethWallets, connectedSolWallets: solWallets } =
associatedWallets ?? {
ethWallets: null,
solWallets: null
}

const linkedWalletsBalance = (ethWallets ?? [])
.concat(solWallets ?? [])
.reduce((total, wallet) => {
return total + BigInt(wallet.balance as unknown as string)
}, BigInt(0)) as AudioWei
const ethWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Eth
)
const solWallets = connectedWallets.filter(
(wallet) => wallet.chain === Chain.Sol
)

const totalBalance = (accountBalance + linkedWalletsBalance) as AudioWei
const getWalletBalance = (address: string, chain: Chain): AudioWei => {
const balanceResult = connectedWalletsBalances.find(
(_, index) =>
connectedWallets[index]?.address === address &&
connectedWallets[index]?.chain === chain
)
return balanceResult?.data
}

return (
<AppDrawer
modalName={AUDIO_BREAKDOWN_MODAL_NAME}
title={messages.modalTitle}
isFullscreen
>
<View style={styles.drawer}>
<GradientText style={styles.amount}>
{AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
</GradientText>

<Text style={styles.total} weight='bold'>
{messages.total}
</Text>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
<Flex alignItems='center' p='xl' pt='l' gap='xl'>
<Flex gap='s'>
<GradientText style={{ fontSize: spacing.unit12 }}>
{formatNumberCommas(
AUDIO(totalBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>

<Text variant='title' size='l' color='subdued'>
{messages.total}
</Text>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.audiusWallet}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(accountBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
<Flex mt='l'>
<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.audiusWalletDescription}
</Text>
</View>
</View>

<View style={styles.section}>
<View style={styles.sectionTitle}>
<Text style={styles.titleLabel} weight='bold'>
</Flex>
</Flex>

<Flex
p='xl'
borderRadius='l'
border='strong'
backgroundColor='surface1'
gap='l'
>
<Flex row justifyContent='center'>
<Text variant='title' size='l'>
{messages.linkedWallets}
</Text>

<GradientText style={styles.titleAmount}>
{AUDIO(linkedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})}
<GradientText style={{ marginLeft: spacing.m, fontSize: 18 }}>
{formatNumberCommas(
AUDIO(connectedWalletsBalance).trunc().toLocaleString('en-US', {
minimumFractionDigits: 0,
maximumFractionDigits: 0
})
)}
</GradientText>
</View>
</Flex>

<View style={styles.walletsHeader}>
<Text style={styles.headerLabel} weight='bold'>
<Flex row justifyContent='space-between'>
<Text variant='label' color='subdued'>
{messages.linkedWallets}
</Text>
<Text style={styles.headerLabel} weight='bold'>
<Text variant='label' color='subdued'>
{messages.audio}
</Text>
</View>

<View style={styles.walletsBody}>
{ethWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Eth} key={wallet.address} {...wallet} />
))}
{solWallets?.map((wallet: AssociatedWallet) => (
<Wallet chain={Chain.Sol} key={wallet.address} {...wallet} />
))}
</View>

<View style={styles.sectionDescription}>
<Text style={styles.description} weight='bold'>
{messages.linkedWalletsDescription}
</Text>
</View>
</View>
</View>
</Flex>

<Divider orientation='horizontal' />

{ethWallets.map((wallet) => (
<Wallet
chain={Chain.Eth}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Eth)}
/>
))}
{solWallets.map((wallet) => (
<Wallet
chain={Chain.Sol}
key={wallet.address}
address={wallet.address}
balance={getWalletBalance(wallet.address, Chain.Sol)}
/>
))}

<Text variant='label' size='s' color='subdued' textAlign='center'>
{messages.linkedWalletsDescription}
</Text>
</Flex>
</Flex>
</AppDrawer>
)
}
Loading