Merge branch 'pending-tx-list-of-address' of https://github.com/magic…

…kbase/ckb-explorer-frontend into pending-tx-list-of-address
Magickbase · Dec 14, 2023 · dd4c667 · dd4c667
2 parents d56acfb + abcdef8
commit dd4c667
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/components/TransactionItem/index.tsx b/src/components/TransactionItem/index.tsx
@@ -67,7 +67,7 @@ const TransactionItem = ({
           >
             {transaction.transactionHash}
           </AddressText>
-          {/* transactio.blockNumber is empty string when the transaction is pending or rejected */}
+          {/* FIXME: transactio.blockNumber is empty string when the transaction is pending or rejected, this should be updated once the type declaration is fixed to number */}
           {!isBlock && transaction.blockNumber !== '' && (
             <div className="transactionItemBlock">
               {`(${t('block.block')} ${localeNumberString(transaction.blockNumber)})  ${parsedBlockCreateAt}`}

diff --git a/src/pages/Address/index.tsx b/src/pages/Address/index.tsx
@@ -82,10 +82,10 @@ export const Address = () => {
   const transactionCounts: Record<'committed' | 'pending', number | '-'> = {
     committed:
       addressInfoQuery.isFetched && addressInfoQuery.data
-        ? // FIXME: this type convertion could be removed once the type declaration of Transaction is fixed
+        ? // FIXME: this type conversion could be removed once the type declaration of Transaction is fixed
           Number(addressInfoQuery.data.transactionsCount) ?? '-'
         : '-',
-    pending: pendingTransactionCountQuery.isFetched ? pendingTransactionCountQuery.data ?? '-' : '-',
+    pending: pendingTransactionCountQuery.data ?? '-',
   }
 
   const newAddr = useNewAddr(address)

diff --git a/src/pages/Transaction/TransactionComp/TransactionOverview.tsx b/src/pages/Transaction/TransactionComp/TransactionOverview.tsx
@@ -144,12 +144,14 @@ export const TransactionOverviewCard: FC<{
   const isProfessional = layout === LayoutLiteProfessional.Professional
 
   if (tipBlockNumber && blockNumber) {
+    // FIXME: the type conversion should be removed once the type declaration is fixed to number
     confirmation = Number(tipBlockNumber) - Number(blockNumber)
   }
 
   const blockHeightData: CardCellInfo = {
     title: t('block.block_height'),
     tooltip: t('glossary.block_height'),
+    // FIXME: the type conversion should be removed once the type declaration is fixed to number
     content: <TransactionBlockHeight blockNumber={Number(blockNumber)} txStatus={txStatus} />,
     className: styles.firstCardCell,
   }