diff --git a/packages/api/src/hooks/useCryptoTransactions.ts b/packages/api/src/hooks/useCryptoTransactions.ts index ee988b08b6b4..3b0d2575ccb9 100644 --- a/packages/api/src/hooks/useCryptoTransactions.ts +++ b/packages/api/src/hooks/useCryptoTransactions.ts @@ -156,7 +156,7 @@ const useCryptoTransactions = () => { /** Formatted transaction hash */ formatted_transaction_hash: transaction.transaction_hash ? getTruncatedString(transaction.transaction_hash, { type: 'middle' }) - : 'NA', + : 'Pending', /** Formatted address hash */ formatted_address_hash: transaction.address_hash ? getTruncatedString(transaction.address_hash, { type: 'middle' }) diff --git a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.scss b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.scss index 171ef3dece49..bd45024a9c4f 100644 --- a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.scss +++ b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.scss @@ -1,6 +1,7 @@ .wallets-transactions { width: 100%; height: fit-content; + min-height: 100%; display: flex; flex-direction: column; align-items: center; diff --git a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx index 620114d6264b..652d08db9acf 100644 --- a/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx +++ b/packages/wallets/src/features/cashier/modules/Transactions/Transactions.tsx @@ -87,11 +87,14 @@ const Transactions = () => { {isPendingActive && ( )} - {wallet?.is_virtual && filterValue === 'deposit' ? ( - - ) : ( - - )} + {!isPendingActive && + (wallet?.is_virtual && filterValue === 'deposit' ? ( + + ) : ( + + ))} ); }; diff --git a/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsPending/TransactionsPending.scss b/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsPending/TransactionsPending.scss index eb96af46efb9..9aa8914172ef 100644 --- a/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsPending/TransactionsPending.scss +++ b/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsPending/TransactionsPending.scss @@ -2,6 +2,8 @@ position: relative; width: 100%; max-width: 80rem; + display: flex; + flex-grow: 1; &__group-title { margin: 0 0 0.8rem 1.6rem; diff --git a/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsPendingRow/TransactionsPendingRow.tsx b/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsPendingRow/TransactionsPendingRow.tsx index 96f5bad7e00a..65ee609b29a1 100644 --- a/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsPendingRow/TransactionsPendingRow.tsx +++ b/packages/wallets/src/features/cashier/modules/Transactions/components/TransactionsPendingRow/TransactionsPendingRow.tsx @@ -117,9 +117,6 @@ const TransactionsCryptoRow: React.FC = ({ transaction }) => { className={{ 'wallets-transactions-pending-row__transaction-confirmations': !isMobile }} name='Confirmations' value={transaction.formatted_confirmations.toString()} - valueTextProps={{ - align: isMobile ? 'start' : 'center', - }} /> {isMobile && (