Merge pull request #1104 from IntersectMBO/develop

Cardano Stack: Address Copying Added, HardFork Proposal Error Fixed, UI Enhancements, and Merged Pull Requests

CHANGELOG.md

@@ -63,6 +63,7 @@ changes.
 
 ### Fixed
 
+- proposal/list no longer throws 500 error when proposal's url is incorrect [Issue 1073](https://github.com/IntersectMBO/govtool/issues/1073)
 - drep/list sql fix (now the drep type is correct) [Issue 957](https://github.com/IntersectMBO/govtool/issues/957)
 - drep/list sql fix (now the latest tx date is correct) [Issue 826](https://github.com/IntersectMBO/govtool/issues/826)
 - drep/info no longer returns null values [Issue 720](https://github.com/IntersectMBO/govtool/issues/720)

README.md

@@ -10,7 +10,8 @@
 
 [![npm](https://img.shields.io/npm/v/npm.svg?style=flat-square)](https://www.npmjs.com/package/npm) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
-![Statements](https://img.shields.io/badge/statements-29.28%25-red.svg?style=flat) ![Branches](https://img.shields.io/badge/branches-86.39%25-yellow.svg?style=flat) ![Functions](https://img.shields.io/badge/functions-14.28%25-red.svg?style=flat) ![Lines](https://img.shields.io/badge/lines-29.28%25-red.svg?style=flat)
+
+[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=intersect-govtool&metric=ncloc)](https://sonarcloud.io/summary/overall?id=intersect-govtool) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=intersect-govtool&metric=coverage)](https://sonarcloud.io/summary/overall?id=intersect-govtool) [![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=intersect-govtool&metric=sqale_index)](https://sonarcloud.io/summary/overall?id=intersect-govtool) 
 
 </div>
 

govtool/backend/src/VVA/API.hs

@@ -407,5 +407,7 @@ validateMetadata MetadataValidationParams {..} = do
       $ Metadata.validateMetadata metadataValidationParamsUrl (unHexText metadataValidationParamsHash)
 
   case fromJSON result of
-    Error e -> throwError $ InternalError $ pack $ show e
-    Success a -> return a
+    Error e -> return $ MetadataValidationResponse Nothing False (AnyValue $ Just result)
+    Success (InternalMetadataValidationResponse {..}) -> return $ MetadataValidationResponse {metadataValidationResponseStatus=internalMetadataValidationResponseStatus, metadataValidationResponseValid=internalMmetadataValidationResponseValid, metadataValidationResponseRaw=AnyValue $ Just result}
+
+

govtool/backend/src/VVA/API/Types.hs

@@ -140,10 +140,36 @@ instance ToSchema MetadataValidationStatus where
         & description ?~ "Metadata Validation Status"
         & enum_ ?~ map toJSON [IncorrectFormat, IncorrectJSONLD, IncorrectHash, UrlNotFound]
 
+
+
+data InternalMetadataValidationResponse
+  = InternalMetadataValidationResponse
+      { internalMetadataValidationResponseStatus :: Maybe MetadataValidationStatus
+      , internalMmetadataValidationResponseValid :: Bool
+      }
+  deriving (Generic, Show)
+
+deriveJSON (jsonOptions "internalMetadataValidationResponse") ''InternalMetadataValidationResponse
+
+instance ToSchema InternalMetadataValidationResponse where
+    declareNamedSchema _ = do
+      NamedSchema name_ schema_ <-
+        genericDeclareNamedSchema
+        ( fromAesonOptions $ jsonOptions "internalMetadataValidationResponse" )
+        (Proxy :: Proxy InternalMetadataValidationResponse)
+      return $
+        NamedSchema name_ $
+          schema_
+            & description ?~ "Metadata Validation Response"
+            & example
+              ?~ toJSON ("{\"status\": \"INCORRECT_FORMTAT\", \"valid\":false, \"raw\":{\"some\":\"key\"}}" :: Text)
+
+
 data MetadataValidationResponse
   = MetadataValidationResponse
       { metadataValidationResponseStatus :: Maybe MetadataValidationStatus
       , metadataValidationResponseValid :: Bool
+      , metadataValidationResponseRaw :: AnyValue
       }
   deriving (Generic, Show)
 

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

@@ -5,7 +5,7 @@ import { Typography, Tooltip, CopyButton, TooltipProps } from "@atoms";
 
 type BaseProps = {
   label: string;
-  text?: string;
+  text?: string | number;
   dataTestId?: string;
   isSliderCard?: boolean;
   tooltipProps?: Omit<TooltipProps, "children">;
@@ -109,6 +109,7 @@ export const GovernanceActionCardElement = ({
               sx={{
                 fontSize: isSliderCard ? 14 : 16,
                 fontWeight: 400,
+                maxWidth: textVariant === "oneLine" ? "283px" : "auto",
                 lineHeight: isSliderCard ? "20px" : "24px",
                 ...(textVariant === "oneLine" && { whiteSpace: "nowrap" }),
                 ...((textVariant === "oneLine" ||
@@ -131,7 +132,7 @@ export const GovernanceActionCardElement = ({
             </Typography>
             {isCopyButton && (
               <Box ml={1}>
-                <CopyButton text={text} variant="blueThin" />
+                <CopyButton text={text.toString()} variant="blueThin" />
               </Box>
             )}
           </Box>

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

@@ -63,6 +63,7 @@ export const DashboardCards = () => {
           currentDelegation={currentDelegation}
           delegateTx={pendingTransaction.delegate}
           dRepID={dRepID}
+          voter={voter}
           votingPower={votingPower}
         />
 

govtool/frontend/src/components/organisms/DashboardCards/DelegateDashboardCard.tsx

@@ -5,7 +5,7 @@ import { Trans } from "react-i18next";
 import { IMAGES, PATHS } from "@consts";
 import { PendingTransaction } from "@context";
 import { useTranslation } from "@hooks";
-import { CurrentDelegation } from "@models";
+import { CurrentDelegation, VoterInfo } from "@models";
 import {
   DashboardActionCard,
   DashboardActionCardProps,
@@ -21,13 +21,15 @@ type DelegateDashboardCardProps = {
   currentDelegation: CurrentDelegation;
   delegateTx: PendingTransaction["delegate"];
   dRepID: string;
+  voter: VoterInfo;
   votingPower: number;
 };
 
 export const DelegateDashboardCard = ({
   currentDelegation,
   delegateTx,
   dRepID,
+  voter,
   votingPower,
 }: DelegateDashboardCardProps) => {
   const navigate = useNavigate();
@@ -56,7 +58,7 @@ export const DelegateDashboardCard = ({
 
   const cardProps: Partial<DashboardActionCardProps> = (() => {
     // transaction in progress
-    if (delegateTx) {
+    if (delegateTx && !voter.isRegisteredAsSoleVoter) {
       return {
         buttons: [learnMoreButton],
         description: getProgressDescription(delegateTx?.resourceId, ada),
@@ -66,7 +68,7 @@ export const DelegateDashboardCard = ({
     }
 
     // current delegation
-    if (currentDelegation) {
+    if (currentDelegation && !voter.isRegisteredAsSoleVoter) {
       return {
         buttons: currentDelegation?.dRepView
           ? [
@@ -116,11 +118,17 @@ export const DelegateDashboardCard = ({
   return (
     <DashboardActionCard
       imageURL={IMAGES.govActionDelegateImage}
-      isSpaceBetweenButtons={!!currentDelegation?.dRepView}
-      transactionId={delegateTx?.transactionHash || currentDelegation?.txHash}
+      isSpaceBetweenButtons={
+        !!currentDelegation?.dRepView && !voter.isRegisteredAsSoleVoter
+      }
+      transactionId={
+        !voter.isRegisteredAsSoleVoter
+          ? delegateTx?.transactionHash ?? currentDelegation?.txHash
+          : undefined
+      }
       {...cardProps}
     >
-      {displayedDelegationId && (
+      {displayedDelegationId && !voter.isRegisteredAsSoleVoter && (
         <DelegationAction
           dRepId={displayedDelegationId}
           onCardClick={navigateToDRepDetails}

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

@@ -7,10 +7,9 @@ import {
   DataMissingInfoBox,
   GovernanceActionDetailsCardHeader,
   GovernanceActionsDatesBox,
-  GovernanceActionDetailsCardOnChainData,
 } from "@molecules";
 import { useScreenDimension, useTranslation } from "@hooks";
-import { getProposalTypeNoEmptySpaces } from "@utils";
+import { getProposalTypeNoEmptySpaces, testIdFromLabel } from "@utils";
 import { MetadataValidationStatus } from "@models";
 
 type GovernanceActionDetailsCardDataProps = {
@@ -120,9 +119,16 @@ export const GovernanceActionDetailsCardData = ({
         textVariant="longText"
         dataTestId="rationale"
       />
-      {details && Object.keys(details).length !== 0 && (
-        <GovernanceActionDetailsCardOnChainData data={details} />
-      )}
+      {details &&
+        Object.keys(details).length !== 0 &&
+        Object.entries(details).map(([label, content]) => (
+          <GovernanceActionCardElement
+            isCopyButton={label.toLowerCase().includes("address")}
+            label={label}
+            text={content}
+            dataTestId={testIdFromLabel(label)}
+          />
+        ))}
       <GovernanceActionDetailsCardLinks links={links} />
     </Box>
   );

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

@@ -104,7 +104,7 @@ export const en = {
             "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
           register: "Register",
           registerDescription:
-            "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
+            "Register to Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
           registerTitle: "Become a Direct Voter",
           reRegister: "Re-register",
           registration: "Direct Voter Registration",
@@ -265,7 +265,7 @@ export const en = {
       myDelegation: "You have delegated <strong>₳ {{ada}}</strong> to:",
       myDelegationToYourself:
         "You have delegated <strong>₳ {{ada}}</strong> to yourself:",
-      myDRep: "This is your DRep profile",
+      myDRep: "You have delegated ₳{{ada}} to this DRep.",
       listTitle: "Find a DRep",
       noConfidenceDefaultDescription:
         "Select this to signal no confidence in the current constitutional committee by voting NO on every proposal and voting YES to no confidence proposals",

govtool/frontend/src/pages/DRepDetails.tsx

@@ -8,13 +8,15 @@ import { useCardano, useModal } from "@context";
 import {
   useDelegateTodRep,
   useGetAdaHolderCurrentDelegationQuery,
+  useGetAdaHolderVotingPowerQuery,
   useGetDRepListInfiniteQuery,
   useScreenDimension,
   useTranslation,
 } from "@hooks";
 import { Card, EmptyStateDrepDirectory, LinkWithIcon, Share } from "@molecules";
 import {
   correctAdaFormat,
+  correctDRepDirectoryFormat,
   isSameDRep,
   openInNewTab,
   testIdFromLabel,
@@ -42,6 +44,8 @@ export const DRepDetails = ({ isConnected }: DRepDetailsProps) => {
   const { dRepId: dRepParam } = useParams();
   const { delegate, isDelegating } = useDelegateTodRep();
   const { currentDelegation } = useGetAdaHolderCurrentDelegationQuery(stakeKey);
+  const { votingPower: myVotingPower } =
+    useGetAdaHolderVotingPowerQuery(stakeKey);
 
   const displayBackButton = location.state?.enteredFromWithinApp || false;
 
@@ -141,7 +145,11 @@ export const DRepDetails = ({ isConnected }: DRepDetailsProps) => {
             <Chip
               color="primary"
               label={
-                isMe ? t("dRepDirectory.meAsDRep") : t("dRepDirectory.myDRep")
+                isMe
+                  ? t("dRepDirectory.meAsDRep")
+                  : t("dRepDirectory.myDRep", {
+                      ada: correctDRepDirectoryFormat(myVotingPower),
+                    })
               }
               sx={{
                 boxShadow: (theme) => theme.shadows[2],