Skip to content

Commit

Permalink
fix: is drect round
Browse files Browse the repository at this point in the history
  • Loading branch information
boudra committed Feb 16, 2024
1 parent 2708434 commit 1a34cc7
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions packages/round-manager/src/features/round/ViewRoundPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import {
horizontalTabStyles,
verticalTabStyles,
} from "../common/Utils";
import { ROUND_PAYOUT_DIRECT, ROUND_PAYOUT_MERKLE } from "common";
import ApplicationsApproved from "./ApplicationsApproved";
import ApplicationsRejected from "./ApplicationsRejected";
import FundContract from "./FundContract";
Expand Down Expand Up @@ -314,10 +313,7 @@ export default function ViewRoundPage() {
<Tab.Panels className="flex-grow ml-6">
<Tab.Panel>
<GrantApplications
isDirectRound={
round.payoutStrategy.strategyName ==
ROUND_PAYOUT_DIRECT
}
isDirectRound={isDirectRound(round)}
applications={applications}
isRoundsFetched={isRoundFetched}
fetchRoundStatus={fetchRoundStatus}
Expand Down Expand Up @@ -641,10 +637,8 @@ export function RoundBadgeStatus({ round }: { round: Round }) {
const now = moment();

if (
(round.payoutStrategy.strategyName == ROUND_PAYOUT_MERKLE &&
now.isBefore(applicationEnds)) ||
(round.payoutStrategy.strategyName == ROUND_PAYOUT_DIRECT &&
now.isBefore(roundEnds))
(!isDirectRound(round) && now.isBefore(applicationEnds)) ||
(isDirectRound(round) && now.isBefore(roundEnds))
) {
return (
<div
Expand Down

0 comments on commit 1a34cc7

Please sign in to comment.