feat: minor changes

Author: chickick

src/containers/vote/index.ts

@@ -11,7 +11,6 @@ import { toast } from 'sonner';
 interface VoteState {
   isLoading: boolean;
   deadline: number | null;
-  voteFinishedAt: number | null;
   votes: Record<string, ['yes' | 'no', string]>;
   yesVotesCount: number | null;
   votedStakeAmount: Big.Big;
@@ -32,7 +31,7 @@ function useVoteContainer(): UseVoteContainer {
   const { viewFunction } = useNear();
 
   const [deadline, setDeadline] = useState<number | null>(null);
-  const [voteFinishedAt, setVoteFinishedAt] = useState<number | null>(null);
+  // const [voteFinishedAt, setVoteFinishedAt] = useState<number | null>(null);
   const [votes, setVotes] = useState<Record<string, ['yes' | 'no', string]>>({});
   const [votedStakeAmount, setVotedStakeAmount] = useState(Big(0));
   const [totalVotedStakeAmount, setTotalVotedStakeAmount] = useState(Big(0));
@@ -44,14 +43,8 @@ function useVoteContainer(): UseVoteContainer {
   }, [votedStakeAmount, totalVotedStakeAmount]);
 
   const votedPercent = useMemo(() => {
-    const _percent = Number(_votedPercent);
-    const lastProgress = PROGRESS[PROGRESS.length - 1];
-    if (voteFinishedAt) {
-      if (_percent >= lastProgress) return _votedPercent;
-      return lastProgress.toFixed(2);
-    }
     return _votedPercent;
-  }, [_votedPercent, voteFinishedAt]);
+  }, [_votedPercent]);
 
   const getTotalVotedStake = useCallback(async () => {
     const data = await viewFunction({
@@ -67,14 +60,14 @@ function useVoteContainer(): UseVoteContainer {
     setTotalVotedStakeAmount(Big(data[2]));
   }, [viewFunction]);
 
-  const getResult = useCallback(async () => {
-    const data = await viewFunction({
-      contractId: contractId,
-      method: 'get_result',
-    });
-    logger.debug('get_result', data);
-    setVoteFinishedAt(data || null);
-  }, [viewFunction]);
+  // const getResult = useCallback(async () => {
+  //   const data = await viewFunction({
+  //     contractId: contractId,
+  //     method: 'get_result',
+  //   });
+  //   logger.debug('get_result', data);
+  //   setVoteFinishedAt(data || null);
+  // }, [viewFunction]);
 
   const getVotes = useCallback(async () => {
     const data = await viewFunction({
@@ -105,7 +98,7 @@ function useVoteContainer(): UseVoteContainer {
   const { isLoading, error } = useSWR(
     'vote_data',
     async () => {
-      const promises = Promise.all([getTotalVotedStake(), getResult(), getVotes(), getDeadline()]);
+      const promises = Promise.all([getTotalVotedStake(), getVotes(), getDeadline()]);
       return await promises;
     },
     // {
@@ -127,7 +120,6 @@ function useVoteContainer(): UseVoteContainer {
   return {
     isLoading,
     deadline,
-    voteFinishedAt,
     votes,
     yesVotesCount,
     votedStakeAmount,

src/pages/home/components/Countdown.tsx

@@ -2,6 +2,7 @@ import { useEffect, useMemo, useState } from 'react';
 
 import dayjs from 'dayjs';
 import { useInterval } from 'react-use';
+import ApprovedImg from '@/assets/images/approved.png';
 
 export interface CountdownProps {
   votedPercent: string;
@@ -12,6 +13,8 @@ export default function Countdown({ deadline }: CountdownProps) {
   const [isPageVisible, setPageVisibility] = useState(!document.hidden);
   const [countdownSeconds, setCountdownSeconds] = useState<number | null>(null);
 
+  const finished = deadline && Date.now() > deadline;
+
   const deadlineFromNow = useMemo(() => {
     if (!countdownSeconds) return null;
     const diffSeconds = countdownSeconds;
@@ -62,6 +65,17 @@ export default function Countdown({ deadline }: CountdownProps) {
 
   if (!deadlineFromNow) return null;
 
+  if (finished) {
+    return (
+      <div className="flex flex-col items-center mb-10">
+        {/* <h3 className="text-app-black-400 text-base sm:text-lg mb-4">
+          {votedPercent}% of Stake Voted for YEA
+        </h3> */}
+        <img src={ApprovedImg} className="h-[72px]" alt="" />
+      </div>
+    );
+  }
+
   return (
     <div className="flex flex-col items-center mb-10">
       {/* <h3 className="text-app-black-400 text-base sm:text-lg mb-4">

src/pages/home/index.tsx

@@ -5,7 +5,6 @@ import { useNavigate } from 'react-router-dom';
 import { PulseLoader } from 'react-spinners';
 
 import NEARLogo from '@/assets/images/near-green.jpg';
-import ApprovedImg from '@/assets/images/approved.png';
 import Bg1 from '@/assets/images/home-star-bg1.png';
 import Bg2 from '@/assets/images/home-star-bg2.png';
 import Markdown from '@/components/markdown';
@@ -26,31 +25,13 @@ dayjs.extend(utc);
 
 export default function Home() {
   const navigate = useNavigate();
-  const {
-    isLoading,
-    deadline,
-    votes,
-    yesVotesCount,
-    votedPercent,
-    voteFinishedAt,
-    votedStakeAmount,
-  } = VoteContainer.useContainer();
+  const { isLoading, deadline, votes, yesVotesCount, votedPercent, votedStakeAmount } =
+    VoteContainer.useContainer();
 
   const NEAR_ENV = config.proposalContractId?.split('.').pop() === 'near' ? 'mainnet' : 'testnet';
 
   const renderVoteProgressStatus = () => {
-    if (!voteFinishedAt) {
-      return <Countdown deadline={deadline} votedPercent={votedPercent} />;
-    }
-
-    return (
-      <div className="flex flex-col items-center mb-10">
-        {/* <h3 className="text-app-black-400 text-base sm:text-lg mb-4">
-          {votedPercent}% of Stake Voted for YEA
-        </h3> */}
-        <img src={ApprovedImg} className="h-[72px]" alt="" />
-      </div>
-    );
+    return <Countdown deadline={deadline} votedPercent={votedPercent} />;
   };
 
   const renderProgress = () => {