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/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,6 +174,7 @@ export * from './tan-query/wallets/useWalletCollectibles'
export * from './tan-query/wallets/useWalletOwner'
export * from './tan-query/wallets/useUSDCBalance'
export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/wallets/useSendTokens'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const QUERY_KEYS = {
tokenPrice: 'tokenPrice',
usdcBalance: 'usdcBalance',
fileSizes: 'fileSizes',
sendTokens: 'sendTokens',
managedAccounts: 'managedAccounts',
userManagers: 'userManagers',
reactions: 'reactions',
Expand Down
163 changes: 163 additions & 0 deletions packages/common/src/api/tan-query/wallets/useSendTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
import { AudioWei } from '@audius/fixed-decimal'
import { useMutation, useQueryClient } from '@tanstack/react-query'

import { useQueryContext } from '~/api/tan-query/utils'
import { Name, SolanaWalletAddress } from '~/models'
import { getErrorMessage } from '~/utils'

import { getUserCoinQueryKey } from '../coins/useUserCoin'
import { useWalletAddresses } from '../users/account/useWalletAddresses'

import { useTokenBalance } from './useTokenBalance'

export type SendTokensParams = {
recipientWallet: SolanaWalletAddress
amount: AudioWei
}

export type SendTokensResult = {
signature: string
success: boolean
}

/**
* Hook for sending tokens on Solana blockchain.
* This hook handles only Solana transfers, not ETH transfers.
*
* @returns Mutation object with sendTokens function and status
*/
export const useSendTokens = ({ mint }: { mint: string }) => {
const queryClient = useQueryClient()
const { audiusBackend, audiusSdk, reportToSentry, analytics, env } =
useQueryContext()
const { data: walletAddresses } = useWalletAddresses()

const { data: tokenBalance } = useTokenBalance({ mint })

return useMutation({
mutationFn: async ({
recipientWallet,
amount
}: SendTokensParams): Promise<SendTokensResult> => {
try {
// For now, we only support wAUDIO transfers
// This can be extended to support other tokens in the future
if (mint !== env.WAUDIO_MINT_ADDRESS) {
throw new Error(`Token mint ${mint} is not supported for sending`)
}

const currentUser = walletAddresses?.currentUser
if (!currentUser) {
throw new Error('Failed to retrieve current user wallet address')
}

const sdk = await audiusSdk()

if (!tokenBalance?.balance || tokenBalance.balance.value < amount) {
throw new Error('Insufficient balance to send tokens')
}

await audiusBackend.sendWAudioTokens({

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.

so we don't have a send in sdk yet?

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.

i think it technically uses sdk but is a weird wrapper function

address: recipientWallet,
amount,
ethAddress: currentUser,
sdk
})

return {
signature: 'success', // The backend doesn't return a signature, so we use a placeholder
success: true
}
} catch (error) {
console.error('Error sending tokens:', error)

const errorMessage = getErrorMessage(error)

if (errorMessage === 'Missing social proof') {
throw new Error('Missing social proof')
}
if (
errorMessage ===
'Recipient has no $AUDIO token account. Please install Phantom-Wallet to create one.'
) {
throw new Error(errorMessage)
}

throw new Error('Something has gone wrong, please try again.')
}
},
onMutate: async ({ amount }) => {
const queryKey = getUserCoinQueryKey(mint)
await queryClient.cancelQueries({ queryKey })

const previousBalance = queryClient.getQueryData(queryKey)

if (previousBalance) {
queryClient.setQueryData(queryKey, (old: any) => {
if (!old) return old

return {
...old,
balance: old.balance - amount,
accounts: old.accounts?.map((account: any) =>
account.isInAppWallet
? { ...account, balance: account.balance - amount }
: account
)
}
})
}

return { previousBalance }
},
onSuccess: (_, { recipientWallet }) => {
if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_SUCCESS,
from: currentUser,
recipient: recipientWallet
})
)
}
}
},
onError: (error, { amount, recipientWallet }, context) => {
if (context?.previousBalance) {
const queryKey = getUserCoinQueryKey(mint)
queryClient.setQueryData(queryKey, context.previousBalance)
}

if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_FAILURE,
from: currentUser,
recipient: recipientWallet,
error: error instanceof Error ? error.message : 'Unknown error'
})
)
}
}

if (reportToSentry) {
reportToSentry({
error: error instanceof Error ? error : new Error(error as string),
name: 'Send Tokens',
additionalInfo: {
amount: amount.toString(),
mint
}
})
}
},
onSettled: () => {
const queryKey = getUserCoinQueryKey(mint)
queryClient.invalidateQueries({ queryKey })
}
})
}
4 changes: 4 additions & 0 deletions packages/common/src/utils/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,3 +450,7 @@ export const searchPage = (searchOptions: SearchOptions) => {
query: searchParams
})
}

export const solanaExplorerAddress = (address: string) => {
return `https://explorer.solana.com/address/${address}`
}
11 changes: 9 additions & 2 deletions packages/harmony/src/components/hint/Hint.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,21 @@ import { IconQuestionCircle } from '~harmony/icons'

type HintProps = {
icon?: IconComponent
noIcon?: boolean
actions?: ReactNode
} & PaperProps

