Merge branch 'dev' into fixing-beta-v2

1Hive · Nov 15, 2024 · f4e2c78 · f4e2c78
2 parents 522a606 + 164a26b
commit f4e2c78
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 32 deletions.
diff --git a/apps/web/components/ProposalCard.tsx b/apps/web/components/ProposalCard.tsx
@@ -256,7 +256,7 @@ export function ProposalCard({
                               </span>
                               /{memberPoolWeight}%{" "}
                               <span className="text-neutral-soft-content text-sm">
-                                ({inputValue}% of your total support)
+                                ({inputValue}% of your voting weight)
                               </span>
                             </p>
                             {/* <p className="text-primary-content">Support</p> */}

diff --git a/apps/web/components/Proposals.tsx b/apps/web/components/Proposals.tsx
@@ -416,13 +416,6 @@ export function Proposals({
     {
       id: 2,
       name: "Voting weight used",
-      stat: calcPoolWeightUsed(memberSupportedProposalsPct),
-      className: poolWeightClassName,
-      info: "Indicates the portion of your pool weight currently allocated in proposals.",
-    },
-    {
-      id: 3,
-      name: "Total support",
       stat: memberSupportedProposalsPct,
       className: `${
         memberSupportedProposalsPct >= 100 ?
@@ -602,34 +595,28 @@ function UserAllocationStats({ stats }: { stats: Stats[] }) {
   return (
     <div className="mt-10">
       <h3>Support Overview</h3>
-      <div className="mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3">
+      <div className="mt-5 grid grid-cols-1 gap-10 sm:grid-cols-2 lg:grid-cols-2">
         {stats.map((stat) => (
-          <div
-            key={`stat_${stat.id}`}
-            className="section-layout sm:px-6 sm:pt-6"
-          >
-            <div>
-              <div
-                className={`radial-progress absolute rounded-full border-4 border-neutral transition-all duration-300 ease-in-out ${stat.className}`}
-                style={{
-                  // @ts-ignore
-                  "--value": stat.stat,
-                  "--size": "4rem",
-                  "--thickness": "0.35rem",
-                }}
-                role="progressbar"
-              >
-                <span className="text-xs">{stat.stat} %</span>
-              </div>
-
+          <div key={`stat_${stat.id}`} className="section-layout flex gap-4">
+            <div
+              className={`radial-progress rounded-full border-4 border-neutral transition-all duration-300 ease-in-out ${stat.className}`}
+              style={{
+                // @ts-ignore
+                "--value": stat.stat,
+                "--size": "4.2rem",
+                "--thickness": "0.35rem",
+              }}
+              role="progressbar"
+            >
+              <span className="text-xs">{stat.stat} %</span>
+            </div>
+            <div className="flex flex-col items-start justify-center">
               <InfoWrapper tooltip={stat.info}>
-                <p className="ml-20">
+                <h5>
                   <TooltipIfOverflow>{stat.name}</TooltipIfOverflow>
-                </p>
+                </h5>
               </InfoWrapper>
-            </div>
-            <div className="ml-20">
-              <p className="text-2xl font-semibold">{stat.stat} %</p>
+              <p className="text-2xl font-semibold text-right">{stat.stat} %</p>
             </div>
           </div>
         ))}