From cf2c08915cccbcbb4cce9b285b3efc2209983973 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Tue, 14 May 2024 15:47:28 -0400 Subject: [PATCH 1/4] Moves ProposalCountdown from the Badge component --- .../Proposals/ProposalCard/ProposalCard.tsx | 6 ++++++ src/components/Proposals/ProposalInfo.tsx | 8 +++++++- src/components/ui/badges/Badge.tsx | 14 ++------------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/components/Proposals/ProposalCard/ProposalCard.tsx b/src/components/Proposals/ProposalCard/ProposalCard.tsx index 87d5fe2430..8bcb0f8c74 100644 --- a/src/components/Proposals/ProposalCard/ProposalCard.tsx +++ b/src/components/Proposals/ProposalCard/ProposalCard.tsx @@ -16,6 +16,7 @@ import { ActivityDescription } from '../../Activity/ActivityDescription'; import { Badge } from '../../ui/badges/Badge'; import QuorumBadge from '../../ui/badges/QuorumBadge'; import { SnapshotIcon } from '../../ui/badges/Snapshot'; +import { ProposalCountdown } from '../../ui/proposal/ProposalCountdown'; function ProposalCard({ proposal }: { proposal: FractalProposal }) { const { @@ -66,7 +67,12 @@ function ProposalCard({ proposal }: { proposal: FractalProposal }) { + {isSnapshotProposal && ( diff --git a/src/components/Proposals/ProposalInfo.tsx b/src/components/Proposals/ProposalInfo.tsx index 467cf64227..6dd8e5c0f9 100644 --- a/src/components/Proposals/ProposalInfo.tsx +++ b/src/components/Proposals/ProposalInfo.tsx @@ -11,6 +11,7 @@ import { Badge } from '../ui/badges/Badge'; import { SnapshotButton } from '../ui/badges/Snapshot'; import { ModalType } from '../ui/modals/ModalProvider'; import { useFractalModal } from '../ui/modals/useFractalModal'; +import { ProposalCountdown } from '../ui/proposal/ProposalCountdown'; import ProposalExecutableCode from '../ui/proposal/ProposalExecutableCode'; import CeleryButtonWithIcon from '../ui/utils/CeleryButtonWithIcon'; @@ -43,9 +44,14 @@ export function ProposalInfo({ )} + {isSnapshotProposal && ( <> diff --git a/src/components/ui/badges/Badge.tsx b/src/components/ui/badges/Badge.tsx index 18f83d25e6..bfd0fbcc83 100644 --- a/src/components/ui/badges/Badge.tsx +++ b/src/components/ui/badges/Badge.tsx @@ -2,8 +2,7 @@ import { Box, Flex, Text, Tooltip } from '@chakra-ui/react'; import { ReactNode } from 'react'; import { useTranslation } from 'react-i18next'; import { TOOLTIP_MAXW } from '../../../constants/common'; -import { FractalProposalState, DAOState, FractalProposal } from '../../../types'; -import { ProposalCountdown } from '../proposal/ProposalCountdown'; +import { FractalProposalState, DAOState } from '../../../types'; type BadgeType = { tooltipKey?: string; @@ -109,10 +108,9 @@ interface IBadge { size: Size; labelKey: keyof typeof BADGE_MAPPING; children?: ReactNode; - proposal?: FractalProposal; } -export function Badge({ labelKey, children, size, proposal }: IBadge) { +export function Badge({ labelKey, children, size }: IBadge) { const { tooltipKey, ...colors } = BADGE_MAPPING[labelKey]; const sizes = BADGE_SIZES[size]; @@ -147,14 +145,6 @@ export function Badge({ labelKey, children, size, proposal }: IBadge) { > {children || t(labelKey)} - {proposal && ( - - )} ); From 047c5b8fc66d82ccea5b08edefaf38f3e027ef01 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Tue, 14 May 2024 15:48:48 -0400 Subject: [PATCH 2/4] reduce gap --- src/components/Proposals/ProposalInfo.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Proposals/ProposalInfo.tsx b/src/components/Proposals/ProposalInfo.tsx index 6dd8e5c0f9..c2dbff44e2 100644 --- a/src/components/Proposals/ProposalInfo.tsx +++ b/src/components/Proposals/ProposalInfo.tsx @@ -37,7 +37,7 @@ export function ProposalInfo({ padding="1.5rem" > {proposal.state && ( From 2ad58aa78f22a6a8da7cf78c7e9298354dd3081a Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Tue, 14 May 2024 20:24:37 -0400 Subject: [PATCH 3/4] remove textStyle prop --- src/components/Proposals/ProposalCard/ProposalCard.tsx | 1 - src/components/Proposals/ProposalInfo.tsx | 1 - src/components/ui/proposal/ProposalCountdown.tsx | 4 +--- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/Proposals/ProposalCard/ProposalCard.tsx b/src/components/Proposals/ProposalCard/ProposalCard.tsx index 8bcb0f8c74..6bd9fe3bcb 100644 --- a/src/components/Proposals/ProposalCard/ProposalCard.tsx +++ b/src/components/Proposals/ProposalCard/ProposalCard.tsx @@ -72,7 +72,6 @@ function ProposalCard({ proposal }: { proposal: FractalProposal }) { proposal={proposal} showIcon={false} textColor="neutral-7" - textStyle="label-base" /> {isSnapshotProposal && ( diff --git a/src/components/Proposals/ProposalInfo.tsx b/src/components/Proposals/ProposalInfo.tsx index c2dbff44e2..ade9b6d603 100644 --- a/src/components/Proposals/ProposalInfo.tsx +++ b/src/components/Proposals/ProposalInfo.tsx @@ -50,7 +50,6 @@ export function ProposalInfo({ proposal={proposal} showIcon={false} textColor="neutral-7" - textStyle="label-base" /> {isSnapshotProposal && ( <> diff --git a/src/components/ui/proposal/ProposalCountdown.tsx b/src/components/ui/proposal/ProposalCountdown.tsx index 32de55a55a..d5189c55cd 100644 --- a/src/components/ui/proposal/ProposalCountdown.tsx +++ b/src/components/ui/proposal/ProposalCountdown.tsx @@ -22,13 +22,11 @@ export function ProposalCountdown({ proposal, showIcon = true, textColor = 'white-0', - textStyle = 'label-base', // previous default }: { proposal: FractalProposal; showIcon?: boolean; // custom text color and style textColor?: string; - textStyle?: string; }) { const totalSecondsLeft = useProposalCountdown(proposal); const { t } = useTranslation('proposal'); @@ -91,7 +89,7 @@ export function ProposalCountdown({ > {showDays && `${zeroPad(daysLeft)}:`} {showHours && `${zeroPad(hoursLeft)}:`} From c5bc25bf8144e442a0fadf5649eb7a1dfbe855ff Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Tue, 14 May 2024 20:29:12 -0400 Subject: [PATCH 4/4] pretty~ --- src/components/ui/proposal/ProposalCountdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ui/proposal/ProposalCountdown.tsx b/src/components/ui/proposal/ProposalCountdown.tsx index d5189c55cd..a09788bc2e 100644 --- a/src/components/ui/proposal/ProposalCountdown.tsx +++ b/src/components/ui/proposal/ProposalCountdown.tsx @@ -89,7 +89,7 @@ export function ProposalCountdown({ > {showDays && `${zeroPad(daysLeft)}:`} {showHours && `${zeroPad(hoursLeft)}:`}