diff --git a/governance/ui/src/components/CouncilTabs/CouncilSelect.tsx b/governance/ui/src/components/CouncilTabs/CouncilSelect.tsx
index 83d2c8e1d..7dcd65cf3 100644
--- a/governance/ui/src/components/CouncilTabs/CouncilSelect.tsx
+++ b/governance/ui/src/components/CouncilTabs/CouncilSelect.tsx
@@ -22,12 +22,11 @@ export const CouncilsSelect = ({ activeCouncil }: { activeCouncil: CouncilSlugs
borderColor="gray.900"
alignItems="center"
data-cy="menu-button-flex-council-select"
- w="100%"
>
{hasVoted ? (
- Your Vote
+
+ Your Vote
+
) : voteAddressState ? (
-
+
Selected
) : null}
diff --git a/governance/ui/src/components/MyVotesBox/MyVotesBox.tsx b/governance/ui/src/components/MyVotesBox/MyVotesBox.tsx
index 043bad61a..f2552bbd6 100644
--- a/governance/ui/src/components/MyVotesBox/MyVotesBox.tsx
+++ b/governance/ui/src/components/MyVotesBox/MyVotesBox.tsx
@@ -21,9 +21,9 @@ export default function MyVotesBox({
-
+
My Votes
-
+
{councilPeriod === '2' && (
<>
{Object.values(stateFromCouncils).filter((vote) => !!vote).length}/{councils.length}
diff --git a/governance/ui/src/components/UserProfileCard/UserProfileCard.tsx b/governance/ui/src/components/UserProfileCard/UserProfileCard.tsx
index 5f154c60a..95b3563f8 100644
--- a/governance/ui/src/components/UserProfileCard/UserProfileCard.tsx
+++ b/governance/ui/src/components/UserProfileCard/UserProfileCard.tsx
@@ -28,7 +28,6 @@ export function UserProfileCard({
);
const isLoading = useDataLoading || councilPeriodLoading || isNominatedLoading;
-
return (
)}
diff --git a/governance/ui/src/components/UserProfileCard/UserProfileDetails.tsx b/governance/ui/src/components/UserProfileCard/UserProfileDetails.tsx
index f3bd9081f..c653a3979 100644
--- a/governance/ui/src/components/UserProfileCard/UserProfileDetails.tsx
+++ b/governance/ui/src/components/UserProfileCard/UserProfileDetails.tsx
@@ -1,5 +1,6 @@
import { CloseIcon, CopyIcon } from '@chakra-ui/icons';
import { Flex, IconButton, Button, Text, Tooltip, Box } from '@chakra-ui/react';
+import { Badge } from '../Badge';
import { prettyString } from '@snx-v3/format';
import { Socials } from '../Socials';
import { GetUserDetails } from '../../queries/useGetUserDetailsQuery';
@@ -147,8 +148,8 @@ export const UserProfileDetails = ({
/>
)}
-
-
+
+
{userData?.username ? userData.username : prettyString(userData?.address || '')}
+ {isAlreadyVoted ? (
+
+ Your Vote
+
+ ) : isSelected ? (
+
+ Selected
+
+ ) : isNominated ? (
+
+ Nominee
+
+ ) : null}
You have unsaved changes
diff --git a/governance/ui/src/components/UserTableView/UserTableView.tsx b/governance/ui/src/components/UserTableView/UserTableView.tsx
index 05ec18d8f..0b2bc5a8a 100644
--- a/governance/ui/src/components/UserTableView/UserTableView.tsx
+++ b/governance/ui/src/components/UserTableView/UserTableView.tsx
@@ -140,11 +140,22 @@ export default function UserTableView({
fontWeight={700}
>
{ballot?.votedCandidates.includes(user.address) ? (
-
+
Your Vote
) : isSelectedForVoting ? (
-
+
Selected
) : null}
diff --git a/governance/ui/src/pages/MyVotes.tsx b/governance/ui/src/pages/MyVotes.tsx
index e5343f7e4..6633b60f6 100644
--- a/governance/ui/src/pages/MyVotes.tsx
+++ b/governance/ui/src/pages/MyVotes.tsx
@@ -9,7 +9,9 @@ import {
ModalOverlay,
Text,
useDisclosure,
+ IconButton,
} from '@chakra-ui/react';
+import { CloseIcon } from '@chakra-ui/icons';
import councils, { CouncilSlugs } from '../utils/councils';
import { useNavigate } from 'react-router-dom';
import { WarningIcon } from '@chakra-ui/icons';
@@ -308,7 +310,7 @@ export default function MyVotes() {
flexDirection="column"
bg="navy.700"
minW="100%"
- borderColor="cyan.500"
+ borderColor="gray.900"
borderWidth="1px"
borderStyle="solid"
rounded="base"
@@ -317,7 +319,20 @@ export default function MyVotes() {
h="500px"
gap="2"
>
- Your haven't complete your selection
+ onClose()}
+ size="xs"
+ aria-label="close button"
+ icon={}
+ variant="ghost"
+ colorScheme="whiteAlpha"
+ color="white"
+ position="absolute"
+ top="16px"
+ right="16px"
+ />
+
+ You haven't completed your selection
You can now vote for multiple councils and cast all your votes in one unique
transaction: