Skip to content

feat(mobile): implement token details, ref LEA-3015 #1465

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.

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

Merged
merged 2 commits into from
Jul 22, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { deserializeAccountId } from '@/store/accounts/accounts';
import { i18n } from '@lingui/core';
import { useLocalSearchParams } from 'expo-router';

import { OnChainActivity } from '@leather.io/models';
import { Text } from '@leather.io/ui/native';

import { configureAccountParamsSchema } from './';
Expand Down Expand Up @@ -44,7 +43,7 @@ export default function AccountActivityScreen() {
})}
</Screen.Title>
}
data={activity.value as OnChainActivity[]} // TODO: Unclear why was this cast. Needs clearing up.
data={activity.value.filter(activity => activity && 'asset' in activity)}
renderItem={({ item }) => <ActivityListItem activity={item} />}
keyExtractor={(_, index) => `activity.${index}`}
ListEmptyComponent={<ActivityEmpty />}
Expand Down
3 changes: 1 addition & 2 deletions apps/mobile/src/app/(tabs)/activity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { RefreshControl, useRefreshHandler } from '@/features/refresh-control/re
import { useTotalActivity } from '@/queries/activity/account-activity.query';
import { t } from '@lingui/macro';

import { OnChainActivity } from '@leather.io/models';
import { Text } from '@leather.io/ui/native';

