diff --git a/.editorconfig b/.editorconfig
index 88bf97c50..ebe51d3bf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,7 +6,7 @@ root = true
 [*]
 indent_style = space
 indent_size = 2
-end_of_line = crlf
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = false
 insert_final_newline = false
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0858885a5..bab2ae64b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,8 @@ jobs:
       - name: Set environment variable
         run: |
           SHORT_SHA_COMMIT=$(git rev-parse --short HEAD)
+          echo SHORT_SHA_COMMIT=${SHORT_SHA_COMMIT} >> $GITHUB_ENV
+          echo ENVIRONMENT=${GITHUB_REF_NAME} >> $GITHUB_ENV
           echo CONTAINER_RELEASE_IMAGE=ghcr.io/aura-nw/explorer-frontend:${GITHUB_REF_NAME}_${SHORT_SHA_COMMIT} >> $GITHUB_ENV
           echo REPO_MANIFEST_NAME=gitops >> $GITHUB_ENV
           echo REPO_MANIFEST_URL=github.com/aura-nw/gitops.git >> $GITHUB_ENV
diff --git a/.gitignore b/.gitignore
index 68714b491..fea2cb0db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ dist
 .idea/vcs.xml
 .idea/workspace.xml
 .vscode/settings.json
-*.orig
\ No newline at end of file
+*.orig
+/src/assets/config/feature-flags.json
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index ffa8f8cc7..67bbb1ed7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,21 @@
 FROM node:18-alpine as build-stage
+
+ARG SHORT_SHA_COMMIT
+ARG ENVIRONMENT
+
 RUN mkdir -p /data/app
+
 WORKDIR /data/app
 COPY . /data/app
+
+ENV NG_APP_VERSION=$SHORT_SHA_COMMIT
+
 RUN npm install && npm cache clean --force
+RUN node scripts/encryptFeatureFlags.mjs $ENVIRONMENT
 RUN npm run build --aot --output-hashing=all
+
 FROM nginx:1.15
+
 COPY --from=build-stage /data/app/nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=build-stage /data/app/dist/frontend /var/www/tmp
 COPY --from=build-stage /data/app/dist/frontend/assets/ngsw-worker.js /var/www/tmp/
diff --git a/ci/build.sh b/ci/build.sh
index 6417e10fb..e30984c52 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -8,5 +8,5 @@ then
     echo 'This is main branch'
 fi
 #Build and push image
-docker build -t ${CONTAINER_RELEASE_IMAGE} -f Dockerfile .
+docker build -t ${CONTAINER_RELEASE_IMAGE} --build-arg SHORT_SHA_COMMIT=${SHORT_SHA_COMMIT} --build-arg ENVIRONMENT=${ENVIRONMENT} -f Dockerfile .
 docker push ${CONTAINER_RELEASE_IMAGE}
diff --git a/package-lock.json b/package-lock.json
index de280277e..670d69183 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,6 +98,7 @@
         "karma-coverage": "~2.0.3",
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.7.0",
+        "npm-run-all": "^4.1.5",
         "prettier": "^3.1.1",
         "typescript": "~4.9.5"
       },
@@ -7735,12 +7736,50 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-flatten": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
       "dev": true
     },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/asn1.js": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
@@ -7809,9 +7848,12 @@
       }
     },
     "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -8514,12 +8556,18 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9673,6 +9721,57 @@
         "node": ">=10"
       }
     },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/date-fns": {
       "version": "2.30.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
@@ -9765,16 +9864,19 @@
       }
     },
     "node_modules/define-data-property": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
-      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-lazy-prop": {
@@ -10296,12 +10398,134 @@
         "is-arrayish": "^0.2.1"
       }
     },
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-module-lexer": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
       "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
       "dev": true
     },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/esbuild": {
       "version": "0.18.17",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz",
@@ -11194,9 +11418,39 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/gauge": {
       "version": "4.0.4",
@@ -11234,14 +11488,18 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -11273,6 +11531,23 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -11404,10 +11679,20 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
       "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -11417,20 +11702,20 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -11450,11 +11735,11 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11491,6 +11776,17 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/hdr-histogram-js": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz",
@@ -12021,6 +12317,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/ioredis": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz",
@@ -12082,12 +12392,40 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -12099,6 +12437,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -12122,6 +12476,36 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "dev": true,
+      "dependencies": {
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-docker": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
@@ -12224,6 +12608,18 @@
       "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
       "dev": true
     },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -12232,8 +12628,23 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-plain-obj": {
-      "version": "3.0.0",
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
       "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
       "dev": true,
@@ -12262,6 +12673,37 @@
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -12273,12 +12715,42 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -12299,6 +12771,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-what": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
@@ -12732,6 +13216,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -13334,6 +13824,43 @@
         "@types/trusted-types": "^2.0.2"
       }
     },
+    "node_modules/load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/load-json-file/node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/load-json-file/node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -13654,6 +14181,15 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -14303,6 +14839,12 @@
         "node-gyp-build": "^4.2.2"
       }
     },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
     "node_modules/node-addon-api": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
@@ -14558,6 +15100,113 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/npm-run-all": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "memorystream": "^0.3.1",
+        "minimatch": "^3.0.4",
+        "pidtree": "^0.3.0",
+        "read-pkg": "^3.0.0",
+        "shell-quote": "^1.6.1",
+        "string.prototype.padend": "^3.0.0"
+      },
+      "bin": {
+        "npm-run-all": "bin/npm-run-all/index.js",
+        "run-p": "bin/run-p/index.js",
+        "run-s": "bin/run-s/index.js"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/npm-run-all/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-all/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -14613,9 +15262,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -14637,6 +15286,24 @@
         "node": ">= 10.12.0"
       }
     },
+    "node_modules/object.assign": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -15150,6 +15817,18 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pidtree": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
+      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
+      "dev": true,
+      "bin": {
+        "pidtree": "bin/pidtree.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/pify": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -15312,6 +15991,14 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.4.31",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
@@ -15938,6 +16625,68 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/read-pkg/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/read-pkg/node_modules/path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg/node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -16064,6 +16813,24 @@
       "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
       "dev": true
     },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regexpu-core": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
@@ -16318,6 +17085,30 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-array-concat/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -16337,6 +17128,23 @@
         }
       ]
     },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safe-stable-stringify": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
@@ -16654,6 +17462,37 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
     },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
@@ -17171,6 +18010,73 @@
         "node": ">=8"
       }
     },
+    "node_modules/string.prototype.padend": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz",
+      "integrity": "sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -17195,6 +18101,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
@@ -17739,6 +18654,79 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/typed-assert": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz",
@@ -17798,6 +18786,21 @@
         "multiformats": "^9.4.2"
       }
     },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/uncrypto": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/uncrypto/-/uncrypto-0.1.3.tgz",
@@ -18619,21 +19622,37 @@
         "which": "bin/which"
       }
     },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/which-module": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
diff --git a/package.json b/package.json
index eba2d988e..e6273b182 100644
--- a/package.json
+++ b/package.json
@@ -3,9 +3,11 @@
   "version": "1.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "start": "run-p featureflags start:dev",
+    "start:dev": "ng serve",
     "build": "ng build --aot=true --output-hashing=all",
     "build:production": "ng build --aot=true --output-hashing=all --configuration production",
+    "featureflags": "node scripts/encryptFeatureFlags.mjs main",
     "watch": "ng build --watch --configuration development",
     "test": "ng test"
   },
@@ -104,6 +106,7 @@
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.7.0",
+    "npm-run-all": "^4.1.5",
     "prettier": "^3.1.1",
     "typescript": "~4.9.5"
   }
