diff --git a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx index 5ad24bf7f..3db0a6dfe 100644 --- a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx +++ b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx @@ -11,10 +11,9 @@ import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit'; export type Metric = components['schemas']['vegaDispatchMetric']; export type Strategy = components['schemas']['vegaDispatchStrategy']; -export const wrapperClasses = - 'border border-vega-light-150 dark:border-vega-dark-200 rounded-md pv-2 mb-5 w-full sm:w-3/4 min-w-[200px] '; +export const wrapperClasses = 'border pv-2 w-full flex-auto basis-full'; export const headerClasses = - 'bg-solid bg-vega-light-150 dark:bg-vega-dark-150 border-vega-light-150 text-center text-xl py-2 font-alpha calt'; + 'bg-solid bg-vega-light-150 dark:bg-vega-dark-150 text-center text-xl py-2 font-alpha calt'; const metricLabels: Record = { DISPATCH_METRIC_UNSPECIFIED: 'Unknown metric', diff --git a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-status.tsx b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-status.tsx index d90335f8a..faa6be065 100644 --- a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-status.tsx +++ b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-status.tsx @@ -20,7 +20,7 @@ interface TransferStatusProps { */ export function TransferStatusView({ status, loading }: TransferStatusProps) { if (!status) { - return null; + status = TransferStatus.STATUS_PENDING; } return ( @@ -28,7 +28,9 @@ export function TransferStatusView({ status, loading }: TransferStatusProps) {

{t('Transfer Status')}

{loading ? ( - +
+ +
) : ( <>

diff --git a/apps/explorer/src/app/components/txs/details/transfer/transfer-details.tsx b/apps/explorer/src/app/components/txs/details/transfer/transfer-details.tsx index eee1eddce..56140318c 100644 --- a/apps/explorer/src/app/components/txs/details/transfer/transfer-details.tsx +++ b/apps/explorer/src/app/components/txs/details/transfer/transfer-details.tsx @@ -10,7 +10,7 @@ export type Recurring = components['schemas']['commandsv1RecurringTransfer']; export type Metric = components['schemas']['vegaDispatchMetric']; export const wrapperClasses = - 'border border-vega-light-150 dark:border-vega-dark-200 rounded-md pv-2 mb-5 w-full sm:w-1/4 min-w-[200px] '; + 'border border-vega-light-150 dark:border-vega-dark-200 pv-2 w-full sm:w-1/3 basis-1/3'; export const headerClasses = 'bg-solid bg-vega-light-150 dark:bg-vega-dark-150 border-vega-light-150 text-center text-xl py-2 font-alpha calt'; @@ -42,12 +42,10 @@ export function TransferDetails({ transfer, from, id }: TransferDetailsProps) { : data?.transfer?.status; return ( -

+
- {status ? ( - - ) : null} {recurring ? : null} + {recurring && recurring.dispatchStrategy ? ( ) : null} diff --git a/apps/explorer/src/app/components/txs/details/tx-transfer.tsx b/apps/explorer/src/app/components/txs/details/tx-transfer.tsx index 3b9fed1e1..3908aeb8d 100644 --- a/apps/explorer/src/app/components/txs/details/tx-transfer.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-transfer.tsx @@ -13,6 +13,7 @@ import { SPECIAL_CASE_NETWORK_ID, } from '../../links/party-link/party-link'; import { txSignatureToDeterministicId } from '../lib/deterministic-ids'; +import Hash from '../../links/hash'; type Transfer = components['schemas']['commandsv1Transfer']; @@ -70,7 +71,9 @@ export const TxDetailsTransfer = ({ {t('Transfer ID')} - {id} + + +