Skip to content

Commit

Permalink
fix: activity list items
Browse files Browse the repository at this point in the history
  • Loading branch information
fbwoolf committed Feb 5, 2024
1 parent 4e6cd7d commit c01626b
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 84 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ import { useGetInscriptionsByOutputQuery } from '@app/query/bitcoin/ordinals/ins
import { useCurrentAccountNativeSegwitAddressIndexZero } from '@app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks';
import { BulletSeparator } from '@app/ui/components/bullet-separator/bullet-separator';
import { BtcIcon } from '@app/ui/components/icons/btc-icon';
import { Caption } from '@app/ui/components/typography/caption';

import { TransactionItemLayout } from '../transaction-item/transaction-item.layout';
import { BitcoinTransactionCaption } from './bitcoin-transaction-caption';
import { BitcoinTransactionIcon } from './bitcoin-transaction-icon';
import { InscriptionIcon } from './bitcoin-transaction-inscription-icon';
import { BitcoinTransactionStatus } from './bitcoin-transaction-status';
import { BitcoinTransactionValue } from './bitcoin-transaction-value';

interface BitcoinTransactionItemProps {
transaction: BitcoinTx;
Expand Down Expand Up @@ -76,13 +75,10 @@ export function BitcoinTransactionItem({ transaction }: BitcoinTransactionItemPr

const txCaption = (
<BulletSeparator>
<BitcoinTransactionCaption>{caption}</BitcoinTransactionCaption>
{inscriptionData ? (
<BitcoinTransactionCaption>{inscriptionData.mime_type}</BitcoinTransactionCaption>
) : null}
<Caption>{caption}</Caption>
{inscriptionData ? <Caption>{inscriptionData.mime_type}</Caption> : null}
</BulletSeparator>
);
const txValue = <BitcoinTransactionValue>{value}</BitcoinTransactionValue>;

const title = inscriptionData ? `Ordinal inscription #${inscriptionData.number}` : 'Bitcoin';
const increaseFeeButton = (
Expand All @@ -107,7 +103,7 @@ export function BitcoinTransactionItem({ transaction }: BitcoinTransactionItemPr
}
txStatus={<BitcoinTransactionStatus transaction={transaction} />}
txTitle={<TransactionTitle title={title} />}
txValue={txValue}
txValue={value}
/>
);
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { BitcoinTx } from '@shared/models/transactions/bitcoin-transaction.model';

import { PendingLabel } from '@app/components/transaction/pending-label';
import { BasicTooltip } from '@app/ui/components/tooltip/basic-tooltip';
import { Caption } from '@app/ui/components/typography/caption';

interface BitcoinTransactionStatusProps {
transaction: BitcoinTx;
Expand All @@ -10,5 +11,9 @@ const pendingWaitingMessage =

export function BitcoinTransactionStatus({ transaction }: BitcoinTransactionStatusProps) {
const isPending = !transaction.status.confirmed;
return isPending ? <PendingLabel pendingWaitingMessage={pendingWaitingMessage} /> : null;
return isPending ? (
<BasicTooltip asChild label={pendingWaitingMessage} side="bottom">
<Caption color="warning.label">Pending</Caption>
</BasicTooltip>
) : null;
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function IncreaseFeeButton(props: IncreaseFeeButtonProps) {
position="relative"
px="space.02"
py="space.01"
rounded="8px"
rounded="xs"
type="button"
zIndex={999}
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { createSearchParams, useLocation, useNavigate } from 'react-router-dom';

import { styled } from 'leather-styles/jsx';

import { StacksTx, TxTransferDetails } from '@shared/models/transactions/stacks-transaction.model';
import { RouteUrls } from '@shared/route-urls';

Expand Down Expand Up @@ -85,22 +83,16 @@ export function StacksTransactionItem({
/>
);
const txStatus = transaction && <StacksTransactionStatus transaction={transaction} />;
const txCaption = (
<styled.span color="accent.text-subdued" textStyle="caption.02" whiteSpace="nowrap">
{caption}
</styled.span>
);
const txValue = <styled.span textStyle="label.02">{value}</styled.span>;

return (
<TransactionItemLayout
openTxLink={openTxLink}
rightElement={isOriginator && isPending ? increaseFeeButton : undefined}
txCaption={txCaption}
txCaption={caption}
txIcon={txIcon}
txStatus={txStatus}
txTitle={<TransactionTitle title={title} />}
txValue={txValue}
txValue={value}
/>
);
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { styled } from 'leather-styles/jsx';

import { StacksTx } from '@shared/models/transactions/stacks-transaction.model';

import { isPendingTx } from '@app/common/transactions/stacks/transaction.utils';
import { BasicTooltip } from '@app/ui/components/tooltip/basic-tooltip';
import { Caption } from '@app/ui/components/typography/caption';

import { PendingLabel } from '../transaction/pending-label';
const pendingWaitingMessage =
'This transaction is waiting to be confirmed. Depending on network congestion, this may take anywhere from a few minutes, to a couple of hours.';

interface TransactionStatusProps {
transaction: StacksTx;
Expand All @@ -16,12 +16,14 @@ export function StacksTransactionStatus({ transaction }: TransactionStatusProps)

return (
<>
{isPending && <PendingLabel />}
{isPending && (
<BasicTooltip asChild label={pendingWaitingMessage} side="bottom">
<Caption color="warning.label">Pending</Caption>
</BasicTooltip>
)}
{isFailed && (
<BasicTooltip label={transaction.tx_status} side="bottom">
<styled.span color="error.label" textStyle="label.03">
Failed
</styled.span>
<Caption color="error.label">Failed</Caption>
</BasicTooltip>
)}
</>
Expand Down
12 changes: 5 additions & 7 deletions src/app/components/transaction-item/transaction-item.layout.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { ReactNode } from 'react';

import { styled } from 'leather-styles/jsx';
import { HStack, styled } from 'leather-styles/jsx';

import { ItemInteractive } from '@app/ui/components/item/item-interactive';
import { ItemLayout } from '@app/ui/components/item/item.layout';
import { Caption } from '@app/ui/components/typography/caption';

interface TransactionItemLayoutProps {
openTxLink(): void;
Expand All @@ -25,18 +26,15 @@ export function TransactionItemLayout({
txValue,
}: TransactionItemLayoutProps) {
return (
// TODO: Revisit if needed styles position="relative" zIndex={99}
<ItemInteractive onClick={openTxLink}>
<ItemLayout
flagImg={txIcon && txIcon}
titleLeft={txTitle}
captionLeft={
<>
<styled.span color="accent.text-subdued" textStyle="caption.01">
{txCaption}
</styled.span>
<HStack alignItems="center">
<Caption>{txCaption}</Caption>
{txStatus && txStatus}
</>
</HStack>
}
titleRight={
rightElement ? (
Expand Down
28 changes: 0 additions & 28 deletions src/app/components/transaction/pending-label.tsx

This file was deleted.

3 changes: 2 additions & 1 deletion src/app/components/transaction/transaction-title.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ export function TransactionTitle(props: TransactionTitleProps) {
return (
<BasicTooltip disabled={!isEllipsisActive} label={title} side="top">
<Title
fontWeight="normal"
fontWeight={500}
overflow="hidden"
ref={ref}
textOverflow="ellipsis"
textStyle="label.02"
whiteSpace="nowrap"
>
{spamFilter(title)}
Expand Down

0 comments on commit c01626b

Please sign in to comment.