[WALL] [Fix] Rostislav / WALL-3134 & 3136 / Pending transactions UI i…

…ssues (#12460) * fix: the thing * fix: correction + other bug * fix: more of wall-3136 * fix: don't center confirmations on desktop
binary-com · Dec 22, 2023 · 23c23d2 · 23c23d2 · vercel · Dec 22, 2023
1 parent 42f6dc7
commit 23c23d2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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
@@ -87,11 +87,14 @@ const Transactions = () => {
             {isPendingActive && (
                 <TransactionsPending filter={filtersMapper.pending[filterValue] as TTransactionsPendingFilter} />
             )}
-            {wallet?.is_virtual && filterValue === 'deposit' ? (
-                <TransactionsCompletedDemoResetBalance />
-            ) : (
-                <TransactionsCompleted filter={filtersMapper.completed[filterValue] as TTransactionCompletedFilter} />
-            )}
+            {!isPendingActive &&
+                (wallet?.is_virtual && filterValue === 'deposit' ? (
+                    <TransactionsCompletedDemoResetBalance />
+                ) : (
+                    <TransactionsCompleted
+                        filter={filtersMapper.completed[filterValue] as TTransactionCompletedFilter}
+                    />
+                ))}
         </div>
     );
 };

diff --git a/...ures/cashier/modules/Transactions/components/TransactionsPending/TransactionsPending.scss b/...ures/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/...cashier/modules/Transactions/components/TransactionsPendingRow/TransactionsPendingRow.tsx b/...cashier/modules/Transactions/components/TransactionsPendingRow/TransactionsPendingRow.tsx
@@ -117,9 +117,6 @@ const TransactionsCryptoRow: React.FC<TProps> = ({ transaction }) => {
                     className={{ 'wallets-transactions-pending-row__transaction-confirmations': !isMobile }}
                     name='Confirmations'
                     value={transaction.formatted_confirmations.toString()}
-                    valueTextProps={{
-                        align: isMobile ? 'start' : 'center',
-                    }}
                 />
                 {isMobile && (
                     <React.Fragment>