fix: safari dark mode bug and voters polling

bgd-labs · Sep 27, 2023 · b8420ea · b8420ea
1 parent 0727cd3
commit b8420ea
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/src/proposals/components/VoteLine.tsx b/src/proposals/components/VoteLine.tsx
@@ -13,18 +13,19 @@ export function VoteLine({
 }: VoteLineProps) {
   return (
     <Box
+      className="VoteLine"
       sx={(theme) => ({
         display: 'inline-flex',
         alignItems: 'center',
         position: 'relative',
-        height: 11,
+        height: 8,
         width: width,
         backgroundColor: '$mainLight',
         borderColor: `${theme.palette.$mainElements} !important`,
         borderStyle: 'solid',
         borderWidth: '1px',
-        borderTopWidth: 3,
-        borderRightWidth: 3,
+        borderTopWidth: 2,
+        borderRightWidth: 2,
         [theme.breakpoints.up('lg')]: {
           height: 10,
           borderTopWidth: 3,

diff --git a/src/proposals/components/proposal/ProposalPage.tsx b/src/proposals/components/proposal/ProposalPage.tsx
@@ -80,6 +80,14 @@ export function ProposalPage({
 
   useEffect(() => {
     const { forVotes, againstVotes } = formatProposal(proposalData.proposal);
+    const { isVotingActive } = getProposalStepsAndAmounts({
+      proposalData: proposal.data,
+      quorum: proposal.config.quorum,
+      differential: proposal.config.differential,
+      precisionDivider: proposal.precisionDivider,
+      cooldownPeriod: proposal.timings.cooldownPeriod,
+      executionPayloadTime: proposal.timings.executionPayloadTime,
+    });
 
     const startBlock =
       proposalData.proposal.data.votingMachineData.createdBlock;
@@ -89,12 +97,6 @@ export function ProposalPage({
 
     const totalVotes = forVotes + againstVotes;
 
-    const isFinished =
-      proposalData.proposal.state === ProposalState.Executed ||
-      proposalData.proposal.state === ProposalState.Defeated ||
-      proposalData.proposal.state === ProposalState.Canceled ||
-      proposalData.proposal.state === ProposalState.Expired;
-
     if (startBlock > 0) {
       if (totalVotes > 0 && !proposal.data.prerender) {
         getVoters(
@@ -106,7 +108,7 @@ export function ProposalPage({
         );
       }
 
-      if (!isFinished) {
+      if (!isVotingActive) {
         startVotersPolling(
           proposal.data.id,
           proposal.data.votingChainId,

diff --git a/src/proposals/components/proposalList/ActiveProposalListItem.tsx b/src/proposals/components/proposalList/ActiveProposalListItem.tsx
@@ -124,6 +124,13 @@ export function ActiveProposalListItem({
           if (!isForHelpModal) {
             setIsClicked(true);
           }
+        }}
+        sx={{
+          '&:visited': {
+            '.VoteLine': {
+              borderColor: `${theme.palette.$mainElements} !important`,
+            },
+          },
         }}>
         <ProposalListItemWrapper
           isVotingActive={isVotingActive}

diff --git a/src/proposals/components/proposalList/ProposalListItemWrapper.tsx b/src/proposals/components/proposalList/ProposalListItemWrapper.tsx
@@ -22,11 +22,12 @@ export function ProposalListItemWrapper({
   disabled?: boolean;
 }) {
   const sm = useMediaQuery(media.sm);
+  const md = useMediaQuery(media.md);
   const theme = useTheme();
 
   return (
     <BoxWith3D
-      disabled={disabled}
+      disabled={md && disabled}
       alwaysWithBorders={isForHelpModal}
       withActions={!sm || !isForHelpModal}
       borderSize={10}

diff --git a/src/utils/appConfig.ts b/src/utils/appConfig.ts
@@ -10,7 +10,7 @@ import { chainInfoHelper } from './configs';
 
 export const isForIPFS = process.env.NEXT_PUBLIC_DEPLOY_FOR_IPFS === 'true';
 
-export const coreName: CoreNetworkName = 'mainnet';
+export const coreName: CoreNetworkName = 'sepolia';
 export const WC_PROJECT_ID = 'e6ed0c48443e54cc875462bbaec6e3a7'; // https://docs.walletconnect.com/2.0/cloud/relay
 
 // @ts-ignore