diff --git a/scripts/encryptFeatureFlags.mjs b/scripts/encryptFeatureFlags.mjs
new file mode 100644
index 000000000..b5f1394b7
--- /dev/null
+++ b/scripts/encryptFeatureFlags.mjs
@@ -0,0 +1,43 @@
+import fs from 'fs';
+import { v5 } from 'uuid';
+
+const args = process.argv;
+if (args.length < 3) {
+  console.error(
+    '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: 'main' };
+const getEnv = () => {
+  return envs[env] || 'dev';
+};
+
+const namespace = '32bf670d-a39e-46a7-8546-2a11d3c16b33';
+const encryptConfig = async () => {
+  try {
+    const config = (
+      await import(`./feature-flags/${getEnv()}/config.json`, {
+        assert: { type: 'json' },
+      })
+    ).default;
+
+    const flags = {};
+    for (const flag of Object.entries(config)) {
+      flags[v5(flag[0], namespace)] = flag[1];
+    }
+
+    fs.writeFile('src/assets/config/feature-flags.json', JSON.stringify(flags), function (err) {
+      if (err) {
+        console.log(err);
+      }
+    });
+    return config;
+  } catch (e) {
+    console.error(e);
+  }
+};
+encryptConfig();
diff --git a/scripts/feature-flags/dev/config.json b/scripts/feature-flags/dev/config.json
new file mode 100644
index 000000000..72367d8c4
--- /dev/null
+++ b/scripts/feature-flags/dev/config.json
@@ -0,0 +1 @@
+{ "devTest": true, "enhanceEventLog": true, "setTokenInfo": true }
diff --git a/scripts/feature-flags/euphoria/config.json b/scripts/feature-flags/euphoria/config.json
new file mode 100644
index 000000000..6eb07f737
--- /dev/null
+++ b/scripts/feature-flags/euphoria/config.json
@@ -0,0 +1 @@
+{ "devTest": false, "enhanceEventLog": false, "setTokenInfo": false }
diff --git a/scripts/feature-flags/main/config.json b/scripts/feature-flags/main/config.json
new file mode 100644
index 000000000..6eb07f737
--- /dev/null
+++ b/scripts/feature-flags/main/config.json
@@ -0,0 +1 @@
+{ "devTest": false, "enhanceEventLog": false, "setTokenInfo": false }
diff --git a/scripts/feature-flags/serenity/config.json b/scripts/feature-flags/serenity/config.json
new file mode 100644
index 000000000..d64273c8c
--- /dev/null
+++ b/scripts/feature-flags/serenity/config.json
@@ -0,0 +1 @@
+{ "devTest": false, "enhanceEventLog": true, "setTokenInfo": true }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 9c63d9926..f762a5a1d 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -28,6 +28,8 @@ import { MediaExpandModule } from './shared/components/media-expand/media-expand
 import { NgHttpCachingLocalStorage, NgHttpCachingModule, NgHttpCachingStrategy } from 'ng-http-caching';
 import { CommonDirectiveModule } from './core/directives/common-directive.module';
 import { ChainInfoInterceptor } from './core/helpers/chain-info.interceptor';
+import { FeatureFlagService } from './core/data-services/feature-flag.service';
+
 initializeApp(environment.firebaseConfig);
 
 @NgModule({
@@ -65,6 +67,13 @@ initializeApp(environment.firebaseConfig);
       multi: true,
       deps: [EnvironmentService],
     },
+    FeatureFlagService,
+    {
+      provide: APP_INITIALIZER,
+      useFactory: (featureFlagService: FeatureFlagService) => () => featureFlagService.load(),
+      multi: true,
+      deps: [FeatureFlagService],
+    },
     { provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
     { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true },
     { provide: HTTP_INTERCEPTORS, useClass: RequestTimeoutHttpInterceptor, multi: true },
diff --git a/src/app/core/constants/account.constant.ts b/src/app/core/constants/account.constant.ts
index 918a46916..158de4b21 100644
--- a/src/app/core/constants/account.constant.ts
+++ b/src/app/core/constants/account.constant.ts
@@ -30,4 +30,14 @@ export const TABS_TITLE_ACCOUNT = [
   { label: TabsAccount.NativeTxs, value: TabsAccountLink.NativeTxs },
   { label: TabsAccount.FtsTxs, value: TabsAccountLink.FtsTxs },
   { label: TabsAccount.NftTxs, value: TabsAccountLink.NftTxs },
-];
\ No newline at end of file
+];
+
+export const COSMOS_ACCOUNT_MESSAGE_TYPE = "/cosmos.auth.v1beta1.BaseAccount";
+export const EVM_ACCOUNT_MESSAGE_TYPE = "/ethermint.types.v1.EthAccount";
+export const COSMOS_WARNING_MESSAGE = "An account created by a EVM wallet (such as Metamask, Rabby, etc.) cannot be used to sign Cosmos transactions."
+export const EVM_WARNING_MESSAGE = "An account created by a Cosmos wallet (such as Keplr, Leap,...) cannot be used to sign EVM transactions."
+
+export const BASE_ACCOUNT_ADDRESS = {
+  cosmos: "aura1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqg4ha9y",
+  evm: "0x0000000000000000000000000000000000000000"
+}
diff --git a/src/app/core/constants/account.enum.ts b/src/app/core/constants/account.enum.ts
index 051494cea..b4dcf2182 100644
--- a/src/app/core/constants/account.enum.ts
+++ b/src/app/core/constants/account.enum.ts
@@ -63,15 +63,22 @@ export enum TabsAccountLink {
 
 export enum ETypeFtExport {
   CW20 = 'cw20-transfer',
-  ERC20 = 'erc20-transfer'
+  ERC20 = 'erc20-transfer',
+}
+
+export enum ETypeNftExport {
+  CW721 = 'cw721-transfer',
+  ERC721 = 'erc721-transfer',
 }
 
 export enum ExportFileName {
   ExecutedTxs = 'cosmos-executed',
   EVMExecutedTxs = 'evm-executed',
   NativeTxs = 'native-ibc-transfer',
-  FtsTxs = 'fungible-token-transfer',
-  NftTxs = 'nft-transfer',
+  CW20FtsTxs = 'cw20-transfer',
+  ERC20FtsTxs = 'erc20-transfer',
+  CW721NftTxs = 'cw721-transfer',
+  ERC721NftTxs = 'erc721-transfer',
 }
 
 export enum StakeModeAccount {
diff --git a/src/app/core/constants/contract.constant.ts b/src/app/core/constants/contract.constant.ts
index e54d36939..51abdf27d 100644
--- a/src/app/core/constants/contract.constant.ts
+++ b/src/app/core/constants/contract.constant.ts
@@ -62,6 +62,7 @@ export const EVM_CONTRACT_TABLE_TEMPLATES: Array<TableTemplate> = [
     isUrl: '/address',
     isNameTag: true,
   },
+  { matColumnDef: 'arrow', headerCellDef: ' ', type: 'status', headerWidth: 1 },
   {
     matColumnDef: 'to',
     headerCellDef: 'To',
diff --git a/src/app/core/constants/feature-flags.enum.ts b/src/app/core/constants/feature-flags.enum.ts
new file mode 100644
index 000000000..b51823941
--- /dev/null
+++ b/src/app/core/constants/feature-flags.enum.ts
@@ -0,0 +1,9 @@
+import { v5 as uuidv5 } from 'uuid';
+
+const FEATURE_FLAGS_NAMESPACE = '32bf670d-a39e-46a7-8546-2a11d3c16b33';
+
+export enum FeatureFlags {
+  DevTest = uuidv5('devTest', FEATURE_FLAGS_NAMESPACE),
+  EnhanceEventLog = uuidv5('enhanceEventLog', FEATURE_FLAGS_NAMESPACE),
+  SetTokenInfo = uuidv5('setTokenInfo', FEATURE_FLAGS_NAMESPACE),
+}
diff --git a/src/app/core/constants/token.constant.ts b/src/app/core/constants/token.constant.ts
index a92dd5855..57191b478 100644
--- a/src/app/core/constants/token.constant.ts
+++ b/src/app/core/constants/token.constant.ts
@@ -50,6 +50,45 @@ export enum ETokenNFTTypeBE {
 
 export const TOKEN_EVM_BURNT = '0x0000000000000000000000000000000000000000';
 
+export const SOCIAL_MEDIA = {
+  youtube: {
+    name: 'youtube',
+    icon: 'assets/icons/icons-svg/basic/youtube.svg',
+  },
+  twitter: {
+    name: 'twitter',
+    icon: 'assets/icons/icons-svg/basic/twitter.svg',
+  },
+  discord: {
+    name: 'discord',
+    icon: 'assets/icons/icons-svg/basic/discord.svg',
+  },
+  telegram: {
+    name: 'telegram',
+    icon: 'assets/icons/icons-svg/basic/telegram.svg',
+  },
+  linkedin: {
+    name: 'linkedin',
+    icon: 'assets/icons/icons-svg/basic/linkedIn.svg',
+  },
+  github: {
+    name: 'github',
+    icon: 'assets/icons/icons-svg/basic/github.svg',
+  },
+  facebook: {
+    name: 'facebook',
+    icon: 'assets/icons/icons-svg/basic/fb-circle.svg',
+  },
+  medium: {
+    name: 'medium',
+    icon: 'assets/icons/icons-svg/basic/medium.svg',
+  },
+  otherWebsite: {
+    name: 'otherWebsite',
+    icon: 'assets/icons/icons-svg/basic/global.svg',
+  },
+};
+
 export const USDC_ADDRESS = '0x80b5a32e4f032b2a058b4f29ec95eefeeb87adcd';
 export const USDC_COIN_ID = 'tether';
 export const USDC_TOKEN = {
diff --git a/src/app/core/data-services/api-cw20-token.service.ts b/src/app/core/data-services/api-cw20-token.service.ts
index 1bfcb216f..d62e920eb 100644
--- a/src/app/core/data-services/api-cw20-token.service.ts
+++ b/src/app/core/data-services/api-cw20-token.service.ts
@@ -75,13 +75,15 @@ export class ApiCw20TokenService {
           BigNumber(token.balance).gt(0),
         );
 
-        const usdcCoin = this.parseUSDCToken(USDCToken, coinsMarkets);
-        
-        const idx = tokens?.findIndex((f) => f.contract_address?.toLowerCase() === USDC_ADDRESS);
-        if (idx >= 0) {
-          tokens[idx] = usdcCoin;
-        } else {
-          tokens.push(usdcCoin);
+        if (USDCToken) {
+          const usdcCoin = this.parseUSDCToken(USDCToken, coinsMarkets);
+
+          const idx = tokens?.findIndex((f) => f.contract_address?.toLowerCase() === USDC_ADDRESS);
+          if (idx >= 0) {
+            tokens[idx] = usdcCoin;
+          } else {
+            tokens.push(usdcCoin);
+          }
         }
 
         const allTokens = [nativeToken, ...tokens];
@@ -115,12 +117,14 @@ export class ApiCw20TokenService {
   }
 
   async getUSDCToken(address: string) {
+    if (!address) {
+      return null;
+    }
     const contract = this.createContract();
     const balance = await contract.balanceOf(address);
     const name = await contract.name();
     const symbol = await contract.symbol();
     const decimals = await contract.decimals();
-    
     return {
       ...USDC_TOKEN,
       tokenUrl: USDC_ADDRESS,
@@ -135,7 +139,6 @@ export class ApiCw20TokenService {
     const USDCMarket = coinsMarkets?.find((item) => item.coinId === USDC_COIN_ID);
     const amount = getBalance(token?.balance || 0, token?.decimals);
     const value = new BigNumber(amount).multipliedBy(Number(USDCMarket?.currentPrice || 0));
-    
     return {
       ...token,
       change: null,
@@ -218,12 +221,13 @@ export class ApiCw20TokenService {
   parseNativeToken(account, coinsMarkets) {
     const nativeId = this.env.coingecko.ids[0];
     const coinMarket = coinsMarkets.find((coin) => coin.coinId === nativeId);
+
     return {
       name: this.env.chainName,
       symbol: this.currencies.coinDenom,
       decimals: this.currencies.coinDecimals,
       denom: this.currencies.coinMinimalDenom,
-      image: this.currencies.coinImageUrl,
+      image: this.currencies.coinImageUrl || coinMarket?.image,
       contract_address: '-',
       balance: account.data.total,
       price: coinMarket?.currentPrice || 0,
diff --git a/src/app/core/data-services/feature-flag.service.ts b/src/app/core/data-services/feature-flag.service.ts
new file mode 100644
index 000000000..40ff284f3
--- /dev/null
+++ b/src/app/core/data-services/feature-flag.service.ts
@@ -0,0 +1,36 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Subject, lastValueFrom } from 'rxjs';
+import { FeatureFlags } from '../constants/feature-flags.enum';
+
+@Injectable()
+export class FeatureFlagService {
+  private configUri = './assets/config/feature-flags.json';
+  private flags: BehaviorSubject<Record<string, boolean>> = new BehaviorSubject({});
+
+  private destroyed$ = new Subject<void>();
+  constructor(private http: HttpClient) {}
+
+  ngOnDestroy(): void {
+    this.destroyed$.next();
+    this.destroyed$.complete();
+  }
+
+  private loadConfig() {
+    return lastValueFrom(this.http.get<Record<string, boolean>>(this.configUri))
+      .then((config) => {
+        this.flags.next(config);
+      })
+      .catch((err: any) => {
+        console.error(err);
+      });
+  }
+
+  async load(): Promise<void> {
+    await this.loadConfig();
+  }
+
+  isEnabled(flag: FeatureFlags) {
+    return this.flags.value[flag] || false;
+  }
+}
diff --git a/src/app/core/directives/common-directive.module.ts b/src/app/core/directives/common-directive.module.ts
index f6cc25384..9a943381b 100644
--- a/src/app/core/directives/common-directive.module.ts
+++ b/src/app/core/directives/common-directive.module.ts
@@ -9,6 +9,7 @@ import { ExpandableContentDirective } from './expandable-content.directive';
 import { TooltipCustomizeDirective } from 'src/app/core/directives/tooltip-customize.directive';
 import { DragDropDirective } from './drag-drop.directive';
 import { RouterLinkActiveMenuDirective } from './routerLinkActiveMenu.directive';
+import { FeatureFlagDirective } from './feature-flag.directive';
 
 @NgModule({
   declarations: [
@@ -16,6 +17,7 @@ import { RouterLinkActiveMenuDirective } from './routerLinkActiveMenu.directive'
     BigNumberDirective,
     ImageDirective,
     FeatureDirective,
+    FeatureFlagDirective,
     LinkDenomDirective,
     CopyButtonDirective,
     ExpandableContentDirective,
@@ -29,6 +31,7 @@ import { RouterLinkActiveMenuDirective } from './routerLinkActiveMenu.directive'
     BigNumberDirective,
     ImageDirective,
     FeatureDirective,
+    FeatureFlagDirective,
     LinkDenomDirective,
     CopyButtonDirective,
     ExpandableContentDirective,
diff --git a/src/app/core/directives/copy-button.directive.ts b/src/app/core/directives/copy-button.directive.ts
index d4fc117e2..e50ae2d76 100644
--- a/src/app/core/directives/copy-button.directive.ts
+++ b/src/app/core/directives/copy-button.directive.ts
@@ -92,4 +92,4 @@ export class CopyButtonDirective implements OnChanges {
     document.execCommand('copy');
     document.body.removeChild(dummy);
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/core/directives/feature-flag.directive.ts b/src/app/core/directives/feature-flag.directive.ts
new file mode 100644
index 000000000..0267a31d4
--- /dev/null
+++ b/src/app/core/directives/feature-flag.directive.ts
@@ -0,0 +1,26 @@
+import { Directive, ElementRef, Input, OnInit } from '@angular/core';
+import { FeatureFlagService } from '../data-services/feature-flag.service';
+import { FeatureFlags } from '../constants/feature-flags.enum';
+
+@Directive({
+  selector: '[featureFlag]',
+  providers: [],
+})
+export class FeatureFlagDirective implements OnInit {
+  @Input() featureFlag: keyof typeof FeatureFlags;
+  @Input() flagEnabled: boolean = true;
+
+  constructor(
+    private flags: FeatureFlagService,
+    private elr: ElementRef<HTMLElement>,
+  ) {}
+
+  ngOnInit(): void {
+    if (!this.featureFlag) return;
+
+    const actualFlagEnabled = this.flags.isEnabled(FeatureFlags[this.featureFlag]);
+    if (this.flagEnabled === actualFlagEnabled) return;
+
+    this.elr.nativeElement.remove();
+  }
+}
diff --git a/src/app/core/helpers/global-error.ts b/src/app/core/helpers/global-error.ts
index a6a49e35b..98b2a47d2 100644
--- a/src/app/core/helpers/global-error.ts
+++ b/src/app/core/helpers/global-error.ts
@@ -3,7 +3,7 @@ import { ErrorHandler, Injectable } from '@angular/core';
 @Injectable()
 export class GlobalErrorHandler implements ErrorHandler {
 
-  handleError(error: any): void {
+  handleError(error: any): void {    
    const chunkFailedMessage = /Loading chunk [\d]+ failed/;
 
     if (chunkFailedMessage.test(error?.message)) {
diff --git a/src/app/core/pipes/custom-pipe.module.ts b/src/app/core/pipes/custom-pipe.module.ts
index 37e1b09ea..8e7c42f45 100644
--- a/src/app/core/pipes/custom-pipe.module.ts
+++ b/src/app/core/pipes/custom-pipe.module.ts
@@ -14,6 +14,7 @@ import { ObjectKeysPipe } from './object-keys.pipe';
 import { CombineTxsMsgPipe, EllipsisPipe } from './string.pipe';
 import { NameTagTooltipPipe } from './tooltip.pipe';
 import { HighlightFunctionPipe } from './highlight-function.pipe';
+import { NewlinePipe } from './newline.pipe';
 
 @NgModule({
   imports: [CommonModule],
@@ -43,6 +44,7 @@ import { HighlightFunctionPipe } from './highlight-function.pipe';
     CapacityPipe,
     EvmAddressPipe,
     HighlightFunctionPipe,
+    NewlinePipe
   ],
   exports: [
     JsonPipe,
@@ -70,6 +72,7 @@ import { HighlightFunctionPipe } from './highlight-function.pipe';
     CapacityPipe,
     EvmAddressPipe,
     HighlightFunctionPipe,
+    NewlinePipe
   ],
   providers: [],
 })
diff --git a/src/app/core/pipes/evm-address.pipe.ts b/src/app/core/pipes/evm-address.pipe.ts
index 522125f35..5f63d6441 100644
--- a/src/app/core/pipes/evm-address.pipe.ts
+++ b/src/app/core/pipes/evm-address.pipe.ts
@@ -1,11 +1,14 @@
 import { Pipe, type PipeTransform } from '@angular/core';
 import { getEvmChecksumAddress } from '../utils/common/address-converter';
+import { EWalletType } from '../constants/wallet.constant';
 
 @Pipe({
-  name: 'appEvmAddress',
+  name: 'beautyAddress',
 })
 export class EvmAddressPipe implements PipeTransform {
   transform(value: string): string {
+    if (!value?.startsWith(EWalletType.EVM)) return value;
+
     return getEvmChecksumAddress(value);
   }
 }
diff --git a/src/app/core/pipes/newline.pipe.ts b/src/app/core/pipes/newline.pipe.ts
new file mode 100644
index 000000000..61052a3e0
--- /dev/null
+++ b/src/app/core/pipes/newline.pipe.ts
@@ -0,0 +1,14 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
+
+@Pipe({ name: 'newline' })
+export class NewlinePipe implements PipeTransform {
+  constructor(private sanitizer: DomSanitizer) {}
+  transform(value: string) {
+    if (!value) return null;
+    let replacedValue = value;
+    replacedValue = replacedValue?.replace(/\n/gi, '<br/>');
+    return this.sanitizer.bypassSecurityTrustHtml(replacedValue);
+  }
+}
+
diff --git a/src/app/core/services/account.service.ts b/src/app/core/services/account.service.ts
index 5707e9c44..547c2f746 100644
--- a/src/app/core/services/account.service.ts
+++ b/src/app/core/services/account.service.ts
@@ -8,9 +8,12 @@ import { ApiCw20TokenService } from '../data-services/api-cw20-token.service';
 import { TYPE_CW4973 } from '../constants/contract.constant';
 import { EnvironmentService } from '../data-services/environment.service';
 import { CommonService } from './common.service';
+import { isEvmAddress } from '../utils/common/validation';
 
 @Injectable()
 export class AccountService extends CommonService {
+    lcd = this.environmentService.chainConfig.chain_info.rest;
+
   constructor(
     private http: HttpClient,
     private environmentService: EnvironmentService,
@@ -20,6 +23,10 @@ export class AccountService extends CommonService {
     super(http, environmentService);
   }
 
+  getAccountInfo(address: string) {
+    return this.http.get(`${this.lcd}/cosmos/auth/v1beta1/accounts/${address}`);
+  }
+
   getAccountDetail(account_id: string | number): Observable<any> {
     return this.apiService.getAccountByAddress(account_id as string);
   }
@@ -182,7 +189,7 @@ export class AccountService extends CommonService {
   }
 
   getAssetERC721ByOwner(payload): Observable<any> {
-    if (payload.keyword?.length >= LENGTH_CHARACTER.EVM_ADDRESS) {
+    if (payload.keyword?.length >= LENGTH_CHARACTER.EVM_ADDRESS && isEvmAddress(payload.keyword)) {
       payload.contractAddress = payload.keyword;
     } else if (payload.keyword?.length > 0) {
       payload.token_id = payload.keyword;
diff --git a/src/app/core/services/contract.service.ts b/src/app/core/services/contract.service.ts
index 8a8e8e40a..cdd5e35ca 100644
--- a/src/app/core/services/contract.service.ts
+++ b/src/app/core/services/contract.service.ts
@@ -210,6 +210,10 @@ export class ContractService extends CommonService {
             symbol
             name
           }
+          erc721_contract {
+            symbol
+            name
+          }
           evm_contract_verifications(limit: 1, where: {status: {_eq:"SUCCESS"}}){
             status
           }
@@ -696,6 +700,33 @@ export class ContractService extends CommonService {
       .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null)));
   }
 
+  
+  getListProxyAbi(addressList: string[]) {
+    const query = `query ListProxyContractDetail($address: [String] = null) {
+      ${this.envDB} {
+        evm_smart_contract(where: {address: {_in: $address}}) {
+          address
+          evm_proxy_histories(order_by: {block_height: desc}, where: {implementation_contract: {_is_null: false}}) {
+            proxy_contract
+            implementation_contract
+            block_height
+          }
+        }
+      }
+    }
+    `;
+
+    return this.http
+      .post<any>(this.graphUrl, {
+        query: query,
+        variables: {
+          address: addressList,
+        },
+        operationName: 'ListProxyContractDetail',
+      })
+      .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null)));
+  }
+
   queryTokenByContractAddress(address: string) {
     if (address.toLowerCase() == this.environmentService.coinMinimalDenom) {
       return of({
diff --git a/src/app/core/services/token.service.ts b/src/app/core/services/token.service.ts
index 52e8857b3..7c5d0548b 100644
--- a/src/app/core/services/token.service.ts
+++ b/src/app/core/services/token.service.ts
@@ -8,7 +8,7 @@ import { CW20_TRACKING } from '../constants/common.constant';
 import { LCD_COSMOS } from '../constants/url.constant';
 import { EnvironmentService } from '../data-services/environment.service';
 import { CommonService } from './common.service';
-import { TOKEN_EVM_BURNT } from '../constants/token.constant';
+import { SOCIAL_MEDIA, TOKEN_EVM_BURNT } from '../constants/token.constant';
 
 @Injectable({ providedIn: 'root' })
 export class TokenService extends CommonService {
@@ -141,28 +141,29 @@ export class TokenService extends CommonService {
       .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null)));
   }
 
-  getListErc721Token(payload, textSearch: string = null, address: string = null): Observable<any> {
-    let queryUpdate = '';
-    if (textSearch?.length > 0) {
-      queryUpdate = `erc721_contract: { _or: [{name: {_ilike: "%${textSearch}%"}} ,  {evm_smart_contract: {address: {_in: ${address} }}}]}`;
-    }
-
-    let querySort = `, order_by: [{${payload.sort_column}: ${payload.sort_order}}, {id: desc}]`;
+  getListErc721Token(payload, textSearch: string = null, addressIn: string[] = []): Observable<any> {
+    let querySort = `order_by: [{erc721_stat: {${payload.sort_column}: ${
+      payload.sort_order === 'asc' ? 'asc_nulls_first' : 'desc_nulls_last'
+    } }}, {id: desc}]`;
+    let queryWhere = `where: {_or: [{address: {_in: $addressIn}}, {name: {_ilike: "%${textSearch}%"}}]}`;
     const operationsDoc = `
-    query queryListErc721($limit: Int = 10, $offset: Int = 0) {
+    query queryListErc721($limit: Int = 10, $offset: Int = 0, $addressIn: [String!] = null) {
       ${this.envDB} {
-        list_token: erc721_stats(limit: $limit, offset: $offset ${querySort}, where: { ${queryUpdate} }) {
-          transfer_24h
-          total_activity
-          erc721_contract {
-            name
-            symbol
-            evm_smart_contract {
-              address
-            }
+        list_token: erc721_contract(
+          limit: $limit
+          offset: $offset
+          ${querySort}
+          ${queryWhere}
+        ) {
+          address
+          name
+          symbol
+          erc721_stat {
+            total_activity
+            transfer_24h
           }
         }
-        total_token: erc721_stats_aggregate (where: { ${queryUpdate} }) {
+        total_token: erc721_contract_aggregate (${queryWhere}) {
           aggregate {
             count
           }
@@ -176,6 +177,7 @@ export class TokenService extends CommonService {
         variables: {
           limit: payload.limit || 20,
           offset: payload.offset || 0,
+          addressIn: addressIn,
         },
         operationName: 'queryListErc721',
       })
@@ -962,4 +964,21 @@ export class TokenService extends CommonService {
       })
       .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null)));
   }
+
+  mappingSocialProfiles(socialProfiles: { [key: string]: string }) {
+    if (!socialProfiles) return [];
+
+    const socialMapping = [];
+    Object.keys(SOCIAL_MEDIA).forEach((key) => {
+      if (socialProfiles[key]) {
+        const social = {
+          name: SOCIAL_MEDIA[key]?.name,
+          icon: SOCIAL_MEDIA[key]?.icon,
+          url: socialProfiles[key],
+        }
+        socialMapping.push(social);
+      }
+    })
+    return socialMapping;
+  }
 }
diff --git a/src/app/core/services/transaction.service.ts b/src/app/core/services/transaction.service.ts
index de139cf77..30433c56d 100644
--- a/src/app/core/services/transaction.service.ts
+++ b/src/app/core/services/transaction.service.ts
@@ -143,7 +143,7 @@ export class TransactionService extends CommonService {
       ${this.envDB} {
         transaction(
           limit: $limit
-          order_by: [{ height: $order}],
+          order_by: [{ id: $order}],
           where: {evm_transaction: {hash: {_is_null: false}}}
         ) {
           id
@@ -776,6 +776,34 @@ export class TransactionService extends CommonService {
       .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null)));
   }
 
+  getListAbiContract(addressList: string[]) {
+    const operationsDoc = `
+    query getListAbiContract($address: [String] = null) {
+      ${this.envDB} {
+        evm_contract_verification(where: {contract_address: {_in: $address}, status: {_eq: "SUCCESS"}}, order_by: {id: desc}) {
+          contract_address
+          created_at
+          creator_tx_hash
+          id
+          status
+          updated_at
+          abi
+        }
+      }
+    }
+    `;
+
+    return this.http
+      .post<any>(this.graphUrl, {
+        query: operationsDoc,
+        variables: {
+          address: addressList,
+        },
+        operationName: 'getListAbiContract',
+      })
+      .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null)));
+  }
+
   getListMappingName(methodId: any): Observable<any> {
     const operationsDoc = `
     query queryListNameMethod($limit: Int = 100, $methodId: [String!] = null) {
diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts
index e485ddf3a..566f02753 100644
--- a/src/app/core/services/user.service.ts
+++ b/src/app/core/services/user.service.ts
@@ -136,6 +136,28 @@ export class UserService {
       .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null)));
   }
 
+  getAccountInfoOfAddress(payload) {
+    const operationsDoc = `
+    query QueryAccountInfo($address: String!) {
+      ${this.envDB} {
+        account(where: {address: {_eq: $address}}){
+          type
+          sequence
+          pubkey
+        }
+      }
+    }
+    `;
+
+    return this.http
+      .post<any>(this.graphUrl, {
+        query: operationsDoc,
+        variables: payload,
+        operationName: 'QueryAccountInfo',
+      })
+      .pipe(map((res) => (res?.data ? res?.data[this.envDB] : {})));
+  }
+
   getListEvmTxByAddress(payload) {
     const operationsDoc = `
     query QueryEvmTxOfAccount($startTime: timestamptz = null, $endTime: timestamptz = null, $limit: Int = null, $orderId: order_by = desc, $address: String! = null) {
@@ -240,27 +262,27 @@ export class UserService {
   getCW20TxByAddress(payload) {
     const operationsDoc = `
     query QueryCW20ListTX(
-      $receiver: String = null, 
-      $sender: String = null, 
-      $heightGT: Int = null, 
-      $heightLT: Int = null, 
-      $limit: Int = 100, 
+      $receiver: String = null,
+      $sender: String = null,
+      $heightGT: Int = null,
+      $heightLT: Int = null,
+      $limit: Int = 100,
       $actionIn: [String!] = null,
       $actionNotIn: [String!] = null,
-      $startTime: timestamptz = null, 
+      $startTime: timestamptz = null,
       $endTime: timestamptz = null
       ) {
       ${this.envDB} {
         transaction(
           where: {
             cw20_activities: {
-              _or: [{to: {_eq: $receiver}}, {from: {_eq: $sender}}], 
+              _or: [{to: {_eq: $receiver}}, {from: {_eq: $sender}}],
               action: {_in: $actionIn, _nin: $actionNotIn}
             },
-            height: {_gt: $heightGT, _lt: $heightLT}, 
+            height: {_gt: $heightGT, _lt: $heightLT},
             timestamp: {_lte: $endTime, _gte: $startTime}
-          }, 
-          order_by: {height: desc}, 
+          },
+          order_by: {height: desc},
           limit: $limit) {
             hash
             height
@@ -285,7 +307,7 @@ export class UserService {
               }
             }
           }
-        } 
+        }
       }`;
     return this.http
       .post<any>(this.graphUrl, {
@@ -443,7 +465,6 @@ export class UserService {
       $heightGT: Int = null
       $heightLT: Int = null
       $limit: Int = null
-      $neqCw4973: String
       $actionIn: [String!] = null
       $actionNotIn: [String!] = null
     ) {
@@ -453,7 +474,6 @@ export class UserService {
             erc721_activities: {
               _or: [{ to: { _eq: $receiver } }, { from: { _eq: $sender } }]
               action: { _in: $actionIn, _nin: $actionNotIn }
-              erc721_contract: { name: { _neq: $neqCw4973 } }
             }
             transaction: {
               timestamp: { _gte: $startTime, _lte: $endTime }
@@ -480,7 +500,10 @@ export class UserService {
             type
           }
           erc721_activities(
-            where: { _or: [{ to: { _eq: $receiver } }, { from: { _eq: $sender } }] }
+            where: {
+              _or: [{ to: { _eq: $receiver } }, { from: { _eq: $sender } }]
+              action: { _in: $actionIn, _nin: $actionNotIn }
+            }
           ) {
             action
             from
@@ -511,10 +534,10 @@ export class UserService {
           actionIn: ERC721_TRACKING,
           actionNotIn: null, //  ['approve', 'instantiate', 'revoke']
           limit: payload.limit,
-          neqCw4973: 'crates.io:cw4973',
         },
         operationName: 'QueryERC721ListTX',
       })
       .pipe(map((res) => (res?.data ? res?.data[this.envDB] : null)));
   }
 }
+
diff --git a/src/app/core/services/wallet.service.ts b/src/app/core/services/wallet.service.ts
index 2b97e72da..5a93bf676 100644
--- a/src/app/core/services/wallet.service.ts
+++ b/src/app/core/services/wallet.service.ts
@@ -255,7 +255,10 @@ export class WalletService implements OnDestroy {
         this.connectToChain();
       }, 1000);
     };
-    (window as any).ethereum?.on('accountsChanged', reconnect);
+
+    (window as any).ethereum?.on('accountsChanged', () => {
+      this.connectEvmWallet(true);
+    });
     (window as any).ethereum?.on('chainChanged', reconnect);
   }
 
@@ -421,9 +424,9 @@ export class WalletService implements OnDestroy {
     );
   }
 
-  async connectEvmWallet() {
+  async connectEvmWallet(changedWallet = false) {
     const connected = await this.connectToChain();
-    if (!connected) {
+    if (!changedWallet && !connected) {
       return;
     }
 
@@ -473,3 +476,4 @@ export class WalletService implements OnDestroy {
     return transferAddress(this.env.chainInfo.bech32Config.bech32PrefixAccAddr, address);
   }
 }
+
diff --git a/src/app/core/utils/ethers/utils.ts b/src/app/core/utils/ethers/utils.ts
index 3d1214392..91dfd21da 100644
--- a/src/app/core/utils/ethers/utils.ts
+++ b/src/app/core/utils/ethers/utils.ts
@@ -40,3 +40,37 @@ export async function addNetwork(chain) {
     console.error(addError);
   }
 }
+
+export const hex2a = (hex: string) => {
+  if(!hex && typeof hex != 'string') return "";
+  const data = hex.toString();
+  let str = '';
+  for (let i = 0; i < data.length; i += 2)
+      str += String.fromCharCode(parseInt(data.substr(i, 2), 16));
+  return str;
+}
+
+export const getValueOfKeyInObject = (obj: object, key: string) => {
+  let result = null;
+  if(obj instanceof Array) {
+    for(const element of obj) {
+      result = getValueOfKeyInObject(element, key);
+      if (result) {
+        break;
+      }   
+    }
+  } else {
+    for(let prop in obj) {
+      if(prop === key) {
+        return obj[key] || {};
+      }
+      if(obj[prop] instanceof Object || obj[prop] instanceof Array) {
+        result = getValueOfKeyInObject(obj[prop], key);
+        if (result) {
+          break;
+        }
+      } 
+    }
+  }
+  return result;
+}
diff --git a/src/app/layouts/horizontaltopbar/horizontaltopbar.component.html b/src/app/layouts/horizontaltopbar/horizontaltopbar.component.html
index 5dd5c4f2a..32c5e5c35 100644
--- a/src/app/layouts/horizontaltopbar/horizontaltopbar.component.html
+++ b/src/app/layouts/horizontaltopbar/horizontaltopbar.component.html
@@ -17,7 +17,10 @@
               </figure>
             </a>
           </div>
-          <div class="page-title ml-2 fw-normal-mob" *ngIf="pageTitle">{{ pageTitle }}</div>
+          <div class="page-title ml-2 fw-normal-mob" *ngIf="pageTitle">
+            {{ pageTitle }}
+            <div class="d-none" [featureFlag]="'DevTest'">DEV test feature flags</div>
+          </div>
           <div class="divider divider-vertical mx-6 ml-xl-12 mr-xl-0 d-none d-lg-block" *ngIf="pageTitle"></div>
         </div>
       </div>
diff --git a/src/app/layouts/horizontaltopbar/horizontaltopbar.component.ts b/src/app/layouts/horizontaltopbar/horizontaltopbar.component.ts
index 1630d445c..fa34a7dd1 100644
--- a/src/app/layouts/horizontaltopbar/horizontaltopbar.component.ts
+++ b/src/app/layouts/horizontaltopbar/horizontaltopbar.component.ts
@@ -13,6 +13,8 @@ import { LENGTH_CHARACTER, STORAGE_KEYS } from '../../../app/core/constants/comm
 import { TransactionService } from '../../core/services/transaction.service';
 import { MENU, MenuName } from './menu';
 import { MenuItem } from './menu.model';
+import { FeatureFlagService } from 'src/app/core/data-services/feature-flag.service';
+import { FeatureFlags } from 'src/app/core/constants/feature-flags.enum';
 @Component({
   selector: 'app-horizontaltopbar',
   templateUrl: './horizontaltopbar.component.html',
@@ -45,6 +47,7 @@ export class HorizontaltopbarComponent implements OnInit, OnDestroy {
     private environmentService: EnvironmentService,
     private nameTagService: NameTagService,
     private userService: UserService,
+    private featureFlag: FeatureFlagService,
   ) {}
 
   ngOnDestroy(): void {
@@ -57,6 +60,10 @@ export class HorizontaltopbarComponent implements OnInit, OnDestroy {
     this.checkEnv();
     this.checkFeatures();
 
+    if (this.featureFlag.isEnabled(FeatureFlags.DevTest)) {
+      console.warn('FeatureFlags.DevTest is enabled. remove later!');
+    }
+
     this.userService.user$?.pipe(takeUntil(this.destroy$)).subscribe((currentUser) => {
       this.userEmail = currentUser ? currentUser.email : null;
     });
diff --git a/src/app/pages/account/account-detail/account-detail.component.html b/src/app/pages/account/account-detail/account-detail.component.html
index 14af60552..5e6bc8517 100644
--- a/src/app/pages/account/account-detail/account-detail.component.html
+++ b/src/app/pages/account/account-detail/account-detail.component.html
@@ -1,31 +1,38 @@
-<section class="account-detail text--white" *ngIf="{ value: breakpoint$ | async } as breakpoint">
+<section class="account-detail text--white" *ngIf="isValidAddress && { value: breakpoint$ | async } as breakpoint">
   <div class="mb-1 mb-md-6">
     <div class="d-flex d-block align-items-center">
       <span class="h2 fw-700 text--white mr-lg-5 mr-2">Account</span>
-      <a
-        [routerLink]="[
+      <a [routerLink]="[
           accountEvmAddress ? '/evm-contracts' : '/contracts',
           accountEvmAddress ? accountEvmAddress : accountAddress
-        ]"
-        *ngIf="isContractAddress"
-        [appTooltip]="'Go to Contract Details'"
+        ]" *ngIf="isContractAddress" [appTooltip]="'Go to Contract Details'"
         class="contract-label text--primary body-04 mr-5">
         Contract
       </a>
-      <i
-        class="ph ph-star body-01"
+      <i class="ph ph-star body-01"
         [appTooltip]="isWatchList ? 'Remove this address from your watch list' : 'Add this address to my watch list'"
-        (click)="handleWatchList()"
-        [ngClass]="isWatchList ? 'ph-star-fill text--yellow-2' : 'text--white'"></i>
+        (click)="handleWatchList()" [ngClass]="isWatchList ? 'ph-star-fill text--yellow-2' : 'text--white'"></i>
     </div>
 
     <div class="d-lg-flex align-items-center mb-lg-2 mb-3 mt-3 body-01 body-mob">
       <div class="text--gray-4 title-address mb-1 mb-lg-0">Cosmos Address:</div>
-      <span [copyBtn]="accountAddress" class="break-word">{{ accountAddress }} </span>
+      <span [copyBtn]="accountAddress" class="break-word">
+        <span *ngIf="accountType !== 'evm'">{{ accountAddress }}</span>
+        <div *ngIf="accountType && accountType !== 'cosmos'" class="warning" [appTooltip]="tooltipCosmosText">
+          <img class="warning-icon" [src]="'assets/icons/icons-svg/color/warning.svg' | imageS3" alt="warning" />
+          <span>{{ accountAddress }}</span>
+        </div>
+      </span>
     </div>
     <div class="d-lg-flex align-items-center mb-4 body-01 body-mob" *ngIf="accountEvmAddress">
       <div class="text--gray-4 title-address mb-1 mb-lg-0">EVM Address:</div>
-      <span [copyBtn]="accountEvmAddress" class="break-word">{{ accountEvmAddress }} </span>
+      <span [copyBtn]="accountEvmAddress" class="break-word">
+        <span *ngIf="accountType !== 'cosmos'">{{ accountEvmAddress | beautyAddress }}</span>
+        <div *ngIf="accountType && accountType !== 'evm'" class="warning" [appTooltip]="tooltipEvmText">
+          <img class="warning-icon" [src]="'assets/icons/icons-svg/color/warning.svg' | imageS3" alt="warning" />
+          <span>{{ accountEvmAddress | beautyAddress }}</span>
+        </div>
+      </span>
     </div>
   </div>
   <!-- Summary info -->
@@ -48,34 +55,21 @@ <h3 class="fw-bold fw-semibold-mob mb-2 text--white">Account Info</h3>
             <div>
               <div class="body mb-1 text--white">Total Value</div>
               <div class="h1 mb-0 fw-700 mb-0 text--white">
-                <span
-                  *ngIf="totalValue.lt(0.01)"
+                <span *ngIf="totalValue.lt(0.01)"
                   [appTooltip]="!totalValue.eq(0) ? (totalValue.toFixed() | mask: 'separator') : null">
-                  {{ totalValue.eq(0) ? '$0' : '< $0.01' }}
-                </span>
-                <span
-                  [appTooltip]="
+                  {{ totalValue.eq(0) ? '$0' : '< $0.01' }} </span>
+                    <span [appTooltip]="
                     totalValue.gte(0.01) && totalValue.lt(1000000) ? null : (totalValue.toFixed() | mask: 'separator.6')
-                  "
-                  [class.cursor-text]="totalValue.gte(0.01) && totalValue.lt(1000000)"
-                  *ngIf="!isNoData && totalValue.gte(0.01)">
-                  $<span [decimal]="0" [appBigNumber]="totalValue.toFixed() || 0"></span>
-                </span>
+                  " [class.cursor-text]="totalValue.gte(0.01) && totalValue.lt(1000000)"
+                      *ngIf="!isNoData && totalValue.gte(0.01)">
+                      $<span [decimal]="0" [appBigNumber]="totalValue.toFixed() || 0"></span>
+                    </span>
               </div>
-              <img
-                [src]="'assets/icons/icons-svg/color/spinner.svg' | imageS3"
-                alt=""
-                class="ml-10"
-                width="20"
-                height="20"
-                *ngIf="isNoData" />
+              <img [src]="'assets/icons/icons-svg/color/spinner.svg' | imageS3" alt="" class="ml-10" width="20"
+                height="20" *ngIf="isNoData" />
             </div>
             <div class="button button--md button-circle ml-1 d-lg-none">
-              <img
-                [src]="'assets/icons/icons-svg/white/qr-code.svg' | imageS3"
-                alt=""
-                width="36px"
-                height="36px"
+              <img [src]="'assets/icons/icons-svg/white/qr-code.svg' | imageS3" alt="" width="36px" height="36px"
                 (click)="viewQrAddress(modalManage)" />
             </div>
           </div>
@@ -85,11 +79,8 @@ <h3 class="fw-bold fw-semibold-mob mb-2 text--white">Account Info</h3>
     <div class="col-12 col-lg-9">
       <div class="card card-h-100">
         <div class="px-4 py-4 px-lg-6 py-lg-6">
-          <app-token-table
-            [address]="accountAddress"
-            (totalAssets)="totalAssets = $event"
-            (totalValue)="totalValueToken = $event"
-            *ngIf="!isNoData"></app-token-table>
+          <app-token-table [address]="accountAddress" (totalAssets)="totalAssets = $event"
+            (totalValue)="totalValueToken = $event" *ngIf="!isNoData"></app-token-table>
           <ng-container *ngTemplateOutlet="reloadTemplate"></ng-container>
         </div>
       </div>
@@ -100,11 +91,7 @@ <h3 class="fw-bold fw-semibold-mob mb-2 text--white">Account Info</h3>
     <ng-template #modalManage let-modal>
       <div class="box-address">
         <div class="text-end mb-4">
-          <img
-            [src]="'assets/images/icons/close-popup.png' | imageS3"
-            alt=""
-            width="14"
-            height="14"
+          <img [src]="'assets/images/icons/close-popup.png' | imageS3" alt="" width="14" height="14"
             (click)="closePopup()" />
         </div>
         <app-qr [address]="accountAddress || ''"></app-qr>
@@ -113,38 +100,25 @@ <h3 class="fw-bold fw-semibold-mob mb-2 text--white">Account Info</h3>
   </div>
 </section>
 
-<section class="account-detail text--white" *ngIf="{ value: breakpoint$ | async } as breakpoint">
+<section class="account-detail text--white" *ngIf="isValidAddress && { value: breakpoint$ | async } as breakpoint">
   <!--SBT  -->
-  <div
-    class="card"
-    *ngIf="
+  <div class="card" *ngIf="
       (totalSBTPick > 0 || (accountAddress === connectedAddress && totalSBT > 0)) &&
       commonService.isValidAddress(accountAddress)
-    "
-    [appFeature]="EFeature.Cw4973">
+    " [appFeature]="EFeature.Cw4973">
     <div class="px-4 py-4 pt-xl-6 pb-xl-6 px-xl-0">
-      <app-soulbound-feature-tokens
-        [extend]="true"
-        (totalSBTPick)="totalSBTPick = $event"
-        [displayManage]="true"
-        [accountAddress]="accountAddress"
-        [reloadAPI]="false"
-        [isAccountDetail]="true"></app-soulbound-feature-tokens>
+      <app-soulbound-feature-tokens [extend]="true" (totalSBTPick)="totalSBTPick = $event" [displayManage]="true"
+        [accountAddress]="accountAddress" [reloadAPI]="false" [isAccountDetail]="true"></app-soulbound-feature-tokens>
     </div>
   </div>
 
   <!-- NFT -->
-  <app-nft-list
-    [address]="accountAddress"
-    (totalValueNft)="totalValueNft = $event"
+  <app-nft-list [address]="accountAddress" (totalValueNft)="totalValueNft = $event"
     [appFeature]="EFeature.Cw721"></app-nft-list>
 
   <!-- Staking-->
-  <app-account-stake
-    *ngIf="currentAccountDetail"
-    [chartOptions]="chartOptions"
-    [chartCustomOptions]="chartCustomOptions"
-    [currentAccountDetail]="currentAccountDetail"></app-account-stake>
+  <app-account-stake *ngIf="currentAccountDetail" [chartOptions]="chartOptions"
+    [chartCustomOptions]="chartCustomOptions" [currentAccountDetail]="currentAccountDetail"></app-account-stake>
 
   <!-- Transaction List-->
   <app-account-transaction [address]="currentUrlAddress"></app-account-transaction>
@@ -162,3 +136,5 @@ <h3 class="fw-bold fw-semibold-mob mb-2 text--white">Account Info</h3>
     </div>
   </div>
 </ng-template>
+
+<app-table-no-data *ngIf="!isValidAddress"></app-table-no-data>
diff --git a/src/app/pages/account/account-detail/account-detail.component.scss b/src/app/pages/account/account-detail/account-detail.component.scss
index ff293652a..27b7bcdb7 100644
--- a/src/app/pages/account/account-detail/account-detail.component.scss
+++ b/src/app/pages/account/account-detail/account-detail.component.scss
@@ -1,4 +1,20 @@
 section.account-detail {
+  .warning {
+      border: 1px solid #ffa237;
+      background: #3d3730;
+      padding: 8px;
+      border-radius: 8px;
+      display: flex;
+      align-items: flex-end;
+
+      span {
+        font-size: 12px;
+        line-height: 16px;
+        color: #CCD0D5;
+        margin-left: 4px;
+      }
+    }
+
   .qr-code {
     background-color: var(--aura-gray-9);
     border-top-left-radius: 12px;
diff --git a/src/app/pages/account/account-detail/account-detail.component.ts b/src/app/pages/account/account-detail/account-detail.component.ts
index 3fd4084db..3ae79a5d6 100644
--- a/src/app/pages/account/account-detail/account-detail.component.ts
+++ b/src/app/pages/account/account-detail/account-detail.component.ts
@@ -9,19 +9,21 @@ import { ChartComponent } from 'ng-apexcharts';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { EFeature } from 'src/app/core/models/common.model';
+import { ContractService } from 'src/app/core/services/contract.service';
 import { SoulboundService } from 'src/app/core/services/soulbound.service';
 import { UserService } from 'src/app/core/services/user.service';
 import { WalletService } from 'src/app/core/services/wallet.service';
 import { transferAddress } from 'src/app/core/utils/common/address-converter';
 import local from 'src/app/core/utils/storage/local';
 import { EnvironmentService } from '../../../../app/core/data-services/environment.service';
-import { ACCOUNT_WALLET_COLOR } from '../../../core/constants/account.constant';
+import { ACCOUNT_WALLET_COLOR, COSMOS_WARNING_MESSAGE, EVM_WARNING_MESSAGE, EVM_ACCOUNT_MESSAGE_TYPE, BASE_ACCOUNT_ADDRESS, COSMOS_ACCOUNT_MESSAGE_TYPE } from '../../../core/constants/account.constant';
 import { ACCOUNT_WALLET_COLOR_ENUM, ENameTag, WalletAcount } from '../../../core/constants/account.enum';
 import { DATE_TIME_WITH_MILLISECOND, STORAGE_KEYS } from '../../../core/constants/common.constant';
 import { AccountService } from '../../../core/services/account.service';
 import { CommonService } from '../../../core/services/common.service';
 import { CHART_OPTION, ChartOptions, chartCustomOptions } from './chart-options';
-import { ContractService } from 'src/app/core/services/contract.service';
+import { isAddress, isEvmAddress } from '../../../core/utils/common/validation';
+import { getValueOfKeyInObject } from 'src/app/core/utils/ethers/utils';
 
 @Component({
   selector: 'app-account-detail',
@@ -68,7 +70,11 @@ export class AccountDetailComponent implements OnInit, OnDestroy {
   EFeature = EFeature;
   ENameTag = ENameTag;
   accountEvmAddress = '';
+  accountType: 'cosmos' | 'evm' | '';
+  tooltipCosmosText: string;
+  tooltipEvmText: string;
   chainInfo = this.environmentService.chainInfo;
+  isValidAddress = false;
 
   constructor(
     public commonService: CommonService,
@@ -109,6 +115,15 @@ export class AccountDetailComponent implements OnInit, OnDestroy {
 
     this.route.params.pipe(takeUntil(this.destroyed$)).subscribe((params) => {
       if (params?.address) {
+        if (
+          !isEvmAddress(params.address) &&
+          !isAddress(params.address, this.chainInfo.bech32Config.bech32PrefixAccAddr)
+        ) {
+          this.isValidAddress = false;
+          return;
+        }
+        this.isValidAddress = true;
+
         const { accountAddress, accountEvmAddress } = transferAddress(
           this.chainInfo.bech32Config.bech32PrefixAccAddr,
           params?.address,
@@ -124,6 +139,48 @@ export class AccountDetailComponent implements OnInit, OnDestroy {
 
         this.getAccountDetail();
         this.checkWatchList();
+
+        if(accountAddress === BASE_ACCOUNT_ADDRESS.cosmos && accountEvmAddress === BASE_ACCOUNT_ADDRESS.evm) {
+          this.accountType = 'evm';
+          this.tooltipCosmosText = COSMOS_WARNING_MESSAGE;
+          return;
+        }
+
+        this.accountService.getAccountInfo(accountAddress).subscribe({
+          next: (data: { account?: {'@type'?: string } } = {}) => {
+            const { account } = data;
+            const { "@type": type } = account || {};
+
+            if (type === EVM_ACCOUNT_MESSAGE_TYPE) {
+              this.accountType = 'evm';
+              this.tooltipCosmosText = COSMOS_WARNING_MESSAGE;
+              return;
+            }
+
+            if (type === COSMOS_ACCOUNT_MESSAGE_TYPE) {
+              const sequence = getValueOfKeyInObject(account, 'sequence');
+              const pubkey = getValueOfKeyInObject(account, 'pub_key');
+              
+              if (Number(sequence) <= 0) return;
+
+              if(!pubkey || !Object.keys(pubkey)?.length) {
+                this.accountType = 'evm';
+                this.tooltipCosmosText = COSMOS_WARNING_MESSAGE;
+                return;
+              }else {
+                this.accountType = 'cosmos';
+                this.tooltipEvmText = EVM_WARNING_MESSAGE;
+                return;
+              }
+            }
+
+            if (type) {
+              this.accountType = 'cosmos';
+              this.tooltipEvmText = EVM_WARNING_MESSAGE;
+              return;
+            }
+          },
+        });
       }
     });
   }
@@ -289,3 +346,4 @@ export class AccountDetailComponent implements OnInit, OnDestroy {
     }
   }
 }
+
diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html
index 547bb4e76..8c87ea490 100644
--- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html
+++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.html
@@ -507,7 +507,7 @@
                           *ngIf="index < data.limit">
                           <div class="item-show d-flex justify-content-between align-items-center">
                             <app-name-tag
-                              [value]="item.fromAddress || currentAddress"
+                              [value]="item.fromAddress || currentAddress | beautyAddress"
                               [iconContract]="isEvmSmartContract(item.fromAddress || currentAddress)"
                               [linkRouter]="
                                 nonFungibleTokenType === nftType.ERC721
@@ -559,6 +559,9 @@
                         <span (click)="expandData(data)" class="cursor-pointer">Collapse all</span>
                       </div>
                     </div>
+                    <ng-container *ngSwitchCase="'arrow'">
+                      <img [src]="'assets/icons/icons-svg/basic/arrow-circle-right.svg'" alt="" />
+                    </ng-container>
                     <div *ngSwitchCase="'toAddress'">
                       <ng-container *ngFor="let item of data.arrEvent; let index = index">
                         <div
@@ -568,7 +571,7 @@
                           <div class="item-show d-flex align-items-center">
                             <div [style]="'min-width: 148px'">
                               <app-name-tag
-                                [value]="item.toAddress || currentAddress"
+                                [value]="item.toAddress || currentAddress | beautyAddress"
                                 [iconContract]="isEvmSmartContract(item.toAddress || currentAddress)"
                                 [linkRouter]="
                                   nonFungibleTokenType === nftType.ERC721
@@ -616,7 +619,7 @@
                       <ng-container *ngIf="modeQuery !== tabsData.FtsTxs">
                         <app-name-tag
                           *ngIf="data[template.matColumnDef]"
-                          [value]="data[template.matColumnDef]"
+                          [value]="data[template.matColumnDef] | beautyAddress"
                           [linkRouter]="[
                             (data[template.matColumnDef] | isContract) ? '/contracts' : '/address',
                             data[template.matColumnDef]
@@ -638,7 +641,7 @@
                             <div class="item-show d-flex align-items-center">
                               <div [style]="'min-width: 148px'">
                                 <app-name-tag
-                                  [value]="item.to || currentAddress"
+                                  [value]="item.to || currentAddress | beautyAddress"
                                   [linkRouter]="[
                                     (item.to || currentAddress | isContract) ? '/contracts' : '/address',
                                     item.to || currentAddress
@@ -678,7 +681,7 @@
                             *ngIf="index < data.limit">
                             <div class="item-show d-flex justify-content-between align-items-center">
                               <app-name-tag
-                                [value]="item.from || currentAddress"
+                                [value]="item.from || currentAddress | beautyAddress"
                                 [iconContract]="item.from || currentAddress | isContract"
                                 [linkRouter]="[
                                   (item.from || currentAddress | isContract) ? '/contracts' : '/address',
@@ -787,14 +790,14 @@
                                 [iconContract]="true"
                                 [linkRouter]="['/evm-contracts', item.contractAddress || currentAddress]"
                                 [isShorterText]="true"
-                                [value]="item.contractAddress"
+                                [value]="item.contractAddress | beautyAddress"
                                 [isEnableRouter]="!item.contractAddress?.startsWith('Null')"></app-name-tag>
                               <app-name-tag
                                 *ngIf="nonFungibleTokenType === nftType.CW721"
                                 [iconContract]="true"
                                 [linkRouter]="['/contracts', item.contractAddress || currentAddress]"
                                 [isShorterText]="true"
-                                [value]="item.contractAddress"
+                                [value]="item.contractAddress | beautyAddress"
                                 [isEnableRouter]="!item.contractAddress?.startsWith('Null')"></app-name-tag>
                             </div>
                           </div>
diff --git a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts
index 00c6b8700..2d08ccf19 100644
--- a/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts
+++ b/src/app/pages/account/account-detail/account-transaction-table/account-transaction-table.component.ts
@@ -7,7 +7,7 @@ import * as _ from 'lodash';
 import * as moment from 'moment';
 import { Subject } from 'rxjs';
 import { map, switchMap, takeUntil } from 'rxjs/operators';
-import { AccountTxType, ETypeFtExport, TabsAccountLink } from 'src/app/core/constants/account.enum';
+import { AccountTxType, ETypeFtExport, ETypeNftExport, TabsAccountLink } from 'src/app/core/constants/account.enum';
 import {
   LENGTH_CHARACTER,
   NULL_ADDRESS,
@@ -72,6 +72,7 @@ export class AccountTransactionTableComponent implements OnInit, OnDestroy {
     { matColumnDef: 'height', headerCellDef: 'Height', headerWidth: 10 },
     { matColumnDef: 'timestamp', headerCellDef: 'Time', headerWidth: 12 },
     { matColumnDef: 'from', headerCellDef: 'From', headerWidth: 15 },
+    { matColumnDef: 'arrow', headerCellDef: ' ', headerWidth: 5 },
     { matColumnDef: 'to', headerCellDef: 'To', headerWidth: 15 },
     { matColumnDef: 'evmAmount', headerCellDef: 'Amount', headerWidth: 11 },
     { matColumnDef: 'hash', headerCellDef: this.denom ? `Cosmos Txn` : 'Txn', headerWidth: 8, cssClass: 'pt-3' },
@@ -81,7 +82,8 @@ export class AccountTransactionTableComponent implements OnInit, OnDestroy {
     { matColumnDef: 'tx_hash', headerCellDef: 'Tx Hash', headerWidth: 18, cssClass: 'pt-3' },
     { matColumnDef: 'type', headerCellDef: 'Message', headerWidth: 18, cssClass: 'pt-4' },
     { matColumnDef: 'timestamp', headerCellDef: 'Time', headerWidth: 12, cssClass: 'pt-4' },
-    { matColumnDef: 'fromAddress', headerCellDef: 'From', headerWidth: 22, cssClass: 'pt-0' },
+    { matColumnDef: 'fromAddress', headerCellDef: 'From', headerWidth: 24, cssClass: 'pt-0' },
+    { matColumnDef: 'arrow', headerCellDef: ' ', headerWidth: 5 },
     { matColumnDef: 'toAddress', headerCellDef: 'To', headerWidth: 20, cssClass: 'pt-0' },
   ];
 
@@ -89,7 +91,8 @@ export class AccountTransactionTableComponent implements OnInit, OnDestroy {
     { matColumnDef: 'tx_hash', headerCellDef: 'Tx Hash', headerWidth: 18, cssClass: 'pt-3' },
     { matColumnDef: 'method', headerCellDef: 'Message', headerWidth: 14, cssClass: 'pt-4' },
     { matColumnDef: 'timestamp', headerCellDef: 'Time', headerWidth: 12, cssClass: 'pt-4' },
-    { matColumnDef: 'from', headerCellDef: 'From', headerWidth: 22, cssClass: 'pt-0' },
+    { matColumnDef: 'from', headerCellDef: 'From', headerWidth: 24, cssClass: 'pt-0' },
+    { matColumnDef: 'arrow', headerCellDef: ' ', headerWidth: 5 },
     { matColumnDef: 'to', headerCellDef: 'To', headerWidth: 20, cssClass: 'pt-0' },
   ];
 
@@ -485,6 +488,17 @@ export class AccountTransactionTableComponent implements OnInit, OnDestroy {
     });
   }
 
+  getEvmContractList(addrs?: string[], cb?: (res?: {evm_smart_contract : {address: string}[]} ) => void) {
+    if (addrs) {
+      const listAddrUnique = _.uniq(addrs);
+      this.contractService.findEvmContractList(listAddrUnique).subscribe({
+        next: (res) => {
+          cb(res)
+        },
+      });
+    }
+  }
+
   getListEvmTxByAddress(payload) {
     this.userService
       .getListEvmTxByAddress(payload)
@@ -495,10 +509,17 @@ export class AccountTransactionTableComponent implements OnInit, OnDestroy {
           return this.transactionService.getListMappingName(listMethodId).pipe(
             map((element) => {
               if (res?.evm_transaction?.length > 0) {
-                res.evm_transaction.forEach((tx) => {
-                  const methodId = _.get(tx, 'data')?.substring(0, 8);
-                  tx['method'] = mappingMethodName(element, methodId);
-                });
+                  const addrs = res?.evm_transaction?.map((tx) => tx?.to)?.filter(Boolean);
+                  this.getEvmContractList( _.uniq(addrs), (evmList) => {
+                    res.evm_transaction.forEach((tx) => {
+                      const methodId = _.get(tx, 'data')?.substring(0, 8);
+                      const isEvmContract = evmList?.evm_smart_contract?.some((evm) => evm?.address === tx?.to)
+                      let method = mappingMethodName(element, methodId)
+
+                      if (tx?.to && !isEvmContract) method = 'Send';
+                      tx['method'] = method;
+                    });
+                  })
                 return res;
               }
               return [];
@@ -668,7 +689,7 @@ export class AccountTransactionTableComponent implements OnInit, OnDestroy {
     } else {
       this.userService.getListCW721ByAddress(payload).subscribe({
         next: (data) => {
-          this.handleGetData({ data });
+          this.handleGetData(data);
         },
         error: (e) => {
           if (e.name === TIMEOUT_ERROR) {
@@ -913,6 +934,13 @@ export class AccountTransactionTableComponent implements OnInit, OnDestroy {
         exportType = ETypeFtExport.CW20;
       }
     }
+    if (this.modeQuery === TabsAccountLink.NftTxs) {
+      if (this.nonFungibleTokenType === ETokenNFTTypeBE.CW721) {
+        exportType = ETypeNftExport.CW721;
+      } else {
+        exportType = ETypeNftExport.ERC721;
+      }
+    }
     local.setItem(
       STORAGE_KEYS.SET_DATA_EXPORT,
       JSON.stringify({ address: this.currentAddress || this.addressNative, exportType }),
@@ -943,3 +971,4 @@ export class AccountTransactionTableComponent implements OnInit, OnDestroy {
     return this.smartContractList.filter((i) => i === addr).length > 0;
   }
 }
+
diff --git a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts
index 39874192d..9169d8d40 100644
--- a/src/app/pages/account/account-detail/nft-list/nft-list.component.ts
+++ b/src/app/pages/account/account-detail/nft-list/nft-list.component.ts
@@ -11,6 +11,7 @@ import { AccountService } from 'src/app/core/services/account.service';
 import { checkTypeFile } from 'src/app/core/utils/common/info-common';
 import { transferAddress } from 'src/app/core/utils/common/address-converter';
 import { EnvironmentService } from 'src/app/core/data-services/environment.service';
+import { isEvmAddress } from 'src/app/core/utils/common/validation';
 
 @Component({
   selector: 'app-nft-list',
@@ -82,7 +83,7 @@ export class NftListComponent implements OnInit, OnChanges, OnDestroy {
     const payload = {
       owner: this.address,
       limit: this.pageData.pageSize,
-      keyword: this.textSearch,
+      keyword: isEvmAddress(this.textSearch) ? this.textSearch?.toLowerCase() : this.textSearch,
       offset: (this.pageData.pageIndex - 1) * this.pageData.pageSize,
       address: this.nftFilter || null,
     };
diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.html b/src/app/pages/account/account-detail/token-table/token-table.component.html
index 679a285e1..90e9c7a07 100644
--- a/src/app/pages/account/account-detail/token-table/token-table.component.html
+++ b/src/app/pages/account/account-detail/token-table/token-table.component.html
@@ -133,7 +133,7 @@ <h3 class="mb-3 fw-700 text--gray-light-2 mb-lg-0">Fungible Tokens ({{ pageData?
                 <div class="d-flex flex-column">
                   <span class="text--gray-4 caption fw-normal">Contract</span>
                   <app-name-tag
-                    [value]="element.contract_address"
+                    [value]="element.contract_address | beautyAddress"
                     *ngIf="element.contract_address !== '-'"
                     [iconContract]="true"
                     [linkRouter]="[
diff --git a/src/app/pages/account/account-detail/token-table/token-table.component.ts b/src/app/pages/account/account-detail/token-table/token-table.component.ts
index b9a29aa22..6920560d0 100644
--- a/src/app/pages/account/account-detail/token-table/token-table.component.ts
+++ b/src/app/pages/account/account-detail/token-table/token-table.component.ts
@@ -124,11 +124,15 @@ export class TokenTableComponent implements OnChanges {
 
       if (this.textSearch && searchList) {
         searchList = searchList?.filter(
-          (item) => item.name?.toLowerCase().includes(txtSearch.toLowerCase()) || item.contract_address == txtSearch,
+          (item) =>
+            item.name?.toLowerCase().includes(txtSearch.toLowerCase()) ||
+            item.contract_address == txtSearch.toLowerCase(),
         );
       } else if (this.tokenFilter === '') {
         searchList = this.dataTable?.filter(
-          (item) => item.name?.toLowerCase().includes(txtSearch.toLowerCase()) || item.contract_address == txtSearch,
+          (item) =>
+            item.name?.toLowerCase().includes(txtSearch.toLowerCase()) ||
+            item.contract_address == txtSearch.toLowerCase(),
         );
       }
 
diff --git a/src/app/pages/blocks/block-detail/block-detail.component.html b/src/app/pages/blocks/block-detail/block-detail.component.html
index 3d0b63b53..e1c2b8bc7 100644
--- a/src/app/pages/blocks/block-detail/block-detail.component.html
+++ b/src/app/pages/blocks/block-detail/block-detail.component.html
@@ -376,12 +376,21 @@ <h2 class="card-header mb-0 text--white pb-0">EVM Transactions</h2>
                             [routerLink]="['/tx', data['hash']]">
                             {{ data[template.matColumnDef] | ellipsis: 8 : 8 }}
                           </a>
-                          <a
-                            *ngSwitchCase="'height'"
-                            class="text--primary cursor-pointer block-link"
-                            [routerLink]="['/block', data['height']]">
-                            {{ data[template.matColumnDef] }}
-                          </a>
+                          <ng-container
+                            *ngIf="
+                              isSameHeight(data[template.matColumnDef], blockHeight, blockDetail?.height);
+                              else showLink
+                            ">
+                            <div *ngSwitchCase="'height'">{{ data[template.matColumnDef] }}</div>
+                          </ng-container>
+                          <ng-template #showLink>
+                            <a
+                              *ngSwitchCase="'height'"
+                              class="text--primary cursor-pointer block-link"
+                              [routerLink]="['/block', data['height']]">
+                              {{ data[template.matColumnDef] }}
+                            </a>
+                          </ng-template>
                           <div *ngSwitchCase="'method'" class="g-type aura-status">
                             <div class="d-flex" [appTooltip]="data.lstType | combineTxsMsg">
                               {{ data[template.matColumnDef] }}
diff --git a/src/app/pages/blocks/block-detail/block-detail.component.ts b/src/app/pages/blocks/block-detail/block-detail.component.ts
index 56245125a..23fedaf72 100644
--- a/src/app/pages/blocks/block-detail/block-detail.component.ts
+++ b/src/app/pages/blocks/block-detail/block-detail.component.ts
@@ -277,4 +277,8 @@ export class BlockDetailComponent implements OnInit {
       });
     }
   }
+
+  isSameHeight(value: string, blockHeight: string | number, blockDetailHeight: string | number): boolean {
+    return value?.toString() === (blockHeight || blockDetailHeight)?.toString();
+  }
 }
diff --git a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.html b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.html
index 8a76aa5f0..6e22a89d9 100644
--- a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.html
+++ b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.html
@@ -1,6 +1,10 @@
 <ng-container *ngIf="root; else noValues">
-  <div class="d-flex justify-content-between align-items-center">
-    <div class="my-t mb-1 mb-lg-3 small-text">
+  <div
+    [ngClass]="{
+      'd-flex justify-content-between align-items-center':
+        !environmentService.isMobile || (environmentService.isMobile && !userAddress)
+    }">
+    <div class="my-t mb-1 mb-lg-3 small-text d-flex align-items-center box-connect-wallet">
       <button
         (click)="connectWallet()"
         class="button button-pill button--xs button-outline button-outline__in-card"
@@ -15,8 +19,22 @@
         <span class="icon-connect connected"></span>
         <span class="text--gray-1">Connected to Web3</span>
       </button>
+      <ng-container *ngIf="userAddress">
+        <div class="divider divider-vertical mx-2 mx-lg-3 d-none d-lg-flex"></div>
+        <div class="text--blue-3link caption fw-normal cursor-pointer d-flex align-items-center" (click)="disconnect()">
+          <span class="txt-disconnect">Disconnect</span>
+          <img
+            [src]="'assets/icons/icons-svg/color/disconnect.svg' | imageS3"
+            alt=""
+            width="18px"
+            height="18px"
+            class="ml-1" />
+        </div>
+      </ng-container>
     </div>
-    <div class="caption fw-normal-mob d-flex align-items-center">
+    <div
+      class="caption fw-normal-mob d-flex align-items-center"
+      [ngClass]="{ 'justify-content-end': environmentService.isMobile && userAddress }">
       <span class="cursor-pointer text--primary" (click)="expandMenu()">
         <ng-container *ngIf="!isExpand">Expand all</ng-container>
         <ng-container *ngIf="isExpand">Collapse all</ng-container>
diff --git a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts
index b7666cd8a..ada262e73 100644
--- a/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts
+++ b/src/app/pages/contracts/contracts-detail/contracts-contents/contract/write-contact/write-contract.component.ts
@@ -7,6 +7,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { Schema, Validator } from 'jsonschema';
 import * as _ from 'lodash';
 import { MESSAGES_CODE_CONTRACT } from 'src/app/core/constants/messages.constant';
+import { EnvironmentService } from 'src/app/core/data-services/environment.service';
 import { getRef, getType, parseValue } from 'src/app/core/helpers/contract-schema';
 import { IMultichainWalletAccount } from 'src/app/core/models/wallet';
 import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service';
@@ -30,6 +31,7 @@ export class WriteContractComponent implements OnInit {
   root: any[];
 
   constructor(
+    public environmentService: EnvironmentService,
     private walletService: WalletService,
     private toastr: NgxToastrService,
     private translate: TranslateService,
@@ -235,4 +237,8 @@ export class WriteContractComponent implements OnInit {
       }
     });
   }
+
+  disconnect() {
+    this.walletService.disconnect();
+  }
 }
diff --git a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-contract.component.html b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-contract.component.html
index fe7f3be94..c18bdc353 100644
--- a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-contract.component.html
+++ b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-contract.component.html
@@ -122,7 +122,7 @@
           class="mr-2" />
         <div>
           Are you the contract creator?
-          <a class="text--primary" [routerLink]="['verify']"> Verify and Publish </a>
+          <a class="text--primary" [routerLink]="['/evm-contracts', contractsAddress, 'verify']"> Verify and Publish</a>
           your contract source code today!
         </div>
       </div>
@@ -135,7 +135,9 @@
           class="mr-2" />
         <div>
           In case this is proxy contract, verify
-          <a class="text--primary" [routerLink]="['proxy-verify']"> Is this a proxy </a>
+          <a class="text--primary" [routerLink]="['/evm-contracts', contractsAddress, 'proxy-verify']">
+            Is this a proxy
+          </a>
           or not?
         </div>
       </div>
diff --git a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-read/evm-read.component.ts b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-read/evm-read.component.ts
index 2b6542b13..e5c710030 100644
--- a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-read/evm-read.component.ts
+++ b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-read/evm-read.component.ts
@@ -87,10 +87,6 @@ export class EvmReadComponent implements OnChanges {
   }
 
   createContract() {
-    if (this.contract) {
-      return this.contract;
-    }
-
     try {
       const provider = getEthersProvider(this.environmentService.etherJsonRpc);
 
diff --git a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-write/evm-write.component.ts b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-write/evm-write.component.ts
index 2cffcc8a1..07d31c3fc 100644
--- a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-write/evm-write.component.ts
+++ b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-content/evm-contract/evm-write/evm-write.component.ts
@@ -202,10 +202,6 @@ export class EvmWriteComponent implements OnChanges {
   }
 
   createContract() {
-    if (this.contract) {
-      return this.contract;
-    }
-
     try {
       const account = this.walletService.getEvmAccount();
 
diff --git a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-info/evm-contract-info.component.html b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-info/evm-contract-info.component.html
index 29da70187..732bde99d 100644
--- a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-info/evm-contract-info.component.html
+++ b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contract-info/evm-contract-info.component.html
@@ -16,7 +16,7 @@ <h6 class="h4-mob mb-0 text--white fw-semibold">Information</h6>
       <div class="">
         <div class="text--gray-4 caption fw-normal mb-1">Public Name</div>
         <app-name-tag
-          [value]="contractDetail?.address"
+          [value]="contractDetail?.address | beautyAddress"
           [mode]="ENameTag.Public"
           [screen]="EScreen.Contract"
           [fullText]="true">
@@ -25,7 +25,10 @@ <h6 class="h4-mob mb-0 text--white fw-semibold">Information</h6>
 
       <div class="mt-3">
         <div class="text--gray-4 caption fw-normal mb-1">Private Name Tag</div>
-        <app-name-tag [value]="contractDetail?.address" [mode]="ENameTag.Private" [screen]="EScreen.Contract">
+        <app-name-tag
+          [value]="contractDetail?.address | beautyAddress"
+          [mode]="ENameTag.Private"
+          [screen]="EScreen.Contract">
         </app-name-tag>
       </div>
     </div>
@@ -54,7 +57,7 @@ <h6 class="h4-mob mb-0 text--white fw-semibold">More Info</h6>
         <div class="text--gray-light">
           <span class="mr-1 mr-lg-2" *ngIf="contractDetail?.creator">
             <app-name-tag
-              [value]="contractDetail?.creator"
+              [value]="contractDetail?.creator | beautyAddress"
               [widthAuto]="true"
               [linkRouter]="[
                 (contractDetail?.creator | isContract) ? '/contracts' : '/address',
diff --git a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contracts-detail.component.html b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contracts-detail.component.html
index f99185180..94b6b9c5e 100644
--- a/src/app/pages/evm-contracts/evm-contracts-detail/evm-contracts-detail.component.html
+++ b/src/app/pages/evm-contracts/evm-contracts-detail/evm-contracts-detail.component.html
@@ -4,10 +4,12 @@
     <div class="d-flex justify-content-between justify-content-lg-start mb-4 mb-lg-5 box-contract-info">
       <div class="d-lg-flex align-items-center">
         <h1 class="mb-0 text--white" id="ttiopa123">EVM Contract</h1>
-        <span class="text--gray-5 body-01 body-02-mob ml-sm-2 break-word mt-2 mt-lg-0">{{ contractAddress }}</span>
+        <span class="text--gray-5 body-01 body-02-mob ml-sm-2 break-word mt-2 mt-lg-0">{{
+          contractAddress | beautyAddress
+        }}</span>
       </div>
       <div class="d-flex align-items-center">
-        <div class="btn-mobile ml-4 ml-lg-2" [copyBtn]="contractAddress"></div>
+        <div class="btn-mobile ml-4 ml-lg-2" [copyBtn]="contractAddress | beautyAddress"></div>
         <div
           class="btn-mobile ml-4 ml-lg-2"
           [appTooltip]="isWatchList ? 'Remove this address from your watch list' : 'Add this address to my watch list'">
diff --git a/src/app/pages/evm-contracts/evm-contracts-list/evm-contracts-list.component.html b/src/app/pages/evm-contracts/evm-contracts-list/evm-contracts-list.component.html
index 177c0811b..73939f503 100644
--- a/src/app/pages/evm-contracts/evm-contracts-list/evm-contracts-list.component.html
+++ b/src/app/pages/evm-contracts/evm-contracts-list/evm-contracts-list.component.html
@@ -112,7 +112,7 @@ <h1 class="mb-4 mb-lg-6 text--white">EVM Contracts</h1>
                           *ngIf="data['contract_verification'] === ContractVerifyType.Verified" />
                       </div>
                       <app-name-tag
-                        [value]="data[template.matColumnDef]"
+                        [value]="data[template.matColumnDef] | beautyAddress"
                         [linkRouter]="[template.isUrl, data[template.matColumnDef]]"
                         [maxCharacter]="12"
                         [tooltipPosition]="'tooltip--right'"></app-name-tag>
@@ -140,7 +140,7 @@ <h1 class="mb-4 mb-lg-6 text--white">EVM Contracts</h1>
                     <ng-container *ngSwitchCase="'creator'">
                       <app-name-tag
                         *ngIf="data[template.matColumnDef]"
-                        [value]="data[template.matColumnDef]"
+                        [value]="data[template.matColumnDef] | beautyAddress"
                         [linkRouter]="[template.isUrl, data[template.matColumnDef]]"
                         [maxCharacter]="12"
                         [tooltipPosition]="'tooltip--right'"></app-name-tag>
diff --git a/src/app/pages/evm-contracts/evm-contracts-list/evm-contracts-list.component.ts b/src/app/pages/evm-contracts/evm-contracts-list/evm-contracts-list.component.ts
index e526ad440..5ade69995 100644
--- a/src/app/pages/evm-contracts/evm-contracts-list/evm-contracts-list.component.ts
+++ b/src/app/pages/evm-contracts/evm-contracts-list/evm-contracts-list.component.ts
@@ -81,7 +81,7 @@ export class EvmContractsListComponent implements OnInit, OnDestroy {
         if (res?.evm_smart_contract?.length) {
           res?.evm_smart_contract.forEach((item) => {
             item.contract_verification = _.get(item, 'evm_contract_verifications[0].status');
-            item.token_tracker = _.get(item, 'erc20_contract.name');
+            item.token_tracker = _.get(item, 'erc20_contract.name') || _.get(item, 'erc721_contract.name');
           });
           this.dataSource.data = res.evm_smart_contract;
           this.pageData.length = res.evm_smart_contract_aggregate?.aggregate?.count;
diff --git a/src/app/pages/evm-token/evm-nft-detail/evm-nft-detail.component.html b/src/app/pages/evm-token/evm-nft-detail/evm-nft-detail.component.html
index 842e129a0..78eea3752 100644
--- a/src/app/pages/evm-token/evm-nft-detail/evm-nft-detail.component.html
+++ b/src/app/pages/evm-token/evm-nft-detail/evm-nft-detail.component.html
@@ -164,7 +164,7 @@ <h2 class="mb-0 h5-mob text--white card__ntf-detail-item" id="popupCopy">Details
               <div class="label-detail text--gray-5">Owner:</div>
               <div class="d-flex align-items-center position-relative" *ngIf="nftDetail?.owner">
                 <app-name-tag
-                  [value]="nftDetail?.owner"
+                  [value]="nftDetail?.owner | beautyAddress"
                   [fullText]="true"
                   [widthAuto]="true"
                   [linkRouter]="[
@@ -179,7 +179,7 @@ <h2 class="mb-0 h5-mob text--white card__ntf-detail-item" id="popupCopy">Details
               <div class="label-detail text--gray-5">Contract Address:</div>
               <div class="d-flex align-items-center position-relative">
                 <app-name-tag
-                  [value]="nftDetail?.contract_address"
+                  [value]="nftDetail?.contract_address | beautyAddress"
                   [linkRouter]="['/evm-contracts', nftDetail?.contract_address]"
                   [fullText]="true"
                   [widthAuto]="true"
@@ -192,7 +192,7 @@ <h2 class="mb-0 h5-mob text--white card__ntf-detail-item" id="popupCopy">Details
               <div class="d-flex align-items-center">
                 <app-name-tag
                   *ngIf="nftDetail?.creator"
-                  [value]="nftDetail?.creator"
+                  [value]="nftDetail?.creator | beautyAddress"
                   [fullText]="true"
                   [widthAuto]="true"
                   [linkRouter]="[
@@ -344,7 +344,7 @@ <h2 class="text--white mb-0">Item Activity</h2>
                       ">
                       <app-name-tag
                         *ngIf="data[template.matColumnDef]"
-                        [value]="data[template.matColumnDef]"
+                        [value]="data[template.matColumnDef] | beautyAddress"
                         [linkRouter]="[
                           isEvmSmartContract(data[template.matColumnDef]) ? '/evm-contracts' : '/address',
                           data[template.matColumnDef]
@@ -376,7 +376,7 @@ <h2 class="text--white mb-0">Item Activity</h2>
                         data.modeExecute !== modeExecuteTransaction.UnEquip &&
                         data[template.matColumnDef]
                       "
-                      [value]="data[template.matColumnDef]"
+                      [value]="data[template.matColumnDef] | beautyAddress"
                       [linkRouter]="[
                         isEvmSmartContract(data[template.matColumnDef]) ? '/evm-contracts' : '/address',
                         data[template.matColumnDef]
diff --git a/src/app/pages/evm-token/evm-nft-detail/evm-nft-detail.component.ts b/src/app/pages/evm-token/evm-nft-detail/evm-nft-detail.component.ts
index 1606a990d..6ab535615 100644
--- a/src/app/pages/evm-token/evm-nft-detail/evm-nft-detail.component.ts
+++ b/src/app/pages/evm-token/evm-nft-detail/evm-nft-detail.component.ts
@@ -51,7 +51,7 @@ export class EvmNFTDetailComponent implements OnInit {
   dataSource: MatTableDataSource<any> = new MatTableDataSource();
   templates: Array<TableTemplate> = [
     { matColumnDef: 'tx_hash', headerCellDef: 'Txn Hash' },
-    { matColumnDef: 'type', headerCellDef: 'Method' },
+    { matColumnDef: 'type', headerCellDef: 'Event' },
     // { matColumnDef: 'status', headerCellDef: 'Result' },
     { matColumnDef: 'timestamp', headerCellDef: 'Time' },
     { matColumnDef: 'from_address', headerCellDef: 'From' },
@@ -204,36 +204,13 @@ export class EvmNFTDetailComponent implements OnInit {
       isNFTDetail: true,
     };
 
-    // this.tokenService.getERC721Transfer(payload)
     this.tokenService
       .getERC721Transfer(payload)
       .pipe(
         switchMap((res) => {
           const erc721Activities = res?.erc721_activity;
-          const listTemp = erc721Activities
-            ?.filter((j) => j.evm_transaction?.data?.length > 0)
-            ?.map((k) => k.evm_transaction?.data?.substring(0, 8));
-          const listMethodId = _.uniq(listTemp);
-          return this.transactionService.getListMappingName(listMethodId).pipe(
-            map((element) => {
-              if (erc721Activities?.length > 0) {
-                return erc721Activities.map((tx) => {
-                  const methodId = _.get(tx, 'evm_transaction.data')?.substring(0, 8);
-                  return {
-                    ...tx,
-                    type: mappingMethodName(element, methodId),
-                  };
-                });
-              }
-              return [];
-            }),
-          );
-        }),
-      )
-      .pipe(
-        switchMap((res) => {
           let listAddr = [];
-          res.forEach((element) => {
+          erc721Activities.forEach((element) => {
             if (element.from) {
               listAddr.push(element.from);
             }
@@ -245,7 +222,7 @@ export class EvmNFTDetailComponent implements OnInit {
           return this.contractService.findEvmContractList(listAddrUnique).pipe(
             map((r) => {
               this.smartContractList = _.uniq((r?.evm_smart_contract || []).map((i) => i?.address));
-              return res;
+              return erc721Activities;
             }),
           );
         }),
@@ -264,29 +241,7 @@ export class EvmNFTDetailComponent implements OnInit {
                 element.evm_transaction.transaction.code == CodeTransaction.Success
                   ? StatusTransaction.Success
                   : StatusTransaction.Fail;
-              element['type'] = element?.type;
-              // if (
-              //   element['action'] === ModeExecuteTransaction.Approve ||
-              //   element['action'] === ModeExecuteTransaction.Revoke
-              // ) {
-              //   let msg = element?.tx.transaction_messages[0]?.content?.msg;
-              //   if (typeof msg === 'string') {
-              //     try {
-              //       msg = JSON.parse(msg);
-              //     } catch (e) { }
-              //   }
-              //   element['to_address'] = msg[Object.keys(msg)[0]]?.spender;
-              // }
-              // if (element.tx.transaction_messages[0].content?.funds?.length > 0) {
-              //   let dataDenom = this.commonService.mappingNameIBC(
-              //     element.tx.transaction_messages[0].content?.funds[0]?.denom,
-              //   );
-              //   element['price'] = balanceOf(
-              //     element.tx.transaction_messages[0].content.funds[0]?.amount,
-              //     dataDenom['decimals'],
-              //   );
-              //   element['denom'] = dataDenom['display'];
-              // }
+              element['type'] = element?.action;
             });
             this.dataSource.data = txs;
             this.pageData.length = txs?.length;
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-holders-tab/evm-token-holders-tab.component.html b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-holders-tab/evm-token-holders-tab.component.html
index a0d13bf36..af8c77091 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-holders-tab/evm-token-holders-tab.component.html
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-holders-tab/evm-token-holders-tab.component.html
@@ -7,7 +7,7 @@
         }})
       </span>
       <span class="small-body text--light-gray" *ngIf="totalHolder <= numberTopHolder">
-        A total of {{ totalHolder || 0 | number }} token holder{{ totalHolder > 1 ? 's' : '' }}
+        A total of {{ totalHolder || 0 | number }} token holder{{ totalHolder > 1 ? 's' : '' }} found
       </span>
     </div>
   </div>
@@ -40,7 +40,7 @@
                   <ng-container *ngSwitchCase="'owner'">
                     <app-name-tag
                       [iconContract]="isEvmSmartContract(data[template.matColumnDef])"
-                      [value]="data[template.matColumnDef]"
+                      [value]="data[template.matColumnDef] | beautyAddress"
                       [fullText]="true"
                       [fullTextMob]="true"
                       [tooltipPosition]="'tooltip--right'"
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-info-tab/evm-token-info-tab.component.html b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-info-tab/evm-token-info-tab.component.html
index caff9a24c..f473b2cb4 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-info-tab/evm-token-info-tab.component.html
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-info-tab/evm-token-info-tab.component.html
@@ -1,6 +1,7 @@
 <div class="text--white">
   <div class="body-02 fw-semibold text--gray-4 mb-1">OVERVIEW</div>
-  <div class="text--gray-6">
+  <div class="text--gray-6" [featureFlag]="'SetTokenInfo'" [flagEnabled]="false">
     Aura gives you the joint benefits of open blockchain technology and traditional currency
   </div>
+  <div class="text--gray-6" [featureFlag]="'SetTokenInfo'" [innerHTML]="overviewInfo | newline"></div>
 </div>
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-info-tab/evm-token-info-tab.component.ts b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-info-tab/evm-token-info-tab.component.ts
index 8cdebb530..838ededf9 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-info-tab/evm-token-info-tab.component.ts
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-info-tab/evm-token-info-tab.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
+import { FeatureFlagService } from '../../../../../core/data-services/feature-flag.service';
 
 @Component({
   selector: 'app-evm-token-info-tab',
@@ -7,6 +8,6 @@ import { Component, OnInit } from '@angular/core';
 })
 export class EvmTokenInfoTabComponent implements OnInit {
   constructor() {}
-
+  @Input() overviewInfo?: string;
   ngOnInit(): void {}
 }
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-inventory-tab/evm-token-inventory-tab.component.html b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-inventory-tab/evm-token-inventory-tab.component.html
index e683a2a97..58eeb303f 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-inventory-tab/evm-token-inventory-tab.component.html
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-inventory-tab/evm-token-inventory-tab.component.html
@@ -54,7 +54,7 @@
                 <app-name-tag
                   *ngIf="!breakpoint.value.matches"
                   class="small-text text--primary hover-link"
-                  [value]="item.owner"
+                  [value]="item.owner | beautyAddress"
                   [linkRouter]="['/token', item.contract_address]"
                   [linkParams]="{ a: item.owner }">
                 </app-name-tag>
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-transfers-tab/evm-token-transfers-tab.component.html b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-transfers-tab/evm-token-transfers-tab.component.html
index 8ff1b8c3c..e2a4f9f6b 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-transfers-tab/evm-token-transfers-tab.component.html
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-transfers-tab/evm-token-transfers-tab.component.html
@@ -107,7 +107,7 @@
                           ">
                           <app-name-tag
                             *ngIf="data.modeExecute !== modeExecuteTransaction.Mint && data[template.matColumnDef]"
-                            [value]="data[template.matColumnDef]"
+                            [value]="data[template.matColumnDef] | beautyAddress"
                             [linkRouter]="['/token', linkAddress]"
                             [linkParams]="{ a: data[template.matColumnDef] }"
                             [iconContract]="isEvmSmartContract(data[template.matColumnDef])"
@@ -115,13 +115,6 @@
                           </app-name-tag>
                         </ng-container>
                       </div>
-                      <ng-container *ngIf="!isSearchAddress">
-                        <img
-                          [src]="'assets/images/icons/arrow-right.png' | imageS3"
-                          width="14"
-                          height="9"
-                          class="mr-lg-3 mr-0 ml-3" />
-                      </ng-container>
                       <ng-container *ngIf="isSearchAddress">
                         <div class="box-token-transfer">
                           <span
@@ -134,11 +127,14 @@
                       </ng-container>
                     </div>
                   </ng-container>
+                  <ng-container *ngSwitchCase="'arrow'">
+                    <img [src]="'assets/icons/icons-svg/basic/arrow-circle-right.svg'" alt="" class="mr-1" />
+                  </ng-container>
                   <ng-container *ngSwitchCase="'to_address'">
                     <div [style.min-width]="'210px'">
                       <app-name-tag
                         *ngIf="data[template.matColumnDef]"
-                        [value]="data[template.matColumnDef]"
+                        [value]="data[template.matColumnDef] | beautyAddress"
                         [iconContract]="isEvmSmartContract(data[template.matColumnDef])"
                         [maxCharacter]="15"
                         [isEnableRouter]="!data[template.matColumnDef]?.startsWith('Null')"
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-transfers-tab/evm-token-transfers-tab.component.ts b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-transfers-tab/evm-token-transfers-tab.component.ts
index 4c29326db..259ac3c2b 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-transfers-tab/evm-token-transfers-tab.component.ts
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content-tab/evm-token-transfers-tab/evm-token-transfers-tab.component.ts
@@ -37,7 +37,8 @@ export class EvmTokenTransfersTabComponent implements OnInit, AfterViewInit {
     { matColumnDef: 'type', headerCellDef: 'Method', isShort: true, headerWidth: 170 },
     // { matColumnDef: 'status', headerCellDef: 'Result' },
     { matColumnDef: 'timestamp', headerCellDef: 'Time', headerWidth: 150 },
-    { matColumnDef: 'from_address', headerCellDef: 'From', headerWidth: 250 },
+    { matColumnDef: 'from_address', headerCellDef: 'From', headerWidth: 200 },
+    { matColumnDef: 'arrow', headerCellDef: ' ', headerWidth: 28 },
     { matColumnDef: 'to_address', headerCellDef: 'To', headerWidth: 180 },
     { matColumnDef: 'amountToken', headerCellDef: 'Amount', isShort: true, headerWidth: 100 },
   ];
@@ -47,7 +48,8 @@ export class EvmTokenTransfersTabComponent implements OnInit, AfterViewInit {
     { matColumnDef: 'type', headerCellDef: 'Method', isShort: true, headerWidth: 170 },
     // { matColumnDef: 'status', headerCellDef: 'Result' },
     { matColumnDef: 'timestamp', headerCellDef: 'Time', headerWidth: 150 },
-    { matColumnDef: 'from_address', headerCellDef: 'From', headerWidth: 250 },
+    { matColumnDef: 'from_address', headerCellDef: 'From', headerWidth: 200 },
+    { matColumnDef: 'arrow', headerCellDef: ' ', headerWidth: 28 },
     { matColumnDef: 'to_address', headerCellDef: 'To', headerWidth: 180 },
     { matColumnDef: 'token_id', headerCellDef: 'Token ID' },
     { matColumnDef: 'details', headerCellDef: 'Details', headerWidth: 120 },
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content.component.html b/src/app/pages/evm-token/evm-token-content/evm-token-content.component.html
index 3f935c5c3..2d0d5dddf 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content.component.html
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content.component.html
@@ -5,8 +5,11 @@
         <img [src]="'assets/images/icons/token-tx.png' | imageS3" class="mr-2" alt="" width="18px" height="18px" />
         FILTER BY TOKEN TXN HASH
       </p>
-      <a class="text--primary body-02 break-word" [copyBtn]="textSearch" [routerLink]="['/tx', textSearch]">
-        {{ textSearch }}
+      <a
+        class="text--primary body-02 break-word"
+        [copyBtn]="textSearch | beautyAddress"
+        [routerLink]="['/tx', textSearch]">
+        {{ textSearch | beautyAddress }}
       </a>
     </div>
     <div *ngIf="!isSearchTx && isSearchAddress" class="card main-tab py-3 py-lg-4 px-4">
@@ -24,8 +27,8 @@
           <div class="mt-2">
             <app-name-tag
               [iconContract]="textSearch | isContract"
-              [value]="textSearch"
-              [linkRouter]="[(textSearch | isContract) ? '/contracts' : '/address', textSearch]"
+              [value]="textSearch | beautyAddress"
+              [linkRouter]="[(textSearch | isContract) ? '/contracts' : '/address', textSearch | beautyAddress]"
               [fullText]="true"
               [widthAuto]="true"
               [maxCharacter]="30"
@@ -33,14 +36,13 @@
             </app-name-tag>
           </div>
         </div>
-        <div
-          class="col-12 col-lg-4 pt-3 py-lg-0 px-lg-4 border-x text--gray-1 {{
+        <div class="col-12 col-lg-4 pt-3 py-lg-0 px-lg-4 border-x text--gray-1 {{
             tokenDetail?.isNFTContract ? 'no-border-bottom pb-0' : 'pb-3'
           }}">
           <div class="caption text--gray-5 mb-1 mb-lg-0">BALANCE</div>
           <ng-container *ngIf="!tokenDetail?.isNFTContract">
             <span *ngIf="infoSearch['balance'] == 0 || !infoSearch['balance']">0</span>
-            <span
+            <span 
               [appTooltip]="{ priceAmount: infoSearch['balance'], decimal: tokenDetail.decimals }"
               *ngIf="(infoSearch['balance'] | balance: tokenDetail.decimals | lt: 0.001) && infoSearch['balance'] != 0">
               {{ '<0.001' }}
@@ -164,9 +166,11 @@
     <app-evm-token-inventory-tab
       *ngIf="currentTab === tokenTab.Inventory"
       [typeContract]="tokenDetail?.type"></app-evm-token-inventory-tab>
-    <app-evm-token-info-tab *ngIf="currentTab === tokenTab.Info"></app-evm-token-info-tab>
-    <app-evm-token-contract-tab
-      *ngIf="currentTab === tokenTab.Contract"
+    <app-evm-token-info-tab 
+      *ngIf="currentTab === tokenTab.Info"
+      [overviewInfo]="tokenDetail?.overviewInfo"></app-evm-token-info-tab>
+    <app-evm-token-contract-tab 
+      *ngIf="currentTab === tokenTab.Contract" 
       [contractAddress]="contractAddress"
       [contractTypeData]="tokenDetail?.type"></app-evm-token-contract-tab>
   </div>
diff --git a/src/app/pages/evm-token/evm-token-content/evm-token-content.component.ts b/src/app/pages/evm-token/evm-token-content/evm-token-content.component.ts
index e10be35d9..1201db9ae 100644
--- a/src/app/pages/evm-token/evm-token-content/evm-token-content.component.ts
+++ b/src/app/pages/evm-token/evm-token-content/evm-token-content.component.ts
@@ -9,10 +9,13 @@ import { MAX_LENGTH_SEARCH_TOKEN, TOKEN_TAB } from 'src/app/core/constants/token
 import { EModeToken, TokenTab } from 'src/app/core/constants/token.enum';
 import { EWalletType } from 'src/app/core/constants/wallet.constant';
 import { EnvironmentService } from 'src/app/core/data-services/environment.service';
+import { EvmAddressPipe } from 'src/app/core/pipes/evm-address.pipe';
 import { NameTagService } from 'src/app/core/services/name-tag.service';
 import { TokenService } from 'src/app/core/services/token.service';
 import { transferAddress } from 'src/app/core/utils/common/address-converter';
 import local from 'src/app/core/utils/storage/local';
+import { FeatureFlagService } from '../../../core/data-services/feature-flag.service';
+import { FeatureFlags } from '../../../core/constants/feature-flags.enum';
 
 @Component({
   selector: 'app-evm-token-content',
@@ -63,7 +66,9 @@ export class EvmTokenContentComponent implements OnInit {
     private tokenService: TokenService,
     private nameTagService: NameTagService,
     private router: Router,
-  ) { }
+    private beautyAddress: EvmAddressPipe,
+    private featureFlag: FeatureFlagService,
+  ) {}
 
   ngOnInit(): void {
     this.linkAddress = this.route.snapshot.paramMap.get('contractAddress');
@@ -105,6 +110,16 @@ export class EvmTokenContentComponent implements OnInit {
         this.handleSearch();
         this.searchTemp = this.nameTagService.findNameTagByAddress(this.searchTemp);
       }
+
+      if (this.featureFlag.isEnabled(FeatureFlags.SetTokenInfo)) {
+        if (!this.paramQuery) {
+          this.TABS.push({
+            key: TokenTab.Info,
+            value: 'Info',
+          });
+          this.tabsBackup = this.TABS;
+        }
+      }
     });
 
     if (local.getItem(STORAGE_KEYS.IS_VERIFY_TAB) == 'true') {
@@ -130,11 +145,12 @@ export class EvmTokenContentComponent implements OnInit {
         this.chainInfo.bech32Config.bech32PrefixAccAddr,
         addressNameTag || this.searchTemp,
       );
-      this.searchTemp = accountEvmAddress || addressNameTag || this.textSearch;
+      const evmAddress = this.searchTemp || this.beautyAddress.transform(accountEvmAddress);
+      this.searchTemp = evmAddress || addressNameTag || this.textSearch;
 
       if (!queryParams && this.searchTemp?.length > 0) {
         this.redirectPage(`/token/${this.linkAddress}`, {
-          a: this.searchTemp,
+          a: this.beautyAddress.transform(this.searchTemp),
         });
       }
 
diff --git a/src/app/pages/evm-token/evm-token-detail/evm-token-detail.component.html b/src/app/pages/evm-token/evm-token-detail/evm-token-detail.component.html
index c7dc3794b..4dd543871 100644
--- a/src/app/pages/evm-token/evm-token-detail/evm-token-detail.component.html
+++ b/src/app/pages/evm-token/evm-token-detail/evm-token-detail.component.html
@@ -3,7 +3,7 @@
   <div class="d-flex mb-4 mb-lg-5 align-items-center">
     <h1 class="mb-0 text--white ml-2">
       <div class="d-flex">
-        Token <span class="text--gray-5 break-word ml-2">{{ tokenDetail?.name }}</span>
+        Token <span class="text--gray-5 break-word ml-2" style="max-width: max-content;">{{ tokenDetail?.name }}</span>
         <div class="status cursor-pointer">
           <img
             [src]="'assets/images/icons/CircleWavyCheck.svg' | imageS3"
diff --git a/src/app/pages/evm-token/evm-token-detail/evm-token-detail.component.ts b/src/app/pages/evm-token/evm-token-detail/evm-token-detail.component.ts
index 6ad7aee7a..5122fb39b 100644
--- a/src/app/pages/evm-token/evm-token-detail/evm-token-detail.component.ts
+++ b/src/app/pages/evm-token/evm-token-detail/evm-token-detail.component.ts
@@ -17,7 +17,7 @@ import { TokenService } from 'src/app/core/services/token.service';
 export class EvmTokenDetailComponent implements OnInit {
   loading = true;
   contractAddress = '';
-  tokenDetail: any;
+  tokenDetail: any = {};
   contractType = ContractRegisterType;
   errTxt: string;
   EModeToken = EModeToken;
@@ -39,14 +39,13 @@ export class EvmTokenDetailComponent implements OnInit {
         this.contractAddress = contractAddress;
         switch (type) {
           case 'erc721':
-            this.getTokenDetailNFT()
+            this.getTokenDetailNFT();
             break;
           default:
             this.getTokenDetail();
             this.getAssetsDetail();
             break;
         }
-
       }
     });
   }
@@ -113,7 +112,10 @@ export class EvmTokenDetailComponent implements OnInit {
               price: tokenMarket?.currentPrice || 0,
               priceChangePercentage24h: tokenMarket?.priceChangePercentage24h || 0,
               verify_text: tokenMarket?.verifyText || '',
-              verify_status: tokenMarket?.verifyStatus || ''
+              verify_status: tokenMarket?.verifyStatus || '',
+              officialSite : tokenMarket?.officialSite,
+              overviewInfo : tokenMarket?.overviewInfo,
+              socialProfiles: this.tokenService?.mappingSocialProfiles(tokenMarket?.socialProfiles)
             };
             this.getAssetsDetail();
           });
@@ -132,7 +134,6 @@ export class EvmTokenDetailComponent implements OnInit {
     });
   }
 
-
   getTokenDetailNFT(): void {
     const payload = {
       address: this.contractAddress,
@@ -146,7 +147,11 @@ export class EvmTokenDetailComponent implements OnInit {
 
         const modeToken = EModeEvmToken.ERCToken;
         this.tokenDetail = { name, type, contract_address, isNFTContract, modeToken };
-        this.tokenDetail.contract_verification = _.get(res, 'evm_smart_contract[0].evm_contract_verifications[0].status', undefined);
+        this.tokenDetail.contract_verification = _.get(
+          res,
+          'evm_smart_contract[0].evm_contract_verifications[0].status',
+          undefined,
+        );
       },
       error: (e) => {
         if (e.name === TIMEOUT_ERROR) {
diff --git a/src/app/pages/evm-token/evm-token-summary/evm-token-summary.component.html b/src/app/pages/evm-token/evm-token-summary/evm-token-summary.component.html
index 699a7b727..38faa562c 100644
--- a/src/app/pages/evm-token/evm-token-summary/evm-token-summary.component.html
+++ b/src/app/pages/evm-token/evm-token-summary/evm-token-summary.component.html
@@ -33,7 +33,7 @@
           <div class="first-col text--gray-5">Contract:</div>
           <div class="break-word">
             <app-name-tag
-              [value]="tokenDetail?.contract_address || tokenDetail?.denom"
+              [value]="tokenDetail?.contract_address || tokenDetail?.denom | beautyAddress"
               [iconContract]="tokenDetail?.contract_address"
               [linkRouter]="['/evm-contracts', tokenDetail?.contract_address]"
               [fullText]="true"></app-name-tag>
@@ -53,16 +53,24 @@
     <tr>
       <td colspan="2">
         <div class="d-flex align-items-center py-2">
-          <div class="first-col text--gray-5">Official Site:</div>
-          <div>-</div>
+          <span class="first-col text--gray-5">Official Site:</span>
+          <a *ngIf="tokenDetail?.officialSite" [href]="tokenDetail?.officialSite" target="_blank"
+            rel="noopener noreferrer" class="text--primary">{{tokenDetail?.officialSite}}</a>
         </div>
       </td>
     </tr>
     <tr>
       <td colspan="2">
         <div class="d-flex align-items-center py-2">
-          <div class="first-col text--gray-5 mb-1">Social Profiles:</div>
-          <div>-</div>
+          <div class="first-col text--gray-5">
+            Social Profiles:
+          </div>
+          <div class="socials" *ngIf="tokenDetail?.socialProfiles?.length">
+            <a *ngFor="let item of tokenDetail?.socialProfiles" [href]="item?.url" target="_blank"
+              rel="noopener noreferrer">
+              <img [src]="item?.icon" alt="social-media">
+            </a>
+          </div>
         </div>
       </td>
     </tr>
diff --git a/src/app/pages/evm-token/evm-token-summary/evm-token-summary.component.scss b/src/app/pages/evm-token/evm-token-summary/evm-token-summary.component.scss
index abc5c1e04..3d7e247ce 100644
--- a/src/app/pages/evm-token/evm-token-summary/evm-token-summary.component.scss
+++ b/src/app/pages/evm-token/evm-token-summary/evm-token-summary.component.scss
@@ -7,6 +7,21 @@
       padding: 0 var(--spacer-4);
     }
   }
+  .socials {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    column-gap: 20px;
+    flex-wrap: wrap;
+
+    img {
+      min-width: 16px;
+      max-width: 16px;
+      min-height: 16px;
+      max-width: 16px;
+      object-fit: cover;
+    }
+  }
 }
 .first-col {
   min-width: 120px;
diff --git a/src/app/pages/evm-token/evm-token.module.ts b/src/app/pages/evm-token/evm-token.module.ts
index 5db8eaee4..19a1b7f90 100644
--- a/src/app/pages/evm-token/evm-token.module.ts
+++ b/src/app/pages/evm-token/evm-token.module.ts
@@ -33,6 +33,7 @@ import { EvmTokenDetailComponent } from './evm-token-detail/evm-token-detail.com
 import { EvmTokenOverviewComponent } from './evm-token-overview/evm-token-overview.component';
 import { EvmTokenRoutingModule } from './evm-token-routing.module';
 import { EvmTokenSummaryComponent } from './evm-token-summary/evm-token-summary.component';
+import { EvmAddressPipe } from 'src/app/core/pipes/evm-address.pipe';
 
 @NgModule({
   declarations: [
@@ -74,6 +75,6 @@ import { EvmTokenSummaryComponent } from './evm-token-summary/evm-token-summary.
     ClipboardModule,
     EvmContractsModule,
   ],
-  providers: [provideEnvironmentNgxMask(MASK_CONFIG)],
+  providers: [provideEnvironmentNgxMask(MASK_CONFIG), EvmAddressPipe],
 })
 export class EvmTokenModule {}
diff --git a/src/app/pages/evm-transactions/evm-transactions.component.html b/src/app/pages/evm-transactions/evm-transactions.component.html
index fabda2661..1635c6794 100644
--- a/src/app/pages/evm-transactions/evm-transactions.component.html
+++ b/src/app/pages/evm-transactions/evm-transactions.component.html
@@ -28,15 +28,18 @@
                       </div>
                       <ng-container *ngSwitchCase="'from'">
                         <app-name-tag
-                          [value]="data[template.matColumnDef]"
+                          [value]="data[template.matColumnDef] | beautyAddress"
                           *ngIf="data[template.matColumnDef]"
                           [iconContract]="data['fromIsEvmContract']">
                         </app-name-tag>
                         <span *ngIf="!data[template.matColumnDef]">-</span>
                       </ng-container>
+                      <ng-container *ngSwitchCase="'arrow'">
+                        <img [src]="'assets/icons/icons-svg/basic/arrow-circle-right.svg'" alt="" class="mr-1" />
+                      </ng-container>
                       <ng-container *ngSwitchCase="'to'">
                         <app-name-tag
-                          [value]="data[template.matColumnDef]"
+                          [value]="data[template.matColumnDef] | beautyAddress"
                           *ngIf="data[template.matColumnDef]"
                           [iconContract]="data['toIsEvmContract']">
                         </app-name-tag>
@@ -61,7 +64,7 @@
                           [appBigNumber]="data[template.matColumnDef]"
                           [decimal]="decimal"></span>
                         <a appLinkDenom> {{ denom }}</a>
-                        <a [appLinkDenom]="data['contractAddress'] | appEvmAddress"> {{ data['tokenSymbol'] }}</a>
+                        <a [appLinkDenom]="data['contractAddress'] | beautyAddress"> {{ data['tokenSymbol'] }}</a>
                       </div>
                       <div *ngSwitchCase="'hash'" class="text-center">
                         <a
@@ -124,14 +127,14 @@
               </mat-expansion-panel-header>
               <div class="body-03">
                 <div class="divider divider-horizontal divider-lighter my-2"></div>
-                <div class="d-flex justify-content-between">
-                  <div class="text--gray-4">Height</div>
+                <div class="d-flex justify-content-between align-items-center">
+                  <div class="text--gray-4 title">Height</div>
                   <a class="text--primary cursor-pointer block-link" [routerLink]="['/block', data['height']]">
                     {{ data?.height }}
                   </a>
                 </div>
-                <div class="d-flex justify-content-between mt-2">
-                  <div class="text--gray-4">Amount</div>
+                <div class="d-flex justify-content-between align-items-center mt-2">
+                  <div class="text--gray-4 title">Amount</div>
                   <div class="text--white">
                     <ng-container *ngIf="!data['contractAddress']">
                       <span
@@ -163,18 +166,18 @@
                     </ng-container>
                   </div>
                 </div>
-                <div class="d-flex justify-content-between mt-2">
-                  <div class="text--gray-4">From</div>
+                <div class="d-flex justify-content-between align-items-center mt-2">
+                  <div class="text--gray-4 title">From</div>
                   <app-name-tag [value]="data?.from" *ngIf="data?.from" [nameTagDark]="true"></app-name-tag>
                   <span *ngIf="!data?.from">-</span>
                 </div>
-                <div class="d-flex justify-content-between mt-2">
-                  <div class="text--gray-4">To</div>
+                <div class="d-flex justify-content-between align-items-center mt-2">
+                  <div class="text--gray-4 title">To</div>
                   <app-name-tag [value]="data?.to" *ngIf="data?.to" [nameTagDark]="true"></app-name-tag>
                   <span *ngIf="!data?.to">-</span>
                 </div>
-                <div class="d-flex justify-content-between mt-2">
-                  <div class="text--gray-4">Cosmos Txn</div>
+                <div class="d-flex justify-content-between align-items-center mt-2">
+                  <div class="text--gray-4 title">Cosmos Txn</div>
                   <a
                     *ngIf="data?.hash"
                     [copyBtn]="data.hash"
diff --git a/src/app/pages/evm-transactions/evm-transactions.component.scss b/src/app/pages/evm-transactions/evm-transactions.component.scss
index e69de29bb..9cad2f74d 100644
--- a/src/app/pages/evm-transactions/evm-transactions.component.scss
+++ b/src/app/pages/evm-transactions/evm-transactions.component.scss
@@ -0,0 +1,4 @@
+.title {
+  height: 24px;
+  line-height: 24px;
+}
\ No newline at end of file
diff --git a/src/app/pages/evm-transactions/evm-transactions.component.ts b/src/app/pages/evm-transactions/evm-transactions.component.ts
index 1336224d5..b75d7639a 100644
--- a/src/app/pages/evm-transactions/evm-transactions.component.ts
+++ b/src/app/pages/evm-transactions/evm-transactions.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 import { MatTableDataSource } from '@angular/material/table';
 import * as _ from 'lodash';
 import { map, switchMap } from 'rxjs';
-import { TIMEOUT_ERROR } from 'src/app/core/constants/common.constant';
+import { EMethodContract, TIMEOUT_ERROR } from 'src/app/core/constants/common.constant';
 import { EnvironmentService } from 'src/app/core/data-services/environment.service';
 import { TableTemplate } from 'src/app/core/models/common.model';
 import { TransactionService } from 'src/app/core/services/transaction.service';
@@ -29,9 +29,10 @@ export class EvmTransactionsComponent {
     { matColumnDef: 'method', headerCellDef: 'Method', headerWidth: 216 },
     { matColumnDef: 'height', headerCellDef: 'Height', headerWidth: 110 },
     { matColumnDef: 'timestamp', headerCellDef: 'Time', headerWidth: 136 },
-    { matColumnDef: 'from', headerCellDef: 'From', headerWidth: 214 },
+    { matColumnDef: 'from', headerCellDef: 'From', headerWidth: 200 },
+    { matColumnDef: 'arrow', headerCellDef: ' ', headerWidth: 28 },
     { matColumnDef: 'to', headerCellDef: 'To', headerWidth: 214 },
-    { matColumnDef: 'amount', headerCellDef: 'Amount', headerWidth: 176 },
+    { matColumnDef: 'amount', headerCellDef: 'Amount', headerWidth: 136 },
     { matColumnDef: 'hash', headerCellDef: this.denom ? `Cosmos Txn` : 'Txn', headerWidth: 108 },
   ];
   displayedColumns: string[] = this.templates.map((dta) => dta.matColumnDef);
@@ -71,7 +72,6 @@ export class EvmTransactionsComponent {
                   const to = _.get(tx, 'evm_transaction.to');
                   listAddr.push(from);
                   listAddr.push(to);
-
                   return {
                     ...tx,
                     evm_hash: _.get(tx, 'evm_transaction.hash'),
@@ -93,11 +93,19 @@ export class EvmTransactionsComponent {
           return this.contractService.findEvmContractList(listAddrUnique).pipe(
             map((r) => {
               const smartContractList = _.uniq((r?.evm_smart_contract || []).map((i) => i?.address));
-              const trans = res.map((i: any) => ({
-                ...i,
-                toIsEvmContract: smartContractList.filter((s) => s === i.to).length > 0,
-                fromIsEvmContract: smartContractList.filter((s) => s === i.from).length > 0,
-              }));
+              const trans = res.map((i: any) => {
+
+                const toIsEvmContract = smartContractList.filter((s) => s === i.to)?.length > 0;
+                let type = i?.type;
+                if (i?.to && !toIsEvmContract) type = 'Send';
+                
+                return { 
+                  ...i,
+                  type,  
+                  toIsEvmContract,
+                  fromIsEvmContract: smartContractList.filter((s) => s === i.from).length > 0,
+                }
+              });
               return trans;
             }),
           );
diff --git a/src/app/pages/export-csv/export-csv.component.html b/src/app/pages/export-csv/export-csv.component.html
index 5af170c8d..f4f3e901a 100644
--- a/src/app/pages/export-csv/export-csv.component.html
+++ b/src/app/pages/export-csv/export-csv.component.html
@@ -73,9 +73,15 @@ <h5 class="dropdown-menu__title">Account transaction</h5>
                 </li>
                 <li
                   class="dropdown-item cursor-pointer py-2 body"
-                  [class.active]="dataType === TabsAccountLink.NftTxs"
-                  (click)="changeTypeFilter(TabsAccountLink.NftTxs)">
-                  <button type="button" class="button px-2">{{ TabsAccount.NftTxs }}</button>
+                  [class.active]="dataType === ETypeNftExport.CW721"
+                  (click)="changeTypeFilter(ETypeNftExport.CW721)">
+                  <button type="button" class="button px-2">{{ typeNftDisplay.CW721 }}</button>
+                </li>
+                <li
+                  class="dropdown-item cursor-pointer py-2 body"
+                  [class.active]="dataType === ETypeNftExport.ERC721"
+                  (click)="changeTypeFilter(ETypeNftExport.ERC721)">
+                  <button type="button" class="button px-2">{{ typeNftDisplay.ERC721 }}</button>
                 </li>
               </div>
             </ul>
diff --git a/src/app/pages/export-csv/export-csv.component.ts b/src/app/pages/export-csv/export-csv.component.ts
index 32e3af6d0..7bdfea184 100644
--- a/src/app/pages/export-csv/export-csv.component.ts
+++ b/src/app/pages/export-csv/export-csv.component.ts
@@ -3,15 +3,21 @@ import {Component, OnDestroy, OnInit} from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {saveAs} from 'file-saver';
 import * as moment from 'moment';
-import {Subject, takeUntil} from 'rxjs';
-import {ETypeFtExport, ExportFileName, TabsAccount, TabsAccountLink} from 'src/app/core/constants/account.enum';
-import {DATEFORMAT, LENGTH_CHARACTER, STORAGE_KEYS} from 'src/app/core/constants/common.constant';
-import {EWalletType} from 'src/app/core/constants/wallet.constant';
-import {EnvironmentService} from 'src/app/core/data-services/environment.service';
-import {CommonService} from 'src/app/core/services/common.service';
-import {NgxToastrService} from 'src/app/core/services/ngx-toastr.service';
-import {UserService} from 'src/app/core/services/user.service';
-import {transferAddress} from 'src/app/core/utils/common/address-converter';
+import { Subject, takeUntil } from 'rxjs';
+import {
+  ETypeFtExport,
+  ETypeNftExport,
+  ExportFileName,
+  TabsAccount,
+  TabsAccountLink,
+} from 'src/app/core/constants/account.enum';
+import { DATEFORMAT, LENGTH_CHARACTER, STORAGE_KEYS } from 'src/app/core/constants/common.constant';
+import { EWalletType } from 'src/app/core/constants/wallet.constant';
+import { EnvironmentService } from 'src/app/core/data-services/environment.service';
+import { CommonService } from 'src/app/core/services/common.service';
+import { NgxToastrService } from 'src/app/core/services/ngx-toastr.service';
+import { UserService } from 'src/app/core/services/user.service';
+import { transferAddress } from 'src/app/core/utils/common/address-converter';
 import local from 'src/app/core/utils/storage/local';
 
 declare var grecaptcha: any;
@@ -46,10 +52,15 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
   chainInfo = this.environmentService.chainInfo;
   evmPrefix = EWalletType;
   ETypeFtExport = ETypeFtExport;
+  ETypeNftExport = ETypeNftExport;
   typeFtDisplay = {
     CW20: 'CW20 Token Transfer',
     ERC20: 'ERC20 Token Transfer',
   };
+  typeNftDisplay = {
+    CW721: 'CW721 Token Transfer',
+    ERC721: 'ERC721 Token Transfer',
+  };
 
   destroyed$ = new Subject<void>();
 
@@ -109,7 +120,7 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
 
   setDataConfig(dataConfig) {
     const data = JSON.parse(dataConfig);
-    const {accountAddress, accountEvmAddress} = transferAddress(
+    const { accountAddress, accountEvmAddress } = transferAddress(
       this.chainInfo.bech32Config.bech32PrefixAccAddr,
       data['address'],
     );
@@ -134,8 +145,10 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
         return this.typeFtDisplay.CW20;
       case ETypeFtExport.ERC20:
         return this.typeFtDisplay.ERC20;
-      case TabsAccountLink.NftTxs:
-        return this.TabsAccount.NftTxs;
+      case ETypeNftExport.CW721:
+        return this.typeNftDisplay.CW721;
+      case ETypeNftExport.ERC721:
+        return this.typeNftDisplay.ERC721;
       default:
         return this.TabsAccount.ExecutedTxs;
     }
@@ -148,7 +161,7 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
     }
     this.csvForm.value.dataType = this.dataType;
     this.csvForm.value.isFilterDate = this.isFilterDate;
-    let {address, displayPrivate, endDate, fromBlock, startDate, toBlock} = this.csvForm.getRawValue();
+    let { address, displayPrivate, endDate, fromBlock, startDate, toBlock } = this.csvForm.getRawValue();
 
     if (startDate || endDate) {
       startDate = moment(startDate).startOf('day').toISOString();
@@ -156,7 +169,7 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
     }
 
     // send both evm + native address for execute + evm execute
-    const {accountAddress, accountEvmAddress} = transferAddress(
+    const { accountAddress, accountEvmAddress } = transferAddress(
       this.chainInfo.bech32Config.bech32PrefixAccAddr,
       address,
     );
@@ -217,19 +230,12 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
     let nameTab;
     switch (payload.dataType) {
       case TabsAccountLink.EVMExecutedTxs:
-        nameTab = ExportFileName.EVMExecutedTxs;
-        break;
       case TabsAccountLink.NativeTxs:
-        nameTab = ExportFileName.NativeTxs;
-        break;
       case ETypeFtExport.CW20:
-        nameTab = ETypeFtExport.CW20;
-        break;
       case ETypeFtExport.ERC20:
-        nameTab = ETypeFtExport.ERC20;
-        break;
-      case TabsAccountLink.NftTxs:
-        nameTab = ExportFileName.NftTxs;
+      case ETypeNftExport.CW721:
+      case ETypeNftExport.ERC721:
+        nameTab = payload.dataType;
         break;
       default:
         nameTab = ExportFileName.ExecutedTxs;
@@ -239,11 +245,13 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
       type: 'text/csv;charset=utf-8',
     });
 
+    const evmAddressTypes = [TabsAccountLink.EVMExecutedTxs, ETypeFtExport.ERC20, ETypeNftExport.ERC721];
+    const address = evmAddressTypes.includes(payload.dataType) ? payload.evmAddress : payload.address;
     const fileName =
       'export-account-' +
       (payload.dataType === TabsAccountLink.NativeTxs ? 'native-ibc-transfer' : nameTab) +
       '-' +
-      payload.address +
+      address +
       '.csv';
     saveAs(data, fileName);
     this.isDownload = false;
@@ -284,7 +292,7 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
 
   checkFormValid(): boolean {
     this.getAddress.setValue(this.getAddress?.value?.trim());
-    const {address, endDate, fromBlock, startDate, toBlock} = this.csvForm.value;
+    const { address, endDate, fromBlock, startDate, toBlock } = this.csvForm.value;
     this.isValidBlock = true;
     //check null/invalid block
     if (!this.isFilterDate) {
@@ -355,7 +363,7 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
   setAddressOther(address, controlName?: string) {
     this.isValidAddress = true;
     this.isValidEvmAddress = true;
-    let {accountAddress, accountEvmAddress} = transferAddress(
+    let { accountAddress, accountEvmAddress } = transferAddress(
       this.chainInfo.bech32Config.bech32PrefixAccAddr,
       address,
     );
@@ -368,12 +376,12 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
         if (controlName === 'address') {
           this.toastr.error('Invalid ' + this.chainName + ' address format');
           this.csvForm.get('evmAddress').disable();
-          this.csvForm.get('address').setErrors({incorrect: true});
+          this.csvForm.get('address').setErrors({ incorrect: true });
         }
         if (controlName === 'evmAddress') {
           this.toastr.error('Invalid EVM address format');
           this.csvForm.get('address').disable();
-          this.csvForm.get('evmAddress').setErrors({incorrect: true});
+          this.csvForm.get('evmAddress').setErrors({ incorrect: true });
         }
         return;
       }
diff --git a/src/app/pages/token-cosmos/token-content/token-content-tab/token-info-tab/token-info-tab.component.html b/src/app/pages/token-cosmos/token-content/token-content-tab/token-info-tab/token-info-tab.component.html
index caff9a24c..f473b2cb4 100644
--- a/src/app/pages/token-cosmos/token-content/token-content-tab/token-info-tab/token-info-tab.component.html
+++ b/src/app/pages/token-cosmos/token-content/token-content-tab/token-info-tab/token-info-tab.component.html
@@ -1,6 +1,7 @@
 <div class="text--white">
   <div class="body-02 fw-semibold text--gray-4 mb-1">OVERVIEW</div>
-  <div class="text--gray-6">
+  <div class="text--gray-6" [featureFlag]="'SetTokenInfo'" [flagEnabled]="false">
     Aura gives you the joint benefits of open blockchain technology and traditional currency
   </div>
+  <div class="text--gray-6" [featureFlag]="'SetTokenInfo'" [innerHTML]="overviewInfo | newline"></div>
 </div>
diff --git a/src/app/pages/token-cosmos/token-content/token-content-tab/token-info-tab/token-info-tab.component.ts b/src/app/pages/token-cosmos/token-content/token-content-tab/token-info-tab/token-info-tab.component.ts
index 1dca16915..9cf7037d4 100644
--- a/src/app/pages/token-cosmos/token-content/token-content-tab/token-info-tab/token-info-tab.component.ts
+++ b/src/app/pages/token-cosmos/token-content/token-content-tab/token-info-tab/token-info-tab.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
   selector: 'app-token-info-tab',
@@ -7,6 +7,7 @@ import { Component, OnInit } from '@angular/core';
 })
 export class TokenInfoTabComponent implements OnInit {
   constructor() {}
-
+  @Input() overviewInfo?: string;
   ngOnInit(): void {}
 }
+
diff --git a/src/app/pages/token-cosmos/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.html b/src/app/pages/token-cosmos/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.html
index 9c220006e..854f3dfad 100644
--- a/src/app/pages/token-cosmos/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.html
+++ b/src/app/pages/token-cosmos/token-content/token-content-tab/token-inventory-tab/token-inventory-tab.component.html
@@ -53,7 +53,7 @@
                 </a>
                 <app-name-tag
                   *ngIf="!breakpoint.value.matches"
-                  class="small-text text--primary hover-link mt-1"
+                  class="small-text text--primary hover-link"
                   [value]="item.owner"
                   [linkRouter]="['/token', 'cw721', item.contract_address]"
                   [linkParams]="{ a: item.owner }">
diff --git a/src/app/pages/token-cosmos/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html b/src/app/pages/token-cosmos/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html
index e124eb88b..d8c818ea6 100644
--- a/src/app/pages/token-cosmos/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html
+++ b/src/app/pages/token-cosmos/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.html
@@ -120,13 +120,6 @@
                           </app-name-tag>
                         </ng-container>
                       </div>
-                      <ng-container *ngIf="!isSearchAddress">
-                        <img
-                          [src]="'assets/images/icons/arrow-right.png' | imageS3"
-                          width="14"
-                          height="9"
-                          class="mr-lg-3 mr-0 ml-3" />
-                      </ng-container>
                       <ng-container *ngIf="isSearchAddress">
                         <div class="box-token-transfer">
                           <span
@@ -139,6 +132,9 @@
                       </ng-container>
                     </div>
                   </ng-container>
+                  <ng-container *ngSwitchCase="'arrow'">
+                    <img [src]="'assets/icons/icons-svg/basic/arrow-circle-right.svg'" alt="" class="mr-3" />
+                  </ng-container>
                   <ng-container *ngSwitchCase="'to_address'">
                     <div [style.min-width]="'210px'">
                       <app-name-tag
diff --git a/src/app/pages/token-cosmos/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts b/src/app/pages/token-cosmos/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts
index 2ba72e25d..834c00e6d 100644
--- a/src/app/pages/token-cosmos/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts
+++ b/src/app/pages/token-cosmos/token-content/token-content-tab/token-transfers-tab/token-transfers-tab.component.ts
@@ -45,7 +45,8 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit {
     { matColumnDef: 'type', headerCellDef: 'Method', isShort: true, headerWidth: 170 },
     // { matColumnDef: 'status', headerCellDef: 'Result' },
     { matColumnDef: 'timestamp', headerCellDef: 'Time' },
-    { matColumnDef: 'from_address', headerCellDef: 'From', headerWidth: 250 },
+    { matColumnDef: 'from_address', headerCellDef: 'From', headerWidth: 220 },
+    { matColumnDef: 'arrow', headerCellDef: ' ', headerWidth: 28 },
     { matColumnDef: 'to_address', headerCellDef: 'To', headerWidth: 180 },
     { matColumnDef: 'amountToken', headerCellDef: 'Amount', isShort: true, headerWidth: 100 },
   ];
@@ -55,7 +56,8 @@ export class TokenTransfersTabComponent implements OnInit, AfterViewInit {
     { matColumnDef: 'type', headerCellDef: 'Method', isShort: true, headerWidth: 170 },
     // { matColumnDef: 'status', headerCellDef: 'Result' },
     { matColumnDef: 'timestamp', headerCellDef: 'Time', headerWidth: 150 },
-    { matColumnDef: 'from_address', headerCellDef: 'From', headerWidth: 250 },
+    { matColumnDef: 'from_address', headerCellDef: 'From', headerWidth: 220 },
+    { matColumnDef: 'arrow', headerCellDef: ' ', headerWidth: 28 },
     { matColumnDef: 'to_address', headerCellDef: 'To', headerWidth: 180 },
     { matColumnDef: 'token_id', headerCellDef: 'Token ID' },
     { matColumnDef: 'details', headerCellDef: 'Details', headerWidth: 120 },
diff --git a/src/app/pages/token-cosmos/token-content/token-content.component.html b/src/app/pages/token-cosmos/token-content/token-content.component.html
index 8639eb408..9df107b32 100644
--- a/src/app/pages/token-cosmos/token-content/token-content.component.html
+++ b/src/app/pages/token-cosmos/token-content/token-content.component.html
@@ -33,7 +33,7 @@
             </app-name-tag>
           </div>
         </div>
-        <div
+        <div 
           class="col-12 col-lg-4 pt-3 py-lg-0 px-lg-4 border-x text--gray-1 {{
             tokenDetail?.isNFTContract ? 'no-border-bottom pb-0' : 'pb-3'
           }}">
@@ -165,12 +165,14 @@
     <app-token-inventory-tab
       *ngIf="currentTab === tokenTab.Inventory"
       [typeContract]="tokenDetail?.type"></app-token-inventory-tab>
-    <app-token-info-tab *ngIf="currentTab === tokenTab.Info"></app-token-info-tab>
-    <app-token-contract-tab
+    <app-token-info-tab
+      *ngIf="currentTab === tokenTab.Info"
+      [overviewInfo]="tokenDetail?.overviewInfo"></app-token-info-tab>
+    <app-token-contract-tab 
       *ngIf="currentTab === tokenTab.Contract"
       [contractAddress]="contractAddress"
       [typeContract]="tokenDetail?.type"></app-token-contract-tab>
   </div>
 </section>
 
-<ng-template #zeroValue>$0.00</ng-template>
+<ng-template #zeroValue>$0.00</ng-template>
\ No newline at end of file
diff --git a/src/app/pages/token-cosmos/token-content/token-content.component.ts b/src/app/pages/token-cosmos/token-content/token-content.component.ts
index d51237f8a..ec22e09a7 100644
--- a/src/app/pages/token-cosmos/token-content/token-content.component.ts
+++ b/src/app/pages/token-cosmos/token-content/token-content.component.ts
@@ -14,6 +14,8 @@ import { NameTagService } from 'src/app/core/services/name-tag.service';
 import { TokenService } from 'src/app/core/services/token.service';
 import { transferAddress } from 'src/app/core/utils/common/address-converter';
 import local from 'src/app/core/utils/storage/local';
+import { FeatureFlagService } from '../../../core/data-services/feature-flag.service';
+import { FeatureFlags } from '../../../core/constants/feature-flags.enum';
 
 @Component({
   selector: 'app-token-content',
@@ -67,9 +69,16 @@ export class TokenContentComponent implements OnInit {
     private nameTagService: NameTagService,
     private contractService: ContractService,
     private router: Router,
+    private featureFlag: FeatureFlagService,
   ) {}
 
   ngOnInit(): void {
+    if (this.featureFlag.isEnabled(FeatureFlags.SetTokenInfo)) {
+      this.tabStaking = [TokenTab.Holders, TokenTab.Info];
+      this.tabIBC = [TokenTab.Transfers, TokenTab.Holders, TokenTab.Info];
+      this.tabToken = [TokenTab.Transfers, TokenTab.Holders, TokenTab.Contract, TokenTab.Info];
+    }
+
     this.linkAddress = this.route.snapshot.paramMap.get('contractAddress');
     let tabFilter;
     switch (this.tokenDetail.modeToken) {
diff --git a/src/app/pages/token-cosmos/token-detail/token-detail.component.html b/src/app/pages/token-cosmos/token-detail/token-detail.component.html
index 6943b2fd2..eb2f347e6 100644
--- a/src/app/pages/token-cosmos/token-detail/token-detail.component.html
+++ b/src/app/pages/token-cosmos/token-detail/token-detail.component.html
@@ -3,9 +3,9 @@
   <div class="d-flex mb-4 mb-lg-5 align-items-center">
     <h1 class="mb-0 text--white ml-2">
       <div class="d-flex">
-        Token <span class="text--gray-5 break-word ml-2">{{ tokenDetail?.name }}</span>
+        Token <span class="text--gray-5 break-word ml-2 flex-grow-1" style="max-width: max-content;">{{ tokenDetail?.name }}</span>
         <div class="status cursor-pointer">
-          <img
+           <img
             [src]="'assets/images/icons/CircleWavyCheck.svg' | imageS3"
             alt=""
             width="18"
@@ -24,9 +24,9 @@ <h1 class="mb-0 text--white ml-2">
 
     <div class="col-12 col-lg-6">
       <app-token-summary
-        *ngIf="tokenDetail"
-        [tokenDetail]="tokenDetail"
-        [channelPath]="channelPath"></app-token-summary>
+      *ngIf="tokenDetail"
+      [tokenDetail]="tokenDetail"
+      [channelPath]="channelPath"></app-token-summary>
     </div>
   </div>
 
@@ -38,4 +38,4 @@ <h1 class="mb-0 text--white ml-2">
     (hasMore)="getMoreTx($event)">
   </app-token-content>
 </ng-container>
-<app-table-no-data *ngIf="!loading && errTxt" [textNull]="errTxt"></app-table-no-data>
+<app-table-no-data *ngIf="!loading && errTxt" [textNull]="errTxt"></app-table-no-data>
\ No newline at end of file
diff --git a/src/app/pages/token-cosmos/token-detail/token-detail.component.ts b/src/app/pages/token-cosmos/token-detail/token-detail.component.ts
index e1ccc7584..1765f5d0a 100644
--- a/src/app/pages/token-cosmos/token-detail/token-detail.component.ts
+++ b/src/app/pages/token-cosmos/token-detail/token-detail.component.ts
@@ -22,7 +22,7 @@ import { TokenService } from 'src/app/core/services/token.service';
 export class TokenDetailComponent implements OnInit {
   loading = true;
   contractAddress = '';
-  tokenDetail: any;
+  tokenDetail: any = {};
   contractType = ContractRegisterType;
   errTxt: string;
   EModeToken = EModeToken;
@@ -65,38 +65,34 @@ export class TokenDetailComponent implements OnInit {
   getCW20Detail(): void {
     let now = new Date();
     now.setDate(now.getDate() - 1);
-    this.tokenService
+    this.tokenService.getTokenDetail(this.contractAddress).subscribe((tokenMarket) => {
+      this.tokenService
       .getCW20Detail(this.contractAddress, this.datePipe.transform(now, DATEFORMAT.DATE_ONLY))
       .subscribe({
         next: (res) => {
           const data = _.get(res, `smart_contract`);
           if (data.length > 0) {
-            this.tokenService.tokensMarket$
-              .pipe(
-                filter((data) => _.isArray(data)),
-                take(1),
-              )
-              .subscribe((item) => {
-                const tokenMarket = item.find((token) => token.denom === data[0].address);
-
-                const token = data[0];
-                token.contract_address = token.address;
-                token.name = tokenMarket?.name || token.cw20_contract.name;
-                token.symbol = tokenMarket?.symbol || token.cw20_contract.symbol;
-                token.decimals = token.cw20_contract.decimal;
-                token.type = this.contractType.CW20;
-                token.max_total_supply = tokenMarket?.max_supply || 0;
-                token.price = tokenMarket?.currentPrice || 0;
-                token.verify_status = tokenMarket?.verifyStatus || '';
-                token.verify_text = tokenMarket?.verifyText || '';
-                token.modeToken = EModeToken.CWToken;
-                token.priceChangePercentage24h = tokenMarket?.priceChangePercentage24h || 0;
-                token.contract_verification = token.code?.code_id_verifications[0]?.verification_status;
-                token.supplyAmount = BigNumber(token.cw20_contract?.total_supply).dividedBy(
-                  BigNumber(10).pow(token.decimals),
-                );
-                this.tokenDetail = token;
-              });
+            const token = data[0];
+            token.contract_address = token.address;
+            token.name = tokenMarket?.name || token.cw20_contract.name;
+            token.symbol = tokenMarket?.symbol || token.cw20_contract.symbol;
+            token.decimals = token.cw20_contract.decimal;
+            token.type = this.contractType.CW20;
+            token.max_total_supply = tokenMarket?.max_supply || 0;
+            token.price = tokenMarket?.currentPrice || 0;
+            token.verify_status = tokenMarket?.verifyStatus || '';
+            token.verify_text = tokenMarket?.verifyText || '';
+            token.modeToken = EModeToken.CWToken;
+            token.priceChangePercentage24h = tokenMarket?.priceChangePercentage24h || 0;
+            token.contract_verification = token.code?.code_id_verifications[0]?.verification_status;
+            token.supplyAmount = BigNumber(token.cw20_contract?.total_supply).dividedBy(
+              BigNumber(10).pow(token.decimals),
+            );
+            token.officialSite = tokenMarket?.officialSite;
+            token.overviewInfo = tokenMarket?.overviewInfo;
+            token.socialProfiles = this.tokenService?.mappingSocialProfiles(tokenMarket?.socialProfiles);
+            
+            this.tokenDetail = token;                
           }
         },
         error: (e) => {
@@ -111,6 +107,7 @@ export class TokenDetailComponent implements OnInit {
           this.loading = false;
         },
       });
+    })
   }
 
   getTokenDetail(): void {
@@ -162,6 +159,7 @@ export class TokenDetailComponent implements OnInit {
           denomHash: token.denom,
           verify_status: token.verifyStatus,
           verify_text: token.verifyText,
+          socialProfiles: this.tokenService.mappingSocialProfiles(token?.socialProfiles),
         };
 
         if (this.contractAddress !== this.chainInfo?.currencies[0].coinMinimalDenom) {
diff --git a/src/app/pages/token-cosmos/token-summary/token-summary.component.html b/src/app/pages/token-cosmos/token-summary/token-summary.component.html
index 8a423bbd3..06b9b35d2 100644
--- a/src/app/pages/token-cosmos/token-summary/token-summary.component.html
+++ b/src/app/pages/token-cosmos/token-summary/token-summary.component.html
@@ -108,18 +108,26 @@
     <tr>
       <td colspan="2">
         <div class="d-flex align-items-center py-2">
-          <div class="first-col text--gray-5">Official Site:</div>
-          <div>-</div>
+          <span class="first-col text--gray-5">Official Site:</span>
+          <a *ngIf="tokenDetail?.officialSite" [href]="tokenDetail?.officialSite" target="_blank"
+            rel="noopener noreferrer" class="text--primary">{{tokenDetail?.officialSite}}</a>
         </div>
       </td>
     </tr>
     <tr>
       <td colspan="2">
         <div class="d-flex align-items-center py-2">
-          <div class="first-col text--gray-5 mb-1">Social Profiles:</div>
-          <div>-</div>
+          <div class="first-col text--gray-5">
+            Social Profiles:
+          </div>
+          <div class="socials" *ngIf="tokenDetail?.socialProfiles?.length">
+            <a *ngFor="let item of tokenDetail?.socialProfiles" [href]="item?.url" target="_blank"
+              rel="noopener noreferrer">
+              <img [src]="item?.icon" alt="social-media">
+            </a>
+          </div>
         </div>
       </td>
     </tr>
   </table>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/token-cosmos/token-summary/token-summary.component.scss b/src/app/pages/token-cosmos/token-summary/token-summary.component.scss
index abc5c1e04..d452c0157 100644
--- a/src/app/pages/token-cosmos/token-summary/token-summary.component.scss
+++ b/src/app/pages/token-cosmos/token-summary/token-summary.component.scss
@@ -7,6 +7,21 @@
       padding: 0 var(--spacer-4);
     }
   }
+
+  .socials {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    column-gap: 20px;
+
+    img {
+      min-width: 16px;
+      max-width: 16px;
+      min-height: 16px;
+      max-width: 16px;
+      object-fit: cover;
+    }
+  }
 }
 .first-col {
   min-width: 120px;
diff --git a/src/app/pages/token-cosmos/token-summary/token-summary.component.ts b/src/app/pages/token-cosmos/token-summary/token-summary.component.ts
index d04d8e376..955e402b2 100644
--- a/src/app/pages/token-cosmos/token-summary/token-summary.component.ts
+++ b/src/app/pages/token-cosmos/token-summary/token-summary.component.ts
@@ -44,3 +44,4 @@ export class TokenSummaryComponent implements OnInit {
     }
   }
 }
+
diff --git a/src/app/pages/tokens/non-fungible-tokens/non-fungible-tokens.component.html b/src/app/pages/tokens/non-fungible-tokens/non-fungible-tokens.component.html
index 2094eb911..d00772c11 100644
--- a/src/app/pages/tokens/non-fungible-tokens/non-fungible-tokens.component.html
+++ b/src/app/pages/tokens/non-fungible-tokens/non-fungible-tokens.component.html
@@ -92,15 +92,11 @@ <h1 class="mb-0 text--white">Non-Fungible Tokens (NFT)</h1>
                 <div class="d-flex">
                   <div>
                     <a
-                      [routerLink]="[
-                        '/token',
-                        element.cw721_contract?.smart_contract?.address ||
-                          element?.erc721_contract?.evm_smart_contract?.address
-                      ]"
+                      [routerLink]="['/token', element.cw721_contract?.smart_contract?.address || element?.address]"
                       class="text--primary text-nowrap">
-                      {{ element.cw721_contract?.name || element.erc721_contract?.name | ellipsis: 30 }}
-                      <span *ngIf="element.cw721_contract?.symbol || element.erc721_contract?.symbol"
-                        >({{ element.cw721_contract?.symbol || element.erc721_contract?.symbol | ellipsis: 10 }})</span
+                      {{ element.cw721_contract?.name || element?.name | ellipsis: 30 }}
+                      <span *ngIf="element.cw721_contract?.symbol || element?.symbol"
+                        >({{ element.cw721_contract?.symbol || element?.symbol | ellipsis: 10 }})</span
                       >
                     </a>
                     <div class="body-02 fw-normal caption-mob mb-0 text--gray-6 pr-5 desc">
@@ -114,18 +110,11 @@ <h1 class="mb-0 text--white">Non-Fungible Tokens (NFT)</h1>
               <th mat-header-cell *matHeaderCellDef>Contract</th>
               <td mat-cell *matCellDef="let element" class="vertical-align-top py-4">
                 <app-name-tag
-                  [value]="
-                    element.cw721_contract?.smart_contract?.address ||
-                    element.erc721_contract?.evm_smart_contract?.address
-                  "
-                  [iconContract]="
-                    element.cw721_contract?.smart_contract?.address ||
-                    element.erc721_contract?.evm_smart_contract?.address
-                  "
+                  [value]="element.cw721_contract?.smart_contract?.address || element.address | beautyAddress"
+                  [iconContract]="element.cw721_contract?.smart_contract?.address || element?.address"
                   [linkRouter]="[
                     element.cw721_contract ? '/contracts' : '/evm-contracts',
-                    element.cw721_contract?.smart_contract?.address ||
-                      element.erc721_contract?.evm_smart_contract?.address
+                    element.cw721_contract?.smart_contract?.address || element?.address
                   ]">
                 </app-name-tag>
               </td>
@@ -133,14 +122,16 @@ <h1 class="mb-0 text--white">Non-Fungible Tokens (NFT)</h1>
             <ng-container matColumnDef="total_activity">
               <th mat-header-cell *matHeaderCellDef mat-sort-header>Total Activities</th>
               <td mat-cell *matCellDef="let element" class="vertical-align-top py-4">
-                {{ element.total_activity | number }}
+                <ng-container *ngIf="element.total_activity || element?.erc721_stat?.total_activity; else noData">
+                  {{ element.total_activity || element?.erc721_stat?.total_activity | number }}
+                </ng-container>
               </td>
             </ng-container>
             <ng-container matColumnDef="transfer_24h">
               <th mat-header-cell *matHeaderCellDef mat-sort-header>Transfers (24H)</th>
               <td mat-cell *matCellDef="let element" class="vertical-align-top py-4">
-                <ng-container *ngIf="element.transfer_24h; else noData">
-                  {{ element.transfer_24h | number }}
+                <ng-container *ngIf="element.transfer_24h || element?.erc721_stat?.transfer_24h; else noData">
+                  {{ element.transfer_24h || element?.erc721_stat?.transfer_24h | number }}
                 </ng-container>
               </td>
             </ng-container>
diff --git a/src/app/pages/tokens/non-fungible-tokens/non-fungible-tokens.component.ts b/src/app/pages/tokens/non-fungible-tokens/non-fungible-tokens.component.ts
index 1ddfcc7a6..0b88a68a3 100644
--- a/src/app/pages/tokens/non-fungible-tokens/non-fungible-tokens.component.ts
+++ b/src/app/pages/tokens/non-fungible-tokens/non-fungible-tokens.component.ts
@@ -13,6 +13,7 @@ import { NameTagService } from 'src/app/core/services/name-tag.service';
 import { TokenService } from 'src/app/core/services/token.service';
 import { PaginatorComponent } from 'src/app/shared/components/paginator/paginator.component';
 import { TableTemplate } from '../../../core/models/common.model';
+import { isEvmAddress } from 'src/app/core/utils/common/validation';
 
 @Component({
   selector: 'app-non-fungible-tokens',
@@ -78,19 +79,20 @@ export class NonFungibleTokensComponent implements OnInit {
       sort_order: this.sortOrder,
     };
 
-    let keySearch = this.textSearch;
+    let keySearch = isEvmAddress(this.textSearch) ? this.textSearch.toLowerCase() : this.textSearch;
 
     if (this.filterBy === 'ERC721') {
       const listAddress = this.nameTagService.findAddressListByNameTag(keySearch, this.filterBy === 'ERC721');
-      let tagAddress = `["${keySearch}"]`;
+      let addressIn = [];
+      if (keySearch.length > 0) {
+        addressIn.push(keySearch);
+      }
       if (listAddress?.length > 0) {
-        tagAddress = '';
         listAddress.forEach((addr) => {
-          tagAddress += `"${addr}",`;
+          addressIn.push(addr);
         });
-        tagAddress = `[${tagAddress}"${keySearch}"]`;
       }
-      this.tokenService.getListErc721Token(payload, keySearch, tagAddress).subscribe({
+      this.tokenService.getListErc721Token(payload, keySearch, addressIn).subscribe({
         next: (res) => {
           this.dataSource = new MatTableDataSource<any>(res.list_token);
           this.pageData.length = res.total_token?.aggregate?.count;
diff --git a/src/app/pages/transaction/cosmos-transaction/cosmos-transaction.component.html b/src/app/pages/transaction/cosmos-transaction/cosmos-transaction.component.html
index 7a8d706fe..0d9d8f425 100644
--- a/src/app/pages/transaction/cosmos-transaction/cosmos-transaction.component.html
+++ b/src/app/pages/transaction/cosmos-transaction/cosmos-transaction.component.html
@@ -26,9 +26,7 @@ <h1 class="text--white mb-0">COSMOS Transaction Details</h1>
       <div class="d-flex align-items-baseline">
         <h2 *ngIf="!isRawData" class="mb-0 text--white pb-0 pr-0">Information</h2>
         <div *ngIf="isRawData">
-          <h2
-            class="mb-0 text--white pb-0 pr-0"
-            [copyBtn]="transaction.tx | json"
+          <h2 class="mb-0 text--white pb-0 pr-0" [copyBtn]="transaction.tx | json"
             [btnClass]="['button', 'button--xxs', 'button--sm-mob', 'button-circle', 'ml-2']">
             Raw Data
           </h2>
@@ -43,7 +41,7 @@ <h2 *ngIf="!isRawData" class="mb-0 text--white pb-0 pr-0">Information</h2>
           <div class="row mb-2 body justify-content-between justify-content-lg-start">
             <div class="col-auto col-lg-2 text--gray-4 d-flex align-items-center">TxHash</div>
             <div class="col-auto col-lg-10 text--gray-1 d-flex align-items-center">
-              <div [copyBtn]="transaction?.tx_hash" [btnClass]="['mr-2']">
+              <div [copyBtn]="transaction?.tx_hash" [btnClass]="!environmentService.isMobile ? ['mr-2'] : []">
                 <span *ngIf="!environmentService.isMobile">{{ transaction?.tx_hash }}</span>
                 <span *ngIf="environmentService.isMobile">{{ transaction?.tx_hash | ellipsis: 8 : 8 }}</span>
               </div>
@@ -52,17 +50,14 @@ <h2 *ngIf="!isRawData" class="mb-0 text--white pb-0 pr-0">Information</h2>
           <div class="row mb-2 body justify-content-between justify-content-lg-start">
             <div class="col-auto col-lg-2 text--gray-4">Status</div>
             <div class="col-auto col-lg-10 d-flex align-items-center">
-              <img
-                [src]="
+              <img [src]="
                   transaction?.code == codeTransaction.Success
                     ? ('assets/icons/icons-svg/color/success.svg' | imageS3)
                     : ('assets/icons/icons-svg/color/fail.svg' | imageS3)
-                "
-                width="20px"
-                height="20px" />
+                " width="20px" height="20px" />
               <span class="ml-2 {{ transaction?.status === 'Success' ? 'text--green-3' : 'text--red-3' }}">{{
                 transaction?.status | uppercase
-              }}</span>
+                }}</span>
             </div>
           </div>
           <div class="row mb-2 body justify-content-between justify-content-lg-start">
@@ -110,6 +105,20 @@ <h2 *ngIf="!isRawData" class="mb-0 text--white pb-0 pr-0">Information</h2>
               {{ !transaction?.memo ? '-' : (transaction?.memo | ellipsis: (environmentService.isMobile ? 25 : 100)) }}
             </div>
           </div>
+          <div class="row body justify-content-between justify-content-lg-start flex-nowrap align-items-center">
+            <div class="col-auto col-lg-2 text--gray-4 d-md-flex">
+              <div>Fee payer</div>
+            </div>
+            <div style="max-width: max-content;">
+              <div *ngIf="!transaction?.fee_payer">-</div>
+              <a *ngIf="transaction?.fee_payer" [copyBtn]="transaction?.fee_payer"
+                [btnClass]="!environmentService.isMobile ? ['mr-2'] : []" class="text--primary d-block"
+                routerLink="/address/{{ transaction?.fee_payer }}">
+                {{ environmentService.isMobile ? (transaction?.fee_payer | ellipsis: 8 :
+                8) : transaction?.fee_payer }}
+              </a>
+            </div>
+          </div>
         </div>
 
         <pre *ngIf="isRawData" id="json" class="raw-content text--gray-1" [innerHtml]="transaction.tx | appJson"></pre>
@@ -125,9 +134,7 @@ <h2 class="text--white">Asset Transfer</h2>
 
     <ng-container *ngIf="!isRawData && transaction?.messages">
       <h2 class="text--white">Messages</h2>
-      <app-transaction-messages
-        [transactionDetail]="transaction"
-        [listValidator]="commonService.listValidator || []"
+      <app-transaction-messages [transactionDetail]="transaction" [listValidator]="commonService.listValidator || []"
         *ngIf="commonService.listValidator?.length > 0">
       </app-transaction-messages>
     </ng-container>
@@ -149,4 +156,4 @@ <h2 class="text--white">Messages</h2>
   <ng-template #noValues>
     <app-table-no-data [textNull]="errTxt"></app-table-no-data>
   </ng-template>
-</ng-container>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/pages/transaction/cosmos-transaction/cosmos-transaction.component.ts b/src/app/pages/transaction/cosmos-transaction/cosmos-transaction.component.ts
index e4a536b2a..431f0e48a 100644
--- a/src/app/pages/transaction/cosmos-transaction/cosmos-transaction.component.ts
+++ b/src/app/pages/transaction/cosmos-transaction/cosmos-transaction.component.ts
@@ -107,12 +107,21 @@ export class CosmosTransactionComponent implements OnChanges {
     }
 
     this.transaction = txs[0];
+
+    const eventsTx = txs[0]?.tx?.events?.find((item) => item?.type === 'message');
+
+    let feePayer = '';
+    eventsTx?.attributes?.forEach((attr) => {
+      if (attr?.key === 'sender') feePayer = attr?.value;
+    });
+
     this.transaction = {
       ...this.transaction,
       chainid: this.chainId,
       gas_used: _.get(res, 'transaction[0].gas_used'),
       gas_wanted: _.get(res, 'transaction[0].gas_wanted'),
       raw_log: _.get(res, 'transaction[0].data.tx_response.raw_log'),
+      fee_payer: feePayer,
       type: this.transaction.typeOrigin,
     };
 
@@ -140,3 +149,4 @@ export class CosmosTransactionComponent implements OnChanges {
     this.isRawData = type;
   }
 }
+
diff --git a/src/app/pages/transaction/evm-transaction/decode-message/decode-message.component.html b/src/app/pages/transaction/evm-transaction/decode-message/decode-message.component.html
new file mode 100644
index 000000000..501d3ffab
--- /dev/null
+++ b/src/app/pages/transaction/evm-transaction/decode-message/decode-message.component.html
@@ -0,0 +1,100 @@
+<div *ngIf="!isDataField" class="decode-message d-flex justify-content-start align-items-start col-12 d-flex"
+    [class]="isMobile ? isAllowSwitchDecode ? 'flex-wrap gap-2' : 'flex-nowrap' : 'flex-nowrap gap-3'">
+    <div class="param-field d-flex gap-3 justify-content-center align-items-start flex-nowrap">
+        <p *ngIf="index !== ''" class="name">
+            {{index}} <span *ngIf="name">: {{ name }}</span>
+        </p>
+        <div *ngIf="isAllowSwitchDecode" class="dropdown aura-dropdown btn-item">
+            <button 
+                style="height: 26px; min-width: max-content;"
+                class="button button--sm button--md-mob button-pill button-outline button-dropdown w-100"
+                type="button"
+                data-bs-toggle="dropdown"
+                aria-expanded="false">
+                <span>{{type}}</span>
+            </button>
+            <ul class="dropdown-menu aura-dropdown-menu">
+                <li (click)="onHex()" class="dropdown-item cursor-pointer" [class.active]="type === 'Hex'">
+                    <button type="button" class="button p-0">Hex</button>
+                </li>
+                <li (click)="onDecode()" class="dropdown-item cursor-pointer" [class.active]="type === 'Decode'">
+                    <button type="button" class="button p-0">Decode</button>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div *ngIf="!isAllowSwitchDecode" class="data flex-grow-1">
+        <p class="mb-1 font-space-mono">{{value}}</p>
+        <p class="mb-0 font-space-mono" [innerHTML]="decode | highlight_function"></p>
+    </div>
+    <div *ngIf="isAllowSwitchDecode" class="data flex-grow-1" [class]="isEvmContract ? 'd-flex align-items-center' : ''">
+        <img
+          [src]="'assets/images/icons/token-contract.svg' | imageS3"
+          width="16px"
+          height="16px"
+          *ngIf="isEvmContract" />
+        <a
+         *ngIf="isLink && type === 'Decode'"
+          class="text--primary font-space-mono d-inline-block"
+          [class]="isEvmContract ? 'p-1' : ''"
+          routerLink="/{{ isEvmContract ? 'evm-contracts' : 'address' }}/{{ data }}">
+            {{data}}
+        </a>
+        <span class="font-space-mono" *ngIf="!isLink || type === 'Hex'">{{data}}</span>
+    </div>
+</div>
+<div class="decode-message">
+    <div *ngIf="isDataField" class="d-flex align-items-start highlight">
+        <div class="flex-grow-1 data-field-msg">
+            <div *ngIf="type === 'Hex'">
+                <p class="font-space-mono">{{ data }}</p>
+            </div>
+            <div *ngIf="type === 'Decode'">
+                <div class="data-item" [style]="isMobile ? 'grid-template-columns: minmax(40px, max-content) 1fr' : ''">
+                    <ng-container *ngFor="let item of data">
+                        <p class="item-name">{{item?.name}}</p>
+                        <a *ngIf="item?.isLink" class="text--primary font-space-mono" routerLink="/address/{{ item?.decode }}">
+                            {{item?.decode}}
+                        </a>
+                        <div *ngIf="!item?.isLink" class="font-space-mono">
+                            <div *ngIf="item?.type === 'tuple'" class="d-flex flex-wrap gap-2 align-items-center">
+                                <div *ngFor="let dataDecoded of item?.decode" [class]="dataDecoded?.isEvmContract ? 'd-flex align-items-center' : ''">
+                                    <img
+                                      [src]="'assets/images/icons/token-contract.svg' | imageS3"
+                                      width="16px"
+                                      height="16px"
+                                      *ngIf="dataDecoded?.isEvmContract" />
+                                    <a
+                                      *ngIf="dataDecoded?.isLink"
+                                      class="text--primary font-space-mono d-inline-block"
+                                      [class]="dataDecoded?.isEvmContract ? 'p-1' : ''"
+                                      routerLink="/{{ dataDecoded?.isEvmContract ? 'evm-contracts' : 'address' }}/{{ dataDecoded?.name }}">
+                                        {{dataDecoded?.name}}
+                                    </a>
+                                    <p class="font-space-mono" *ngIf="!dataDecoded?.isLink" >{{dataDecoded?.name}}</p>
+                                </div>
+                            </div>
+                            <div *ngIf="item?.type !== 'tuple'">
+                                <p class="font-space-mono">{{item?.decode}}</p>
+                            </div>
+                        </div>
+                    </ng-container>
+                </div>
+            </div>
+        </div>
+        <div *ngIf="isAllowSwitchDecode" class="button-container">
+            <button
+                class="button-data body-04 button-dec"
+                [class.active]="type === 'Decode'"
+                (click)="onDecode('data')">
+                <span>Dec</span>
+            </button>
+            <button 
+                class="button-data body-04 button-hex"
+                [class.active]="type === 'Hex'"
+                (click)="onHex()">
+                <span>Hex</span>
+            </button>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/transaction/evm-transaction/decode-message/decode-message.component.scss b/src/app/pages/transaction/evm-transaction/decode-message/decode-message.component.scss
new file mode 100644
index 000000000..dfd8f222c
--- /dev/null
+++ b/src/app/pages/transaction/evm-transaction/decode-message/decode-message.component.scss
@@ -0,0 +1,116 @@
+.decode-message {
+    column-gap: 8px;
+    .data{
+        font-size: 14px;
+        line-height: 24px;
+    }
+
+    .name {
+        border-radius: 6px;
+        padding: 4px 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #B4B8C0;
+        border: 1px solid var(--aura-gray-6);
+        background: var(--aura-gray-9);
+        font-weight: 600;
+        font-size: 12px;
+        white-space: nowrap;
+        margin: 0;
+    }
+    button.button {
+        background-color: #494C58;
+        padding-left: 6px;
+        padding-right: 25px;
+        font-size: 12px;
+        line-height: 16px;
+        bottom: 1px;
+        top: -1px;
+    }
+
+    .button.button-dropdown.button--sm:before,
+    .button.button-dropdown.button--sm:after {
+        right: 5px;        
+    }
+
+    .dropdown-menu.aura-dropdown-menu{
+        top: 0px;
+        margin-top: 0px;
+    }
+
+    .dropdown-item.cursor-pointer {
+        padding: 0 4px;
+        margin-top: 2px;
+        
+        button{
+            background-color: transparent;
+        }
+    }
+
+    .data-field-msg {
+        padding: 2px;
+        border-radius: 4px;
+
+        p {
+            font-size: 14px;
+            line-height: 18px;
+            font-weight: 400;
+            margin: 0;
+        }
+
+        .data-item {
+            display: grid;
+            column-gap: 20px;
+            row-gap: 6px;
+            grid-template-columns: minmax(100px, max-content) 1fr;
+
+            .item-name {
+                color: #9DA1AC;
+                font-size: 12px;
+                line-height: 16px;
+            }
+        }
+    }
+
+    .highlight {
+        max-width: 98%;
+        padding: 4px 8px;
+        border-radius: 4px;
+        background-color: var(--aura-gray-10);
+      }
+    
+    .button-container {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-wrap: nowrap;
+    }
+
+    .button-data {
+        width: 39px;
+        height: 24px;
+        gap: 10px;
+        padding: 2px;
+        background: #363843;
+        color: #9DA1AC;
+
+    }
+
+    .button-dec {
+        border-radius: 8px 0px 0px 8px;
+    }
+
+    .button-hex {
+        border-radius: 0px 8px 8px 0px;
+    }
+    
+    .active {
+        background-color: #000;
+        span {   
+            background: var(--aura-gradient-button);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/app/pages/transaction/evm-transaction/decode-message/decode-message.component.ts b/src/app/pages/transaction/evm-transaction/decode-message/decode-message.component.ts
new file mode 100644
index 000000000..6b991aa43
--- /dev/null
+++ b/src/app/pages/transaction/evm-transaction/decode-message/decode-message.component.ts
@@ -0,0 +1,118 @@
+import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { EnvironmentService } from 'src/app/core/data-services/environment.service';
+import { ContractService } from 'src/app/core/services/contract.service';
+import * as _ from 'lodash';
+
+@Component({
+  selector: 'app-decode-message',
+  templateUrl: './decode-message.component.html',
+  styleUrls: ['./decode-message.component.scss'],
+})
+export class DecodeMessageComponent implements OnInit {
+  @Input() index?: string;
+  @Input() isLink?: boolean;
+  @Input() name?: string;
+  @Input() isAllowSwitchDecode?: boolean;
+  @Input() value: string;
+  @Input() decode: string;
+  @Input() isHighlight?: boolean;
+  @Input() isDataField?: boolean;
+
+  data: string | any = '';
+  type: 'Decode' | 'Hex' = 'Hex';
+  isMobile = false;
+  isEvmContract = false;
+  constructor(
+    private environmentService: EnvironmentService,
+    private contractService: ContractService,
+    private detectRef: ChangeDetectorRef,
+  ) {}
+
+  ngOnInit(): void {
+    this.isMobile = this.environmentService.isMobile;
+    this.data = this.value;
+  }
+
+  checkEvmContract(address: string, cb: (isContract: boolean) => void) {
+    this.contractService.findEvmContract(address).subscribe({
+      next: (res) => {
+        if (res?.evm_smart_contract?.length > 0) cb(true);
+        else cb(false);
+      },
+    });
+  }
+
+  getAddress (data: any[]) {
+    const addresses = [];
+    for (const item of data) {
+      if(item?.isLink) addresses.push(item?.decode);
+      else if(item?.type === 'tuple') {
+        item?.decode?.split(',')?.forEach((tupleItem) => {
+          if (tupleItem?.startsWith('0x')) {
+            addresses.push(tupleItem);
+          }})
+      } 
+    }
+    return _.uniq(addresses.filter(Boolean));
+  }
+
+  onDecode(field?: string) {
+    this.type = 'Decode';
+    if (field !== 'data') {
+      this.data = this.decode;
+      this.checkEvmContract(this.decode, (isContract) => {
+        if (isContract) this.isEvmContract = true;
+        else this.isEvmContract = false;
+        this.detectRef.detectChanges();
+      });
+      return;
+    } else {
+      if (Array.isArray(this.decode)) {
+        const addresses = this.getAddress(this.decode);       
+        this.contractService.findEvmContractList(addresses).subscribe({
+          next: (evmList) => {
+            this.data = Array.isArray(this.decode) && this.decode?.map((item) => {
+              if (item?.type !== 'tuple') {
+                const isEvmContract = !!evmList?.evm_smart_contract?.find(contract => contract?.address === item?.decode?.toString()?.toLowerCase());
+
+                return {
+                  ...item,
+                  isEvmContract,
+                  isArray: false,
+                };
+              }
+              if (item?.type === 'tuple') {
+                const links = item?.decode?.split(',')?.map((tupleItem: string) => {
+                  if (tupleItem?.startsWith('0x')) {
+                  const isEvmContract = !!evmList?.evm_smart_contract?.find(contract => contract?.address === tupleItem?.toString()?.toLowerCase());
+                    return {
+                      isEvmContract,
+                      name: tupleItem,
+                      isLink: true,
+                    };
+                  }
+                  return {
+                    name: tupleItem,
+                    isLink: false,
+                  };
+                });
+                return {
+                  ...item,
+                  isArray: true,
+                  decode: links,
+                };
+              }
+            });
+            this.detectRef.detectChanges();
+          },
+        })
+      }
+    }
+  }
+
+  onHex() {
+    this.type = 'Hex';
+    this.data = this.value;
+    this.isEvmContract = false;
+  }
+}
diff --git a/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.html b/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.html
index b471efd67..d3022c37f 100644
--- a/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.html
+++ b/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.html
@@ -1,47 +1,47 @@
 <div class="message-container text--white">
-  <div class="row mb-2 body justify-content-between justify-content-lg-start">
-    <div class="col-auto col-lg-2 text--gray-4">
-      {{ 'Method' }}
-    </div>
-    <div class="col-auto col-lg-10 text--gray-1">{{ method }}</div>
-  </div>
-
-  <div class="row mb-3 body justify-content-between justify-content-lg-start align-items-center"
+  <div
+    class="row mb-3 body justify-content-between justify-content-lg-start align-items-center"
     *ngIf="transaction?.contractAddress > 0">
     <div class="col-auto col-lg-2 text--gray-4">Contract Address</div>
-    <div class="col-auto col-lg-10">
-      <app-name-tag [value]="transaction?.contractAddress?.toLowerCase()" [fullText]="true"
+    <div class="col-auto">
+      <app-name-tag
+        [value]="transaction?.contractAddress | beautyAddress"
+        [fullText]="true"
         [linkRouter]="['/evm-contracts', transaction?.contractAddress?.toLowerCase()]"
         [iconContract]="true"></app-name-tag>
     </div>
   </div>
-
   <div class="d-flex flex-wrap mb-4" *ngIf="transaction?.inputData">
-    <div class="col-12 col-lg-2 mb-2 mb-lg-0 text--gray-4 body">
-      {{ 'Input Data' }}
-    </div>
-    <div class="col-12 col-lg-10">
+    <div class="col-12">
       <div class="button-switch-stage box-input-data mt-lg-0 mb-2">
-        <button class="button body-04 {{ isCreateContract ? 'text--gray-7 pe-none' : '' }}"
-          (click)="changeType(inputDataType.RAW)" [class.active-gradient]="typeInput === inputDataType.RAW"
+        <button
+          *ngIf="isEvmContract"
+          class="button body-04 {{ isCreateContract ? 'text--gray-7 pe-none' : '' }}"
+          (click)="changeType(inputDataType.RAW)"
+          [class.active-gradient]="typeInput === inputDataType.RAW"
           [disabled]="isCreateContract">
           <span>{{ inputDataType.RAW }}</span>
         </button>
-        <button class="button body-04 {{
-            !isContractVerified || isCreateContract ? 'text--gray-7 pe-none' : ''
-          }} active-gradient" (click)="changeType(inputDataType.DECODED)"
+        <button
+          *ngIf="isEvmContract || (!isEvmContract && transaction?.memo)"
+          class="button body-04 {{
+            (!isContractVerified || isCreateContract) && isEvmContract ? 'text--gray-7 pe-none' : ''
+          }} active-gradient"
+          (click)="changeType(inputDataType.DECODED)"
           [class.active-gradient]="typeInput === inputDataType.DECODED"
-          [disabled]="!isContractVerified || isCreateContract">
+          [disabled]="(!isContractVerified || isCreateContract) && isEvmContract">
           <span>{{ inputDataType.DECODED }}</span>
         </button>
-        <button class="button body-04 active-gradient" (click)="changeType(inputDataType.ORIGINAL)"
+        <button
+          class="button body-04 active-gradient"
+          (click)="changeType(inputDataType.ORIGINAL)"
           [class.active-gradient]="typeInput === inputDataType.ORIGINAL">
           <span>{{ inputDataType.ORIGINAL }}</span>
         </button>
       </div>
 
-      <div class="box-data log-content mb-3">
-        <div class="log-data body-02 break-word" *ngIf="typeInput === inputDataType.RAW">
+      <div class="box-data log-content mb-3 overflow-auto">
+        <div class="log-data body-02 break-word" *ngIf="typeInput === inputDataType.RAW && isEvmContract">
           <div *ngIf="inputDataRaw['methodId']" class="font-space-mono">MethodId: {{ inputDataRaw['methodId'] }}</div>
           <p *ngIf="inputDataRaw['name']" class="font-space-mono">Method name: {{ inputDataRaw['name'] }}</p>
           <ng-container *ngIf="inputDataRaw['arrList']?.length > 0">
@@ -58,44 +58,51 @@
           </ng-container>
         </div>
 
-        <div class="log-data body-02 break-word box-decoded overflow-auto" *ngIf="typeInput === inputDataType.DECODED">
-          <ng-container *ngIf="!env.isMobile">
-            <div class="row pb-3 text--gray-4 body-01 fw-semibold decoded-header">
-              <div class="col-1 pl-4">#</div>
-              <div class="col-3">Name</div>
-              <div class="col-3">Type</div>
-              <div class="col-5">Data</div>
-            </div>
-            <ng-container *ngFor="let item of inputDataDecoded['params']; index as index">
-              <div class="row item-decoded text--gray-1">
-                <div class="col-1 pl-4 font-space-mono">{{ index }}</div>
-                <div class="col-3 font-space-mono">{{ item.name }}</div>
-                <div class="col-3 font-space-mono">{{ item.type }}</div>
-                <div class="col-5 text-wrap font-space-mono">
-                  {{ item.value }}
-                </div>
+        <div class="log-data body-02 break-word box-decoded" *ngIf="typeInput === inputDataType.DECODED">
+          <ng-container *ngIf="isEvmContract">
+            <ng-container *ngIf="!env.isMobile">
+              <div class="row pb-3 text--gray-4 body-01 fw-semibold decoded-header">
+                <div class="col-1 pl-4">#</div>
+                <div class="col-3">Name</div>
+                <div class="col-3">Type</div>
+                <div class="col-5">Data</div>
               </div>
+              <ng-container *ngFor="let item of inputDataDecoded['params']; index as index">
+                <div class="row item-decoded text--gray-1">
+                  <div class="col-1 pl-4 font-space-mono">{{ index }}</div>
+                  <div class="col-3 font-space-mono">{{ item.name }}</div>
+                  <div class="col-3 font-space-mono">{{ item.type }}</div>
+                  <div class="col-5 text-wrap font-space-mono">
+                    {{ item.value }}
+                  </div>
+                </div>
+              </ng-container>
             </ng-container>
-          </ng-container>
-
-          <ng-container *ngIf="env.isMobile">
-            <ng-container *ngFor="let item of inputDataDecoded['params']; index as index">
-              <div class="row item-decoded text--gray-1">
-                <div class="text--gray-4 body-04">Name</div>
-                <p>{{ item.name }}</p>
-                <div class="text--gray-4 body-04">Type</div>
-                <p class="">{{ item.type }}</p>
-                <div class="text--gray-4 body-04">Data</div>
-                <p class="text-wrap">
-                  {{ item.value }}
-                </p>
-              </div>
+            <ng-container *ngIf="env.isMobile">
+              <ng-container *ngFor="let item of inputDataDecoded['params']; index as index">
+                <div class="row item-decoded text--gray-1">
+                  <div class="text--gray-4 body-04">Name</div>
+                  <p>{{ item.name }}</p>
+                  <div class="text--gray-4 body-04">Type</div>
+                  <p class="">{{ item.type }}</p>
+                  <div class="text--gray-4 body-04">Data</div>
+                  <p class="text-wrap">
+                    {{ item.value }}
+                  </p>
+                </div>
+              </ng-container>
             </ng-container>
           </ng-container>
+          <div *ngIf="!isEvmContract" class="memo">
+            <p class="mb-0 font-space-mono">{{ transaction?.memo }}</p>
+          </div>
         </div>
 
-        <div class="log-data break-word font-space-mono" *ngIf="typeInput === inputDataType.ORIGINAL"
-          [appExpandable]="transaction?.inputData" [maxCharVisible]="500">
+        <div
+          class="log-data break-word font-space-mono"
+          *ngIf="typeInput === inputDataType.ORIGINAL"
+          [appExpandable]="transaction?.inputData"
+          [maxCharVisible]="500">
           {{ transaction?.inputData }}
         </div>
       </div>
@@ -105,13 +112,19 @@
   <div class="d-flex flex-wrap mb-3">
     <div class="col-12 mb-2 mb-lg-0 text--gray-4 body">
       <div class="button-switch-stage box-input-data mt-lg-0 mb-2">
-        <button type="button" (click)="isLog = true" class="button body-04 border-radius--sm"
+        <button
+          type="button"
+          (click)="isLog = true"
+          class="button body-04 border-radius--sm"
           [class.active-gradient]="isLog">
           <span>{{ 'Event log' }}</span>
         </button>
-        <button type="button" (click)="isLog = false" class="button body-04 border-radius--sm"
+        <button
+          type="button"
+          (click)="isLog = false"
+          class="button body-04 border-radius--sm"
           [class.active-gradient]="!isLog">
-          <span>Internal Transactions</span>
+          <span>Internal Txns</span>
         </button>
       </div>
     </div>
@@ -120,8 +133,22 @@
         <div *ngIf="eventLog?.length > 0; else noValue">
           <div class="mb-6">Transaction Receipt Event Logs ({{ eventLog?.length }})</div>
           <div class="">
-            <app-evm-transaction-event-log *ngFor="let log of eventLog; index as idx" [eventLog]="log"
-              [arrTopicDecode]="arrTopicDecode" [index]="idx">
+            <app-evm-transaction-event-log
+              [featureFlag]="'EnhanceEventLog'"
+              [flagEnabled]="false"
+              *ngFor="let log of eventLog; index as idx"
+              [eventLog]="log"
+              [arrTopicDecode]="arrTopicDecode"
+              [index]="idx">
+            </app-evm-transaction-event-log>
+
+            <app-evm-transaction-event-log
+              [featureFlag]="'EnhanceEventLog'"
+              *ngFor="let topic of topicsDecoded; let i = index"
+              [eventLog]="eventLog[i]"
+              [arrTopicDecode]="arrTopicDecode"
+              [topicsDecoded]="topic"
+              [index]="i">
             </app-evm-transaction-event-log>
           </div>
         </div>
@@ -129,10 +156,10 @@
           <app-table-no-data></app-table-no-data>
         </ng-template>
       </div>
-      <div class="box-data box mt-2" *ngIf="!isLog">
+      <div class="box-data box mt-2 overflow-auto" *ngIf="!isLog">
         <app-evm-internal-transactions
           [dataTable]="transaction.evm_internal_transactions"></app-evm-internal-transactions>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.scss b/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.scss
index 5f275cbbb..85397a283 100644
--- a/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.scss
+++ b/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.scss
@@ -16,7 +16,6 @@
     border-radius: 8px;
     padding: 12px;
     max-height: 558px;
-    overflow: auto;
     @media (min-width: 992px) {
       max-height: 330px;
       padding: 12px 16px;
@@ -78,8 +77,6 @@
   }
 
   .box-decoded {
-    padding: 8px 12px;
-
     .decoded-header {
       border-bottom: 1px solid var(--aura-gray-6);
     }
@@ -100,4 +97,10 @@
   ::-webkit-scrollbar {
     height: 6px;
   }
+
+  .memo {
+    height: max-content;
+    width: 100%;
+    background-color: var(--aura-gray-9);
+  }
 }
diff --git a/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.ts b/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.ts
index 06a11af9a..69b367837 100644
--- a/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.ts
+++ b/src/app/pages/transaction/evm-transaction/evm-message/evm-message.component.ts
@@ -6,6 +6,8 @@ import { EnvironmentService } from 'src/app/core/data-services/environment.servi
 import { ContractService } from 'src/app/core/services/contract.service';
 import { TransactionService } from 'src/app/core/services/transaction.service';
 import { mappingMethodName } from 'src/app/global/global';
+import { FeatureFlagService } from '../../../../core/data-services/feature-flag.service';
+import { FeatureFlags } from '../../../../core/constants/feature-flags.enum';
 
 @Component({
   selector: 'app-evm-message',
@@ -15,6 +17,7 @@ import { mappingMethodName } from 'src/app/global/global';
 export class EvmMessageComponent {
   @Input() title: string;
   @Input() transaction: any;
+  @Input() isEvmContract: boolean;
   @Input() eventLog: {
     id: number;
     contractName?: string;
@@ -24,6 +27,7 @@ export class EvmMessageComponent {
       data: string;
     }[];
     data: string;
+    dataDecoded?: string;
   }[];
 
   inputDataType = {
@@ -43,14 +47,23 @@ export class EvmMessageComponent {
   arrTopicDecode = [];
   interfaceCoder: Interface;
   contractAddressAbi = '';
+  contractAddressAbiList = [];
+  topicsDecoded = [];
+  abiContractData = [];
 
   constructor(
     private transactionService: TransactionService,
     public env: EnvironmentService,
     private contractService: ContractService,
+    private featureFlag: FeatureFlagService,
   ) {}
 
   ngOnInit(): void {
+    if (!this.isEvmContract) {
+      this.typeInput = this.inputDataType.DECODED;
+      if (!this.transaction?.memo) this.typeInput = this.inputDataType.ORIGINAL;
+    } else this.typeInput = this.inputDataType.RAW;
+
     this.inputDataRaw['methodId'] = this.transaction?.inputData?.substring(0, 8);
     this.inputDataRaw['arrList'] = this.transaction?.inputData?.slice(8).match(/.{1,64}/g);
     if (this.inputDataRaw['methodId'] === EMethodContract.Creation) {
@@ -58,14 +71,18 @@ export class EvmMessageComponent {
       this.typeInput = this.inputDataType.ORIGINAL;
     }
     this.getMethodName(this.inputDataRaw['methodId']);
-    this.getProxyContractAbi(this.transaction?.to);
+    if (this.featureFlag.isEnabled(FeatureFlags.EnhanceEventLog)) {
+      this.getProxyContractAbi();
+    } else {
+      this.getProxyContractAbiOld(this.transaction?.to);
+    }
   }
 
   changeType(data) {
     this.typeInput = data;
   }
 
-  getProxyContractAbi(address) {
+  getProxyContractAbiOld(address) {
     this.contractAddressAbi = this.transaction?.to;
     this.contractService.getProxyContractAbi(address).subscribe({
       next: (res) => {
@@ -92,7 +109,7 @@ export class EvmMessageComponent {
         const value = parseEther('1.0');
         const rawData = this.interfaceCoder.parseTransaction({ data: '0x' + this.transaction?.inputData, value });
         if (rawData?.fragment?.inputs?.length > 0) {
-          this.getListTopicDecode();
+          this.getListTopicDecodeOld();
           this.inputDataRaw['name'] =
             this.interfaceCoder.getFunction(rawData?.fragment?.name)?.format() || rawData.name;
           this.inputDataDecoded['name'] = rawData.name;
@@ -108,7 +125,86 @@ export class EvmMessageComponent {
     });
   }
 
-  getListTopicDecode() {
+  getProxyContractAbi() {
+    let listContract = this.transaction.eventLog.map((i) => i.address?.toLowerCase());
+    listContract.push(this.transaction?.to?.toLowerCase());
+    listContract = _.uniq(listContract);
+    this.contractService.getListProxyAbi(listContract?.filter(Boolean)).subscribe({
+      next: (res) => {
+        this.contractAddressAbiList = res?.evm_smart_contract?.map((item) => {
+          return {
+            implementation_contract: _.get(item, 'evm_proxy_histories[0].implementation_contract') || item?.address,
+            address: item?.address,
+          };
+        });
+      },
+      complete: () => {
+        this.getAbiList();
+      },
+    });
+  }
+
+  getAbiList() {
+    if (this.contractAddressAbiList.length === 0) {
+      return;
+    }
+    const implementationContractList = this.contractAddressAbiList.map((i) => i.implementation_contract);
+
+    this.transactionService.getListAbiContract(implementationContractList).subscribe((res) => {
+      if (res?.evm_contract_verification?.length > 0) {
+        this.isDecoded = true;
+        this.abiContractData = res?.evm_contract_verification.map((i) => ({
+          contractAddress: this.contractAddressAbiList.find((f) => f.implementation_contract === i.contract_address)
+            ?.address,
+          implementationContractAddr: i.contract_address,
+          abi: i.abi,
+          interfaceCoder: new Interface(i.abi),
+        }));
+
+        const abiInfo = this.abiContractData.find((f) => f.contractAddress === this.transaction?.to);
+
+        if (abiInfo) {
+          this.isContractVerified = true;
+          const value = parseEther('1.0');
+          const rawData = abiInfo.interfaceCoder.parseTransaction({ data: '0x' + this.transaction?.inputData, value });
+
+          this.inputDataRaw['name'] = abiInfo.interfaceCoder.getFunction(rawData?.selector)?.format() || rawData.name;
+          this.inputDataDecoded['name'] = rawData.name;
+
+          if (rawData?.fragment?.inputs?.length > 0) {
+            this.inputDataDecoded['params'] = rawData?.fragment?.inputs.map((item, index) => {
+              return {
+                name: item.name,
+                type: item.type,
+                value: rawData.args[index],
+              };
+            });
+          }
+        }
+      }
+      this.getListTopicDecode();
+    });
+  }
+
+  mappingTopics(element) {
+    element['isAllowSwitchDecodeDataField'] = false;
+    return element?.topics?.map((i, tidx) => ({
+      index: tidx,
+      decode: '',
+      value: i,
+      isAllowSwitchDecode: false,
+    }));
+  }
+
+  mappingFunctionName(item) {
+    const { type, indexed, name } = item;
+    let param = type;
+    if (!indexed) param = `${type} ${name}`;
+    else param = `${type} indexed ${name}`;
+    return param;
+  }
+
+  getListTopicDecodeOld() {
     this.transaction.eventLog.forEach((element, index) => {
       let arrTopicTemp = element?.evm_signature_mapping_topic || [];
       try {
@@ -121,12 +217,88 @@ export class EvmMessageComponent {
 
       this.arrTopicDecode[index] = arrTopicTemp;
     });
-    this.arrTopicDecode = [...this.arrTopicDecode]
+    this.arrTopicDecode = [...this.arrTopicDecode];
+  }
+
+  getListTopicDecode() {
+    this.transaction.eventLog.forEach((element, index) => {
+      let arrTopicTemp = element?.evm_signature_mapping_topic || [];
+      try {
+        const abiInfo = this.abiContractData.find((f) => f.contractAddress === element.address);
+        let decoded = [];
+        element.data = element?.data?.replace('\\x', '');
+        element['isAllowSwitchDecodeDataField'] = true;
+
+        if (!abiInfo?.abi) {
+          decoded = this.mappingTopics(element);
+        } else {
+          const paramsDecode = abiInfo.interfaceCoder.parseLog({
+            topics: element.topics?.filter((f) => f),
+            data: `0x${element.data || this.transaction?.inputData}`,
+          });
+
+          if (!paramsDecode) decoded = this.mappingTopics(element);
+          else {
+            const params = paramsDecode?.fragment?.inputs.map(this.mappingFunctionName);
+            const decodeTopic0 = `> ${paramsDecode?.fragment?.name}(${params.join(', ')})`;
+
+            decoded = [
+              {
+                index: 0,
+                decode: decodeTopic0,
+                value: element.topics[0],
+              },
+            ];
+
+            const inputs = paramsDecode?.fragment?.inputs;
+            if (inputs?.length > 0) {
+              const params = [];
+              const data = [];
+              let currentParamIndex = 0;
+
+              inputs?.forEach((item, idx) => {
+                if (item?.type === 'tuple') {
+                  const tupleType = `(${item?.components?.map(this.mappingFunctionName)?.join(', ')}) ${item?.name}`;
+                  const replaceTuple = new RegExp(`\\b${item?.type} ${item?.name}\\b`, 'g');
+                  decoded[0].decode = decoded[0]?.decode?.replace(replaceTuple, tupleType);
+                }
+
+                const param = {
+                  indexed: item?.indexed,
+                  name: item.name,
+                  type: item.type,
+                  isLink: item.type === 'address',
+                  decode: paramsDecode.args[idx]?.toString(),
+                };
+                if (item?.indexed) {
+                  param['indexed'] = item.indexed;
+                  param['index'] = currentParamIndex + 1;
+                  param['isAllowSwitchDecode'] = true;
+                  (param['value'] = element.topics[currentParamIndex + 1]), (currentParamIndex += 1);
+                  params.push(param);
+                } else {
+                  data.push(param);
+                }
+              });
+
+              element.dataDecoded = data;
+              decoded = [...decoded, ...params];
+            }
+          }
+        }
+
+        this.topicsDecoded[index] = decoded;
+      } catch (e) {}
+      this.arrTopicDecode[index] = arrTopicTemp;
+    });
+    this.arrTopicDecode = [...this.arrTopicDecode];
   }
 
   getMethodName(methodId) {
     this.transactionService.getListMappingName(methodId).subscribe((res) => {
       this.method = mappingMethodName(res, methodId);
+      if (!this.isEvmContract) this.method = 'Send';
+      if (!this.transaction?.to) this.method = 'Create Contract';
     });
   }
 }
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 41c13d6eb..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
@@ -1,6 +1,5 @@
 <div class="event-log-container break-word" *ngIf="eventLog">
   <div class="event-number">{{ index + 1 }}</div>
-
   <div class="event-content w-100">
     <div class="d-flex flex-wrap mb-3">
       <div class="col-12 col-lg-1 mb-2 mb-lg-0 text--gray-4 body">
@@ -10,44 +9,67 @@
       <div class="col-12 col-lg-11 row">
         <div class="col-12">
           <div class="d-block d-lg-inline">
-            {{ eventLog.contractName }}
+            {{ eventLog?.contractName }}
           </div>
-          <span class="font-space-mono">{{ eventLog.address }}</span>
+          <span class="font-space-mono">{{ eventLog?.address }}</span>
         </div>
       </div>
     </div>
 
     <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-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 *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 [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>
-          </div>
-        </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' }}
+        <span style="line-height: 28px">Data</span>
       </div>
       <div class="col-12 col-lg-11">
-        <!-- <div class="mb-1">Value {{ eventLog.data }}</div> -->
-        <div class="highlight font-space-mono">{{ eventLog.data }}</div>
+        <div class="highlight font-space-mono" [featureFlag]="'EnhanceEventLog'" [flagEnabled]="false">
+          {{ eventLog.data }}
+        </div>
+        <app-decode-message
+          [featureFlag]="'EnhanceEventLog'"
+          [isDataField]="true"
+          [value]="eventLog.data"
+          [decode]="eventLog.dataDecoded"
+          [isAllowSwitchDecode]="eventLog.isAllowSwitchDecodeDataField"
+          [isHighlight]="true"></app-decode-message>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.scss b/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.scss
index b38275bf5..d38983229 100644
--- a/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.scss
+++ b/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.scss
@@ -17,6 +17,7 @@
 
   .event-number {
     width: 44px;
+    min-width: max-content;
     max-width: 20%;
     height: 34px;
     border-radius: 8px;
@@ -28,6 +29,7 @@
     align-items: center;
     justify-content: center;
     gap: 8px;
+    white-space: nowrap;
 
     &.secondary {
       color: var(--while);
diff --git a/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.ts b/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.ts
index bad6e0a7a..f1dda3db5 100644
--- a/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.ts
+++ b/src/app/pages/transaction/evm-transaction/evm-transaction-event-log/evm-transaction-event-log.component.ts
@@ -1,4 +1,6 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { FeatureFlagService } from '../../../../core/data-services/feature-flag.service';
+import { FeatureFlags } from '../../../../core/constants/feature-flags.enum';
 
 @Component({
   selector: 'app-evm-transaction-event-log',
@@ -8,6 +10,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core
 })
 export class EvmTransactionEventLogComponent implements OnInit {
   @Input() arrTopicDecode;
+  @Input() topicsDecoded;
   @Input() eventLog: {
     id: number;
     contractName?: string;
@@ -17,13 +20,18 @@ export class EvmTransactionEventLogComponent implements OnInit {
       data: string;
     }[];
     data: string;
+    dataDecoded?: string;
+    isAllowSwitchDecodeDataField?: boolean;
   };
   @Input() index;
 
+  constructor(private featureFlag: FeatureFlagService) {}
+
   ngOnInit(): void {
-    if (this.eventLog?.data) {
-      this.eventLog['data'] = this.eventLog?.data.replace('\\x', '');
+    if (!this.featureFlag.isEnabled(FeatureFlags.EnhanceEventLog)) {
+      if (this.eventLog?.data) {
+        this.eventLog['data'] = this.eventLog?.data.replace('\\x', '');
+      }
     }
   }
 }
-
diff --git a/src/app/pages/transaction/evm-transaction/evm-transaction.component.html b/src/app/pages/transaction/evm-transaction/evm-transaction.component.html
index 40d3675d5..2949b0f32 100644
--- a/src/app/pages/transaction/evm-transaction/evm-transaction.component.html
+++ b/src/app/pages/transaction/evm-transaction/evm-transaction.component.html
@@ -87,7 +87,7 @@ <h1 class="text--white mb-0">EVM Transaction Details</h1>
             <div class="col-auto col-lg-2 text--gray-4">From</div>
             <div class="col-auto col-lg-10 text-end text-lg-start d-lg-flex align-items-center text--gray-1">
               <ng-container *ngIf="transaction.from; else dash">
-                <app-name-tag [value]="transaction.from" [fullText]="true"></app-name-tag>
+                <app-name-tag [value]="transaction.from | beautyAddress" [fullText]="true"></app-name-tag>
               </ng-container>
             </div>
           </div>
@@ -97,7 +97,7 @@ <h1 class="text--white mb-0">EVM Transaction Details</h1>
             <div class="col-auto col-lg-10 text-end text-lg-start d-lg-flex align-items-center text--gray-1">
               <ng-container *ngIf="transaction.to; else dash">
                 <app-name-tag
-                  [value]="transaction.to?.toLowerCase()"
+                  [value]="transaction.to | beautyAddress"
                   [fullText]="true"
                   [linkRouter]="[isEvmContract ? '/evm-contracts' : '/address', transaction.to]"
                   [iconContract]="isEvmContract"></app-name-tag>
@@ -148,7 +148,10 @@ <h2 class="text--white">Asset Transfer</h2>
     </ng-container>
 
     <div class="row body justify-content-between justify-content-lg-start">
-      <app-evm-message [transaction]="transaction" [eventLog]="transaction.eventLog"></app-evm-message>
+      <app-evm-message 
+      [transaction]="transaction"
+      [eventLog]="transaction.eventLog"
+      [isEvmContract]="isEvmContract"></app-evm-message>
     </div>
   </ng-container>
 </ng-container>
diff --git a/src/app/pages/transaction/evm-transaction/evm-transaction.component.ts b/src/app/pages/transaction/evm-transaction/evm-transaction.component.ts
index ec9299e76..b1c9f2dd3 100644
--- a/src/app/pages/transaction/evm-transaction/evm-transaction.component.ts
+++ b/src/app/pages/transaction/evm-transaction/evm-transaction.component.ts
@@ -8,6 +8,7 @@ import { CommonService } from 'src/app/core/services/common.service';
 import { ContractService } from 'src/app/core/services/contract.service';
 import { TransactionService } from 'src/app/core/services/transaction.service';
 import { getBalance } from 'src/app/core/utils/common/parsing';
+import { hex2a } from 'src/app/core/utils/ethers/utils';
 
 @Component({
   selector: 'app-evm-transaction',
@@ -129,9 +130,9 @@ export class EvmTransactionComponent implements OnChanges {
     if (this.transaction?.to) {
       this.contractService.findEvmContract(this.transaction.to).subscribe({
         next: (res) => {
-          if (res?.evm_smart_contract?.length > 0) {
+          if (res?.evm_smart_contract?.length > 0)
             this.isEvmContract = true;
-          }
+          else this.transaction.memo = hex2a(this.transaction.inputData as any);
         },
       });
     }
diff --git a/src/app/pages/transaction/token-transfer/token-transfer.component.html b/src/app/pages/transaction/token-transfer/token-transfer.component.html
index 8e7b5238c..6146655c2 100644
--- a/src/app/pages/transaction/token-transfer/token-transfer.component.html
+++ b/src/app/pages/transaction/token-transfer/token-transfer.component.html
@@ -105,7 +105,7 @@ <h5 class="card-header w-100 card-header-gray text--gray-light-2 mb-0 py-4">
                           [isEnableRouter]="!!data.from"
                           [maxCharacter]="breakpoint.value.matches ? 6 : 16"
                           [iconContract]="data.from | isContract"
-                          [value]="data.from || nullAddress"
+                          [value]="data.from || nullAddress | beautyAddress"
                           [isShorterText]="breakpoint.value.matches"
                           [linkRouter]="[(data.from | isContract) ? '/contracts' : '/address', data.from]">
                         </app-name-tag>
@@ -118,7 +118,7 @@ <h5 class="card-header w-100 card-header-gray text--gray-light-2 mb-0 py-4">
                           [isEnableRouter]="!!data.to"
                           [maxCharacter]="breakpoint.value.matches ? 6 : 16"
                           [iconContract]="data.to | isContract"
-                          [value]="data.to || nullAddress"
+                          [value]="data.to || nullAddress | beautyAddress"
                           [isShorterText]="breakpoint.value.matches"
                           [linkRouter]="[(data.to | isContract) ? '/contracts' : '/address', data.to]">
                         </app-name-tag>
@@ -204,7 +204,7 @@ <h5 class="card-header w-100 card-header-gray text--gray-light-2 mb-0 py-4">
                           [isEnableRouter]="true"
                           [value]="
                             data?.cw721_contract?.smart_contract?.address ||
-                            data?.erc721_contract?.evm_smart_contract?.address
+                              data?.erc721_contract?.evm_smart_contract?.address | beautyAddress
                           "
                           [iconContract]="true"
                           [isShorterText]="breakpoint.value.matches"
@@ -227,7 +227,7 @@ <h5 class="card-header w-100 card-header-gray text--gray-light-2 mb-0 py-4">
                           [isEnableRouter]="!!data.from"
                           [maxCharacter]="breakpoint.value.matches ? 6 : 16"
                           [iconContract]="data.from | isContract"
-                          [value]="data.from || nullAddress"
+                          [value]="data.from || nullAddress | beautyAddress"
                           [isShorterText]="breakpoint.value.matches"
                           [linkRouter]="[(data.from | isContract) ? '/contracts' : '/address', data.from]">
                         </app-name-tag>
@@ -236,7 +236,7 @@ <h5 class="card-header w-100 card-header-gray text--gray-light-2 mb-0 py-4">
                           [isEnableRouter]="!!data.from"
                           [maxCharacter]="breakpoint.value.matches ? 6 : 16"
                           [iconContract]="isEvmSmartContract(data.from)"
-                          [value]="data.from || nullAddress"
+                          [value]="data.from || nullAddress | beautyAddress"
                           [isShorterText]="breakpoint.value.matches"
                           [linkRouter]="[isEvmSmartContract(data.from) ? '/evm-contracts' : '/address', data.from]">
                         </app-name-tag>
@@ -250,7 +250,7 @@ <h5 class="card-header w-100 card-header-gray text--gray-light-2 mb-0 py-4">
                           [isEnableRouter]="!!data.to"
                           [iconContract]="data.to | isContract"
                           [maxCharacter]="breakpoint.value.matches ? 6 : 16"
-                          [value]="data.to || nullAddress"
+                          [value]="data.to || nullAddress | beautyAddress"
                           [isShorterText]="breakpoint.value.matches"
                           [linkRouter]="[(data.to | isContract) ? '/contracts' : '/address', data.to]"></app-name-tag>
                         <app-name-tag
@@ -258,7 +258,7 @@ <h5 class="card-header w-100 card-header-gray text--gray-light-2 mb-0 py-4">
                           [isEnableRouter]="!!data.to"
                           [iconContract]="isEvmSmartContract(data.to)"
                           [maxCharacter]="breakpoint.value.matches ? 6 : 16"
-                          [value]="data.to || nullAddress"
+                          [value]="data.to || nullAddress | beautyAddress"
                           [isShorterText]="breakpoint.value.matches"
                           [linkRouter]="[
                             isEvmSmartContract(data.to) ? '/evm-contracts' : '/address',
diff --git a/src/app/pages/transaction/transaction.module.ts b/src/app/pages/transaction/transaction.module.ts
index 2ace90e16..899e8e721 100644
--- a/src/app/pages/transaction/transaction.module.ts
+++ b/src/app/pages/transaction/transaction.module.ts
@@ -26,6 +26,7 @@ import { TransactionMessagesComponent } from './transaction-messages/transaction
 import { TransactionRoutingModule } from './transaction-routing.module';
 import { TransactionComponent } from './transaction.component';
 import { EvmInternalTransactionsComponent } from './evm-transaction/evm-internal-transactions/evm-internal-transactions.component';
+import { DecodeMessageComponent } from './evm-transaction/decode-message/decode-message.component';
 
 @NgModule({
   declarations: [
@@ -38,6 +39,7 @@ import { EvmInternalTransactionsComponent } from './evm-transaction/evm-internal
     EvmMessageComponent,
     EvmTransactionEventLogComponent,
     EvmInternalTransactionsComponent,
+    DecodeMessageComponent
   ],
   imports: [
     CommonModule,
diff --git a/src/app/shared/components/contract-table/contract-table.component.html b/src/app/shared/components/contract-table/contract-table.component.html
index edc61e2d8..218868278 100644
--- a/src/app/shared/components/contract-table/contract-table.component.html
+++ b/src/app/shared/components/contract-table/contract-table.component.html
@@ -42,14 +42,14 @@
                       <ng-container *ngIf="template.isNameTag">
                         <app-name-tag
                           *ngIf="template.matColumnDef !== 'from' && template.matColumnDef !== 'to'"
-                          [value]="data[template.matColumnDef]"
+                          [value]="data[template.matColumnDef] | beautyAddress"
                           [linkRouter]="[template?.isUrl, data[template.matColumnDef]]"
                           [isEnableRouter]="
                             data[template.matColumnDef] !== contractInfo?.contractsAddress?.toLowerCase()
                           "></app-name-tag>
                         <app-name-tag
                           *ngIf="template.matColumnDef === 'from'"
-                          [value]="data[template.matColumnDef]"
+                          [value]="data[template.matColumnDef] | beautyAddress"
                           [linkRouter]="[template?.isUrl, data[template.matColumnDef]]"
                           [iconContract]="data['fromIsEvmContract']"
                           [isEnableRouter]="
@@ -57,7 +57,7 @@
                           "></app-name-tag>
                         <app-name-tag
                           *ngIf="template.matColumnDef === 'to'"
-                          [value]="data[template.matColumnDef]"
+                          [value]="data[template.matColumnDef] | beautyAddress"
                           [linkRouter]="[template?.isUrl, data[template.matColumnDef]]"
                           [iconContract]="data['toIsEvmContract']"
                           [isEnableRouter]="
@@ -129,6 +129,9 @@
                   <ng-container *ngSwitchCase="'time-distance'">
                     {{ data[template.matColumnDef] | customDateTime: 'Distance' }}
                   </ng-container>
+                  <ng-container *ngIf="template.matColumnDef === 'arrow'">
+                    <img [src]="'assets/icons/icons-svg/basic/arrow-circle-right.svg'" alt="" class="mr-1" />
+                  </ng-container>
                   <div *ngSwitchDefault>{{ data[template.matColumnDef] }}</div>
                 </ng-container>
               </td>
diff --git a/src/app/shared/components/wallet-connect/wallet-connect.component.html b/src/app/shared/components/wallet-connect/wallet-connect.component.html
index 31c8e5eda..15bc1d7a2 100644
--- a/src/app/shared/components/wallet-connect/wallet-connect.component.html
+++ b/src/app/shared/components/wallet-connect/wallet-connect.component.html
@@ -34,5 +34,10 @@
           class="ml-1" />
       </div>
     </div>
+    <div *ngIf="ng.wallet?.cosmosAccount || ng.wallet?.evmAccount" class="connection-info mt-1">
+      <img [src]="'assets/icons/icons-svg/white/info.svg'" alt="warning">
+      <span>{{ng.wallet?.cosmosAccount ? "Aura Cosmos connected!" : ng.wallet?.evmAccount ? "Aura EVM connected!" :
+        ""}}</span>
+    </div>
   </ng-container>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/components/wallet-connect/wallet-connect.component.scss b/src/app/shared/components/wallet-connect/wallet-connect.component.scss
index 67c0bdb75..68f5e3585 100644
--- a/src/app/shared/components/wallet-connect/wallet-connect.component.scss
+++ b/src/app/shared/components/wallet-connect/wallet-connect.component.scss
@@ -1,5 +1,14 @@
 .wallet-connect-container {
   margin-bottom: 22px;
+
+  .connection-info {
+    span {
+      margin-left: 4px;
+      color: var(--aura-gray-2);
+      font-size: 12px;
+      line-height: 16px;
+    }
+  }
   @media (max-width: 414px) {
     margin-bottom: 16px;
   }
@@ -12,28 +21,3 @@
   border: 1px solid var(--aura-gray-9);
   cursor: unset;
 }
-
-.box-connect-wallet {
-  .divider-vertical {
-    height: 32px;
-  }
-
-  .aura-tooltip-object {
-    background: none;
-  }
-
-  .txt-wallet,
-  .txt-disconnect:hover {
-    text-decoration: underline;
-    text-underline-offset: 2px;
-  }
-
-  .txt-disconnect:hover {
-    color: var(--aura-blue-4);
-  }
-
-  @media (max-width: 992px) {
-    width: 100%;
-    justify-content: space-between;
-  }
-}
diff --git a/src/app/shared/components/wallet-connect/wallet-connect.component.ts b/src/app/shared/components/wallet-connect/wallet-connect.component.ts
index b4288a72c..bdd59fbda 100644
--- a/src/app/shared/components/wallet-connect/wallet-connect.component.ts
+++ b/src/app/shared/components/wallet-connect/wallet-connect.component.ts
@@ -21,7 +21,6 @@ import { WalletDialogComponent } from './wallet-dialog/wallet-dialog.component';
 })
 export class WalletConnectComponent implements OnInit {
   CHAIN_ID = this.env.chainId;
-
   signerOptions = {
     signingCosmwasm: (chain: Chain) => ({ gasPrice: getGasPriceByChain(chain) }),
     signingStargate: (chain: Chain) => ({ gasPrice: getGasPriceByChain(chain) }),
@@ -105,3 +104,4 @@ export class WalletConnectComponent implements OnInit {
     document.body.removeChild(dummy);
   }
 }
+
diff --git a/src/app/shared/components/wallet-connect/wallet-provider/wallet-provider.component.ts b/src/app/shared/components/wallet-connect/wallet-provider/wallet-provider.component.ts
index 450213374..358f0fa43 100644
--- a/src/app/shared/components/wallet-connect/wallet-provider/wallet-provider.component.ts
+++ b/src/app/shared/components/wallet-connect/wallet-provider/wallet-provider.component.ts
@@ -154,3 +154,4 @@ export class WalletProviderComponent implements AfterViewInit {
     this.onClose.emit(null);
   }
 }
+
diff --git a/src/assets/icons/icons-svg/basic/arrow-circle-right.svg b/src/assets/icons/icons-svg/basic/arrow-circle-right.svg
new file mode 100644
index 000000000..1fb732ab2
--- /dev/null
+++ b/src/assets/icons/icons-svg/basic/arrow-circle-right.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="29" height="28" viewBox="0 0 29 28" fill="none">
+  <path d="M14.333 24.5C20.132 24.5 24.833 19.799 24.833 14C24.833 8.20101 20.132 3.5 14.333 3.5C8.53402 3.5 3.83301 8.20101 3.83301 14C3.83301 19.799 8.53402 24.5 14.333 24.5Z" stroke="#717582" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M15 17.7076L18.7078 13.9998L15 10.292" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M9.95801 14H18.708" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/icons-svg/basic/global.svg b/src/assets/icons/icons-svg/basic/global.svg
new file mode 100644
index 000000000..7a1fab86e
--- /dev/null
+++ b/src/assets/icons/icons-svg/basic/global.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M7.99992 13.3333C10.9454 13.3333 13.3333 10.9454 13.3333 7.99992C13.3333 5.0544 10.9454 2.66659 7.99992 2.66659C5.0544 2.66659 2.66659 5.0544 2.66659 7.99992C2.66659 10.9454 5.0544 13.3333 7.99992 13.3333ZM7.99992 14.6666C11.6818 14.6666 14.6666 11.6818 14.6666 7.99992C14.6666 4.31802 11.6818 1.33325 7.99992 1.33325C4.31802 1.33325 1.33325 4.31802 1.33325 7.99992C1.33325 11.6818 4.31802 14.6666 7.99992 14.6666Z" fill="#777E91"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M9.16453 12.1177C9.657 11.1327 10.0001 9.67876 10.0001 7.99992C10.0001 6.32108 9.657 4.8671 9.16453 3.88216C8.63219 2.81747 8.14345 2.66659 8.00008 2.66659C7.85671 2.66659 7.36797 2.81747 6.83563 3.88216C6.34316 4.8671 6.00008 6.32108 6.00008 7.99992C6.00008 9.67876 6.34316 11.1327 6.83563 12.1177C7.36797 13.1824 7.85671 13.3333 8.00008 13.3333C8.14345 13.3333 8.63219 13.1824 9.16453 12.1177ZM8.00008 14.6666C9.84103 14.6666 11.3334 11.6818 11.3334 7.99992C11.3334 4.31802 9.84103 1.33325 8.00008 1.33325C6.15913 1.33325 4.66675 4.31802 4.66675 7.99992C4.66675 11.6818 6.15913 14.6666 8.00008 14.6666Z" fill="#777E91"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M14.6337 8.66659C14.6554 8.44731 14.6666 8.22492 14.6666 7.99992C14.6666 7.77492 14.6554 7.55252 14.6337 7.33325H1.36617C1.3444 7.55252 1.33325 7.77492 1.33325 7.99992C1.33325 8.22492 1.3444 8.44731 1.36617 8.66659H14.6337Z" fill="#777E91"/>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/icons-svg/basic/medium.svg b/src/assets/icons/icons-svg/basic/medium.svg
new file mode 100644
index 000000000..b23623508
--- /dev/null
+++ b/src/assets/icons/icons-svg/basic/medium.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.54698 7.99993C8.54698 9.36231 7.44276 10.464 6.08294 10.464C4.72311 10.464 3.6189 9.35975 3.6189 7.99993C3.6189 6.64011 4.72311 5.53589 6.08294 5.53589C7.44276 5.53589 8.54698 6.64011 8.54698 7.99993ZM10.0245 10.2698C10.7134 10.2698 11.2718 9.25357 11.2718 8C11.2718 6.74644 10.7134 5.73022 10.0245 5.73022C9.33556 5.73022 8.7771 6.74644 8.7771 8C8.7771 9.25357 9.33556 10.2698 10.0245 10.2698ZM11.9489 10.0746C12.1892 10.0746 12.3835 9.14677 12.3835 7.9991C12.3835 6.85399 12.1892 5.92358 11.9489 5.92358C11.7087 5.92358 11.5144 6.85143 11.5144 7.9991C11.5144 9.14677 11.7087 10.0746 11.9489 10.0746Z" fill="#777E91"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8 13.8C11.2033 13.8 13.8 11.2033 13.8 8C13.8 4.79675 11.2033 2.2 8 2.2C4.79675 2.2 2.2 4.79675 2.2 8C2.2 11.2033 4.79675 13.8 8 13.8ZM15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8Z" fill="#777E91"/>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/icons-svg/basic/youtube.svg b/src/assets/icons/icons-svg/basic/youtube.svg
new file mode 100644
index 000000000..5e5fb4e05
--- /dev/null
+++ b/src/assets/icons/icons-svg/basic/youtube.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8 4.00008C5.72221 4.00008 3.84905 4.08059 2.54125 4.16157C1.96538 4.19723 1.5115 4.64138 1.46579 5.22773C1.39443 6.14319 1.33333 7.17395 1.33333 8.00008C1.33333 8.82621 1.39443 9.85695 1.46579 10.7724C1.5115 11.3588 1.96538 11.8029 2.54125 11.8386C3.84905 11.9195 5.72221 12.0001 8 12.0001C10.2778 12.0001 12.1509 11.9195 13.4587 11.8386C14.0346 11.8029 14.4885 11.3588 14.5342 10.7724C14.6056 9.85695 14.6667 8.82621 14.6667 8.00008C14.6667 7.17395 14.6056 6.14319 14.5342 5.22773C14.4885 4.64138 14.0346 4.19723 13.4587 4.16157C12.1509 4.08059 10.2778 4.00008 8 4.00008ZM2.45884 2.83079C1.214 2.90787 0.233422 3.88066 0.136491 5.12411C0.0643435 6.04964 0 7.12135 0 8.00008C0 8.87881 0.0643435 9.95055 0.136491 10.8761C0.233422 12.1195 1.214 13.0923 2.45884 13.1693C3.79028 13.2518 5.69115 13.3334 8 13.3334C10.3089 13.3334 12.2097 13.2518 13.5411 13.1693C14.786 13.0923 15.7666 12.1195 15.8635 10.8761C15.9357 9.95055 16 8.87881 16 8.00008C16 7.12135 15.9357 6.04964 15.8635 5.12411C15.7666 3.88066 14.786 2.90787 13.5411 2.83079C12.2097 2.74834 10.3089 2.66675 8 2.66675C5.69115 2.66675 3.79028 2.74834 2.45884 2.83079Z" fill="#777E91"/>
+    <path d="M7.70321 6.02446L9.83475 7.44548C10.2305 7.70935 10.2305 8.29095 9.83475 8.55488L7.70321 9.97582C7.26021 10.2712 6.66675 9.95362 6.66675 9.42115V6.57916C6.66675 6.0467 7.26021 5.72911 7.70321 6.02446Z" fill="#777E91"/>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/icons-svg/white/info.svg b/src/assets/icons/icons-svg/white/info.svg
new file mode 100644
index 000000000..862523546
--- /dev/null
+++ b/src/assets/icons/icons-svg/white/info.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+    <rect width="16" height="16" rx="8" fill="white"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8 3.5C7.44771 3.5 7 3.94772 7 4.5C7 5.05229 7.44771 5.5 8 5.5C8.55229 5.5 9 5.05229 9 4.5C9 3.94772 8.55229 3.5 8 3.5ZM8 7.5C7.44771 7.5 7 7.94772 7 8.5V12.5C7 13.0523 7.44771 13.5 8 13.5C8.55229 13.5 9 13.0523 9 12.5V8.5C9 7.94772 8.55229 7.5 8 7.5Z" fill="black"/>
+</svg>
\ No newline at end of file
diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss
index 12996b467..de8fd648a 100644
--- a/src/assets/scss/custom.scss
+++ b/src/assets/scss/custom.scss
@@ -464,4 +464,29 @@ input:-webkit-autofill:active {
   font-family: var(--font-space-mono);
   font-size: 14px;
   line-height: 18px;
+}
+
+.box-connect-wallet {
+  .divider-vertical {
+    height: 32px;
+  }
+
+  .aura-tooltip-object {
+    background: none;
+  }
+
+  .txt-wallet,
+  .txt-disconnect:hover {
+    text-decoration: underline;
+    text-underline-offset: 2px;
+  }
+
+  .txt-disconnect:hover {
+    color: var(--aura-blue-4);
+  }
+
+  @media (max-width: 992px) {
+    width: 100%;
+    justify-content: space-between;
+  }
 }
\ No newline at end of file