Merge pull request #97 from GeneralMagicio/fix/feedback_issues

Fix: remaining issues
GeneralMagicio · Oct 31, 2024 · 066b70f · 066b70f
2 parents fc348ff + acfdc37
commit 066b70f
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 16 deletions.
diff --git a/app/allocation/[category]/page.tsx b/app/allocation/[category]/page.tsx
@@ -172,7 +172,7 @@ const RankingPage = () => {
   const lockSelection = () => {
     if (!projects) return;
 
-    if (checkedItems.length > projects?.length - 2) {
+    if (checkedItems.length > projects?.length - 2 || lockedItems.length >= projects?.length - 2) {
       setTotalShareError('At least two projects must be unlocked');
       window.scrollTo(0, document.body.scrollHeight);
       return;

diff --git a/app/allocation/components/BudgetAllocation.tsx b/app/allocation/components/BudgetAllocation.tsx
@@ -48,15 +48,13 @@ const BudgetAllocation: React.FC<IBudgetAllocationProps> = ({
 
   const renderProgressState = useMemo(() => {
     switch (progress) {
-      case CollectionProgressStatusEnum.Finished:
-        return <VotedCategory id={id} isAutoConnecting={isAutoConnecting} />;
       case CollectionProgressStatusEnum.Attested:
         return (
           <VotedCategory
             budgetEditHandle={onScore}
             id={id}
             isAutoConnecting={isAutoConnecting}
-            attestationLink={attestationLink}
+            attestationLink={attestationLink || ''}
           />
         );
       case CollectionProgressStatusEnum.Delegated:
@@ -67,6 +65,7 @@ const BudgetAllocation: React.FC<IBudgetAllocationProps> = ({
             username={username}
           />
         );
+      case CollectionProgressStatusEnum.Finished:
       case CollectionProgressStatusEnum.Pending:
       default:
         return (

diff --git a/app/allocation/components/ProgressCards/PendingCategory.tsx b/app/allocation/components/ProgressCards/PendingCategory.tsx
@@ -63,7 +63,7 @@ const PendingCategory = ({
           </p>
         </div>
       )}
-      {progress === 'WIP'
+      {(progress === 'WIP' || progress === 'Finished')
       && !(isBadgeholder && bhCategory !== categorySlug) && (
         <div className="flex w-full justify-center gap-2 rounded-xl border border-[#FFA15A] bg-[#FFF7ED] py-1">
           <p className="text-xs font-medium text-[#FFA15A]">Voting</p>

diff --git a/app/allocation/page.tsx b/app/allocation/page.tsx
@@ -133,6 +133,11 @@ const AllocationPage = () => {
     = useState<Pick<ICategory, 'id' | 'name'>>();
   const [targetDelegate, setTargetDelegate] = useState<TargetDelegate>();
 
+  const [rankingProgress, setRankingProgress]
+    = useState<CollectionProgressStatusEnum>(
+      CollectionProgressStatusEnum.Pending
+    );
+
   const { mutateAsync: updateCategoriesRanking } = useUpdateCategoriesRanking({
     budget: totalValue,
     allocationPercentages:
@@ -304,6 +309,12 @@ const AllocationPage = () => {
     );
   };
 
+  useEffect(() => {
+    if (categoryRankings) {
+      setRankingProgress(categoryRankings.progress);
+    }
+  }, [categoryRankings]);
+
   useEffect(() => {
     if (delegations) {
       const budgetDelegateFromYou = delegations?.fromYou?.budget;
@@ -315,10 +326,14 @@ const AllocationPage = () => {
   }, [delegations]);
 
   useEffect(() => {
-    if (categoryRankings && categoryRankings.progress === 'Attested' && dbudgetProgress === CollectionProgressStatusEnum.Pending) {
+    if (
+      rankingProgress === CollectionProgressStatusEnum.Attested
+      && dbudgetProgress === CollectionProgressStatusEnum.Pending
+    ) {
       setDbudgetProgress(CollectionProgressStatusEnum.Attested);
     }
-  }, [categoryRankings, dbudgetProgress]);
+    else setDbudgetProgress(CollectionProgressStatusEnum.Pending);
+  }, [rankingProgress]);
 
   useEffect(() => {
     if (categoryRankings) {

diff --git a/app/comparison/card/GithubBox.tsx b/app/comparison/card/GithubBox.tsx
@@ -55,13 +55,13 @@ const GithubBox: FC<Props> = ({ repo }) => {
           {isExpanded
             ? (
                 <div className="flex items-center gap-2">
-                  <span> Hide metrics </span>
+                  {'metrics' in repo && repo.metrics && <span> Hide metrics </span>}
                   <ArrowUpIcon />
                 </div>
               )
             : (
                 <div className="flex items-center gap-2">
-                  <span> View metrics </span>
+                  {'metrics' in repo && repo.metrics && <span> View metrics </span>}
                   <ArrowDownIcon />
                 </div>
               )}

diff --git a/app/comparison/card/ProjectCard.tsx b/app/comparison/card/ProjectCard.tsx
@@ -161,9 +161,9 @@ export const ProjectCard: React.FC<Props> = ({
 
     const handleScroll = () => {
       if (parentRef.current && titleRef.current) {
-        const rect = titleRef.current.getBoundingClientRect();
+        const rect = titleRef.current.getBoundingClientRect()?.top;
         const offset = parentRef.current.getBoundingClientRect()?.top;
-        setIsSticky(rect.top <= offset && rect.top >= -offset);
+        setIsSticky(rect <= offset && rect >= -offset);
       }
     };
 
@@ -241,7 +241,7 @@ export const ProjectCard: React.FC<Props> = ({
     coi || coiLoading ? 'brightness-50' : ''
     }`}
       >
-        <div ref={parentRef} className="h-[78vh] gap-10 overflow-y-auto p-2">
+        <div ref={parentRef} className="h-[78vh] gap-10 overflow-y-auto">
           <div className="mr-4">
             {/* Cover Image and Profile Avatar */}
             <div className="relative h-40">
@@ -424,7 +424,7 @@ export const ProjectCard: React.FC<Props> = ({
                 />
                 {project.testimonials?.length && (
                   <SimpleInfoBox
-                    title={`https://www.metricsgarden.xyz/projects/${project.projectId}/contributions/${project.projectId}`}
+                    title={`https://www.metricsgarden.xyz/projects/${project.projectId}/?tab=insights`}
                     description=""
                     type="link"
                     showIcon={false}

diff --git a/app/comparison/utils/data-fetching/ranking.ts b/app/comparison/utils/data-fetching/ranking.ts
@@ -1,6 +1,6 @@
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { axiosInstance } from '@/app/utils/axiosInstance';
-import { IProjectRanking, ICategory, IProject, CollectionProgressStatus } from '@/app/comparison/utils/types';
+import { IProjectRanking, ICategory, IProject, CollectionProgressStatusEnum } from '@/app/comparison/utils/types';
 
 type TCategoryRanking = {
   project: IProject
@@ -21,7 +21,7 @@ export interface IProjectsRankingResponse {
   hasRanking: boolean
   isFinished: boolean
   attestationLink?: string
-  progress: CollectionProgressStatus
+  progress: CollectionProgressStatusEnum
   budget: number
   name: string
   share: number
@@ -55,7 +55,7 @@ export const useCategoryRankings = () => {
 export const getProjectsRankingByCategoryId = async (
   cid: number | undefined
 ): Promise<IProjectsRankingResponse> => {
-  if (!cid) return { ranking: [], hasRanking: false, isFinished: false, progress: 'Pending', attestationLink: '', budget: 0, name: '', share: 0, id: 0 };
+  if (!cid) return { ranking: [], hasRanking: false, isFinished: false, progress: CollectionProgressStatusEnum.Pending, attestationLink: '', budget: 0, name: '', share: 0, id: 0 };
 
   return (
     await axiosInstance.get(`flow/ranking?cid=${cid}