Added no vote list (#256)

* moved global css files to _app.tsx * latest fixes * reviewed changes * no confidence vote for both votes added * removed old project page * blocked unauthorized users fron applications and projects * reviewed changes * fixed no confidence vote list * build fixes * removed briefs/id/applications page * refund flow optimization * blocked unauthorized brief owners from applications
ImbueNetwork · Nov 13, 2023 · f852a17 · f852a17
1 parent 96606f9
commit f852a17
Show file tree

Hide file tree

Showing 24 changed files with 303 additions and 1,774 deletions.
diff --git a/src/components/Application/BriefOwnerHeader.tsx b/src/components/Application/BriefOwnerHeader.tsx
@@ -69,8 +69,8 @@ const BriefOwnerHeader = (props: BriefOwnerHeaderProps) => {
     user,
   } = props;
 
-  const [balance, setBalance] = useState<string>();
-  const [imbueBalance, setImbueBalance] = useState<string>();
+  const [balance, setBalance] = useState<number | undefined>();
+  const [imbueBalance, setImbueBalance] = useState<number | undefined>();
   const [loadingWallet, setLoadingWallet] = useState<string>('loading');
   const [error, setError] = useState<any>();
 
@@ -129,13 +129,15 @@ const BriefOwnerHeader = (props: BriefOwnerHeaderProps) => {
           user?.web3_address,
           application.id
         );
+
         const imbueBalance = await getBalance(
           Currency.IMBU,
           user,
           user?.web3_address
         );
-        setBalance(balance.toLocaleString());
-        setImbueBalance(imbueBalance.toLocaleString());
+
+        setBalance(Number(balance) || 0);
+        setImbueBalance(Number(imbueBalance) || 0);
       } catch (error) {
         setError({ message: error });
       } finally {

diff --git a/src/components/ClientView/ClientView.tsx b/src/components/ClientView/ClientView.tsx
@@ -54,7 +54,7 @@ export default function ClientView({
             onClick={() => setSwitcher('projects')}
             className='text-2xl text-black py-5 border-r text-center w-full'
           >
-            Projects({briefs?.acceptedBriefs.length})
+            Projects({briefs?.acceptedBriefs?.length})
           </p>
           <p
             onClick={() => setSwitcher('grants')}

diff --git a/src/components/CopyToClipboardToast.tsx b/src/components/CopyToClipboardToast.tsx
@@ -0,0 +1,43 @@
+import { Alert } from '@mui/material';
+import React, { ReactNode, useState } from 'react';
+
+
+interface CopyToClipboardProps {
+    link: string;
+    title: string;
+    children: ReactNode;
+    extraClass?: string;
+}
+
+const CopyToClipboardToast = (props: CopyToClipboardProps) => {
+    const { link, title, children, extraClass } = props;
+    const [copied, setCopied] = useState<string>('');
+
+    const copyToClipboard = () => {
+        const textToCopy = link || '';
+
+        navigator.clipboard.writeText(textToCopy);
+        setCopied(title);
+
+        setTimeout(() => {
+            setCopied('');
+        }, 3000);
+    };
+
+    return (
+        <div className='inline'>
+            <div
+                className={`fixed ${extraClass || "top-5"} z-10 transform duration-300 transition-all ${copied ? 'right-5' : '-right-full'
+                    }`}
+            >
+                <Alert severity='success'>{`${copied} Copied to clipboard`}</Alert>
+            </div>
+
+            <div className='inline cursor-pointer' onClick={copyToClipboard}>
+                {children}
+            </div>
+        </div>
+    );
+};
+
+export default CopyToClipboardToast;
diff --git a/src/components/Dashboard/MyClientBriefsView.tsx b/src/components/Dashboard/MyClientBriefsView.tsx
@@ -2,13 +2,15 @@
 //import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import { useRouter } from 'next/router';
 import React, { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
 
 import { Freelancer, Project } from '@/model';
 import {
   getBriefApplications,
   getUserBriefs,
 } from '@/redux/services/briefService';
 import { getUsersOngoingGrants } from '@/redux/services/projectServices';
+import { RootState } from '@/redux/store/store';
 
 // import OngoingProject from './FreelacerView/OngoingProject/OngoingProject';
 // import { ApplicationContainer } from '../Briefs/ApplicationContainer';
@@ -20,12 +22,13 @@ type ClientViewProps = {
   briefId: string | string[] | undefined;
   handleMessageBoxClick: (_userId: number, _freelander: Freelancer) => void;
   redirectToBriefApplications: (_applicationId: string) => void;
-  user: any;
 };
 
 const MyClientBriefsView = (props: ClientViewProps) => {
-  const { user, briefId, handleMessageBoxClick, redirectToBriefApplications } =
-    props;
+  const { briefId, handleMessageBoxClick, redirectToBriefApplications } = props;
+
+  const { user, loading } = useSelector((state: RootState) => state.userState);
+
 
   const [briefs, _setBriefs] = useState<any>();
   const [briefApplications, setBriefApplications] = useState<Project[]>([]);
@@ -35,25 +38,39 @@ const MyClientBriefsView = (props: ClientViewProps) => {
 
   useEffect(() => {
     const setUserBriefs = async () => {
-      if (user?.id) _setBriefs(await getUserBriefs(user?.id));
-      setOngoingGrants(await getUsersOngoingGrants(user?.web3_address));
+      if (!user.id) return router.push('/auth/sign-in')
+
+      _setBriefs(await getUserBriefs(user?.id));
+
+      if (user?.web3_address)
+        setOngoingGrants(await getUsersOngoingGrants(user?.web3_address));
     };
-    setUserBriefs();
-  }, [user?.id, user?.web3_address]);
+    !loading && setUserBriefs();
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [user.id, user?.web3_address, loading]);
 
   useEffect(() => {
-    const getApplications = async (id: string | number) => {
+    const getApplications = async () => {
+      if (!briefId) return
+
       try {
         setLoadingApplications(true);
-        setBriefApplications(await getBriefApplications(id));
+        const resp = await getBriefApplications(String(briefId));
+
+        if (resp.status === 501)
+          return router.push('/dashboard');
+
+        setBriefApplications(resp);
+        setLoadingApplications(false);
       } catch (error) {
         console.log(error);
-      } finally {
         setLoadingApplications(false);
       }
     };
-    briefId && getApplications(briefId.toString());
-  }, [briefId, user?.id]);
+
+    briefId && getApplications();
+  }, [briefId, loading, router]);
 
   const goBack = () => {
     router.query.briefId = [];

diff --git a/src/components/HirePopup.tsx b/src/components/HirePopup.tsx
@@ -24,6 +24,7 @@ import { getOffchainEscrowAddress, getOffchainEscrowBalance, mintTokens } from '
 import { RootState } from '@/redux/store/store';
 
 import AccountChoice from './AccountChoice';
+import CopyToClipboardToast from './CopyToClipboardToast';
 import ErrorScreen from './ErrorScreen';
 import SuccessScreen from './SuccessScreen';
 import styles from '../styles/modules/hire-modal.module.css';
@@ -74,12 +75,19 @@ export const HirePopup = ({
 
 
   const updateEscrowInfo = async () => {
-    const escrowAddress = await getOffchainEscrowAddress(application.id);
-    setEscrowAddress(escrowAddress);
-    const allBalances = await getOffchainEscrowBalance(application.id);
-    const currency = Currency[application.currency_id].toString().toLowerCase();
-    const escrowBalance = Number(allBalances[currency]) ?? 0;
-    setEscrowBalance(escrowBalance);
+    try {
+      const escrowAddress = await getOffchainEscrowAddress(application.id);
+
+      if (escrowAddress?.status !== "Failed")
+        setEscrowAddress(escrowAddress);
+
+      const allBalances = await getOffchainEscrowBalance(application.id);
+      const currency = Currency[application.currency_id].toString().toLowerCase();
+      const escrowBalance = Number(allBalances[currency]) || 0;
+      setEscrowBalance(escrowBalance);
+    } catch (error) {
+      setError({ message: "Failed to load payment info" })
+    }
   };
 
   useEffect(() => {
@@ -379,8 +387,15 @@ export const HirePopup = ({
           </p>
           <p className='mb-10'>
             <span>Escrow Address:</span>
-            <span className='text-lg lg:text-xl text-imbue-lemon mr-1'>
-              {escrowAddress}
+            <span
+              className='text-lg lg:text-xl text-imbue-lemon ml-1 font-mono'
+            >
+              <CopyToClipboardToast
+                title='Payment address'
+                link={escrowAddress}
+              >
+                {escrowAddress}
+              </CopyToClipboardToast>
             </span>
           </p>
           <p className='mb-10'>