Skip to content

Commit d1d8d2b

Browse files
author
Pierre Gee
authored
fix(governance): enable neutral voting (#1925)
1 parent ca7a167 commit d1d8d2b

1 file changed

Lines changed: 16 additions & 23 deletions

File tree

src/pages/governance/_components/ConfirmVoteDialog.tsx

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export function ConfirmVoteDialog({
5353

5454
const localStorageMasterNodeId = getLocalStorageItem(
5555
"masternodeId",
56-
connection
56+
connection,
5757
);
5858

5959
const [masternodeId, setMasternodeId] = useState(localStorageMasterNodeId);
@@ -85,7 +85,7 @@ export function ConfirmVoteDialog({
8585
<Dialog.Panel
8686
className={classNames(
8787
"w-full max-w-[512px] transform overflow-hidden rounded-[10px] bg-white dark:bg-dark-gray-100 p-5 md:p-8 text-left align-middle shadow-xl transition-all",
88-
{ "max-w-[436px]": voteStage === VoteStages.ReadyVoteId }
88+
{ "max-w-[436px]": voteStage === VoteStages.ReadyVoteId },
8989
)}
9090
>
9191
{voteStage !== VoteStages.ReadyVoteId && (
@@ -193,11 +193,11 @@ function VoteForProposal({
193193

194194
const localStorageRememberMasterNodeId = getLocalStorageItem(
195195
"rememberMasternodeId",
196-
connection
196+
connection,
197197
);
198198

199199
const [rememberMasternodeId, setRememberMasternodeId] = useState(
200-
localStorageRememberMasterNodeId
200+
localStorageRememberMasterNodeId,
201201
);
202202
const ref = useRef<HTMLTextAreaElement>(null);
203203
const dimension = useWindowDimensions();
@@ -260,7 +260,7 @@ function VoteForProposal({
260260
{
261261
"border-red-500 dark:border-dark-red-500":
262262
masternodeErrorMsg !== "",
263-
}
263+
},
264264
)}
265265
>
266266
<textarea
@@ -314,7 +314,7 @@ function VoteForProposal({
314314
}
315315
}}
316316
className={classNames(
317-
"flex flex-row gap-x-[6px] items-center mt-2 md:mb-4 mb-6 accent-blue-600 dark:accent-dark-blue-600"
317+
"flex flex-row gap-x-[6px] items-center mt-2 md:mb-4 mb-6 accent-blue-600 dark:accent-dark-blue-600",
318318
)}
319319
>
320320
<input
@@ -355,7 +355,7 @@ function VoteForProposal({
355355
connection,
356356
rememberMasternodeId,
357357
masternodeId,
358-
setVoteStage
358+
setVoteStage,
359359
);
360360
}}
361361
className="w-full py-3 rounded-sm font-medium border border-primary-50 dark:border-dark-primary-50 text-primary-500 dark:text-dark-primary-500 bg-primary-50 dark:bg-dark-primary-50 hover:bg-primary-100 hover:dark:bg-dark-primary-100 hover:border-primary-100 hover:dark:border-dark-primary-100 disabled:bg-gray-50 disabled:dark:bg-dark-gray-50 disabled:border-transparent disabled:text-gray-300 disabled:dark:text-dark-gray-300"
@@ -378,11 +378,11 @@ function UserVote({
378378
setUserSelectedVote: Dispatch<SetStateAction<VoteDecision>>;
379379
}) {
380380
const [isVoteSelectionDisabled, setIsVoteSelectionDisabled] = useState(
381-
masternodeId === "" || masternodeErrorMsg !== ""
381+
masternodeId === "" || masternodeErrorMsg !== "",
382382
);
383383
useEffect(() => {
384384
setIsVoteSelectionDisabled(
385-
masternodeId === "" || masternodeErrorMsg !== ""
385+
masternodeId === "" || masternodeErrorMsg !== "",
386386
);
387387
}, [masternodeId, masternodeErrorMsg]);
388388

@@ -401,7 +401,7 @@ function UserVote({
401401
"grow w-1/3 rounded-l border border-r-[0.5px] py-3 text-sm font-medium border-gray-300 dark:border-dark-gray-300 disabled:opacity-30",
402402
userSelectedVote === VoteDecision.NO
403403
? "text-white dark:text-dark-gray-0 border-0 bg-red-600 dark:bg-dark-red-600"
404-
: "text-red-600 dark:text-dark-red-600 dark:bg-dark-gray-50"
404+
: "text-red-600 dark:text-dark-red-600 dark:bg-dark-gray-50",
405405
)}
406406
onClick={() => {
407407
setUserSelectedVote(VoteDecision.NO);
@@ -413,25 +413,18 @@ function UserVote({
413413
<button
414414
type="button"
415415
data-testid="OnChainGovernance.VotingFlow.NeutralVote"
416-
disabled
416+
disabled={isVoteSelectionDisabled}
417417
className={classNames(
418418
"grow w-1/3 border border-r-[0.5px] border-l-[0.5px] py-3 text-sm font-medium border-gray-300 dark:border-dark-gray-300 disabled:dark:border-opacity-30 disabled:border-opacity-30 disabled:dark:text-opacity-30 disabled:text-opacity-30",
419419
userSelectedVote === VoteDecision.NEUTRAL
420420
? "text-white dark:text-dark-gray-0 border-0 bg-gray-600/[0.30] dark:bg-dark-gray-600/[0.30]"
421-
: "text-gray-600 dark:text-dark-gray-600 dark:bg-dark-gray-50 dark:bg-opacity-30"
421+
: "text-gray-600 dark:text-dark-gray-600 dark:bg-dark-gray-50 dark:bg-opacity-30",
422422
)}
423423
onClick={() => {
424424
setUserSelectedVote(VoteDecision.NEUTRAL);
425425
}}
426426
>
427-
<div className="flex self-center justify-center">
428-
NEUTRAL
429-
<InfoHoverPopover
430-
className="ml-1 self-center"
431-
description="The neutral option is disabled due to a bug which treats the neutral vote as a no vote"
432-
placement="top"
433-
/>
434-
</div>
427+
<div className="flex self-center justify-center">NEUTRAL</div>
435428
</button>
436429

437430
<button
@@ -442,7 +435,7 @@ function UserVote({
442435
"grow w-1/3 border border-l-[0.5px] rounded-r py-3 text-sm font-medium border-gray-300 dark:border-dark-gray-300 disabled:opacity-30",
443436
userSelectedVote === VoteDecision.YES
444437
? "text-white dark:text-dark-gray-0 border-0 bg-green-600 dark:bg-dark-green-600"
445-
: "text-green-600 dark:text-dark-green-600 dark:bg-dark-gray-50"
438+
: "text-green-600 dark:text-dark-green-600 dark:bg-dark-gray-50",
446439
)}
447440
onClick={() => {
448441
setUserSelectedVote(VoteDecision.YES);
@@ -489,7 +482,7 @@ function UserReviewVote({
489482
data-testid="OnChainGovernance.VotingFlow.UserReviewVote.UserSelectedVote"
490483
className={classNames(
491484
"text-right capitalize font-medium",
492-
getVotesStyle(userSelectedVote)
485+
getVotesStyle(userSelectedVote),
493486
)}
494487
>
495488
{userSelectedVote}
@@ -656,7 +649,7 @@ function onContinueVoteButtonClick(
656649
connection: EnvironmentNetwork,
657650
rememberMasternodeId: RememberMasterNodeId,
658651
masternodeId: string,
659-
setVoteStage: Dispatch<SetStateAction<VoteStages>>
652+
setVoteStage: Dispatch<SetStateAction<VoteStages>>,
660653
) {
661654
const rememberMasternodeObj =
662655
getLocalStorageItem("rememberMasternodeId") ?? {};

0 commit comments

Comments
 (0)