/*
* A way of informing the user of important details in line in a prominent way.
*/
export const Hint = (props: HintProps) => {
const { icon: Icon = IconQuestionCircle, children, actions, ...other } = props
const {
icon: Icon = IconQuestionCircle,
children,
actions,
noIcon,
...other
} = props
return (
<Paper
role='alert'
Expand All@@ -29,7 +36,7 @@ export const Hint = (props: HintProps) => {
{...other}
>
<Flex gap='l' alignItems='center'>
<Icon size='l' color='default' />
{noIcon ? null : <Icon size='l' color='default' />}
<Text variant='body' color='default'>
{children}
</Text>
Expand Down
5 changes: 4 additions & 1 deletion packages/web/src/components/modal/ResponsiveModal.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import Drawer from 'components/drawer/Drawer'
import { useIsMobile } from 'hooks/useIsMobile'

export type ResponsiveModalProps = {
className?: string
// Core props
isOpen: boolean
onClose: () => void
Expand DownExpand Up@@ -68,7 +69,8 @@ const ResponsiveModal = ({
showDismissButton,
zIndex,
renderAsDrawer,
renderAsModal
renderAsModal,
className
}: ResponsiveModalProps) => {
const isMobile = useIsMobile()
const shouldRenderAsDrawer = renderAsDrawer ?? (isMobile && !renderAsModal)
Expand DownExpand Up@@ -123,6 +125,7 @@ const ResponsiveModal = ({
size={getModalSize(size)}
zIndex={zIndex}
dismissOnClickOutside={dismissOnClickOutside}
className={className}
>
{(title || Icon || subtitle) && (
<ModalHeader showDismissButton={showDismissButton}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,6 +174,7 @@ export * from './tan-query/wallets/useWalletCollectibles'
export * from './tan-query/wallets/useWalletOwner'
export * from './tan-query/wallets/useUSDCBalance'
export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/wallets/useSendTokens'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const QUERY_KEYS = {
tokenPrice: 'tokenPrice',
usdcBalance: 'usdcBalance',
fileSizes: 'fileSizes',
sendTokens: 'sendTokens',
managedAccounts: 'managedAccounts',
userManagers: 'userManagers',
reactions: 'reactions',
Expand Down
163 changes: 163 additions & 0 deletions packages/common/src/api/tan-query/wallets/useSendTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
import { AudioWei } from '@audius/fixed-decimal'
import { useMutation, useQueryClient } from '@tanstack/react-query'

import { useQueryContext } from '~/api/tan-query/utils'
import { Name, SolanaWalletAddress } from '~/models'
import { getErrorMessage } from '~/utils'

import { getUserCoinQueryKey } from '../coins/useUserCoin'
import { useWalletAddresses } from '../users/account/useWalletAddresses'

import { useTokenBalance } from './useTokenBalance'

export type SendTokensParams = {
recipientWallet: SolanaWalletAddress
amount: AudioWei
}

export type SendTokensResult = {
signature: string
success: boolean
}

/**
* Hook for sending tokens on Solana blockchain.
* This hook handles only Solana transfers, not ETH transfers.
*
* @returns Mutation object with sendTokens function and status
*/
export const useSendTokens = ({ mint }: { mint: string }) => {
const queryClient = useQueryClient()
const { audiusBackend, audiusSdk, reportToSentry, analytics, env } =
useQueryContext()
const { data: walletAddresses } = useWalletAddresses()

const { data: tokenBalance } = useTokenBalance({ mint })

return useMutation({
mutationFn: async ({
recipientWallet,
amount
}: SendTokensParams): Promise<SendTokensResult> => {
try {
// For now, we only support wAUDIO transfers
// This can be extended to support other tokens in the future
if (mint !== env.WAUDIO_MINT_ADDRESS) {
throw new Error(`Token mint ${mint} is not supported for sending`)
}

const currentUser = walletAddresses?.currentUser
if (!currentUser) {
throw new Error('Failed to retrieve current user wallet address')
}

const sdk = await audiusSdk()

if (!tokenBalance?.balance || tokenBalance.balance.value < amount) {
throw new Error('Insufficient balance to send tokens')
}

await audiusBackend.sendWAudioTokens({

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.

so we don't have a send in sdk yet?

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.

i think it technically uses sdk but is a weird wrapper function

address: recipientWallet,
amount,
ethAddress: currentUser,
sdk
})

return {
signature: 'success', // The backend doesn't return a signature, so we use a placeholder
success: true
}
} catch (error) {
console.error('Error sending tokens:', error)

const errorMessage = getErrorMessage(error)

if (errorMessage === 'Missing social proof') {
throw new Error('Missing social proof')
}
if (
errorMessage ===
'Recipient has no $AUDIO token account. Please install Phantom-Wallet to create one.'
) {
throw new Error(errorMessage)
}

throw new Error('Something has gone wrong, please try again.')
}
},
onMutate: async ({ amount }) => {
const queryKey = getUserCoinQueryKey(mint)
await queryClient.cancelQueries({ queryKey })

const previousBalance = queryClient.getQueryData(queryKey)

if (previousBalance) {
queryClient.setQueryData(queryKey, (old: any) => {
if (!old) return old

return {
...old,
balance: old.balance - amount,
accounts: old.accounts?.map((account: any) =>
account.isInAppWallet
? { ...account, balance: account.balance - amount }
: account
)
}
})
}

return { previousBalance }
},
onSuccess: (_, { recipientWallet }) => {
if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_SUCCESS,
from: currentUser,
recipient: recipientWallet
})
)
}
}
},
onError: (error, { amount, recipientWallet }, context) => {
if (context?.previousBalance) {
const queryKey = getUserCoinQueryKey(mint)
queryClient.setQueryData(queryKey, context.previousBalance)
}

if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_FAILURE,
from: currentUser,
recipient: recipientWallet,
error: error instanceof Error ? error.message : 'Unknown error'
})
)
}
}

if (reportToSentry) {
reportToSentry({
error: error instanceof Error ? error : new Error(error as string),
name: 'Send Tokens',
additionalInfo: {
amount: amount.toString(),
mint
}
})
}
},
onSettled: () => {
const queryKey = getUserCoinQueryKey(mint)
queryClient.invalidateQueries({ queryKey })
}
})
}
4 changes: 4 additions & 0 deletions packages/common/src/utils/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,3 +450,7 @@ export const searchPage = (searchOptions: SearchOptions) => {
query: searchParams
})
}

export const solanaExplorerAddress = (address: string) => {
return `https://explorer.solana.com/address/${address}`
}
11 changes: 9 additions & 2 deletions packages/harmony/src/components/hint/Hint.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,21 @@ import { IconQuestionCircle } from '~harmony/icons'

type HintProps = {
icon?: IconComponent
noIcon?: boolean
actions?: ReactNode
} & PaperProps

