From 8a149a9c96448e96444e7bc6165818f5e5a97be0 Mon Sep 17 00:00:00 2001
From: Doris Benda <DOBEN@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:41:29 +0100
Subject: [PATCH 1/2] Simplify query

---
 frontend/src/queries/useTokenQuery.ts | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/frontend/src/queries/useTokenQuery.ts b/frontend/src/queries/useTokenQuery.ts
index 68c87784..f9b542e4 100644
--- a/frontend/src/queries/useTokenQuery.ts
+++ b/frontend/src/queries/useTokenQuery.ts
@@ -26,7 +26,7 @@ transaction {
 }
 event {
   __typename
-  ...on CisBurnEvent {
+  ...on Cis2BurnEvent {
     fromAddress {
       __typename
       ... on AccountAddress {
@@ -38,14 +38,10 @@ event {
         asString
       }
     }
-    contractIndex
-    contractSubIndex
     tokenAmount
     tokenId
-    transactionHash
-    parsed
   }
-  ...on CisMintEvent {
+  ...on Cis2MintEvent {
     toAddress {
       __typename
       ... on AccountAddress {
@@ -58,22 +54,14 @@ event {
       }
     }
     tokenAmount
-    contractIndex
-    contractSubIndex
     tokenId
-    transactionHash
-    parsed
   }
-  ...on CisTokenMetadataEvent {
+  ...on Cis2TokenMetadataEvent {
     hashHex
     metadataUrl
-    contractIndex
-    contractSubIndex
     tokenId
-    transactionHash
-    parsed
   }
-  ... on CisTransferEvent {
+  ... on Cis2TransferEvent {
     toAddress {
       __typename
       ... on AccountAddress {
@@ -97,11 +85,7 @@ event {
       }
     }
     tokenAmount
-    contractIndex
-    contractSubIndex
     tokenId
-    transactionHash
-    parsed
   }
 }
 `

From 8a080bbd1a0a94c637599a101b19170fe4a422a4 Mon Sep 17 00:00:00 2001
From: Doris Benda <DOBEN@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:14:15 +0100
Subject: [PATCH 2/2] Update changelog

---
 frontend/CHANGELOG.md                 | 1 +
 frontend/src/queries/useTokenQuery.ts | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/CHANGELOG.md b/frontend/CHANGELOG.md
index 5f2c1692..d0ddd9e9 100644
--- a/frontend/CHANGELOG.md
+++ b/frontend/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fix
 
+- Remove unused fields in query for cis2 token events.
 - Remove unused sub-query for account transactions in the accounts page.
 
 ## [1.6.0] - 2024-11-05
diff --git a/frontend/src/queries/useTokenQuery.ts b/frontend/src/queries/useTokenQuery.ts
index f9b542e4..81fa638e 100644
--- a/frontend/src/queries/useTokenQuery.ts
+++ b/frontend/src/queries/useTokenQuery.ts
@@ -26,7 +26,7 @@ transaction {
 }
 event {
   __typename
-  ...on Cis2BurnEvent {
+  ...on CisBurnEvent {
     fromAddress {
       __typename
       ... on AccountAddress {
@@ -41,7 +41,7 @@ event {
     tokenAmount
     tokenId
   }
-  ...on Cis2MintEvent {
+  ...on CisMintEvent {
     toAddress {
       __typename
       ... on AccountAddress {
@@ -56,12 +56,12 @@ event {
     tokenAmount
     tokenId
   }
-  ...on Cis2TokenMetadataEvent {
+  ...on CisTokenMetadataEvent {
     hashHex
     metadataUrl
     tokenId
   }
-  ... on Cis2TransferEvent {
+  ... on CisTransferEvent {
     toAddress {
       __typename
       ... on AccountAddress {