From e29df3b73cd3bb6420cc0b51d1fa6bb411738c0a Mon Sep 17 00:00:00 2001
From: Tuan Phan Anh <38557844+fibonacci998@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:05:05 +0700
Subject: [PATCH] Fix/add missing tx id merge staging (#919)

* fix: add missing tx_id when handle cw20 activity

* fix: update naming tx_id
---
 .../databases/euphoria/tables/public_cw20_activity.yaml        | 3 ++-
 .../metadata/databases/xstaxy/tables/public_cw20_activity.yaml | 3 ++-
 src/services/cw20/cw20.service.ts                              | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hasura/metadata/databases/euphoria/tables/public_cw20_activity.yaml b/hasura/metadata/databases/euphoria/tables/public_cw20_activity.yaml
index c50ae6d1e..112bab2b2 100644
--- a/hasura/metadata/databases/euphoria/tables/public_cw20_activity.yaml
+++ b/hasura/metadata/databases/euphoria/tables/public_cw20_activity.yaml
@@ -25,11 +25,12 @@ select_permissions:
         - from
         - sender
         - to
-        - tx_hash
         - cw20_contract_id
         - height
         - id
         - smart_contract_event_id
         - amount
+        - tx_hash
+        - tx_id
       filter: {}
       limit: 100
diff --git a/hasura/metadata/databases/xstaxy/tables/public_cw20_activity.yaml b/hasura/metadata/databases/xstaxy/tables/public_cw20_activity.yaml
index c50ae6d1e..112bab2b2 100644
--- a/hasura/metadata/databases/xstaxy/tables/public_cw20_activity.yaml
+++ b/hasura/metadata/databases/xstaxy/tables/public_cw20_activity.yaml
@@ -25,11 +25,12 @@ select_permissions:
         - from
         - sender
         - to
-        - tx_hash
         - cw20_contract_id
         - height
         - id
         - smart_contract_event_id
         - amount
+        - tx_hash
+        - tx_id
       filter: {}
       limit: 100
diff --git a/src/services/cw20/cw20.service.ts b/src/services/cw20/cw20.service.ts
index f400a84a0..dd428b5de 100644
--- a/src/services/cw20/cw20.service.ts
+++ b/src/services/cw20/cw20.service.ts
@@ -245,7 +245,8 @@ export default class Cw20Service extends BullableService {
         'smart_contract.id as smart_contract_id',
         'smart_contract_event.id as smart_contract_event_id',
         'event:transaction.hash',
-        'event:transaction.height'
+        'event:transaction.height',
+        'smart_contract_event.tx_id'
       )
       .orderBy('smart_contract_event.id', 'asc');
   }