/*
* A way of informing the user of important details in line in a prominent way.
*/
export const Hint = (props: HintProps) => {
const { icon: Icon = IconQuestionCircle, children, actions, ...other } = props
const {
icon: Icon = IconQuestionCircle,
children,
actions,
noIcon,
...other
} = props
return (
<Paper
role='alert'
Expand All@@ -29,7 +36,7 @@ export const Hint = (props: HintProps) => {
{...other}
>
<Flex gap='l' alignItems='center'>
<Icon size='l' color='default' />
{noIcon ? null : <Icon size='l' color='default' />}
<Text variant='body' color='default'>
{children}
</Text>
Expand Down
5 changes: 4 additions & 1 deletion packages/web/src/components/modal/ResponsiveModal.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import Drawer from 'components/drawer/Drawer'
import { useIsMobile } from 'hooks/useIsMobile'

export type ResponsiveModalProps = {
className?: string
// Core props
isOpen: boolean
onClose: () => void
Expand DownExpand Up@@ -68,7 +69,8 @@ const ResponsiveModal = ({
showDismissButton,
zIndex,
renderAsDrawer,
renderAsModal
renderAsModal,
className
}: ResponsiveModalProps) => {
const isMobile = useIsMobile()
const shouldRenderAsDrawer = renderAsDrawer ?? (isMobile && !renderAsModal)
Expand DownExpand Up@@ -123,6 +125,7 @@ const ResponsiveModal = ({
size={getModalSize(size)}
zIndex={zIndex}
dismissOnClickOutside={dismissOnClickOutside}
className={className}
>
{(title || Icon || subtitle) && (
<ModalHeader showDismissButton={showDismissButton}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,6 +174,7 @@ export * from './tan-query/wallets/useWalletCollectibles'
export * from './tan-query/wallets/useWalletOwner'
export * from './tan-query/wallets/useUSDCBalance'
export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/wallets/useSendTokens'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const QUERY_KEYS = {
tokenPrice: 'tokenPrice',
usdcBalance: 'usdcBalance',
fileSizes: 'fileSizes',
sendTokens: 'sendTokens',
managedAccounts: 'managedAccounts',
userManagers: 'userManagers',
reactions: 'reactions',
Expand Down
163 changes: 163 additions & 0 deletions packages/common/src/api/tan-query/wallets/useSendTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
import { AudioWei } from '@audius/fixed-decimal'
import { useMutation, useQueryClient } from '@tanstack/react-query'

import { useQueryContext } from '~/api/tan-query/utils'
import { Name, SolanaWalletAddress } from '~/models'
import { getErrorMessage } from '~/utils'

import { getUserCoinQueryKey } from '../coins/useUserCoin'
import { useWalletAddresses } from '../users/account/useWalletAddresses'

import { useTokenBalance } from './useTokenBalance'

export type SendTokensParams = {
recipientWallet: SolanaWalletAddress
amount: AudioWei
}

export type SendTokensResult = {
signature: string
success: boolean
}

/**
* Hook for sending tokens on Solana blockchain.
* This hook handles only Solana transfers, not ETH transfers.
*
* @returns Mutation object with sendTokens function and status
*/
export const useSendTokens = ({ mint }: { mint: string }) => {
const queryClient = useQueryClient()
const { audiusBackend, audiusSdk, reportToSentry, analytics, env } =
useQueryContext()
const { data: walletAddresses } = useWalletAddresses()

const { data: tokenBalance } = useTokenBalance({ mint })

return useMutation({
mutationFn: async ({
recipientWallet,
amount
}: SendTokensParams): Promise<SendTokensResult> => {
try {
// For now, we only support wAUDIO transfers
// This can be extended to support other tokens in the future
if (mint !== env.WAUDIO_MINT_ADDRESS) {
throw new Error(`Token mint ${mint} is not supported for sending`)
}

const currentUser = walletAddresses?.currentUser
if (!currentUser) {
throw new Error('Failed to retrieve current user wallet address')
}

const sdk = await audiusSdk()

if (!tokenBalance?.balance || tokenBalance.balance.value < amount) {
throw new Error('Insufficient balance to send tokens')
}

await audiusBackend.sendWAudioTokens({

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.

so we don't have a send in sdk yet?

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.

i think it technically uses sdk but is a weird wrapper function

address: recipientWallet,
amount,
ethAddress: currentUser,
sdk
})

return {
signature: 'success', // The backend doesn't return a signature, so we use a placeholder
success: true
}
} catch (error) {
console.error('Error sending tokens:', error)

const errorMessage = getErrorMessage(error)

if (errorMessage === 'Missing social proof') {
throw new Error('Missing social proof')
}
if (
errorMessage ===
'Recipient has no $AUDIO token account. Please install Phantom-Wallet to create one.'
) {
throw new Error(errorMessage)
}

throw new Error('Something has gone wrong, please try again.')
}
},
onMutate: async ({ amount }) => {
const queryKey = getUserCoinQueryKey(mint)
await queryClient.cancelQueries({ queryKey })

const previousBalance = queryClient.getQueryData(queryKey)

if (previousBalance) {
queryClient.setQueryData(queryKey, (old: any) => {
if (!old) return old

return {
...old,
balance: old.balance - amount,
accounts: old.accounts?.map((account: any) =>
account.isInAppWallet
? { ...account, balance: account.balance - amount }
: account
)
}
})
}

return { previousBalance }
},
onSuccess: (_, { recipientWallet }) => {
if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_SUCCESS,
from: currentUser,
recipient: recipientWallet
})
)
}
}
},
onError: (error, { amount, recipientWallet }, context) => {
if (context?.previousBalance) {
const queryKey = getUserCoinQueryKey(mint)
queryClient.setQueryData(queryKey, context.previousBalance)
}

if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_FAILURE,
from: currentUser,
recipient: recipientWallet,
error: error instanceof Error ? error.message : 'Unknown error'
})
)
}
}

if (reportToSentry) {
reportToSentry({
error: error instanceof Error ? error : new Error(error as string),
name: 'Send Tokens',
additionalInfo: {
amount: amount.toString(),
mint
}
})
}
},
onSettled: () => {
const queryKey = getUserCoinQueryKey(mint)
queryClient.invalidateQueries({ queryKey })
}
})
}
4 changes: 4 additions & 0 deletions packages/common/src/utils/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,3 +450,7 @@ export const searchPage = (searchOptions: SearchOptions) => {
query: searchParams
})
}

export const solanaExplorerAddress = (address: string) => {
return `https://explorer.solana.com/address/${address}`
}
11 changes: 9 additions & 2 deletions packages/harmony/src/components/hint/Hint.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,21 @@ import { IconQuestionCircle } from '~harmony/icons'

type HintProps = {
icon?: IconComponent
noIcon?: boolean
actions?: ReactNode
} & PaperProps

