diff --git a/src/app/(investment)/deals/[id]/page.tsx b/src/app/(investment)/deals/[id]/page.tsx
index 9001daa..a84ee65 100644
--- a/src/app/(investment)/deals/[id]/page.tsx
+++ b/src/app/(investment)/deals/[id]/page.tsx
@@ -14,6 +14,7 @@ import FollowShareButtons from "./followShareButton";
 
 import { getProjectData } from "@/lib/data/projectQuery";
 import { getDealList } from "@/app/api/dealApi";
+import { sumByKey, toPercentage } from "@/lib/utils";
 
 export default async function ProjectDealPage({ params }: { params: { id: number } }) {
   const supabase = createSupabaseClient();
@@ -28,13 +29,13 @@ export default async function ProjectDealPage({ params }: { params: { id: number
     return <div>Error</div>;
   }
 
-  console.log(projectData);
-
   const projectBusinessOwnerId = projectData.user_id;
-  // console.log(projectBusinessOwnerId);
-  const dealData = await getDealList(projectBusinessOwnerId);
-  // console.log(dealData);
-
+  const dealList = await getDealList(projectBusinessOwnerId);
+  const totalDealAmount = sumByKey(dealList, "deal_amount");
+  // timeDiff, if negative convert to zero
+  const timeDiff = Math.max((new Date(projectData.investment_deadline)).getTime() - new Date().getTime(), 0)
+  const hourLeft = Math.floor(timeDiff / (1000 * 60 * 60));
+  console.log(hourLeft)
   const carouselData = [
     { src: "/boiler1.jpg", alt: "Boiler 1" },
     { src: "/boiler1.jpg", alt: "Boiler 1" },
@@ -95,27 +96,33 @@ export default async function ProjectDealPage({ params }: { params: { id: number
               <div className="pl-5">
                 <span>
                   {/* #TODO use sum() instead of storing total in database */}
-                  <h1 className="font-semibold text-xl md:text-4xl mt-8">${projectData?.total_investment}</h1>
+                  <h1 className="font-semibold text-xl md:text-4xl mt-8">${totalDealAmount}</h1>
                   <p className="text-sm md:text-lg">
-                    {projectData?.total_investment / projectData?.target_investment}%
+                    {toPercentage(totalDealAmount, projectData?.target_investment)}%
                     raised of ${projectData?.target_investment} max goal
                   </p>
                   <Progress
-                    value={projectData?.total_investment / projectData?.target_investment}
+                    value={toPercentage(totalDealAmount, projectData?.target_investment)}
                     className="w-[60%] h-3 mt-3"
                   />
                 </span>
                 <span>
                   <h1 className="font-semibold text-4xl md:mt-8">
-                    <p className="text-xl md:text-4xl">{dealData ? dealData.length: 0}</p>
+                    <p className="text-xl md:text-4xl">{dealList.length}</p>
                   </h1>
                   <p className="text-sm md:text-lg">Investors</p>
                 </span>
                 <Separator decorative className="mt-3 w-3/4 ml-5" />
                 <span>
                   <h1 className="font-semibold text-xl md:text-4xl mt-8 ml-5"></h1>
-                  <p className="text-xl md:text-4xl">1 hours</p>
-                  <p>Left to invest</p>
+                    {projectData?.investment_deadline ? (
+                      <>
+                        <p className="text-xl md:text-4xl">{Math.floor(hourLeft)} hours</p>
+                        <p>Left to invest</p>
+                      </>
+                    ) : (
+                      <p className="text-xl md:text-4xl">No deadline</p>
+                  )}
                 </span>
                 <Button className="mt-5 w-3/4 h-12">
                   <Link href={`/invest/${params.id}`}>Invest in {projectData?.project_name}</Link>
diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index 5216a19..68a471b 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -24,13 +24,6 @@ export default function Dashboard() {
 
   return (
     <>
-      {/* {dealList?.map((deal, index) => (
-        <div key={index} className="deal-item">
-          <p>Deal Amount: {deal.deal_amount}</p>
-          <p>Created Time: {new Date(deal.created_time).toUTCString()}</p>
-          <p>Investor ID: {deal.investor_id}</p>
-        </div>
-      ))} */}
       <div className="md:hidden">
         <Image
           src="/examples/dashboard-light.png"
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index a6761ea..812d222 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -25,4 +25,9 @@ export function sumByKey(list: any[], key: string) {
   // const totalAmount = sumByKey(items, 'amount');
   // console.log(totalAmount); // Output: 100
   return list.reduce((total, obj) => total + (obj[key] || 0), 0);
+}
+
+export function toPercentage(part: number, total: number): number {
+  if (total === 0) return 0; // Prevent division by zero
+  return Number(((part * 100) / total).toFixed(2));
 }
\ No newline at end of file