Merge pull request #455 from 1Hive/hide-completed-proposals

Hide completed proposals

.gitignore

@@ -48,6 +48,7 @@ cache/
 pkg/subgraph/generated
 pkg/**/data
 cookies.json
+.graphclientrc.yml
 
 lcov.info
 # some abi should be ignored

apps/web/app/(app)/gardens/[chain]/[garden]/[community]/[poolId]/[proposalId]/page.tsx

@@ -271,7 +271,7 @@ export default function Page({
  thresholdPct={thresholdPct}
  proposalSupportPct={totalSupportPct}
  isSignalingType={isSignalingType}
- proposalId={Number(proposalIdNumber)}
+ proposalNumber={Number(proposalIdNumber)}
  />
  </>
  }

apps/web/components/Charts/ConvictionBarChart.tsx

@@ -15,7 +15,7 @@ type ConvictionBarChartProps = {
  thresholdPct: number;
  proposalSupportPct: number;
  isSignalingType: boolean;
- proposalId: number;
+ proposalNumber: number;
  compact?: boolean;
 };
 
@@ -24,7 +24,7 @@ export const ConvictionBarChart = ({
  thresholdPct,
  proposalSupportPct,
  isSignalingType,
- proposalId,
+ proposalNumber,
  compact,
 }: ConvictionBarChartProps) => {
  const supportNeeded = (thresholdPct - proposalSupportPct).toFixed(2);
@@ -170,12 +170,6 @@ export const ConvictionBarChart = ({
  const supportGtConv = proposalSupportPct > currentConvictionPct;
  const convEqSupport = proposalSupportPct === currentConvictionPct;
 
- const maxValue = Math.max(
- proposalSupportPct,
- currentConvictionPct,
- thresholdPct,
- );
-
  const emphasis = {
  disabled: true,
  };
@@ -215,7 +209,7 @@ export const ConvictionBarChart = ({
  const option: EChartsOption = {
  emphasis: emphasis,
  yAxis: {
- data: [`Proposal #${proposalId}`],
+ data: [`Proposal #${proposalNumber}`],
  axisTick: { show: false },
 
  axisLine: {

apps/web/components/ProposalCard.tsx

@@ -36,9 +36,8 @@ export type ProposalCardProps = {
  metadata?: Maybe<Pick<ProposalMetadata, "title">>;
  };
  strategyConfig: Pick<CVStrategyConfig, "decay" | "proposalType">;
- inputData: ProposalInputItem;
+ inputData?: ProposalInputItem;
  stakedFilter: ProposalInputItem;
- index: number;
  poolToken: FetchTokenResult;
  isAllocationView: boolean;
  memberActivatedPoints: number;
@@ -48,15 +47,14 @@ export type ProposalCardProps = {
  tokenDecimals: number;
  alloInfo: Allo;
  tokenData: Parameters<typeof useConvictionRead>[0]["tokenData"];
- inputHandler: (i: number, value: number) => void;
+ inputHandler: (proposalId: string, value: number) => void;
 };
 
 export function ProposalCard({
  proposalData,
  strategyConfig,
  inputData,
  stakedFilter,
- index,
  poolToken,
  isAllocationView,
  memberActivatedPoints,
@@ -168,7 +166,7 @@ export function ProposalCard({
  }
  step={memberActivatedPoints / 100}
  onChange={(e) =>
- inputHandler(index, Number(e.target.value))
+ inputHandler(proposalData.id, Number(e.target.value))
  }
  />
  <div className="flex w-full justify-between px-2.5">
@@ -181,7 +179,7 @@ export function ProposalCard({
  </div>
  </div>
  <div className="mb-2">
- {Number(inputValue) > 0 && (
+ {inputValue > 0 && (
  <>
  <div className="flex gap-10">
  <div className="flex flex-col items-center justify-center">
@@ -223,7 +221,7 @@ export function ProposalCard({
  thresholdPct={isSignalingType ? 0 : thresholdPct}
  proposalSupportPct={totalSupportPct}
  isSignalingType={isSignalingType}
- proposalId={proposalNumber}
+ proposalNumber={proposalNumber}
  />
  </div>
  </div>
@@ -233,15 +231,13 @@ export function ProposalCard({
  </div>
  </div>
  </div>
- {
+ {!isAllocationView && stakedFilter && stakedFilter?.value > 0 && (
  <div className="">
- {!isAllocationView && stakedFilter && stakedFilter?.value > 0 && (
- <p className="flex items-baseline text-xs">
- Your support: {poolWeightAllocatedInProposal}%
- </p>
- )}
+ <p className="flex items-baseline text-xs">
+ Your support: {poolWeightAllocatedInProposal}%
+ </p>
  </div>
- }
+ )}
  {/* TODO: fetch every member stake */}
  {/* {!isAllocationView && <p className="text-sm mt-1">3 Supporters</p>} */}
  </>