From 793cd2cabd601d882ab0eb5428ad67cb58cdf4ee Mon Sep 17 00:00:00 2001
From: Cesar <cesarbrazon10@gmail.com>
Date: Tue, 20 Feb 2024 16:37:18 +0100
Subject: [PATCH 1/6] rollback: progress bar init

---
 web/components/RealtimeLogs.tsx  |  8 ++----
 web/components/TimeRemaining.tsx |  2 +-
 web/hooks/useProgressTime.ts     | 46 +++++++++++---------------------
 web/utils/logs.ts                |  8 +++---
 4 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/web/components/RealtimeLogs.tsx b/web/components/RealtimeLogs.tsx
index 4d7be4f..56df573 100644
--- a/web/components/RealtimeLogs.tsx
+++ b/web/components/RealtimeLogs.tsx
@@ -51,8 +51,7 @@ export default function RealtimeLogs(props: {
   });
   const progressInformation = useProgressTime(
     Object.values(STEP_TIME_ESTS),
-    sortedLogsWithSteps,
-    props.run.prompt
+    sortedLogsWithSteps
   );
 
   const supabase = createSupabaseBrowserClient(
@@ -78,10 +77,7 @@ export default function RealtimeLogs(props: {
             return;
           }
 
-          if (
-            payload.new.step_name === "SYNTHESIZE_RESULTS" &&
-            payload.new.status === "COMPLETED"
-          ) {
+          if (payload.new.status === "COMPLETED") {
             router.refresh();
           }
         }
diff --git a/web/components/TimeRemaining.tsx b/web/components/TimeRemaining.tsx
index 363fff7..3e57ce4 100644
--- a/web/components/TimeRemaining.tsx
+++ b/web/components/TimeRemaining.tsx
@@ -16,7 +16,7 @@ function formatTime(seconds: number) {
   const roundedSeconds = Math.round(seconds);
   const minutes = Math.floor(roundedSeconds / 60);
   const secs = roundedSeconds % 60;
-  const timeRemaining = seconds ? `${minutes}:${secs.toString().padStart(2, "0")}` : "1:40" 
+  const timeRemaining = seconds ? `${minutes}:${secs.toString().padStart(2, "0")}` : "1:10" 
   return `Estimated time: ~${timeRemaining}`
 }
 
diff --git a/web/hooks/useProgressTime.ts b/web/hooks/useProgressTime.ts
index 9e4c5b5..643941d 100644
--- a/web/hooks/useProgressTime.ts
+++ b/web/hooks/useProgressTime.ts
@@ -1,11 +1,9 @@
 import { Tables } from "@/supabase/dbTypes";
-import { COMPLETED_TEXTS } from "@/utils/logs";
 import { useState, useEffect } from "react";
 
 export function useProgressTime(
   stepTimes: number[],
-  logs: Array<Tables<"logs">>,
-  prompt: string,
+  logs: Array<Tables<"logs">>
 ) {
   const [startTime] = useState(Date.now());
   const [progressInformation, setProgressInformation] = useState({
@@ -20,44 +18,28 @@ export function useProgressTime(
 
     const intervalId = setInterval(function () {
       const now = Date.now();
-      const secondsFromStart = (now - startTime) / 1000; // Convert ms to seconds
       let currentStep = progressInformation.logs.findIndex(
         (x) => x.status === "IN_PROGRESS"
       );
+
+      if (currentStep === -1) {
+        return;
+      }
+
       const elapsedTimeInSteps = stepTimes
         .slice(0, currentStep + 1)
         .reduce((a, b) => a + b, 0);
 
-      const timeRemaining = Math.max(totalTime - secondsFromStart, 0);
-
-      const progress = (secondsFromStart / totalTime) * 100;
-      if (timeRemaining <= 1) {
-        clearInterval(intervalId);
+      const secondsFromStart = (now - startTime) / 1000; // Convert ms to seconds
+      if (secondsFromStart > elapsedTimeInSteps) {
         return;
       }
 
-      if (
-        secondsFromStart > elapsedTimeInSteps &&
-        stepTimes.length > currentStep &&
-        currentStep !== -1
-      ) {
-        setProgressInformation(({ logs }) => {
-          const newLogs = [...logs];
-          newLogs[currentStep].status = "COMPLETED";
-          newLogs[currentStep].value = COMPLETED_TEXTS[newLogs[currentStep].step_name]
-          if (currentStep === 0) {
-            newLogs[currentStep].value += " to " + prompt
-          }
+      const timeRemaining = Math.max(totalTime - secondsFromStart, 0);
+      const progress = (secondsFromStart / totalTime) * 100;
 
-          if (stepTimes.length > currentStep + 1) {
-            newLogs[currentStep + 1].status = "IN_PROGRESS";
-          }
-          return {
-            time: timeRemaining,
-            progress: progress,
-            logs: newLogs,
-          };
-        });
+      if (timeRemaining <= 1) {
+        clearInterval(intervalId);
         return;
       }
 
@@ -66,9 +48,11 @@ export function useProgressTime(
         time: timeRemaining,
         progress: progress,
       }));
+
+      console.log(currentStep);
     }, 1000);
     return () => clearInterval(intervalId);
-  }, [stepTimes]);
+  }, [stepTimes, progressInformation]);
 
   return progressInformation;
 }
diff --git a/web/utils/logs.ts b/web/utils/logs.ts
index bc30b1c..1ca4e01 100644
--- a/web/utils/logs.ts
+++ b/web/utils/logs.ts
@@ -48,8 +48,8 @@ export const STEPS_ORDER: Record<StepName, number> = {
 }
 
 export const STEP_TIME_ESTS: Record<StepName, number> = {
-  FETCH_PROJECTS: 30,
-  EVALUATE_PROJECTS: 30,
-  ANALYZE_FUNDING: 30,
-  SYNTHESIZE_RESULTS: 10
+  FETCH_PROJECTS: 35,
+  EVALUATE_PROJECTS: 15,
+  ANALYZE_FUNDING: 5,
+  SYNTHESIZE_RESULTS: 15
 }
\ No newline at end of file

From debee0050cada46496b63df1ea3979ffe7b736fc Mon Sep 17 00:00:00 2001
From: nerfZael <bogunovij@gmail.com>
Date: Tue, 20 Feb 2024 18:31:38 +0100
Subject: [PATCH 2/6] error fixing

---
 web/components/Button.tsx        |  1 +
 web/components/Strategy.tsx      |  2 +-
 web/components/StrategyTable.tsx | 14 ++++++++++---
 web/hooks/useDonation.ts         | 34 ++++++++++++++++++++------------
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/web/components/Button.tsx b/web/components/Button.tsx
index 62feeee..37857f5 100644
--- a/web/components/Button.tsx
+++ b/web/components/Button.tsx
@@ -42,6 +42,7 @@ const Button = ({
   return (
     <Popover className='relative'>
       <Popover.Button
+        disabled={disabled}
         className={clsx(
           "text-shadow-md relative inline-flex items-center justify-center space-x-2 rounded-full border-2 transition-all duration-500",
           hierarchyClasses[hierarchy],
diff --git a/web/components/Strategy.tsx b/web/components/Strategy.tsx
index dceff82..2df0c40 100644
--- a/web/components/Strategy.tsx
+++ b/web/components/Strategy.tsx
@@ -253,7 +253,7 @@ export default function Strategy(props: {
                     </div>
                     <Button
                       disabled={
-                        selectedStrategiesLength === 0 || amount === "0" || amount === ""
+                        selectedStrategiesLength === 0 || amount === "0" || amount === "" || isTransactionPending
                       }
                       onClick={executeTransaction}>
                       {isTransactionPending ? (
diff --git a/web/components/StrategyTable.tsx b/web/components/StrategyTable.tsx
index 0812471..440c95e 100644
--- a/web/components/StrategyTable.tsx
+++ b/web/components/StrategyTable.tsx
@@ -52,6 +52,12 @@ const InputWithTooltip = forwardRef(
   )
 );
 
+declare global {
+  interface Window {
+    getSelection: () => Selection | null;
+  }
+}
+
 function WeightInput({
   selected,
   index,
@@ -106,7 +112,10 @@ export function StrategyTable(props: StrategiesHandler & { network: NetworkName
     .filter((s) => !s.disabled)
     .some((s) => s.selected);
 
-  function openProjectDetails(strategy: StrategyInformation) {
+  function openProjectDetails(strategy: StrategyInformation){
+    // Do not open the project details if the user is trying to select the project
+    if (window.getSelection()?.type === "Range") return;
+
     setShowStrategyDetails({
       show: true,
       strategy,
@@ -155,7 +164,6 @@ export function StrategyTable(props: StrategiesHandler & { network: NetworkName
     );
   };
 
-
   return (
     <>
       <div className='space-y-2'>
@@ -188,7 +196,7 @@ export function StrategyTable(props: StrategiesHandler & { network: NetworkName
               className={clsx(
                 "bg-indigo-50 border-2 border-indigo-300 hover:bg-white transition-colors duration-200 w-full rounded-2xl shadow-sm hover:shadow-lg shadow-primary-shadow/20 p-4 col-span-12 space-y-3 cursor-pointer"
               )}
-              onClick={() => openProjectDetails(entry)}>
+              onClick={(e) => openProjectDetails(entry)}>
               <div className='grid gap-4 grid-cols-12'>
                 <div className='flex space-x-4 items-center w-full col-span-12 md:col-span-6'>
                   <div
diff --git a/web/hooks/useDonation.ts b/web/hooks/useDonation.ts
index 4b2b7b6..fce7d97 100644
--- a/web/hooks/useDonation.ts
+++ b/web/hooks/useDonation.ts
@@ -38,6 +38,8 @@ export function useDonation() {
     setIsTransactionPending(true);
 
     const { network: selectedNetwork, token: selectedToken, donations } = plan;
+    const filteredDonations = donations.filter((d) => Number(d.amount) > 0);
+
     const token = getTokensForNetwork(selectedNetwork).find(
       (t) => t.name == selectedToken.name
     );
@@ -45,11 +47,11 @@ export function useDonation() {
     if (!token) {
       throw new Error(`Token with name: ${selectedToken} is not valid`);
     }
-    const amounts = donations.map((d) => Number(d.amount));
+    const amounts = filteredDonations.map((d) => Number(d.amount));
     console.log(plan, amounts, signer, token);
     try {
       await splitTransferFunds(
-        donations.map((d) => d.recipient),
+        filteredDonations.map((d) => d.recipient),
         amounts,
         signer,
         selectedNetwork,
@@ -97,17 +99,23 @@ export function useDonation() {
     amount: string,
     network: NetworkName
   ) => {
-    const ethersProvider = new ethers.providers.Web3Provider(
-      wallet.provider,
-      "any"
-    );
-    const signer = ethersProvider.getSigner();
-    const tokenContract = new ethers.Contract(token.address, ERC20_ABI, signer);
-
-    const contractAddress = DISPERSE_CONTRACT_ADDRESSES[network];
-    const amountInDecimals = ethers.utils.parseUnits(amount.toString(), token.decimals);
-    const approveTx = await tokenContract.approve(contractAddress, amountInDecimals);
-    await approveTx.wait(1);
+    setIsTransactionPending(true);
+   
+    try {
+      const ethersProvider = new ethers.providers.Web3Provider(
+        wallet.provider,
+        "any"
+      );
+      const signer = ethersProvider.getSigner();
+      const tokenContract = new ethers.Contract(token.address, ERC20_ABI, signer);
+  
+      const contractAddress = DISPERSE_CONTRACT_ADDRESSES[network];
+      const amountInDecimals = ethers.utils.parseUnits(amount.toString(), token.decimals);
+      const approveTx = await tokenContract.approve(contractAddress, amountInDecimals);
+      await approveTx.wait(1);
+    } finally {
+      setIsTransactionPending(false);
+    }
   };
 
   return {

From 736d1df45b6a67939c9548510f16ad8a17791863 Mon Sep 17 00:00:00 2001
From: Cesar <cesarbrazon10@gmail.com>
Date: Tue, 20 Feb 2024 19:00:23 +0100
Subject: [PATCH 3/6] chore: progress bar attached to backend

---
 web/components/RealtimeLogs.tsx |  6 +----
 web/hooks/useProgressTime.ts    | 48 ++++++++++++++++++---------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/web/components/RealtimeLogs.tsx b/web/components/RealtimeLogs.tsx
index 56df573..d0259fe 100644
--- a/web/components/RealtimeLogs.tsx
+++ b/web/components/RealtimeLogs.tsx
@@ -72,14 +72,10 @@ export default function RealtimeLogs(props: {
         },
         (payload) => {
           if (payload.new.status === "ERRORED") {
-            router.refresh();
             setHasErrored(true);
-            return;
           }
 
-          if (payload.new.status === "COMPLETED") {
-            router.refresh();
-          }
+          router.refresh();
         }
       )
       .subscribe();
diff --git a/web/hooks/useProgressTime.ts b/web/hooks/useProgressTime.ts
index 643941d..e259ba2 100644
--- a/web/hooks/useProgressTime.ts
+++ b/web/hooks/useProgressTime.ts
@@ -5,42 +5,49 @@ export function useProgressTime(
   stepTimes: number[],
   logs: Array<Tables<"logs">>
 ) {
-  const [startTime] = useState(Date.now());
+  const [startTime, setStartTime] = useState(Date.now());
+  const [, setHasReachedTime] = useState(false)
   const [progressInformation, setProgressInformation] = useState({
-    logs,
     time: 0,
     progress: 0,
   });
 
-  // Capture the start time when the hook is first called or when stepTimes or currentStep changes
+  const totalTime = stepTimes.reduce((a, b) => a + b, 0);
+  let currentStep = logs.findIndex(
+    (x) => x.status === "IN_PROGRESS"
+  );
+
   useEffect(() => {
-    const totalTime = stepTimes.reduce((a, b) => a + b, 0);
+    setStartTime(Date.now())
+    setHasReachedTime((reached) => {
+      if (reached) {
+        return false
+      }
+      return reached
+    })
+  }, [currentStep])
 
+  useEffect(() => {
     const intervalId = setInterval(function () {
       const now = Date.now();
-      let currentStep = progressInformation.logs.findIndex(
-        (x) => x.status === "IN_PROGRESS"
-      );
+      const elapsedTimeSinceStart = (now - startTime) / 1000; // Convert ms to seconds
 
-      if (currentStep === -1) {
-        return;
+      if (elapsedTimeSinceStart > stepTimes[currentStep]) {
+        setHasReachedTime(true)
+        return
       }
 
       const elapsedTimeInSteps = stepTimes
-        .slice(0, currentStep + 1)
+        .slice(0, currentStep)
         .reduce((a, b) => a + b, 0);
 
-      const secondsFromStart = (now - startTime) / 1000; // Convert ms to seconds
-      if (secondsFromStart > elapsedTimeInSteps) {
-        return;
-      }
+      const totalElapsedTime = elapsedTimeSinceStart + elapsedTimeInSteps;
 
-      const timeRemaining = Math.max(totalTime - secondsFromStart, 0);
-      const progress = (secondsFromStart / totalTime) * 100;
+      const timeRemaining = Math.max(totalTime - totalElapsedTime, 0); // Prevent negative time
+      const progress = (totalElapsedTime / totalTime) * 100;
 
-      if (timeRemaining <= 1) {
-        clearInterval(intervalId);
-        return;
+      if (timeRemaining < 1) {
+        return
       }
 
       setProgressInformation((i) => ({
@@ -49,10 +56,9 @@ export function useProgressTime(
         progress: progress,
       }));
 
-      console.log(currentStep);
     }, 1000);
     return () => clearInterval(intervalId);
-  }, [stepTimes, progressInformation]);
+  }, [stepTimes, currentStep]);
 
   return progressInformation;
 }

From f0f2beea57cfbd350d617ac328a989554af32046 Mon Sep 17 00:00:00 2001
From: dOrgJelli <jelli@dorg.tech>
Date: Tue, 20 Feb 2024 19:06:04 +0100
Subject: [PATCH 4/6] feat: handle no results found

---
 web/app/s/[id]/page.tsx           | 26 +++++++----
 web/components/NoResultsFound.tsx | 77 +++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 web/components/NoResultsFound.tsx

diff --git a/web/app/s/[id]/page.tsx b/web/app/s/[id]/page.tsx
index a82c31d..d8afd93 100644
--- a/web/app/s/[id]/page.tsx
+++ b/web/app/s/[id]/page.tsx
@@ -1,6 +1,7 @@
 import Disclaimer from "@/components/Disclaimer";
 import RealtimeLogs from "@/components/RealtimeLogs";
 import Strategy from "@/components/Strategy";
+import NoResultsFound from "@/components/NoResultsFound";
 import {
   StrategiesWithProjects,
   Application,
@@ -107,12 +108,21 @@ export default async function StrategyPage({
   const uniqueNetworks = Array.from(
     new Set(strategies.map((x) => x.networks).flat())
   );
-  return (
-    <Strategy
-      fetchedStrategies={strategies}
-      prompt={run.data.prompt}
-      runId={run.data.id}
-      networks={uniqueNetworks}
-    />
-  );
+
+  if (strategies.length > 0) {
+    return (
+      <Strategy
+        fetchedStrategies={strategies}
+        prompt={run.data.prompt}
+        runId={run.data.id}
+        networks={uniqueNetworks}
+      />
+    );
+  } else {
+    return (
+      <NoResultsFound
+        prompt={run.data.prompt}
+      />
+    );
+  }
 }
diff --git a/web/components/NoResultsFound.tsx b/web/components/NoResultsFound.tsx
new file mode 100644
index 0000000..944cc54
--- /dev/null
+++ b/web/components/NoResultsFound.tsx
@@ -0,0 +1,77 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import Button from "./Button";
+import { StrategyTable } from "./StrategyTable";
+import TextField from "./TextField";
+import { useConnectWallet, useSetChain } from "@web3-onboard/react";
+import Dropdown from "./Dropdown";
+import { ArrowRight } from "@phosphor-icons/react/dist/ssr";
+import { useRouter, useSearchParams } from "next/navigation";
+import { NetworkName, SUPPORTED_NETWORKS, getNetworkNameFromChainId } from "@/utils/ethereum";
+import useSession from "@/hooks/useSession";
+import { startRun } from "@/app/actions";
+import {
+  StrategiesWithProjects,
+  useStrategiesHandler,
+} from "@/hooks/useStrategiesHandler";
+import { useDonation } from "@/hooks/useDonation";
+import LoadingCircle from "./LoadingCircle";
+import { useToken } from "@/hooks/useToken";
+import ChatInputButton from "./ChatInputButton";
+import SuccessModal from "./SuccessModal";
+import { XLogo } from "./Icons";
+import Image from "next/image";
+import { pluralize } from "@/utils/pluralize";
+import { findMostRepeatedString } from "@/utils/findMostRepeatedString";
+import { useTweetShare } from "@/hooks/useTweetShare";
+
+export default function NoResultsFound(props: {
+  prompt: string;
+}) {
+  const [currentPrompt, setCurrentPrompt] = useState<string>(props.prompt);
+  const [isRegenerating, setIsRegenerating] = useState(false);
+  const { data: session } = useSession();
+  const router = useRouter();
+
+  async function regenerateStrat(prompt: string) {
+    setIsRegenerating(true);
+    if (!session) {
+      throw new Error("User needs to have a session");
+    }
+    const response = await startRun(prompt, session.supabaseAccessToken);
+    router.push(`/s/${response.runId}`);
+    setIsRegenerating(false);
+  }
+
+  return (
+    <>
+      <div className='flex justify-center py-10 px-6 flex-grow flex-column'>
+        <div className='flex flex-col mx-auto max-w-wrapper w-full space-y-4'>
+          <TextField
+            label={`No results found for ${props.prompt}, try again...`}
+            value={currentPrompt}
+            onChange={(e) => setCurrentPrompt(e.target.value)}
+            onKeyDown={(e) => {
+              if (e.key === "Enter" && !!currentPrompt) {
+                regenerateStrat(currentPrompt);
+              }
+            }}
+            rightAdornment={
+              <ChatInputButton
+                running={isRegenerating}
+                message={currentPrompt}
+                regenerate
+                handleSend={async () => {
+                  if (currentPrompt) {
+                    await regenerateStrat(currentPrompt);
+                  }
+                }}
+              />
+            }
+          />
+        </div>
+      </div>
+    </>
+  )
+}
\ No newline at end of file

From e69f4f33b8133b6a9f8799180cf577a78d5258b9 Mon Sep 17 00:00:00 2001
From: Cesar <cesarbrazon10@gmail.com>
Date: Tue, 20 Feb 2024 19:09:23 +0100
Subject: [PATCH 5/6] chore: remove unused state

---
 web/hooks/useProgressTime.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/web/hooks/useProgressTime.ts b/web/hooks/useProgressTime.ts
index e259ba2..b7e958e 100644
--- a/web/hooks/useProgressTime.ts
+++ b/web/hooks/useProgressTime.ts
@@ -6,7 +6,6 @@ export function useProgressTime(
   logs: Array<Tables<"logs">>
 ) {
   const [startTime, setStartTime] = useState(Date.now());
-  const [, setHasReachedTime] = useState(false)
   const [progressInformation, setProgressInformation] = useState({
     time: 0,
     progress: 0,
@@ -19,12 +18,6 @@ export function useProgressTime(
 
   useEffect(() => {
     setStartTime(Date.now())
-    setHasReachedTime((reached) => {
-      if (reached) {
-        return false
-      }
-      return reached
-    })
   }, [currentStep])
 
   useEffect(() => {
@@ -33,7 +26,6 @@ export function useProgressTime(
       const elapsedTimeSinceStart = (now - startTime) / 1000; // Convert ms to seconds
 
       if (elapsedTimeSinceStart > stepTimes[currentStep]) {
-        setHasReachedTime(true)
         return
       }
 

From edbffe29c459374474e5953c01194a987dd1f79a Mon Sep 17 00:00:00 2001
From: dOrgJelli <jelli@dorg.tech>
Date: Tue, 20 Feb 2024 19:17:46 +0100
Subject: [PATCH 6/6] chore: remove unused imports

---
 web/components/NoResultsFound.tsx | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/web/components/NoResultsFound.tsx b/web/components/NoResultsFound.tsx
index 944cc54..0331fb0 100644
--- a/web/components/NoResultsFound.tsx
+++ b/web/components/NoResultsFound.tsx
@@ -1,30 +1,11 @@
 "use client";
 
-import { useEffect, useState } from "react";
-import Button from "./Button";
-import { StrategyTable } from "./StrategyTable";
+import { useState } from "react";
 import TextField from "./TextField";
-import { useConnectWallet, useSetChain } from "@web3-onboard/react";
-import Dropdown from "./Dropdown";
-import { ArrowRight } from "@phosphor-icons/react/dist/ssr";
-import { useRouter, useSearchParams } from "next/navigation";
-import { NetworkName, SUPPORTED_NETWORKS, getNetworkNameFromChainId } from "@/utils/ethereum";
+import { useRouter } from "next/navigation";
 import useSession from "@/hooks/useSession";
 import { startRun } from "@/app/actions";
-import {
-  StrategiesWithProjects,
-  useStrategiesHandler,
-} from "@/hooks/useStrategiesHandler";
-import { useDonation } from "@/hooks/useDonation";
-import LoadingCircle from "./LoadingCircle";
-import { useToken } from "@/hooks/useToken";
 import ChatInputButton from "./ChatInputButton";
-import SuccessModal from "./SuccessModal";
-import { XLogo } from "./Icons";
-import Image from "next/image";
-import { pluralize } from "@/utils/pluralize";
-import { findMostRepeatedString } from "@/utils/findMostRepeatedString";
-import { useTweetShare } from "@/hooks/useTweetShare";
 
 export default function NoResultsFound(props: {
   prompt: string;