/*
* A way of informing the user of important details in line in a prominent way.
*/
export const Hint = (props: HintProps) => {
const { icon: Icon = IconQuestionCircle, children, actions, ...other } = props
const {
icon: Icon = IconQuestionCircle,
children,
actions,
noIcon,
...other
} = props
return (
<Paper
role='alert'
Expand All@@ -29,7 +36,7 @@ export const Hint = (props: HintProps) => {
{...other}
>
<Flex gap='l' alignItems='center'>
<Icon size='l' color='default' />
{noIcon ? null : <Icon size='l' color='default' />}
<Text variant='body' color='default'>
{children}
</Text>
Expand Down
5 changes: 4 additions & 1 deletion packages/web/src/components/modal/ResponsiveModal.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import Drawer from 'components/drawer/Drawer'
import { useIsMobile } from 'hooks/useIsMobile'

export type ResponsiveModalProps = {
className?: string
// Core props
isOpen: boolean
onClose: () => void
Expand DownExpand Up@@ -68,7 +69,8 @@ const ResponsiveModal = ({
showDismissButton,
zIndex,
renderAsDrawer,
renderAsModal
renderAsModal,
className
}: ResponsiveModalProps) => {
const isMobile = useIsMobile()
const shouldRenderAsDrawer = renderAsDrawer ?? (isMobile && !renderAsModal)
Expand DownExpand Up@@ -123,6 +125,7 @@ const ResponsiveModal = ({
size={getModalSize(size)}
zIndex={zIndex}
dismissOnClickOutside={dismissOnClickOutside}
className={className}
>
{(title || Icon || subtitle) && (
<ModalHeader showDismissButton={showDismissButton}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,6 +174,7 @@ export * from './tan-query/wallets/useWalletCollectibles'
export * from './tan-query/wallets/useWalletOwner'
export * from './tan-query/wallets/useUSDCBalance'
export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/wallets/useSendTokens'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const QUERY_KEYS = {
tokenPrice: 'tokenPrice',
usdcBalance: 'usdcBalance',
fileSizes: 'fileSizes',
sendTokens: 'sendTokens',
managedAccounts: 'managedAccounts',
userManagers: 'userManagers',
reactions: 'reactions',
Expand Down
163 changes: 163 additions & 0 deletions packages/common/src/api/tan-query/wallets/useSendTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
import { AudioWei } from '@audius/fixed-decimal'
import { useMutation, useQueryClient } from '@tanstack/react-query'

import { useQueryContext } from '~/api/tan-query/utils'
import { Name, SolanaWalletAddress } from '~/models'
import { getErrorMessage } from '~/utils'

import { getUserCoinQueryKey } from '../coins/useUserCoin'
import { useWalletAddresses } from '../users/account/useWalletAddresses'

import { useTokenBalance } from './useTokenBalance'

export type SendTokensParams = {
recipientWallet: SolanaWalletAddress
amount: AudioWei
}

export type SendTokensResult = {
signature: string
success: boolean
}

/**
* Hook for sending tokens on Solana blockchain.
* This hook handles only Solana transfers, not ETH transfers.
*
* @returns Mutation object with sendTokens function and status
*/
export const useSendTokens = ({ mint }: { mint: string }) => {
const queryClient = useQueryClient()
const { audiusBackend, audiusSdk, reportToSentry, analytics, env } =
useQueryContext()
const { data: walletAddresses } = useWalletAddresses()

const { data: tokenBalance } = useTokenBalance({ mint })

return useMutation({
mutationFn: async ({
recipientWallet,
amount
}: SendTokensParams): Promise<SendTokensResult> => {
try {
// For now, we only support wAUDIO transfers
// This can be extended to support other tokens in the future
if (mint !== env.WAUDIO_MINT_ADDRESS) {
throw new Error(`Token mint ${mint} is not supported for sending`)
}

const currentUser = walletAddresses?.currentUser
if (!currentUser) {
throw new Error('Failed to retrieve current user wallet address')
}

const sdk = await audiusSdk()

if (!tokenBalance?.balance || tokenBalance.balance.value < amount) {
throw new Error('Insufficient balance to send tokens')
}

await audiusBackend.sendWAudioTokens({

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.

so we don't have a send in sdk yet?

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.

i think it technically uses sdk but is a weird wrapper function

address: recipientWallet,
amount,
ethAddress: currentUser,
sdk
})

return {
signature: 'success', // The backend doesn't return a signature, so we use a placeholder
success: true
}
} catch (error) {
console.error('Error sending tokens:', error)

const errorMessage = getErrorMessage(error)

if (errorMessage === 'Missing social proof') {
throw new Error('Missing social proof')
}
if (
errorMessage ===
'Recipient has no $AUDIO token account. Please install Phantom-Wallet to create one.'
) {
throw new Error(errorMessage)
}

throw new Error('Something has gone wrong, please try again.')
}
},
onMutate: async ({ amount }) => {
const queryKey = getUserCoinQueryKey(mint)
await queryClient.cancelQueries({ queryKey })

const previousBalance = queryClient.getQueryData(queryKey)

if (previousBalance) {
queryClient.setQueryData(queryKey, (old: any) => {
if (!old) return old

return {
...old,
balance: old.balance - amount,
accounts: old.accounts?.map((account: any) =>
account.isInAppWallet
? { ...account, balance: account.balance - amount }
: account
)
}
})
}

return { previousBalance }
},
onSuccess: (_, { recipientWallet }) => {
if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_SUCCESS,
from: currentUser,
recipient: recipientWallet
})
)
}
}
},
onError: (error, { amount, recipientWallet }, context) => {
if (context?.previousBalance) {
const queryKey = getUserCoinQueryKey(mint)
queryClient.setQueryData(queryKey, context.previousBalance)
}

if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_FAILURE,
from: currentUser,
recipient: recipientWallet,
error: error instanceof Error ? error.message : 'Unknown error'
})
)
}
}

if (reportToSentry) {
reportToSentry({
error: error instanceof Error ? error : new Error(error as string),
name: 'Send Tokens',
additionalInfo: {
amount: amount.toString(),
mint
}
})
}
},
onSettled: () => {
const queryKey = getUserCoinQueryKey(mint)
queryClient.invalidateQueries({ queryKey })
}
})
}
4 changes: 4 additions & 0 deletions packages/common/src/utils/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,3 +450,7 @@ export const searchPage = (searchOptions: SearchOptions) => {
query: searchParams
})
}

export const solanaExplorerAddress = (address: string) => {
return `https://explorer.solana.com/address/${address}`
}
11 changes: 9 additions & 2 deletions packages/harmony/src/components/hint/Hint.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,21 @@ import { IconQuestionCircle } from '~harmony/icons'

type HintProps = {
icon?: IconComponent
noIcon?: boolean
actions?: ReactNode
} & PaperProps

