Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(APP-2621): Proposal is missing Exact Expiry Data/ Time for Multisig DAO #1391

Merged
merged 2 commits into from
Jul 25, 2024
Merged

fix(APP-2621): Proposal is missing Exact Expiry Data/ Time for Multisig DAO #1391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5edf74
removed seperate logic for multisig proposals
Barukimang Jul 25, 2024
eb90d86
fixed ui issue
Barukimang Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions src/containers/votingTerminal/infoTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ const InfoTab: React.FC<Props> = ({
preciseEndDate,
}) => {
const {t} = useTranslation();
const isMultisigProposal = minApproval != null && minApproval !== 0;

return (
<>
Expand Down Expand Up @@ -167,22 +166,14 @@ const InfoTab: React.FC<Props> = ({
</InfoLine>
<InfoLine className="items-start gap-x-4">
<p className="ft-text-base">{t('votingTerminal.endDate')}</p>
<EndDateWrapper className="w-[213px]">
{isMultisigProposal ? (
<p className="text-right font-semibold text-neutral-800 ft-text-base">
{t('votingTerminal.multisig.endDescription')}
</p>
) : (
<>
<Strong>{endDate}</Strong>
{preciseEndDate && (
<div className="flex justify-end gap-x-2">
<p className="text-right text-neutral-800 ft-text-sm">
{preciseEndDate}
</p>
</div>
)}
</>
<EndDateWrapper>
<Strong>{endDate}</Strong>
{preciseEndDate && (
<div className="flex justify-end gap-x-2">
<p className="text-right text-neutral-800 ft-text-sm">
{preciseEndDate}
</p>
</div>
)}
</EndDateWrapper>
</InfoLine>
Expand Down
Loading