Merge branch 'develop' of https://github.com/magickbase/ckb-explorer-…

…frontend into develop
nervosnetwork · Dec 18, 2024 · 39b4589 · 39b4589
2 parents 09779c0 + b32833f
commit 39b4589
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/components/TransactionParameters/index.tsx b/src/components/TransactionParameters/index.tsx
@@ -3,7 +3,7 @@ import { FC, ReactNode } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { Link } from 'react-router-dom'
 import classNames from 'classnames'
-import { useCKBNode } from '../../hooks/useCKBNode'
+import { explorerService } from '../../services/ExplorerService'
 import { matchTxHash } from '../../utils/util'
 import Loading from '../AwesomeLoadings/Spinner'
 import HashTag from '../HashTag'
@@ -48,9 +48,8 @@ const Field = ({
 
 const TransactionParameters: FC<{ hash: string }> = ({ hash }) => {
   const [t] = useTranslation()
-  const { nodeService } = useCKBNode()
 
-  const { data, isLoading } = useQuery(['tx', hash], () => nodeService.getTx(hash))
+  const { data, isLoading } = useQuery(['explorer-tx', hash], () => explorerService.api.fetchTransactionByHash(hash))
   if (isLoading) {
     return (
       <div className={styles.loading}>
@@ -59,9 +58,9 @@ const TransactionParameters: FC<{ hash: string }> = ({ hash }) => {
     )
   }
 
-  if (!data?.result?.transaction) return <div>{`Transaction ${hash} not loaded`}</div>
+  if (!data) return <div>{`Transaction ${hash} not loaded`}</div>
 
-  const { header_deps: headerDeps, cell_deps: cellDeps, witnesses } = data.result.transaction
+  const { headerDeps, cellDeps, witnesses } = data
 
   const parameters = [
     {
@@ -84,8 +83,8 @@ const TransactionParameters: FC<{ hash: string }> = ({ hash }) => {
       content: cellDeps.length ? (
         cellDeps.map(cellDep => {
           const {
-            out_point: { tx_hash: txHash, index },
-            dep_type: depType,
+            outPoint: { txHash, index },
+            depType,
           } = cellDep
           const hashTag = matchTxHash(txHash, Number(index))
           return (

diff --git a/src/models/Transaction/index.ts b/src/models/Transaction/index.ts
@@ -35,6 +35,9 @@ export interface Transaction {
   maxCyclesInEpoch: number | null
   maxCycles: number | null
   createTimestamp?: number
+  cellDeps: CellDep[]
+  headerDeps: string[]
+  witnesses: string[]
 }
 
 export interface BtcTx {

diff --git a/src/pages/Transaction/state.ts b/src/pages/Transaction/state.ts
@@ -26,6 +26,9 @@ export const defaultTransactionInfo: Transaction = {
   cycles: null,
   maxCyclesInEpoch: null,
   maxCycles: null,
+  cellDeps: [],
+  headerDeps: [],
+  witnesses: [],
 }
 
 export const defaultTransactionLiteDetails: TransactionRecord[] = [

diff --git a/src/utils/transformer.ts b/src/utils/transformer.ts
@@ -35,6 +35,9 @@ export const transformToTransaction = (
     cycles: null,
     maxCyclesInEpoch: null,
     maxCycles: null,
+    cellDeps: [],
+    headerDeps: [],
+    witnesses: [],
   }
 }