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

PatrickDinh · web-flow · commit b36918d272d6 · 2024-05-01T13:45:15.000+10:00
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
 }

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@`
`288`	`288`	`>`
`289`	`289`	`<a`
`290`	`290`	`class="text-primary underline"`
`291`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/1"`
	`291`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/1"`
`292`	`292`	`>`
`293`	`293`	`Inner 1`
`294`	`294`	`</a>`
`@@ -419,7 +419,7 @@`
`419`	`419`	`>`
`420`	`420`	`<a`
`421`	`421`	`class="text-primary underline"`
`422`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/2"`
	`422`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/2"`
`423`	`423`	`>`
`424`	`424`	`Inner 2`
`425`	`425`	`</a>`
`@@ -532,7 +532,7 @@`
`532`	`532`	`>`
`533`	`533`	`<a`
`534`	`534`	`class="text-primary underline"`
`535`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/2-1"`
	`535`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/2-1"`
`536`	`536`	`>`
`537`	`537`	`Inner 2-1`
`538`	`538`	`</a>`
`@@ -641,7 +641,7 @@`
`641`	`641`	`>`
`642`	`642`	`<a`
`643`	`643`	`class="text-primary underline"`
`644`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/3"`
	`644`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/3"`
`645`	`645`	`>`
`646`	`646`	`Inner 3`
`647`	`647`	`</a>`
`@@ -752,7 +752,7 @@`
`752`	`752`	`>`
`753`	`753`	`<a`
`754`	`754`	`class="text-primary underline"`
`755`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/4"`
	`755`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/4"`
`756`	`756`	`>`
`757`	`757`	`Inner 4`
`758`	`758`	`</a>`
`@@ -865,7 +865,7 @@`
`865`	`865`	`>`
`866`	`866`	`<a`
`867`	`867`	`class="text-primary underline"`
`868`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/4-1"`
	`868`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/4-1"`
`869`	`869`	`>`
`870`	`870`	`Inner 4-1`
`871`	`871`	`</a>`
`@@ -972,7 +972,7 @@`
`972`	`972`	`>`
`973`	`973`	`<a`
`974`	`974`	`class="text-primary underline"`
`975`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/5"`
	`975`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/5"`
`976`	`976`	`>`
`977`	`977`	`Inner 5`
`978`	`978`	`</a>`
`@@ -1082,7 +1082,7 @@`
`1082`	`1082`	`>`
`1083`	`1083`	`<a`
`1084`	`1084`	`class="text-primary underline"`
`1085`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/6"`
	`1085`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/6"`
`1086`	`1086`	`>`
`1087`	`1087`	`Inner 6`
`1088`	`1088`	`</a>`
`@@ -1195,7 +1195,7 @@`
`1195`	`1195`	`>`
`1196`	`1196`	`<a`
`1197`	`1197`	`class="text-primary underline"`
`1198`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/6-1"`
	`1198`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/6-1"`
`1199`	`1199`	`>`
`1200`	`1200`	`Inner 6-1`
`1201`	`1201`	`</a>`
`@@ -1301,7 +1301,7 @@`
`1301`	`1301`	`>`
`1302`	`1302`	`<a`
`1303`	`1303`	`class="text-primary underline"`
`1304`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/7"`
	`1304`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/7"`
`1305`	`1305`	`>`
`1306`	`1306`	`Inner 7`
`1307`	`1307`	`</a>`
`@@ -1410,7 +1410,7 @@`
`1410`	`1410`	`>`
`1411`	`1411`	`<a`
`1412`	`1412`	`class="text-primary underline"`
`1413`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/8"`
	`1413`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/8"`
`1414`	`1414`	`>`
`1415`	`1415`	`Inner 8`
`1416`	`1416`	`</a>`
`@@ -1519,7 +1519,7 @@`
`1519`	`1519`	`>`
`1520`	`1520`	`<a`
`1521`	`1521`	`class="text-primary underline"`
`1522`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/8-1"`
	`1522`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/8-1"`
`1523`	`1523`	`>`
`1524`	`1524`	`Inner 8-1`
`1525`	`1525`	`</a>`
`@@ -1642,7 +1642,7 @@`
`1642`	`1642`	`>`
`1643`	`1643`	`<a`
`1644`	`1644`	`class="text-primary underline"`
`1645`		`- href="/explore/transaction/VE767RE4HGQM7GFC7MUVY3J67KOR5TV34OBTDDEQTDET2UFM7KTQ/inner/9"`
	`1645`	`+ href="/explore/transaction/INDQXWQXHF22SO45EZY7V6FFNI6WUD5FHRVDV6NCU6HD424BJGGA/inner/9"`
`1646`	`1646`	`>`
`1647`	`1647`	`Inner 9`
`1648`	`1648`	`</a>`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ function ConnectionToParent() {`
`94`	`94`	`function TransactionId({ hasParent, transaction }: { hasParent: boolean; transaction: Transaction \| InnerTransaction }) {`
`95`	`95`	`const component = useMemo(() => {`
`96`	`96`	`if ('innerId' in transaction) {`
`97`		`- return <InnerTransactionLink innerTransactionId={transaction.innerId} />`
	`97`	`+ return <InnerTransactionLink transactionId={transaction.networkTransactionId} innerTransactionId={transaction.innerId} />`
`98`	`98`	`}`
`99`	`99`	`return <TransactionLink transactionId={transaction.id} short={true} />`
`100`	`100`	`}, [transaction])`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export const transactionsTableColumns: ColumnDef<FlattenedTransaction>[] = [`
`35`	`35`	`}}`
`36`	`36`	`>`
`37`	`37`	`{'innerId' in transaction ? (`
`38`		`- <InnerTransactionLink innerTransactionId={transaction.innerId} />`
	`38`	`+ <InnerTransactionLink transactionId={transaction.networkTransactionId} innerTransactionId={transaction.innerId} />`
`39`	`39`	`) : (`
`40`	`40`	`<TransactionLink transactionId={transaction.id} short={true} />`
`41`	`41`	`)}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ const asJson = (transactionResult: TransactionResult) =>`
`50`	`50`
`51`	`51`	`export const asInnerTransactionId = (networkTransactionId: string, index: string): InnerTransactionId => {`
`52`	`52`	`return {`
	`53`	`+ networkTransactionId: networkTransactionId,`
`53`	`54`	id: `${networkTransactionId}-${index}`,
`54`	`55`	`innerId: index,`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ export enum AppCallOnComplete {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`export type InnerTransactionId = {`
	`153`	`+ networkTransactionId: string`
`153`	`154`	`id: string`
`154`	`155`	`innerId: string`
`155`	`156`	`}`