Merge pull request #2667 from IntersectMBO/feat/2658-tweaks-to-drep-ids---change-default-id-to-cip129

feat: make CIP-129 identifiers default ones

Author: MSzalowski

CHANGELOG.md

@@ -21,6 +21,7 @@ changes.
 ### Changed
 
 - Bump cardano-node to 10.1.4
+- Make CIP-129 governance identifiers the default ones
 
 ### Removed
 

govtool/frontend/src/components/molecules/GovernanceActionCard.tsx

@@ -118,18 +118,19 @@ export const GovernanceActionCard: FC<ActionTypeProps> = ({ ...props }) => {
           isSliderCard
         />
         <GovernanceActionCardElement
-          label={t("govActions.governanceActionId")}
-          text={govActionId}
-          dataTestId={`${govActionId}-id`}
+          label={t("govActions.cip129GovernanceActionId")}
+          text={cip129GovernanceActionId}
+          dataTestId={`${cip129GovernanceActionId}-id`}
           isCopyButton
           isSliderCard
         />
         <GovernanceActionCardElement
-          label={t("govActions.cip129GovernanceActionId")}
-          text={cip129GovernanceActionId}
-          dataTestId={`${cip129GovernanceActionId}-id`}
+          label={t("govActions.governanceActionId")}
+          text={govActionId}
+          dataTestId={`${govActionId}-id`}
           isCopyButton
           isSliderCard
+          isSemiTransparent
         />
       </Box>
       <Box

govtool/frontend/src/components/molecules/GovernanceActionCardElement.tsx

@@ -12,6 +12,7 @@ type BaseProps = {
   isSliderCard?: boolean;
   tooltipProps?: Omit<TooltipProps, "children">;
   marginBottom?: number;
+  isSemiTransparent?: boolean;
 };
 
 type PillVariantProps = BaseProps & {
@@ -39,6 +40,7 @@ export const GovernanceActionCardElement = ({
   tooltipProps,
   marginBottom,
   isMarkdown = false,
+  isSemiTransparent = false,
 }: GovernanceActionCardElementProps) => {
   if (!text) {
     return null;
@@ -161,6 +163,9 @@ export const GovernanceActionCardElement = ({
                   ...(isCopyButton && {
                     color: "primaryBlue",
                   }),
+                  ...(isSemiTransparent && {
+                    opacity: 0.75,
+                  }),
                 }}
               >
                 {isMarkdown ? removeMarkdown(text) : text}

govtool/frontend/src/components/molecules/GovernanceVotedOnCard.tsx

@@ -108,18 +108,19 @@ export const GovernanceVotedOnCard = ({ votedProposal, inProgress }: Props) => {
           isSliderCard
         />
         <GovernanceActionCardElement
-          label={t("govActions.governanceActionId")}
-          text={govActionId}
-          dataTestId={`${govActionId}-id`}
+          label={t("govActions.cip129GovernanceActionId")}
+          text={cip129GovernanceActionId}
+          dataTestId={`${cip129GovernanceActionId}-id`}
           isCopyButton
           isSliderCard
         />
         <GovernanceActionCardElement
-          label={t("govActions.cip129GovernanceActionId")}
-          text={cip129GovernanceActionId}
-          dataTestId={`${cip129GovernanceActionId}-id`}
+          label={t("govActions.governanceActionId")}
+          text={govActionId}
+          dataTestId={`${govActionId}-id`}
           isCopyButton
           isSliderCard
+          isSemiTransparent
         />
         {vote && (
           <GovernanceActionCardMyVote

govtool/frontend/src/components/organisms/DRepCard.tsx

@@ -152,9 +152,9 @@ export const DRepCard = ({
                   }}
                 >
                   <ButtonBase
-                    data-testid={`${view}-copy-id-button`}
+                    data-testid={`${cip129Identifier}-copy-id-button`}
                     onClick={(e) => {
-                      navigator.clipboard.writeText(view);
+                      navigator.clipboard.writeText(cip129Identifier);
                       addSuccessAlert(t("alerts.copiedToClipboard"));
                       e.stopPropagation();
                     }}
@@ -169,21 +169,23 @@ export const DRepCard = ({
                         opacity: 0.6,
                         transition: "opacity 0.3s",
                       },
+                      display: "flex",
+                      flexDirection: "row",
                     }}
                   >
                     <Typography
                       color="primary"
                       variant="body2"
                       sx={ellipsisStyles}
                     >
-                      {view}
+                      {cip129Identifier}
                     </Typography>
                     <img alt="" src={ICONS.copyBlueIcon} />
                   </ButtonBase>
                   <ButtonBase
-                    data-testid={`${cip129Identifier}-copy-id-button`}
+                    data-testid={`${view}-copy-id-button`}
                     onClick={(e) => {
-                      navigator.clipboard.writeText(cip129Identifier);
+                      navigator.clipboard.writeText(view);
                       addSuccessAlert(t("alerts.copiedToClipboard"));
                       e.stopPropagation();
                     }}
@@ -198,18 +200,16 @@ export const DRepCard = ({
                         opacity: 0.6,
                         transition: "opacity 0.3s",
                       },
-                      display: "flex",
-                      flexDirection: "row",
                     }}
                   >
                     <Typography variant="body2" sx={ellipsisStyles}>
-                      (CIP-129){" "}
+                      (CIP-105){" "}
                       <Typography
                         color="primary"
                         variant="body2"
                         component="span"
                       >
-                        {cip129Identifier}
+                        {view}
                       </Typography>
                     </Typography>
                     <img alt="" src={ICONS.copyBlueIcon} />

govtool/frontend/src/components/organisms/DRepDetailsCard.tsx

@@ -112,13 +112,7 @@ export const DRepDetailsCard = ({
           />
         )}
         {/* ERROR MESSAGES END */}
-        <DRepDetailsInfoItem label={t("drepId")} dataTestId="drep-id">
-          <CopyableText value={view} dataTestId="copy-drep-id-button" />
-        </DRepDetailsInfoItem>
-        <DRepDetailsInfoItem
-          label={t("cip129DrepId")}
-          dataTestId="cip-129-drep-id"
-        >
+        <DRepDetailsInfoItem label={t("drepId")} dataTestId="cip-129-drep-id">
           <CopyableText
             value={encodeCIP129Identifier({
               txID: `${isScriptBased ? "23" : "22"}${drepId}`,
@@ -127,6 +121,18 @@ export const DRepDetailsCard = ({
             dataTestId="copy-cip-129-drep-id-button"
           />
         </DRepDetailsInfoItem>
+
+        <DRepDetailsInfoItem
+          label={t("cip105DRepId")}
+          dataTestId="cip-105-drep-id"
+        >
+          <CopyableText
+            isSemiTransparent
+            value={view}
+            dataTestId="copy-drep-id-button"
+          />
+        </DRepDetailsInfoItem>
+
         <DRepDetailsInfoItem label={t("status")} dataTestId="drep-status">
           <StatusPill status={status} />
         </DRepDetailsInfoItem>
@@ -296,9 +302,14 @@ const DRepDetailsInfoItem = ({
 type CopyableTextProps = {
   value: string;
   dataTestId: string;
+  isSemiTransparent?: boolean;
 };
 
-const CopyableText = ({ value, dataTestId }: CopyableTextProps) => (
+const CopyableText = ({
+  value,
+  dataTestId,
+  isSemiTransparent,
+}: CopyableTextProps) => (
   <ButtonBase
     onClick={(e) => {
       navigator.clipboard.writeText(value.toString());
@@ -314,7 +325,11 @@ const CopyableText = ({ value, dataTestId }: CopyableTextProps) => (
       },
     }}
   >
-    <Typography color="primary" fontWeight={500} sx={ellipsisStyles}>
+    <Typography
+      color="primary"
+      fontWeight={500}
+      sx={{ ...ellipsisStyles, opacity: isSemiTransparent ? 0.75 : 1 }}
+    >
       {value}
     </Typography>
     <img alt="" src={ICONS.copyBlueIcon} />

govtool/frontend/src/components/organisms/GovernanceActionDetailsCardData.tsx

@@ -256,18 +256,19 @@ export const GovernanceActionDetailsCardData = ({
         />
       )}
       <GovernanceActionCardElement
-        label={t("govActions.governanceActionId")}
-        text={govActionId}
+        label={t("govActions.cip129GovernanceActionId")}
+        text={cip129GovernanceActionId}
+        dataTestId={`${cip129GovernanceActionId}-id`}
         isCopyButton
-        dataTestId={`${govActionId}-id`}
         textVariant={screenWidth > 1600 ? "longText" : "oneLine"}
       />
       <GovernanceActionCardElement
-        label={t("govActions.cip129GovernanceActionId")}
-        text={cip129GovernanceActionId}
-        dataTestId={`${cip129GovernanceActionId}-id`}
+        label={t("govActions.governanceActionId")}
+        text={govActionId}
         isCopyButton
+        dataTestId={`${govActionId}-id`}
         textVariant={screenWidth > 1600 ? "longText" : "oneLine"}
+        isSemiTransparent
       />
 
       {tabs?.length === 1 ? (

govtool/frontend/src/i18n/locales/en.json

@@ -361,8 +361,8 @@
     "dReps": "DReps",
     "sPos": "SPOs",
     "ccCommittee": "Constitutional Committee",
-    "governanceActionId": "Governance Action ID:",
-    "cip129GovernanceActionId": "(CIP-129) Governance Action ID:",
+    "governanceActionId": "Legacy Governance Action ID (CIP-105):",
+    "cip129GovernanceActionId": "Governance Action ID:",
     "governanceActionType": "Governance Action Type:",
     "goToVote": "Go to Vote",
     "membersToBeRemovedFromTheCommittee": "Members to be removed from the Committee",
@@ -760,6 +760,7 @@
   "delegate": "Delegate",
   "drepId": "DRep ID",
   "cip129DrepId": "(CIP-129) DRep ID",
+  "cip105DRepId": "Legacy DRep ID (CIP-105)",
   "email": "Email",
   "feedback": "Feedback",
   "filter": "Filter",