[#239 #240 #338] Fixes after CR

govtool/frontend/src/App.tsx

@@ -30,13 +30,13 @@ import {
   removeItemFromLocalStorage,
 } from "@utils";
 import { SetupInterceptors } from "./services";
-import { useGetDRepInfo, useWalletConnectionListener } from "./hooks";
+import { useGetVoterInfo, useWalletConnectionListener } from "./hooks";
 import { RegisterAsSoleVoter } from "./pages/RegisterAsSoleVoter";
 
 export default function App() {
   const { enable, setVoter, setIsDrepLoading } = useCardano();
   const navigate = useNavigate();
-  const { data } = useGetDRepInfo();
+  const { data } = useGetVoterInfo();
   const { modal, openModal, modals } = useModal();
 
   useWalletConnectionListener();

govtool/frontend/src/context/walletUtils.ts

@@ -1,4 +1,4 @@
-import { getAdaHolderCurrentDelegation, getDRepInfo } from "@services";
+import { getAdaHolderCurrentDelegation, getVoterInfo } from "@services";
 import { DRepActionType } from "./wallet";
 import { VoterInfo } from "@models";
 
@@ -18,7 +18,7 @@ export const setLimitedRegistrationInterval = (
         count++;
 
         try {
-          const data = await getDRepInfo(dRepID);
+          const data = await getVoterInfo(dRepID);
 
           if (
             data.isRegisteredAsDRep === desiredResult ||

govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx

@@ -37,14 +37,12 @@ export const useRegisterAsdRepFormContext = () => {
       const { url, hash } = values;
 
       // Temporary solution. To modify later.
-      const urlSubmitValue =
-        !url || url === ""
-          ? "https://raw.githubusercontent.com/Thomas-Upfield/test-metadata/main/placeholder.json"
-          : url;
-      const hashSubmitValue =
-        !hash || hash === ""
-          ? "654e483feefc4d208ea02637a981a2046e17c73c09583e9dd0c84c25dab42749"
-          : hash;
+      const urlSubmitValue = !url
+        ? "https://raw.githubusercontent.com/Thomas-Upfield/test-metadata/main/placeholder.json"
+        : url;
+      const hashSubmitValue = !hash
+        ? "654e483feefc4d208ea02637a981a2046e17c73c09583e9dd0c84c25dab42749"
+        : hash;
       setIsLoading(true);
 
       try {

govtool/frontend/src/hooks/forms/useUpdatedRepMetadataForm.tsx

@@ -27,14 +27,12 @@ export const useUpdatedRepMetadataForm = () => {
       const { url, hash } = values;
 
       // Temporary solution. To modify later.
-      const urlSubmitValue =
-        !url || url === ""
-          ? "https://raw.githubusercontent.com/Thomas-Upfield/test-metadata/main/placeholder.json"
-          : url;
-      const hashSubmitValue =
-        !hash || hash === ""
-          ? "654e483feefc4d208ea02637a981a2046e17c73c09583e9dd0c84c25dab42749"
-          : hash;
+      const urlSubmitValue = !url
+        ? "https://raw.githubusercontent.com/Thomas-Upfield/test-metadata/main/placeholder.json"
+        : url;
+      const hashSubmitValue = !hash
+        ? "654e483feefc4d208ea02637a981a2046e17c73c09583e9dd0c84c25dab42749"
+        : hash;
       setIsLoading(true);
       try {
         const certBuilder = await buildDRepUpdateCert(

govtool/frontend/src/hooks/queries/index.ts

@@ -1,6 +1,6 @@
 export * from "./useGetAdaHolderCurrentDelegationQuery";
 export * from "./useGetAdaHolderVotingPowerQuery";
-export * from "./useGetDRepInfoQuery";
+export * from "./useGetVoterInfoQuery";
 export * from "./useGetDRepListQuery";
 export * from "./useGetDRepVotesQuery";
 export * from "./useGetDRepVotingPowerQuery";

govtool/frontend/src/hooks/queries/useGetDRepInfoQuery.ts → govtool/frontend/src/hooks/queries/useGetVoterInfoQuery.ts

@@ -2,9 +2,9 @@ import { useQuery } from "react-query";
 
 import { QUERY_KEYS } from "@consts";
 import { useCardano } from "@context";
-import { getDRepInfo } from "@services";
+import { getVoterInfo } from "@services";
 
-export const useGetDRepInfo = () => {
+export const useGetVoterInfo = () => {
   const { dRepID, registerTransaction, soleVoterTransaction } = useCardano();
 
   const { data, isLoading } = useQuery({
@@ -14,7 +14,7 @@ export const useGetDRepInfo = () => {
       soleVoterTransaction?.transactionHash,
     ],
     enabled: !!dRepID,
-    queryFn: async () => await getDRepInfo(dRepID),
+    queryFn: async () => await getVoterInfo(dRepID),
   });
 
   return { data, isLoading };

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

@@ -114,10 +114,10 @@ export const en = {
         retire: "Retire",
         wasSoleVoterTitle: "You Have Retired as a Sole Voter",
         retirement: "Sole Voter Retirement",
-        wasRegisteredDescription:
-          "You cannot vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>. until you re-register.",
         retirementInProgress:
           "The retirement process is ongoing. This may take several minutes.",
+        wasRegisteredDescription:
+          "You cannot vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>. until you re-register.",
         youAreSoleVoterTitle: "You are a Sole Voter",
       },
     },

govtool/frontend/src/services/requests/getDRepInfo.ts → govtool/frontend/src/services/requests/getVoterInfo.ts

@@ -2,7 +2,7 @@ import { API } from "../API";
 
 import type { VoterInfo } from "@models";
 
-export const getDRepInfo = async (dRepID: string) => {
+export const getVoterInfo = async (dRepID: string) => {
   const response = await API.get<VoterInfo>(`/drep/info/${dRepID}`);
 
   return response.data;

govtool/frontend/src/services/requests/index.ts

@@ -1,6 +1,6 @@
 export * from "./getAdaHolderCurrentDelegation";
 export * from "./getAdaHolderVotingPower";
-export * from "./getDRepInfo";
+export * from "./getVoterInfo";
 export * from "./getDRepList";
 export * from "./getDRepVotes";
 export * from "./getDRepVotingPower";