Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: handle Attested status on allocations view #79

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Fix: handle Attested status on allocations view #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
499e914
Merge branch 'staging' of github.com:GeneralMagicio/pairwise-rf6 into…
Meriem-BM Oct 30, 2024
6e10d5d
fix: add Attested status to catefgoties cards logic
Meriem-BM Oct 30, 2024
61ce56d
chore: linting errors
Meriem-BM Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/allocation/components/BudgetAllocation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,15 @@ const BudgetAllocation: React.FC<IBudgetAllocationProps> = ({
switch (progress) {
case CollectionProgressStatusEnum.Finished:
return <VotedCategory id={id} isAutoConnecting={isAutoConnecting} />;
case CollectionProgressStatusEnum.Attested:
return <VotedCategory id={id} isAutoConnecting={isAutoConnecting} />;
case CollectionProgressStatusEnum.Delegated:
return (
<DelegatedCategory id={id} isAutoConnecting={isAutoConnecting} username={username} />
<DelegatedCategory
id={id}
isAutoConnecting={isAutoConnecting}
username={username}
/>
);
case CollectionProgressStatusEnum.Pending:
default:
Expand Down
4 changes: 4 additions & 0 deletions app/allocation/components/CategoryAllocation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ const CategoryAllocation: FC<CategoryAllocationProps> = ({

const hrefLink
= progress === CollectionProgressStatusEnum.Finished
|| progress === CollectionProgressStatusEnum.Delegated
|| progress === CollectionProgressStatusEnum.Attested
? `/allocation/${categoryIdSlugMap.get(id)}`
: `/comparison/${categoryIdSlugMap.get(id)}`;

Expand Down Expand Up @@ -101,6 +103,8 @@ const CategoryAllocation: FC<CategoryAllocationProps> = ({
);
case CollectionProgressStatusEnum.Finished:
return <VotedCategory id={id} isAutoConnecting={isAutoConnecting} />;
case CollectionProgressStatusEnum.Attested:
return <VotedCategory id={id} isAutoConnecting={isAutoConnecting} />;
case CollectionProgressStatusEnum.Pending:
default:
return (
Expand Down
2 changes: 1 addition & 1 deletion app/comparison/card/ProjectCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ export const ProjectCard: React.FC<Props> = ({
coi || coiLoading ? 'brightness-50' : ''
}`}
>
<div ref={parentRef} className="h-[78vh] gap-10 p-2 overflow-y-auto">
<div ref={parentRef} className="h-[78vh] gap-10 overflow-y-auto p-2">
<div className="mr-4">
{/* Cover Image and Profile Avatar */}
<div className="relative h-40">
Expand Down