Merge pull request #362 from zkLinkProtocol/fix/epoch3-issue

fix epoch3 issue
zkLinkProtocol · Sep 3, 2024 · fa29c49 · fa29c49
2 parents de53cc8 + 5892a52
commit fa29c49
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 31 deletions.
diff --git a/public/img/icon-sector-1.svg b/public/img/icon-sector-1.svg
diff --git a/public/img/icon-sector-assets.svg b/public/img/icon-sector-assets.svg
diff --git a/public/img/icon-sector-2.svg → public/img/icon-sector-boosted.svg b/public/img/icon-sector-2.svg → public/img/icon-sector-boosted.svg
diff --git a/public/img/icon-sector-5.svg → public/img/icon-sector-gamefi.svg b/public/img/icon-sector-5.svg → public/img/icon-sector-gamefi.svg
diff --git a/public/img/icon-sector-4.svg → public/img/icon-sector-lending.svg b/public/img/icon-sector-4.svg → public/img/icon-sector-lending.svg
diff --git a/public/img/icon-sector-6.svg → public/img/icon-sector-other.svg b/public/img/icon-sector-6.svg → public/img/icon-sector-other.svg
diff --git a/public/img/icon-sector-perpdex.svg b/public/img/icon-sector-perpdex.svg
diff --git a/public/img/icon-sector-7.svg → public/img/icon-sector-portfolio.svg b/public/img/icon-sector-7.svg → public/img/icon-sector-portfolio.svg
diff --git a/public/img/icon-sector-3.svg → public/img/icon-sector-spotdex.svg b/public/img/icon-sector-3.svg → public/img/icon-sector-spotdex.svg
diff --git a/src/components/DashboardS2/Tabs/Protfolio.tsx b/src/components/DashboardS2/Tabs/Protfolio.tsx
@@ -541,7 +541,7 @@ export default function Portfolio({
                 }}
                 content={
                   <div>
-                    {epochActive === 0 && (
+                    {epochActive !== epochList.length - 1 && (
                       <div>
                         <>
                           <div className="mb-[16px] text-[14px] font-[700]">

diff --git a/src/pages/DashboardS2/index2.tsx b/src/pages/DashboardS2/index2.tsx
@@ -282,37 +282,37 @@ export default function Dashboard() {
 
   const tabs2 = [
     {
-      iconURL: "/img/icon-sector-1.svg",
+      iconURL: "/img/icon-sector-assets.svg",
       name: "Assets",
       category: "holding",
     },
     {
-      iconURL: "/img/icon-sector-2.svg",
+      iconURL: "/img/icon-sector-boosted.svg",
       name: "Boosted",
       category: "nativeboost",
     },
     {
-      iconURL: "/img/icon-sector-3.svg",
+      iconURL: "/img/icon-sector-spotdex.svg",
       name: "Spot DEX",
       category: "spotdex",
     },
     {
-      iconURL: "/img/icon-sector-4.svg",
+      iconURL: "/img/icon-sector-perpdex.svg",
       name: "Perp DEX",
       category: "perpdex",
     },
     {
-      iconURL: "/img/icon-sector-5.svg",
-      name: "Lending",
+      iconURL: "/img/icon-sector-lending.svg",
+      name: "Lending & Staking",
       category: "lending",
     },
     // {
-    //   iconURL: "/img/icon-sector-6.svg",
+    //   iconURL: "/img/icon-sector-gamefi.svg",
     //   name: "GameFi",
     //   category: "gamefi",
     // },
     {
-      iconURL: "/img/icon-sector-7.svg",
+      iconURL: "/img/icon-sector-other.svg",
       name: "Others",
       category: "other",
     },
@@ -638,9 +638,7 @@ export default function Dashboard() {
   return (
     <Container>
       <div className="side fixed right-[8px] md:right-[32px] top-[120px] z-[9] max-w-[350px] md:max-w-[392px] w-full md:w-[392px]">
-        <ZKLClaimAd />
         <MysteryBoxIII />
-        {/* <GoogleRecaptcha /> */}
       </div>
 
       <div className="mt-[29.6px] mx-auto max-w-[1246px] hidden md:block">
@@ -658,9 +656,9 @@ export default function Dashboard() {
             </div>
 
             <div className="desc whitespace-nowrap">
-              <div className="mt-[12px]">
-                The 30 million $ZKL will be distributed over at least Three
-                Epochs.
+              <div className="mt-[12px] max-w-[400px] whitespace-normal">
+                The 30 million $ZKL will be distributed by epoches, based on
+                milestone achievement.
               </div>
               <div className="mt-[12px] before">
                 Epoch One (From May 30th to July 15th)
@@ -768,7 +766,7 @@ export default function Dashboard() {
                 onClick={() => setTabs2Active(99)}
               >
                 <img
-                  src={"/img/icon-sector-1.svg"}
+                  src={"/img/icon-sector-portfolio.svg"}
                   alt=""
                   className="w-[24px] h-[24px] block"
                 />

diff --git a/src/pages/Leaderboard/index.tsx b/src/pages/Leaderboard/index.tsx
@@ -479,66 +479,70 @@ export default function Leaderboard() {
           {
             name: "Holding",
             category: "holding",
-            iconURL: "/img/icon-sector-1.svg",
+            iconURL: "/img/icon-sector-assets.svg",
           },
           {
             name: "Boosted",
             category: "nativeboost",
-            iconURL: "/img/icon-sector-2.svg",
+            iconURL: "/img/icon-sector-boosted.svg",
           },
           {
             name: "Spot DEX",
             category: "spotdex",
-            iconURL: "/img/icon-sector-3.svg",
+            iconURL: "/img/icon-sector-spotdex.svg",
           },
           {
             name: "Perp DEX",
             category: "perpdex",
-            iconURL: "/img/icon-sector-4.svg",
+            iconURL: "/img/icon-sector-perpdex.svg",
           },
           {
             name: "Lending",
             category: "lending",
-            iconURL: "/img/icon-sector-5.svg",
+            iconURL: "/img/icon-sector-lending.svg",
           },
           // { name: "GameFi", category: "gamefi" },
           {
             name: "Other",
             category: "other",
-            iconURL: "/img/icon-sector-7.svg",
+            iconURL: "/img/icon-sector-other.svg",
           },
         ]
       : [
           {
             name: "Holding",
             category: "holding",
-            iconURL: "/img/icon-sector-1.svg",
+            iconURL: "/img/icon-sector-assets.svg",
           },
           {
             name: "Boosted",
             category: "nativeboost",
-            iconURL: "/img/icon-sector-2.svg",
+            iconURL: "/img/icon-sector-boosted.svg",
           },
           {
             name: "Spot DEX",
             category: "spotdex",
-            iconURL: "/img/icon-sector-3.svg",
+            iconURL: "/img/icon-sector-spotdex.svg",
           },
           {
             name: "Perp DEX",
             category: "perpdex",
-            iconURL: "/img/icon-sector-4.svg",
+            iconURL: "/img/icon-sector-perpdex.svg",
           },
           {
             name: "Lending",
             category: "lending",
-            iconURL: "/img/icon-sector-5.svg",
+            iconURL: "/img/icon-sector-lending.svg",
+          },
+          {
+            name: "GameFi",
+            category: "gamefi",
+            iconURL: "/img/icon-sector-gamefi.svg",
           },
-          { name: "GameFi", category: "gamefi" },
           {
             name: "Other",
             category: "other",
-            iconURL: "/img/icon-sector-7.svg",
+            iconURL: "/img/icon-sector-other.svg",
           },
         ];
   }, [epochActive]);