/*
* A way of informing the user of important details in line in a prominent way.
*/
export const Hint = (props: HintProps) => {
const { icon: Icon = IconQuestionCircle, children, actions, ...other } = props
const {
icon: Icon = IconQuestionCircle,
children,
actions,
noIcon,
...other
} = props
return (
<Paper
role='alert'
Expand All@@ -29,7 +36,7 @@ export const Hint = (props: HintProps) => {
{...other}
>
<Flex gap='l' alignItems='center'>
<Icon size='l' color='default' />
{noIcon ? null : <Icon size='l' color='default' />}
<Text variant='body' color='default'>
{children}
</Text>
Expand Down
5 changes: 4 additions & 1 deletion packages/web/src/components/modal/ResponsiveModal.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import Drawer from 'components/drawer/Drawer'
import { useIsMobile } from 'hooks/useIsMobile'

export type ResponsiveModalProps = {
className?: string
// Core props
isOpen: boolean
onClose: () => void
Expand DownExpand Up@@ -68,7 +69,8 @@ const ResponsiveModal = ({
showDismissButton,
zIndex,
renderAsDrawer,
renderAsModal
renderAsModal,
className
}: ResponsiveModalProps) => {
const isMobile = useIsMobile()
const shouldRenderAsDrawer = renderAsDrawer ?? (isMobile && !renderAsModal)
Expand DownExpand Up@@ -123,6 +125,7 @@ const ResponsiveModal = ({
size={getModalSize(size)}
zIndex={zIndex}
dismissOnClickOutside={dismissOnClickOutside}
className={className}
>
{(title || Icon || subtitle) && (
<ModalHeader showDismissButton={showDismissButton}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,6 +174,7 @@ export * from './tan-query/wallets/useWalletCollectibles'
export * from './tan-query/wallets/useWalletOwner'
export * from './tan-query/wallets/useUSDCBalance'
export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/wallets/useSendTokens'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const QUERY_KEYS = {
tokenPrice: 'tokenPrice',
usdcBalance: 'usdcBalance',
fileSizes: 'fileSizes',
sendTokens: 'sendTokens',
managedAccounts: 'managedAccounts',
userManagers: 'userManagers',
reactions: 'reactions',
Expand Down
163 changes: 163 additions & 0 deletions packages/common/src/api/tan-query/wallets/useSendTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
import { AudioWei } from '@audius/fixed-decimal'
import { useMutation, useQueryClient } from '@tanstack/react-query'

import { useQueryContext } from '~/api/tan-query/utils'
import { Name, SolanaWalletAddress } from '~/models'
import { getErrorMessage } from '~/utils'

import { getUserCoinQueryKey } from '../coins/useUserCoin'
import { useWalletAddresses } from '../users/account/useWalletAddresses'

import { useTokenBalance } from './useTokenBalance'

export type SendTokensParams = {
recipientWallet: SolanaWalletAddress
amount: AudioWei
}

export type SendTokensResult = {
signature: string
success: boolean
}

/**
* Hook for sending tokens on Solana blockchain.
* This hook handles only Solana transfers, not ETH transfers.
*
* @returns Mutation object with sendTokens function and status
*/
export const useSendTokens = ({ mint }: { mint: string }) => {
const queryClient = useQueryClient()
const { audiusBackend, audiusSdk, reportToSentry, analytics, env } =
useQueryContext()
const { data: walletAddresses } = useWalletAddresses()

const { data: tokenBalance } = useTokenBalance({ mint })

return useMutation({
mutationFn: async ({
recipientWallet,
amount
}: SendTokensParams): Promise<SendTokensResult> => {
try {
// For now, we only support wAUDIO transfers
// This can be extended to support other tokens in the future
if (mint !== env.WAUDIO_MINT_ADDRESS) {
throw new Error(`Token mint ${mint} is not supported for sending`)
}

const currentUser = walletAddresses?.currentUser
if (!currentUser) {
throw new Error('Failed to retrieve current user wallet address')
}

const sdk = await audiusSdk()

if (!tokenBalance?.balance || tokenBalance.balance.value < amount) {
throw new Error('Insufficient balance to send tokens')
}

await audiusBackend.sendWAudioTokens({

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.

so we don't have a send in sdk yet?

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.

i think it technically uses sdk but is a weird wrapper function

address: recipientWallet,
amount,
ethAddress: currentUser,
sdk
})

return {
signature: 'success', // The backend doesn't return a signature, so we use a placeholder
success: true
}
} catch (error) {
console.error('Error sending tokens:', error)

const errorMessage = getErrorMessage(error)

if (errorMessage === 'Missing social proof') {
throw new Error('Missing social proof')
}
if (
errorMessage ===
'Recipient has no $AUDIO token account. Please install Phantom-Wallet to create one.'
) {
throw new Error(errorMessage)
}

throw new Error('Something has gone wrong, please try again.')
}
},
onMutate: async ({ amount }) => {
const queryKey = getUserCoinQueryKey(mint)
await queryClient.cancelQueries({ queryKey })

const previousBalance = queryClient.getQueryData(queryKey)

if (previousBalance) {
queryClient.setQueryData(queryKey, (old: any) => {
if (!old) return old

return {
...old,
balance: old.balance - amount,
accounts: old.accounts?.map((account: any) =>
account.isInAppWallet
? { ...account, balance: account.balance - amount }
: account
)
}
})
}

return { previousBalance }
},
onSuccess: (_, { recipientWallet }) => {
if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_SUCCESS,
from: currentUser,
recipient: recipientWallet
})
)
}
}
},
onError: (error, { amount, recipientWallet }, context) => {
if (context?.previousBalance) {
const queryKey = getUserCoinQueryKey(mint)
queryClient.setQueryData(queryKey, context.previousBalance)
}

if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_FAILURE,
from: currentUser,
recipient: recipientWallet,
error: error instanceof Error ? error.message : 'Unknown error'
})
)
}
}

if (reportToSentry) {
reportToSentry({
error: error instanceof Error ? error : new Error(error as string),
name: 'Send Tokens',
additionalInfo: {
amount: amount.toString(),
mint
}
})
}
},
onSettled: () => {
const queryKey = getUserCoinQueryKey(mint)
queryClient.invalidateQueries({ queryKey })
}
})
}
4 changes: 4 additions & 0 deletions packages/common/src/utils/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,3 +450,7 @@ export const searchPage = (searchOptions: SearchOptions) => {
query: searchParams
})
}

export const solanaExplorerAddress = (address: string) => {
return `https://explorer.solana.com/address/${address}`
}
11 changes: 9 additions & 2 deletions packages/harmony/src/components/hint/Hint.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,21 @@ import { IconQuestionCircle } from '~harmony/icons'

type HintProps = {
icon?: IconComponent
noIcon?: boolean
actions?: ReactNode
} & PaperProps

