update after version change ui

comdex-official · Nov 22, 2022 · 20966ee · 20966ee
1 parent 777ac08
commit 20966ee
Show file tree

Hide file tree

Showing 7 changed files with 20,754 additions and 38 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "@restart/context": "^2.1.4",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.2.0",
-    "antd": "^4.24.3",
+    "antd": "^5.0.0",
     "babel-plugin-import": "^1.13.0",
     "bignumber.js": "^9.0.2",
     "classnames": "^2.3.2",

diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss
@@ -18,6 +18,8 @@ body {
   font-weight: 300;
   background: $body-background-light !important;
   height: auto !important;
+  margin: 0;
+  padding: 0;
   &.dark-mode {
     background: $primary-gradient !important;
     color: $white;
@@ -1764,3 +1766,17 @@ button {
 ::-webkit-scrollbar-thumb:hover {
   background: rgba(#665aa6, 0.8);
 }
+
+.dropconnect-overlay{
+  padding: 0;
+  background: none !important;
+  .ant-dropdown-menu{
+    padding: 0;
+    background: none !important;
+    .ant-dropdown-menu-item{
+      padding: 0;
+      cursor: default;
+      background: none !important;
+    }
+  }
+}
diff --git a/src/containers/Assets/index.scss b/src/containers/Assets/index.scss
@@ -25,6 +25,7 @@
       margin-bottom: 0;
       font-size: 1.5rem;
       color: $text-color-dark2;
+      margin-top: 0;
       .dark-mode & {
         color: $white;
       }

diff --git a/src/containers/DisConnectModal/index.js b/src/containers/DisConnectModal/index.js
@@ -54,47 +54,48 @@ const DisConnectModal = ({
     );
   };
 
-  const WalletConnectedDropdown = (
-    <div className="wallet-connect-dropdown">
-      <div className="wallet-connect-upper">
-        <span />
-        <div>{localStorage.getItem("loginType") === "ledger" ? "native-ledger" : name}</div>
-      </div>
-      <div className="px-3">
-        <div> {variables[lang].balance_wallet}</div>
-        <div className="balance__value__data">
-          {amountConversionWithComma(
-            getDenomBalance(balances, comdex?.coinMinimalDenom) || 0, DOLLAR_DECIMALS
-          )}{" "}
-          {denomConversion(comdex?.coinMinimalDenom)}
-        </div>
+  const items = [
+    { label: <div className="wallet-connect-dropdown">
+    <div className="wallet-connect-upper">
+      <span />
+      <div>{localStorage.getItem("loginType") === "ledger" ? "native-ledger" : name}</div>
+    </div>
+    <div className="px-3">
+      <div> {variables[lang].balance_wallet}</div>
+      <div className="balance__value__data">
+        {amountConversionWithComma(
+          getDenomBalance(balances, comdex?.coinMinimalDenom) || 0, DOLLAR_DECIMALS
+        )}{" "}
+        {denomConversion(comdex?.coinMinimalDenom)}
       </div>
-      <div className="mt-2 px-3">
-        <div>{variables[lang].address_wallet} </div>
-        <div className="wallet-address">
-          <div className="address-wallet-address d-flex">
-            <span className="mr-3"> {truncateString(address, 6, 6)} </span>{" "}
-            <Copy text={address} />
-          </div>
+    </div>
+    <div className="mt-2 px-3">
+      <div>{variables[lang].address_wallet} </div>
+      <div className="wallet-address">
+        <div className="address-wallet-address d-flex">
+          <span className="mr-3"> {truncateString(address, 6, 6)} </span>{" "}
+          <Copy text={address} />
         </div>
       </div>
-      <div className="mb-2 mt-3">
-        <Button
-          type="primary"
-          onClick={showModal}
-          className="btn-filled"
-          block
-          size="small"
-        >
-          {variables[lang].disconnect}
-        </Button>
-      </div>
     </div>
-  );
+    <div className="mb-2 mt-3">
+      <Button
+        type="primary"
+        onClick={showModal}
+        className="btn-filled"
+        block
+        size="small"
+      >
+        {variables[lang].disconnect}
+      </Button>
+    </div>
+  </div>, 
+  key: 'item-1' }
+  ]
 
   return (
     <>
-      <Dropdown overlay={WalletConnectedDropdown} trigger={["click"]}>
+      <Dropdown menu={{ items }} trigger={["click"]} overlayClassName="dropconnect-overlay">
         <div className="connected_button">
           {" "}
           <SvgIcon name="wallet" />  {truncateString(address, 6, 6)}

diff --git a/src/containers/Modal/index.js b/src/containers/Modal/index.js
@@ -1,5 +1,4 @@
 import "./index.scss";
-import "antd/dist/antd.css";
 import * as PropTypes from "prop-types";
 import { Spin, message } from "antd";
 import { connect } from "react-redux";

diff --git a/src/containers/NavigationBar/ConnectButton.js b/src/containers/NavigationBar/ConnectButton.js
@@ -166,7 +166,9 @@ const ConnectButton = ({
     });
   };
 
-  const WalletConnectedDropdown = <ConnectModal />;
+  const items =  [
+    { label: <ConnectModal />, key: 'item-1' }
+  ];
 
   return (
     <>
@@ -177,9 +179,10 @@ const ConnectButton = ({
       ) : (
         <div>
           <Dropdown
-            overlay={WalletConnectedDropdown}
+            menu={{ items }}
             placement="bottomRight"
             trigger={["click"]}
+            overlayClassName="dropconnect-overlay"
           >
             <Button shape="round" type="primary">
               {variables[lang].connect}