Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Token Transfers MVP #2443

Merged
merged 7 commits into from
Sep 16, 2024
Merged

Token Transfers MVP #2443

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e61a91
token transfers
onnovisser Sep 10, 2024
0c4388b
fix address param
onnovisser Sep 12, 2024
b8d2b7b
allowance
onnovisser Sep 13, 2024
aaa5052
cleanup
onnovisser Sep 13, 2024
904fa51
Merge branch 'main' into token-transfers
onnovisser Sep 13, 2024
c8f1801
Merge branch 'main' into token-transfers
onnovisser Sep 16, 2024
257621e
fix table
onnovisser Sep 16, 2024
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
25 changes: 15 additions & 10 deletions centrifuge-app/src/components/Portfolio/Holdings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { Tooltips } from '../Tooltips'
import { TransferTokensDrawer } from './TransferTokensDrawer'
import { usePortfolioTokens } from './usePortfolio'

type Row = {
export type Holding = {
currency: Token['currency']
poolId: string
trancheId: string
Expand All @@ -42,13 +42,13 @@ const columns: Column[] = [
{
align: 'left',
header: 'Token',
cell: (token: Row) => {
cell: (token: Holding) => {
return <TokenWithIcon {...token} />
},
},
{
header: <Tooltips type="cfgPrice" label="Token price" />,
cell: ({ tokenPrice }: Row) => {
cell: ({ tokenPrice }: Holding) => {
return (
<Text textOverflow="ellipsis" variant="body3">
{formatBalance(tokenPrice || 1, 'USD', 4)}
Expand All @@ -59,7 +59,7 @@ const columns: Column[] = [
},
{
header: <SortableTableHeader label="Position" />,
cell: ({ currency, position }: Row) => {
cell: ({ currency, position }: Holding) => {
return (
<Text textOverflow="ellipsis" variant="body3">
{formatBalanceAbbreviated(position || 0, currency?.symbol, 2)}
Expand All @@ -71,7 +71,7 @@ const columns: Column[] = [
},
{
header: <SortableTableHeader label="Market value" />,
cell: ({ marketValue }: Row) => {
cell: ({ marketValue }: Holding) => {
return (
<Text textOverflow="ellipsis" variant="body3">
{formatBalanceAbbreviated(marketValue || 0, 'USD', 2)}
Expand All @@ -84,12 +84,18 @@ const columns: Column[] = [
{
align: 'left',
header: '', // invest redeem buttons
cell: ({ showActions, poolId, trancheId, currency, connectedNetwork }: Row) => {
cell: ({ showActions, poolId, trancheId, currency, connectedNetwork }: Holding) => {
return (
<Grid gap={1} justifySelf="end">
{showActions ? (
trancheId ? (
<Shelf>
<RouterLinkButton to={`?receive=${poolId}.${trancheId}`} small variant="tertiary" icon={IconDownload}>
Receive
</RouterLinkButton>
<RouterLinkButton to={`?send=${poolId}.${trancheId}`} small variant="tertiary" icon={IconSend}>
Send
</RouterLinkButton>
<RouterLinkButton to={`?redeem=${poolId}.${trancheId}`} small variant="tertiary" icon={IconMinus}>
Redeem
</RouterLinkButton>
Expand Down Expand Up @@ -127,7 +133,7 @@ export function useHoldings(address?: string, chainId?: number, showActions = tr
const currencies = usePoolCurrencies()
const CFGPrice = useCFGTokenPrice()

const tokens: Row[] = [
const tokens: Holding[] = [
...portfolioTokens.map((token) => ({
...token,
tokenPrice: token.tokenPrice.toDecimal() || Dec(0),
Expand Down Expand Up @@ -179,7 +185,7 @@ export function useHoldings(address?: string, chainId?: number, showActions = tr
connectedNetwork: wallet.connectedNetworkName,
}
}) || []),
...((wallet.connectedNetworkName === 'Centrifuge' && showActions) || centBalances?.native.balance.gtn(0)
...((wallet.connectedNetwork === 'centrifuge' && showActions) || centBalances?.native.balance.gtn(0)
? [
{
currency: {
Expand Down Expand Up @@ -239,7 +245,6 @@ export function Holdings({
defaultView={openRedeemDrawer ? 'redeem' : 'invest'}
/>
<TransferTokensDrawer
address={address}
isOpen={!!(openSendDrawer || openReceiveDrawer)}
onClose={() => navigate(pathname, { replace: true })}
/>
Expand All @@ -254,7 +259,7 @@ export function Holdings({
)
}

const TokenWithIcon = ({ poolId, currency }: Row) => {
const TokenWithIcon = ({ poolId, currency }: Holding) => {
const pool = usePool(poolId, false)
const { data: metadata } = usePoolMetadata(pool)
const cent = useCentrifuge()
Expand Down
Loading
Loading