From a97fa7354314e2edfa1582ef0f1716e2a391d38e Mon Sep 17 00:00:00 2001
From: tamvb2391 <33695595+tamvb2391@users.noreply.github.com>
Date: Mon, 15 Jul 2024 22:26:21 +0700
Subject: [PATCH] [featfix] fix feature flag for enhance event log (#3635)

* [featfix] fix feature flag for enhance event log

* update feature flag
---
 scripts/encryptFeatureFlags.mjs               |  4 +-
 .../{mainnet => main}/config.json             |  0
 .../evm-transaction-event-log.component.html  | 62 ++++++++++---------
 3 files changed, 35 insertions(+), 31 deletions(-)
 rename scripts/feature-flags/{mainnet => main}/config.json (100%)

diff --git a/scripts/encryptFeatureFlags.mjs b/scripts/encryptFeatureFlags.mjs
index 8b24ac003..b5f1394b7 100644
--- a/scripts/encryptFeatureFlags.mjs
+++ b/scripts/encryptFeatureFlags.mjs
@@ -4,14 +4,14 @@ import { v5 } from 'uuid';
 const args = process.argv;
 if (args.length < 3) {
   console.error(
-    'Missing env:<dev|serenity|euphoria|mainnet>: `node encryptFeatureFlags.mjs <dev|serenity|euphoria|mainnet>`',
+    'Missing env:<dev|serenity|euphoria|main>: `node encryptFeatureFlags.mjs <dev|serenity|euphoria|main>`',
   );
   process.exit(1);
 }
 
 const env = args[2];
 
-const envs = { develop: 'dev', serenity: 'serenity', euphoria: 'euphoria', main: 'mainnet' };
+const envs = { develop: 'dev', serenity: 'serenity', euphoria: 'euphoria', main: 'main' };
 const getEnv = () => {
   return envs[env] || 'dev';
 };
diff --git a/scripts/feature-flags/mainnet/config.json b/scripts/feature-flags/main/config.json
similarity index 100%
rename from scripts/feature-flags/mainnet/config.json
rename to scripts/feature-flags/main/config.json
diff --git a/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.html b/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.html
index 7d438f685..99f613876 100644
--- a/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.html
+++ b/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.html
@@ -19,41 +19,45 @@
     <div class="d-flex flex-wrap mb-3">
       <div class="col-12 col-lg-1 mb-2 mb-lg-0 text--gray-4 body">Topics</div>
       <div class="col-12 col-lg-11 d-flex flex-column gap-2">
-        <ng-container
-          [featureFlag]="'EnhanceEventLog'"
-          [flagEnabled]="false"
-          *ngFor="let top of eventLog.topics; index as idx">
-          <div class="d-flex gap-2 item-topic" *ngIf="top">
-            <div class="event-number secondary flex-shrink-0 font-space-mono">{{ idx }}</div>
-            <div class="flex-grow-1 topic align-items-center">
-              <div
-                class="font-space-mono {{
-                  arrTopicDecode[index]?.length > 0 && arrTopicDecode[index][idx] ? '' : 'mt-1'
-                }}">
-                {{ top }}
+        <div [featureFlag]="'EnhanceEventLog'" [flagEnabled]="false">
+          <ng-container *ngFor="let top of eventLog.topics; index as idx">
+            <div class="d-flex gap-2 item-topic" *ngIf="top">
+              <div class="event-number secondary flex-shrink-0 font-space-mono">{{ idx }}</div>
+              <div class="flex-grow-1 topic align-items-center">
+                <div
+                  class="font-space-mono {{
+                    arrTopicDecode[index]?.length > 0 && arrTopicDecode[index][idx] ? '' : 'mt-1'
+                  }}">
+                  {{ top }}
+                </div>
+                <div
+                  class="mt-1 event-log-msg font-space-mono"
+                  *ngIf="arrTopicDecode[index]?.length > 0 && arrTopicDecode[index][idx]"
+                  [innerHTML]="arrTopicDecode[index][idx] | highlight_function"></div>
               </div>
-              <div
-                class="mt-1 event-log-msg font-space-mono"
-                *ngIf="arrTopicDecode[index]?.length > 0 && arrTopicDecode[index][idx]"
-                [innerHTML]="arrTopicDecode[index][idx] | highlight_function"></div>
             </div>
-          </div>
-        </ng-container>
-        <ng-container [featureFlag]="'EnhanceEventLog'" *ngFor="let topic of topicsDecoded; index as idx">
-          <app-decode-message
-            *ngIf="topic?.value"
-            [index]="topic?.index"
-            [name]="topic?.name"
-            [isLink]="topic?.isLink"
-            [isAllowSwitchDecode]="topic?.isAllowSwitchDecode"
-            [value]="topic?.value"
-            [decode]="topic?.decode"></app-decode-message>
-        </ng-container>
+          </ng-container>
+        </div>
+
+        <div [featureFlag]="'EnhanceEventLog'">
+          <ng-container *ngFor="let topic of topicsDecoded; index as idx">
+            <app-decode-message
+              *ngIf="topic?.value"
+              [index]="topic?.index"
+              [name]="topic?.name"
+              [isLink]="topic?.isLink"
+              [isAllowSwitchDecode]="topic?.isAllowSwitchDecode"
+              [value]="topic?.value"
+              [decode]="topic?.decode"></app-decode-message>
+          </ng-container>
+        </div>
       </div>
     </div>
 
     <div class="d-flex flex-wrap mb-3" *ngIf="eventLog.data">
-      <div class="col-12 col-lg-1 mb-2 mb-lg-0 text--gray-4 body">Data</div>
+      <div class="col-12 col-lg-1 mb-2 mb-lg-0 text--gray-4 body">
+        <span style="line-height: 28px">Data</span>
+      </div>
       <div class="col-12 col-lg-11">
         <div class="highlight font-space-mono" [featureFlag]="'EnhanceEventLog'" [flagEnabled]="false">
           {{ eventLog.data }}