Merge branch 'liquidity-onboarding' into feature/basic-skip-bridge-tr…

…ansfer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mars-v2-frontend",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "homepage": "./",
   "private": false,
   "license": "SEE LICENSE IN LICENSE FILE",

src/components/common/Table/Row.tsx

@@ -1,8 +1,6 @@
 import { flexRender, Row as TanstackRow, Table as TanstackTable } from '@tanstack/react-table'
 import classNames from 'classnames'
-import { Tooltip } from 'components/common/Tooltip'
 import { ReactElement } from 'react'
-
 import { LEFT_ALIGNED_ROWS } from 'constants/table'
 
 interface Props<T> {

src/components/common/Text.tsx

@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import { ElementType, ReactNode } from 'react'
+import { Component, ElementType, ReactNode } from 'react'
 
 interface Props {
   children: ReactNode | string
@@ -19,7 +19,6 @@ export default function Text(props: Props) {
 
   const tagIndex = headlines.indexOf(tag)
   const sizeClass = tagIndex > -1 ? headMap[tagIndex] : size
-  const Component = tag as ElementType
 
   return (
     <Component

yarn.lock

@@ -4060,6 +4060,7 @@
   resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11"
   integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==
 
+<<<<<<< HEAD
 "@types/uuid@^8.3.4":
   version "8.3.4"
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
@@ -4079,6 +4080,8 @@
   dependencies:
     "@types/node" "*"
 
+=======
+>>>>>>> liquidity-onboarding
 "@typescript-eslint/eslint-plugin@8.18.1", "@typescript-eslint/eslint-plugin@^8.18.1":
   version "8.18.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.1.tgz#992e5ac1553ce20d0d46aa6eccd79dc36dedc805"
@@ -4141,6 +4144,7 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.18.1.tgz#d7f4f94d0bba9ebd088de840266fcd45408a8fff"
   integrity sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==
 
+<<<<<<< HEAD
 "@typescript-eslint/typescript-estree@8.12.1":
   version "8.12.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.1.tgz#70ea0e0cf038017edd945c2b2bd568c4c81062eb"
@@ -4155,6 +4159,8 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
+=======
+>>>>>>> liquidity-onboarding
 "@typescript-eslint/typescript-estree@8.18.1":
   version "8.18.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz#2a86cd64b211a742f78dfa7e6f4860413475367e"
@@ -4180,6 +4186,7 @@
     "@typescript-eslint/typescript-estree" "8.18.1"
 
 "@typescript-eslint/utils@^8.10.0":
+<<<<<<< HEAD
   version "8.12.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.12.1.tgz#937e49cf1f9696afa9e78d6e652c6fca76e821b0"
   integrity sha512-sDv9yFHrhKe1WN8EYuzfhKCh/sFRupe9P+m/lZ5YgVvPoCUGHNN50IO4llSu7JAbftUM/QcCh+GeCortXPrBYQ==
@@ -4190,12 +4197,16 @@
     "@typescript-eslint/typescript-estree" "8.12.1"
 
 "@typescript-eslint/visitor-keys@8.12.1":
+=======
+>>>>>>> liquidity-onboarding
   version "8.12.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.1.tgz#d21e3c85732c4857aca9663abfade596b3f0f00d"
-  integrity sha512-2RwdwnNGuOQKdGjuhujQHUqBZhEuodg2sLVPvOfWktvA9sOXOVqARjOyHSyhN2LiJGKxV6c8oOcmOtRcAnEeFw==
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.12.1.tgz#937e49cf1f9696afa9e78d6e652c6fca76e821b0"
+  integrity sha512-sDv9yFHrhKe1WN8EYuzfhKCh/sFRupe9P+m/lZ5YgVvPoCUGHNN50IO4llSu7JAbftUM/QcCh+GeCortXPrBYQ==
   dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "8.12.1"
     "@typescript-eslint/types" "8.12.1"
-    eslint-visitor-keys "^3.4.3"
+    "@typescript-eslint/typescript-estree" "8.12.1"
 
 "@typescript-eslint/visitor-keys@8.18.1":
   version "8.18.1"