Fixed unit test

hicommonwealth · Nov 15, 2024 · 3709179 · 3709179
1 parent 96e654b
commit 3709179
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 41 deletions.
diff --git a/packages/commonwealth/client/scripts/helpers/index.tsx b/packages/commonwealth/client/scripts/helpers/index.tsx
@@ -2,9 +2,9 @@ import { TopicWeightedVoting } from '@hicommonwealth/schemas';
 import BigNumber from 'bignumber.js';
 import moment from 'moment';
 import React from 'react';
-import app from 'state';
 import Account from '../models/Account';
 import { ThreadStage } from '../models/types';
+import type { IApp } from '../state/index';
 
 export async function sleep(msec) {
   return new Promise((resolve) => setTimeout(resolve, msec));
@@ -26,7 +26,11 @@ export function threadStageToLabel(stage: string) {
   }
 }
 
-export function isDefaultStage(stage: string, customStages?: string[]) {
+export function isDefaultStage(
+  app: IApp,
+  stage: string,
+  customStages?: string[],
+) {
   return (
     stage === ThreadStage.Discussion ||
     stage ===
@@ -174,16 +178,16 @@ export function renderMultilineText(text: string) {
  * blocknum helpers
  */
 
-export function blocknumToTime(blocknum: number): moment.Moment {
+export function blocknumToTime(app: IApp, blocknum: number): moment.Moment {
   const currentBlocknum = app.chain.block.height;
   const blocktime = app.chain.block.duration;
   const lastBlockTime: moment.Moment = app.chain.block.lastTime.clone();
   return lastBlockTime.add((blocknum - currentBlocknum) * blocktime, 'seconds');
 }
 
-export function blocknumToDuration(blocknum: number) {
+export function blocknumToDuration(app: IApp, blocknum: number) {
   return moment
-    .duration(blocknumToTime(blocknum).diff(moment()))
+    .duration(blocknumToTime(app, blocknum).diff(moment()))
     .asMilliseconds();
 }
 

diff --git a/packages/commonwealth/client/scripts/views/components/ProposalCard/helpers.tsx b/packages/commonwealth/client/scripts/views/components/ProposalCard/helpers.tsx
@@ -11,18 +11,19 @@ import type { AnyProposal } from '../../../models/types';
 import { ProposalStatus } from '../../../models/types';
 
 import { Countdown } from 'views/components/countdown';
+import app from '../../../state/index';
 
 export const getStatusClass = (proposal: AnyProposal, isLoading?: boolean) => {
   if (isLoading) return '';
   return proposal.isPassing === ProposalStatus.Passing
     ? 'pass'
     : proposal.isPassing === ProposalStatus.Passed
-    ? 'pass'
-    : proposal.isPassing === ProposalStatus.Failing
-    ? 'fail'
-    : proposal.isPassing === ProposalStatus.Failed
-    ? 'fail'
-    : '';
+      ? 'pass'
+      : proposal.isPassing === ProposalStatus.Failing
+        ? 'fail'
+        : proposal.isPassing === ProposalStatus.Failed
+          ? 'fail'
+          : '';
 };
 
 export const getStatusText = (proposal: AnyProposal, isLoading?: boolean) => {
@@ -45,34 +46,37 @@ export const getStatusText = (proposal: AnyProposal, isLoading?: boolean) => {
           ' left',
         ]
       : proposal.endTime.kind === 'fixed_block'
-      ? [
-          <Countdown
-            key={proposal.endTime.kind}
-            duration={blocknumToDuration(proposal.endTime.blocknum)}
-          />,
-          ` left (ends on block ${formatNumberLong(
-            proposal.endTime.blocknum,
-          )})`,
-        ]
-      : proposal.endTime.kind === 'dynamic'
-      ? [
-          <Countdown
-            key={proposal.endTime.kind}
-            duration={blocknumToDuration(proposal.endTime.getBlocknum())}
-          />,
-          ` left (ends on block ${formatNumberLong(
-            proposal.endTime.getBlocknum(),
-          )})`,
-        ]
-      : proposal.endTime.kind === 'threshold'
-      ? `needs ${proposal.endTime.threshold} votes`
-      : proposal.endTime.kind === 'not_started'
-      ? 'not yet started'
-      : proposal.endTime.kind === 'queued'
-      ? 'in queue'
-      : proposal.endTime.kind === 'unavailable'
-      ? ''
-      : '';
+        ? [
+            <Countdown
+              key={proposal.endTime.kind}
+              duration={blocknumToDuration(app, proposal.endTime.blocknum)}
+            />,
+            ` left (ends on block ${formatNumberLong(
+              proposal.endTime.blocknum,
+            )})`,
+          ]
+        : proposal.endTime.kind === 'dynamic'
+          ? [
+              <Countdown
+                key={proposal.endTime.kind}
+                duration={blocknumToDuration(
+                  app,
+                  proposal.endTime.getBlocknum(),
+                )}
+              />,
+              ` left (ends on block ${formatNumberLong(
+                proposal.endTime.getBlocknum(),
+              )})`,
+            ]
+          : proposal.endTime.kind === 'threshold'
+            ? `needs ${proposal.endTime.threshold} votes`
+            : proposal.endTime.kind === 'not_started'
+              ? 'not yet started'
+              : proposal.endTime.kind === 'queued'
+                ? 'in queue'
+                : proposal.endTime.kind === 'unavailable'
+                  ? ''
+                  : '';
 
   if (proposal.isPassing === ProposalStatus.Passed)
     return [

diff --git a/packages/commonwealth/client/scripts/views/pages/discussions/ThreadCard/ThreadCard.tsx b/packages/commonwealth/client/scripts/views/pages/discussions/ThreadCard/ThreadCard.tsx
@@ -20,6 +20,7 @@ import { getClasses } from 'views/components/component_kit/helpers';
 import { CWTag } from 'views/components/component_kit/new_designs/CWTag';
 import useBrowserWindow from '../../../../hooks/useBrowserWindow';
 import { ThreadStage } from '../../../../models/types';
+import app from '../../../../state/index';
 import Permissions from '../../../../utils/Permissions';
 import { CommentCard } from '../CommentCard';
 import { isHot } from '../helpers';
@@ -116,7 +117,7 @@ export const ThreadCard = ({
   const linkedSnapshots = filterLinks(thread.links, LinkSource.Snapshot);
   const linkedProposals = filterLinks(thread.links, LinkSource.Proposal);
 
-  const isStageDefault = isDefaultStage(thread.stage, customStages);
+  const isStageDefault = isDefaultStage(app, thread.stage, customStages);
   const isTagsRowVisible =
     (thread.stage && !isStageDefault) || linkedProposals?.length > 0;
   const stageLabel = threadStageToLabel(thread.stage);

diff --git a/packages/commonwealth/client/scripts/views/pages/view_thread/ViewThreadPage.tsx b/packages/commonwealth/client/scripts/views/pages/view_thread/ViewThreadPage.tsx
@@ -347,7 +347,7 @@ const ViewThreadPage = ({ identifier }: ViewThreadPageProps) => {
   const editsToSave = localStorage.getItem(
     `${app.activeChainId()}-edit-thread-${thread?.id}-storedText`,
   );
-  const isStageDefault = thread && isDefaultStage(thread.stage);
+  const isStageDefault = thread && isDefaultStage(app, thread.stage);
 
   const tabsShouldBePresent =
     showLinkedProposalOptions ||