/*
* A way of informing the user of important details in line in a prominent way.
*/
export const Hint = (props: HintProps) => {
const { icon: Icon = IconQuestionCircle, children, actions, ...other } = props
const {
icon: Icon = IconQuestionCircle,
children,
actions,
noIcon,
...other
} = props
return (
<Paper
role='alert'
Expand All@@ -29,7 +36,7 @@ export const Hint = (props: HintProps) => {
{...other}
>
<Flex gap='l' alignItems='center'>
<Icon size='l' color='default' />
{noIcon ? null : <Icon size='l' color='default' />}
<Text variant='body' color='default'>
{children}
</Text>
Expand Down
5 changes: 4 additions & 1 deletion packages/web/src/components/modal/ResponsiveModal.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import Drawer from 'components/drawer/Drawer'
import { useIsMobile } from 'hooks/useIsMobile'

export type ResponsiveModalProps = {
className?: string
// Core props
isOpen: boolean
onClose: () => void
Expand DownExpand Up@@ -68,7 +69,8 @@ const ResponsiveModal = ({
showDismissButton,
zIndex,
renderAsDrawer,
renderAsModal
renderAsModal,
className
}: ResponsiveModalProps) => {
const isMobile = useIsMobile()
const shouldRenderAsDrawer = renderAsDrawer ?? (isMobile && !renderAsModal)
Expand DownExpand Up@@ -123,6 +125,7 @@ const ResponsiveModal = ({
size={getModalSize(size)}
zIndex={zIndex}
dismissOnClickOutside={dismissOnClickOutside}
className={className}
>
{(title || Icon || subtitle) && (
<ModalHeader showDismissButton={showDismissButton}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,6 +174,7 @@ export * from './tan-query/wallets/useWalletCollectibles'
export * from './tan-query/wallets/useWalletOwner'
export * from './tan-query/wallets/useUSDCBalance'
export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/wallets/useSendTokens'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const QUERY_KEYS = {
tokenPrice: 'tokenPrice',
usdcBalance: 'usdcBalance',
fileSizes: 'fileSizes',
sendTokens: 'sendTokens',
managedAccounts: 'managedAccounts',
userManagers: 'userManagers',
reactions: 'reactions',
Expand Down
163 changes: 163 additions & 0 deletions packages/common/src/api/tan-query/wallets/useSendTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
import { AudioWei } from '@audius/fixed-decimal'
import { useMutation, useQueryClient } from '@tanstack/react-query'

import { useQueryContext } from '~/api/tan-query/utils'
import { Name, SolanaWalletAddress } from '~/models'
import { getErrorMessage } from '~/utils'

import { getUserCoinQueryKey } from '../coins/useUserCoin'
import { useWalletAddresses } from '../users/account/useWalletAddresses'

import { useTokenBalance } from './useTokenBalance'

export type SendTokensParams = {
recipientWallet: SolanaWalletAddress
amount: AudioWei
}

export type SendTokensResult = {
signature: string
success: boolean
}

/**
* Hook for sending tokens on Solana blockchain.
* This hook handles only Solana transfers, not ETH transfers.
*
* @returns Mutation object with sendTokens function and status
*/
export const useSendTokens = ({ mint }: { mint: string }) => {
const queryClient = useQueryClient()
const { audiusBackend, audiusSdk, reportToSentry, analytics, env } =
useQueryContext()
const { data: walletAddresses } = useWalletAddresses()

const { data: tokenBalance } = useTokenBalance({ mint })

return useMutation({
mutationFn: async ({
recipientWallet,
amount
}: SendTokensParams): Promise<SendTokensResult> => {
try {
// For now, we only support wAUDIO transfers
// This can be extended to support other tokens in the future
if (mint !== env.WAUDIO_MINT_ADDRESS) {
throw new Error(`Token mint ${mint} is not supported for sending`)
}

const currentUser = walletAddresses?.currentUser
if (!currentUser) {
throw new Error('Failed to retrieve current user wallet address')
}

const sdk = await audiusSdk()

if (!tokenBalance?.balance || tokenBalance.balance.value < amount) {
throw new Error('Insufficient balance to send tokens')
}

await audiusBackend.sendWAudioTokens({

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.

so we don't have a send in sdk yet?

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.

i think it technically uses sdk but is a weird wrapper function

address: recipientWallet,
amount,
ethAddress: currentUser,
sdk
})

return {
signature: 'success', // The backend doesn't return a signature, so we use a placeholder
success: true
}
} catch (error) {
console.error('Error sending tokens:', error)

const errorMessage = getErrorMessage(error)

if (errorMessage === 'Missing social proof') {
throw new Error('Missing social proof')
}
if (
errorMessage ===
'Recipient has no $AUDIO token account. Please install Phantom-Wallet to create one.'
) {
throw new Error(errorMessage)
}

throw new Error('Something has gone wrong, please try again.')
}
},
onMutate: async ({ amount }) => {
const queryKey = getUserCoinQueryKey(mint)
await queryClient.cancelQueries({ queryKey })

const previousBalance = queryClient.getQueryData(queryKey)

if (previousBalance) {
queryClient.setQueryData(queryKey, (old: any) => {
if (!old) return old

return {
...old,
balance: old.balance - amount,
accounts: old.accounts?.map((account: any) =>
account.isInAppWallet
? { ...account, balance: account.balance - amount }
: account
)
}
})
}

return { previousBalance }
},
onSuccess: (_, { recipientWallet }) => {
if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_SUCCESS,
from: currentUser,
recipient: recipientWallet
})
)
}
}
},
onError: (error, { amount, recipientWallet }, context) => {
if (context?.previousBalance) {
const queryKey = getUserCoinQueryKey(mint)
queryClient.setQueryData(queryKey, context.previousBalance)
}

if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_FAILURE,
from: currentUser,
recipient: recipientWallet,
error: error instanceof Error ? error.message : 'Unknown error'
})
)
}
}

if (reportToSentry) {
reportToSentry({
error: error instanceof Error ? error : new Error(error as string),
name: 'Send Tokens',
additionalInfo: {
amount: amount.toString(),
mint
}
})
}
},
onSettled: () => {
const queryKey = getUserCoinQueryKey(mint)
queryClient.invalidateQueries({ queryKey })
}
})
}
4 changes: 4 additions & 0 deletions packages/common/src/utils/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,3 +450,7 @@ export const searchPage = (searchOptions: SearchOptions) => {
query: searchParams
})
}

export const solanaExplorerAddress = (address: string) => {
return `https://explorer.solana.com/address/${address}`
}
11 changes: 9 additions & 2 deletions packages/harmony/src/components/hint/Hint.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,21 @@ import { IconQuestionCircle } from '~harmony/icons'

type HintProps = {
icon?: IconComponent
noIcon?: boolean
actions?: ReactNode
} & PaperProps

