Merge pull request #11 from web3wagers/feat/10

Allow to donate once the goal reach, and validate progress bar
undefinedorgcr · Dec 21, 2024 · 4e229bd · 4e229bd
2 parents 04405d0 + 6d71356
commit 4e229bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/utils/index.ts b/app/utils/index.ts
@@ -7,5 +7,8 @@ export default function hex2ascii(hexx: string) {
 }
 
 export function calculatePorcentage(qty: number, goal: number): number {
+  if( qty >= goal ){
+    return 100;
+  }
   return (Number(qty) / Number(goal)) * 100;
 }
diff --git a/components/modules/Fund/Fund.tsx b/components/modules/Fund/Fund.tsx
@@ -108,7 +108,7 @@ const Fund = () => {
               voted={fund.voted}
             />
           )}
-          {Number(fund.state) === 2 && (
+          {Number(fund.state) === 2 || Number(fund.state) === 3 &&  !isOwner && (
             <>
               <FundDonate
                 currentBalance={fund.currentBalance}
@@ -128,11 +128,11 @@ const Fund = () => {
               getDetails={getDetails}
             />
           )}
-          {Number(fund.state) === 3 && !isOwner && (
+          {/* {Number(fund.state) === 3 && !isOwner && (
             <p className="mt-10 self-center text-xl text-gray-500">
               The goal has been reached and funds are ready to be withdrawn by the owner.
             </p>
-          )}
+          )} */}
           {Number(fund.state) === 4 && <p>Fund was already withdrawn.</p>}
         </section>
       )}