Merge pull request #965 from IntersectMBO/904-no-option-to-delegate-t…

…o-myself-as-a-drep-after-delegating-to-abstain [#904] No option to delegate to myself as a drep
IntersectMBO · May 9, 2024 · 6c01a1e · 6c01a1e
2 parents 1bfd6d8 + be9e1dd
commit 6c01a1e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/govtool/frontend/src/components/organisms/DRepCard.tsx b/govtool/frontend/src/components/organisms/DRepCard.tsx
@@ -83,7 +83,9 @@ export const DRepCard = ({
             }}
           >
             <Box minWidth={0} display="flex" flexDirection="column">
-              <Typography sx={ellipsisStyles}>{type}</Typography>
+              <Typography sx={ellipsisStyles}>
+                {type === "SoleVoter" ? t("dRepDirectory.directVoter") : type}
+              </Typography>
               <ButtonBase
                 data-testid={`${view}-copy-id-button`}
                 onClick={(e) => {
@@ -178,7 +180,6 @@ export const DRepCard = ({
           {status === "Active" &&
             isConnected &&
             onDelegate &&
-            !isMe &&
             !isInProgress && (
               <Button
                 data-testid={`${view}-delegate-button`}

diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
@@ -250,10 +250,13 @@ export const en = {
       automatedVotingOptions: "Automated Voting Options",
       editBtn: "Edit DRep data",
       delegationOptions: "Delegation Options",
+      directVoter: "Direct Voter",
       filterTitle: "DRep Status",
       goToDRepDirectory: "Go to DRep Directory",
       meAsDRep: "This  DRep ID is connected  to your wallet",
       myDelegation: "You have delegated <strong>₳ {{ada}}</strong> to:",
+      myDelegationToYourself:
+        "You have delegated <strong>₳ {{ada}}</strong> to yourself:",
       myDRep: "This is your DRep",
       listTitle: "Find a DRep",
       noConfidenceDescription:

diff --git a/govtool/frontend/src/models/api.ts b/govtool/frontend/src/models/api.ts
@@ -33,7 +33,7 @@ export interface DRepData {
   deposit: number;
   votingPower: number;
   status: DRepStatus;
-  type: "DRep" | "DirectVoter";
+  type: "DRep" | "SoleVoter";
 }
 export type InfinityDRepData = {
   elements: DRepData[];

diff --git a/govtool/frontend/src/pages/DRepDirectoryContent.tsx b/govtool/frontend/src/pages/DRepDirectoryContent.tsx
@@ -96,6 +96,7 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
             dRep={myDrep}
             isConnected={!!isConnected}
             isInProgress={isSameDRep(myDrep, inProgressDelegation)}
+            isMe={isSameDRep(myDrep, myDRepId)}
           />
         </div>
       )}

diff --git a/govtool/frontend/src/utils/tests/dRep.test.ts b/govtool/frontend/src/utils/tests/dRep.test.ts
@@ -2,7 +2,7 @@ import { isSameDRep } from "..";
 
 import { DRepStatus } from "@/models";
 
-type TDRepType = "DRep" | "DirectVoter";
+type TDRepType = "DRep" | "SoleVoter";
 
 const EXAMPLE_DREP = {
   drepId: "drep123",