/*
* A way of informing the user of important details in line in a prominent way.
*/
export const Hint = (props: HintProps) => {
const { icon: Icon = IconQuestionCircle, children, actions, ...other } = props
const {
icon: Icon = IconQuestionCircle,
children,
actions,
noIcon,
...other
} = props
return (
<Paper
role='alert'
Expand All@@ -29,7 +36,7 @@ export const Hint = (props: HintProps) => {
{...other}
>
<Flex gap='l' alignItems='center'>
<Icon size='l' color='default' />
{noIcon ? null : <Icon size='l' color='default' />}
<Text variant='body' color='default'>
{children}
</Text>
Expand Down
5 changes: 4 additions & 1 deletion packages/web/src/components/modal/ResponsiveModal.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import Drawer from 'components/drawer/Drawer'
import { useIsMobile } from 'hooks/useIsMobile'

export type ResponsiveModalProps = {
className?: string
// Core props
isOpen: boolean
onClose: () => void
Expand DownExpand Up@@ -68,7 +69,8 @@ const ResponsiveModal = ({
showDismissButton,
zIndex,
renderAsDrawer,
renderAsModal
renderAsModal,
className
}: ResponsiveModalProps) => {
const isMobile = useIsMobile()
const shouldRenderAsDrawer = renderAsDrawer ?? (isMobile && !renderAsModal)
Expand DownExpand Up@@ -123,6 +125,7 @@ const ResponsiveModal = ({
size={getModalSize(size)}
zIndex={zIndex}
dismissOnClickOutside={dismissOnClickOutside}
className={className}
>
{(title || Icon || subtitle) && (
<ModalHeader showDismissButton={showDismissButton}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,6 +174,7 @@ export * from './tan-query/wallets/useWalletCollectibles'
export * from './tan-query/wallets/useWalletOwner'
export * from './tan-query/wallets/useUSDCBalance'
export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/wallets/useSendTokens'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const QUERY_KEYS = {
tokenPrice: 'tokenPrice',
usdcBalance: 'usdcBalance',
fileSizes: 'fileSizes',
sendTokens: 'sendTokens',
managedAccounts: 'managedAccounts',
userManagers: 'userManagers',
reactions: 'reactions',
Expand Down
163 changes: 163 additions & 0 deletions packages/common/src/api/tan-query/wallets/useSendTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
import { AudioWei } from '@audius/fixed-decimal'
import { useMutation, useQueryClient } from '@tanstack/react-query'

import { useQueryContext } from '~/api/tan-query/utils'
import { Name, SolanaWalletAddress } from '~/models'
import { getErrorMessage } from '~/utils'

import { getUserCoinQueryKey } from '../coins/useUserCoin'
import { useWalletAddresses } from '../users/account/useWalletAddresses'

import { useTokenBalance } from './useTokenBalance'

export type SendTokensParams = {
recipientWallet: SolanaWalletAddress
amount: AudioWei
}

export type SendTokensResult = {
signature: string
success: boolean
}

/**
* Hook for sending tokens on Solana blockchain.
* This hook handles only Solana transfers, not ETH transfers.
*
* @returns Mutation object with sendTokens function and status
*/
export const useSendTokens = ({ mint }: { mint: string }) => {
const queryClient = useQueryClient()
const { audiusBackend, audiusSdk, reportToSentry, analytics, env } =
useQueryContext()
const { data: walletAddresses } = useWalletAddresses()

const { data: tokenBalance } = useTokenBalance({ mint })

return useMutation({
mutationFn: async ({
recipientWallet,
amount
}: SendTokensParams): Promise<SendTokensResult> => {
try {
// For now, we only support wAUDIO transfers
// This can be extended to support other tokens in the future
if (mint !== env.WAUDIO_MINT_ADDRESS) {
throw new Error(`Token mint ${mint} is not supported for sending`)
}

const currentUser = walletAddresses?.currentUser
if (!currentUser) {
throw new Error('Failed to retrieve current user wallet address')
}

const sdk = await audiusSdk()

if (!tokenBalance?.balance || tokenBalance.balance.value < amount) {
throw new Error('Insufficient balance to send tokens')
}

await audiusBackend.sendWAudioTokens({

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.

so we don't have a send in sdk yet?

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.

i think it technically uses sdk but is a weird wrapper function

address: recipientWallet,
amount,
ethAddress: currentUser,
sdk
})

return {
signature: 'success', // The backend doesn't return a signature, so we use a placeholder
success: true
}
} catch (error) {
console.error('Error sending tokens:', error)

const errorMessage = getErrorMessage(error)

if (errorMessage === 'Missing social proof') {
throw new Error('Missing social proof')
}
if (
errorMessage ===
'Recipient has no $AUDIO token account. Please install Phantom-Wallet to create one.'
) {
throw new Error(errorMessage)
}

throw new Error('Something has gone wrong, please try again.')
}
},
onMutate: async ({ amount }) => {
const queryKey = getUserCoinQueryKey(mint)
await queryClient.cancelQueries({ queryKey })

const previousBalance = queryClient.getQueryData(queryKey)

if (previousBalance) {
queryClient.setQueryData(queryKey, (old: any) => {
if (!old) return old

return {
...old,
balance: old.balance - amount,
accounts: old.accounts?.map((account: any) =>
account.isInAppWallet
? { ...account, balance: account.balance - amount }
: account
)
}
})
}

return { previousBalance }
},
onSuccess: (_, { recipientWallet }) => {
if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_SUCCESS,
from: currentUser,
recipient: recipientWallet
})
)
}
}
},
onError: (error, { amount, recipientWallet }, context) => {
if (context?.previousBalance) {
const queryKey = getUserCoinQueryKey(mint)
queryClient.setQueryData(queryKey, context.previousBalance)
}

if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_FAILURE,
from: currentUser,
recipient: recipientWallet,
error: error instanceof Error ? error.message : 'Unknown error'
})
)
}
}

if (reportToSentry) {
reportToSentry({
error: error instanceof Error ? error : new Error(error as string),
name: 'Send Tokens',
additionalInfo: {
amount: amount.toString(),
mint
}
})
}
},
onSettled: () => {
const queryKey = getUserCoinQueryKey(mint)
queryClient.invalidateQueries({ queryKey })
}
})
}
4 changes: 4 additions & 0 deletions packages/common/src/utils/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,3 +450,7 @@ export const searchPage = (searchOptions: SearchOptions) => {
query: searchParams
})
}

export const solanaExplorerAddress = (address: string) => {
return `https://explorer.solana.com/address/${address}`
}
11 changes: 9 additions & 2 deletions packages/harmony/src/components/hint/Hint.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,21 @@ import { IconQuestionCircle } from '~harmony/icons'

type HintProps = {
icon?: IconComponent
noIcon?: boolean
actions?: ReactNode
} & PaperProps

/*
* A way of informing the user of important details in line in a prominent way.
*/
export const Hint = (props: HintProps) => {
const { icon: Icon = IconQuestionCircle, children, actions, ...other } = props
const {
icon: Icon = IconQuestionCircle,
children,
actions,
noIcon,
...other
} = props
return (
<Paper
role='alert'
Expand All@@ -29,7 +36,7 @@ export const Hint = (props: HintProps) => {
{...other}
>
<Flex gap='l' alignItems='center'>
<Icon size='l' color='default' />
{noIcon ? null : <Icon size='l' color='default' />}
<Text variant='body' color='default'>
{children}
</Text>
Expand Down
5 changes: 4 additions & 1 deletion packages/web/src/components/modal/ResponsiveModal.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import Drawer from 'components/drawer/Drawer'
import { useIsMobile } from 'hooks/useIsMobile'

export type ResponsiveModalProps = {
className?: string
// Core props
isOpen: boolean
onClose: () => void
Expand DownExpand Up@@ -68,7 +69,8 @@ const ResponsiveModal = ({
showDismissButton,
zIndex,
renderAsDrawer,
renderAsModal
renderAsModal,
className
}: ResponsiveModalProps) => {
const isMobile = useIsMobile()
const shouldRenderAsDrawer = renderAsDrawer ?? (isMobile && !renderAsModal)
Expand DownExpand Up@@ -123,6 +125,7 @@ const ResponsiveModal = ({
size={getModalSize(size)}
zIndex={zIndex}
dismissOnClickOutside={dismissOnClickOutside}
className={className}
>
{(title || Icon || subtitle) && (
<ModalHeader showDismissButton={showDismissButton}>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,6 +174,7 @@ export * from './tan-query/wallets/useWalletCollectibles'
export * from './tan-query/wallets/useWalletOwner'
export * from './tan-query/wallets/useUSDCBalance'
export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/wallets/useSendTokens'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,6 +98,7 @@ export const QUERY_KEYS = {
tokenPrice: 'tokenPrice',
usdcBalance: 'usdcBalance',
fileSizes: 'fileSizes',
sendTokens: 'sendTokens',
managedAccounts: 'managedAccounts',
userManagers: 'userManagers',
reactions: 'reactions',
Expand Down
163 changes: 163 additions & 0 deletions packages/common/src/api/tan-query/wallets/useSendTokens.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
import { AudioWei } from '@audius/fixed-decimal'
import { useMutation, useQueryClient } from '@tanstack/react-query'

import { useQueryContext } from '~/api/tan-query/utils'
import { Name, SolanaWalletAddress } from '~/models'
import { getErrorMessage } from '~/utils'

import { getUserCoinQueryKey } from '../coins/useUserCoin'
import { useWalletAddresses } from '../users/account/useWalletAddresses'

import { useTokenBalance } from './useTokenBalance'

export type SendTokensParams = {
recipientWallet: SolanaWalletAddress
amount: AudioWei
}

export type SendTokensResult = {
signature: string
success: boolean
}

/**
* Hook for sending tokens on Solana blockchain.
* This hook handles only Solana transfers, not ETH transfers.
*
* @returns Mutation object with sendTokens function and status
*/
export const useSendTokens = ({ mint }: { mint: string }) => {
const queryClient = useQueryClient()
const { audiusBackend, audiusSdk, reportToSentry, analytics, env } =
useQueryContext()
const { data: walletAddresses } = useWalletAddresses()

const { data: tokenBalance } = useTokenBalance({ mint })

return useMutation({
mutationFn: async ({
recipientWallet,
amount
}: SendTokensParams): Promise<SendTokensResult> => {
try {
// For now, we only support wAUDIO transfers
// This can be extended to support other tokens in the future
if (mint !== env.WAUDIO_MINT_ADDRESS) {
throw new Error(`Token mint ${mint} is not supported for sending`)
}

const currentUser = walletAddresses?.currentUser
if (!currentUser) {
throw new Error('Failed to retrieve current user wallet address')
}

const sdk = await audiusSdk()

if (!tokenBalance?.balance || tokenBalance.balance.value < amount) {
throw new Error('Insufficient balance to send tokens')
}

await audiusBackend.sendWAudioTokens({

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.

so we don't have a send in sdk yet?

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.

i think it technically uses sdk but is a weird wrapper function

address: recipientWallet,
amount,
ethAddress: currentUser,
sdk
})

return {
signature: 'success', // The backend doesn't return a signature, so we use a placeholder
success: true
}
} catch (error) {
console.error('Error sending tokens:', error)

const errorMessage = getErrorMessage(error)

if (errorMessage === 'Missing social proof') {
throw new Error('Missing social proof')
}
if (
errorMessage ===
'Recipient has no $AUDIO token account. Please install Phantom-Wallet to create one.'
) {
throw new Error(errorMessage)
}

throw new Error('Something has gone wrong, please try again.')
}
},
onMutate: async ({ amount }) => {
const queryKey = getUserCoinQueryKey(mint)
await queryClient.cancelQueries({ queryKey })

const previousBalance = queryClient.getQueryData(queryKey)

if (previousBalance) {
queryClient.setQueryData(queryKey, (old: any) => {
if (!old) return old

return {
...old,
balance: old.balance - amount,
accounts: old.accounts?.map((account: any) =>
account.isInAppWallet
? { ...account, balance: account.balance - amount }
: account
)
}
})
}

return { previousBalance }
},
onSuccess: (_, { recipientWallet }) => {
if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_SUCCESS,
from: currentUser,
recipient: recipientWallet
})
)
}
}
},
onError: (error, { amount, recipientWallet }, context) => {
if (context?.previousBalance) {
const queryKey = getUserCoinQueryKey(mint)
queryClient.setQueryData(queryKey, context.previousBalance)
}

if (analytics) {
const currentUser = walletAddresses?.currentUser
if (currentUser) {
analytics.track(
analytics.make({
eventName: Name.SEND_AUDIO_FAILURE,
from: currentUser,
recipient: recipientWallet,
error: error instanceof Error ? error.message : 'Unknown error'
})
)
}
}

if (reportToSentry) {
reportToSentry({
error: error instanceof Error ? error : new Error(error as string),
name: 'Send Tokens',
additionalInfo: {
amount: amount.toString(),
mint
}
})
}
},
onSettled: () => {
const queryKey = getUserCoinQueryKey(mint)
queryClient.invalidateQueries({ queryKey })
}
})
}
4 changes: 4 additions & 0 deletions packages/common/src/utils/route.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,3 +450,7 @@ export const searchPage = (searchOptions: SearchOptions) => {
query: searchParams
})
}

export const solanaExplorerAddress = (address: string) => {
return `https://explorer.solana.com/address/${address}`
}
11 changes: 9 additions & 2 deletions packages/harmony/src/components/hint/Hint.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,21 @@ import { IconQuestionCircle } from '~harmony/icons'

type HintProps = {
icon?: IconComponent
noIcon?: boolean
actions?: ReactNode
} & PaperProps

/*
* A way of informing the user of important details in line in a prominent way.
*/
export const Hint = (props: HintProps) => {
const { icon: Icon = IconQuestionCircle, children, actions, ...other } = props
const {
icon: Icon = IconQuestionCircle,
children,
actions,
noIcon,
...other
} = props
return (
<Paper
role='alert'
Expand All@@ -29,7 +36,7 @@ export const Hint = (props: HintProps) => {
{...other}
>
<Flex gap='l' alignItems='center'>
<Icon size='l' color='default' />
{noIcon ? null : <Icon size='l' color='default' />}
<Text variant='body' color='default'>
{children}
</Text>
Expand Down
5 changes: 4 additions & 1 deletion packages/web/src/components/modal/ResponsiveModal.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import Drawer from 'components/drawer/Drawer'
import { useIsMobile } from 'hooks/useIsMobile'

export type ResponsiveModalProps = {
className?: string
// Core props
isOpen: boolean
onClose: () => void
Expand DownExpand Up@@ -68,7 +69,8 @@ const ResponsiveModal = ({
showDismissButton,
zIndex,
renderAsDrawer,
renderAsModal
renderAsModal,
className
}: ResponsiveModalProps) => {
const isMobile = useIsMobile()
const shouldRenderAsDrawer = renderAsDrawer ?? (isMobile && !renderAsModal)
Expand DownExpand Up@@ -123,6 +125,7 @@ const ResponsiveModal = ({
size={getModalSize(size)}
zIndex={zIndex}
dismissOnClickOutside={dismissOnClickOutside}
className={className}
>
{(title || Icon || subtitle) && (
<ModalHeader showDismissButton={showDismissButton}>
Expand Down
Loading