export default function ActivityScreen() {
Expand All @@ -33,7 +32,7 @@ export default function ActivityScreen() {
<Screen.List
refreshControl={<RefreshControl />}
ListHeaderComponent={<Screen.Title>{pageTitle}</Screen.Title>}
data={activity.value as OnChainActivity[]} // TODO: Unclear why was this cast. Needs clearing up.
data={activity.value.filter(activity => activity && 'asset' in activity)}
renderItem={({ item }) => <ActivityListItem activity={item} />}
keyExtractor={(_, index) => `activity.${index}`}
ListEmptyComponent={<ActivityEmpty />}
Expand Down
46 changes: 46 additions & 0 deletions apps/mobile/src/components/summary-table.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { ReactNode } from 'react';

import { Box, HasChildren, Text } from '@leather.io/ui/native';

export function SummaryTableRoot({ children }: HasChildren) {
return <Box>{children}</Box>;
}

function SummaryTableLabel({ children }: HasChildren) {
return (
<Box flex={1}>
<Text variant="label02" color="ink.text-subdued">
{children}
</Text>
</Box>
);
}

function SummaryTableValue({ children }: HasChildren) {
return (
<Box flex={1} alignItems="flex-end">
<Text variant="label02">{children}</Text>
</Box>
);
}

interface SummaryTableItem {
label: string;
value: ReactNode;
}

export function SummaryTableItem({ label, value }: SummaryTableItem) {
return (
<Box flexDirection="row" py="2">
<SummaryTableLabel>{label}</SummaryTableLabel>
<SummaryTableValue>{value}</SummaryTableValue>
</Box>
);
}

export const SummaryTable = {
Root: SummaryTableRoot,
Item: SummaryTableItem,
Value: SummaryTableValue,
Label: SummaryTableLabel,
};
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ interface AccountListItemProps extends PressableProps {
icon: React.ReactNode;
iconTestID?: string;
testID?: string;
walletName?: string;
walletName?: React.ReactNode;
chevron?: React.ReactNode;
}
export function AccountListItem({
accountName,
Expand All @@ -18,19 +19,23 @@ export function AccountListItem({
onPress,
testID,
walletName,
chevron,
...rest
}: AccountListItemProps) {
return (
<Cell.Root pressable={true} disabled={!onPress} onPress={onPress} testID={testID} {...rest}>
<Cell.Icon testID={iconTestID}>{icon}</Cell.Icon>
<Cell.Content>
<Cell.Label variant="primary">{accountName}</Cell.Label>
<Cell.Label variant="primary" numberOfLines={1} ellipsizeMode="tail">
{accountName}
</Cell.Label>
<Cell.Label variant="secondary">{walletName}</Cell.Label>
</Cell.Content>
<Cell.Aside>
<Cell.Label variant="primary">{balance}</Cell.Label>
<Cell.Label variant="secondary">{address}</Cell.Label>
</Cell.Aside>
{chevron && <Cell.Icon>{chevron}</Cell.Icon>}
</Cell.Root>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
interface AccountSelectorHeaderProps {
sheetRef: RefObject<SheetRef | null>;
}
// TODO: refactor HeaderLayout so that we can use it here

export function AccountSelectorHeader({ sheetRef }: AccountSelectorHeaderProps) {
return (
<Box alignItems="center" flexDirection="row" justifyContent="space-between" py="5">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function AccountAvatar(props: AccountAvatarProps) {
alignItems="center"
{...props}
>
{Icon && <Icon />}
{Icon && <Icon {...props} />}
</SquircleBox>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ComponentType, ReactNode } from 'react';
import { Card } from '@/components/card';
import { Loading } from '@/components/loading/loading';
import { AccountAvatar } from '@/features/account/components/account-avatar';
import { AppIcons } from '@/features/accounts/components/app-icons';
import { AppIcons } from '@/features/account/components/app-icons';
import { AccountIcon } from '@/store/accounts/utils';

import { Box, HasChildren, PressableProps, Text } from '@leather.io/ui/native';
Expand Down
93 changes: 76 additions & 17 deletions apps/mobile/src/features/balances/balances.tsx
Original file line number Diff line number Diff line change
@@ -1,42 +1,101 @@
import { useRef, useState } from 'react';

import {
BitcoinBalance,
BitcoinBalanceByAccount,
} from '@/features/balances/bitcoin/bitcoin-balance';
import { RunesBalance, RunesBalanceByAccount } from '@/features/balances/bitcoin/runes-balance';
import { Sip10Balance, Sip10BalanceByAccount } from '@/features/balances/stacks/sip10-balance';
import { StacksBalance, StacksBalanceByAccount } from '@/features/balances/stacks/stacks-balance';
import { useRunesFlag } from '@/features/feature-flags';
import { useRunesFlag, useTokenDetailsFlag } from '@/features/feature-flags';
import { TokenSheet, TokenSheetData } from '@/features/token/token-sheet';
import { ViewMode } from '@/shared/types';

import { AccountId } from '@leather.io/models';
import { Box } from '@leather.io/ui/native';
import { AccountId, FungibleCryptoAsset, Money } from '@leather.io/models';
import { Box, SheetRef } from '@leather.io/ui/native';

export interface BalanceViewProps {
mode: ViewMode;
onPress?: ({ asset, availableBalance, quoteBalance }: OnOpenTokenProps) => void;
}

export interface OnOpenTokenProps {
asset: FungibleCryptoAsset;
availableBalance: Money;
quoteBalance: Money;
}

export function AllAccountBalances({ mode }: BalanceViewProps) {
const [sheetData, setSheetData] = useState<TokenSheetData | null>(null);
const runesFlag = useRunesFlag();
const tokenDetailsFlag = useTokenDetailsFlag();

const tokenSheetRef = useRef<SheetRef>(null);

function onOpenToken({ asset, availableBalance, quoteBalance }: OnOpenTokenProps) {
setSheetData({ asset, availableBalance, quoteBalance });
// analytics.track('token_sheet_opened', { source: 'action_bar' });
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Keeping these as a placeholder. I'll add the analytics keys soon

tokenSheetRef.current?.present();
}

const onPressToken = tokenDetailsFlag ? onOpenToken : undefined;

return (
<Box flex={1} height="100%">
<BitcoinBalance />
<StacksBalance />
<Sip10Balance mode={mode} />
{runesFlag && <RunesBalance mode={mode} />}
</Box>
<>
<Box flex={1} height="100%">
<BitcoinBalance onPress={onPressToken} />
<StacksBalance onPress={onPressToken} />
<Sip10Balance mode={mode} onPress={onPressToken} />
{runesFlag && <RunesBalance mode={mode} />}
</Box>
<TokenSheet data={sheetData} sheetRef={tokenSheetRef} />
</>
);
}

export function AccountBalances({ mode, fingerprint, accountIndex }: AccountId & BalanceViewProps) {
const [sheetData, setSheetData] = useState<TokenSheetData | null>(null);
const runesFlag = useRunesFlag();

const tokenSheetRef = useRef<SheetRef>(null);
const tokenDetailsFlag = useTokenDetailsFlag();

function onOpenToken(data: TokenSheetData) {
setSheetData(data);
// analytics.track('token_sheet_opened', { source: 'action_bar' });
tokenSheetRef.current?.present();
}

const onPressToken = tokenDetailsFlag ? onOpenToken : undefined;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have enabled tokenDetailsFlag in dev but off in production in launch darkly.

There is no way to trigger the TokenDetails sheet without entering here first


return (
<Box>
<BitcoinBalanceByAccount fingerprint={fingerprint} accountIndex={accountIndex} />
<StacksBalanceByAccount fingerprint={fingerprint} accountIndex={accountIndex} />
<Sip10BalanceByAccount mode={mode} fingerprint={fingerprint} accountIndex={accountIndex} />
{runesFlag && (
<RunesBalanceByAccount mode={mode} fingerprint={fingerprint} accountIndex={accountIndex} />
)}
</Box>
<>
<Box>
<BitcoinBalanceByAccount
onPress={onPressToken}
fingerprint={fingerprint}
accountIndex={accountIndex}
/>
<StacksBalanceByAccount
onPress={onPressToken}
fingerprint={fingerprint}
accountIndex={accountIndex}
/>
<Sip10BalanceByAccount
mode={mode}
fingerprint={fingerprint}
accountIndex={accountIndex}
onPress={onPressToken}
/>
{runesFlag && (
<RunesBalanceByAccount
mode={mode}
fingerprint={fingerprint}
accountIndex={accountIndex}
/>
)}
</Box>
<TokenSheet data={sheetData} sheetRef={tokenSheetRef} />
</>
);
}
21 changes: 13 additions & 8 deletions apps/mobile/src/features/balances/bitcoin/bitcoin-balance.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { TokenBalance } from '@/features/token/components/token-balance';
import { useBtcAccountBalance, useBtcTotalBalance } from '@/queries/balance/btc-balance.query';
import { t } from '@lingui/macro';

import { btcAsset } from '@leather.io/constants';
import { Money } from '@leather.io/models';
import { BtcAvatarIcon, PressableProps } from '@leather.io/ui/native';

import { TokenBalance } from '../token-balance';
import { OnOpenTokenProps } from '../balances';

interface BitcoinTokenBalanceProps extends PressableProps {
availableBalance?: Money;
Expand Down Expand Up @@ -37,29 +39,30 @@ export function BitcoinTokenBalance({
}

interface BitcoinBalanceProps {
onPress?(): void;
onPress?: ({ asset, availableBalance, quoteBalance }: OnOpenTokenProps) => void;
}

export function BitcoinBalance({ onPress }: BitcoinBalanceProps) {
const { state, value } = useBtcTotalBalance();

const availableBalance = value?.btc.availableBalance;
const quoteBalance = value?.quote.availableBalance;

if (!availableBalance || !quoteBalance) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I need to clean this up

return null;
}
return (
<BitcoinTokenBalance
availableBalance={availableBalance}
quoteBalance={quoteBalance}
isLoading={state === 'loading'}
onPress={onPress}
onPress={() => onPress?.({ asset: btcAsset, availableBalance, quoteBalance })}
/>
);
}

interface BitcoinBalanceByAccountProps {
accountIndex: number;
fingerprint: string;
onPress?(): void;
onPress?: ({ asset, availableBalance, quoteBalance }: OnOpenTokenProps) => void;
}
export function BitcoinBalanceByAccount({
accountIndex,
Expand All @@ -70,12 +73,14 @@ export function BitcoinBalanceByAccount({

const availableBalance = value?.btc.availableBalance;
const quoteBalance = value?.quote.availableBalance;

if (!availableBalance || !quoteBalance) {
return null;
}
return (
<BitcoinTokenBalance
availableBalance={availableBalance}
quoteBalance={quoteBalance}
onPress={onPress}
onPress={() => onPress?.({ asset: btcAsset, availableBalance, quoteBalance })}
isLoading={state === 'loading'}
/>
);
Expand Down
3 changes: 1 addition & 2 deletions apps/mobile/src/features/balances/bitcoin/runes-balance.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FetchState, FetchWrapper } from '@/components/loading';
import { BalanceViewProps } from '@/features/balances/balances';
import { TokenBalance } from '@/features/token/components/token-balance';
import {
useRunesAccountBalance,
useRunesTotalBalance,
Expand All @@ -10,8 +11,6 @@ import { AccountId, Money } from '@leather.io/models';
import { RunesAccountBalance, RunesAggregateBalance } from '@leather.io/services';
import { PressableProps, RunesAvatarIcon } from '@leather.io/ui/native';

import { TokenBalance } from '../token-balance';

interface RunesTokenBalanceProps extends PressableProps {
availableBalance?: Money;
quoteBalance?: Money;
Expand Down
Loading
Loading