[#119] Post code review adjustments

IntersectMBO · Feb 27, 2024 · 5c6659e · 5c6659e
1 parent 17d9230
commit 5c6659e
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 34 deletions.
diff --git a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
@@ -2,7 +2,7 @@ import { Box, ButtonProps, Skeleton } from "@mui/material";
 import { FC, ReactNode } from "react";
 
 import { CopyButton, LoadingButton, Typography } from "@atoms";
-import { useScreenDimension } from "@hooks";
+import { useScreenDimension, useTranslation } from "@hooks";
 import { theme } from "@/theme";
 
 type DashboardActionCardProps = {
@@ -31,6 +31,7 @@ type DashboardActionCardProps = {
 export const DashboardActionCard: FC<DashboardActionCardProps> = ({
   ...props
 }) => {
+  const { t } = useTranslation();
   const {
     cardId,
     cardTitle,
@@ -83,7 +84,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
           }}
         >
           <Typography color={"orangeDark"} variant="body2">
-            In progress
+            {t("inProgress").toLocaleUpperCase()}
           </Typography>
         </Box>
       )}

diff --git a/govtool/frontend/src/components/molecules/VoteActionForm.tsx b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
@@ -142,7 +142,7 @@ export const VoteActionForm = ({
             />
           </Box>
         </Box>
-        {voter?.isRegisteredAsDRep && (
+        {(voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter) && (
           <Button
             data-testid="show-votes-button"
             variant="text"

diff --git a/govtool/frontend/src/pages/Dashboard.tsx b/govtool/frontend/src/pages/Dashboard.tsx
@@ -7,7 +7,7 @@ import { useCardano } from "@context";
 import { Background, ScrollToManage } from "@atoms";
 import { useScreenDimension } from "@hooks";
 import { DashboardTopNav, Drawer, Footer } from "@organisms";
-import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
+import { checkIsWalletConnected } from "@/utils";
 
 const getPageTitle = (pathname: string) => {
   if (pathname === PATHS.dashboard) {
@@ -33,10 +33,7 @@ export const Dashboard = () => {
   }, [pathname, divRef]);
 
   useEffect(() => {
-    if (
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
-    ) {
+    if (checkIsWalletConnected()) {
       if (window.location.pathname === PATHS.dashboard) {
         navigate(PATHS.home);
       } else {

diff --git a/govtool/frontend/src/pages/DelegateTodRep.tsx b/govtool/frontend/src/pages/DelegateTodRep.tsx
@@ -10,8 +10,8 @@ import {
   Footer,
 } from "@organisms";
 import { useScreenDimension, useTranslation } from "@hooks";
-import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
 import { useNavigate } from "react-router-dom";
+import { checkIsWalletConnected } from "@/utils";
 
 export const DelegateTodRep = () => {
   const [step, setStep] = useState(1);
@@ -20,10 +20,7 @@ export const DelegateTodRep = () => {
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
-    ) {
+    if (checkIsWalletConnected()) {
       navigate(PATHS.home);
     }
   }, []);

diff --git a/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx b/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
@@ -4,18 +4,15 @@ import { useNavigate } from "react-router-dom";
 import { PATHS } from "@consts";
 import { RegisterAsSoleVoterBox } from "@organisms";
 import { useTranslation } from "@hooks";
-import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
 import { CenteredBoxPageWrapper } from "@molecules";
+import { checkIsWalletConnected } from "@/utils";
 
 export const RegisterAsSoleVoter = () => {
   const navigate = useNavigate();
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
-    ) {
+    if (checkIsWalletConnected()) {
       navigate(PATHS.home);
     }
   }, []);

diff --git a/govtool/frontend/src/pages/RegisterAsdRep.tsx b/govtool/frontend/src/pages/RegisterAsdRep.tsx
@@ -17,7 +17,7 @@ import {
   useTranslation,
 } from "@hooks";
 import { useNavigate } from "react-router-dom";
-import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
+import { checkIsWalletConnected } from "@/utils";
 
 export const RegisterAsdRep = () => {
   const [step, setStep] = useState<number>(1);
@@ -28,10 +28,7 @@ export const RegisterAsdRep = () => {
   const registerAsdRepFormMethods = useRegisterAsdRepFormController();
 
   useEffect(() => {
-    if (
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
-    ) {
+    if (checkIsWalletConnected()) {
       navigate(PATHS.home);
     }
   }, []);

diff --git a/govtool/frontend/src/pages/RetireAsSoleVoter.tsx b/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
@@ -4,18 +4,15 @@ import { PATHS } from "@consts";
 import { RetireAsSoleVoterBox } from "@organisms";
 import { useTranslation } from "@hooks";
 import { useNavigate } from "react-router-dom";
-import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
 import { CenteredBoxPageWrapper } from "@molecules";
+import { checkIsWalletConnected } from "@/utils";
 
 export const RetireAsSoleVoter = () => {
   const navigate = useNavigate();
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
-    ) {
+    if (checkIsWalletConnected()) {
       navigate(PATHS.home);
     }
   }, []);

diff --git a/govtool/frontend/src/pages/UpdatedRepMetadata.tsx b/govtool/frontend/src/pages/UpdatedRepMetadata.tsx
@@ -12,7 +12,7 @@ import {
 } from "@hooks";
 import { ControlledField, DashboardTopNav, Footer } from "@organisms";
 import { theme } from "@/theme";
-import { WALLET_LS_KEY, getItemFromLocalStorage, openInNewTab } from "@utils";
+import { checkIsWalletConnected, openInNewTab } from "@utils";
 
 export const UpdatedRepMetadata = () => {
   const navigate = useNavigate();
@@ -27,10 +27,7 @@ export const UpdatedRepMetadata = () => {
     useUpdatedRepMetadataForm();
 
   useEffect(() => {
-    if (
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
-    ) {
+    if (checkIsWalletConnected()) {
       navigate(PATHS.home);
     } else {
       const isPendingTx = isPendingTransaction();

diff --git a/govtool/frontend/src/utils/checkIsWalletConnected.ts b/govtool/frontend/src/utils/checkIsWalletConnected.ts
@@ -0,0 +1,5 @@
+import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
+
+export const checkIsWalletConnected = () =>
+  !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
+  !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`);
diff --git a/govtool/frontend/src/utils/index.ts b/govtool/frontend/src/utils/index.ts
@@ -2,7 +2,7 @@ export * from "./adaFormat";
 export * from "./basicReducer";
 export * from "./callAll";
 export * from "./formatDate";
-export * from "./getDRepId";
+export * from "./getDRepID";
 export * from "./getLengthInBytes";
 export * from "./getProposalTypeLabel";
 export * from "./isValidFormat";
@@ -11,3 +11,4 @@ export * from "./openInNewTab";
 export * from "./getGovActionId";
 export * from "./checkIsMaintenanceOn";
 export * from "./removeDuplicatedProposals";
+export * from "./checkIsWalletConnected";