fix: url to inner transaction when viewing groups (#40)

algorandfoundation · May 1, 2024 · b36918d · b36918d
1 parent a6b4e94
commit b36918d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/src/features/transactions/components/__snapshots__/group-graph.group-1.html b/src/features/transactions/components/__snapshots__/group-graph.group-1.html
@@ -288,7 +288,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/1"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/1"
           >
             Inner 1
           </a>
@@ -419,7 +419,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/2"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/2"
           >
             Inner 2
           </a>
@@ -532,7 +532,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/2-1"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/2-1"
           >
             Inner 2-1
           </a>
@@ -641,7 +641,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/3"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/3"
           >
             Inner 3
           </a>
@@ -752,7 +752,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/4"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/4"
           >
             Inner 4
           </a>
@@ -865,7 +865,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/4-1"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/4-1"
           >
             Inner 4-1
           </a>
@@ -972,7 +972,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/5"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/5"
           >
             Inner 5
           </a>
@@ -1082,7 +1082,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/6"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/6"
           >
             Inner 6
           </a>
@@ -1195,7 +1195,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/6-1"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/6-1"
           >
             Inner 6-1
           </a>
@@ -1301,7 +1301,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/7"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/7"
           >
             Inner 7
           </a>
@@ -1410,7 +1410,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/8"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/8"
           >
             Inner 8
           </a>
@@ -1519,7 +1519,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/8-1"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/8-1"
           >
             Inner 8-1
           </a>
@@ -1642,7 +1642,7 @@
         >
           <a
             class="text-primary underline"
-            href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/9"
+            href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/9"
           >
             Inner 9
           </a>

diff --git a/src/features/transactions/components/inner-transaction-link.tsx b/src/features/transactions/components/inner-transaction-link.tsx
@@ -4,16 +4,20 @@ import { Urls } from '@/routes/urls'
 import { PropsWithChildren } from 'react'
 
 type Props = PropsWithChildren<{
+  transactionId: string
   innerTransactionId: string
   className?: string
 }>
 
-export function InnerTransactionLink({ innerTransactionId, className, children }: Props) {
+export function InnerTransactionLink({ transactionId, innerTransactionId, className, children }: Props) {
   return (
     <TemplatedNavLink
       className={cn(!children && 'text-primary underline', className)}
       urlTemplate={Urls.Explore.Transaction.ById.Inner.ById}
-      urlParams={{ innerTransactionId: innerTransactionId }}
+      urlParams={{
+        transactionId: transactionId,
+        innerTransactionId: innerTransactionId,
+      }}
     >
       {children ? children : `Inner ${innerTransactionId}`}
     </TemplatedNavLink>

diff --git a/src/features/transactions/components/transactions-graph.tsx b/src/features/transactions/components/transactions-graph.tsx
@@ -94,7 +94,7 @@ function ConnectionToParent() {
 function TransactionId({ hasParent, transaction }: { hasParent: boolean; transaction: Transaction | InnerTransaction }) {
   const component = useMemo(() => {
     if ('innerId' in transaction) {
-      return <InnerTransactionLink innerTransactionId={transaction.innerId} />
+      return <InnerTransactionLink transactionId={transaction.networkTransactionId} innerTransactionId={transaction.innerId} />
     }
     return <TransactionLink transactionId={transaction.id} short={true} />
   }, [transaction])

diff --git a/src/features/transactions/components/transactions-table.tsx b/src/features/transactions/components/transactions-table.tsx
@@ -35,7 +35,7 @@ export const transactionsTableColumns: ColumnDef<FlattenedTransaction>[] = [
           }}
         >
           {'innerId' in transaction ? (
-            <InnerTransactionLink innerTransactionId={transaction.innerId} />
+            <InnerTransactionLink transactionId={transaction.networkTransactionId} innerTransactionId={transaction.innerId} />
           ) : (
             <TransactionLink transactionId={transaction.id} short={true} />
           )}

diff --git a/src/features/transactions/mappers/transaction-common-properties-mappers.ts b/src/features/transactions/mappers/transaction-common-properties-mappers.ts
@@ -50,6 +50,7 @@ const asJson = (transactionResult: TransactionResult) =>
 
 export const asInnerTransactionId = (networkTransactionId: string, index: string): InnerTransactionId => {
   return {
+    networkTransactionId: networkTransactionId,
     id: `${networkTransactionId}-${index}`,
     innerId: index,
   }

diff --git a/src/features/transactions/models/index.ts b/src/features/transactions/models/index.ts
@@ -150,6 +150,7 @@ export enum AppCallOnComplete {
 }
 
 export type InnerTransactionId = {
+  networkTransactionId: string
   id: string
   innerId: string
 }