From 29069b3b49213a0df94cd2fefb6cebb492027a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 23 Feb 2024 11:35:24 +0100
Subject: [PATCH 01/82] fix get drep voting power

---
 .../frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index aade95029..48729a672 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -5,14 +5,14 @@ import { useCardano } from "@context";
 import { getDRepVotingPower } from "@services";
 
 export const useGetDRepVotingPowerQuery = () => {
-  const { dRepID } = useCardano();
+  const { dRepID, dRep } = useCardano();
 
   const { data, isLoading } = useQuery({
     queryKey: QUERY_KEYS.useGetDRepVotingPowerKey,
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },
-    enabled: !!dRepID,
+    enabled: !!dRepID && dRep?.isRegistered,
   });
 
   return { dRepVotingPower: data, isDRepVotingPowerLoading: isLoading };

From 2e3a764fa9af99a4c8e45fd98cd69e8dd8962205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 23 Feb 2024 12:46:10 +0100
Subject: [PATCH 02/82] add keys

---
 .../frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index 48729a672..5df7a3af1 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -8,7 +8,7 @@ export const useGetDRepVotingPowerQuery = () => {
   const { dRepID, dRep } = useCardano();
 
   const { data, isLoading } = useQuery({
-    queryKey: QUERY_KEYS.useGetDRepVotingPowerKey,
+    queryKey: [QUERY_KEYS.useGetDRepVotingPowerKey, dRepID, dRep?.isRegistered],
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },

From 7ac847f9e5fa38b074d56f1c78753751f0220e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Fri, 23 Feb 2024 14:09:31 +0100
Subject: [PATCH 03/82] [#280] Fix get drep voting power request

---
 CHANGELOG.md                                                | 1 +
 .../frontend/src/hooks/mutations/useDRepRegisterMutation.ts | 6 +++++-
 .../frontend/src/hooks/mutations/useDRepRetireMutation.ts   | 6 +++++-
 .../src/hooks/queries/useGetDRepVotingPowerQuery.ts         | 2 +-
 govtool/frontend/src/models/api.ts                          | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e9e33261..90954bacd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ changes.
 - Fixed vote calculation problems related to NoConfidence DRep [Issue 59](https://github.com/IntersectMBO/govtool/issues/59)
 - Fixed ada-holder/get-current-delegation error when delegated to NoConfidence or AlwaysAbstain dreps. [Issue 82](https://github.com/IntersectMBO/govtool/issues/82)
 - Fixed deployment scripts to address [Issue 171](https://github.com/IntersectMBO/govtool/issues/171).
+- Fixed get drep voting power incorrectly executed endpoint [Issue 280](https://github.com/IntersectMBO/govtool/issues/280)
 
 ### Changed
 - Update Cardano-Serialization-Lib to 12.0.0-alpha.16 [Issue 156](https://github.com/IntersectMBO/govtool/issues/156)
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
index 76b79287d..d757d09b2 100644
--- a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
+++ b/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
@@ -7,7 +7,11 @@ export const useDRepRegisterMutation = () => {
 
   const { mutateAsync, isLoading } = useMutation(postDRepRegister, {
     onSuccess: () => {
-      setDRep({ deposit: 100, isRegistered: true, wasRegistered: false });
+      setDRep({
+        deposit: 100,
+        isRegistered: true,
+        wasRegistered: false,
+      });
     },
   });
 
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
index b3697c714..8bf8973e1 100644
--- a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
+++ b/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
@@ -8,7 +8,11 @@ export const useDRepRetireMutation = () => {
 
   const { mutateAsync } = useMutation(postDRepRetire, {
     onSuccess: () => {
-      setDRep({ deposit: 100, wasRegistered: true, isRegistered: false });
+      setDRep({
+        deposit: 100,
+        wasRegistered: true,
+        isRegistered: false,
+      });
       addSuccessAlert("DRep retired.");
     },
   });
diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index 5df7a3af1..836946aa9 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -12,7 +12,7 @@ export const useGetDRepVotingPowerQuery = () => {
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },
-    enabled: !!dRepID && dRep?.isRegistered,
+    enabled: !!dRepID && !!dRep?.isRegistered,
   });
 
   return { dRepVotingPower: data, isDRepVotingPowerLoading: isLoading };
diff --git a/govtool/frontend/src/models/api.ts b/govtool/frontend/src/models/api.ts
index 03fec9e2b..5281e2a9e 100644
--- a/govtool/frontend/src/models/api.ts
+++ b/govtool/frontend/src/models/api.ts
@@ -1,7 +1,7 @@
 export interface DRepInfo {
   isRegistered: boolean;
   wasRegistered: boolean;
-  deposit: number;
+  deposit: number | null;
 }
 
 export interface DRepData {

From 965c021c3f8a102f2e7c928a66c2435e536dc3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 23 Feb 2024 11:35:24 +0100
Subject: [PATCH 04/82] fix get drep voting power

---
 .../frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index aade95029..48729a672 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -5,14 +5,14 @@ import { useCardano } from "@context";
 import { getDRepVotingPower } from "@services";
 
 export const useGetDRepVotingPowerQuery = () => {
-  const { dRepID } = useCardano();
+  const { dRepID, dRep } = useCardano();
 
   const { data, isLoading } = useQuery({
     queryKey: QUERY_KEYS.useGetDRepVotingPowerKey,
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },
-    enabled: !!dRepID,
+    enabled: !!dRepID && dRep?.isRegistered,
   });
 
   return { dRepVotingPower: data, isDRepVotingPowerLoading: isLoading };

From 602c0835fb102fb8218423d1a6927db3c6d2acac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 23 Feb 2024 12:46:10 +0100
Subject: [PATCH 05/82] add keys

---
 .../frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index 48729a672..5df7a3af1 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -8,7 +8,7 @@ export const useGetDRepVotingPowerQuery = () => {
   const { dRepID, dRep } = useCardano();
 
   const { data, isLoading } = useQuery({
-    queryKey: QUERY_KEYS.useGetDRepVotingPowerKey,
+    queryKey: [QUERY_KEYS.useGetDRepVotingPowerKey, dRepID, dRep?.isRegistered],
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },

From e18baa1b111a618bb2cc1f4c2d24ebb726eff4fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Fri, 23 Feb 2024 14:09:31 +0100
Subject: [PATCH 06/82] [#280] Fix get drep voting power request

---
 CHANGELOG.md                                                | 1 +
 .../frontend/src/hooks/mutations/useDRepRegisterMutation.ts | 6 +++++-
 .../frontend/src/hooks/mutations/useDRepRetireMutation.ts   | 6 +++++-
 .../src/hooks/queries/useGetDRepVotingPowerQuery.ts         | 2 +-
 govtool/frontend/src/models/api.ts                          | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e9e33261..90954bacd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ changes.
 - Fixed vote calculation problems related to NoConfidence DRep [Issue 59](https://github.com/IntersectMBO/govtool/issues/59)
 - Fixed ada-holder/get-current-delegation error when delegated to NoConfidence or AlwaysAbstain dreps. [Issue 82](https://github.com/IntersectMBO/govtool/issues/82)
 - Fixed deployment scripts to address [Issue 171](https://github.com/IntersectMBO/govtool/issues/171).
+- Fixed get drep voting power incorrectly executed endpoint [Issue 280](https://github.com/IntersectMBO/govtool/issues/280)
 
 ### Changed
 - Update Cardano-Serialization-Lib to 12.0.0-alpha.16 [Issue 156](https://github.com/IntersectMBO/govtool/issues/156)
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
index 76b79287d..d757d09b2 100644
--- a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
+++ b/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
@@ -7,7 +7,11 @@ export const useDRepRegisterMutation = () => {
 
   const { mutateAsync, isLoading } = useMutation(postDRepRegister, {
     onSuccess: () => {
-      setDRep({ deposit: 100, isRegistered: true, wasRegistered: false });
+      setDRep({
+        deposit: 100,
+        isRegistered: true,
+        wasRegistered: false,
+      });
     },
   });
 
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
index b3697c714..8bf8973e1 100644
--- a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
+++ b/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
@@ -8,7 +8,11 @@ export const useDRepRetireMutation = () => {
 
   const { mutateAsync } = useMutation(postDRepRetire, {
     onSuccess: () => {
-      setDRep({ deposit: 100, wasRegistered: true, isRegistered: false });
+      setDRep({
+        deposit: 100,
+        wasRegistered: true,
+        isRegistered: false,
+      });
       addSuccessAlert("DRep retired.");
     },
   });
diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index 5df7a3af1..836946aa9 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -12,7 +12,7 @@ export const useGetDRepVotingPowerQuery = () => {
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },
-    enabled: !!dRepID && dRep?.isRegistered,
+    enabled: !!dRepID && !!dRep?.isRegistered,
   });
 
   return { dRepVotingPower: data, isDRepVotingPowerLoading: isLoading };
diff --git a/govtool/frontend/src/models/api.ts b/govtool/frontend/src/models/api.ts
index 03fec9e2b..5281e2a9e 100644
--- a/govtool/frontend/src/models/api.ts
+++ b/govtool/frontend/src/models/api.ts
@@ -1,7 +1,7 @@
 export interface DRepInfo {
   isRegistered: boolean;
   wasRegistered: boolean;
-  deposit: number;
+  deposit: number | null;
 }
 
 export interface DRepData {

From 3d96d83232f946be940b18eca443b9d75c345162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Mon, 26 Feb 2024 15:20:54 +0100
Subject: [PATCH 07/82] [#265] make button disabled when tries to connect

---
 CHANGELOG.md                                  |  1 +
 .../src/components/molecules/WalletOption.tsx | 81 ++++++++++++-------
 govtool/frontend/src/context/wallet.tsx       |  7 ++
 3 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90954bacd..b80f9c5f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ changes.
 - i18next library added to FE [Issue 80](https://github.com/IntersectMBO/govtool/issues/80)
 
 ### Fixed
+- Fix make button disble when wallet tries connect [Issue 265](https://github.com/IntersectMBO/govtool/issues/265)
 - Fix drep voting power calculation [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
 - Fix proposal/list and network/metrics bug that appeared when noone has delegated their funds either to drep_always_abstain or drep_always_no_confidence [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
 - Fix GA details [Issue 272](https://github.com/IntersectMBO/govtool/issues/272)
diff --git a/govtool/frontend/src/components/molecules/WalletOption.tsx b/govtool/frontend/src/components/molecules/WalletOption.tsx
index 94c5f9ed7..a1a14dd69 100644
--- a/govtool/frontend/src/components/molecules/WalletOption.tsx
+++ b/govtool/frontend/src/components/molecules/WalletOption.tsx
@@ -1,10 +1,10 @@
-import { Box, Typography } from "@mui/material";
-import { FC } from "react";
+import { FC, useCallback } from "react";
+import { useNavigate } from "react-router-dom";
+import { Box, CircularProgress, Typography } from "@mui/material";
 
+import { PATHS } from "@consts";
 import { useCardano } from "@context";
 import { theme } from "@/theme";
-import { useNavigate } from "react-router-dom";
-import { PATHS } from "@/consts";
 
 export interface WalletOption {
   icon: string;
@@ -15,7 +15,7 @@ export interface WalletOption {
 }
 
 export const WalletOptionButton: FC<WalletOption> = ({ ...props }) => {
-  const { enable } = useCardano();
+  const { enable, isEnableLoading } = useCardano();
   const {
     palette: { lightBlue },
   } = theme;
@@ -23,52 +23,77 @@ export const WalletOptionButton: FC<WalletOption> = ({ ...props }) => {
 
   const { dataTestId, icon, label, name, cip95Available } = props;
 
+  const enableByWalletName = useCallback(async() => {
+    if(isEnableLoading) return;
+    const result = await enable(name);
+    if (result?.stakeKey) {
+      navigate(PATHS.dashboard);
+      return;
+    }
+    navigate(PATHS.stakeKeys);
+  }, [enable, isEnableLoading])
+
   return (
     <Box
       data-testid={dataTestId}
       sx={{
         alignItems: "center",
-        border: `1px solid ${lightBlue}`,
+        border: isEnableLoading ? "none" : `1px solid ${lightBlue}`,
+        bgcolor: isEnableLoading ? "#EAE9F0" : "white",
         borderRadius: "100px",
-        boxShadow: "0px 0px 11px 0px #24223230",
+        boxShadow: isEnableLoading ? undefined : "0px 0px 11px 0px #24223230",
         boxSizing: "border-box",
-        cursor: cip95Available ? "pointer" : "unset",
+        cursor: cip95Available
+          ? isEnableLoading
+            ? "default"
+            : "pointer"
+          : "unset",
         display: "flex",
         justifyContent: "space-between",
         marginBottom: "16px",
-        padding: "12px 28px 12px 13px",
+        padding: "12px 13px 12px 13px",
         transition: "background .2s",
+        position: "relative",
         width: "100%",
-        "&:hover": {
-          background: lightBlue,
-        },
+        "&:hover": isEnableLoading
+          ? undefined
+          : {
+              background: lightBlue,
+            },
       }}
       key={name}
-      onClick={async () => {
-        const result = await enable(name);
-        if (result?.stakeKey) {
-          navigate(PATHS.dashboard);
-          return;
-        }
-        navigate(PATHS.stakeKeys);
-      }}
+      onClick={enableByWalletName}
     >
       <img
         alt={`${name} icon`}
         src={icon}
-        style={{ height: "24px", width: "24px" }}
+        style={{
+          height: "24px",
+          width: "24px",
+          filter: isEnableLoading ? "grayscale(100%)" : "none",
+        }}
       />
       <Typography
-        color="primaryBlue"
-        sx={{ fontSize: "16px", fontWeight: "500" }}
+        color={isEnableLoading ? "#C1BED3" : "primaryBlue"}
+        sx={{
+          fontSize: "16px",
+          fontWeight: "500",
+        }}
       >
         {name ?? label}
       </Typography>
-      <img
-        alt={`${name} icon`}
-        src={icon}
-        style={{ height: "24px", width: "24px", visibility: "hidden" }}
-      />
+      <div style={{ height: "24px", width: "24px" }} />
+      {isEnableLoading === name && (
+        <Box
+          position="absolute"
+          left={0}
+          right={0}
+          display="flex"
+          justifyContent="center"
+        >
+          <CircularProgress size={26} />
+        </Box>
+      )}
     </Box>
   );
 };
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 3d49f7a25..765e24226 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -97,6 +97,7 @@ interface CardanoContext {
   address?: string;
   disconnectWallet: () => Promise<void>;
   enable: (walletName: string) => Promise<EnableResponse>;
+  isEnableLoading: string | null;
   error?: string;
   dRep: DRepInfo | undefined;
   isEnabled: boolean;
@@ -165,6 +166,7 @@ CardanoContext.displayName = "CardanoContext";
 
 function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
+  const [isEnableLoading, setIsEnableLoading] = useState<string | null>(null);
   const [dRep, setDRep] = useState<DRepInfo | undefined>(undefined);
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
@@ -517,6 +519,7 @@ function CardanoProvider(props: Props) {
 
   const enable = useCallback(
     async (walletName: string) => {
+      setIsEnableLoading(walletName);
       await checkIsMaintenanceOn();
 
       // todo: use .getSupportedExtensions() to check if wallet supports CIP-95
@@ -650,6 +653,8 @@ function CardanoProvider(props: Props) {
             status: "ERROR",
             error: `${e == undefined ? t("errors.somethingWentWrong") : e}`,
           };
+        } finally {
+          setIsEnableLoading(null);
         }
       }
       throw { status: "ERROR", error: t("errors.somethingWentWrong") };
@@ -1141,6 +1146,7 @@ function CardanoProvider(props: Props) {
       isPendingTransaction,
       isDrepLoading,
       setIsDrepLoading,
+      isEnableLoading,
     }),
     [
       address,
@@ -1173,6 +1179,7 @@ function CardanoProvider(props: Props) {
       isPendingTransaction,
       isDrepLoading,
       setIsDrepLoading,
+      isEnableLoading,
     ]
   );
 

From c17c0c051a921ea752849df57b385cfd96adda46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Placzy=C5=84ski?= <placzynski.pawel@gmail.com>
Date: Mon, 26 Feb 2024 14:36:25 +0100
Subject: [PATCH 08/82] =?UTF-8?q?[#301]=20Add=20Micha=C5=82=20Sza=C5=82ows?=
 =?UTF-8?q?ki=20to=20SSH=20access=20list=20for=20environment=20management?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit updates the user_data.sh script within the Terraform modules
for govtool-EC2 instances. It adds Michał Szałowski to the list of users
authorized for SSH access, thereby expanding the secure access
management system to include a team leader. This change is a step
towards fulfilling the secure credential sharing acceptance criterion by
ensuring new team members like Michał have the necessary access to
sensitive environments.
---
 infra/terraform/modules/govtool-ec2/main.tf      | 2 +-
 infra/terraform/modules/govtool-ec2/user_data.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra/terraform/modules/govtool-ec2/main.tf b/infra/terraform/modules/govtool-ec2/main.tf
index f71417f05..40ad6f6cd 100644
--- a/infra/terraform/modules/govtool-ec2/main.tf
+++ b/infra/terraform/modules/govtool-ec2/main.tf
@@ -153,7 +153,7 @@ resource "aws_instance" "govtool" {
   }
 
   user_data = file("${path.module}/user_data.sh")
-  # user_data_replace_on_change = true
+  user_data_replace_on_change = false
 
   credit_specification {
     cpu_credits = "unlimited"
diff --git a/infra/terraform/modules/govtool-ec2/user_data.sh b/infra/terraform/modules/govtool-ec2/user_data.sh
index 6f9708ffe..79a7f1a06 100644
--- a/infra/terraform/modules/govtool-ec2/user_data.sh
+++ b/infra/terraform/modules/govtool-ec2/user_data.sh
@@ -2,7 +2,7 @@
 
 # setup ssh access
 mkdir -p /home/ubuntu/.ssh
-users="a.guderski,michal.jankun,p.placzynski"
+users="a.guderski,michal.jankun,p.placzynski,michal.szalowski"
 curl --retry 5 --retry-delay 5 -L keys.binarapps.com/ssh/{$users} | tee -a /home/ubuntu/.ssh/authorized_keys
 echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKeM0HOF9szWhOfbQM8XkIfznORTtTaCJJStALYjQuy6 (voltaire-era-github-actions)" | tee -a /home/ubuntu/.ssh/authorized_keys
 chmod 700 /home/ubuntu/.ssh

From 1a27c092c2887152f8ce079dee146eab509aaa59 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Wed, 14 Feb 2024 09:37:03 +0100
Subject: [PATCH 09/82] Sole voter information page, without footer

---
 govtool/frontend/src/App.tsx                  |   5 +
 .../components/organisms/SoleVoterInfo.tsx    | 108 +++++++++++++++++
 govtool/frontend/src/consts/paths.ts          |   1 +
 govtool/frontend/src/i18n/locales/en.ts       |   8 ++
 .../src/pages/RegisterAsSoleVoter.tsx         | 110 ++++++++++++++++++
 5 files changed, 232 insertions(+)
 create mode 100644 govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
 create mode 100644 govtool/frontend/src/pages/RegisterAsSoleVoter.tsx

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index 91dab6356..d48e4d55a 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -30,6 +30,7 @@ import {
 } from "@utils";
 import { SetupInterceptors } from "./services";
 import { useGetDRepInfo, useWalletConnectionListener } from "./hooks";
+import { RegisterAsSoleVoter } from "./pages/RegisterAsSoleVoter";
 
 export default function App() {
   const { enable, setDRep, setIsDrepLoading } = useCardano();
@@ -115,6 +116,10 @@ export default function App() {
         </Route>
         <Route path={PATHS.delegateTodRep} element={<DelegateTodRep />} />
         <Route path={PATHS.registerAsdRep} element={<RegisterAsdRep />} />
+        <Route
+          path={PATHS.registerAsSoleVoter}
+          element={<RegisterAsSoleVoter />}
+        />
         <Route path={PATHS.stakeKeys} element={<ChooseStakeKey />} />
         <Route path={PATHS.updateMetadata} element={<UpdatedRepMetadata />} />
         <Route path="*" element={<ErrorPage />} />
diff --git a/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx b/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
new file mode 100644
index 000000000..4eb34dafe
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
@@ -0,0 +1,108 @@
+import { useMemo } from "react";
+import { Box, Link } from "@mui/material";
+
+import { LoadingButton, Button, Typography } from "@atoms";
+import { theme } from "@/theme";
+import { useScreenDimension, useTranslation } from "@hooks";
+import { Trans } from "react-i18next";
+import { openInNewTab } from "@/utils";
+import { useNavigate } from "react-router-dom";
+import { PATHS } from "@consts";
+
+export const SoleVoterInfo = () => {
+  const {
+    palette: { boxShadow2 },
+  } = theme;
+  const { isMobile, pagePadding, screenWidth } = useScreenDimension();
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+
+  const renderBackButton = useMemo(() => {
+    return (
+      <Button
+        data-testid={"back-button"}
+        onClick={() => navigate(PATHS.dashboard)}
+        size="extraLarge"
+        sx={{
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+        }}
+        variant="outlined"
+      >
+        {t("cancel")}
+      </Button>
+    );
+  }, [isMobile]);
+
+  const renderRegisterButton = useMemo(() => {
+    return (
+      <LoadingButton
+        data-testid={"register-button"}
+        // isLoading={isLoading}
+        onClick={() => {}}
+        sx={{
+          borderRadius: 50,
+          textTransform: "none",
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+          height: 48,
+        }}
+        variant="contained"
+      >
+        {t("soleVoter.continueToRegister")}
+      </LoadingButton>
+    );
+  }, [
+    // isLoading,
+    isMobile,
+  ]);
+
+  return (
+    <Box
+      width={screenWidth < 768 ? "auto" : screenWidth < 1024 ? "60vw" : "45vw"}
+      boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
+      px={pagePadding}
+      py={isMobile ? 3 : 8}
+      borderRadius={"20px"}
+      mb={isMobile ? 0 : 6}
+      height="auto"
+    >
+      <Box display="flex" flexDirection="column">
+        <Typography sx={{ mt: 1, textAlign: "center" }} variant="headline4">
+          {t("soleVoter.heading")}
+        </Typography>
+        <Typography
+          fontWeight={400}
+          sx={{
+            mb: 7,
+            mt: isMobile ? 4 : 10,
+            textAlign: "center",
+            whiteSpace: "pre-line",
+          }}
+          variant="body1"
+        >
+          <Trans
+            i18nKey="soleVoter.description"
+            components={[
+              <Link
+                onClick={() => openInNewTab("https://sancho.network/")}
+                sx={{ cursor: "pointer" }}
+                key="0"
+              />,
+            ]}
+          />
+        </Typography>
+      </Box>
+      <Box
+        display="flex"
+        flexDirection={isMobile ? "column" : "row"}
+        justifyContent="space-between"
+        mt={6}
+      >
+        {isMobile ? renderRegisterButton : renderBackButton}
+        <Box px={2} py={isMobile ? 1.5 : 0} />
+        {isMobile ? renderBackButton : renderRegisterButton}
+      </Box>
+    </Box>
+  );
+};
diff --git a/govtool/frontend/src/consts/paths.ts b/govtool/frontend/src/consts/paths.ts
index 645f4e695..8af3a6381 100644
--- a/govtool/frontend/src/consts/paths.ts
+++ b/govtool/frontend/src/consts/paths.ts
@@ -16,6 +16,7 @@ export const PATHS = {
   faqs: "/faqs",
   delegateTodRep: "/delegate",
   registerAsdRep: "/register",
+  registerAsSoleVoter: "/register_sole_voter",
   stakeKeys: "/stake_keys",
   updateMetadata: "/update_metadata",
 };
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 9204175a4..68cd48743 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -286,6 +286,13 @@ export const en = {
       showAll: "Show all",
       viewAll: "View all",
     },
+    soleVoter: {
+      becomeSoleVoter: "Become a Sole Voter",
+      continueToRegister: "Continue to register",
+      description:
+        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳2</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
+      heading: "What this Means",
+    },
     system: {
       sanchoNet: "SanchoNet",
       sanchoNetIsBeta:
@@ -360,6 +367,7 @@ export const en = {
     back: "Back",
     backToDashboard: "Back to dashboard",
     backToList: "Back to the list",
+    backToDashboard: "Back to dashboard",
     cancel: "Cancel",
     clear: "Clear",
     confirm: "Confirm",
diff --git a/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx b/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
new file mode 100644
index 000000000..370a5fefc
--- /dev/null
+++ b/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
@@ -0,0 +1,110 @@
+import { useEffect } from "react";
+import { Box, Link } from "@mui/material";
+
+import { Background, Typography } from "@atoms";
+import { ICONS, PATHS } from "@consts";
+import { DashboardTopNav, Footer } from "@organisms";
+import { useScreenDimension, useTranslation } from "@hooks";
+import { useNavigate } from "react-router-dom";
+import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
+import { SoleVoterInfo } from "@/components/organisms/SoleVoterInfo";
+
+export const RegisterAsSoleVoter = () => {
+  const { isMobile, screenWidth } = useScreenDimension();
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
+    ) {
+      navigate(PATHS.home);
+    }
+  }, []);
+
+  return (
+    <Background isReverted>
+      <Box display={"flex"} minHeight={"100vh"} flexDirection="column">
+        <DashboardTopNav
+          imageSRC={ICONS.appLogoIcon}
+          imageWidth={isMobile ? undefined : 42}
+          imageHeight={isMobile ? 24 : 35}
+          title={t("soleVoter.becomeSoleVoter")}
+        />
+
+        <Box
+          mt={isMobile ? 0 : 7}
+          height={isMobile ? "100%" : "auto"}
+          sx={{
+            marginTop: isMobile ? "97px" : "153px",
+            display: isMobile ? "flex" : "grid",
+            ...(isMobile && {
+              flexDirection: "column",
+            }),
+            ...(!isMobile && { gridTemplateColumns: "1fr auto 1fr" }),
+          }}
+        >
+          {isMobile && (
+            <Box borderBottom={1} borderColor={"#fff"}>
+              <Typography
+                variant="body2"
+                sx={{
+                  ml: 2,
+                  my: "26px",
+                  fontSize: "24px",
+                  fontWeight: 400,
+                }}
+              >
+                {t("soleVoter.becomeSoleVoter")}
+              </Typography>
+            </Box>
+          )}
+          <Link
+            data-testid={"back-to-list-link"}
+            sx={{
+              cursor: "pointer",
+              alignSelf: "flex-start",
+              display: "flex",
+              justifyContent: "center",
+              textDecoration: "none",
+              marginBottom: 3,
+              mt: isMobile ? 3 : "none",
+              mx: isMobile ? 2 : 1,
+            }}
+            onClick={() => navigate(PATHS.dashboard)}
+          >
+            <img
+              src={ICONS.arrowRightIcon}
+              alt="arrow"
+              style={{
+                marginRight: isMobile
+                  ? "12px"
+                  : screenWidth < 950
+                  ? "8px"
+                  : "12px",
+                transform: "rotate(180deg)",
+              }}
+            />
+            <Typography
+              variant="body2"
+              color="primary"
+              sx={{
+                display: "inline-block",
+                fontSize: isMobile
+                  ? "14px"
+                  : screenWidth < 950
+                  ? "12px"
+                  : "14px",
+              }}
+            >
+              {t("backToDashboard")}
+            </Typography>
+          </Link>
+          <SoleVoterInfo />
+        </Box>
+        {isMobile && <Footer />}
+      </Box>
+    </Background>
+  );
+};

From 119471f4fc37ed9e857978849395c4f9a63c5295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:31:58 +0100
Subject: [PATCH 10/82] add image for sole voter

---
 .../public/images/GovActionsSoleVoter.png        | Bin 0 -> 4097 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 govtool/frontend/public/images/GovActionsSoleVoter.png

diff --git a/govtool/frontend/public/images/GovActionsSoleVoter.png b/govtool/frontend/public/images/GovActionsSoleVoter.png
new file mode 100644
index 0000000000000000000000000000000000000000..69048a4c322a99fc2098fe7efffd775246ed0620
GIT binary patch
literal 4097
zcmV+c5dQCpP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH50*(pK~#7F?OF?r
zUB!9+XU=`?+9ozMrh*s@h6ICa$FQtzY?ImzGNzGI6qkgeMkT34-8OY4<din8Kn)6M
zRFRfE+Cm6Xq>#|kkg5?$Ah31-zu2|0cTI3?{E|X=I3#x1yZ1b1{`~VibIv}z-t}cI
zCBJuk=bp#R{NMcVxd6Z6#GsAT8tAzMBeseIe-{e*PMWSpmt)4*F`0>jE!o;UYw_B{
zFoks50Z0a(UL=u!9E4m8LR<n;0wCJiXgbaTB5It`S3UjnOv3%ug>O8>*i8c7W;$&E
z3~k?h5v!+Pfh1dvnXpVV^T${|lj}1F1g9>2N<0!F{6l5&>WATNq|*XG>xG^VU=sfq
zF@K(Cn6sSOQD?Uj;XokJq?Dg+MDlL7Xw4wJ4OD?iQfqh5257cE3sN*##LTWTmbU@|
zXe7g_guX<5QWK<qj7JK*JCcmgLBx+zUqYK{QUJ7e{qS=**xaa?V38B)$cngS-tq5L
z0!ISDG$bID^dQ4qTD?yuboFD<W}2`H#JirlQ#M<7=|L)L=OYaOW1$3;UQ&#z-3~$U
zwu0rrX{k_6Y-n_^y${+*69S;Q^T`kKIQu3_QDqfkxKhdWm|OkVqnC!)4AZBOdbj;|
z^`Co|+5Z$!LL3v&_`T`ft6qgR5r<PG-1pS^EEQiGk$I;E&bWoPfEu$>q9w)Ohaym3
zGqjuhotjMk9@<E!3_#MvyCKcaH4H~Z=11FktK>@bnezWt0<98&P$K4S2LlOWJ??sJ
zCbWr834qrA=jO>)`e%C46+SlePLE04AtiB6<p5c?uM-YE`Y{b&iTSeaFrU?CvwkzQ
ziB8E2u))@yq?g9x>)jhg=g~5rWrI@Sy;+Q3oUwe(>u#K(LtE!YiTD9Y(7PFdr0s#5
zqog)!Y%b)7>DGTh8))1{u-U(P4j&ro!!&y*t43P)^)6aT@MM{nar)CJO+Qpy_J`X?
z8n5;8wo7@I?Z70RsloCqGE35+s78QeDw>V@PiL~O+fq2qG;S4$B(A_rCp5#1TTV8p
ziIc%N9(><u%qwclTe_bl=vxrlf#8$*I6_N7XA;kS543^C4FE%VHCUHja9L`x%CPBB
zmi{uW?|(gW`He51d`$7bK4cEP20&m7%=b*D-OvUaw+%qxzYi4(Rcj>rwJ5)#e7efv
zGy|Xv-=2<TYri(0G2<*7s8*`<o)~GuLO9L2ya3uj<C1{Zz^1=sRW_e@)<DPm0)wV@
zTqv=pmMMT{#r>Oa8qc`X_P+53F_)E%UO}x~41v+v&;}Y4fT2ClTpagr+D=>bB{`Hd
zFv&otx-N>7GB;M%<&jaFgED(0?ccN!PD1P^%KtgMm1mAt@AXY)!fLSgfMX}Lfkp)&
z>)&!COOqFIFz!}<+(c+r*L6|@CZ?A*oK=QgNkmF5q3|UYpBvi!)M_{xVKhWyMV)f9
z^JqgD(Ogjt+CU=$(AxRzU!=|Ex3QJg%>t~?w+qrCyxwuh8COm9(SFa!YGl!;vFD-2
z81pNYO8od<0=R7!3<VJ5lTO`7qG13eeb3wqN$U$hdTm10$b`IhQ7DxSP)${FY#)P#
zqisrPguEv0nET$bm%w7?0kF)1>$_kpqQ7bt+CT+VkN5RlBD3@X((_0aCrp%Q7Xo2E
zZ}nb>_+cUw#so}D2>mUfFWW|4fs}6*#@Csl8-i;WtLzL``MS7&%K^^Ve#!Z6y0}vc
z`D%mlH$a{^I?)P}2Y~dM#l6pb57U-qJ_LZ}1q|tO^^kF1WL#e}U8?Dfsk<C`FAaC4
zE`$V`paD~Xfi@^oz_WQY?L7K&y>hz*1|;eo{tk!-wlx{Y1N2NU71oXr@&{_19f6MO
z0Gro!98Ly6vTMsHF-<RFjOV)^=)GayT6@Q^TQCL*4CG)DrfTsAVGN?Z-32cD^YsBc
zr3}XoBEw<Pr?$wQC~zU&T&OpWSV+|KL+P8zz?K&%hj~WI>}ws1R~-)L*PLK)?>oqa
zt=9`swuVPOuU8@np|w{Fvc^s^h-d-R?^JvrwLO5NNu2eL1wfqOkMtVUn3Cm;I#68X
z8P*lN$zXX>rq{(xBueoJCN{s|>}-;u)%5V4oYxM<yPo|9?$|M>06<(xZ^kUUkg>>C
zX^rJ)WeM;=7{*mz&pWHYIw(4<+X%605+tU*1%COgRjZDT1;C62OJ8Kjp3Ms(7&JC4
zGc-$LK48+{T`^Xt=SF&2B~aabNcGa6#Fb<#_HCW-0bl~x>#p5>Q=PSL$s0C>u<-<h
z!7(<Y3j8d^JUv^d>s3`9V#bJrUf{i*E8q7oFb*Ox{}xQeB#$Yu^bjk*<gQx~ILi-Q
zRKX>3k{dkhVi$z-W0`&jw{1I%C%d;^Nj`m{W;P0RKa9$}*fSOPA3}&1)vJw*Nar3U
zw<t|r(=DDIrP}Vg#<JzN!#Jrn|EfNE`Ho>XLX9XQHmq+X0}bP<p9OJ>1r<HGdadt{
zA-<I*ySM+jOtJ^`L%OQV3KMF?^gyIrG^h}A(e!Jt-Q({+{&>B4-ptD>UygVTuXl8<
zI0_S_R{yqtrTK3kw)-I<5i1=x7&occD6EP);(_WSn&1ts`_7a>7kgQ<cl#r9NZypE
zw!wr>WNc(dJN|ITiWRp&8z~-m{$`r!9+IRB3paeM#fnm)%5B2rB`l05+_Q?L1t2Wb
z(eqM>H#wnlS?FQPuEtz44^*oB>(FMZFSz=fwR0+$3zQ$G1^1B1X5KDH$h{He9N1LV
zBBST|c|=fG2<!=lV>oHZ<WPk~ZjRO+$EZWsUc%fUH!D%C58ei1=XEvd<G)qILx&pK
zFOOX%P%Ne8t)yN3pmuT6>3+#TltKjk;oP^&V6{Z6tX6C%-vu2|KE@h>=#?X^t7}Y`
z)(&D9UDTqF=kTTNucU%~OvWPckU@}CHkKA3ckTjKl{NFK&PV_-DetQwXPBSgLB9K8
zSgJEp7Qqw|zO?haREQ@r5%cs?!;|N-r*NVU-sM@nSIkSj^Az)t>lgQTthr%xg)aY!
z-tEwDl*HeYL3{SEc0V_J#-in~!zqx;F_NG3y@zJ);;b@Ts#9cSzYrkyH>zw0yL9P^
zG2g%IE}qEjX)<>6^aWRXD@2L*VVQ^0==wHQR}rGxd9chMJpR@v)N^D5_|GB2*@YO~
zjF5lV2?xxqVP!e>9)s~P{!-t<1jL^v`^c(GIA7_Y1XKG{(X$dLRY^<s?RcOntM{<^
ziw}=9PWq7>K2I5ssR+9>2+eq4?F$CZGVkgX(lSqsqe!1875MbDH8=df8=rP($CojM
z^$?!KJDmYLs6D*I2oBcy^!e<HE0WO|Pxtkap^_VEqU)$N$cE>;0oI{#8>~dk<xa2B
z#(t)DS$E+iINrbWa+YMhWa&HnJ3(NYuN86~cb>xOyV?03F2xsWS@r~5Q%svHv@_c%
zja=_esSVR^!FEy)HoG{91~;`1?!L8g@uGctew7p)*>ho>B<rYLa*NEwB8YR{!*GFU
zBWr1aPy(TAAnaU<F#kRMaql_R`CWJV-I3z&=z5X)vXyr_E}d%w%Q(JCAp9q*@~<|o
zT{&uro?-vCbJHsS8BN3rc}M|~0CftpsY0y!$BCH}#K<|sP^XF#A+?KfavADlAO$u9
z$rBqLzM{znBe=VMdG|jJ?b&fLuffZDOlIEkK^nU35%M617}vpChP`CnAFOva9we`I
z(vu|3VfN$a|3@IM^Kml<5>S5Hmg*SKrK3<E#M1L_JZVKTxR?Ky2n-08Ioh=iyoQ6K
zg<lDiLa?d1-W!nvpn@T4zmS>y)ZuexK6u3#Dmo$n>E0cGK;Zw-+X3%Nu*4Aa^-7<C
zInj1I5{?||sV$nK-7z0_hrbbs{1_6e@Cuz6yvs+at_BktJf-KVB$VQjdWElIOO_mh
zQzXB|t^Vy#(~?%@F#wL>4p}Y*!J_ojBkaCs5S(6uwF@?iW2FGbNr8ISNf?yoaR8`z
zNQJ>I(IV@-sIhX%PhbM%hpw|}>uAtlI-LsB$h?n1Ob+@;Oea?(<?s2D4H)WoM5+MC
z?O9^D^I;tk?AOu8v>T))DOCv#J~2_|3jnYM3*Mx?`G{u9F;?zNvy&K}1B3vT7OLM-
zRyi}EnjcdIOb%ntN}Vf$3h?SR3}~CxGQ?3&pic<^MUD3^`2kgNKSfPyadn2q^@C5%
zm@z)K_z<+rw$$jTZ|a^d`?Dg`9+BWW3)CU>PL_FFFjj8$0GuuW6xFX@@|iS~AEm*M
z`!G_L8H7TkK+3elwlx0)^*KaqK7q$^5bveMA09R<mc+-0<mmN1ENkU;K1Mj>q<%Cp
z;?dajWy`*SmFOyp*<V0c3`xT#O-rQN+44@eRHJ)?Bua0I!?G!EYgFKZ#??!1uVHi@
zS%79<tqDK~44hABz^af4R08vR(IiieM?G(AbakodX>qgXxpf@bCuq`@05(`E5Ei;t
zPhX?wze~sdU+w(BHCw``*@CMM#8ieO5r5b-gHGZR!rvL?F3*OzQEna_amFuzNzh3T
z96MJnf0RBRJ^sYzODkA;KTY0EhG#AnLocAUOe2>zNU$6vaXd;VGB4Jv(bnqqMW)Mi
z&tu<v<c<%n{bTY3H~PHYn*uDR<UZPC28fCU$mMEM{w_>{7)%ij?b<q*j>UEo<FkAK
zRbEYA!8PKqI(3^4r`8C!#Q$|(xBQP_g2Z8psAKW6!z`l;a5?()Q62=x@1TPx?Fw76
zpaNu1E`v$XlmVcq*4_OOxytW&_gZRb^9P@6C}XIM?2rrsBA5-6peY4FQN32#Kpv%~
zEWKygm9M<ZMSswtU2Ibt5KJ&O>-hJ#OxP1lIRKQhlJUfiCg92gs65U<!?X>&e1N4u
zXc<syF)n}!(v$<BsPo!uzDT?Il+OJN!4;aH;Q8p%^!>fq#3AXBJPRgBZTa2JL`X<>
z3ze;20>Ne$!d`708RVx_Q2ad-UE?XVV1jf;NPwd0?_c^F6Z}Rm0ihJQoFlbHP_@`b
zo1_ZlO<sfv(isDQqK>u8Hc=e(&sa#PAh!!HztGJBF@(FOeSF0$FhM$_08q5|XSKT-
z^82)?yQC^+Ho3AA5L@Qy04<B*^DqgTvPf_&Qimyn-`etT#O&V`4m2|iPpYZZkN2Pb
z$<?>PB<PHj07aA|;Pji9Z=fjeuV{x3xx%MY1DU~zEQNoZ)%?+Vm?WK%5)cwTzQ5jl
z_4VsX8m<(n=wzvU8AS5!85`G}(h=QnX%zZ3`)LTK7|Y7T00000NkvXXu0mjft(DTW

literal 0
HcmV?d00001


From 441d0289e68fd553fb4e23f5ff0ce411fa28359a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:32:44 +0100
Subject: [PATCH 11/82] change props and dashabord card sizes

---
 .../components/molecules/DashboardActionCard.tsx   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
index 3d3e9fc26..90cfce5ca 100644
--- a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
+++ b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
@@ -18,9 +18,7 @@ type DashboardActionCardProps = {
   firstButtonIsLoading?: boolean;
   firstButtonLabel?: string;
   firstButtonVariant?: ButtonProps["variant"];
-  imageHeight?: number;
   imageURL?: string;
-  imageWidth?: number;
   inProgress?: boolean;
   isLoading?: boolean;
   secondButtonAction?: () => void;
@@ -62,17 +60,15 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
 
   return (
     <Box
-      mb={3}
-      p={3}
-      sx={{ boxShadow: `5px 5px 15px 5px ${boxShadow2}` }}
+      border={inProgress && !isLoading ? 1 : 0}
+      borderColor="accentOrange"
       borderRadius={3}
-      flex={1}
       display="flex"
+      flex={1}
       flexDirection="column"
-      border={inProgress && !isLoading ? 1 : 0}
-      borderColor="accentOrange"
+      p={3}
       position="relative"
-      maxWidth={440}
+      sx={{ boxShadow: `5px 5px 15px 5px ${boxShadow2}` }}
     >
       {inProgress && !isLoading && (
         <Box

From 19ef0beeea816c426aae4fa94e884c93f42e120f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:33:28 +0100
Subject: [PATCH 12/82] add sole voter into IMAGES

---
 govtool/frontend/src/consts/images.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/govtool/frontend/src/consts/images.ts b/govtool/frontend/src/consts/images.ts
index f9a098d4f..9d64fe9b2 100644
--- a/govtool/frontend/src/consts/images.ts
+++ b/govtool/frontend/src/consts/images.ts
@@ -3,6 +3,7 @@ export const IMAGES = {
   appLogoWithoutText: "/images/AppLogoWithoutText.png",
   errorPageImage: "/images/ErrorPageImage.png",
   heroImage: "/images/HeroImage.png",
+  soleVoterImage: "/images/GovActionsSoleVoter.png",
   govActionDelegateImage: "/images/GovActionDelegate.png",
   govActionRegisterImage: "/images/GovActionRegister.png",
   govActionListImage: "/images/GovActionList.png",

From 88273fc84f36735ec3b639554f92401bf271ba51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:33:46 +0100
Subject: [PATCH 13/82] sort IMAGES asc

---
 govtool/frontend/src/consts/images.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/govtool/frontend/src/consts/images.ts b/govtool/frontend/src/consts/images.ts
index 9d64fe9b2..b74b473ea 100644
--- a/govtool/frontend/src/consts/images.ts
+++ b/govtool/frontend/src/consts/images.ts
@@ -1,16 +1,16 @@
 export const IMAGES = {
   appLogo: "/images/SanchoLogo.png",
   appLogoWithoutText: "/images/AppLogoWithoutText.png",
+  bgBlue: "/images/BGBlue.png",
+  bgOrange: "/images/BGOrange.png",
   errorPageImage: "/images/ErrorPageImage.png",
-  heroImage: "/images/HeroImage.png",
-  soleVoterImage: "/images/GovActionsSoleVoter.png",
+  govActionDefaultImage: "/images/GovActionDefault.png",
   govActionDelegateImage: "/images/GovActionDelegate.png",
-  govActionRegisterImage: "/images/GovActionRegister.png",
   govActionListImage: "/images/GovActionList.png",
-  govActionDefaultImage: "/images/GovActionDefault.png",
+  govActionRegisterImage: "/images/GovActionRegister.png",
+  heroImage: "/images/HeroImage.png",
+  soleVoterImage: "/images/GovActionsSoleVoter.png",
   successImage: "/images/Success.png",
   warningImage: "/images/Warning.png",
   warningYellowImage: "/images/WarningYellow.png",
-  bgOrange: "/images/BGOrange.png",
-  bgBlue: "/images/BGBlue.png",
 };

From 9070153d72768f6940ccb0a2fe6c6c5d9b8a25c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:34:04 +0100
Subject: [PATCH 14/82] add translations for sole voter card

---
 govtool/frontend/src/i18n/locales/en.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 68cd48743..ed247a1e1 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -72,6 +72,11 @@ export const en = {
         title: "Governance Actions",
         view: "View governance actions",
       },
+      cards: {
+        registerAsSoleVoterTitle: "Become a Sole Voter",
+        registerAsSoleVoterDescription:
+          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>",
+      },
       registration: {
         changeMetadata: "Change metadata",
         connectToRegister: "Connect to register",

From a6a72c56726970aaa7899c198ff0086d3d0c4b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:34:28 +0100
Subject: [PATCH 15/82] change way to display cards on dashboard/ add sole
 voter card

---
 .../components/organisms/DashboardCards.tsx   | 327 +++++++++---------
 1 file changed, 164 insertions(+), 163 deletions(-)

diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index a4bde49da..8aa4cad6b 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -1,5 +1,5 @@
 import { useNavigate } from "react-router-dom";
-import { Box, CircularProgress, Typography } from "@mui/material";
+import { Box, CircularProgress } from "@mui/material";
 import { Trans } from "react-i18next";
 
 import { IMAGES, PATHS } from "@consts";
@@ -259,38 +259,6 @@ export const DashboardCards = () => {
     dRep?.wasRegistered,
   ]);
 
-  const renderGovActionSection = useCallback(() => {
-    return (
-      <>
-        <Typography fontSize={16} fontWeight={600} lineHeight={"24px"} my={3}>
-          {t("dashboard.headingTwo")}
-        </Typography>
-        <Box display={"flex"}>
-          <DashboardActionCard
-            dataTestidFirstButton="view-governance-actions-button"
-            description={t("dashboard.govActions.description")}
-            firstButtonAction={() =>
-              navigate(PATHS.dashboard_governance_actions)
-            }
-            firstButtonLabel={t(
-              `dashboard.govActions.${
-                dRep?.isRegistered ? "reviewAndVote" : "view"
-              }`
-            )}
-            imageURL={IMAGES.govActionListImage}
-            title={t("dashboard.govActions.title")}
-          />
-          {screenWidth < 1024 ? null : (
-            <>
-              <Box p={2} />
-              <Box flex={1} px={4} />
-            </>
-          )}
-        </Box>
-      </>
-    );
-  }, [screenWidth, isMobile, dRep?.isRegistered]);
-
   return isDrepLoading ? (
     <Box
       alignItems="center"
@@ -303,138 +271,171 @@ export const DashboardCards = () => {
     </Box>
   ) : (
     <Box
-      pl={screenWidth < 1024 ? 2 : screenWidth < 1440 ? 4 : 4}
-      pr={screenWidth < 1024 ? 2 : screenWidth < 1440 ? 8 : 29.5}
+      display="grid"
+      rowGap={3}
+      columnGap={4}
+      gridTemplateColumns={screenWidth < 1024 ? "1fr" : "1fr 1fr"}
+      px={screenWidth < 1024 ? 2 : screenWidth < 1440 ? 5 : 4}
+      py={3}
     >
-      {dRep?.isRegistered && renderGovActionSection()}
-      <Typography fontSize={16} fontWeight={600} lineHeight={"24px"} my={3}>
-        {t("dashboard.headingOne")}
-      </Typography>
-      <Box
-        display={"flex"}
-        flexDirection={screenWidth < 1024 ? "column" : "row"}
-      >
-        <DashboardActionCard
-          dataTestidFirstButton={
-            currentDelegation ? "change-dRep-button" : "delegate-button"
-          }
-          dataTestidSecondButton="delegate-learn-more-button"
-          dataTestidDrepIdBox="delegated-to-drep-id"
-          isLoading={isCurrentDelegationLoading || powerIsLoading}
-          description={
-            delegateTransaction?.transactionHash
-              ? progressDescription
-              : delegationDescription
-          }
-          dataTestidDelegationStatus={
-            delegateTransaction?.transactionHash
-              ? "voting-power-delegation-status-in-progress"
-              : `voting-power-delegation-status-${delegationStatusTestForId}`
-          }
-          firstButtonAction={() => navigateTo(PATHS.delegateTodRep)}
-          firstButtonLabel={
-            delegateTransaction?.transactionHash
-              ? ""
-              : currentDelegation
-              ? t("dashboard.delegation.changeDelegation")
-              : t("delegate")
-          }
-          imageHeight={55}
-          imageWidth={65}
-          firstButtonVariant={currentDelegation ? "outlined" : "contained"}
-          imageURL={IMAGES.govActionDelegateImage}
-          cardId={displayedDelegationId}
-          inProgress={!!delegateTransaction?.transactionHash}
-          cardTitle={t("dashboard.delegation.dRepDelegatedTo")}
-          secondButtonAction={
-            delegateTransaction?.transactionHash
-              ? () => openInNewTab("https://adanordic.com/latest_transactions")
-              : () =>
-                  openInNewTab(
-                    "https://docs.sanchogov.tools/faqs/ways-to-use-your-voting-power"
-                  )
-          }
-          secondButtonLabel={
-            delegateTransaction?.transactionHash
-              ? t("seeTransaction")
-              : currentDelegation
-              ? ""
-              : t("learnMore")
-          }
-          title={
-            delegateTransaction?.transactionHash ? (
-              t("dashboard.delegation.votingPowerDelegation")
-            ) : currentDelegation ? (
-              <Trans i18nKey="dashboard.delegation.yourVotingPowerIsDelegated" />
-            ) : (
-              t("dashboard.delegation.useYourVotingPower")
-            )
-          }
-        />
-        <Box width={24} />
-        <DashboardActionCard
-          dataTestidFirstButton={
-            dRep?.isRegistered ? "retire-button" : "register-button"
-          }
-          dataTestidDrepIdBox="my-drep-id"
-          firstButtonVariant={dRep?.isRegistered ? "outlined" : "contained"}
-          secondButtonVariant={
-            registerTransaction?.transactionHash
-              ? "outlined"
-              : dRep?.isRegistered
-              ? "text"
-              : "outlined"
-          }
-          dataTestidSecondButton={
-            dRep?.isRegistered
-              ? "change-metadata-button"
-              : "register-learn-more-button"
-          }
-          description={registrationCardDescription}
-          firstButtonAction={
-            dRep?.isRegistered
-              ? retireAsDrep
-              : () => navigateTo(PATHS.registerAsdRep)
-          }
-          firstButtonIsLoading={isRetirementLoading}
-          firstButtonLabel={
-            registerTransaction?.transactionHash
-              ? ""
-              : t(
-                  `dashboard.registration.${
-                    dRep?.isRegistered ? "retire" : "register"
-                  }`
+      {/* DELEGATION CARD */}
+      <DashboardActionCard
+        dataTestidFirstButton={
+          currentDelegation ? "change-dRep-button" : "delegate-button"
+        }
+        dataTestidSecondButton="delegate-learn-more-button"
+        dataTestidDrepIdBox="delegated-to-drep-id"
+        isLoading={isCurrentDelegationLoading || powerIsLoading}
+        description={
+          delegateTransaction?.transactionHash
+            ? progressDescription
+            : delegationDescription
+        }
+        dataTestidDelegationStatus={
+          delegateTransaction?.transactionHash
+            ? "voting-power-delegation-status-in-progress"
+            : `voting-power-delegation-status-${delegationStatusTestForId}`
+        }
+        firstButtonAction={() => navigateTo(PATHS.delegateTodRep)}
+        firstButtonLabel={
+          delegateTransaction?.transactionHash
+            ? ""
+            : currentDelegation
+            ? t("dashboard.delegation.changeDelegation")
+            : t("delegate")
+        }
+        firstButtonVariant={currentDelegation ? "outlined" : "contained"}
+        imageURL={IMAGES.govActionDelegateImage}
+        cardId={displayedDelegationId}
+        inProgress={!!delegateTransaction?.transactionHash}
+        cardTitle={t("dashboard.delegation.dRepDelegatedTo")}
+        secondButtonAction={
+          delegateTransaction?.transactionHash
+            ? () => openInNewTab("https://adanordic.com/latest_transactions")
+            : () =>
+                openInNewTab(
+                  "https://docs.sanchogov.tools/faqs/ways-to-use-your-voting-power"
                 )
-          }
-          inProgress={!!registerTransaction?.transactionHash}
-          imageURL={IMAGES.govActionRegisterImage}
-          secondButtonAction={
-            registerTransaction?.transactionHash
-              ? () => openInNewTab("https://adanordic.com/latest_transactions")
-              : dRep?.isRegistered
-              ? () => {
-                  navigateTo(PATHS.updateMetadata);
-                }
-              : () =>
-                  openInNewTab(
-                    "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
-                  )
-          }
-          secondButtonLabel={
-            registerTransaction?.transactionHash
-              ? t("seeTransaction")
-              : dRep?.isRegistered
-              ? t("dashboard.registration.changeMetadata")
-              : t("learnMore")
-          }
-          cardId={dRep?.isRegistered || dRep?.wasRegistered ? dRepIDBech32 : ""}
-          cardTitle={
-            dRep?.isRegistered || dRep?.wasRegistered ? t("myDRepId") : ""
-          }
-          title={registrationCardTitle}
-        />
-      </Box>
-      {!dRep?.isRegistered && renderGovActionSection()}
+        }
+        secondButtonLabel={
+          delegateTransaction?.transactionHash
+            ? t("seeTransaction")
+            : currentDelegation
+            ? ""
+            : t("learnMore")
+        }
+        title={
+          delegateTransaction?.transactionHash ? (
+            t("dashboard.delegation.votingPowerDelegation")
+          ) : currentDelegation ? (
+            <Trans i18nKey="dashboard.delegation.yourVotingPowerIsDelegated" />
+          ) : (
+            t("dashboard.delegation.useYourVotingPower")
+          )
+        }
+      />
+      {/* DELEGATION CARD END*/}
+      {/* REGISTARTION AS DREP CARD */}
+      <DashboardActionCard
+        dataTestidFirstButton={
+          dRep?.isRegistered ? "retire-button" : "register-button"
+        }
+        dataTestidDrepIdBox="my-drep-id"
+        firstButtonVariant={dRep?.isRegistered ? "outlined" : "contained"}
+        secondButtonVariant={
+          registerTransaction?.transactionHash
+            ? "outlined"
+            : dRep?.isRegistered
+            ? "text"
+            : "outlined"
+        }
+        dataTestidSecondButton={
+          dRep?.isRegistered
+            ? "change-metadata-button"
+            : "register-learn-more-button"
+        }
+        description={registrationCardDescription}
+        firstButtonAction={
+          dRep?.isRegistered
+            ? retireAsDrep
+            : () => navigateTo(PATHS.registerAsdRep)
+        }
+        firstButtonIsLoading={isRetirementLoading}
+        firstButtonLabel={
+          registerTransaction?.transactionHash
+            ? ""
+            : t(
+                `dashboard.registration.${
+                  dRep?.isRegistered ? "retire" : "register"
+                }`
+              )
+        }
+        inProgress={!!registerTransaction?.transactionHash}
+        imageURL={IMAGES.govActionRegisterImage}
+        secondButtonAction={
+          registerTransaction?.transactionHash
+            ? () => openInNewTab("https://adanordic.com/latest_transactions")
+            : dRep?.isRegistered
+            ? () => {
+                navigateTo(PATHS.updateMetadata);
+              }
+            : () =>
+                openInNewTab(
+                  "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
+                )
+        }
+        secondButtonLabel={
+          registerTransaction?.transactionHash
+            ? t("seeTransaction")
+            : dRep?.isRegistered
+            ? t("dashboard.registration.changeMetadata")
+            : t("learnMore")
+        }
+        cardId={dRep?.isRegistered || dRep?.wasRegistered ? dRepIDBech32 : ""}
+        cardTitle={
+          dRep?.isRegistered || dRep?.wasRegistered ? t("myDRepId") : ""
+        }
+        title={registrationCardTitle}
+      />
+      {/* DREP CARD END*/}
+      {/* SOLE VOTER CARD */}
+      <DashboardActionCard
+        dataTestidFirstButton={"register-as-sole-voter-button"}
+        firstButtonVariant={"contained"}
+        secondButtonVariant={"outlined"}
+        dataTestidSecondButton={"learn-more-button"}
+        description={
+          <Trans
+            i18nKey="dashboard.cards.registerAsSoleVoterDescription"
+            values={{ votingPower }}
+          />
+        }
+        firstButtonAction={() => navigateTo(PATHS.registerAsSoleVoter)}
+        firstButtonLabel={t("dashboard.registration.register")}
+        imageURL={IMAGES.soleVoterImage}
+        secondButtonAction={() =>
+          openInNewTab(
+            "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
+          )
+        }
+        secondButtonLabel={t("learnMore")}
+        title={t("dashboard.cards.registerAsSoleVoterTitle")}
+      />
+      {/* REGISTARTION AS SOLE VOTER CARD END*/}
+      {/* GOV ACTIONS LIST CARD */}
+      <DashboardActionCard
+        dataTestidFirstButton="view-governance-actions-button"
+        description={t("dashboard.govActions.description")}
+        firstButtonAction={() => navigate(PATHS.dashboard_governance_actions)}
+        firstButtonLabel={t(
+          `dashboard.govActions.${
+            dRep?.isRegistered ? "reviewAndVote" : "view"
+          }`
+        )}
+        imageURL={IMAGES.govActionListImage}
+        title={t("dashboard.govActions.title")}
+      />
+      {/* GOV ACTIONS LIST CARD END*/}
     </Box>
   );
 };

From 18ff224b2dd09304b10a4b69ce0bb94821bebd28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:35:14 +0100
Subject: [PATCH 16/82] delete unnecessary code

---
 govtool/frontend/src/components/organisms/DashboardCards.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 8aa4cad6b..7e3ae3721 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -31,7 +31,7 @@ export const DashboardCards = () => {
   const navigate = useNavigate();
   const { currentDelegation, isCurrentDelegationLoading } =
     useGetAdaHolderCurrentDelegationQuery(stakeKey);
-  const { screenWidth, isMobile } = useScreenDimension();
+  const { screenWidth } = useScreenDimension();
   const { openModal } = useModal();
   const [isRetirementLoading, setIsRetirementLoading] =
     useState<boolean>(false);

From d1151f9b34d3b57210ff79472d2fb8cc2f246135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:39:07 +0100
Subject: [PATCH 17/82] add feat to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b80f9c5f8..6830148d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
 ## [Unreleased]
+- Add Sole Voter card [Issue 141](https://github.com/IntersectMBO/govtool/issues/141)
 - Create DRep registration page about roles [Issue 205](https://github.com/IntersectMBO/govtool/issues/205)
 - Create Checkbox component. Improve Field and ControlledField [Issue 177](https://github.com/IntersectMBO/govtool/pull/177)
 - Vitest unit tests added for utils functions [Issue 81](https://github.com/IntersectMBO/govtool/issues/81)

From 75be3bf3d127aee5a74f1cbd098ca08fbb5c34d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:33:28 +0100
Subject: [PATCH 18/82] add sole voter into IMAGES

---
 govtool/frontend/src/consts/images.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/govtool/frontend/src/consts/images.ts b/govtool/frontend/src/consts/images.ts
index b74b473ea..e178dbf93 100644
--- a/govtool/frontend/src/consts/images.ts
+++ b/govtool/frontend/src/consts/images.ts
@@ -4,6 +4,8 @@ export const IMAGES = {
   bgBlue: "/images/BGBlue.png",
   bgOrange: "/images/BGOrange.png",
   errorPageImage: "/images/ErrorPageImage.png",
+  heroImage: "/images/HeroImage.png",
+  soleVoterImage: "/images/GovActionsSoleVoter.png",
   govActionDefaultImage: "/images/GovActionDefault.png",
   govActionDelegateImage: "/images/GovActionDelegate.png",
   govActionListImage: "/images/GovActionList.png",

From b6b57372c05cd75521c03b457b45d0780e65b403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Mon, 19 Feb 2024 09:00:16 +0100
Subject: [PATCH 19/82] add retire as sole voter screen

---
 govtool/frontend/src/App.tsx                  |   2 +
 .../components/organisms/DashboardCards.tsx   |  43 ++++-
 govtool/frontend/src/consts/paths.ts          |  23 +--
 govtool/frontend/src/context/wallet.tsx       |  11 ++
 govtool/frontend/src/i18n/locales/en.ts       |  10 +-
 .../frontend/src/pages/RetireAsSoleVoter.tsx  | 180 ++++++++++++++++++
 govtool/frontend/src/pages/index.ts           |   5 +-
 7 files changed, 250 insertions(+), 24 deletions(-)
 create mode 100644 govtool/frontend/src/pages/RetireAsSoleVoter.tsx

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index d48e4d55a..a36a89f8f 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -21,6 +21,7 @@ import {
   UpdatedRepMetadata,
   GovernanceActionsCategory,
   DashboardGovernanceActionsCategory,
+  RetireAsSoleVoter,
 } from "@pages";
 import {
   callAll,
@@ -120,6 +121,7 @@ export default function App() {
           path={PATHS.registerAsSoleVoter}
           element={<RegisterAsSoleVoter />}
         />
+        <Route path={PATHS.retireAsSoleVoter} element={<RetireAsSoleVoter />} />
         <Route path={PATHS.stakeKeys} element={<ChooseStakeKey />} />
         <Route path={PATHS.updateMetadata} element={<UpdatedRepMetadata />} />
         <Route path="*" element={<ErrorPage />} />
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 7e3ae3721..953c11c4c 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -27,6 +27,7 @@ export const DashboardCards = () => {
     isPendingTransaction,
     registerTransaction,
     stakeKey,
+    soleVoter,
   } = useCardano();
   const navigate = useNavigate();
   const { currentDelegation, isCurrentDelegationLoading } =
@@ -271,12 +272,12 @@ export const DashboardCards = () => {
     </Box>
   ) : (
     <Box
+      columnGap={3}
       display="grid"
-      rowGap={3}
-      columnGap={4}
       gridTemplateColumns={screenWidth < 1024 ? "1fr" : "1fr 1fr"}
       px={screenWidth < 1024 ? 2 : screenWidth < 1440 ? 5 : 4}
       py={3}
+      rowGap={4}
     >
       {/* DELEGATION CARD */}
       <DashboardActionCard
@@ -400,18 +401,35 @@ export const DashboardCards = () => {
       {/* DREP CARD END*/}
       {/* SOLE VOTER CARD */}
       <DashboardActionCard
-        dataTestidFirstButton={"register-as-sole-voter-button"}
-        firstButtonVariant={"contained"}
-        secondButtonVariant={"outlined"}
+        dataTestidFirstButton={
+          soleVoter?.isRegistered
+            ? "retire-as-sole-voter-button"
+            : "register-as-sole-voter-button"
+        }
         dataTestidSecondButton={"learn-more-button"}
         description={
           <Trans
-            i18nKey="dashboard.cards.registerAsSoleVoterDescription"
-            values={{ votingPower }}
+            i18nKey={
+              soleVoter?.isRegistered
+                ? "dashboard.cards.youAreSoleVoterDescription"
+                : "dashboard.cards.registerAsSoleVoterDescription"
+            }
+            values={{ votingPower: correctAdaFormat(votingPower) }}
           />
         }
-        firstButtonAction={() => navigateTo(PATHS.registerAsSoleVoter)}
-        firstButtonLabel={t("dashboard.registration.register")}
+        firstButtonAction={() =>
+          navigateTo(
+            soleVoter?.isRegistered
+              ? PATHS.retireAsSoleVoter
+              : PATHS.registerAsSoleVoter
+          )
+        }
+        firstButtonLabel={t(
+          soleVoter?.isRegistered
+            ? "dashboard.cards.retire"
+            : "dashboard.registration.register"
+        )}
+        firstButtonVariant={soleVoter?.isRegistered ? "outlined" : "contained"}
         imageURL={IMAGES.soleVoterImage}
         secondButtonAction={() =>
           openInNewTab(
@@ -419,7 +437,12 @@ export const DashboardCards = () => {
           )
         }
         secondButtonLabel={t("learnMore")}
-        title={t("dashboard.cards.registerAsSoleVoterTitle")}
+        secondButtonVariant={"outlined"}
+        title={t(
+          soleVoter?.isRegistered
+            ? "dashboard.cards.youAreSoleVoterTitle"
+            : "dashboard.cards.registerAsSoleVoterTitle"
+        )}
       />
       {/* REGISTARTION AS SOLE VOTER CARD END*/}
       {/* GOV ACTIONS LIST CARD */}
diff --git a/govtool/frontend/src/consts/paths.ts b/govtool/frontend/src/consts/paths.ts
index 8af3a6381..4ac0cbde2 100644
--- a/govtool/frontend/src/consts/paths.ts
+++ b/govtool/frontend/src/consts/paths.ts
@@ -1,22 +1,23 @@
 export const PATHS = {
-  home: "/",
-  dashboard: "/dashboard",
-  error: "/error",
-  governance_actions: "/governance_actions",
-  governance_actions_category: "/governance_actions/category/:category",
-  governance_actions_category_action:
-    "/governance_actions/category/:category/:proposalId",
-  governance_actions_action: "/governance_actions/:proposalId",
-  dashboard_governance_actions: "/connected/governance_actions",
   dashboard_governance_actions_action:
     "/connected/governance_actions/:proposalId",
   dashboard_governance_actions_category:
     "/connected/governance_actions/category/:category",
-  guides: "/guides",
-  faqs: "/faqs",
+  dashboard_governance_actions: "/connected/governance_actions",
+  dashboard: "/dashboard",
   delegateTodRep: "/delegate",
+  error: "/error",
+  faqs: "/faqs",
+  governance_actions_action: "/governance_actions/:proposalId",
+  governance_actions_category_action:
+    "/governance_actions/category/:category/:proposalId",
+  governance_actions_category: "/governance_actions/category/:category",
+  governance_actions: "/governance_actions",
+  guides: "/guides",
+  home: "/",
   registerAsdRep: "/register",
   registerAsSoleVoter: "/register_sole_voter",
+  retireAsSoleVoter: "/retire_sole_voter",
   stakeKeys: "/stake_keys",
   updateMetadata: "/update_metadata",
 };
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 765e24226..925f3d418 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -100,6 +100,8 @@ interface CardanoContext {
   isEnableLoading: string | null;
   error?: string;
   dRep: DRepInfo | undefined;
+  soleVoter: DRepInfo | undefined;
+  setSoleVoter: (key: undefined | DRepInfo) => void;
   isEnabled: boolean;
   pubDRepKey: string;
   dRepID: string;
@@ -168,6 +170,11 @@ function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
   const [isEnableLoading, setIsEnableLoading] = useState<string | null>(null);
   const [dRep, setDRep] = useState<DRepInfo | undefined>(undefined);
+  const [soleVoter, setSoleVoter] = useState<DRepInfo | undefined>({
+    deposit: 4000000,
+    isRegistered: false,
+    wasRegistered: false,
+  });
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
   );
@@ -1147,6 +1154,8 @@ function CardanoProvider(props: Props) {
       isDrepLoading,
       setIsDrepLoading,
       isEnableLoading,
+      soleVoter,
+      setSoleVoter,
     }),
     [
       address,
@@ -1180,6 +1189,8 @@ function CardanoProvider(props: Props) {
       isDrepLoading,
       setIsDrepLoading,
       isEnableLoading,
+      soleVoter,
+      setSoleVoter,
     ]
   );
 
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index ed247a1e1..bcdea545c 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -73,9 +73,13 @@ export const en = {
         view: "View governance actions",
       },
       cards: {
+        retire: "Retire",
+        youAreSoleVoterTitle: "You are a Sole Voter",
+        youAreSoleVoterDescription:
+          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
         registerAsSoleVoterTitle: "Become a Sole Voter",
         registerAsSoleVoterDescription:
-          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>",
+          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
       },
       registration: {
         changeMetadata: "Change metadata",
@@ -292,11 +296,15 @@ export const en = {
       viewAll: "View all",
     },
     soleVoter: {
+      retireSoleVoter: "Retire as a Sole Voter",
       becomeSoleVoter: "Become a Sole Voter",
       continueToRegister: "Continue to register",
       description:
         "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳2</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
       heading: "What this Means",
+      retirementHeading: "What Retirement Means",
+      retirementDescription:
+        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of <strong>{{deposit}} ADA</strong> will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\n<0>These options are listed in our Guides here:</0> <1>Voting options and Roles</1>",
     },
     system: {
       sanchoNet: "SanchoNet",
diff --git a/govtool/frontend/src/pages/RetireAsSoleVoter.tsx b/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
new file mode 100644
index 000000000..830f4ffd5
--- /dev/null
+++ b/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
@@ -0,0 +1,180 @@
+import { useCallback, useEffect, useMemo } from "react";
+import { useNavigate } from "react-router-dom";
+import { Trans } from "react-i18next";
+import { Box, Link } from "@mui/material";
+import ArrowBackIosIcon from "@mui/icons-material/ArrowBackIos";
+
+import { Background, Button, Typography } from "@atoms";
+import { useCardano } from "@context";
+import { ICONS, PATHS } from "@consts";
+import { useScreenDimension, useTranslation } from "@hooks";
+import { DashboardTopNav, Footer } from "@organisms";
+import {
+  WALLET_LS_KEY,
+  correctAdaFormat,
+  getItemFromLocalStorage,
+  openInNewTab,
+} from "@utils";
+import { theme } from "@/theme";
+
+export const RetireAsSoleVoter = () => {
+  const {
+    palette: { boxShadow2 },
+  } = theme;
+  const { isMobile, screenWidth } = useScreenDimension();
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+  const { soleVoter } = useCardano();
+
+  const navigateToDashboard = useCallback(
+    () => navigate(PATHS.dashboard),
+    [navigate]
+  );
+
+  useEffect(() => {
+    if (
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`) ||
+      !soleVoter?.isRegistered
+    ) {
+      navigate(PATHS.home);
+    }
+  }, []);
+
+  const renderBackButton = useMemo(() => {
+    return (
+      <Button
+        data-testid="back-button"
+        onClick={navigateToDashboard}
+        size="extraLarge"
+        sx={{
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+        }}
+        variant="outlined"
+      >
+        {t("cancel")}
+      </Button>
+    );
+  }, [isMobile, navigateToDashboard]);
+
+  const renderRegisterButton = useMemo(() => {
+    return (
+      <Button
+        data-testid="retire-button"
+        onClick={() => {}}
+        size="extraLarge"
+        sx={{
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+        }}
+        variant="contained"
+      >
+        {t("continue")}
+      </Button>
+    );
+  }, [isMobile]);
+
+  return (
+    <Background isReverted>
+      <Box display="flex" flexDirection="column" minHeight="100vh">
+        <DashboardTopNav
+          imageHeight={isMobile ? 24 : 35}
+          imageSRC={ICONS.appLogoIcon}
+          imageWidth={isMobile ? undefined : 42}
+          title={t("soleVoter.retireSoleVoter")}
+        />
+
+        <Box
+          height={isMobile ? "100%" : "auto"}
+          mt={isMobile ? 0 : 7}
+          sx={{
+            alignItems: screenWidth >= 768 ? "center" : "inherit",
+            marginTop: screenWidth < 1440 ? "97px" : "153px",
+            display: screenWidth < 1440 ? "flex" : "grid",
+            ...(screenWidth < 1440 && {
+              flexDirection: "column",
+            }),
+            ...(screenWidth >= 1440 && { gridTemplateColumns: "1fr auto 1fr" }),
+          }}
+        >
+          {isMobile && (
+            <Box borderColor="white" borderBottom={1}>
+              <Typography
+                variant="title1"
+                sx={{
+                  ml: 2,
+                  my: 3.25,
+                }}
+              >
+                {t("soleVoter.retireSoleVoter")}
+              </Typography>
+            </Box>
+          )}
+          <Link
+            data-testid="back-to-list-link"
+            sx={{
+              alignItems: "center",
+              alignSelf: "flex-start",
+              cursor: "pointer",
+              display: "flex",
+              justifyContent: "flex-start",
+              marginBottom: 3,
+              ml: screenWidth < 1440 ? 2 : 5,
+              mt: screenWidth < 1440 ? 3 : "none",
+              textDecoration: "none",
+            }}
+            onClick={navigateToDashboard}
+          >
+            <ArrowBackIosIcon sx={{ fontSize: 14 }} />
+            <Typography color="primary" fontWeight={400} variant="body2">
+              {t("backToDashboard")}
+            </Typography>
+          </Link>
+          <Box
+            borderRadius="20px"
+            boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
+            height="auto"
+            maxWidth={screenWidth > 768 ? 600 : undefined}
+            px={isMobile ? 2 : 18.75}
+            py={isMobile ? 6.25 : 10}
+          >
+            <Box display="flex" flexDirection="column">
+              <Typography sx={{ textAlign: "center" }} variant="headline4">
+                {t("soleVoter.retirementHeading")}
+              </Typography>
+              <Typography
+                fontWeight={400}
+                sx={{ py: 5, textAlign: "center", whiteSpace: "pre-line" }}
+                variant="body1"
+              >
+                <Trans
+                  components={[
+                    <Typography fontWeight={500} key={0} variant="body1" />,
+                    <Link
+                      key="1"
+                      onClick={() => openInNewTab("https://sancho.network/")}
+                      sx={{ cursor: "pointer" }}
+                    />,
+                  ]}
+                  i18nKey={"soleVoter.retirementDescription"}
+                  values={{ deposit: correctAdaFormat(soleVoter?.deposit) }}
+                />
+              </Typography>
+            </Box>
+            <Box
+              display="flex"
+              flexDirection={isMobile ? "column" : "row"}
+              justifyContent="space-between"
+            >
+              {isMobile ? renderRegisterButton : renderBackButton}
+              <Box px={2} py={isMobile ? 1.5 : 0} />
+              {isMobile ? renderBackButton : renderRegisterButton}
+            </Box>
+          </Box>
+          {isMobile && <Footer />}
+        </Box>
+      </Box>
+    </Background>
+  );
+};
diff --git a/govtool/frontend/src/pages/index.ts b/govtool/frontend/src/pages/index.ts
index e6cdcc6de..c2f422300 100644
--- a/govtool/frontend/src/pages/index.ts
+++ b/govtool/frontend/src/pages/index.ts
@@ -1,11 +1,12 @@
 export * from "./ChooseStakeKey";
 export * from "./Dashboard";
+export * from "./DashboardGovernanceActionsCategory";
 export * from "./DelegateTodRep";
+export * from "./ErrorPage";
 export * from "./GovernanceActionDetails";
 export * from "./GovernanceActions";
 export * from "./GovernanceActionsCategory";
-export * from "./DashboardGovernanceActionsCategory";
 export * from "./Home";
 export * from "./RegisterAsdRep";
+export * from "./RetireAsSoleVoter";
 export * from "./UpdatedRepMetadata";
-export * from "./ErrorPage";

From dc101218211fa249ad2ba061dd99abcf09c68e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Mon, 19 Feb 2024 09:03:10 +0100
Subject: [PATCH 20/82] add retirement to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6830148d4..9c094e85f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
 ## [Unreleased]
+- Add retire as Sole Voter screen [Issue 198](https://github.com/IntersectMBO/govtool/issues/198)
 - Add Sole Voter card [Issue 141](https://github.com/IntersectMBO/govtool/issues/141)
 - Create DRep registration page about roles [Issue 205](https://github.com/IntersectMBO/govtool/issues/205)
 - Create Checkbox component. Improve Field and ControlledField [Issue 177](https://github.com/IntersectMBO/govtool/pull/177)

From b515b26c1c10a226876376417afc0916b72ab3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Mon, 19 Feb 2024 11:34:05 +0100
Subject: [PATCH 21/82] update home cards

---
 .../src/components/molecules/ActionCard.tsx   |  1 -
 .../components/organisms/DashboardCards.tsx   |  4 +-
 .../src/components/organisms/Hero.tsx         | 34 ++++++-
 .../src/components/organisms/HomeCards.tsx    | 93 ++++++++++++++-----
 govtool/frontend/src/i18n/locales/en.ts       | 28 +++++-
 govtool/frontend/src/pages/Home.tsx           |  8 +-
 6 files changed, 134 insertions(+), 34 deletions(-)

diff --git a/govtool/frontend/src/components/molecules/ActionCard.tsx b/govtool/frontend/src/components/molecules/ActionCard.tsx
index 63fc9eb03..3418c6471 100644
--- a/govtool/frontend/src/components/molecules/ActionCard.tsx
+++ b/govtool/frontend/src/components/molecules/ActionCard.tsx
@@ -94,7 +94,6 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
           <Button
             data-testid={dataTestIdFirstButton}
             onClick={firstButtonAction}
-            size="large"
             sx={{
               width: MOBILE_AND_WIDE_CONDITION ? "100%" : "auto",
             }}
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 953c11c4c..49ae2df2c 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -406,7 +406,9 @@ export const DashboardCards = () => {
             ? "retire-as-sole-voter-button"
             : "register-as-sole-voter-button"
         }
-        dataTestidSecondButton={"learn-more-button"}
+        firstButtonVariant="contained"
+        secondButtonVariant="outlined"
+        dataTestidSecondButton="learn-more-button"
         description={
           <Trans
             i18nKey={
diff --git a/govtool/frontend/src/components/organisms/Hero.tsx b/govtool/frontend/src/components/organisms/Hero.tsx
index 4854f84bc..497f230e0 100644
--- a/govtool/frontend/src/components/organisms/Hero.tsx
+++ b/govtool/frontend/src/components/organisms/Hero.tsx
@@ -1,10 +1,13 @@
-import { Box } from "@mui/material";
+import { useCallback } from "react";
 import { useNavigate } from "react-router-dom";
+import { Trans } from "react-i18next";
+import { Box, Link } from "@mui/material";
 
 import { Button, Typography } from "@atoms";
 import { IMAGES, PATHS } from "@consts";
 import { useCardano, useModal } from "@context";
 import { useScreenDimension, useTranslation } from "@hooks";
+import { openInNewTab } from "@utils";
 
 export const Hero = () => {
   const { isEnabled } = useCardano();
@@ -23,6 +26,12 @@ export const Hero = () => {
       ? 600
       : 720;
 
+  const onClickVotingPower = useCallback(
+    () =>
+      openInNewTab("https://docs.sanchogov.tools/faqs/what-is-voting-power"),
+    []
+  );
+
   return (
     <Box
       alignItems="center"
@@ -44,10 +53,29 @@ export const Hero = () => {
         </Typography>
         <Typography
           fontWeight={400}
-          sx={{ my: 4, ...(isMobile ? {} : { whiteSpace: "pre-line" }) }}
+          sx={{
+            maxWidth: 630,
+            my: 4,
+            ...(isMobile ? {} : { whiteSpace: "pre-line" }),
+          }}
           variant={isMobile ? "body2" : "title2"}
         >
-          {t("hero.description")}
+          <Trans
+            i18nKey={
+              screenWidth < 1024
+                ? "hero.description.mobile"
+                : "hero.description.wide"
+            }
+            components={[
+              <Link
+                data-testid="voting-power-link"
+                onClick={onClickVotingPower}
+                sx={{
+                  cursor: "pointer",
+                }}
+              ></Link>,
+            ]}
+          ></Trans>
         </Typography>
         <Button
           data-testid="hero-connect-wallet-button"
diff --git a/govtool/frontend/src/components/organisms/HomeCards.tsx b/govtool/frontend/src/components/organisms/HomeCards.tsx
index 66593a0ba..d8ca35a92 100644
--- a/govtool/frontend/src/components/organisms/HomeCards.tsx
+++ b/govtool/frontend/src/components/organisms/HomeCards.tsx
@@ -6,6 +6,7 @@ import { useModal } from "@context";
 import { ActionCard } from "@molecules";
 import { useScreenDimension, useTranslation } from "@hooks";
 import { openInNewTab } from "@utils";
+import { useCallback } from "react";
 
 export const HomeCards = () => {
   const navigate = useNavigate();
@@ -13,6 +14,36 @@ export const HomeCards = () => {
   const { isMobile, screenWidth } = useScreenDimension();
   const { t } = useTranslation();
 
+  const openWalletModal = useCallback(() => {
+    openModal({ type: "chooseWallet" });
+  }, [openModal]);
+
+  const onClickLearnMoreAboutDelegation = useCallback(
+    () =>
+      openInNewTab(
+        "https://docs.sanchogov.tools/faqs/ways-to-use-your-voting-power"
+      ),
+    []
+  );
+
+  const onClickLearnMoreAboutDRepRegistration = useCallback(
+    () =>
+      openInNewTab(
+        "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
+      ),
+    []
+  );
+
+  const onClickLearnMoreAboutSoleVoterRegistration = useCallback(
+    () => openInNewTab("https://www.google.com"),
+    []
+  );
+
+  const navigateToGovActions = useCallback(
+    () => navigate(PATHS.governance_actions),
+    [navigate]
+  );
+
   return (
     <Box
       columnGap={12}
@@ -35,60 +66,78 @@ export const HomeCards = () => {
         width={!isMobile && screenWidth < 1920 ? "90%" : "auto"}
         display="flex"
       >
+        {/* DELEGATE CARD */}
         <ActionCard
           dataTestIdFirstButton="delegate-connect-wallet-button"
           dataTestIdSecondButton="delegate-learn-more-button"
-          description={t("dashboard.delegation.description")}
-          firstButtonAction={() => openModal({ type: "chooseWallet" })}
-          firstButtonLabel={t("dashboard.delegation.connectToDelegate")}
+          description={t("home.cards.delegateDescription")}
+          firstButtonAction={openWalletModal}
+          firstButtonLabel={t("home.cards.delegateFirstButtonLabel")}
           imageHeight={80}
           imageURL={IMAGES.govActionDelegateImage}
           imageWidth={115}
-          secondButtonAction={() =>
-            openInNewTab(
-              "https://docs.sanchogov.tools/faqs/ways-to-use-your-voting-power"
-            )
-          }
+          secondButtonAction={onClickLearnMoreAboutDelegation}
           secondButtonLabel={t("learnMore")}
-          title={t("dashboard.delegation.useYourVotingPower")}
+          title={t("home.cards.delegateTitle")}
         />
+        {/* DELEGATE CARD END*/}
       </Box>
       <Box
         display="flex"
         width={!isMobile && screenWidth < 1920 ? "90%" : "auto"}
       >
+        {/* REGISTER AS DREP CARD */}
         <ActionCard
           dataTestIdFirstButton="register-connect-wallet-button"
           dataTestIdSecondButton="register-learn-more-button"
-          description={t("dashboard.registration.description")}
-          firstButtonAction={() => openModal({ type: "chooseWallet" })}
-          firstButtonLabel={t("dashboard.registration.connectToRegister")}
+          description={t("home.cards.registerAsDRepDescription")}
+          firstButtonAction={openWalletModal}
+          firstButtonLabel={t("home.cards.registerAsDRepFirstButtonLabel")}
           imageHeight={80}
           imageURL={IMAGES.govActionRegisterImage}
           imageWidth={70}
-          secondButtonAction={() =>
-            openInNewTab(
-              "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
-            )
-          }
+          secondButtonAction={onClickLearnMoreAboutDRepRegistration}
+          secondButtonLabel={t("learnMore")}
+          title={t("home.cards.registerAsDRepTitle")}
+        />
+        {/* REGISTER AS DREP CARD END */}
+      </Box>
+      <Box
+        display="flex"
+        width={!isMobile && screenWidth < 1920 ? "90%" : "auto"}
+      >
+        {/* REGISTER AS SOLE VOTER CARD */}
+        <ActionCard
+          dataTestIdFirstButton="register-as-sole-voter-button"
+          dataTestIdSecondButton="lear-more-about-sole-voter-button"
+          description={t("home.cards.registerAsSoleVoterDescription")}
+          firstButtonAction={openWalletModal}
+          firstButtonLabel={t("home.cards.registerAsSoleVoterFirstButtonLabel")}
+          imageHeight={84}
+          imageURL={IMAGES.soleVoterImage}
+          imageWidth={84}
+          secondButtonAction={onClickLearnMoreAboutSoleVoterRegistration}
           secondButtonLabel={t("learnMore")}
-          title={t("dashboard.registration.registerAsDRep")}
+          title={t("home.cards.registerAsSoleVoterTitle")}
         />
+        {/* REGISTER AS SOLE VOTER CARD END */}
       </Box>
       <Box
         display="flex"
         width={!isMobile && screenWidth < 1920 ? "90%" : "auto"}
       >
+        {/* GOV ACTIONS CARD */}
         <ActionCard
           dataTestIdFirstButton="move-to-governance-actions-button"
-          description={t("dashboard.govActions.description")}
-          firstButtonAction={() => navigate(PATHS.governance_actions)}
-          firstButtonLabel={t("dashboard.govActions.view")}
+          description={t("home.cards.governaneActionsDescription")}
+          firstButtonAction={navigateToGovActions}
+          firstButtonLabel={t("home.cards.governanceActionsFirstButtonLabel")}
           imageHeight={80}
           imageURL={IMAGES.govActionListImage}
           imageWidth={80}
-          title={t("dashboard.govActions.title")}
+          title={t("home.cards.governaneActionsTitle")}
         />
+        {/* GOV ACTIONS CARD */}
       </Box>
     </Box>
   );
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index bcdea545c..b1d413e2e 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -106,6 +106,25 @@ export const en = {
         youAreRegistered: "You are Registered as a DRep",
       },
     },
+    home: {
+      cards: {
+        delegateDescription: "Find a DRep to vote on your behalf.",
+        delegateFirstButtonLabel: "View DRep Direcotry",
+        delegateTitle: "Delegate your Voting Power",
+        governaneActionsDescription:
+          "See all the Governance Actions submitted on chain. ",
+        governanceActionsFirstButtonLabel: "View Governance Actions",
+        governaneActionsTitle: "View Governance Actions",
+        registerAsDRepDescription:
+          "Accept delegated voting power from other ADA holders, and combine it with your own voting power. Vote with the accumulated Power on  Governance Actions.",
+        registerAsDRepFirstButtonLabel: "Connect to Register",
+        registerAsDRepTitle: "Become a DRep",
+        registerAsSoleVoterDescription:
+          "Vote on Governance Actions using your own voting power",
+        registerAsSoleVoterFirstButtonLabel: "Connect to Register",
+        registerAsSoleVoterTitle: "Become a Sole Voter",
+      },
+    },
     delegation: {
       description:
         "You can delegate your voting power to a DRep or to a pre-defined voting option.",
@@ -220,8 +239,11 @@ export const en = {
     },
     hero: {
       connectWallet: "Connect your wallet",
-      description:
-        "Interact with SanchoNet using GovTool - a friendly user\ninterface connected to SanchoNet. You can delegate\nyour voting power (tAda) or become a SanchoNet DRep\nto allow people to delegate voting power to you.",
+      description: {
+        mobile:
+          "You can either delegate your voting power or become a DRep to allow people to delegate voting power to you.",
+        wide: "Anyone with a wallet containing ADA can participate in governance on Sanchonet.\n\nYour ADA balance entitles you to an equal amount of Voting Power.\n\nFor more info see the guide entry for <0>Voting Power</0>.",
+      },
       headline: "SanchoNet \n Governance Tool",
     },
     menu: {
@@ -362,7 +384,7 @@ export const en = {
         "Can’t see your wallet? Check what wallets are currently compatible with GovTool ",
       chooseWallet: "Choose the wallet you want to connect with:",
       connect: "Connect",
-      connectWallet: "Connect wallet",
+      connectWallet: "Connect Wallet",
       connectYourWallet: "Connect your Wallet",
       connectYourWalletButton: "Connect your wallet",
       connectedWallet: "Connected Wallet:",
diff --git a/govtool/frontend/src/pages/Home.tsx b/govtool/frontend/src/pages/Home.tsx
index 6ca5689f2..25942471c 100644
--- a/govtool/frontend/src/pages/Home.tsx
+++ b/govtool/frontend/src/pages/Home.tsx
@@ -1,12 +1,12 @@
 import { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
+import { Box } from "@mui/material";
 
 import { Background } from "@atoms";
-import { Box } from "@mui/material";
-import { TopNav, Hero, Footer, HomeCards } from "@organisms";
+import { PATHS } from "@consts";
 import { useCardano } from "@context";
-import { PATHS } from "@/consts";
-import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
+import { TopNav, Hero, Footer, HomeCards } from "@organisms";
+import { WALLET_LS_KEY, getItemFromLocalStorage } from "@utils";
 
 export const Home = () => {
   const { isEnabled } = useCardano();

From a06abb465e6d8b419831883856b2ccbebba9ea5a Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Tue, 20 Feb 2024 11:44:03 +0100
Subject: [PATCH 22/82] Sole Voter transactions added and UI components
 unification

---
 .../frontend/public/icons/ArrowLeftThin.svg   |   5 +
 .../components/molecules/BottomBoxButtons.tsx |  75 ++++++++
 .../molecules/CenteredBoxPageWrapper.tsx      | 108 +++++++++++
 .../src/components/molecules/index.ts         |   2 +
 .../components/organisms/DashboardCards.tsx   |  23 ++-
 .../components/organisms/DashboardTopNav.tsx  |   5 +-
 .../organisms/RegisterAsSoleVoterBox.tsx      |  76 ++++++++
 .../RegisterAsSoleVoterBoxContent.tsx         |  48 +++++
 .../organisms/RetireAsSoleVoterBox.tsx        |  86 +++++++++
 .../organisms/RetireAsSoleVoterBoxContent.tsx |  43 +++++
 .../components/organisms/SoleVoterInfo.tsx    | 108 -----------
 .../src/components/organisms/index.ts         |   7 +-
 govtool/frontend/src/consts/icons.ts          |   1 +
 govtool/frontend/src/context/wallet.tsx       | 112 ++++++++++-
 govtool/frontend/src/context/walletUtils.ts   |   2 +-
 govtool/frontend/src/i18n/locales/en.ts       |  76 ++++----
 .../src/pages/RegisterAsSoleVoter.tsx         | 103 ++--------
 .../frontend/src/pages/RetireAsSoleVoter.tsx  | 178 ++----------------
 govtool/frontend/src/utils/localStorage.ts    |   2 +
 19 files changed, 649 insertions(+), 411 deletions(-)
 create mode 100644 govtool/frontend/public/icons/ArrowLeftThin.svg
 create mode 100644 govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
 create mode 100644 govtool/frontend/src/components/molecules/CenteredBoxPageWrapper.tsx
 create mode 100644 govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
 create mode 100644 govtool/frontend/src/components/organisms/RegisterAsSoleVoterBoxContent.tsx
 create mode 100644 govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
 create mode 100644 govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
 delete mode 100644 govtool/frontend/src/components/organisms/SoleVoterInfo.tsx

diff --git a/govtool/frontend/public/icons/ArrowLeftThin.svg b/govtool/frontend/public/icons/ArrowLeftThin.svg
new file mode 100644
index 000000000..38c648693
--- /dev/null
+++ b/govtool/frontend/public/icons/ArrowLeftThin.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="chevron-left">
+<path id="Vector" d="M12.5 15L7.5 10L12.5 5" stroke="#0033AD" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx b/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
new file mode 100644
index 000000000..c54a6627c
--- /dev/null
+++ b/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
@@ -0,0 +1,75 @@
+import { useMemo } from "react";
+import { Box } from "@mui/material";
+
+import { Button, LoadingButton } from "@atoms";
+import { useScreenDimension, useTranslation } from "@hooks";
+
+interface Props {
+  leftButtonAction: () => void;
+  rightButtonAction: () => void;
+  rightButtonIsLoading?: boolean;
+  leftButtonText?: string;
+  rightButtonText?: string;
+}
+
+export const BottomBoxButtons = ({
+  leftButtonAction,
+  rightButtonAction,
+  rightButtonIsLoading,
+  leftButtonText,
+  rightButtonText,
+}: Props) => {
+  const { isMobile } = useScreenDimension();
+  const { t } = useTranslation();
+
+  const renderBackButton = useMemo(() => {
+    return (
+      <Button
+        data-testid={"back-button"}
+        onClick={leftButtonAction}
+        size="extraLarge"
+        sx={{
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+        }}
+        variant="outlined"
+      >
+        {leftButtonText ?? t("cancel")}
+      </Button>
+    );
+  }, [isMobile]);
+
+  const renderRegisterButton = useMemo(() => {
+    return (
+      <LoadingButton
+        data-testid={"register-button"}
+        isLoading={rightButtonIsLoading}
+        onClick={rightButtonAction}
+        sx={{
+          borderRadius: 50,
+          textTransform: "none",
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+          height: 48,
+          fontSize: 16,
+        }}
+        variant="contained"
+      >
+        {rightButtonText ?? t("continue")}
+      </LoadingButton>
+    );
+  }, [rightButtonIsLoading, isMobile]);
+
+  return (
+    <Box
+      display="flex"
+      flexDirection={isMobile ? "column" : "row"}
+      justifyContent="space-around"
+      mt={6}
+    >
+      {isMobile ? renderRegisterButton : renderBackButton}
+      <Box px={2} py={isMobile ? 1.5 : 0} />
+      {isMobile ? renderBackButton : renderRegisterButton}
+    </Box>
+  );
+};
diff --git a/govtool/frontend/src/components/molecules/CenteredBoxPageWrapper.tsx b/govtool/frontend/src/components/molecules/CenteredBoxPageWrapper.tsx
new file mode 100644
index 000000000..dc9cbe0da
--- /dev/null
+++ b/govtool/frontend/src/components/molecules/CenteredBoxPageWrapper.tsx
@@ -0,0 +1,108 @@
+import { FC, PropsWithChildren } from "react";
+import { Box, Link } from "@mui/material";
+
+import { Background, Typography } from "@atoms";
+import { ICONS } from "@consts";
+import { DashboardTopNav } from "@organisms";
+import { useScreenDimension } from "@hooks";
+import { useNavigate } from "react-router-dom";
+import { theme } from "@/theme";
+
+interface Props {
+  pageTitle: string;
+  backButtonText: string;
+  backButtonPath: string;
+  isVotingPowerHidden?: boolean;
+}
+export const CenteredBoxPageWrapper: FC<PropsWithChildren<Props>> = ({
+  pageTitle,
+  backButtonText,
+  backButtonPath,
+  isVotingPowerHidden,
+  children,
+}) => {
+  const { isMobile, screenWidth, pagePadding } = useScreenDimension();
+  const navigate = useNavigate();
+  const {
+    palette: { boxShadow2 },
+  } = theme;
+
+  return (
+    <Background isReverted>
+      <Box display={"flex"} minHeight={"100vh"} flexDirection="column">
+        <DashboardTopNav
+          imageSRC={ICONS.appLogoIcon}
+          imageWidth={isMobile ? undefined : 42}
+          imageHeight={isMobile ? 24 : 35}
+          title={pageTitle}
+          isVotingPowerHidden={isVotingPowerHidden}
+        />
+        <Box
+          display={"flex"}
+          justifyContent={"center"}
+          flexDirection={"column"}
+          mt={isMobile ? 0 : 7}
+          height={isMobile ? "100%" : "auto"}
+          sx={{ marginTop: "97px" }}
+        >
+          {isMobile && (
+            <Box borderBottom={1} borderColor={"#fff"}>
+              <Typography
+                variant="body2"
+                sx={{
+                  ml: 2,
+                  my: "26px",
+                  fontSize: "24px",
+                  fontWeight: 400,
+                }}
+              >
+                {pageTitle}
+              </Typography>
+            </Box>
+          )}
+          <Link
+            data-testid={"back-button"}
+            sx={{
+              cursor: "pointer",
+              display: "flex",
+              textDecoration: "none",
+              my: 3,
+              marginLeft: isMobile ? 2 : "40px",
+            }}
+            onClick={() => navigate(backButtonPath)}
+          >
+            <img
+              src={ICONS.arrowLeftThinIcon}
+              alt="arrow"
+              style={{ marginRight: "4px" }}
+            />
+            <Typography
+              variant="body2"
+              color="primary"
+              sx={{
+                fontWeight: 400,
+                paddingTop: "1px",
+              }}
+            >
+              {backButtonText}
+            </Typography>
+          </Link>
+          <Box display={"flex"} justifyContent={"center"}>
+            <Box
+              width={screenWidth < 768 ? "auto" : "52vw"}
+              boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
+              px={pagePadding}
+              py={isMobile ? 3 : 8}
+              borderRadius={"20px"}
+              height="auto"
+            >
+              <Box display="flex" flexDirection="column">
+                {children}
+              </Box>
+            </Box>
+          </Box>
+        </Box>
+      </Box>
+    </Background>
+  );
+};
diff --git a/govtool/frontend/src/components/molecules/index.ts b/govtool/frontend/src/components/molecules/index.ts
index 4fc87340a..cb5e9115b 100644
--- a/govtool/frontend/src/components/molecules/index.ts
+++ b/govtool/frontend/src/components/molecules/index.ts
@@ -1,4 +1,6 @@
 export * from "./ActionCard";
+export * from "./BottomBoxButtons";
+export * from "./CenteredBoxPageWrapper";
 export * from "./DashboardActionCard";
 export * from "./DataActionsBar";
 export * from "./DRepInfoCard";
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 49ae2df2c..e78353ccb 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -1,3 +1,4 @@
+import { useCallback, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { Box, CircularProgress } from "@mui/material";
 import { Trans } from "react-i18next";
@@ -11,7 +12,6 @@ import {
   useTranslation,
 } from "@hooks";
 import { DashboardActionCard } from "@molecules";
-import { useCallback, useMemo, useState } from "react";
 import { correctAdaFormat, formHexToBech32, openInNewTab } from "@utils";
 
 export const DashboardCards = () => {
@@ -26,6 +26,7 @@ export const DashboardCards = () => {
     isDrepLoading,
     isPendingTransaction,
     registerTransaction,
+    soleVoterTransaction,
     stakeKey,
     soleVoter,
   } = useCardano();
@@ -413,8 +414,8 @@ export const DashboardCards = () => {
           <Trans
             i18nKey={
               soleVoter?.isRegistered
-                ? "dashboard.cards.youAreSoleVoterDescription"
-                : "dashboard.cards.registerAsSoleVoterDescription"
+                ? "dashboard.soleVoter.youAreSoleVoterDescription"
+                : "dashboard.soleVoter.registerAsSoleVoterDescription"
             }
             values={{ votingPower: correctAdaFormat(votingPower) }}
           />
@@ -428,10 +429,18 @@ export const DashboardCards = () => {
         }
         firstButtonLabel={t(
           soleVoter?.isRegistered
-            ? "dashboard.cards.retire"
-            : "dashboard.registration.register"
+            ? "dashboard.soleVoter.retire"
+            : "dashboard.soleVoter.register"
         )}
         firstButtonVariant={soleVoter?.isRegistered ? "outlined" : "contained"}
+        secondButtonVariant={
+          soleVoterTransaction?.transactionHash
+            ? "outlined"
+            : soleVoter?.isRegistered
+            ? "text"
+            : "outlined"
+        }
+        inProgress={!!soleVoterTransaction?.transactionHash}
         imageURL={IMAGES.soleVoterImage}
         secondButtonAction={() =>
           openInNewTab(
@@ -442,8 +451,8 @@ export const DashboardCards = () => {
         secondButtonVariant={"outlined"}
         title={t(
           soleVoter?.isRegistered
-            ? "dashboard.cards.youAreSoleVoterTitle"
-            : "dashboard.cards.registerAsSoleVoterTitle"
+            ? "dashboard.soleVoter.youAreSoleVoterTitle"
+            : "dashboard.soleVoter.registerAsSoleVoterTitle"
         )}
       />
       {/* REGISTARTION AS SOLE VOTER CARD END*/}
diff --git a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
index 5bf0a3be4..b02a4c2ae 100644
--- a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
@@ -15,6 +15,7 @@ type DashboardTopNavProps = {
   imageHeight?: number;
   title: string;
   isDrawer?: boolean;
+  isVotingPowerHidden?: boolean;
 };
 
 const DRAWER_PADDING = 2;
@@ -25,6 +26,7 @@ export const DashboardTopNav = ({
   imageSRC,
   imageWidth,
   imageHeight,
+  isVotingPowerHidden,
 }: DashboardTopNavProps) => {
   const { isMobile, screenWidth } = useScreenDimension();
   const { dRep } = useCardano();
@@ -47,6 +49,7 @@ export const DashboardTopNav = ({
       zIndex={100}
       flex={1}
       width={"fill-available"}
+      height={"48px"}
     >
       <Box display={"flex"}>
         {imageSRC ? (
@@ -66,7 +69,7 @@ export const DashboardTopNav = ({
         ) : null}
       </Box>
       <Box display="flex">
-        <VotingPowerChips />
+        {!isVotingPowerHidden && <VotingPowerChips />}
         {isMobile && (
           <IconButton
             data-testid={"open-drawer-button"}
diff --git a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
new file mode 100644
index 000000000..4034e6f01
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
@@ -0,0 +1,76 @@
+import { useCallback, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+
+import { PATHS } from "@consts";
+import { RegisterAsSoleVoterBoxContent } from "@organisms";
+import { BottomBoxButtons } from "@molecules";
+import { useCardano, useModal } from "@context";
+
+export const RegisterAsSoleVoterBox = () => {
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  const { buildSignSubmitConwayCertTx, buildDRepRegCert } = useCardano();
+  const navigate = useNavigate();
+  const { openModal, closeModal } = useModal();
+  const { t } = useTranslation();
+
+  const onRegister = useCallback(async () => {
+    setIsLoading(true);
+
+    try {
+      const certBuilder = await buildDRepRegCert();
+      const result = await buildSignSubmitConwayCertTx({
+        certBuilder,
+        type: "soleVoterRegistration",
+        registrationType: "registration",
+      });
+      if (result)
+        openModal({
+          type: "statusModal",
+          state: {
+            status: "success",
+            title: t("modals.registration.title"),
+            message: t("modals.registration.message"),
+            link: "https://adanordic.com/latest_transactions",
+            buttonText: t("modals.common.goToDashboard"),
+            onSubmit: () => {
+              navigate(PATHS.dashboard);
+              closeModal();
+            },
+            dataTestId: "registration-transaction-submitted-modal",
+          },
+        });
+    } catch (e: any) {
+      const errorMessage = e.info ? e.info : e;
+
+      openModal({
+        type: "statusModal",
+        state: {
+          status: "warning",
+          title: t("modals.common.oops"),
+          message: errorMessage,
+          buttonText: t("modals.common.goToDashboard"),
+          onSubmit: () => {
+            navigate(PATHS.dashboard);
+            closeModal();
+          },
+          dataTestId: "registration-transaction-error-modal",
+        },
+      });
+    } finally {
+      setIsLoading(false);
+    }
+  }, [buildSignSubmitConwayCertTx, buildDRepRegCert, openModal]);
+
+  return (
+    <>
+      <RegisterAsSoleVoterBoxContent />
+      <BottomBoxButtons
+        leftButtonAction={() => navigate(PATHS.dashboard)}
+        rightButtonAction={onRegister}
+        rightButtonIsLoading={isLoading}
+      />
+    </>
+  );
+};
diff --git a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBoxContent.tsx
new file mode 100644
index 000000000..9308da9f5
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBoxContent.tsx
@@ -0,0 +1,48 @@
+import { Link } from "@mui/material";
+import { Trans } from "react-i18next";
+
+import { Typography } from "@atoms";
+import { useScreenDimension, useTranslation } from "@hooks";
+import {
+  PROTOCOL_PARAMS_KEY,
+  correctAdaFormat,
+  getItemFromLocalStorage,
+  openInNewTab,
+} from "@utils";
+
+export const RegisterAsSoleVoterBoxContent = () => {
+  const { isMobile } = useScreenDimension();
+  const { t } = useTranslation();
+
+  const epochParams = getItemFromLocalStorage(PROTOCOL_PARAMS_KEY);
+
+  return (
+    <>
+      <Typography sx={{ mt: 1, textAlign: "center" }} variant="headline4">
+        {t("soleVoter.registerHeading")}
+      </Typography>
+      <Typography
+        fontWeight={400}
+        sx={{
+          mb: 7,
+          mt: isMobile ? 4 : 10,
+          textAlign: "center",
+          whiteSpace: "pre-line",
+        }}
+        variant="body1"
+      >
+        <Trans
+          i18nKey="soleVoter.registerDescription"
+          values={{ deposit: correctAdaFormat(epochParams.drep_deposit) }}
+          components={[
+            <Link
+              onClick={() => openInNewTab("https://sancho.network/")}
+              sx={{ cursor: "pointer" }}
+              key="0"
+            />,
+          ]}
+        />
+      </Typography>
+    </>
+  );
+};
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
new file mode 100644
index 000000000..0b41dba29
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
@@ -0,0 +1,86 @@
+import { useCallback, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+
+import { PATHS } from "@consts";
+import { BottomBoxButtons } from "@molecules";
+import { useCardano, useModal } from "@context";
+import { RetireAsSoleVoterBoxContent } from "@organisms";
+
+export const RetireAsSoleVoterBox = () => {
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  const navigate = useNavigate();
+  const {
+    buildDRepRetirementCert,
+    buildSignSubmitConwayCertTx,
+    isPendingTransaction,
+  } = useCardano();
+  const { openModal, closeModal } = useModal();
+  const { t } = useTranslation();
+
+  const onRetire = useCallback(async () => {
+    try {
+      setIsLoading(true);
+      const isPendingTx = isPendingTransaction();
+      if (isPendingTx) return;
+      const certBuilder = await buildDRepRetirementCert();
+      const result = await buildSignSubmitConwayCertTx({
+        certBuilder,
+        type: "soleVoterRegistration",
+        registrationType: "retirement",
+      });
+      if (result)
+        openModal({
+          type: "statusModal",
+          state: {
+            status: "success",
+            title: t("modals.retirement.title"),
+            message: t("modals.retirement.message"),
+            link: `https://adanordic.com/latest_transactions`,
+            buttonText: t("modals.common.goToDashboard"),
+            dataTestId: "retirement-transaction-submitted-modal",
+            onSubmit: () => {
+              navigate(PATHS.dashboard);
+              closeModal();
+            },
+          },
+        });
+    } catch (error: any) {
+      const errorMessage = error.info ? error.info : error;
+
+      openModal({
+        type: "statusModal",
+        state: {
+          status: "warning",
+          message: errorMessage,
+          buttonText: t("modals.common.goToDashboard"),
+          title: t("modals.common.oops"),
+          dataTestId: "retirement-transaction-error-modal",
+          onSubmit: () => {
+            navigate(PATHS.dashboard);
+            closeModal();
+          },
+        },
+      });
+    } finally {
+      setIsLoading(false);
+    }
+  }, [
+    buildDRepRetirementCert,
+    buildSignSubmitConwayCertTx,
+    isPendingTransaction,
+    openModal,
+  ]);
+
+  return (
+    <>
+      <RetireAsSoleVoterBoxContent />
+      <BottomBoxButtons
+        leftButtonAction={() => navigate(PATHS.dashboard)}
+        rightButtonAction={onRetire}
+        rightButtonIsLoading={isLoading}
+      />
+    </>
+  );
+};
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
new file mode 100644
index 000000000..67fcc97d6
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
@@ -0,0 +1,43 @@
+import { Link } from "@mui/material";
+import { Trans } from "react-i18next";
+
+import { Typography } from "@atoms";
+import { useScreenDimension, useTranslation } from "@hooks";
+import { correctAdaFormat, openInNewTab } from "@/utils";
+import { useCardano } from "@/context";
+
+export const RetireAsSoleVoterBoxContent = () => {
+  const { isMobile } = useScreenDimension();
+  const { t } = useTranslation();
+  const { soleVoter } = useCardano();
+
+  return (
+    <>
+      <Typography sx={{ mt: 1, textAlign: "center" }} variant="headline4">
+        {t("soleVoter.retirementHeading")}
+      </Typography>
+      <Typography
+        fontWeight={400}
+        sx={{
+          mb: 7,
+          mt: isMobile ? 4 : 10,
+          textAlign: "center",
+          whiteSpace: "pre-line",
+        }}
+        variant="body1"
+      >
+        <Trans
+          i18nKey="soleVoter.retirementDescription"
+          values={{ deposit: correctAdaFormat(soleVoter?.deposit) }}
+          components={[
+            <Link
+              onClick={() => openInNewTab("https://sancho.network/")}
+              sx={{ cursor: "pointer" }}
+              key="0"
+            />,
+          ]}
+        />
+      </Typography>
+    </>
+  );
+};
diff --git a/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx b/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
deleted file mode 100644
index 4eb34dafe..000000000
--- a/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { useMemo } from "react";
-import { Box, Link } from "@mui/material";
-
-import { LoadingButton, Button, Typography } from "@atoms";
-import { theme } from "@/theme";
-import { useScreenDimension, useTranslation } from "@hooks";
-import { Trans } from "react-i18next";
-import { openInNewTab } from "@/utils";
-import { useNavigate } from "react-router-dom";
-import { PATHS } from "@consts";
-
-export const SoleVoterInfo = () => {
-  const {
-    palette: { boxShadow2 },
-  } = theme;
-  const { isMobile, pagePadding, screenWidth } = useScreenDimension();
-  const navigate = useNavigate();
-  const { t } = useTranslation();
-
-  const renderBackButton = useMemo(() => {
-    return (
-      <Button
-        data-testid={"back-button"}
-        onClick={() => navigate(PATHS.dashboard)}
-        size="extraLarge"
-        sx={{
-          px: 6,
-          width: isMobile ? "100%" : "auto",
-        }}
-        variant="outlined"
-      >
-        {t("cancel")}
-      </Button>
-    );
-  }, [isMobile]);
-
-  const renderRegisterButton = useMemo(() => {
-    return (
-      <LoadingButton
-        data-testid={"register-button"}
-        // isLoading={isLoading}
-        onClick={() => {}}
-        sx={{
-          borderRadius: 50,
-          textTransform: "none",
-          px: 6,
-          width: isMobile ? "100%" : "auto",
-          height: 48,
-        }}
-        variant="contained"
-      >
-        {t("soleVoter.continueToRegister")}
-      </LoadingButton>
-    );
-  }, [
-    // isLoading,
-    isMobile,
-  ]);
-
-  return (
-    <Box
-      width={screenWidth < 768 ? "auto" : screenWidth < 1024 ? "60vw" : "45vw"}
-      boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
-      px={pagePadding}
-      py={isMobile ? 3 : 8}
-      borderRadius={"20px"}
-      mb={isMobile ? 0 : 6}
-      height="auto"
-    >
-      <Box display="flex" flexDirection="column">
-        <Typography sx={{ mt: 1, textAlign: "center" }} variant="headline4">
-          {t("soleVoter.heading")}
-        </Typography>
-        <Typography
-          fontWeight={400}
-          sx={{
-            mb: 7,
-            mt: isMobile ? 4 : 10,
-            textAlign: "center",
-            whiteSpace: "pre-line",
-          }}
-          variant="body1"
-        >
-          <Trans
-            i18nKey="soleVoter.description"
-            components={[
-              <Link
-                onClick={() => openInNewTab("https://sancho.network/")}
-                sx={{ cursor: "pointer" }}
-                key="0"
-              />,
-            ]}
-          />
-        </Typography>
-      </Box>
-      <Box
-        display="flex"
-        flexDirection={isMobile ? "column" : "row"}
-        justifyContent="space-between"
-        mt={6}
-      >
-        {isMobile ? renderRegisterButton : renderBackButton}
-        <Box px={2} py={isMobile ? 1.5 : 0} />
-        {isMobile ? renderBackButton : renderRegisterButton}
-      </Box>
-    </Box>
-  );
-};
diff --git a/govtool/frontend/src/components/organisms/index.ts b/govtool/frontend/src/components/organisms/index.ts
index 1906a2e23..5387a425c 100644
--- a/govtool/frontend/src/components/organisms/index.ts
+++ b/govtool/frontend/src/components/organisms/index.ts
@@ -1,6 +1,7 @@
 export * from "./BgCard";
 export * from "./ChooseStakeKeyPanel";
 export * from "./ChooseWalletModal";
+export * from "./ControlledField";
 export * from "./DashboardCards";
 export * from "./DashboardCards";
 export * from "./DashboardGovernanceActionDetails";
@@ -21,8 +22,10 @@ export * from "./RegisterAsdRepStepOne";
 export * from "./RegisterAsdRepStepThree";
 export * from "./RegisterAsdRepStepTwo";
 export * from "./Slider";
+export * from "./RegisterAsSoleVoterBoxContent";
+export * from "./RegisterAsSoleVoterBox";
+export * from "./RetireAsSoleVoterBoxContent";
+export * from "./RetireAsSoleVoterBox";
 export * from "./StatusModal";
 export * from "./TopNav";
 export * from "./VotingPowerModal";
-
-export * from "./ControlledField";
diff --git a/govtool/frontend/src/consts/icons.ts b/govtool/frontend/src/consts/icons.ts
index c6facbf60..93574c43b 100644
--- a/govtool/frontend/src/consts/icons.ts
+++ b/govtool/frontend/src/consts/icons.ts
@@ -2,6 +2,7 @@ export const ICONS = {
   appLogoIcon: "/icons/AppLogo.svg",
   arrowDownIcon: "/icons/ArrowDown.svg",
   arrowRightIcon: "/icons/ArrowRight.svg",
+  arrowLeftThinIcon: "/icons/ArrowLeftThin.svg",
   checkCircleIcon: "/icons/CheckCircle.svg",
   closeDrawerIcon: "/icons/CloseIcon.svg",
   closeIcon: "/icons/Close.svg",
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 925f3d418..31eaf2626 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -66,6 +66,7 @@ import {
   SANCHO_INFO_KEY,
   VOTE_TRANSACTION_KEY,
   checkIsMaintenanceOn,
+  REGISTER_SOLE_VOTER_TRANSACTION_KEY,
 } from "@utils";
 import { getEpochParams, getTransactionStatus } from "@services";
 import {
@@ -122,7 +123,7 @@ interface CardanoContext {
   }: {
     certBuilder?: CertificatesBuilder;
     votingBuilder?: VotingBuilder;
-    type?: "delegation" | "registration" | "vote";
+    type?: "delegation" | "registration" | "soleVoterRegistration" | "vote";
     proposalId?: string;
     registrationType?: DRepActionType;
   }) => Promise<string>;
@@ -145,6 +146,9 @@ interface CardanoContext {
   ) => Promise<VotingBuilder>;
   delegateTransaction: TransactionHistoryItem;
   registerTransaction: TransactionHistoryItem & { type: DRepActionType };
+  soleVoterTransaction: TransactionHistoryItem & {
+    type: Omit<DRepActionType, "update">;
+  };
   delegateTo: string;
   voteTransaction: TransactionHistoryItem & { proposalId: string };
   isPendingTransaction: () => boolean;
@@ -208,6 +212,9 @@ function CardanoProvider(props: Props) {
   const [registerTransaction, setRegisterTransaction] = useState<
     TransactionHistoryItem & { type: DRepActionType }
   >({ time: undefined, transactionHash: "", type: "" });
+  const [soleVoterTransaction, setSoleVoterTransaction] = useState<
+    TransactionHistoryItem & { type: Omit<DRepActionType, "update"> }
+  >({ time: undefined, transactionHash: "", type: "" });
   const [voteTransaction, setVoteTransaction] = useState<
     { proposalId: string } & TransactionHistoryItem
   >({ time: undefined, transactionHash: "", proposalId: "" });
@@ -219,6 +226,7 @@ function CardanoProvider(props: Props) {
   const isPendingTransaction = useCallback(() => {
     if (
       registerTransaction?.transactionHash ||
+      soleVoterTransaction?.transactionHash ||
       delegateTransaction?.transactionHash ||
       voteTransaction?.transactionHash
     ) {
@@ -243,6 +251,7 @@ function CardanoProvider(props: Props) {
     delegateTransaction?.transactionHash,
     openModal,
     registerTransaction?.transactionHash,
+    soleVoterTransaction?.transactionHash,
     voteTransaction?.transactionHash,
   ]);
 
@@ -253,6 +262,11 @@ function CardanoProvider(props: Props) {
     const registerTransaction = JSON.parse(
       getItemFromLocalStorage(REGISTER_TRANSACTION_KEY + `_${stakeKey}`)
     );
+    const soleVoterTransaction = JSON.parse(
+      getItemFromLocalStorage(
+        REGISTER_SOLE_VOTER_TRANSACTION_KEY + `_${stakeKey}`
+      )
+    );
     const voteTransaction = JSON.parse(
       getItemFromLocalStorage(VOTE_TRANSACTION_KEY + `_${stakeKey}`)
     );
@@ -265,6 +279,9 @@ function CardanoProvider(props: Props) {
     if (registerTransaction?.transactionHash) {
       setRegisterTransaction(registerTransaction);
     }
+    if (soleVoterTransaction?.transactionHash) {
+      setSoleVoterTransaction(soleVoterTransaction);
+    }
     if (voteTransaction?.transactionHash) {
       setVoteTransaction(voteTransaction);
     }
@@ -385,6 +402,71 @@ function CardanoProvider(props: Props) {
       let interval = setInterval(checkRegisterTransaction, REFRESH_TIME);
       checkRegisterTransaction();
     }
+    if (soleVoterTransaction?.transactionHash) {
+      const checkRegisterTransaction = async () => {
+        const resetRegisterTransaction = () => {
+          clearInterval(interval);
+          removeItemFromLocalStorage(
+            REGISTER_SOLE_VOTER_TRANSACTION_KEY + `_${stakeKey}`
+          );
+          setSoleVoterTransaction({
+            time: undefined,
+            transactionHash: "",
+            type: "",
+          });
+        };
+        const status = await getTransactionStatus(
+          soleVoterTransaction.transactionHash
+        );
+        if (status.transactionConfirmed) {
+          if (isEnabled) {
+            await setLimitedRegistrationInterval(
+              3000,
+              10,
+              dRepID,
+              soleVoterTransaction.type,
+              setDRep
+            ).then((isRegistered) => {
+              if (soleVoterTransaction.type === "registration") {
+                if (isRegistered) {
+                  addSuccessAlert(t("alerts.soleVoterRegistration.success"));
+                } else {
+                  addWarningAlert(
+                    t("alerts.soleVoterRegistration.refreshPage")
+                  );
+                }
+              } else if (soleVoterTransaction.type === "retirement") {
+                if (!isRegistered) {
+                  addSuccessAlert(t("alerts.soleVoterRetirement.success"));
+                } else {
+                  addWarningAlert(t("alerts.soleVoterRetirement.refreshPage"));
+                }
+              }
+            });
+          }
+          resetRegisterTransaction();
+        }
+        if (
+          new Date().getTime() -
+            new Date(soleVoterTransaction?.time).getTime() >
+          TIME_TO_EXPIRE_TRANSACTION
+        ) {
+          resetRegisterTransaction();
+          if (isEnabled)
+            addErrorAlert(
+              t(
+                `alerts.${
+                  soleVoterTransaction.type === "retirement"
+                    ? "retirement.failed"
+                    : "registration.failed"
+                }`
+              )
+            );
+        }
+      };
+      let interval = setInterval(checkRegisterTransaction, REFRESH_TIME);
+      checkRegisterTransaction();
+    }
     if (voteTransaction?.transactionHash) {
       const checkVoteTransaction = async () => {
         const resetVoteTransaction = () => {
@@ -418,11 +500,17 @@ function CardanoProvider(props: Props) {
       isEnabled &&
       (voteTransaction?.transactionHash ||
         registerTransaction?.transactionHash ||
+        soleVoterTransaction?.transactionHash ||
         delegateTransaction?.transactionHash)
     ) {
       addWarningAlert(t("alerts.transactionInProgress"), 10000);
     }
-  }, [delegateTransaction, registerTransaction, voteTransaction]);
+  }, [
+    delegateTransaction,
+    registerTransaction,
+    soleVoterTransaction,
+    voteTransaction,
+  ]);
 
   const getChangeAddress = async (enabledApi: CardanoApiWallet) => {
     try {
@@ -726,7 +814,7 @@ function CardanoProvider(props: Props) {
     }: {
       certBuilder?: CertificatesBuilder;
       votingBuilder?: VotingBuilder;
-      type?: "delegation" | "registration" | "vote";
+      type?: "delegation" | "registration" | "soleVoterRegistration" | "vote";
       proposalId?: string;
       registrationType?: DRepActionType;
     }) => {
@@ -849,6 +937,21 @@ function CardanoProvider(props: Props) {
             })
           );
         }
+        if (type === "soleVoterRegistration" && registrationType !== "update") {
+          setSoleVoterTransaction({
+            time: new Date(),
+            transactionHash: resultHash,
+            type: registrationType ?? "",
+          });
+          setItemToLocalStorage(
+            REGISTER_SOLE_VOTER_TRANSACTION_KEY + `_${stakeKey}`,
+            JSON.stringify({
+              time: new Date(),
+              transactionHash: resultHash,
+              type: registrationType,
+            })
+          );
+        }
         if (type === "delegation") {
           setDelegateTransaction({
             time: new Date(),
@@ -899,6 +1002,7 @@ function CardanoProvider(props: Props) {
       walletApi,
       getUtxos,
       registerTransaction.transactionHash,
+      soleVoterTransaction.transactionHash,
       delegateTransaction.transactionHash,
       voteTransaction.transactionHash,
       stakeKey,
@@ -1148,6 +1252,7 @@ function CardanoProvider(props: Props) {
       buildVoteDelegationCert,
       delegateTransaction,
       registerTransaction,
+      soleVoterTransaction,
       delegateTo,
       voteTransaction,
       isPendingTransaction,
@@ -1183,6 +1288,7 @@ function CardanoProvider(props: Props) {
       buildVoteDelegationCert,
       delegateTransaction,
       registerTransaction,
+      soleVoterTransaction,
       delegateTo,
       voteTransaction,
       isPendingTransaction,
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index 5bf0be32a..e722e4c84 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -6,7 +6,7 @@ export const setLimitedRegistrationInterval = (
   intervalTime: number,
   attemptsNumber: number,
   dRepID: string,
-  transactionType: DRepActionType,
+  transactionType: DRepActionType | Omit<DRepActionType, "update">,
   setDRep: (key: undefined | DRepInfo) => void
 ): Promise<boolean> => {
   return new Promise(async (resolve) => {
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index b1d413e2e..267f26abf 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -23,6 +23,16 @@ export const en = {
           "You have successfully retired from being a DRep! Please refresh the page.",
         success: "You have successfully retired from being a DRep!",
       },
+      soleVoterRegistration: {
+        refreshPage:
+          "You have successfully registered as a Sole Voter! Please refresh the page.",
+        success: "You have successfully registered as a Sole Voter!",
+      },
+      soleVoterRetirement: {
+        refreshPage:
+          "You have successfully retired from being a Sole Voter! Please refresh the page.",
+        success: "You have successfully retired from being a SoleVoter!",
+      },
       voting: {
         failed: "Vote transaction failed",
         success: "You have successfully voted!",
@@ -37,11 +47,8 @@ export const en = {
       headingTwo: "See Active Governance Actions",
       delegation: {
         changeDelegation: "Change delegation",
-        connectToDelegate: "Connect to delegate",
         delegateOwnPower:
           "If you want to delegate your own voting power of ₳<strong>{{ada}}</strong>.",
-        description:
-          "If you want to delegate to a DRep or select a default option.",
         dRepDelegatedTo: "DRep you delegated to",
         toDRep:
           "You have delegated your voting power of ₳<strong>{{ada}}</strong> to a selected DRep.",
@@ -72,23 +79,11 @@ export const en = {
         title: "Governance Actions",
         view: "View governance actions",
       },
-      cards: {
-        retire: "Retire",
-        youAreSoleVoterTitle: "You are a Sole Voter",
-        youAreSoleVoterDescription:
-          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
-        registerAsSoleVoterTitle: "Become a Sole Voter",
-        registerAsSoleVoterDescription:
-          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
-      },
       registration: {
         changeMetadata: "Change metadata",
-        connectToRegister: "Connect to register",
         dRepRegistration: "DRep Registration",
         dRepRetirement: "DRep Retirement",
         dRepUpdate: "DRep Update",
-        description:
-          "If you want to directly participate in voting and have other ada holders delegate their voting power to you.",
         holdersCanDelegate:
           "Ada holders can delegate their voting power to you.",
         ifYouWant:
@@ -105,24 +100,15 @@ export const en = {
           "The retirement process is ongoing. This may take several minutes.",
         youAreRegistered: "You are Registered as a DRep",
       },
-    },
-    home: {
-      cards: {
-        delegateDescription: "Find a DRep to vote on your behalf.",
-        delegateFirstButtonLabel: "View DRep Direcotry",
-        delegateTitle: "Delegate your Voting Power",
-        governaneActionsDescription:
-          "See all the Governance Actions submitted on chain. ",
-        governanceActionsFirstButtonLabel: "View Governance Actions",
-        governaneActionsTitle: "View Governance Actions",
-        registerAsDRepDescription:
-          "Accept delegated voting power from other ADA holders, and combine it with your own voting power. Vote with the accumulated Power on  Governance Actions.",
-        registerAsDRepFirstButtonLabel: "Connect to Register",
-        registerAsDRepTitle: "Become a DRep",
+      soleVoter: {
+        register: "Register",
         registerAsSoleVoterDescription:
-          "Vote on Governance Actions using your own voting power",
-        registerAsSoleVoterFirstButtonLabel: "Connect to Register",
+          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
         registerAsSoleVoterTitle: "Become a Sole Voter",
+        retire: "Retire",
+        youAreSoleVoterDescription:
+          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
+        youAreSoleVoterTitle: "You are a Sole Voter",
       },
     },
     delegation: {
@@ -246,6 +232,25 @@ export const en = {
       },
       headline: "SanchoNet \n Governance Tool",
     },
+    home: {
+      cards: {
+        delegateDescription: "Find a DRep to vote on your behalf.",
+        delegateFirstButtonLabel: "View DRep Direcotry",
+        delegateTitle: "Delegate your Voting Power",
+        governaneActionsDescription:
+          "See all the Governance Actions submitted on chain. ",
+        governanceActionsFirstButtonLabel: "View Governance Actions",
+        governaneActionsTitle: "View Governance Actions",
+        registerAsDRepDescription:
+          "Accept delegated voting power from other ADA holders, and combine it with your own voting power. Vote with the accumulated Power on  Governance Actions.",
+        registerAsDRepFirstButtonLabel: "Connect to Register",
+        registerAsDRepTitle: "Become a DRep",
+        registerAsSoleVoterDescription:
+          "Vote on Governance Actions using your own voting power",
+        registerAsSoleVoterFirstButtonLabel: "Connect to Register",
+        registerAsSoleVoterTitle: "Become a Sole Voter",
+      },
+    },
     menu: {
       faqs: "FAQs",
       guides: "Guides",
@@ -320,13 +325,12 @@ export const en = {
     soleVoter: {
       retireSoleVoter: "Retire as a Sole Voter",
       becomeSoleVoter: "Become a Sole Voter",
-      continueToRegister: "Continue to register",
-      description:
-        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳2</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
-      heading: "What this Means",
+      registerDescription:
+        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
+      registerHeading: "What this Means",
       retirementHeading: "What Retirement Means",
       retirementDescription:
-        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of <strong>{{deposit}} ADA</strong> will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\n<0>These options are listed in our Guides here:</0> <1>Voting options and Roles</1>",
+        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
     },
     system: {
       sanchoNet: "SanchoNet",
diff --git a/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx b/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
index 370a5fefc..ea7018a85 100644
--- a/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
+++ b/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
@@ -1,16 +1,13 @@
 import { useEffect } from "react";
-import { Box, Link } from "@mui/material";
-
-import { Background, Typography } from "@atoms";
-import { ICONS, PATHS } from "@consts";
-import { DashboardTopNav, Footer } from "@organisms";
-import { useScreenDimension, useTranslation } from "@hooks";
 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 { SoleVoterInfo } from "@/components/organisms/SoleVoterInfo";
+import { CenteredBoxPageWrapper } from "@molecules";
 
 export const RegisterAsSoleVoter = () => {
-  const { isMobile, screenWidth } = useScreenDimension();
   const navigate = useNavigate();
   const { t } = useTranslation();
 
@@ -24,87 +21,13 @@ export const RegisterAsSoleVoter = () => {
   }, []);
 
   return (
-    <Background isReverted>
-      <Box display={"flex"} minHeight={"100vh"} flexDirection="column">
-        <DashboardTopNav
-          imageSRC={ICONS.appLogoIcon}
-          imageWidth={isMobile ? undefined : 42}
-          imageHeight={isMobile ? 24 : 35}
-          title={t("soleVoter.becomeSoleVoter")}
-        />
-
-        <Box
-          mt={isMobile ? 0 : 7}
-          height={isMobile ? "100%" : "auto"}
-          sx={{
-            marginTop: isMobile ? "97px" : "153px",
-            display: isMobile ? "flex" : "grid",
-            ...(isMobile && {
-              flexDirection: "column",
-            }),
-            ...(!isMobile && { gridTemplateColumns: "1fr auto 1fr" }),
-          }}
-        >
-          {isMobile && (
-            <Box borderBottom={1} borderColor={"#fff"}>
-              <Typography
-                variant="body2"
-                sx={{
-                  ml: 2,
-                  my: "26px",
-                  fontSize: "24px",
-                  fontWeight: 400,
-                }}
-              >
-                {t("soleVoter.becomeSoleVoter")}
-              </Typography>
-            </Box>
-          )}
-          <Link
-            data-testid={"back-to-list-link"}
-            sx={{
-              cursor: "pointer",
-              alignSelf: "flex-start",
-              display: "flex",
-              justifyContent: "center",
-              textDecoration: "none",
-              marginBottom: 3,
-              mt: isMobile ? 3 : "none",
-              mx: isMobile ? 2 : 1,
-            }}
-            onClick={() => navigate(PATHS.dashboard)}
-          >
-            <img
-              src={ICONS.arrowRightIcon}
-              alt="arrow"
-              style={{
-                marginRight: isMobile
-                  ? "12px"
-                  : screenWidth < 950
-                  ? "8px"
-                  : "12px",
-                transform: "rotate(180deg)",
-              }}
-            />
-            <Typography
-              variant="body2"
-              color="primary"
-              sx={{
-                display: "inline-block",
-                fontSize: isMobile
-                  ? "14px"
-                  : screenWidth < 950
-                  ? "12px"
-                  : "14px",
-              }}
-            >
-              {t("backToDashboard")}
-            </Typography>
-          </Link>
-          <SoleVoterInfo />
-        </Box>
-        {isMobile && <Footer />}
-      </Box>
-    </Background>
+    <CenteredBoxPageWrapper
+      pageTitle={t("soleVoter.becomeSoleVoter")}
+      backButtonText={t("backToDashboard")}
+      backButtonPath={PATHS.dashboard}
+      isVotingPowerHidden
+    >
+      <RegisterAsSoleVoterBox />
+    </CenteredBoxPageWrapper>
   );
 };
diff --git a/govtool/frontend/src/pages/RetireAsSoleVoter.tsx b/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
index 830f4ffd5..c661be2cd 100644
--- a/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
+++ b/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
@@ -1,180 +1,32 @@
-import { useCallback, useEffect, useMemo } from "react";
-import { useNavigate } from "react-router-dom";
-import { Trans } from "react-i18next";
-import { Box, Link } from "@mui/material";
-import ArrowBackIosIcon from "@mui/icons-material/ArrowBackIos";
+import { useEffect } from "react";
 
-import { Background, Button, Typography } from "@atoms";
-import { useCardano } from "@context";
-import { ICONS, PATHS } from "@consts";
-import { useScreenDimension, useTranslation } from "@hooks";
-import { DashboardTopNav, Footer } from "@organisms";
-import {
-  WALLET_LS_KEY,
-  correctAdaFormat,
-  getItemFromLocalStorage,
-  openInNewTab,
-} from "@utils";
-import { theme } from "@/theme";
+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";
 
 export const RetireAsSoleVoter = () => {
-  const {
-    palette: { boxShadow2 },
-  } = theme;
-  const { isMobile, screenWidth } = useScreenDimension();
   const navigate = useNavigate();
   const { t } = useTranslation();
-  const { soleVoter } = useCardano();
-
-  const navigateToDashboard = useCallback(
-    () => navigate(PATHS.dashboard),
-    [navigate]
-  );
 
   useEffect(() => {
     if (
       !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`) ||
-      !soleVoter?.isRegistered
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
     ) {
       navigate(PATHS.home);
     }
   }, []);
 
-  const renderBackButton = useMemo(() => {
-    return (
-      <Button
-        data-testid="back-button"
-        onClick={navigateToDashboard}
-        size="extraLarge"
-        sx={{
-          px: 6,
-          width: isMobile ? "100%" : "auto",
-        }}
-        variant="outlined"
-      >
-        {t("cancel")}
-      </Button>
-    );
-  }, [isMobile, navigateToDashboard]);
-
-  const renderRegisterButton = useMemo(() => {
-    return (
-      <Button
-        data-testid="retire-button"
-        onClick={() => {}}
-        size="extraLarge"
-        sx={{
-          px: 6,
-          width: isMobile ? "100%" : "auto",
-        }}
-        variant="contained"
-      >
-        {t("continue")}
-      </Button>
-    );
-  }, [isMobile]);
-
   return (
-    <Background isReverted>
-      <Box display="flex" flexDirection="column" minHeight="100vh">
-        <DashboardTopNav
-          imageHeight={isMobile ? 24 : 35}
-          imageSRC={ICONS.appLogoIcon}
-          imageWidth={isMobile ? undefined : 42}
-          title={t("soleVoter.retireSoleVoter")}
-        />
-
-        <Box
-          height={isMobile ? "100%" : "auto"}
-          mt={isMobile ? 0 : 7}
-          sx={{
-            alignItems: screenWidth >= 768 ? "center" : "inherit",
-            marginTop: screenWidth < 1440 ? "97px" : "153px",
-            display: screenWidth < 1440 ? "flex" : "grid",
-            ...(screenWidth < 1440 && {
-              flexDirection: "column",
-            }),
-            ...(screenWidth >= 1440 && { gridTemplateColumns: "1fr auto 1fr" }),
-          }}
-        >
-          {isMobile && (
-            <Box borderColor="white" borderBottom={1}>
-              <Typography
-                variant="title1"
-                sx={{
-                  ml: 2,
-                  my: 3.25,
-                }}
-              >
-                {t("soleVoter.retireSoleVoter")}
-              </Typography>
-            </Box>
-          )}
-          <Link
-            data-testid="back-to-list-link"
-            sx={{
-              alignItems: "center",
-              alignSelf: "flex-start",
-              cursor: "pointer",
-              display: "flex",
-              justifyContent: "flex-start",
-              marginBottom: 3,
-              ml: screenWidth < 1440 ? 2 : 5,
-              mt: screenWidth < 1440 ? 3 : "none",
-              textDecoration: "none",
-            }}
-            onClick={navigateToDashboard}
-          >
-            <ArrowBackIosIcon sx={{ fontSize: 14 }} />
-            <Typography color="primary" fontWeight={400} variant="body2">
-              {t("backToDashboard")}
-            </Typography>
-          </Link>
-          <Box
-            borderRadius="20px"
-            boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
-            height="auto"
-            maxWidth={screenWidth > 768 ? 600 : undefined}
-            px={isMobile ? 2 : 18.75}
-            py={isMobile ? 6.25 : 10}
-          >
-            <Box display="flex" flexDirection="column">
-              <Typography sx={{ textAlign: "center" }} variant="headline4">
-                {t("soleVoter.retirementHeading")}
-              </Typography>
-              <Typography
-                fontWeight={400}
-                sx={{ py: 5, textAlign: "center", whiteSpace: "pre-line" }}
-                variant="body1"
-              >
-                <Trans
-                  components={[
-                    <Typography fontWeight={500} key={0} variant="body1" />,
-                    <Link
-                      key="1"
-                      onClick={() => openInNewTab("https://sancho.network/")}
-                      sx={{ cursor: "pointer" }}
-                    />,
-                  ]}
-                  i18nKey={"soleVoter.retirementDescription"}
-                  values={{ deposit: correctAdaFormat(soleVoter?.deposit) }}
-                />
-              </Typography>
-            </Box>
-            <Box
-              display="flex"
-              flexDirection={isMobile ? "column" : "row"}
-              justifyContent="space-between"
-            >
-              {isMobile ? renderRegisterButton : renderBackButton}
-              <Box px={2} py={isMobile ? 1.5 : 0} />
-              {isMobile ? renderBackButton : renderRegisterButton}
-            </Box>
-          </Box>
-          {isMobile && <Footer />}
-        </Box>
-      </Box>
-    </Background>
+    <CenteredBoxPageWrapper
+      pageTitle={t("soleVoter.retireSoleVoter")}
+      backButtonText={t("backToDashboard")}
+      backButtonPath={PATHS.dashboard}
+    >
+      <RetireAsSoleVoterBox />
+    </CenteredBoxPageWrapper>
   );
 };
diff --git a/govtool/frontend/src/utils/localStorage.ts b/govtool/frontend/src/utils/localStorage.ts
index 51d03347f..8655509fb 100644
--- a/govtool/frontend/src/utils/localStorage.ts
+++ b/govtool/frontend/src/utils/localStorage.ts
@@ -1,6 +1,8 @@
 export const WALLET_LS_KEY = "wallet_data";
 export const DELEGATE_TRANSACTION_KEY = "delegate_transaction";
 export const REGISTER_TRANSACTION_KEY = "register_transaction";
+export const REGISTER_SOLE_VOTER_TRANSACTION_KEY =
+  "register_sole_voter_transaction";
 export const DELEGATE_TO_KEY = "delegate_to_transaction";
 export const PROTOCOL_PARAMS_KEY = "protocol_params";
 export const SANCHO_INFO_KEY = "sancho_info";

From 7c1a049aba86b000ebca6147728ad0220f3eb197 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Wed, 21 Feb 2024 10:56:02 +0100
Subject: [PATCH 23/82] Minor refactor

---
 ...ttons.tsx => CenteredBoxBottomButtons.tsx} | 40 +++++++++----------
 .../src/components/molecules/index.ts         |  2 +-
 .../organisms/RegisterAsSoleVoterBox.tsx      | 10 ++---
 .../organisms/RetireAsSoleVoterBox.tsx        | 10 ++---
 .../organisms/RetireAsSoleVoterBoxContent.tsx |  1 +
 5 files changed, 32 insertions(+), 31 deletions(-)
 rename govtool/frontend/src/components/molecules/{BottomBoxButtons.tsx => CenteredBoxBottomButtons.tsx} (62%)

diff --git a/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx b/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
similarity index 62%
rename from govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
rename to govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
index c54a6627c..3da36563c 100644
--- a/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
+++ b/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
@@ -5,19 +5,19 @@ import { Button, LoadingButton } from "@atoms";
 import { useScreenDimension, useTranslation } from "@hooks";
 
 interface Props {
-  leftButtonAction: () => void;
-  rightButtonAction: () => void;
-  rightButtonIsLoading?: boolean;
-  leftButtonText?: string;
-  rightButtonText?: string;
+  onBackButton: () => void;
+  onActionButton: () => void;
+  isLoading?: boolean;
+  backButtonText?: string;
+  actionButtonText?: string;
 }
 
-export const BottomBoxButtons = ({
-  leftButtonAction,
-  rightButtonAction,
-  rightButtonIsLoading,
-  leftButtonText,
-  rightButtonText,
+export const CenteredBoxBottomButtons = ({
+  onBackButton,
+  onActionButton,
+  isLoading,
+  backButtonText,
+  actionButtonText,
 }: Props) => {
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
@@ -26,7 +26,7 @@ export const BottomBoxButtons = ({
     return (
       <Button
         data-testid={"back-button"}
-        onClick={leftButtonAction}
+        onClick={onBackButton}
         size="extraLarge"
         sx={{
           px: 6,
@@ -34,17 +34,17 @@ export const BottomBoxButtons = ({
         }}
         variant="outlined"
       >
-        {leftButtonText ?? t("cancel")}
+        {backButtonText ?? t("cancel")}
       </Button>
     );
   }, [isMobile]);
 
-  const renderRegisterButton = useMemo(() => {
+  const renderActionButton = useMemo(() => {
     return (
       <LoadingButton
         data-testid={"register-button"}
-        isLoading={rightButtonIsLoading}
-        onClick={rightButtonAction}
+        isLoading={isLoading}
+        onClick={onActionButton}
         sx={{
           borderRadius: 50,
           textTransform: "none",
@@ -55,10 +55,10 @@ export const BottomBoxButtons = ({
         }}
         variant="contained"
       >
-        {rightButtonText ?? t("continue")}
+        {actionButtonText ?? t("continue")}
       </LoadingButton>
     );
-  }, [rightButtonIsLoading, isMobile]);
+  }, [isLoading, isMobile]);
 
   return (
     <Box
@@ -67,9 +67,9 @@ export const BottomBoxButtons = ({
       justifyContent="space-around"
       mt={6}
     >
-      {isMobile ? renderRegisterButton : renderBackButton}
+      {isMobile ? renderActionButton : renderBackButton}
       <Box px={2} py={isMobile ? 1.5 : 0} />
-      {isMobile ? renderBackButton : renderRegisterButton}
+      {isMobile ? renderBackButton : renderActionButton}
     </Box>
   );
 };
diff --git a/govtool/frontend/src/components/molecules/index.ts b/govtool/frontend/src/components/molecules/index.ts
index cb5e9115b..7b4c1668f 100644
--- a/govtool/frontend/src/components/molecules/index.ts
+++ b/govtool/frontend/src/components/molecules/index.ts
@@ -1,5 +1,5 @@
 export * from "./ActionCard";
-export * from "./BottomBoxButtons";
+export * from "./CenteredBoxBottomButtons";
 export * from "./CenteredBoxPageWrapper";
 export * from "./DashboardActionCard";
 export * from "./DataActionsBar";
diff --git a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
index 4034e6f01..1794a7042 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 
 import { PATHS } from "@consts";
 import { RegisterAsSoleVoterBoxContent } from "@organisms";
-import { BottomBoxButtons } from "@molecules";
+import { CenteredBoxBottomButtons } from "@molecules";
 import { useCardano, useModal } from "@context";
 
 export const RegisterAsSoleVoterBox = () => {
@@ -66,10 +66,10 @@ export const RegisterAsSoleVoterBox = () => {
   return (
     <>
       <RegisterAsSoleVoterBoxContent />
-      <BottomBoxButtons
-        leftButtonAction={() => navigate(PATHS.dashboard)}
-        rightButtonAction={onRegister}
-        rightButtonIsLoading={isLoading}
+      <CenteredBoxBottomButtons
+        onBackButton={() => navigate(PATHS.dashboard)}
+        onActionButton={onRegister}
+        isLoading={isLoading}
       />
     </>
   );
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
index 0b41dba29..b2518b9e4 100644
--- a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 
 import { PATHS } from "@consts";
-import { BottomBoxButtons } from "@molecules";
+import { CenteredBoxBottomButtons } from "@molecules";
 import { useCardano, useModal } from "@context";
 import { RetireAsSoleVoterBoxContent } from "@organisms";
 
@@ -76,10 +76,10 @@ export const RetireAsSoleVoterBox = () => {
   return (
     <>
       <RetireAsSoleVoterBoxContent />
-      <BottomBoxButtons
-        leftButtonAction={() => navigate(PATHS.dashboard)}
-        rightButtonAction={onRetire}
-        rightButtonIsLoading={isLoading}
+      <CenteredBoxBottomButtons
+        onBackButton={() => navigate(PATHS.dashboard)}
+        onActionButton={onRetire}
+        isLoading={isLoading}
       />
     </>
   );
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
index 67fcc97d6..a05bb424b 100644
--- a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
@@ -23,6 +23,7 @@ export const RetireAsSoleVoterBoxContent = () => {
           mt: isMobile ? 4 : 10,
           textAlign: "center",
           whiteSpace: "pre-line",
+          textDecoration: "underline",
         }}
         variant="body1"
       >

From 2b8aac78634613bee7ecfbdcfc3de14f626f04c4 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Mon, 26 Feb 2024 14:24:25 +0100
Subject: [PATCH 24/82] [#119] Fixes after CR

---
 .../components/molecules/CenteredBoxBottomButtons.tsx  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx b/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
index 3da36563c..5ca687317 100644
--- a/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
+++ b/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
@@ -30,7 +30,6 @@ export const CenteredBoxBottomButtons = ({
         size="extraLarge"
         sx={{
           px: 6,
-          width: isMobile ? "100%" : "auto",
         }}
         variant="outlined"
       >
@@ -46,10 +45,7 @@ export const CenteredBoxBottomButtons = ({
         isLoading={isLoading}
         onClick={onActionButton}
         sx={{
-          borderRadius: 50,
-          textTransform: "none",
           px: 6,
-          width: isMobile ? "100%" : "auto",
           height: 48,
           fontSize: 16,
         }}
@@ -63,13 +59,13 @@ export const CenteredBoxBottomButtons = ({
   return (
     <Box
       display="flex"
-      flexDirection={isMobile ? "column" : "row"}
+      flexDirection={isMobile ? "column-reverse" : "row"}
       justifyContent="space-around"
       mt={6}
     >
-      {isMobile ? renderActionButton : renderBackButton}
+      {renderBackButton}
       <Box px={2} py={isMobile ? 1.5 : 0} />
-      {isMobile ? renderBackButton : renderActionButton}
+      {renderActionButton}
     </Box>
   );
 };

From f1c92578031aa83bf0e4c68cd89af9b7c34cbd1b Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Thu, 22 Feb 2024 09:46:28 +0100
Subject: [PATCH 25/82] [#210] Sole voter wallet logic for registration and
 retirement

---
 govtool/frontend/src/App.tsx                  |  6 +--
 .../src/components/atoms/VotingPowerChips.tsx | 10 ++--
 .../components/molecules/VoteActionForm.tsx   |  4 +-
 .../components/organisms/DashboardCards.tsx   | 53 +++++++++----------
 .../DashboardGovernanceActionDetails.tsx      |  4 +-
 .../organisms/DashboardGovernanceActions.tsx  |  4 +-
 .../components/organisms/DashboardTopNav.tsx  |  4 +-
 .../organisms/DelegateTodRepStepOne.tsx       |  6 +--
 .../src/components/organisms/Drawer.tsx       |  4 +-
 .../organisms/RetireAsSoleVoterBoxContent.tsx |  4 +-
 govtool/frontend/src/context/wallet.tsx       | 30 +++++------
 govtool/frontend/src/context/walletUtils.ts   |  8 +--
 govtool/frontend/src/hooks/index.ts           |  1 -
 govtool/frontend/src/hooks/mutations/index.ts |  7 ---
 .../useAdaHolderDelegateAbstainMutation.ts    | 10 ----
 .../mutations/useAdaHolderDelegateMutation.ts | 10 ----
 .../useAdaHolderDelegateNoMutation.ts         | 10 ----
 .../useAdaHolderRemoveDelegationMutation.ts   | 10 ----
 .../mutations/useDRepRegisterMutation.ts      | 22 --------
 .../mutations/useDRepRemoveVoteMutation.ts    | 10 ----
 .../hooks/mutations/useDRepRetireMutation.ts  | 23 --------
 govtool/frontend/src/i18n/locales/en.ts       |  9 ++--
 govtool/frontend/src/models/api.ts            | 10 ++--
 .../DashboardGovernanceActionsCategory.tsx    |  4 +-
 .../src/pages/GovernanceActionsCategory.tsx   |  4 +-
 .../src/services/requests/getDRepInfo.ts      |  4 +-
 26 files changed, 84 insertions(+), 187 deletions(-)
 delete mode 100644 govtool/frontend/src/hooks/mutations/index.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index a36a89f8f..fc659e428 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -34,7 +34,7 @@ import { useGetDRepInfo, useWalletConnectionListener } from "./hooks";
 import { RegisterAsSoleVoter } from "./pages/RegisterAsSoleVoter";
 
 export default function App() {
-  const { enable, setDRep, setIsDrepLoading } = useCardano();
+  const { enable, setUser, setIsDrepLoading } = useCardano();
   const navigate = useNavigate();
   const { data } = useGetDRepInfo();
   const { modal, openModal, modals } = useModal();
@@ -47,11 +47,11 @@ export default function App() {
 
   useEffect(() => {
     setIsDrepLoading(true);
-    setDRep(data);
+    setUser(data);
     const timer = setTimeout(() => setIsDrepLoading(false), 1000);
 
     return () => clearTimeout(timer);
-  }, [data?.isRegistered]);
+  }, [data?.isRegisteredAsDRep]);
 
   const checkTheWalletIsActive = useCallback(() => {
     const hrefCondition =
diff --git a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
index 897ec0ce8..6dbeb0d6a 100644
--- a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
+++ b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
@@ -13,7 +13,7 @@ import { correctAdaFormat } from "@utils";
 import { Tooltip } from "@atoms";
 
 export const VotingPowerChips = () => {
-  const { dRep, stakeKey, isDrepLoading } = useCardano();
+  const { user, stakeKey, isDrepLoading } = useCardano();
   const { dRepVotingPower, isDRepVotingPowerLoading } =
     useGetDRepVotingPowerQuery();
   const { votingPower, powerIsLoading } =
@@ -33,7 +33,7 @@ export const VotingPowerChips = () => {
       alignItems="center"
       maxHeight={isMobile ? undefined : 48}
     >
-      {dRep?.isRegistered && (
+      {user?.isRegisteredAsDRep && (
         <Tooltip
           heading={t("tooltips.votingPower.heading")}
           paragraphOne={t("tooltips.votingPower.paragraphOne")}
@@ -55,8 +55,8 @@ export const VotingPowerChips = () => {
           {t("votingPower")}
         </Typography>
       )}
-      {(dRep?.isRegistered && isDRepVotingPowerLoading) ||
-      (!dRep?.isRegistered && powerIsLoading) ||
+      {(user?.isRegisteredAsDRep && isDRepVotingPowerLoading) ||
+      (!user?.isRegisteredAsDRep && powerIsLoading) ||
       isDrepLoading ? (
         <CircularProgress size={20} color="primary" />
       ) : (
@@ -67,7 +67,7 @@ export const VotingPowerChips = () => {
           sx={{ whiteSpace: "nowrap" }}
         >
           ₳{" "}
-          {dRep?.isRegistered
+          {user?.isRegisteredAsDRep
             ? correctAdaFormat(dRepVotingPower) ?? 0
             : correctAdaFormat(votingPower) ?? 0}
         </Typography>
diff --git a/govtool/frontend/src/components/molecules/VoteActionForm.tsx b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
index 3c1645bd2..9a4efbb95 100644
--- a/govtool/frontend/src/components/molecules/VoteActionForm.tsx
+++ b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
@@ -25,7 +25,7 @@ export const VoteActionForm = ({
   const [isContext, setIsContext] = useState<boolean>(false);
   const { isMobile, screenWidth } = useScreenDimension();
   const { openModal } = useModal();
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -142,7 +142,7 @@ export const VoteActionForm = ({
             />
           </Box>
         </Box>
-        {dRep?.isRegistered && (
+        {user?.isRegisteredAsDRep && (
           <Button
             data-testid="show-votes-button"
             variant="text"
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index e78353ccb..5e360523c 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -20,7 +20,7 @@ export const DashboardCards = () => {
     buildSignSubmitConwayCertTx,
     delegateTo,
     delegateTransaction,
-    dRep,
+    user,
     dRepID,
     dRepIDBech32,
     isDrepLoading,
@@ -28,7 +28,6 @@ export const DashboardCards = () => {
     registerTransaction,
     soleVoterTransaction,
     stakeKey,
-    soleVoter,
   } = useCardano();
   const navigate = useNavigate();
   const { currentDelegation, isCurrentDelegationLoading } =
@@ -225,7 +224,7 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.metadataUpdateInProgress");
       }
-    } else if (dRep?.isRegistered || dRep?.wasRegistered) {
+    } else if (user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep) {
       return t("dashboard.registration.holdersCanDelegate");
     } else {
       return t("dashboard.registration.ifYouWant");
@@ -233,8 +232,8 @@ export const DashboardCards = () => {
   }, [
     registerTransaction.transactionHash,
     registerTransaction.type,
-    dRep?.isRegistered,
-    dRep?.wasRegistered,
+    user?.isRegisteredAsDRep,
+    user?.wasRegisteredAsDRep,
   ]);
 
   const registrationCardTitle = useMemo(() => {
@@ -247,9 +246,9 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.dRepUpdate");
       }
-    } else if (dRep?.isRegistered) {
+    } else if (user?.isRegisteredAsDRep) {
       return t("dashboard.registration.youAreRegistered");
-    } else if (dRep?.wasRegistered) {
+    } else if (user?.wasRegisteredAsDRep) {
       return t("dashboard.registration.registerAgain");
     } else {
       return t("dashboard.registration.registerAsDRep");
@@ -257,8 +256,8 @@ export const DashboardCards = () => {
   }, [
     registerTransaction?.transactionHash,
     registerTransaction.type,
-    dRep?.isRegistered,
-    dRep?.wasRegistered,
+    user?.isRegisteredAsDRep,
+    user?.wasRegisteredAsDRep,
   ]);
 
   return isDrepLoading ? (
@@ -340,25 +339,25 @@ export const DashboardCards = () => {
       {/* REGISTARTION AS DREP CARD */}
       <DashboardActionCard
         dataTestidFirstButton={
-          dRep?.isRegistered ? "retire-button" : "register-button"
+          user?.isRegisteredAsDRep ? "retire-button" : "register-button"
         }
         dataTestidDrepIdBox="my-drep-id"
-        firstButtonVariant={dRep?.isRegistered ? "outlined" : "contained"}
+        firstButtonVariant={user?.isRegisteredAsDRep ? "outlined" : "contained"}
         secondButtonVariant={
           registerTransaction?.transactionHash
             ? "outlined"
-            : dRep?.isRegistered
+            : user?.isRegisteredAsDRep
             ? "text"
             : "outlined"
         }
         dataTestidSecondButton={
-          dRep?.isRegistered
+          user?.isRegisteredAsDRep
             ? "change-metadata-button"
             : "register-learn-more-button"
         }
         description={registrationCardDescription}
         firstButtonAction={
-          dRep?.isRegistered
+          user?.isRegisteredAsDRep
             ? retireAsDrep
             : () => navigateTo(PATHS.registerAsdRep)
         }
@@ -368,7 +367,7 @@ export const DashboardCards = () => {
             ? ""
             : t(
                 `dashboard.registration.${
-                  dRep?.isRegistered ? "retire" : "register"
+                  user?.isRegisteredAsDRep ? "retire" : "register"
                 }`
               )
         }
@@ -377,7 +376,7 @@ export const DashboardCards = () => {
         secondButtonAction={
           registerTransaction?.transactionHash
             ? () => openInNewTab("https://adanordic.com/latest_transactions")
-            : dRep?.isRegistered
+            : user?.isRegisteredAsDRep
             ? () => {
                 navigateTo(PATHS.updateMetadata);
               }
@@ -389,13 +388,13 @@ export const DashboardCards = () => {
         secondButtonLabel={
           registerTransaction?.transactionHash
             ? t("seeTransaction")
-            : dRep?.isRegistered
+            : user?.isRegisteredAsDRep
             ? t("dashboard.registration.changeMetadata")
             : t("learnMore")
         }
-        cardId={dRep?.isRegistered || dRep?.wasRegistered ? dRepIDBech32 : ""}
+        cardId={user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep ? dRepIDBech32 : ""}
         cardTitle={
-          dRep?.isRegistered || dRep?.wasRegistered ? t("myDRepId") : ""
+          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep ? t("myDRepId") : ""
         }
         title={registrationCardTitle}
       />
@@ -403,7 +402,7 @@ export const DashboardCards = () => {
       {/* SOLE VOTER CARD */}
       <DashboardActionCard
         dataTestidFirstButton={
-          soleVoter?.isRegistered
+          user?.isRegisteredAsSoleVoter
             ? "retire-as-sole-voter-button"
             : "register-as-sole-voter-button"
         }
@@ -413,7 +412,7 @@ export const DashboardCards = () => {
         description={
           <Trans
             i18nKey={
-              soleVoter?.isRegistered
+              user?.isRegisteredAsSoleVoter
                 ? "dashboard.soleVoter.youAreSoleVoterDescription"
                 : "dashboard.soleVoter.registerAsSoleVoterDescription"
             }
@@ -422,21 +421,21 @@ export const DashboardCards = () => {
         }
         firstButtonAction={() =>
           navigateTo(
-            soleVoter?.isRegistered
+            user?.isRegisteredAsSoleVoter
               ? PATHS.retireAsSoleVoter
               : PATHS.registerAsSoleVoter
           )
         }
         firstButtonLabel={t(
-          soleVoter?.isRegistered
+          user?.isRegisteredAsSoleVoter
             ? "dashboard.soleVoter.retire"
             : "dashboard.soleVoter.register"
         )}
-        firstButtonVariant={soleVoter?.isRegistered ? "outlined" : "contained"}
+        firstButtonVariant={user?.isRegisteredAsSoleVoter ? "outlined" : "contained"}
         secondButtonVariant={
           soleVoterTransaction?.transactionHash
             ? "outlined"
-            : soleVoter?.isRegistered
+            : user?.isRegisteredAsSoleVoter
             ? "text"
             : "outlined"
         }
@@ -450,7 +449,7 @@ export const DashboardCards = () => {
         secondButtonLabel={t("learnMore")}
         secondButtonVariant={"outlined"}
         title={t(
-          soleVoter?.isRegistered
+          user?.isRegisteredAsSoleVoter
             ? "dashboard.soleVoter.youAreSoleVoterTitle"
             : "dashboard.soleVoter.registerAsSoleVoterTitle"
         )}
@@ -463,7 +462,7 @@ export const DashboardCards = () => {
         firstButtonAction={() => navigate(PATHS.dashboard_governance_actions)}
         firstButtonLabel={t(
           `dashboard.govActions.${
-            dRep?.isRegistered ? "reviewAndVote" : "view"
+            user?.isRegisteredAsDRep ? "reviewAndVote" : "view"
           }`
         )}
         imageURL={IMAGES.govActionListImage}
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
index a15148f94..50ac76595 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
@@ -28,7 +28,7 @@ import {
 } from "@utils";
 
 export const DashboardGovernanceActionDetails = () => {
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const { state, hash } = useLocation();
   const navigate = useNavigate();
   const { isMobile, screenWidth } = useScreenDimension();
@@ -134,7 +134,7 @@ export const DashboardGovernanceActionDetails = () => {
                 ? formatDisplayDate(state.expiryDate)
                 : formatDisplayDate(data.proposal.expiryDate)
             }
-            isDRep={dRep?.isRegistered}
+            isDRep={user?.isRegisteredAsDRep}
             noVotes={state ? state.noVotes : data.proposal.noVotes}
             type={
               state
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
index d942dd9a4..39c2b7cf4 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
@@ -65,7 +65,7 @@ export const DashboardGovernanceActions = () => {
     state && state.isVotedListOnLoad ? 1 : 0
   );
 
-  const { dRep, isDrepLoading } = useCardano();
+  const { user, isDrepLoading } = useCardano();
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
 
@@ -121,7 +121,7 @@ export const DashboardGovernanceActions = () => {
             sortingActive={Boolean(chosenSorting)}
             sortOpen={sortOpen}
           />
-          {dRep?.isRegistered && (
+          {user?.isRegisteredAsDRep && (
             <Tabs
               sx={{
                 marginTop: 3,
diff --git a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
index b02a4c2ae..b167ceb44 100644
--- a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
@@ -29,7 +29,7 @@ export const DashboardTopNav = ({
   isVotingPowerHidden,
 }: DashboardTopNavProps) => {
   const { isMobile, screenWidth } = useScreenDimension();
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const navigate = useNavigate();
   const [isDrawerOpen, setIsDrawerOpen] = useState<boolean>(false);
   const { t } = useTranslation();
@@ -168,7 +168,7 @@ export const DashboardTopNav = ({
                   </Grid>
                 </Grid>
               </Box>
-              {dRep?.isRegistered && <DRepInfoCard />}
+              {user?.isRegisteredAsDRep && <DRepInfoCard />}
               <Box py={2} />
               <WalletInfoCard />
             </Box>
diff --git a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
index 2e333a0c1..a03a4b7e0 100644
--- a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
+++ b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
@@ -21,7 +21,7 @@ interface DelegateProps {
 export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   const navigate = useNavigate();
   const {
-    dRep,
+    user,
     dRepID,
     buildSignSubmitConwayCertTx,
     buildVoteDelegationCert,
@@ -133,7 +133,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   }, [
     chosenOption,
     delegate,
-    dRep?.isRegistered,
+    user?.isRegisteredAsDRep,
     dRepID,
     isDelegationLoading,
     isMobile,
@@ -215,7 +215,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
           flexDirection={"column"}
           rowGap={3}
         >
-          {dRep?.isRegistered && currentDelegation !== dRepID && (
+          {user?.isRegisteredAsDRep && currentDelegation !== dRepID && (
             <Grid item>
               <ActionRadio
                 onChange={setChosenOption}
diff --git a/govtool/frontend/src/components/organisms/Drawer.tsx b/govtool/frontend/src/components/organisms/Drawer.tsx
index 922d920e9..43291e76c 100644
--- a/govtool/frontend/src/components/organisms/Drawer.tsx
+++ b/govtool/frontend/src/components/organisms/Drawer.tsx
@@ -9,7 +9,7 @@ import { openInNewTab } from "@/utils";
 import { useTranslation } from "@hooks";
 
 export const Drawer = () => {
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const { t } = useTranslation();
 
   return (
@@ -61,7 +61,7 @@ export const Drawer = () => {
           ))}
         </Grid>
         <Box px={2}>
-          {dRep?.isRegistered && <DRepInfoCard />}
+          {user?.isRegisteredAsDRep && <DRepInfoCard />}
           <Box py={2} />
           <WalletInfoCard />
           <Box my={1}>
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
index a05bb424b..90eff76ee 100644
--- a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
@@ -9,7 +9,7 @@ import { useCardano } from "@/context";
 export const RetireAsSoleVoterBoxContent = () => {
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
-  const { soleVoter } = useCardano();
+  const { user } = useCardano();
 
   return (
     <>
@@ -29,7 +29,7 @@ export const RetireAsSoleVoterBoxContent = () => {
       >
         <Trans
           i18nKey="soleVoter.retirementDescription"
-          values={{ deposit: correctAdaFormat(soleVoter?.deposit) }}
+          values={{ deposit: correctAdaFormat(user?.deposit) }}
           components={[
             <Link
               onClick={() => openInNewTab("https://sancho.network/")}
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 31eaf2626..b8abbf9f1 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -50,7 +50,7 @@ import { Trans } from "react-i18next";
 import { useModal, useSnackbar } from ".";
 
 import { PATHS } from "@consts";
-import { CardanoApiWallet, DRepInfo, Protocol } from "@models";
+import { CardanoApiWallet, userInfo, Protocol } from "@models";
 import type { StatusModalState } from "@organisms";
 import {
   getPubDRepID,
@@ -100,16 +100,14 @@ interface CardanoContext {
   enable: (walletName: string) => Promise<EnableResponse>;
   isEnableLoading: string | null;
   error?: string;
-  dRep: DRepInfo | undefined;
-  soleVoter: DRepInfo | undefined;
-  setSoleVoter: (key: undefined | DRepInfo) => void;
+  user: userInfo | undefined;
   isEnabled: boolean;
   pubDRepKey: string;
   dRepID: string;
   dRepIDBech32: string;
   isMainnet: boolean;
   stakeKey?: string;
-  setDRep: (key: undefined | DRepInfo) => void;
+  setUser: (key: undefined | userInfo) => void;
   setStakeKey: (key: string) => void;
   stakeKeys: string[];
   walletApi?: CardanoApiWallet;
@@ -358,7 +356,7 @@ function CardanoProvider(props: Props) {
                 10,
                 dRepID,
                 registerTransaction.type,
-                setDRep
+                setUser
               ).then((isRegistered) => {
                 if (registerTransaction.type === "registration") {
                   if (isRegistered) {
@@ -425,7 +423,7 @@ function CardanoProvider(props: Props) {
               10,
               dRepID,
               soleVoterTransaction.type,
-              setDRep
+              setUser
             ).then((isRegistered) => {
               if (soleVoterTransaction.type === "registration") {
                 if (isRegistered) {
@@ -855,9 +853,9 @@ function CardanoProvider(props: Props) {
         // Add output of 1 ADA to the address of our wallet
         let outputValue = BigNum.from_str("1000000");
 
-        if (registrationType === "retirement" && dRep?.deposit) {
+        if (registrationType === "retirement" && user?.deposit) {
           outputValue = outputValue.checked_add(
-            BigNum.from_str(`${dRep?.deposit}`)
+            BigNum.from_str(`${user?.deposit}`)
           );
         }
 
@@ -1007,7 +1005,7 @@ function CardanoProvider(props: Props) {
       voteTransaction.transactionHash,
       stakeKey,
       isPendingTransaction,
-      dRep,
+      user,
     ]
   );
 
@@ -1156,7 +1154,7 @@ function CardanoProvider(props: Props) {
 
         const dRepRetirementCert = DrepDeregistration.new(
           dRepCred,
-          BigNum.from_str(`${dRep?.deposit}`)
+          BigNum.from_str(`${user?.deposit}`)
         );
         // add cert to tbuilder
         certBuilder.add(
@@ -1168,7 +1166,7 @@ function CardanoProvider(props: Props) {
         console.log(e);
         throw e;
       }
-    }, [dRepID, dRep]);
+    }, [dRepID, user]);
 
   const buildVote = useCallback(
     async (
@@ -1229,7 +1227,7 @@ function CardanoProvider(props: Props) {
     () => ({
       address,
       enable,
-      dRep,
+      user,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1237,7 +1235,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setDRep,
+      setUser,
       setStakeKey,
       stakeKeys,
       walletApi,
@@ -1265,7 +1263,7 @@ function CardanoProvider(props: Props) {
     [
       address,
       enable,
-      dRep,
+      user,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1273,7 +1271,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setDRep,
+      setUser,
       setStakeKey,
       stakeKeys,
       walletApi,
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index e722e4c84..ea223a238 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -1,13 +1,13 @@
 import { getAdaHolderCurrentDelegation, getDRepInfo } from "@services";
 import { DRepActionType } from "./wallet";
-import { DRepInfo } from "@models";
+import { userInfo } from "@models";
 
 export const setLimitedRegistrationInterval = (
   intervalTime: number,
   attemptsNumber: number,
   dRepID: string,
   transactionType: DRepActionType | Omit<DRepActionType, "update">,
-  setDRep: (key: undefined | DRepInfo) => void
+  setUser: (key: undefined | userInfo) => void
 ): Promise<boolean> => {
   return new Promise(async (resolve) => {
     const desiredResult = transactionType === "registration" ? true : false;
@@ -20,8 +20,8 @@ export const setLimitedRegistrationInterval = (
         try {
           const data = await getDRepInfo(dRepID);
 
-          if (data.isRegistered === desiredResult) {
-            setDRep(data);
+          if (data.isRegisteredAsDRep === desiredResult) {
+            setUser(data);
             clearInterval(interval);
             resolve(desiredResult);
           }
diff --git a/govtool/frontend/src/hooks/index.ts b/govtool/frontend/src/hooks/index.ts
index e17b56d3a..84e427cfa 100644
--- a/govtool/frontend/src/hooks/index.ts
+++ b/govtool/frontend/src/hooks/index.ts
@@ -6,5 +6,4 @@ export * from "./useFetchNextPageDetector";
 export * from "./useWalletConnectionListener";
 
 export * from "./forms";
-export * from "./mutations";
 export * from "./queries";
diff --git a/govtool/frontend/src/hooks/mutations/index.ts b/govtool/frontend/src/hooks/mutations/index.ts
deleted file mode 100644
index 7ab26f25b..000000000
--- a/govtool/frontend/src/hooks/mutations/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from "./useDRepRegisterMutation";
-export * from "./useDRepRemoveVoteMutation";
-export * from "./useDRepRetireMutation";
-export * from "./useAdaHolderDelegateMutation";
-export * from "./useAdaHolderDelegateAbstainMutation";
-export * from "./useAdaHolderDelegateNoMutation";
-export * from "./useAdaHolderRemoveDelegationMutation";
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts
deleted file mode 100644
index 9d37a5a01..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderDelegateAbstain } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderDelegateAbstainMutation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderDelegateAbstain, {});
-
-  return {
-    delegateAbstainAsAdaHolder: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts
deleted file mode 100644
index fe915c357..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderDelegate } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderDelegateMutation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderDelegate, {});
-
-  return {
-    delegateAsAdaHolder: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts
deleted file mode 100644
index 8491c4627..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderDelegateNo } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderDelegateNoMutation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderDelegateNo, {});
-
-  return {
-    delegateNoAsAdaHolder: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts
deleted file mode 100644
index 739a6b5e4..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderRemoveDelegation } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderRemoveDelegation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderRemoveDelegation);
-
-  return {
-    register: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
deleted file mode 100644
index d757d09b2..000000000
--- a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useMutation } from "react-query";
-import { useCardano } from "@context";
-import { postDRepRegister } from "@services";
-
-export const useDRepRegisterMutation = () => {
-  const { setDRep } = useCardano();
-
-  const { mutateAsync, isLoading } = useMutation(postDRepRegister, {
-    onSuccess: () => {
-      setDRep({
-        deposit: 100,
-        isRegistered: true,
-        wasRegistered: false,
-      });
-    },
-  });
-
-  return {
-    isLoading: isLoading,
-    register: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts
deleted file mode 100644
index 7102ad95a..000000000
--- a/govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postDRepRemoveVote } from "@services";
-import { useMutation } from "react-query";
-
-export const useDRepRemoveVoteMutation = () => {
-  const { mutateAsync } = useMutation(postDRepRemoveVote);
-
-  return {
-    removeVote: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
deleted file mode 100644
index 8bf8973e1..000000000
--- a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useMutation } from "react-query";
-import { useCardano, useSnackbar } from "@context";
-import { postDRepRetire } from "@services";
-
-export const useDRepRetireMutation = () => {
-  const { setDRep } = useCardano();
-  const { addSuccessAlert } = useSnackbar();
-
-  const { mutateAsync } = useMutation(postDRepRetire, {
-    onSuccess: () => {
-      setDRep({
-        deposit: 100,
-        wasRegistered: true,
-        isRegistered: false,
-      });
-      addSuccessAlert("DRep retired.");
-    },
-  });
-
-  return {
-    retire: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 267f26abf..6af937395 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -323,14 +323,15 @@ export const en = {
       viewAll: "View all",
     },
     soleVoter: {
-      retireSoleVoter: "Retire as a Sole Voter",
       becomeSoleVoter: "Become a Sole Voter",
       registerDescription:
-        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
+      "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
       registerHeading: "What this Means",
-      retirementHeading: "What Retirement Means",
+      reRegister:"Re-register",
       retirementDescription:
-        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
+      "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
+      retirementHeading: "What Retirement Means",
+      retireSoleVoter: "Retire as a Sole Voter",
     },
     system: {
       sanchoNet: "SanchoNet",
diff --git a/govtool/frontend/src/models/api.ts b/govtool/frontend/src/models/api.ts
index 5281e2a9e..ecbe1fc2e 100644
--- a/govtool/frontend/src/models/api.ts
+++ b/govtool/frontend/src/models/api.ts
@@ -1,7 +1,9 @@
-export interface DRepInfo {
-  isRegistered: boolean;
-  wasRegistered: boolean;
-  deposit: number | null;
+export interface userInfo {
+  isRegisteredAsDRep: boolean;
+  wasRegisteredAsDRep: boolean;
+  isRegisteredAsSoleVoter: boolean;
+  wasRegisteredAsSoleVoter: boolean;
+  deposit: number;
 }
 
 export interface DRepData {
diff --git a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
index 5097fd091..d71a5e317 100644
--- a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
@@ -38,7 +38,7 @@ export const DashboardGovernanceActionsCategory = () => {
   const [chosenSorting, setChosenSorting] = useState<string>("");
   const { isMobile, screenWidth } = useScreenDimension();
   const navigate = useNavigate();
-  const { dRep, isDrepLoading, voteTransaction } = useCardano();
+  const { user, isDrepLoading, voteTransaction } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -88,7 +88,7 @@ export const DashboardGovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [proposals, dRep?.isRegistered, searchText, isProposalsFetchingNextPage]);
+  }, [proposals, user?.isRegisteredAsDRep, searchText, isProposalsFetchingNextPage]);
 
   const closeSorts = useCallback(() => {
     setSortOpen(false);
diff --git a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
index b7cd4982e..0293c1379 100644
--- a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
@@ -36,7 +36,7 @@ export const GovernanceActionsCategory = () => {
   const { isMobile, pagePadding, screenWidth } = useScreenDimension();
   const { isEnabled } = useCardano();
   const navigate = useNavigate();
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -86,7 +86,7 @@ export const GovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [dRep?.isRegistered, isProposalsFetchingNextPage, proposals, searchText]);
+  }, [user?.isRegisteredAsDRep, isProposalsFetchingNextPage, proposals, searchText]);
 
   useEffect(() => {
     if (isEnabled && getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`)) {
diff --git a/govtool/frontend/src/services/requests/getDRepInfo.ts b/govtool/frontend/src/services/requests/getDRepInfo.ts
index 00925091e..1b36cdb09 100644
--- a/govtool/frontend/src/services/requests/getDRepInfo.ts
+++ b/govtool/frontend/src/services/requests/getDRepInfo.ts
@@ -1,9 +1,9 @@
 import { API } from "../API";
 
-import type { DRepInfo } from "@models";
+import type { userInfo } from "@models";
 
 export const getDRepInfo = async (dRepID: string) => {
-  const response = await API.get<DRepInfo>(`/drep/info/${dRepID}`);
+  const response = await API.get<userInfo>(`/drep/info/${dRepID}`);
 
   return response.data;
 };

From 2367be0b5d15ff99f4909ab79f6b872acc04bd51 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Mon, 26 Feb 2024 16:25:15 +0100
Subject: [PATCH 26/82] [#210] Sole voter wallet logic for registration and
 retirement - part 2

---
 govtool/frontend/src/App.tsx                  |  2 +-
 .../molecules/DashboardActionCard.tsx         |  2 +-
 .../components/organisms/DashboardCards.tsx   | 99 +++++++++++++------
 govtool/frontend/src/context/walletUtils.ts   |  5 +-
 govtool/frontend/src/i18n/locales/en.ts       | 23 +++--
 5 files changed, 93 insertions(+), 38 deletions(-)

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index fc659e428..41c45a03b 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -51,7 +51,7 @@ export default function App() {
     const timer = setTimeout(() => setIsDrepLoading(false), 1000);
 
     return () => clearTimeout(timer);
-  }, [data?.isRegisteredAsDRep]);
+  }, [data?.isRegisteredAsDRep, data?.isRegisteredAsSoleVoter]);
 
   const checkTheWalletIsActive = useCallback(() => {
     const hrefCondition =
diff --git a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
index 90cfce5ca..48bd969ec 100644
--- a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
+++ b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
@@ -112,7 +112,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
         ) : null}
         {inProgress && !isLoading ? (
           <Typography variant="title2" fontWeight={700}>
-            in progress
+            In Progress
           </Typography>
         ) : null}
         {description ? (
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 5e360523c..0f2dbe19c 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -236,6 +236,28 @@ export const DashboardCards = () => {
     user?.wasRegisteredAsDRep,
   ]);
 
+  const soleVoterCardDescription = useMemo(() => {
+    if (soleVoterTransaction.transactionHash) {
+      switch (soleVoterTransaction.type) {
+        case "retirement":
+          return "dashboard.soleVoter.retirementInProgress";
+        default:
+          return "dashboard.soleVoter.registrationInProgress";
+      }
+    } else if (user?.isRegisteredAsSoleVoter) {
+      return "dashboard.soleVoter.isRegisteredDescription";
+    } else if (user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep) {
+      return "dashboard.soleVoter.wasRegisteredDescription";
+    } else {
+      return "dashboard.soleVoter.registerDescription";
+    }
+  }, [
+    soleVoterTransaction.transactionHash,
+    soleVoterTransaction.type,
+    user?.isRegisteredAsSoleVoter,
+    user?.wasRegisteredAsSoleVoter,
+  ]);
+
   const registrationCardTitle = useMemo(() => {
     if (registerTransaction?.transactionHash) {
       switch (registerTransaction.type) {
@@ -260,6 +282,28 @@ export const DashboardCards = () => {
     user?.wasRegisteredAsDRep,
   ]);
 
+  const soleVoterCardTitle = useMemo(() => {
+    if (soleVoterTransaction?.transactionHash) {
+      switch (soleVoterTransaction.type) {
+        case "retirement":
+          return t("dashboard.soleVoter.retirement");
+        default:
+          return t("dashboard.soleVoter.registration");
+      }
+    } else if (user?.isRegisteredAsSoleVoter) {
+      return t("dashboard.soleVoter.youAreSoleVoterTitle");
+    } else if (user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep) {
+      return t("dashboard.soleVoter.retireTitle");
+    } else {
+      return t("dashboard.soleVoter.registerTitle");
+    }
+  }, [
+    soleVoterTransaction?.transactionHash,
+    soleVoterTransaction.type,
+    user?.isRegisteredAsSoleVoter,
+    user?.isRegisteredAsSoleVoter,
+  ]);
+
   return isDrepLoading ? (
     <Box
       alignItems="center"
@@ -392,33 +436,46 @@ export const DashboardCards = () => {
             ? t("dashboard.registration.changeMetadata")
             : t("learnMore")
         }
-        cardId={user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep ? dRepIDBech32 : ""}
+        cardId={
+          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep
+            ? dRepIDBech32
+            : ""
+        }
         cardTitle={
-          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep ? t("myDRepId") : ""
+          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep
+            ? t("myDRepId")
+            : ""
         }
         title={registrationCardTitle}
       />
       {/* DREP CARD END*/}
       {/* SOLE VOTER CARD */}
       <DashboardActionCard
+        title={soleVoterCardTitle}
+        inProgress={!!soleVoterTransaction?.transactionHash}
         dataTestidFirstButton={
           user?.isRegisteredAsSoleVoter
             ? "retire-as-sole-voter-button"
             : "register-as-sole-voter-button"
         }
-        firstButtonVariant="contained"
-        secondButtonVariant="outlined"
         dataTestidSecondButton="learn-more-button"
         description={
           <Trans
-            i18nKey={
-              user?.isRegisteredAsSoleVoter
-                ? "dashboard.soleVoter.youAreSoleVoterDescription"
-                : "dashboard.soleVoter.registerAsSoleVoterDescription"
-            }
+            i18nKey={soleVoterCardDescription}
             values={{ votingPower: correctAdaFormat(votingPower) }}
           />
         }
+        firstButtonLabel={
+          soleVoterTransaction?.transactionHash
+            ? ""
+            : t(
+                user?.isRegisteredAsSoleVoter
+                  ? "dashboard.soleVoter.retire"
+                  : user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep
+                  ? "dashboard.soleVoter.reRegister"
+                  : "dashboard.soleVoter.register"
+              )
+        }
         firstButtonAction={() =>
           navigateTo(
             user?.isRegisteredAsSoleVoter
@@ -426,21 +483,10 @@ export const DashboardCards = () => {
               : PATHS.registerAsSoleVoter
           )
         }
-        firstButtonLabel={t(
-          user?.isRegisteredAsSoleVoter
-            ? "dashboard.soleVoter.retire"
-            : "dashboard.soleVoter.register"
-        )}
-        firstButtonVariant={user?.isRegisteredAsSoleVoter ? "outlined" : "contained"}
-        secondButtonVariant={
-          soleVoterTransaction?.transactionHash
-            ? "outlined"
-            : user?.isRegisteredAsSoleVoter
-            ? "text"
-            : "outlined"
+        firstButtonVariant={
+          user?.isRegisteredAsSoleVoter ? "outlined" : "contained"
         }
-        inProgress={!!soleVoterTransaction?.transactionHash}
-        imageURL={IMAGES.soleVoterImage}
+        secondButtonLabel={t("learnMore")}
         secondButtonAction={() =>
           openInNewTab(
             "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
@@ -448,11 +494,8 @@ export const DashboardCards = () => {
         }
         secondButtonLabel={t("learnMore")}
         secondButtonVariant={"outlined"}
-        title={t(
-          user?.isRegisteredAsSoleVoter
-            ? "dashboard.soleVoter.youAreSoleVoterTitle"
-            : "dashboard.soleVoter.registerAsSoleVoterTitle"
-        )}
+        dataTestidSecondButton="learn-more-button"
+        imageURL={IMAGES.soleVoterImage}
       />
       {/* REGISTARTION AS SOLE VOTER CARD END*/}
       {/* GOV ACTIONS LIST CARD */}
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index ea223a238..2b0dfe136 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -20,7 +20,10 @@ export const setLimitedRegistrationInterval = (
         try {
           const data = await getDRepInfo(dRepID);
 
-          if (data.isRegisteredAsDRep === desiredResult) {
+          if (
+            data.isRegisteredAsDRep === desiredResult ||
+            data.isRegisteredAsSoleVoter === desiredResult
+          ) {
             setUser(data);
             clearInterval(interval);
             resolve(desiredResult);
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 6af937395..d67d642ac 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -101,13 +101,23 @@ export const en = {
         youAreRegistered: "You are Registered as a DRep",
       },
       soleVoter: {
+        isRegisteredDescription:
+          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
         register: "Register",
-        registerAsSoleVoterDescription:
+        registerDescription:
           "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
-        registerAsSoleVoterTitle: "Become a Sole Voter",
+        registerTitle: "Become a Sole Voter",
+        reRegister: "Re-register",
+        registration: "Sole Voter Registration",
+        registrationInProgress:
+          "The registration process is ongoing. This may take several minutes.",
         retire: "Retire",
-        youAreSoleVoterDescription:
-          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
+        retireTitle: "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.",
         youAreSoleVoterTitle: "You are a Sole Voter",
       },
     },
@@ -325,11 +335,10 @@ export const en = {
     soleVoter: {
       becomeSoleVoter: "Become a Sole Voter",
       registerDescription:
-      "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
+        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
       registerHeading: "What this Means",
-      reRegister:"Re-register",
       retirementDescription:
-      "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
+        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
       retirementHeading: "What Retirement Means",
       retireSoleVoter: "Retire as a Sole Voter",
     },

From e230b78754d3f29bcb14ecb9efd57942c96a1dc0 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Mon, 26 Feb 2024 18:40:17 +0100
Subject: [PATCH 27/82] [#210] 'user' changed to 'voter'

---
 govtool/frontend/src/App.tsx                  |  4 +-
 .../src/components/atoms/VotingPowerChips.tsx | 10 +--
 .../components/molecules/VoteActionForm.tsx   |  4 +-
 .../components/organisms/DashboardCards.tsx   | 65 ++++++++++---------
 .../DashboardGovernanceActionDetails.tsx      |  4 +-
 .../organisms/DashboardGovernanceActions.tsx  |  4 +-
 .../components/organisms/DashboardTopNav.tsx  |  4 +-
 .../organisms/DelegateTodRepStepOne.tsx       |  6 +-
 .../src/components/organisms/Drawer.tsx       |  4 +-
 .../organisms/RetireAsSoleVoterBoxContent.tsx |  4 +-
 govtool/frontend/src/context/wallet.tsx       | 34 ++++------
 govtool/frontend/src/context/walletUtils.ts   |  4 +-
 .../DashboardGovernanceActionsCategory.tsx    |  9 ++-
 .../src/pages/GovernanceActionsCategory.tsx   |  9 ++-
 14 files changed, 86 insertions(+), 79 deletions(-)

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index 41c45a03b..a282b9e74 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -34,7 +34,7 @@ import { useGetDRepInfo, useWalletConnectionListener } from "./hooks";
 import { RegisterAsSoleVoter } from "./pages/RegisterAsSoleVoter";
 
 export default function App() {
-  const { enable, setUser, setIsDrepLoading } = useCardano();
+  const { enable, setVoter, setIsDrepLoading } = useCardano();
   const navigate = useNavigate();
   const { data } = useGetDRepInfo();
   const { modal, openModal, modals } = useModal();
@@ -47,7 +47,7 @@ export default function App() {
 
   useEffect(() => {
     setIsDrepLoading(true);
-    setUser(data);
+    setVoter(data);
     const timer = setTimeout(() => setIsDrepLoading(false), 1000);
 
     return () => clearTimeout(timer);
diff --git a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
index 6dbeb0d6a..ad707be93 100644
--- a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
+++ b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
@@ -13,7 +13,7 @@ import { correctAdaFormat } from "@utils";
 import { Tooltip } from "@atoms";
 
 export const VotingPowerChips = () => {
-  const { user, stakeKey, isDrepLoading } = useCardano();
+  const { voter, stakeKey, isDrepLoading } = useCardano();
   const { dRepVotingPower, isDRepVotingPowerLoading } =
     useGetDRepVotingPowerQuery();
   const { votingPower, powerIsLoading } =
@@ -33,7 +33,7 @@ export const VotingPowerChips = () => {
       alignItems="center"
       maxHeight={isMobile ? undefined : 48}
     >
-      {user?.isRegisteredAsDRep && (
+      {voter?.isRegisteredAsDRep && (
         <Tooltip
           heading={t("tooltips.votingPower.heading")}
           paragraphOne={t("tooltips.votingPower.paragraphOne")}
@@ -55,8 +55,8 @@ export const VotingPowerChips = () => {
           {t("votingPower")}
         </Typography>
       )}
-      {(user?.isRegisteredAsDRep && isDRepVotingPowerLoading) ||
-      (!user?.isRegisteredAsDRep && powerIsLoading) ||
+      {(voter?.isRegisteredAsDRep && isDRepVotingPowerLoading) ||
+      (!voter?.isRegisteredAsDRep && powerIsLoading) ||
       isDrepLoading ? (
         <CircularProgress size={20} color="primary" />
       ) : (
@@ -67,7 +67,7 @@ export const VotingPowerChips = () => {
           sx={{ whiteSpace: "nowrap" }}
         >
           ₳{" "}
-          {user?.isRegisteredAsDRep
+          {voter?.isRegisteredAsDRep
             ? correctAdaFormat(dRepVotingPower) ?? 0
             : correctAdaFormat(votingPower) ?? 0}
         </Typography>
diff --git a/govtool/frontend/src/components/molecules/VoteActionForm.tsx b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
index 9a4efbb95..211d6ad50 100644
--- a/govtool/frontend/src/components/molecules/VoteActionForm.tsx
+++ b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
@@ -25,7 +25,7 @@ export const VoteActionForm = ({
   const [isContext, setIsContext] = useState<boolean>(false);
   const { isMobile, screenWidth } = useScreenDimension();
   const { openModal } = useModal();
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -142,7 +142,7 @@ export const VoteActionForm = ({
             />
           </Box>
         </Box>
-        {user?.isRegisteredAsDRep && (
+        {voter?.isRegisteredAsDRep && (
           <Button
             data-testid="show-votes-button"
             variant="text"
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 0f2dbe19c..b7ad772d0 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -20,7 +20,7 @@ export const DashboardCards = () => {
     buildSignSubmitConwayCertTx,
     delegateTo,
     delegateTransaction,
-    user,
+    voter,
     dRepID,
     dRepIDBech32,
     isDrepLoading,
@@ -224,7 +224,7 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.metadataUpdateInProgress");
       }
-    } else if (user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep) {
+    } else if (voter?.isRegisteredAsDRep || voter?.wasRegisteredAsDRep) {
       return t("dashboard.registration.holdersCanDelegate");
     } else {
       return t("dashboard.registration.ifYouWant");
@@ -232,8 +232,8 @@ export const DashboardCards = () => {
   }, [
     registerTransaction.transactionHash,
     registerTransaction.type,
-    user?.isRegisteredAsDRep,
-    user?.wasRegisteredAsDRep,
+    voter?.isRegisteredAsDRep,
+    voter?.wasRegisteredAsDRep,
   ]);
 
   const soleVoterCardDescription = useMemo(() => {
@@ -244,9 +244,9 @@ export const DashboardCards = () => {
         default:
           return "dashboard.soleVoter.registrationInProgress";
       }
-    } else if (user?.isRegisteredAsSoleVoter) {
+    } else if (voter?.isRegisteredAsSoleVoter) {
       return "dashboard.soleVoter.isRegisteredDescription";
-    } else if (user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep) {
+    } else if (voter?.wasRegisteredAsSoleVoter && !voter?.isRegisteredAsDRep) {
       return "dashboard.soleVoter.wasRegisteredDescription";
     } else {
       return "dashboard.soleVoter.registerDescription";
@@ -254,8 +254,8 @@ export const DashboardCards = () => {
   }, [
     soleVoterTransaction.transactionHash,
     soleVoterTransaction.type,
-    user?.isRegisteredAsSoleVoter,
-    user?.wasRegisteredAsSoleVoter,
+    voter?.isRegisteredAsSoleVoter,
+    voter?.wasRegisteredAsSoleVoter,
   ]);
 
   const registrationCardTitle = useMemo(() => {
@@ -268,9 +268,9 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.dRepUpdate");
       }
-    } else if (user?.isRegisteredAsDRep) {
+    } else if (voter?.isRegisteredAsDRep) {
       return t("dashboard.registration.youAreRegistered");
-    } else if (user?.wasRegisteredAsDRep) {
+    } else if (voter?.wasRegisteredAsDRep) {
       return t("dashboard.registration.registerAgain");
     } else {
       return t("dashboard.registration.registerAsDRep");
@@ -278,8 +278,8 @@ export const DashboardCards = () => {
   }, [
     registerTransaction?.transactionHash,
     registerTransaction.type,
-    user?.isRegisteredAsDRep,
-    user?.wasRegisteredAsDRep,
+    voter?.isRegisteredAsDRep,
+    voter?.wasRegisteredAsDRep,
   ]);
 
   const soleVoterCardTitle = useMemo(() => {
@@ -290,9 +290,9 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.soleVoter.registration");
       }
-    } else if (user?.isRegisteredAsSoleVoter) {
+    } else if (voter?.isRegisteredAsSoleVoter) {
       return t("dashboard.soleVoter.youAreSoleVoterTitle");
-    } else if (user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep) {
+    } else if (voter?.wasRegisteredAsSoleVoter && !voter?.isRegisteredAsDRep) {
       return t("dashboard.soleVoter.retireTitle");
     } else {
       return t("dashboard.soleVoter.registerTitle");
@@ -300,8 +300,8 @@ export const DashboardCards = () => {
   }, [
     soleVoterTransaction?.transactionHash,
     soleVoterTransaction.type,
-    user?.isRegisteredAsSoleVoter,
-    user?.isRegisteredAsSoleVoter,
+    voter?.isRegisteredAsSoleVoter,
+    voter?.isRegisteredAsSoleVoter,
   ]);
 
   return isDrepLoading ? (
@@ -383,25 +383,27 @@ export const DashboardCards = () => {
       {/* REGISTARTION AS DREP CARD */}
       <DashboardActionCard
         dataTestidFirstButton={
-          user?.isRegisteredAsDRep ? "retire-button" : "register-button"
+          voter?.isRegisteredAsDRep ? "retire-button" : "register-button"
         }
         dataTestidDrepIdBox="my-drep-id"
-        firstButtonVariant={user?.isRegisteredAsDRep ? "outlined" : "contained"}
+        firstButtonVariant={
+          voter?.isRegisteredAsDRep ? "outlined" : "contained"
+        }
         secondButtonVariant={
           registerTransaction?.transactionHash
             ? "outlined"
-            : user?.isRegisteredAsDRep
+            : voter?.isRegisteredAsDRep
             ? "text"
             : "outlined"
         }
         dataTestidSecondButton={
-          user?.isRegisteredAsDRep
+          voter?.isRegisteredAsDRep
             ? "change-metadata-button"
             : "register-learn-more-button"
         }
         description={registrationCardDescription}
         firstButtonAction={
-          user?.isRegisteredAsDRep
+          voter?.isRegisteredAsDRep
             ? retireAsDrep
             : () => navigateTo(PATHS.registerAsdRep)
         }
@@ -411,7 +413,7 @@ export const DashboardCards = () => {
             ? ""
             : t(
                 `dashboard.registration.${
-                  user?.isRegisteredAsDRep ? "retire" : "register"
+                  voter?.isRegisteredAsDRep ? "retire" : "register"
                 }`
               )
         }
@@ -420,7 +422,7 @@ export const DashboardCards = () => {
         secondButtonAction={
           registerTransaction?.transactionHash
             ? () => openInNewTab("https://adanordic.com/latest_transactions")
-            : user?.isRegisteredAsDRep
+            : voter?.isRegisteredAsDRep
             ? () => {
                 navigateTo(PATHS.updateMetadata);
               }
@@ -432,17 +434,17 @@ export const DashboardCards = () => {
         secondButtonLabel={
           registerTransaction?.transactionHash
             ? t("seeTransaction")
-            : user?.isRegisteredAsDRep
+            : voter?.isRegisteredAsDRep
             ? t("dashboard.registration.changeMetadata")
             : t("learnMore")
         }
         cardId={
-          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep
+          voter?.isRegisteredAsDRep || voter?.wasRegisteredAsDRep
             ? dRepIDBech32
             : ""
         }
         cardTitle={
-          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep
+          voter?.isRegisteredAsDRep || voter?.wasRegisteredAsDRep
             ? t("myDRepId")
             : ""
         }
@@ -469,22 +471,23 @@ export const DashboardCards = () => {
           soleVoterTransaction?.transactionHash
             ? ""
             : t(
-                user?.isRegisteredAsSoleVoter
+                voter?.isRegisteredAsSoleVoter
                   ? "dashboard.soleVoter.retire"
-                  : user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep
+                  : voter?.wasRegisteredAsSoleVoter &&
+                    !voter?.isRegisteredAsDRep
                   ? "dashboard.soleVoter.reRegister"
                   : "dashboard.soleVoter.register"
               )
         }
         firstButtonAction={() =>
           navigateTo(
-            user?.isRegisteredAsSoleVoter
+            voter?.isRegisteredAsSoleVoter
               ? PATHS.retireAsSoleVoter
               : PATHS.registerAsSoleVoter
           )
         }
         firstButtonVariant={
-          user?.isRegisteredAsSoleVoter ? "outlined" : "contained"
+          voter?.isRegisteredAsSoleVoter ? "outlined" : "contained"
         }
         secondButtonLabel={t("learnMore")}
         secondButtonAction={() =>
@@ -505,7 +508,7 @@ export const DashboardCards = () => {
         firstButtonAction={() => navigate(PATHS.dashboard_governance_actions)}
         firstButtonLabel={t(
           `dashboard.govActions.${
-            user?.isRegisteredAsDRep ? "reviewAndVote" : "view"
+            voter?.isRegisteredAsDRep ? "reviewAndVote" : "view"
           }`
         )}
         imageURL={IMAGES.govActionListImage}
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
index 50ac76595..b197c3f6b 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
@@ -28,7 +28,7 @@ import {
 } from "@utils";
 
 export const DashboardGovernanceActionDetails = () => {
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const { state, hash } = useLocation();
   const navigate = useNavigate();
   const { isMobile, screenWidth } = useScreenDimension();
@@ -134,7 +134,7 @@ export const DashboardGovernanceActionDetails = () => {
                 ? formatDisplayDate(state.expiryDate)
                 : formatDisplayDate(data.proposal.expiryDate)
             }
-            isDRep={user?.isRegisteredAsDRep}
+            isDRep={voter?.isRegisteredAsDRep}
             noVotes={state ? state.noVotes : data.proposal.noVotes}
             type={
               state
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
index 39c2b7cf4..a8d769f06 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
@@ -65,7 +65,7 @@ export const DashboardGovernanceActions = () => {
     state && state.isVotedListOnLoad ? 1 : 0
   );
 
-  const { user, isDrepLoading } = useCardano();
+  const { voter, isDrepLoading } = useCardano();
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
 
@@ -121,7 +121,7 @@ export const DashboardGovernanceActions = () => {
             sortingActive={Boolean(chosenSorting)}
             sortOpen={sortOpen}
           />
-          {user?.isRegisteredAsDRep && (
+          {voter?.isRegisteredAsDRep && (
             <Tabs
               sx={{
                 marginTop: 3,
diff --git a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
index b167ceb44..3b28a149c 100644
--- a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
@@ -29,7 +29,7 @@ export const DashboardTopNav = ({
   isVotingPowerHidden,
 }: DashboardTopNavProps) => {
   const { isMobile, screenWidth } = useScreenDimension();
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const navigate = useNavigate();
   const [isDrawerOpen, setIsDrawerOpen] = useState<boolean>(false);
   const { t } = useTranslation();
@@ -168,7 +168,7 @@ export const DashboardTopNav = ({
                   </Grid>
                 </Grid>
               </Box>
-              {user?.isRegisteredAsDRep && <DRepInfoCard />}
+              {voter?.isRegisteredAsDRep && <DRepInfoCard />}
               <Box py={2} />
               <WalletInfoCard />
             </Box>
diff --git a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
index a03a4b7e0..f46a454c1 100644
--- a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
+++ b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
@@ -21,7 +21,7 @@ interface DelegateProps {
 export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   const navigate = useNavigate();
   const {
-    user,
+    voter,
     dRepID,
     buildSignSubmitConwayCertTx,
     buildVoteDelegationCert,
@@ -133,7 +133,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   }, [
     chosenOption,
     delegate,
-    user?.isRegisteredAsDRep,
+    voter?.isRegisteredAsDRep,
     dRepID,
     isDelegationLoading,
     isMobile,
@@ -215,7 +215,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
           flexDirection={"column"}
           rowGap={3}
         >
-          {user?.isRegisteredAsDRep && currentDelegation !== dRepID && (
+          {voter?.isRegisteredAsDRep && currentDelegation !== dRepID && (
             <Grid item>
               <ActionRadio
                 onChange={setChosenOption}
diff --git a/govtool/frontend/src/components/organisms/Drawer.tsx b/govtool/frontend/src/components/organisms/Drawer.tsx
index 43291e76c..914674bda 100644
--- a/govtool/frontend/src/components/organisms/Drawer.tsx
+++ b/govtool/frontend/src/components/organisms/Drawer.tsx
@@ -9,7 +9,7 @@ import { openInNewTab } from "@/utils";
 import { useTranslation } from "@hooks";
 
 export const Drawer = () => {
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const { t } = useTranslation();
 
   return (
@@ -61,7 +61,7 @@ export const Drawer = () => {
           ))}
         </Grid>
         <Box px={2}>
-          {user?.isRegisteredAsDRep && <DRepInfoCard />}
+          {voter?.isRegisteredAsDRep && <DRepInfoCard />}
           <Box py={2} />
           <WalletInfoCard />
           <Box my={1}>
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
index 90eff76ee..bb371f0c4 100644
--- a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
@@ -9,7 +9,7 @@ import { useCardano } from "@/context";
 export const RetireAsSoleVoterBoxContent = () => {
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
-  const { user } = useCardano();
+  const { voter } = useCardano();
 
   return (
     <>
@@ -29,7 +29,7 @@ export const RetireAsSoleVoterBoxContent = () => {
       >
         <Trans
           i18nKey="soleVoter.retirementDescription"
-          values={{ deposit: correctAdaFormat(user?.deposit) }}
+          values={{ deposit: correctAdaFormat(voter?.deposit) }}
           components={[
             <Link
               onClick={() => openInNewTab("https://sancho.network/")}
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index b8abbf9f1..dbda6cf99 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -100,14 +100,14 @@ interface CardanoContext {
   enable: (walletName: string) => Promise<EnableResponse>;
   isEnableLoading: string | null;
   error?: string;
-  user: userInfo | undefined;
+  voter: userInfo | undefined;
   isEnabled: boolean;
   pubDRepKey: string;
   dRepID: string;
   dRepIDBech32: string;
   isMainnet: boolean;
   stakeKey?: string;
-  setUser: (key: undefined | userInfo) => void;
+  setVoter: (key: undefined | userInfo) => void;
   setStakeKey: (key: string) => void;
   stakeKeys: string[];
   walletApi?: CardanoApiWallet;
@@ -170,13 +170,7 @@ CardanoContext.displayName = "CardanoContext";
 
 function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
-  const [isEnableLoading, setIsEnableLoading] = useState<string | null>(null);
-  const [dRep, setDRep] = useState<DRepInfo | undefined>(undefined);
-  const [soleVoter, setSoleVoter] = useState<DRepInfo | undefined>({
-    deposit: 4000000,
-    isRegistered: false,
-    wasRegistered: false,
-  });
+  const [voter, setVoter] = useState<userInfo | undefined>(undefined);
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
   );
@@ -356,7 +350,7 @@ function CardanoProvider(props: Props) {
                 10,
                 dRepID,
                 registerTransaction.type,
-                setUser
+                setVoter
               ).then((isRegistered) => {
                 if (registerTransaction.type === "registration") {
                   if (isRegistered) {
@@ -423,7 +417,7 @@ function CardanoProvider(props: Props) {
               10,
               dRepID,
               soleVoterTransaction.type,
-              setUser
+              setVoter
             ).then((isRegistered) => {
               if (soleVoterTransaction.type === "registration") {
                 if (isRegistered) {
@@ -853,9 +847,9 @@ function CardanoProvider(props: Props) {
         // Add output of 1 ADA to the address of our wallet
         let outputValue = BigNum.from_str("1000000");
 
-        if (registrationType === "retirement" && user?.deposit) {
+        if (registrationType === "retirement" && voter?.deposit) {
           outputValue = outputValue.checked_add(
-            BigNum.from_str(`${user?.deposit}`)
+            BigNum.from_str(`${voter?.deposit}`)
           );
         }
 
@@ -1005,7 +999,7 @@ function CardanoProvider(props: Props) {
       voteTransaction.transactionHash,
       stakeKey,
       isPendingTransaction,
-      user,
+      voter,
     ]
   );
 
@@ -1154,7 +1148,7 @@ function CardanoProvider(props: Props) {
 
         const dRepRetirementCert = DrepDeregistration.new(
           dRepCred,
-          BigNum.from_str(`${user?.deposit}`)
+          BigNum.from_str(`${voter?.deposit}`)
         );
         // add cert to tbuilder
         certBuilder.add(
@@ -1166,7 +1160,7 @@ function CardanoProvider(props: Props) {
         console.log(e);
         throw e;
       }
-    }, [dRepID, user]);
+    }, [dRepID, voter]);
 
   const buildVote = useCallback(
     async (
@@ -1227,7 +1221,7 @@ function CardanoProvider(props: Props) {
     () => ({
       address,
       enable,
-      user,
+      voter,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1235,7 +1229,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setUser,
+      setVoter,
       setStakeKey,
       stakeKeys,
       walletApi,
@@ -1263,7 +1257,7 @@ function CardanoProvider(props: Props) {
     [
       address,
       enable,
-      user,
+      voter,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1271,7 +1265,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setUser,
+      setVoter,
       setStakeKey,
       stakeKeys,
       walletApi,
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index 2b0dfe136..feb134841 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -7,7 +7,7 @@ export const setLimitedRegistrationInterval = (
   attemptsNumber: number,
   dRepID: string,
   transactionType: DRepActionType | Omit<DRepActionType, "update">,
-  setUser: (key: undefined | userInfo) => void
+  setVoter: (key: undefined | userInfo) => void
 ): Promise<boolean> => {
   return new Promise(async (resolve) => {
     const desiredResult = transactionType === "registration" ? true : false;
@@ -24,7 +24,7 @@ export const setLimitedRegistrationInterval = (
             data.isRegisteredAsDRep === desiredResult ||
             data.isRegisteredAsSoleVoter === desiredResult
           ) {
-            setUser(data);
+            setVoter(data);
             clearInterval(interval);
             resolve(desiredResult);
           }
diff --git a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
index d71a5e317..1fffa539d 100644
--- a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
@@ -38,7 +38,7 @@ export const DashboardGovernanceActionsCategory = () => {
   const [chosenSorting, setChosenSorting] = useState<string>("");
   const { isMobile, screenWidth } = useScreenDimension();
   const navigate = useNavigate();
-  const { user, isDrepLoading, voteTransaction } = useCardano();
+  const { voter, isDrepLoading, voteTransaction } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -88,7 +88,12 @@ export const DashboardGovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [proposals, user?.isRegisteredAsDRep, searchText, isProposalsFetchingNextPage]);
+  }, [
+    proposals,
+    voter?.isRegisteredAsDRep,
+    searchText,
+    isProposalsFetchingNextPage,
+  ]);
 
   const closeSorts = useCallback(() => {
     setSortOpen(false);
diff --git a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
index 0293c1379..ef6c40a50 100644
--- a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
@@ -36,7 +36,7 @@ export const GovernanceActionsCategory = () => {
   const { isMobile, pagePadding, screenWidth } = useScreenDimension();
   const { isEnabled } = useCardano();
   const navigate = useNavigate();
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -86,7 +86,12 @@ export const GovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [user?.isRegisteredAsDRep, isProposalsFetchingNextPage, proposals, searchText]);
+  }, [
+    voter?.isRegisteredAsDRep,
+    isProposalsFetchingNextPage,
+    proposals,
+    searchText,
+  ]);
 
   useEffect(() => {
     if (isEnabled && getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`)) {

From df64c454e1872c5bfd90c989a409a2aa43c55f45 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Mon, 26 Feb 2024 18:43:26 +0100
Subject: [PATCH 28/82] [#210] 'UserInfo' changed to 'VoterInfo'

---
 govtool/frontend/src/context/wallet.tsx               | 8 ++++----
 govtool/frontend/src/context/walletUtils.ts           | 4 ++--
 govtool/frontend/src/models/api.ts                    | 2 +-
 govtool/frontend/src/services/requests/getDRepInfo.ts | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index dbda6cf99..26e5244c4 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -50,7 +50,7 @@ import { Trans } from "react-i18next";
 import { useModal, useSnackbar } from ".";
 
 import { PATHS } from "@consts";
-import { CardanoApiWallet, userInfo, Protocol } from "@models";
+import { CardanoApiWallet, VoterInfo, Protocol } from "@models";
 import type { StatusModalState } from "@organisms";
 import {
   getPubDRepID,
@@ -100,14 +100,14 @@ interface CardanoContext {
   enable: (walletName: string) => Promise<EnableResponse>;
   isEnableLoading: string | null;
   error?: string;
-  voter: userInfo | undefined;
+  voter: VoterInfo | undefined;
   isEnabled: boolean;
   pubDRepKey: string;
   dRepID: string;
   dRepIDBech32: string;
   isMainnet: boolean;
   stakeKey?: string;
-  setVoter: (key: undefined | userInfo) => void;
+  setVoter: (key: undefined | VoterInfo) => void;
   setStakeKey: (key: string) => void;
   stakeKeys: string[];
   walletApi?: CardanoApiWallet;
@@ -170,7 +170,7 @@ CardanoContext.displayName = "CardanoContext";
 
 function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
-  const [voter, setVoter] = useState<userInfo | undefined>(undefined);
+  const [voter, setVoter] = useState<VoterInfo | undefined>(undefined);
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
   );
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index feb134841..d68d8e7cf 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -1,13 +1,13 @@
 import { getAdaHolderCurrentDelegation, getDRepInfo } from "@services";
 import { DRepActionType } from "./wallet";
-import { userInfo } from "@models";
+import { VoterInfo } from "@models";
 
 export const setLimitedRegistrationInterval = (
   intervalTime: number,
   attemptsNumber: number,
   dRepID: string,
   transactionType: DRepActionType | Omit<DRepActionType, "update">,
-  setVoter: (key: undefined | userInfo) => void
+  setVoter: (key: undefined | VoterInfo) => void
 ): Promise<boolean> => {
   return new Promise(async (resolve) => {
     const desiredResult = transactionType === "registration" ? true : false;
diff --git a/govtool/frontend/src/models/api.ts b/govtool/frontend/src/models/api.ts
index ecbe1fc2e..9f16b07ff 100644
--- a/govtool/frontend/src/models/api.ts
+++ b/govtool/frontend/src/models/api.ts
@@ -1,4 +1,4 @@
-export interface userInfo {
+export interface VoterInfo {
   isRegisteredAsDRep: boolean;
   wasRegisteredAsDRep: boolean;
   isRegisteredAsSoleVoter: boolean;
diff --git a/govtool/frontend/src/services/requests/getDRepInfo.ts b/govtool/frontend/src/services/requests/getDRepInfo.ts
index 1b36cdb09..869fcd337 100644
--- a/govtool/frontend/src/services/requests/getDRepInfo.ts
+++ b/govtool/frontend/src/services/requests/getDRepInfo.ts
@@ -1,9 +1,9 @@
 import { API } from "../API";
 
-import type { userInfo } from "@models";
+import type { VoterInfo } from "@models";
 
 export const getDRepInfo = async (dRepID: string) => {
-  const response = await API.get<userInfo>(`/drep/info/${dRepID}`);
+  const response = await API.get<VoterInfo>(`/drep/info/${dRepID}`);
 
   return response.data;
 };

From c6a470423ac6862288cba66f25e3bd40103d9009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Tue, 27 Feb 2024 08:59:21 +0100
Subject: [PATCH 29/82] [#119] add registration as sole voter

---
 CHANGELOG.md                                        |  3 +--
 .../src/components/organisms/DashboardCards.tsx     |  4 +---
 govtool/frontend/src/context/wallet.tsx             |  5 +----
 .../src/hooks/queries/useGetDRepVotingPowerQuery.ts | 13 ++++++++++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c094e85f..a181f9b9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,7 @@ As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
 ## [Unreleased]
-- Add retire as Sole Voter screen [Issue 198](https://github.com/IntersectMBO/govtool/issues/198)
-- Add Sole Voter card [Issue 141](https://github.com/IntersectMBO/govtool/issues/141)
+- Add possibility to vote on behalf of myself - Sole Voter [Issue 119](https://github.com/IntersectMBO/govtool/issues/119)
 - Create DRep registration page about roles [Issue 205](https://github.com/IntersectMBO/govtool/issues/205)
 - Create Checkbox component. Improve Field and ControlledField [Issue 177](https://github.com/IntersectMBO/govtool/pull/177)
 - Vitest unit tests added for utils functions [Issue 81](https://github.com/IntersectMBO/govtool/issues/81)
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index b7ad772d0..34018f07a 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -456,7 +456,7 @@ export const DashboardCards = () => {
         title={soleVoterCardTitle}
         inProgress={!!soleVoterTransaction?.transactionHash}
         dataTestidFirstButton={
-          user?.isRegisteredAsSoleVoter
+          voter?.isRegisteredAsSoleVoter
             ? "retire-as-sole-voter-button"
             : "register-as-sole-voter-button"
         }
@@ -495,9 +495,7 @@ export const DashboardCards = () => {
             "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
           )
         }
-        secondButtonLabel={t("learnMore")}
         secondButtonVariant={"outlined"}
-        dataTestidSecondButton="learn-more-button"
         imageURL={IMAGES.soleVoterImage}
       />
       {/* REGISTARTION AS SOLE VOTER CARD END*/}
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 26e5244c4..1b29b1d5d 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -170,6 +170,7 @@ CardanoContext.displayName = "CardanoContext";
 
 function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
+  const [isEnableLoading, setIsEnableLoading] = useState<string | null>(null);
   const [voter, setVoter] = useState<VoterInfo | undefined>(undefined);
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
@@ -1251,8 +1252,6 @@ function CardanoProvider(props: Props) {
       isDrepLoading,
       setIsDrepLoading,
       isEnableLoading,
-      soleVoter,
-      setSoleVoter,
     }),
     [
       address,
@@ -1287,8 +1286,6 @@ function CardanoProvider(props: Props) {
       isDrepLoading,
       setIsDrepLoading,
       isEnableLoading,
-      soleVoter,
-      setSoleVoter,
     ]
   );
 
diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index 836946aa9..4accd00fb 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -5,14 +5,21 @@ import { useCardano } from "@context";
 import { getDRepVotingPower } from "@services";
 
 export const useGetDRepVotingPowerQuery = () => {
-  const { dRepID, dRep } = useCardano();
+  const { dRepID, voter } = useCardano();
 
   const { data, isLoading } = useQuery({
-    queryKey: [QUERY_KEYS.useGetDRepVotingPowerKey, dRepID, dRep?.isRegistered],
+    queryKey: [
+      QUERY_KEYS.useGetDRepVotingPowerKey,
+      dRepID,
+      voter?.isRegisteredAsDRep,
+      voter?.isRegisteredAsSoleVoter,
+    ],
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },
-    enabled: !!dRepID && !!dRep?.isRegistered,
+    enabled:
+      !!dRepID &&
+      (!!voter?.isRegisteredAsDRep || !!voter?.isRegisteredAsSoleVoter),
   });
 
   return { dRepVotingPower: data, isDRepVotingPowerLoading: isLoading };

From abdbfe422648366ac4b594d45871400864611e29 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Tue, 27 Feb 2024 09:54:05 +0100
Subject: [PATCH 30/82] [#119] Duplicated lines removed

---
 govtool/frontend/src/consts/images.ts   | 2 --
 govtool/frontend/src/i18n/locales/en.ts | 1 -
 2 files changed, 3 deletions(-)

diff --git a/govtool/frontend/src/consts/images.ts b/govtool/frontend/src/consts/images.ts
index e178dbf93..72f60559d 100644
--- a/govtool/frontend/src/consts/images.ts
+++ b/govtool/frontend/src/consts/images.ts
@@ -10,8 +10,6 @@ export const IMAGES = {
   govActionDelegateImage: "/images/GovActionDelegate.png",
   govActionListImage: "/images/GovActionList.png",
   govActionRegisterImage: "/images/GovActionRegister.png",
-  heroImage: "/images/HeroImage.png",
-  soleVoterImage: "/images/GovActionsSoleVoter.png",
   successImage: "/images/Success.png",
   warningImage: "/images/Warning.png",
   warningYellowImage: "/images/WarningYellow.png",
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index d67d642ac..e3ec7bdea 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -416,7 +416,6 @@ export const en = {
     back: "Back",
     backToDashboard: "Back to dashboard",
     backToList: "Back to the list",
-    backToDashboard: "Back to dashboard",
     cancel: "Cancel",
     clear: "Clear",
     confirm: "Confirm",

From c716ea706f2fb92afc53ffd783bcb2f0f2c6361a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Tue, 27 Feb 2024 10:41:26 +0100
Subject: [PATCH 31/82] [#119] Make voting on governance actions possible

---
 .../src/components/organisms/BgCard.tsx       |  2 +-
 .../DashboardGovernanceActionDetails.tsx      |  2 +-
 .../organisms/DashboardGovernanceActions.tsx  |  2 +-
 .../components/organisms/DashboardTopNav.tsx  |  5 ++-
 .../organisms/DelegateTodRepStepOne.tsx       | 42 ++++++++++---------
 .../organisms/RegisterAsdRepStepTwo.tsx       |  4 +-
 govtool/frontend/src/i18n/locales/en.ts       |  1 +
 7 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/govtool/frontend/src/components/organisms/BgCard.tsx b/govtool/frontend/src/components/organisms/BgCard.tsx
index 98f537eee..94c7b9ee8 100644
--- a/govtool/frontend/src/components/organisms/BgCard.tsx
+++ b/govtool/frontend/src/components/organisms/BgCard.tsx
@@ -61,7 +61,7 @@ export const BgCard = ({
         {actionButtonLabel}
       </LoadingButton>
     );
-  }, [isLoadingActionButton, isMobile]);
+  }, [isLoadingActionButton, isMobile, actionButtonLabel]);
 
   return (
     <Box
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
index b197c3f6b..413f76818 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
@@ -134,7 +134,7 @@ export const DashboardGovernanceActionDetails = () => {
                 ? formatDisplayDate(state.expiryDate)
                 : formatDisplayDate(data.proposal.expiryDate)
             }
-            isDRep={voter?.isRegisteredAsDRep}
+            isDRep={voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter}
             noVotes={state ? state.noVotes : data.proposal.noVotes}
             type={
               state
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
index a8d769f06..c8b18afb6 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
@@ -121,7 +121,7 @@ export const DashboardGovernanceActions = () => {
             sortingActive={Boolean(chosenSorting)}
             sortOpen={sortOpen}
           />
-          {voter?.isRegisteredAsDRep && (
+          {(voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter) && (
             <Tabs
               sx={{
                 marginTop: 3,
diff --git a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
index 3b28a149c..00f44fedd 100644
--- a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
@@ -44,7 +44,7 @@ export const DashboardTopNav = ({
       alignItems={"center"}
       justifyContent={"space-between"}
       borderBottom={1}
-      borderColor={"#D6E2FF"}
+      borderColor="#D6E2FF"
       position="fixed"
       zIndex={100}
       flex={1}
@@ -168,7 +168,8 @@ export const DashboardTopNav = ({
                   </Grid>
                 </Grid>
               </Box>
-              {voter?.isRegisteredAsDRep && <DRepInfoCard />}
+              {(voter?.isRegisteredAsDRep ||
+                voter?.isRegisteredAsSoleVoter) && <DRepInfoCard />}
               <Box py={2} />
               <WalletInfoCard />
             </Box>
diff --git a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
index f46a454c1..3f38f8ba8 100644
--- a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
+++ b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
@@ -134,6 +134,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
     chosenOption,
     delegate,
     voter?.isRegisteredAsDRep,
+    voter?.isRegisteredAsSoleVoter,
     dRepID,
     isDelegationLoading,
     isMobile,
@@ -177,9 +178,9 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
             <Box
               border={1}
               borderColor="#D6E2FF"
-              py={"12px"}
-              px={"24px"}
-              mb={"32px"}
+              py="12px"
+              px="24px"
+              mb="32px"
               borderRadius={3}
             >
               <Box sx={{ display: "flex", alignItems: "center" }}>
@@ -211,24 +212,27 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
         <Grid
           container
           columns={1}
-          display={"flex"}
-          flexDirection={"column"}
+          display="flex"
+          flexDirection="column"
           rowGap={3}
         >
-          {voter?.isRegisteredAsDRep && currentDelegation !== dRepID && (
-            <Grid item>
-              <ActionRadio
-                onChange={setChosenOption}
-                tooltipTitle={t("tooltips.delegateTodRep.toMyself.heading")}
-                tooltipText={t("tooltips.delegateTodRep.toMyself.paragraphOne")}
-                isChecked={chosenOption === dRepID}
-                subtitle={t("delegation.toMyself.subtitle")}
-                title={t("delegation.toMyself.title")}
-                value={dRepID}
-                dataTestId="delegate-to-myself-card"
-              />
-            </Grid>
-          )}
+          {(voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter) &&
+            currentDelegation !== dRepID && (
+              <Grid item>
+                <ActionRadio
+                  onChange={setChosenOption}
+                  tooltipTitle={t("tooltips.delegateTodRep.toMyself.heading")}
+                  tooltipText={t(
+                    "tooltips.delegateTodRep.toMyself.paragraphOne"
+                  )}
+                  isChecked={chosenOption === dRepID}
+                  subtitle={t("delegation.toMyself.subtitle")}
+                  title={t("delegation.toMyself.title")}
+                  value={dRepID}
+                  dataTestId="delegate-to-myself-card"
+                />
+              </Grid>
+            )}
           <Grid item>
             <ActionRadio
               onChange={setChosenOption}
diff --git a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
index 2c1a0f37d..2e6acdebb 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
@@ -18,7 +18,7 @@ interface Props {
 export const RegisterAsdRepStepTwo = ({ setStep }: Props) => {
   const { t } = useTranslation();
   const { isMobile } = useScreenDimension();
-  const { control, errors } = useRegisterAsdRepFormContext();
+  const { showSubmitButton, control, errors } = useRegisterAsdRepFormContext();
 
   const onClickContinue = useCallback(() => setStep(3), []);
 
@@ -26,7 +26,7 @@ export const RegisterAsdRepStepTwo = ({ setStep }: Props) => {
 
   return (
     <BgCard
-      actionButtonLabel={t("skip")}
+      actionButtonLabel={showSubmitButton ? t("continue") : t("skip")}
       onClickActionButton={onClickContinue}
       onClickBackButton={onClickBackButton}
     >
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index e3ec7bdea..edf57f75d 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -431,6 +431,7 @@ export const en = {
     ok: "Ok",
     select: "Select",
     seeTransaction: "See transaction",
+    submit: "Submit",
     skip: "Skip",
     sortBy: "Sort by",
     thisLink: "this link",

From 1769960f75a391bd4203b1e2e7403e76ccad088d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Tue, 27 Feb 2024 10:54:10 +0100
Subject: [PATCH 32/82] [#119] Post code review adjustments

---
 .../src/components/molecules/DashboardActionCard.tsx       | 5 +++--
 .../frontend/src/components/molecules/VoteActionForm.tsx   | 2 +-
 govtool/frontend/src/pages/Dashboard.tsx                   | 7 ++-----
 govtool/frontend/src/pages/DelegateTodRep.tsx              | 7 ++-----
 govtool/frontend/src/pages/RegisterAsSoleVoter.tsx         | 7 ++-----
 govtool/frontend/src/pages/RegisterAsdRep.tsx              | 7 ++-----
 govtool/frontend/src/pages/RetireAsSoleVoter.tsx           | 7 ++-----
 govtool/frontend/src/pages/UpdatedRepMetadata.tsx          | 7 ++-----
 govtool/frontend/src/utils/checkIsWalletConnected.ts       | 5 +++++
 govtool/frontend/src/utils/index.ts                        | 3 ++-
 10 files changed, 23 insertions(+), 34 deletions(-)
 create mode 100644 govtool/frontend/src/utils/checkIsWalletConnected.ts

diff --git a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
index 48bd969ec..d394c12a4 100644
--- 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
index 211d6ad50..920021f24 100644
--- 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
index db72fd2a2..7899270cc 100644
--- 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
index 8749bb225..05b11cc44 100644
--- 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
index ea7018a85..822d809ce 100644
--- 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
index 791c30feb..3653b806d 100644
--- 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
index c661be2cd..7b8fde1cc 100644
--- 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
index 6d5b0cb22..3d80064e7 100644
--- 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
new file mode 100644
index 000000000..4c91a1137
--- /dev/null
+++ 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
index f28259282..95c368dd8 100644
--- 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";

From b39916fca918c83f447dcf23842e18292cc37ab5 Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Wed, 21 Feb 2024 17:29:51 +0100
Subject: [PATCH 33/82] [#212] provide sole voter information in drep/info

Extend the drep/info endpoint by adding isRegisteredAsSoleVoter and wasRegisteredAsSoleVoter fields
---
 govtool/backend/sql/get-drep-info.sql | 44 ++++++++++++++++++++++++---
 govtool/backend/src/VVA/API.hs        |  6 ++--
 govtool/backend/src/VVA/API/Types.hs  | 12 +++++---
 govtool/backend/src/VVA/DRep.hs       | 10 +++---
 govtool/backend/src/VVA/Types.hs      |  6 ++--
 5 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/govtool/backend/sql/get-drep-info.sql b/govtool/backend/sql/get-drep-info.sql
index 341dbabbc..65611fe76 100644
--- a/govtool/backend/sql/get-drep-info.sql
+++ b/govtool/backend/sql/get-drep-info.sql
@@ -1,6 +1,6 @@
 WITH DRepId AS (
     SELECT decode(?, 'hex') as raw
-), IsRegistered AS (
+), IsRegisteredAsDRep AS (
     SELECT (deposit>0) as value,
            deposit as deposit
     FROM drep_registration
@@ -9,9 +9,10 @@ WITH DRepId AS (
     CROSS JOIN DRepId
     WHERE drep_hash.raw = DRepId.raw
     and deposit is not null
+    and drep_registration.voting_anchor_id is not null
     ORDER BY drep_registration.tx_id DESC
     LIMIT 1
-), WasRegistered AS (
+), WasRegisteredAsDRep AS (
     select (EXISTS (
         SELECT *
         FROM drep_registration
@@ -20,9 +21,42 @@ WITH DRepId AS (
         CROSS JOIN DRepId
         WHERE drep_hash.raw = DRepId.raw
         and drep_registration.deposit > 0
+        and drep_registration.voting_anchor_id is not null
+    )) as value
+), IsRegisteredAsSoleVoter AS (
+    SELECT (deposit>0) as value,
+           deposit as deposit
+    FROM drep_registration
+    JOIN drep_hash
+    ON drep_hash.id = drep_registration.drep_hash_id
+    CROSS JOIN DRepId
+    WHERE drep_hash.raw = DRepId.raw
+    and deposit is not null
+    and drep_registration.voting_anchor_id is null
+    ORDER BY drep_registration.tx_id DESC
+    LIMIT 1
+), WasRegisteredAsSoleVoter AS (
+    select (EXISTS (
+        SELECT *
+        FROM drep_registration
+        JOIN drep_hash
+        ON drep_hash.id = drep_registration.drep_hash_id
+        CROSS JOIN DRepId
+        WHERE drep_hash.raw = DRepId.raw
+        and drep_registration.deposit > 0
+        and drep_registration.voting_anchor_id is null
     )) as value
 )
-SELECT IsRegistered.value, WasRegistered.value, IsRegistered.deposit
-FROM WasRegistered
-LEFT JOIN IsRegistered
+SELECT
+    IsRegisteredAsDrep.value,
+    WasRegisteredAsDRep.value,
+    IsRegisteredAsSoleVoter.value,
+    WasRegisteredAsSoleVoter.value,
+    coalesce(IsRegisteredAsDRep.deposit, IsRegisteredAsSoleVoter.deposit)
+FROM WasRegisteredAsDRep
+LEFT JOIN IsRegisteredAsDRep
+ON 1=1
+LEFT JOIN WasRegisteredAsSoleVoter
+ON 1=1
+LEFT JOIN IsRegisteredAsSoleVoter
 ON 1=1
\ No newline at end of file
diff --git a/govtool/backend/src/VVA/API.hs b/govtool/backend/src/VVA/API.hs
index ed0b5f193..30557f6c6 100644
--- a/govtool/backend/src/VVA/API.hs
+++ b/govtool/backend/src/VVA/API.hs
@@ -153,8 +153,10 @@ drepInfo (unHexText -> dRepId) = do
   CacheEnv {dRepInfoCache} <- asks vvaCache
   Types.DRepInfo {..} <- cacheRequest dRepInfoCache dRepId $ DRep.getDRepInfo dRepId
   return $ DRepInfoResponse
-    { dRepInfoResponseIsRegistered = dRepInfoIsRegistered
-    , dRepInfoResponseWasRegistered = dRepInfoWasRegistered
+    { dRepInfoResponseIsRegisteredAsDRep = dRepInfoIsRegisteredAsDRep
+    , dRepInfoResponseWasRegisteredAsDRep = dRepInfoWasRegisteredAsDRep
+    , dRepInfoResponseIsRegisteredAsSoleVoter = dRepInfoIsRegisteredAsSoleVoter
+    , dRepInfoResponseWasRegisteredAsSoleVoter = dRepInfoWasRegisteredAsSoleVoter
     , dRepInfoResponseDeposit = dRepInfoDeposit
     }
 
diff --git a/govtool/backend/src/VVA/API/Types.hs b/govtool/backend/src/VVA/API/Types.hs
index 208e2b4f4..459e72563 100644
--- a/govtool/backend/src/VVA/API/Types.hs
+++ b/govtool/backend/src/VVA/API/Types.hs
@@ -375,8 +375,10 @@ instance ToSchema VoteResponse where
             ?~ toJSON exampleVoteResponse
 
 data DRepInfoResponse = DRepInfoResponse
-  { dRepInfoResponseIsRegistered :: Bool
-  , dRepInfoResponseWasRegistered :: Bool
+  { dRepInfoResponseIsRegisteredAsDRep :: Bool
+  , dRepInfoResponseWasRegisteredAsDRep :: Bool
+  , dRepInfoResponseIsRegisteredAsSoleVoter :: Bool
+  , dRepInfoResponseWasRegisteredAsSoleVoter :: Bool
   , dRepInfoResponseDeposit :: Maybe Integer
   } deriving (Generic, Show)
 
@@ -384,8 +386,10 @@ deriveJSON (jsonOptions "dRepInfoResponse") ''DRepInfoResponse
 
 exampleDRepInfoResponse :: Text
 exampleDRepInfoResponse =
-    "{\"isRegistered\": false,"
-  <> "\"wasRegistered\": true,"
+    "{\"isRegisteredAsDRep\": false,"
+  <> "\"wasRegisteredAsDRep\": true,"
+  <> "\"wasRegisteredAsSoleVoter\": true,"
+  <> "\"wasRegisteredAsSoleVoter\": true,"
   <> "\"deposit\": 2000000}"
 
 instance ToSchema DRepInfoResponse where
diff --git a/govtool/backend/src/VVA/DRep.hs b/govtool/backend/src/VVA/DRep.hs
index 0661f0f82..4a29872ea 100644
--- a/govtool/backend/src/VVA/DRep.hs
+++ b/govtool/backend/src/VVA/DRep.hs
@@ -99,10 +99,12 @@ getDRepInfo
 getDRepInfo drepId = withPool $ \conn -> do
   result <- liftIO $ SQL.query conn getDRepInfoSql (SQL.Only drepId)
   case result of
-    [(isRegistered, wasRegistered, deposit)] ->
+    [(isRegisteredAsDRep, wasRegisteredAsDRep, isRegisteredAsSoleVoter, wasRegisteredAsSoleVoter, deposit)] ->
       return $ DRepInfo
-        { dRepInfoIsRegistered = fromMaybe False isRegistered
-        , dRepInfoWasRegistered = fromMaybe False wasRegistered
+        { dRepInfoIsRegisteredAsDRep = fromMaybe False isRegisteredAsDRep
+        , dRepInfoWasRegisteredAsDRep = fromMaybe False wasRegisteredAsDRep
+        , dRepInfoIsRegisteredAsSoleVoter = fromMaybe False isRegisteredAsSoleVoter
+        , dRepInfoWasRegisteredAsSoleVoter = fromMaybe False wasRegisteredAsSoleVoter
         , dRepInfoDeposit = deposit
         }
-    [] -> return $ DRepInfo False False Nothing
\ No newline at end of file
+    [] -> return $ DRepInfo False False False False Nothing
\ No newline at end of file
diff --git a/govtool/backend/src/VVA/Types.hs b/govtool/backend/src/VVA/Types.hs
index dc4438d18..4d5d2e0db 100644
--- a/govtool/backend/src/VVA/Types.hs
+++ b/govtool/backend/src/VVA/Types.hs
@@ -59,8 +59,10 @@ data Vote = Vote
   }
 
 data DRepInfo = DRepInfo
-  { dRepInfoIsRegistered :: Bool
-  , dRepInfoWasRegistered :: Bool
+  { dRepInfoIsRegisteredAsDRep :: Bool
+  , dRepInfoWasRegisteredAsDRep :: Bool
+  , dRepInfoIsRegisteredAsSoleVoter :: Bool
+  , dRepInfoWasRegisteredAsSoleVoter :: Bool
   , dRepInfoDeposit :: Maybe Integer
   }
 

From a9de520f4bc25cbe63ff4a7976590d7a0d941d28 Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Wed, 21 Feb 2024 17:33:12 +0100
Subject: [PATCH 34/82] [#212] udpate CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a181f9b9f..101a6893a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@ changes.
 - Vitest unit tests added for utils functions [Issue 81](https://github.com/IntersectMBO/govtool/issues/81)
 - i18next library added to FE [Issue 80](https://github.com/IntersectMBO/govtool/issues/80)
 
+### Added
+- Added `isRegisteredAsSoleVoter` and `wasRegisteredAsSoleVoter` fields to the drep/info response [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
+
 ### Fixed
 - Fix make button disble when wallet tries connect [Issue 265](https://github.com/IntersectMBO/govtool/issues/265)
 - Fix drep voting power calculation [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
@@ -28,6 +31,7 @@ changes.
 - Fixed get drep voting power incorrectly executed endpoint [Issue 280](https://github.com/IntersectMBO/govtool/issues/280)
 
 ### Changed
+- `isRegistered` and `wasRegistered` fields in the drep/info endpoint changed to `isRegisteredAsDRep` and `wasRegisteredAsDRep` respectively [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
 - Update Cardano-Serialization-Lib to 12.0.0-alpha.16 [Issue 156](https://github.com/IntersectMBO/govtool/issues/156)
 - Changed and improved working conventions docs, PR template and codeowners file, addressing [Issue 88](https://github.com/IntersectMBO/govtool/issues/88).
 - Changed Node version from 8.7.1-pre to 8.8.0-pre and DbSync version from sancho-2-3-0 to sancho-4-0-0-fix-config, addressing also [Issue 181](https://github.com/IntersectMBO/govtool/issues/181).

From dafe4012909e492ee941a6a1e5e119200b031406 Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Mon, 26 Feb 2024 11:16:10 +0100
Subject: [PATCH 35/82] [#212] fix swagger drep info example

Signed-off-by: jankun4 <michaljankun@gmail.com>
---
 govtool/backend/src/VVA/API/Types.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/govtool/backend/src/VVA/API/Types.hs b/govtool/backend/src/VVA/API/Types.hs
index 459e72563..a3c29fc57 100644
--- a/govtool/backend/src/VVA/API/Types.hs
+++ b/govtool/backend/src/VVA/API/Types.hs
@@ -388,7 +388,7 @@ exampleDRepInfoResponse :: Text
 exampleDRepInfoResponse =
     "{\"isRegisteredAsDRep\": false,"
   <> "\"wasRegisteredAsDRep\": true,"
-  <> "\"wasRegisteredAsSoleVoter\": true,"
+  <> "\"isRegisteredAsSoleVoter\": true,"
   <> "\"wasRegisteredAsSoleVoter\": true,"
   <> "\"deposit\": 2000000}"
 

From 41875b54242e020d2ff0c195e69264df1793cfdd Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Tue, 27 Feb 2024 11:35:24 +0100
Subject: [PATCH 36/82] [#212] fix drep/info sql query

Signed-off-by: jankun4 <michaljankun@gmail.com>
---
 govtool/backend/sql/get-drep-info.sql | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/govtool/backend/sql/get-drep-info.sql b/govtool/backend/sql/get-drep-info.sql
index 65611fe76..e1bfcbbc6 100644
--- a/govtool/backend/sql/get-drep-info.sql
+++ b/govtool/backend/sql/get-drep-info.sql
@@ -1,7 +1,7 @@
 WITH DRepId AS (
     SELECT decode(?, 'hex') as raw
 ), IsRegisteredAsDRep AS (
-    SELECT (deposit>0) as value,
+    SELECT (drep_registration.voting_anchor_id is not null and deposit>0) as value,
            deposit as deposit
     FROM drep_registration
     JOIN drep_hash
@@ -9,7 +9,6 @@ WITH DRepId AS (
     CROSS JOIN DRepId
     WHERE drep_hash.raw = DRepId.raw
     and deposit is not null
-    and drep_registration.voting_anchor_id is not null
     ORDER BY drep_registration.tx_id DESC
     LIMIT 1
 ), WasRegisteredAsDRep AS (
@@ -24,7 +23,7 @@ WITH DRepId AS (
         and drep_registration.voting_anchor_id is not null
     )) as value
 ), IsRegisteredAsSoleVoter AS (
-    SELECT (deposit>0) as value,
+    SELECT (drep_registration.voting_anchor_id is null and deposit>0) as value,
            deposit as deposit
     FROM drep_registration
     JOIN drep_hash
@@ -32,7 +31,6 @@ WITH DRepId AS (
     CROSS JOIN DRepId
     WHERE drep_hash.raw = DRepId.raw
     and deposit is not null
-    and drep_registration.voting_anchor_id is null
     ORDER BY drep_registration.tx_id DESC
     LIMIT 1
 ), WasRegisteredAsSoleVoter AS (

From 66d60af37cb01220fb9b20704a4b7ce7b2504c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Placzy=C5=84ski?= <placzynski.pawel@gmail.com>
Date: Mon, 26 Feb 2024 08:56:25 +0100
Subject: [PATCH 37/82] [#291] Allow Sentry error reporting in CSP settings
 across environments

Updated CSP settings in Traefik configuration for beta, dev, staging,
and test environments to include Sentry's domain without the ingest
subdomain. This change permits Sentry error logging and reporting to
function correctly without being blocked by the CSP. The adjustment
ensures Sentry can capture and report runtime errors, facilitating
better monitoring and debugging capabilities across our development,
testing, and staging phases.

- Modified CSP `connect-src` directive to set
  `o4506155985141760.ingest.sentry.io` replacing old Sentry
  sources.
- Ensured that the updated settings adhere to our security policies by
  only allowing necessary and trusted sources.

This update addresses the need for comprehensive error reporting through
Sentry, enhancing our ability to quickly identify and resolve issues in
our application's environments.
---
 scripts/govtool/docker-compose.beta.yml    | 2 +-
 scripts/govtool/docker-compose.dev.yml     | 2 +-
 scripts/govtool/docker-compose.staging.yml | 2 +-
 scripts/govtool/docker-compose.test.yml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/govtool/docker-compose.beta.yml b/scripts/govtool/docker-compose.beta.yml
index 0a608601f..9e4e9e41f 100644
--- a/scripts/govtool/docker-compose.beta.yml
+++ b/scripts/govtool/docker-compose.beta.yml
@@ -209,7 +209,7 @@ services:
       - "traefik.http.routers.frontend.rule=Host(`sanchogov.tools`)"
       - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
-      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' https://o4506155985141760.ingest.sentry.io/api/4506156032196608/envelope/ *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
+      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' o4506155985141760.ingest.sentry.io *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
       - "traefik.http.routers.frontend.middlewares=frontend-csp@docker"
       - "traefik.http.services.frontend.loadbalancer.server.port=80"
 
diff --git a/scripts/govtool/docker-compose.dev.yml b/scripts/govtool/docker-compose.dev.yml
index a43d63137..ea64ba147 100644
--- a/scripts/govtool/docker-compose.dev.yml
+++ b/scripts/govtool/docker-compose.dev.yml
@@ -209,7 +209,7 @@ services:
       - "traefik.http.routers.frontend.rule=Host(`dev-sanchonet.govtool.byron.network`)"
       - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
-      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' https://o4506155985141760.ingest.sentry.io/api/4506156032196608/envelope/ *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
+      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' o4506155985141760.ingest.sentry.io *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
       - "traefik.http.routers.frontend.middlewares=frontend-csp@docker"
       - "traefik.http.services.frontend.loadbalancer.server.port=80"
 
diff --git a/scripts/govtool/docker-compose.staging.yml b/scripts/govtool/docker-compose.staging.yml
index 24de7ae0a..6ab455d3a 100644
--- a/scripts/govtool/docker-compose.staging.yml
+++ b/scripts/govtool/docker-compose.staging.yml
@@ -209,7 +209,7 @@ services:
       - "traefik.http.routers.frontend.rule=Host(`staging.govtool.byron.network`)"
       - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
-      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' https://o4506155985141760.ingest.sentry.io/api/4506156032196608/envelope/ *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
+      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' o4506155985141760.ingest.sentry.io *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
       - "traefik.http.routers.frontend.middlewares=frontend-csp@docker"
       - "traefik.http.services.frontend.loadbalancer.server.port=80"
 
diff --git a/scripts/govtool/docker-compose.test.yml b/scripts/govtool/docker-compose.test.yml
index 08aa25dd2..d35544e82 100644
--- a/scripts/govtool/docker-compose.test.yml
+++ b/scripts/govtool/docker-compose.test.yml
@@ -209,7 +209,7 @@ services:
       - "traefik.http.routers.frontend.rule=Host(`test-sanchonet.govtool.byron.network`)"
       - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
-      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' https://o4506155985141760.ingest.sentry.io/api/4506156032196608/envelope/ *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
+      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' o4506155985141760.ingest.sentry.io *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
       - "traefik.http.routers.frontend.middlewares=frontend-csp@docker"
       - "traefik.http.services.frontend.loadbalancer.server.port=80"
 

From 7304dfa7f8b213aee9b84febad10a8d82bc0d125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Placzy=C5=84ski?= <placzynski.pawel@gmail.com>
Date: Mon, 26 Feb 2024 07:48:38 +0100
Subject: [PATCH 38/82] Updated CHANGELOG.md to include recent enhancements

- Integrated OAuth for secure Slack deployment notifications #194.
- Streamlined build and deployment process for faster CD and reduced
  resource use #246.
- Allow Sentry error reporting in CSP settings across environments #291.
---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 101a6893a..efa898655 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,8 @@ changes.
 - Fixed vote calculation problems related to NoConfidence DRep [Issue 59](https://github.com/IntersectMBO/govtool/issues/59)
 - Fixed ada-holder/get-current-delegation error when delegated to NoConfidence or AlwaysAbstain dreps. [Issue 82](https://github.com/IntersectMBO/govtool/issues/82)
 - Fixed deployment scripts to address [Issue 171](https://github.com/IntersectMBO/govtool/issues/171).
-- Fixed get drep voting power incorrectly executed endpoint [Issue 280](https://github.com/IntersectMBO/govtool/issues/280)
+- Fixed get drep voting power incorrectly executed endpoint [Issue 280](https://github.com/IntersectMBO/govtool/issues/280).
+- Fixed CSP settings to allow error reports with Sentry [Issue 291](https://github.com/IntersectMBO/govtool/issues/291).
 
 ### Changed
 - `isRegistered` and `wasRegistered` fields in the drep/info endpoint changed to `isRegisteredAsDRep` and `wasRegisteredAsDRep` respectively [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
@@ -39,6 +40,8 @@ changes.
 - Renamed project from VVA to GovTool [Issue 97](https://github.com/IntersectMBO/govtool/issues/97).
 - (`docs/update-working-conventions`) Addressing [Issue 25](https://github.com/IntersectMBO/govtool/issues/25) changed working conventions documentation to improve intended flows.
 - Adjusted Nix configuration to meet projects needs [Issue 187](https://github.com/IntersectMBO/govtool/issues/187).
+- Integrated OAuth to securely notify about deployment status in Slack [Issue 194](https://github.com/IntersectMBO/govtool/issues/194).
+- Streamlined the application build and deployment process, thereby accelerating continuous delivery (CD) and reducing the resource burden [Issue 246](https://github.com/IntersectMBO/govtool/issues/246).
 
 ### Removed
 -

From 804f906e65992d1fe639d9d407082096998cae62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Placzy=C5=84ski?= <placzynski.pawel@gmail.com>
Date: Mon, 26 Feb 2024 11:20:32 +0100
Subject: [PATCH 39/82] Add environment-specific warning to .env.example for
 clarity and safety

This commit introduces a significant update to the `.env.example` file
within the `scripts/govtool` directory to enhance usability and prevent
configuration mistakes. Key changes include:

- Addition of Vim modeline at the beginning of the file (`# vim: set
  ft=bash`) to ensure that when editing the file with Vim, the correct
  filetype (bash) is automatically set. This facilitates syntax
  highlighting and other filetype-specific features, improving the editing
  experience.
- Introduction of a conditional warning mechanism that activates when
  the environment is not set to 'dev'. This mechanism employs bash
  scripting to alert to users, especially those working in
  non-development environments, to proceed with caution and be aware of
  their current configuration context. The warning message explicitly
  states the current environment value, reinforcing the need for
  attentiveness.

These enhancements are designed to minimize the risk of misconfiguration
by providing clear, environment-specific warnings and improving file
readability and editing support.
---
 scripts/govtool/.env.example | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/govtool/.env.example b/scripts/govtool/.env.example
index 47fb60653..adc906cb9 100644
--- a/scripts/govtool/.env.example
+++ b/scripts/govtool/.env.example
@@ -1,3 +1,5 @@
+# vim: set ft=bash
+
 use nix shell.nix
 
 export AWS_PROFILE=govtool
@@ -27,3 +29,13 @@ export GRAFANA_ADMIN_PASSWORD=<grafana_admin_password>
 export GRAFANA_SLACK_RECIPIENT=<grafana_slack_recipient>
 export GRAFANA_SLACK_WEBHOOK=<grafana_slack_webhook>
 export GRAFANA_SLACK_OAUTH_TOKEN=<grafana_slack_oauth_token>
+export DOMAIN="${ENVIRONMENT}-${CARDANO_NETWORK}.govtool.byron.network"
+#export DOMAIN="staging.govtool.byron.network"
+#export DOMAIN="sanchogov.tools"
+
+if [ "$ENVIRONMENT" != "dev" ]; then
+  tput setaf 1 # set text color to red
+  tput bold
+  echo "THIS IS NOT A DEVELOPMENT ENVIRONMENT! It is '$ENVIRONMENT'. BE CAREFUL…"
+  tput sgr0 # reset text formatting to normal
+fi

From 198b2de2799ab3ca063becc20e420f55fbd12396 Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Tue, 27 Feb 2024 20:51:03 +0100
Subject: [PATCH 40/82] [#333] fix drep type detection

Signed-off-by: jankun4 <michaljankun@gmail.com>
---
 CHANGELOG.md                          |   1 +
 govtool/backend/sql/get-drep-info.sql | 130 +++++++++++++++-----------
 2 files changed, 79 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efa898655..6a81c409b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ changes.
 - Added `isRegisteredAsSoleVoter` and `wasRegisteredAsSoleVoter` fields to the drep/info response [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
 
 ### Fixed
+- Fix drep type detection when changing metadata [Issue 333](https://github.com/IntersectMBO/govtool/issues/333)
 - Fix make button disble when wallet tries connect [Issue 265](https://github.com/IntersectMBO/govtool/issues/265)
 - Fix drep voting power calculation [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
 - Fix proposal/list and network/metrics bug that appeared when noone has delegated their funds either to drep_always_abstain or drep_always_no_confidence [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
diff --git a/govtool/backend/sql/get-drep-info.sql b/govtool/backend/sql/get-drep-info.sql
index e1bfcbbc6..de5048afb 100644
--- a/govtool/backend/sql/get-drep-info.sql
+++ b/govtool/backend/sql/get-drep-info.sql
@@ -1,60 +1,86 @@
 WITH DRepId AS (
-    SELECT decode(?, 'hex') as raw
-), IsRegisteredAsDRep AS (
-    SELECT (drep_registration.voting_anchor_id is not null and deposit>0) as value,
-           deposit as deposit
-    FROM drep_registration
-    JOIN drep_hash
-    ON drep_hash.id = drep_registration.drep_hash_id
-    CROSS JOIN DRepId
-    WHERE drep_hash.raw = DRepId.raw
-    and deposit is not null
-    ORDER BY drep_registration.tx_id DESC
+    SELECT
+        decode(?, 'hex') AS raw
+),
+LatestRegistrationEntry AS (
+    SELECT
+        drep_registration.voting_anchor_id AS voting_anchor_id,
+        deposit AS deposit
+    FROM
+        drep_registration
+        CROSS JOIN DrepId
+        JOIN drep_hash ON drep_hash.id = drep_registration.drep_hash_id
+    WHERE
+        drep_hash.raw = DRepId.raw
+    ORDER BY
+        drep_registration.tx_id DESC
     LIMIT 1
-), WasRegisteredAsDRep AS (
-    select (EXISTS (
-        SELECT *
-        FROM drep_registration
-        JOIN drep_hash
-        ON drep_hash.id = drep_registration.drep_hash_id
-        CROSS JOIN DRepId
-        WHERE drep_hash.raw = DRepId.raw
-        and drep_registration.deposit > 0
-        and drep_registration.voting_anchor_id is not null
-    )) as value
-), IsRegisteredAsSoleVoter AS (
-    SELECT (drep_registration.voting_anchor_id is null and deposit>0) as value,
-           deposit as deposit
-    FROM drep_registration
-    JOIN drep_hash
-    ON drep_hash.id = drep_registration.drep_hash_id
-    CROSS JOIN DRepId
-    WHERE drep_hash.raw = DRepId.raw
-    and deposit is not null
-    ORDER BY drep_registration.tx_id DESC
+),
+IsRegisteredAsDRep AS (
+    SELECT
+        (LatestRegistrationEntry.deposit is null or LatestRegistrationEntry.deposit > 0)
+        AND LatestRegistrationEntry.voting_anchor_id IS NOT NULL AS value
+    FROM
+        LatestRegistrationEntry
+),
+IsRegisteredAsSoleVoter AS (
+    SELECT
+        (LatestRegistrationEntry.deposit is null or LatestRegistrationEntry.deposit > 0)
+        AND LatestRegistrationEntry.voting_anchor_id IS NULL AS value
+    FROM
+        LatestRegistrationEntry
+),
+CurrentDeposit AS (
+    SELECT
+        GREATEST(drep_registration.deposit, 0) AS value
+FROM
+    drep_registration
+    join drep_hash
+    on drep_hash.id = drep_registration.drep_hash_id
+    cross join DRepId
+
+    WHERE
+        drep_registration.deposit IS NOT NULL
+        and drep_hash.raw = DRepId.raw
+    ORDER BY
+        drep_registration.tx_id DESC
     LIMIT 1
-), WasRegisteredAsSoleVoter AS (
-    select (EXISTS (
-        SELECT *
-        FROM drep_registration
-        JOIN drep_hash
-        ON drep_hash.id = drep_registration.drep_hash_id
-        CROSS JOIN DRepId
-        WHERE drep_hash.raw = DRepId.raw
-        and drep_registration.deposit > 0
-        and drep_registration.voting_anchor_id is null
-    )) as value
+),
+WasRegisteredAsDRep AS (
+    SELECT
+        (EXISTS (
+                SELECT
+                    *
+                FROM
+                    drep_registration
+                    JOIN drep_hash ON drep_hash.id = drep_registration.drep_hash_id
+                    CROSS JOIN DRepId
+                WHERE
+                    drep_hash.raw = DRepId.raw
+                    AND drep_registration.voting_anchor_id IS NOT NULL)) AS value
+),
+WasRegisteredAsSoleVoter AS (
+    SELECT
+        (EXISTS (
+                SELECT
+                    *
+                FROM
+                    drep_registration
+                    JOIN drep_hash ON drep_hash.id = drep_registration.drep_hash_id
+                    CROSS JOIN DRepId
+                WHERE
+                    drep_hash.raw = DRepId.raw
+                    AND drep_registration.voting_anchor_id IS NULL)) AS value
 )
 SELECT
-    IsRegisteredAsDrep.value,
+    IsRegisteredAsDRep.value,
     WasRegisteredAsDRep.value,
     IsRegisteredAsSoleVoter.value,
     WasRegisteredAsSoleVoter.value,
-    coalesce(IsRegisteredAsDRep.deposit, IsRegisteredAsSoleVoter.deposit)
-FROM WasRegisteredAsDRep
-LEFT JOIN IsRegisteredAsDRep
-ON 1=1
-LEFT JOIN WasRegisteredAsSoleVoter
-ON 1=1
-LEFT JOIN IsRegisteredAsSoleVoter
-ON 1=1
\ No newline at end of file
+    CurrentDeposit.value
+FROM
+    IsRegisteredAsDRep
+    CROSS JOIN IsRegisteredAsSoleVoter
+    CROSS JOIN WasRegisteredAsDRep
+    CROSS JOIN WasRegisteredAsSoleVoter
+    CROSS JOIN CurrentDeposit

From eb7eb45030ec780b1781bb4da3247f998744f60d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 23 Feb 2024 11:35:24 +0100
Subject: [PATCH 41/82] fix get drep voting power

---
 .../frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index 836946aa9..5df7a3af1 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -12,7 +12,7 @@ export const useGetDRepVotingPowerQuery = () => {
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },
-    enabled: !!dRepID && !!dRep?.isRegistered,
+    enabled: !!dRepID && dRep?.isRegistered,
   });
 
   return { dRepVotingPower: data, isDRepVotingPowerLoading: isLoading };

From e23b8687ab4d9e96c4ad16e9b659296dafa8070c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Fri, 23 Feb 2024 14:09:31 +0100
Subject: [PATCH 42/82] [#280] Fix get drep voting power request

---
 .../frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index 5df7a3af1..836946aa9 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -12,7 +12,7 @@ export const useGetDRepVotingPowerQuery = () => {
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },
-    enabled: !!dRepID && dRep?.isRegistered,
+    enabled: !!dRepID && !!dRep?.isRegistered,
   });
 
   return { dRepVotingPower: data, isDRepVotingPowerLoading: isLoading };

From 5e2df20725b5661369d9ad2684861eb8ece65423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Mon, 26 Feb 2024 15:20:54 +0100
Subject: [PATCH 43/82] [#265] make button disabled when tries to connect

---
 CHANGELOG.md                                  |  1 +
 .../src/components/molecules/WalletOption.tsx | 81 ++++++++++++-------
 govtool/frontend/src/context/wallet.tsx       |  7 ++
 3 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90954bacd..b80f9c5f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ changes.
 - i18next library added to FE [Issue 80](https://github.com/IntersectMBO/govtool/issues/80)
 
 ### Fixed
+- Fix make button disble when wallet tries connect [Issue 265](https://github.com/IntersectMBO/govtool/issues/265)
 - Fix drep voting power calculation [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
 - Fix proposal/list and network/metrics bug that appeared when noone has delegated their funds either to drep_always_abstain or drep_always_no_confidence [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
 - Fix GA details [Issue 272](https://github.com/IntersectMBO/govtool/issues/272)
diff --git a/govtool/frontend/src/components/molecules/WalletOption.tsx b/govtool/frontend/src/components/molecules/WalletOption.tsx
index 94c5f9ed7..a1a14dd69 100644
--- a/govtool/frontend/src/components/molecules/WalletOption.tsx
+++ b/govtool/frontend/src/components/molecules/WalletOption.tsx
@@ -1,10 +1,10 @@
-import { Box, Typography } from "@mui/material";
-import { FC } from "react";
+import { FC, useCallback } from "react";
+import { useNavigate } from "react-router-dom";
+import { Box, CircularProgress, Typography } from "@mui/material";
 
+import { PATHS } from "@consts";
 import { useCardano } from "@context";
 import { theme } from "@/theme";
-import { useNavigate } from "react-router-dom";
-import { PATHS } from "@/consts";
 
 export interface WalletOption {
   icon: string;
@@ -15,7 +15,7 @@ export interface WalletOption {
 }
 
 export const WalletOptionButton: FC<WalletOption> = ({ ...props }) => {
-  const { enable } = useCardano();
+  const { enable, isEnableLoading } = useCardano();
   const {
     palette: { lightBlue },
   } = theme;
@@ -23,52 +23,77 @@ export const WalletOptionButton: FC<WalletOption> = ({ ...props }) => {
 
   const { dataTestId, icon, label, name, cip95Available } = props;
 
+  const enableByWalletName = useCallback(async() => {
+    if(isEnableLoading) return;
+    const result = await enable(name);
+    if (result?.stakeKey) {
+      navigate(PATHS.dashboard);
+      return;
+    }
+    navigate(PATHS.stakeKeys);
+  }, [enable, isEnableLoading])
+
   return (
     <Box
       data-testid={dataTestId}
       sx={{
         alignItems: "center",
-        border: `1px solid ${lightBlue}`,
+        border: isEnableLoading ? "none" : `1px solid ${lightBlue}`,
+        bgcolor: isEnableLoading ? "#EAE9F0" : "white",
         borderRadius: "100px",
-        boxShadow: "0px 0px 11px 0px #24223230",
+        boxShadow: isEnableLoading ? undefined : "0px 0px 11px 0px #24223230",
         boxSizing: "border-box",
-        cursor: cip95Available ? "pointer" : "unset",
+        cursor: cip95Available
+          ? isEnableLoading
+            ? "default"
+            : "pointer"
+          : "unset",
         display: "flex",
         justifyContent: "space-between",
         marginBottom: "16px",
-        padding: "12px 28px 12px 13px",
+        padding: "12px 13px 12px 13px",
         transition: "background .2s",
+        position: "relative",
         width: "100%",
-        "&:hover": {
-          background: lightBlue,
-        },
+        "&:hover": isEnableLoading
+          ? undefined
+          : {
+              background: lightBlue,
+            },
       }}
       key={name}
-      onClick={async () => {
-        const result = await enable(name);
-        if (result?.stakeKey) {
-          navigate(PATHS.dashboard);
-          return;
-        }
-        navigate(PATHS.stakeKeys);
-      }}
+      onClick={enableByWalletName}
     >
       <img
         alt={`${name} icon`}
         src={icon}
-        style={{ height: "24px", width: "24px" }}
+        style={{
+          height: "24px",
+          width: "24px",
+          filter: isEnableLoading ? "grayscale(100%)" : "none",
+        }}
       />
       <Typography
-        color="primaryBlue"
-        sx={{ fontSize: "16px", fontWeight: "500" }}
+        color={isEnableLoading ? "#C1BED3" : "primaryBlue"}
+        sx={{
+          fontSize: "16px",
+          fontWeight: "500",
+        }}
       >
         {name ?? label}
       </Typography>
-      <img
-        alt={`${name} icon`}
-        src={icon}
-        style={{ height: "24px", width: "24px", visibility: "hidden" }}
-      />
+      <div style={{ height: "24px", width: "24px" }} />
+      {isEnableLoading === name && (
+        <Box
+          position="absolute"
+          left={0}
+          right={0}
+          display="flex"
+          justifyContent="center"
+        >
+          <CircularProgress size={26} />
+        </Box>
+      )}
     </Box>
   );
 };
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 3d49f7a25..765e24226 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -97,6 +97,7 @@ interface CardanoContext {
   address?: string;
   disconnectWallet: () => Promise<void>;
   enable: (walletName: string) => Promise<EnableResponse>;
+  isEnableLoading: string | null;
   error?: string;
   dRep: DRepInfo | undefined;
   isEnabled: boolean;
@@ -165,6 +166,7 @@ CardanoContext.displayName = "CardanoContext";
 
 function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
+  const [isEnableLoading, setIsEnableLoading] = useState<string | null>(null);
   const [dRep, setDRep] = useState<DRepInfo | undefined>(undefined);
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
@@ -517,6 +519,7 @@ function CardanoProvider(props: Props) {
 
   const enable = useCallback(
     async (walletName: string) => {
+      setIsEnableLoading(walletName);
       await checkIsMaintenanceOn();
 
       // todo: use .getSupportedExtensions() to check if wallet supports CIP-95
@@ -650,6 +653,8 @@ function CardanoProvider(props: Props) {
             status: "ERROR",
             error: `${e == undefined ? t("errors.somethingWentWrong") : e}`,
           };
+        } finally {
+          setIsEnableLoading(null);
         }
       }
       throw { status: "ERROR", error: t("errors.somethingWentWrong") };
@@ -1141,6 +1146,7 @@ function CardanoProvider(props: Props) {
       isPendingTransaction,
       isDrepLoading,
       setIsDrepLoading,
+      isEnableLoading,
     }),
     [
       address,
@@ -1173,6 +1179,7 @@ function CardanoProvider(props: Props) {
       isPendingTransaction,
       isDrepLoading,
       setIsDrepLoading,
+      isEnableLoading,
     ]
   );
 

From 36b8202541ecc6586883da8219a3e37a146f60c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Placzy=C5=84ski?= <placzynski.pawel@gmail.com>
Date: Mon, 26 Feb 2024 14:36:25 +0100
Subject: [PATCH 44/82] =?UTF-8?q?[#301]=20Add=20Micha=C5=82=20Sza=C5=82ows?=
 =?UTF-8?q?ki=20to=20SSH=20access=20list=20for=20environment=20management?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit updates the user_data.sh script within the Terraform modules
for govtool-EC2 instances. It adds Michał Szałowski to the list of users
authorized for SSH access, thereby expanding the secure access
management system to include a team leader. This change is a step
towards fulfilling the secure credential sharing acceptance criterion by
ensuring new team members like Michał have the necessary access to
sensitive environments.
---
 infra/terraform/modules/govtool-ec2/main.tf      | 2 +-
 infra/terraform/modules/govtool-ec2/user_data.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra/terraform/modules/govtool-ec2/main.tf b/infra/terraform/modules/govtool-ec2/main.tf
index f71417f05..40ad6f6cd 100644
--- a/infra/terraform/modules/govtool-ec2/main.tf
+++ b/infra/terraform/modules/govtool-ec2/main.tf
@@ -153,7 +153,7 @@ resource "aws_instance" "govtool" {
   }
 
   user_data = file("${path.module}/user_data.sh")
-  # user_data_replace_on_change = true
+  user_data_replace_on_change = false
 
   credit_specification {
     cpu_credits = "unlimited"
diff --git a/infra/terraform/modules/govtool-ec2/user_data.sh b/infra/terraform/modules/govtool-ec2/user_data.sh
index 6f9708ffe..79a7f1a06 100644
--- a/infra/terraform/modules/govtool-ec2/user_data.sh
+++ b/infra/terraform/modules/govtool-ec2/user_data.sh
@@ -2,7 +2,7 @@
 
 # setup ssh access
 mkdir -p /home/ubuntu/.ssh
-users="a.guderski,michal.jankun,p.placzynski"
+users="a.guderski,michal.jankun,p.placzynski,michal.szalowski"
 curl --retry 5 --retry-delay 5 -L keys.binarapps.com/ssh/{$users} | tee -a /home/ubuntu/.ssh/authorized_keys
 echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKeM0HOF9szWhOfbQM8XkIfznORTtTaCJJStALYjQuy6 (voltaire-era-github-actions)" | tee -a /home/ubuntu/.ssh/authorized_keys
 chmod 700 /home/ubuntu/.ssh

From 314d71ef0052b5bbd835af9ab4ace9e28bf220a3 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Wed, 14 Feb 2024 09:37:03 +0100
Subject: [PATCH 45/82] Sole voter information page, without footer

---
 govtool/frontend/src/App.tsx                  |   5 +
 .../components/organisms/SoleVoterInfo.tsx    | 108 +++++++++++++++++
 govtool/frontend/src/consts/paths.ts          |   1 +
 govtool/frontend/src/i18n/locales/en.ts       |   8 ++
 .../src/pages/RegisterAsSoleVoter.tsx         | 110 ++++++++++++++++++
 5 files changed, 232 insertions(+)
 create mode 100644 govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
 create mode 100644 govtool/frontend/src/pages/RegisterAsSoleVoter.tsx

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index 91dab6356..d48e4d55a 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -30,6 +30,7 @@ import {
 } from "@utils";
 import { SetupInterceptors } from "./services";
 import { useGetDRepInfo, useWalletConnectionListener } from "./hooks";
+import { RegisterAsSoleVoter } from "./pages/RegisterAsSoleVoter";
 
 export default function App() {
   const { enable, setDRep, setIsDrepLoading } = useCardano();
@@ -115,6 +116,10 @@ export default function App() {
         </Route>
         <Route path={PATHS.delegateTodRep} element={<DelegateTodRep />} />
         <Route path={PATHS.registerAsdRep} element={<RegisterAsdRep />} />
+        <Route
+          path={PATHS.registerAsSoleVoter}
+          element={<RegisterAsSoleVoter />}
+        />
         <Route path={PATHS.stakeKeys} element={<ChooseStakeKey />} />
         <Route path={PATHS.updateMetadata} element={<UpdatedRepMetadata />} />
         <Route path="*" element={<ErrorPage />} />
diff --git a/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx b/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
new file mode 100644
index 000000000..4eb34dafe
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
@@ -0,0 +1,108 @@
+import { useMemo } from "react";
+import { Box, Link } from "@mui/material";
+
+import { LoadingButton, Button, Typography } from "@atoms";
+import { theme } from "@/theme";
+import { useScreenDimension, useTranslation } from "@hooks";
+import { Trans } from "react-i18next";
+import { openInNewTab } from "@/utils";
+import { useNavigate } from "react-router-dom";
+import { PATHS } from "@consts";
+
+export const SoleVoterInfo = () => {
+  const {
+    palette: { boxShadow2 },
+  } = theme;
+  const { isMobile, pagePadding, screenWidth } = useScreenDimension();
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+
+  const renderBackButton = useMemo(() => {
+    return (
+      <Button
+        data-testid={"back-button"}
+        onClick={() => navigate(PATHS.dashboard)}
+        size="extraLarge"
+        sx={{
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+        }}
+        variant="outlined"
+      >
+        {t("cancel")}
+      </Button>
+    );
+  }, [isMobile]);
+
+  const renderRegisterButton = useMemo(() => {
+    return (
+      <LoadingButton
+        data-testid={"register-button"}
+        // isLoading={isLoading}
+        onClick={() => {}}
+        sx={{
+          borderRadius: 50,
+          textTransform: "none",
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+          height: 48,
+        }}
+        variant="contained"
+      >
+        {t("soleVoter.continueToRegister")}
+      </LoadingButton>
+    );
+  }, [
+    // isLoading,
+    isMobile,
+  ]);
+
+  return (
+    <Box
+      width={screenWidth < 768 ? "auto" : screenWidth < 1024 ? "60vw" : "45vw"}
+      boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
+      px={pagePadding}
+      py={isMobile ? 3 : 8}
+      borderRadius={"20px"}
+      mb={isMobile ? 0 : 6}
+      height="auto"
+    >
+      <Box display="flex" flexDirection="column">
+        <Typography sx={{ mt: 1, textAlign: "center" }} variant="headline4">
+          {t("soleVoter.heading")}
+        </Typography>
+        <Typography
+          fontWeight={400}
+          sx={{
+            mb: 7,
+            mt: isMobile ? 4 : 10,
+            textAlign: "center",
+            whiteSpace: "pre-line",
+          }}
+          variant="body1"
+        >
+          <Trans
+            i18nKey="soleVoter.description"
+            components={[
+              <Link
+                onClick={() => openInNewTab("https://sancho.network/")}
+                sx={{ cursor: "pointer" }}
+                key="0"
+              />,
+            ]}
+          />
+        </Typography>
+      </Box>
+      <Box
+        display="flex"
+        flexDirection={isMobile ? "column" : "row"}
+        justifyContent="space-between"
+        mt={6}
+      >
+        {isMobile ? renderRegisterButton : renderBackButton}
+        <Box px={2} py={isMobile ? 1.5 : 0} />
+        {isMobile ? renderBackButton : renderRegisterButton}
+      </Box>
+    </Box>
+  );
+};
diff --git a/govtool/frontend/src/consts/paths.ts b/govtool/frontend/src/consts/paths.ts
index 645f4e695..8af3a6381 100644
--- a/govtool/frontend/src/consts/paths.ts
+++ b/govtool/frontend/src/consts/paths.ts
@@ -16,6 +16,7 @@ export const PATHS = {
   faqs: "/faqs",
   delegateTodRep: "/delegate",
   registerAsdRep: "/register",
+  registerAsSoleVoter: "/register_sole_voter",
   stakeKeys: "/stake_keys",
   updateMetadata: "/update_metadata",
 };
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 9204175a4..68cd48743 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -286,6 +286,13 @@ export const en = {
       showAll: "Show all",
       viewAll: "View all",
     },
+    soleVoter: {
+      becomeSoleVoter: "Become a Sole Voter",
+      continueToRegister: "Continue to register",
+      description:
+        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳2</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
+      heading: "What this Means",
+    },
     system: {
       sanchoNet: "SanchoNet",
       sanchoNetIsBeta:
@@ -360,6 +367,7 @@ export const en = {
     back: "Back",
     backToDashboard: "Back to dashboard",
     backToList: "Back to the list",
+    backToDashboard: "Back to dashboard",
     cancel: "Cancel",
     clear: "Clear",
     confirm: "Confirm",
diff --git a/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx b/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
new file mode 100644
index 000000000..370a5fefc
--- /dev/null
+++ b/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
@@ -0,0 +1,110 @@
+import { useEffect } from "react";
+import { Box, Link } from "@mui/material";
+
+import { Background, Typography } from "@atoms";
+import { ICONS, PATHS } from "@consts";
+import { DashboardTopNav, Footer } from "@organisms";
+import { useScreenDimension, useTranslation } from "@hooks";
+import { useNavigate } from "react-router-dom";
+import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
+import { SoleVoterInfo } from "@/components/organisms/SoleVoterInfo";
+
+export const RegisterAsSoleVoter = () => {
+  const { isMobile, screenWidth } = useScreenDimension();
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
+    ) {
+      navigate(PATHS.home);
+    }
+  }, []);
+
+  return (
+    <Background isReverted>
+      <Box display={"flex"} minHeight={"100vh"} flexDirection="column">
+        <DashboardTopNav
+          imageSRC={ICONS.appLogoIcon}
+          imageWidth={isMobile ? undefined : 42}
+          imageHeight={isMobile ? 24 : 35}
+          title={t("soleVoter.becomeSoleVoter")}
+        />
+
+        <Box
+          mt={isMobile ? 0 : 7}
+          height={isMobile ? "100%" : "auto"}
+          sx={{
+            marginTop: isMobile ? "97px" : "153px",
+            display: isMobile ? "flex" : "grid",
+            ...(isMobile && {
+              flexDirection: "column",
+            }),
+            ...(!isMobile && { gridTemplateColumns: "1fr auto 1fr" }),
+          }}
+        >
+          {isMobile && (
+            <Box borderBottom={1} borderColor={"#fff"}>
+              <Typography
+                variant="body2"
+                sx={{
+                  ml: 2,
+                  my: "26px",
+                  fontSize: "24px",
+                  fontWeight: 400,
+                }}
+              >
+                {t("soleVoter.becomeSoleVoter")}
+              </Typography>
+            </Box>
+          )}
+          <Link
+            data-testid={"back-to-list-link"}
+            sx={{
+              cursor: "pointer",
+              alignSelf: "flex-start",
+              display: "flex",
+              justifyContent: "center",
+              textDecoration: "none",
+              marginBottom: 3,
+              mt: isMobile ? 3 : "none",
+              mx: isMobile ? 2 : 1,
+            }}
+            onClick={() => navigate(PATHS.dashboard)}
+          >
+            <img
+              src={ICONS.arrowRightIcon}
+              alt="arrow"
+              style={{
+                marginRight: isMobile
+                  ? "12px"
+                  : screenWidth < 950
+                  ? "8px"
+                  : "12px",
+                transform: "rotate(180deg)",
+              }}
+            />
+            <Typography
+              variant="body2"
+              color="primary"
+              sx={{
+                display: "inline-block",
+                fontSize: isMobile
+                  ? "14px"
+                  : screenWidth < 950
+                  ? "12px"
+                  : "14px",
+              }}
+            >
+              {t("backToDashboard")}
+            </Typography>
+          </Link>
+          <SoleVoterInfo />
+        </Box>
+        {isMobile && <Footer />}
+      </Box>
+    </Background>
+  );
+};

From 0d9915cc83216aa043010192812a5db783c2d181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:31:58 +0100
Subject: [PATCH 46/82] add image for sole voter

---
 .../public/images/GovActionsSoleVoter.png        | Bin 0 -> 4097 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 govtool/frontend/public/images/GovActionsSoleVoter.png

diff --git a/govtool/frontend/public/images/GovActionsSoleVoter.png b/govtool/frontend/public/images/GovActionsSoleVoter.png
new file mode 100644
index 0000000000000000000000000000000000000000..69048a4c322a99fc2098fe7efffd775246ed0620
GIT binary patch
literal 4097
zcmV+c5dQCpP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH50*(pK~#7F?OF?r
zUB!9+XU=`?+9ozMrh*s@h6ICa$FQtzY?ImzGNzGI6qkgeMkT34-8OY4<din8Kn)6M
zRFRfE+Cm6Xq>#|kkg5?$Ah31-zu2|0cTI3?{E|X=I3#x1yZ1b1{`~VibIv}z-t}cI
zCBJuk=bp#R{NMcVxd6Z6#GsAT8tAzMBeseIe-{e*PMWSpmt)4*F`0>jE!o;UYw_B{
zFoks50Z0a(UL=u!9E4m8LR<n;0wCJiXgbaTB5It`S3UjnOv3%ug>O8>*i8c7W;$&E
z3~k?h5v!+Pfh1dvnXpVV^T${|lj}1F1g9>2N<0!F{6l5&>WATNq|*XG>xG^VU=sfq
zF@K(Cn6sSOQD?Uj;XokJq?Dg+MDlL7Xw4wJ4OD?iQfqh5257cE3sN*##LTWTmbU@|
zXe7g_guX<5QWK<qj7JK*JCcmgLBx+zUqYK{QUJ7e{qS=**xaa?V38B)$cngS-tq5L
z0!ISDG$bID^dQ4qTD?yuboFD<W}2`H#JirlQ#M<7=|L)L=OYaOW1$3;UQ&#z-3~$U
zwu0rrX{k_6Y-n_^y${+*69S;Q^T`kKIQu3_QDqfkxKhdWm|OkVqnC!)4AZBOdbj;|
z^`Co|+5Z$!LL3v&_`T`ft6qgR5r<PG-1pS^EEQiGk$I;E&bWoPfEu$>q9w)Ohaym3
zGqjuhotjMk9@<E!3_#MvyCKcaH4H~Z=11FktK>@bnezWt0<98&P$K4S2LlOWJ??sJ
zCbWr834qrA=jO>)`e%C46+SlePLE04AtiB6<p5c?uM-YE`Y{b&iTSeaFrU?CvwkzQ
ziB8E2u))@yq?g9x>)jhg=g~5rWrI@Sy;+Q3oUwe(>u#K(LtE!YiTD9Y(7PFdr0s#5
zqog)!Y%b)7>DGTh8))1{u-U(P4j&ro!!&y*t43P)^)6aT@MM{nar)CJO+Qpy_J`X?
z8n5;8wo7@I?Z70RsloCqGE35+s78QeDw>V@PiL~O+fq2qG;S4$B(A_rCp5#1TTV8p
ziIc%N9(><u%qwclTe_bl=vxrlf#8$*I6_N7XA;kS543^C4FE%VHCUHja9L`x%CPBB
zmi{uW?|(gW`He51d`$7bK4cEP20&m7%=b*D-OvUaw+%qxzYi4(Rcj>rwJ5)#e7efv
zGy|Xv-=2<TYri(0G2<*7s8*`<o)~GuLO9L2ya3uj<C1{Zz^1=sRW_e@)<DPm0)wV@
zTqv=pmMMT{#r>Oa8qc`X_P+53F_)E%UO}x~41v+v&;}Y4fT2ClTpagr+D=>bB{`Hd
zFv&otx-N>7GB;M%<&jaFgED(0?ccN!PD1P^%KtgMm1mAt@AXY)!fLSgfMX}Lfkp)&
z>)&!COOqFIFz!}<+(c+r*L6|@CZ?A*oK=QgNkmF5q3|UYpBvi!)M_{xVKhWyMV)f9
z^JqgD(Ogjt+CU=$(AxRzU!=|Ex3QJg%>t~?w+qrCyxwuh8COm9(SFa!YGl!;vFD-2
z81pNYO8od<0=R7!3<VJ5lTO`7qG13eeb3wqN$U$hdTm10$b`IhQ7DxSP)${FY#)P#
zqisrPguEv0nET$bm%w7?0kF)1>$_kpqQ7bt+CT+VkN5RlBD3@X((_0aCrp%Q7Xo2E
zZ}nb>_+cUw#so}D2>mUfFWW|4fs}6*#@Csl8-i;WtLzL``MS7&%K^^Ve#!Z6y0}vc
z`D%mlH$a{^I?)P}2Y~dM#l6pb57U-qJ_LZ}1q|tO^^kF1WL#e}U8?Dfsk<C`FAaC4
zE`$V`paD~Xfi@^oz_WQY?L7K&y>hz*1|;eo{tk!-wlx{Y1N2NU71oXr@&{_19f6MO
z0Gro!98Ly6vTMsHF-<RFjOV)^=)GayT6@Q^TQCL*4CG)DrfTsAVGN?Z-32cD^YsBc
zr3}XoBEw<Pr?$wQC~zU&T&OpWSV+|KL+P8zz?K&%hj~WI>}ws1R~-)L*PLK)?>oqa
zt=9`swuVPOuU8@np|w{Fvc^s^h-d-R?^JvrwLO5NNu2eL1wfqOkMtVUn3Cm;I#68X
z8P*lN$zXX>rq{(xBueoJCN{s|>}-;u)%5V4oYxM<yPo|9?$|M>06<(xZ^kUUkg>>C
zX^rJ)WeM;=7{*mz&pWHYIw(4<+X%605+tU*1%COgRjZDT1;C62OJ8Kjp3Ms(7&JC4
zGc-$LK48+{T`^Xt=SF&2B~aabNcGa6#Fb<#_HCW-0bl~x>#p5>Q=PSL$s0C>u<-<h
z!7(<Y3j8d^JUv^d>s3`9V#bJrUf{i*E8q7oFb*Ox{}xQeB#$Yu^bjk*<gQx~ILi-Q
zRKX>3k{dkhVi$z-W0`&jw{1I%C%d;^Nj`m{W;P0RKa9$}*fSOPA3}&1)vJw*Nar3U
zw<t|r(=DDIrP}Vg#<JzN!#Jrn|EfNE`Ho>XLX9XQHmq+X0}bP<p9OJ>1r<HGdadt{
zA-<I*ySM+jOtJ^`L%OQV3KMF?^gyIrG^h}A(e!Jt-Q({+{&>B4-ptD>UygVTuXl8<
zI0_S_R{yqtrTK3kw)-I<5i1=x7&occD6EP);(_WSn&1ts`_7a>7kgQ<cl#r9NZypE
zw!wr>WNc(dJN|ITiWRp&8z~-m{$`r!9+IRB3paeM#fnm)%5B2rB`l05+_Q?L1t2Wb
z(eqM>H#wnlS?FQPuEtz44^*oB>(FMZFSz=fwR0+$3zQ$G1^1B1X5KDH$h{He9N1LV
zBBST|c|=fG2<!=lV>oHZ<WPk~ZjRO+$EZWsUc%fUH!D%C58ei1=XEvd<G)qILx&pK
zFOOX%P%Ne8t)yN3pmuT6>3+#TltKjk;oP^&V6{Z6tX6C%-vu2|KE@h>=#?X^t7}Y`
z)(&D9UDTqF=kTTNucU%~OvWPckU@}CHkKA3ckTjKl{NFK&PV_-DetQwXPBSgLB9K8
zSgJEp7Qqw|zO?haREQ@r5%cs?!;|N-r*NVU-sM@nSIkSj^Az)t>lgQTthr%xg)aY!
z-tEwDl*HeYL3{SEc0V_J#-in~!zqx;F_NG3y@zJ);;b@Ts#9cSzYrkyH>zw0yL9P^
zG2g%IE}qEjX)<>6^aWRXD@2L*VVQ^0==wHQR}rGxd9chMJpR@v)N^D5_|GB2*@YO~
zjF5lV2?xxqVP!e>9)s~P{!-t<1jL^v`^c(GIA7_Y1XKG{(X$dLRY^<s?RcOntM{<^
ziw}=9PWq7>K2I5ssR+9>2+eq4?F$CZGVkgX(lSqsqe!1875MbDH8=df8=rP($CojM
z^$?!KJDmYLs6D*I2oBcy^!e<HE0WO|Pxtkap^_VEqU)$N$cE>;0oI{#8>~dk<xa2B
z#(t)DS$E+iINrbWa+YMhWa&HnJ3(NYuN86~cb>xOyV?03F2xsWS@r~5Q%svHv@_c%
zja=_esSVR^!FEy)HoG{91~;`1?!L8g@uGctew7p)*>ho>B<rYLa*NEwB8YR{!*GFU
zBWr1aPy(TAAnaU<F#kRMaql_R`CWJV-I3z&=z5X)vXyr_E}d%w%Q(JCAp9q*@~<|o
zT{&uro?-vCbJHsS8BN3rc}M|~0CftpsY0y!$BCH}#K<|sP^XF#A+?KfavADlAO$u9
z$rBqLzM{znBe=VMdG|jJ?b&fLuffZDOlIEkK^nU35%M617}vpChP`CnAFOva9we`I
z(vu|3VfN$a|3@IM^Kml<5>S5Hmg*SKrK3<E#M1L_JZVKTxR?Ky2n-08Ioh=iyoQ6K
zg<lDiLa?d1-W!nvpn@T4zmS>y)ZuexK6u3#Dmo$n>E0cGK;Zw-+X3%Nu*4Aa^-7<C
zInj1I5{?||sV$nK-7z0_hrbbs{1_6e@Cuz6yvs+at_BktJf-KVB$VQjdWElIOO_mh
zQzXB|t^Vy#(~?%@F#wL>4p}Y*!J_ojBkaCs5S(6uwF@?iW2FGbNr8ISNf?yoaR8`z
zNQJ>I(IV@-sIhX%PhbM%hpw|}>uAtlI-LsB$h?n1Ob+@;Oea?(<?s2D4H)WoM5+MC
z?O9^D^I;tk?AOu8v>T))DOCv#J~2_|3jnYM3*Mx?`G{u9F;?zNvy&K}1B3vT7OLM-
zRyi}EnjcdIOb%ntN}Vf$3h?SR3}~CxGQ?3&pic<^MUD3^`2kgNKSfPyadn2q^@C5%
zm@z)K_z<+rw$$jTZ|a^d`?Dg`9+BWW3)CU>PL_FFFjj8$0GuuW6xFX@@|iS~AEm*M
z`!G_L8H7TkK+3elwlx0)^*KaqK7q$^5bveMA09R<mc+-0<mmN1ENkU;K1Mj>q<%Cp
z;?dajWy`*SmFOyp*<V0c3`xT#O-rQN+44@eRHJ)?Bua0I!?G!EYgFKZ#??!1uVHi@
zS%79<tqDK~44hABz^af4R08vR(IiieM?G(AbakodX>qgXxpf@bCuq`@05(`E5Ei;t
zPhX?wze~sdU+w(BHCw``*@CMM#8ieO5r5b-gHGZR!rvL?F3*OzQEna_amFuzNzh3T
z96MJnf0RBRJ^sYzODkA;KTY0EhG#AnLocAUOe2>zNU$6vaXd;VGB4Jv(bnqqMW)Mi
z&tu<v<c<%n{bTY3H~PHYn*uDR<UZPC28fCU$mMEM{w_>{7)%ij?b<q*j>UEo<FkAK
zRbEYA!8PKqI(3^4r`8C!#Q$|(xBQP_g2Z8psAKW6!z`l;a5?()Q62=x@1TPx?Fw76
zpaNu1E`v$XlmVcq*4_OOxytW&_gZRb^9P@6C}XIM?2rrsBA5-6peY4FQN32#Kpv%~
zEWKygm9M<ZMSswtU2Ibt5KJ&O>-hJ#OxP1lIRKQhlJUfiCg92gs65U<!?X>&e1N4u
zXc<syF)n}!(v$<BsPo!uzDT?Il+OJN!4;aH;Q8p%^!>fq#3AXBJPRgBZTa2JL`X<>
z3ze;20>Ne$!d`708RVx_Q2ad-UE?XVV1jf;NPwd0?_c^F6Z}Rm0ihJQoFlbHP_@`b
zo1_ZlO<sfv(isDQqK>u8Hc=e(&sa#PAh!!HztGJBF@(FOeSF0$FhM$_08q5|XSKT-
z^82)?yQC^+Ho3AA5L@Qy04<B*^DqgTvPf_&Qimyn-`etT#O&V`4m2|iPpYZZkN2Pb
z$<?>PB<PHj07aA|;Pji9Z=fjeuV{x3xx%MY1DU~zEQNoZ)%?+Vm?WK%5)cwTzQ5jl
z_4VsX8m<(n=wzvU8AS5!85`G}(h=QnX%zZ3`)LTK7|Y7T00000NkvXXu0mjft(DTW

literal 0
HcmV?d00001


From 53b7d98ec2cd80ef9bdafc1823af72de7da06397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:32:44 +0100
Subject: [PATCH 47/82] change props and dashabord card sizes

---
 .../components/molecules/DashboardActionCard.tsx   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
index 3d3e9fc26..90cfce5ca 100644
--- a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
+++ b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
@@ -18,9 +18,7 @@ type DashboardActionCardProps = {
   firstButtonIsLoading?: boolean;
   firstButtonLabel?: string;
   firstButtonVariant?: ButtonProps["variant"];
-  imageHeight?: number;
   imageURL?: string;
-  imageWidth?: number;
   inProgress?: boolean;
   isLoading?: boolean;
   secondButtonAction?: () => void;
@@ -62,17 +60,15 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
 
   return (
     <Box
-      mb={3}
-      p={3}
-      sx={{ boxShadow: `5px 5px 15px 5px ${boxShadow2}` }}
+      border={inProgress && !isLoading ? 1 : 0}
+      borderColor="accentOrange"
       borderRadius={3}
-      flex={1}
       display="flex"
+      flex={1}
       flexDirection="column"
-      border={inProgress && !isLoading ? 1 : 0}
-      borderColor="accentOrange"
+      p={3}
       position="relative"
-      maxWidth={440}
+      sx={{ boxShadow: `5px 5px 15px 5px ${boxShadow2}` }}
     >
       {inProgress && !isLoading && (
         <Box

From 5b4ede45636bda18b78ab33a727fa6e8162fdb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:33:28 +0100
Subject: [PATCH 48/82] add sole voter into IMAGES

---
 govtool/frontend/src/consts/images.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/govtool/frontend/src/consts/images.ts b/govtool/frontend/src/consts/images.ts
index f9a098d4f..9d64fe9b2 100644
--- a/govtool/frontend/src/consts/images.ts
+++ b/govtool/frontend/src/consts/images.ts
@@ -3,6 +3,7 @@ export const IMAGES = {
   appLogoWithoutText: "/images/AppLogoWithoutText.png",
   errorPageImage: "/images/ErrorPageImage.png",
   heroImage: "/images/HeroImage.png",
+  soleVoterImage: "/images/GovActionsSoleVoter.png",
   govActionDelegateImage: "/images/GovActionDelegate.png",
   govActionRegisterImage: "/images/GovActionRegister.png",
   govActionListImage: "/images/GovActionList.png",

From bf8a0fa84d3f43f68dea463d9c2e3d9ecd615be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:33:46 +0100
Subject: [PATCH 49/82] sort IMAGES asc

---
 govtool/frontend/src/consts/images.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/govtool/frontend/src/consts/images.ts b/govtool/frontend/src/consts/images.ts
index 9d64fe9b2..b74b473ea 100644
--- a/govtool/frontend/src/consts/images.ts
+++ b/govtool/frontend/src/consts/images.ts
@@ -1,16 +1,16 @@
 export const IMAGES = {
   appLogo: "/images/SanchoLogo.png",
   appLogoWithoutText: "/images/AppLogoWithoutText.png",
+  bgBlue: "/images/BGBlue.png",
+  bgOrange: "/images/BGOrange.png",
   errorPageImage: "/images/ErrorPageImage.png",
-  heroImage: "/images/HeroImage.png",
-  soleVoterImage: "/images/GovActionsSoleVoter.png",
+  govActionDefaultImage: "/images/GovActionDefault.png",
   govActionDelegateImage: "/images/GovActionDelegate.png",
-  govActionRegisterImage: "/images/GovActionRegister.png",
   govActionListImage: "/images/GovActionList.png",
-  govActionDefaultImage: "/images/GovActionDefault.png",
+  govActionRegisterImage: "/images/GovActionRegister.png",
+  heroImage: "/images/HeroImage.png",
+  soleVoterImage: "/images/GovActionsSoleVoter.png",
   successImage: "/images/Success.png",
   warningImage: "/images/Warning.png",
   warningYellowImage: "/images/WarningYellow.png",
-  bgOrange: "/images/BGOrange.png",
-  bgBlue: "/images/BGBlue.png",
 };

From 6b5576536b0c7a681141b18003101cced3fd9463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:34:04 +0100
Subject: [PATCH 50/82] add translations for sole voter card

---
 govtool/frontend/src/i18n/locales/en.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 68cd48743..ed247a1e1 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -72,6 +72,11 @@ export const en = {
         title: "Governance Actions",
         view: "View governance actions",
       },
+      cards: {
+        registerAsSoleVoterTitle: "Become a Sole Voter",
+        registerAsSoleVoterDescription:
+          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>",
+      },
       registration: {
         changeMetadata: "Change metadata",
         connectToRegister: "Connect to register",

From 928b20b570cfc3aaa65ee158f200cf923ab3adcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:34:28 +0100
Subject: [PATCH 51/82] change way to display cards on dashboard/ add sole
 voter card

---
 .../components/organisms/DashboardCards.tsx   | 327 +++++++++---------
 1 file changed, 164 insertions(+), 163 deletions(-)

diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index a4bde49da..8aa4cad6b 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -1,5 +1,5 @@
 import { useNavigate } from "react-router-dom";
-import { Box, CircularProgress, Typography } from "@mui/material";
+import { Box, CircularProgress } from "@mui/material";
 import { Trans } from "react-i18next";
 
 import { IMAGES, PATHS } from "@consts";
@@ -259,38 +259,6 @@ export const DashboardCards = () => {
     dRep?.wasRegistered,
   ]);
 
-  const renderGovActionSection = useCallback(() => {
-    return (
-      <>
-        <Typography fontSize={16} fontWeight={600} lineHeight={"24px"} my={3}>
-          {t("dashboard.headingTwo")}
-        </Typography>
-        <Box display={"flex"}>
-          <DashboardActionCard
-            dataTestidFirstButton="view-governance-actions-button"
-            description={t("dashboard.govActions.description")}
-            firstButtonAction={() =>
-              navigate(PATHS.dashboard_governance_actions)
-            }
-            firstButtonLabel={t(
-              `dashboard.govActions.${
-                dRep?.isRegistered ? "reviewAndVote" : "view"
-              }`
-            )}
-            imageURL={IMAGES.govActionListImage}
-            title={t("dashboard.govActions.title")}
-          />
-          {screenWidth < 1024 ? null : (
-            <>
-              <Box p={2} />
-              <Box flex={1} px={4} />
-            </>
-          )}
-        </Box>
-      </>
-    );
-  }, [screenWidth, isMobile, dRep?.isRegistered]);
-
   return isDrepLoading ? (
     <Box
       alignItems="center"
@@ -303,138 +271,171 @@ export const DashboardCards = () => {
     </Box>
   ) : (
     <Box
-      pl={screenWidth < 1024 ? 2 : screenWidth < 1440 ? 4 : 4}
-      pr={screenWidth < 1024 ? 2 : screenWidth < 1440 ? 8 : 29.5}
+      display="grid"
+      rowGap={3}
+      columnGap={4}
+      gridTemplateColumns={screenWidth < 1024 ? "1fr" : "1fr 1fr"}
+      px={screenWidth < 1024 ? 2 : screenWidth < 1440 ? 5 : 4}
+      py={3}
     >
-      {dRep?.isRegistered && renderGovActionSection()}
-      <Typography fontSize={16} fontWeight={600} lineHeight={"24px"} my={3}>
-        {t("dashboard.headingOne")}
-      </Typography>
-      <Box
-        display={"flex"}
-        flexDirection={screenWidth < 1024 ? "column" : "row"}
-      >
-        <DashboardActionCard
-          dataTestidFirstButton={
-            currentDelegation ? "change-dRep-button" : "delegate-button"
-          }
-          dataTestidSecondButton="delegate-learn-more-button"
-          dataTestidDrepIdBox="delegated-to-drep-id"
-          isLoading={isCurrentDelegationLoading || powerIsLoading}
-          description={
-            delegateTransaction?.transactionHash
-              ? progressDescription
-              : delegationDescription
-          }
-          dataTestidDelegationStatus={
-            delegateTransaction?.transactionHash
-              ? "voting-power-delegation-status-in-progress"
-              : `voting-power-delegation-status-${delegationStatusTestForId}`
-          }
-          firstButtonAction={() => navigateTo(PATHS.delegateTodRep)}
-          firstButtonLabel={
-            delegateTransaction?.transactionHash
-              ? ""
-              : currentDelegation
-              ? t("dashboard.delegation.changeDelegation")
-              : t("delegate")
-          }
-          imageHeight={55}
-          imageWidth={65}
-          firstButtonVariant={currentDelegation ? "outlined" : "contained"}
-          imageURL={IMAGES.govActionDelegateImage}
-          cardId={displayedDelegationId}
-          inProgress={!!delegateTransaction?.transactionHash}
-          cardTitle={t("dashboard.delegation.dRepDelegatedTo")}
-          secondButtonAction={
-            delegateTransaction?.transactionHash
-              ? () => openInNewTab("https://adanordic.com/latest_transactions")
-              : () =>
-                  openInNewTab(
-                    "https://docs.sanchogov.tools/faqs/ways-to-use-your-voting-power"
-                  )
-          }
-          secondButtonLabel={
-            delegateTransaction?.transactionHash
-              ? t("seeTransaction")
-              : currentDelegation
-              ? ""
-              : t("learnMore")
-          }
-          title={
-            delegateTransaction?.transactionHash ? (
-              t("dashboard.delegation.votingPowerDelegation")
-            ) : currentDelegation ? (
-              <Trans i18nKey="dashboard.delegation.yourVotingPowerIsDelegated" />
-            ) : (
-              t("dashboard.delegation.useYourVotingPower")
-            )
-          }
-        />
-        <Box width={24} />
-        <DashboardActionCard
-          dataTestidFirstButton={
-            dRep?.isRegistered ? "retire-button" : "register-button"
-          }
-          dataTestidDrepIdBox="my-drep-id"
-          firstButtonVariant={dRep?.isRegistered ? "outlined" : "contained"}
-          secondButtonVariant={
-            registerTransaction?.transactionHash
-              ? "outlined"
-              : dRep?.isRegistered
-              ? "text"
-              : "outlined"
-          }
-          dataTestidSecondButton={
-            dRep?.isRegistered
-              ? "change-metadata-button"
-              : "register-learn-more-button"
-          }
-          description={registrationCardDescription}
-          firstButtonAction={
-            dRep?.isRegistered
-              ? retireAsDrep
-              : () => navigateTo(PATHS.registerAsdRep)
-          }
-          firstButtonIsLoading={isRetirementLoading}
-          firstButtonLabel={
-            registerTransaction?.transactionHash
-              ? ""
-              : t(
-                  `dashboard.registration.${
-                    dRep?.isRegistered ? "retire" : "register"
-                  }`
+      {/* DELEGATION CARD */}
+      <DashboardActionCard
+        dataTestidFirstButton={
+          currentDelegation ? "change-dRep-button" : "delegate-button"
+        }
+        dataTestidSecondButton="delegate-learn-more-button"
+        dataTestidDrepIdBox="delegated-to-drep-id"
+        isLoading={isCurrentDelegationLoading || powerIsLoading}
+        description={
+          delegateTransaction?.transactionHash
+            ? progressDescription
+            : delegationDescription
+        }
+        dataTestidDelegationStatus={
+          delegateTransaction?.transactionHash
+            ? "voting-power-delegation-status-in-progress"
+            : `voting-power-delegation-status-${delegationStatusTestForId}`
+        }
+        firstButtonAction={() => navigateTo(PATHS.delegateTodRep)}
+        firstButtonLabel={
+          delegateTransaction?.transactionHash
+            ? ""
+            : currentDelegation
+            ? t("dashboard.delegation.changeDelegation")
+            : t("delegate")
+        }
+        firstButtonVariant={currentDelegation ? "outlined" : "contained"}
+        imageURL={IMAGES.govActionDelegateImage}
+        cardId={displayedDelegationId}
+        inProgress={!!delegateTransaction?.transactionHash}
+        cardTitle={t("dashboard.delegation.dRepDelegatedTo")}
+        secondButtonAction={
+          delegateTransaction?.transactionHash
+            ? () => openInNewTab("https://adanordic.com/latest_transactions")
+            : () =>
+                openInNewTab(
+                  "https://docs.sanchogov.tools/faqs/ways-to-use-your-voting-power"
                 )
-          }
-          inProgress={!!registerTransaction?.transactionHash}
-          imageURL={IMAGES.govActionRegisterImage}
-          secondButtonAction={
-            registerTransaction?.transactionHash
-              ? () => openInNewTab("https://adanordic.com/latest_transactions")
-              : dRep?.isRegistered
-              ? () => {
-                  navigateTo(PATHS.updateMetadata);
-                }
-              : () =>
-                  openInNewTab(
-                    "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
-                  )
-          }
-          secondButtonLabel={
-            registerTransaction?.transactionHash
-              ? t("seeTransaction")
-              : dRep?.isRegistered
-              ? t("dashboard.registration.changeMetadata")
-              : t("learnMore")
-          }
-          cardId={dRep?.isRegistered || dRep?.wasRegistered ? dRepIDBech32 : ""}
-          cardTitle={
-            dRep?.isRegistered || dRep?.wasRegistered ? t("myDRepId") : ""
-          }
-          title={registrationCardTitle}
-        />
-      </Box>
-      {!dRep?.isRegistered && renderGovActionSection()}
+        }
+        secondButtonLabel={
+          delegateTransaction?.transactionHash
+            ? t("seeTransaction")
+            : currentDelegation
+            ? ""
+            : t("learnMore")
+        }
+        title={
+          delegateTransaction?.transactionHash ? (
+            t("dashboard.delegation.votingPowerDelegation")
+          ) : currentDelegation ? (
+            <Trans i18nKey="dashboard.delegation.yourVotingPowerIsDelegated" />
+          ) : (
+            t("dashboard.delegation.useYourVotingPower")
+          )
+        }
+      />
+      {/* DELEGATION CARD END*/}
+      {/* REGISTARTION AS DREP CARD */}
+      <DashboardActionCard
+        dataTestidFirstButton={
+          dRep?.isRegistered ? "retire-button" : "register-button"
+        }
+        dataTestidDrepIdBox="my-drep-id"
+        firstButtonVariant={dRep?.isRegistered ? "outlined" : "contained"}
+        secondButtonVariant={
+          registerTransaction?.transactionHash
+            ? "outlined"
+            : dRep?.isRegistered
+            ? "text"
+            : "outlined"
+        }
+        dataTestidSecondButton={
+          dRep?.isRegistered
+            ? "change-metadata-button"
+            : "register-learn-more-button"
+        }
+        description={registrationCardDescription}
+        firstButtonAction={
+          dRep?.isRegistered
+            ? retireAsDrep
+            : () => navigateTo(PATHS.registerAsdRep)
+        }
+        firstButtonIsLoading={isRetirementLoading}
+        firstButtonLabel={
+          registerTransaction?.transactionHash
+            ? ""
+            : t(
+                `dashboard.registration.${
+                  dRep?.isRegistered ? "retire" : "register"
+                }`
+              )
+        }
+        inProgress={!!registerTransaction?.transactionHash}
+        imageURL={IMAGES.govActionRegisterImage}
+        secondButtonAction={
+          registerTransaction?.transactionHash
+            ? () => openInNewTab("https://adanordic.com/latest_transactions")
+            : dRep?.isRegistered
+            ? () => {
+                navigateTo(PATHS.updateMetadata);
+              }
+            : () =>
+                openInNewTab(
+                  "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
+                )
+        }
+        secondButtonLabel={
+          registerTransaction?.transactionHash
+            ? t("seeTransaction")
+            : dRep?.isRegistered
+            ? t("dashboard.registration.changeMetadata")
+            : t("learnMore")
+        }
+        cardId={dRep?.isRegistered || dRep?.wasRegistered ? dRepIDBech32 : ""}
+        cardTitle={
+          dRep?.isRegistered || dRep?.wasRegistered ? t("myDRepId") : ""
+        }
+        title={registrationCardTitle}
+      />
+      {/* DREP CARD END*/}
+      {/* SOLE VOTER CARD */}
+      <DashboardActionCard
+        dataTestidFirstButton={"register-as-sole-voter-button"}
+        firstButtonVariant={"contained"}
+        secondButtonVariant={"outlined"}
+        dataTestidSecondButton={"learn-more-button"}
+        description={
+          <Trans
+            i18nKey="dashboard.cards.registerAsSoleVoterDescription"
+            values={{ votingPower }}
+          />
+        }
+        firstButtonAction={() => navigateTo(PATHS.registerAsSoleVoter)}
+        firstButtonLabel={t("dashboard.registration.register")}
+        imageURL={IMAGES.soleVoterImage}
+        secondButtonAction={() =>
+          openInNewTab(
+            "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
+          )
+        }
+        secondButtonLabel={t("learnMore")}
+        title={t("dashboard.cards.registerAsSoleVoterTitle")}
+      />
+      {/* REGISTARTION AS SOLE VOTER CARD END*/}
+      {/* GOV ACTIONS LIST CARD */}
+      <DashboardActionCard
+        dataTestidFirstButton="view-governance-actions-button"
+        description={t("dashboard.govActions.description")}
+        firstButtonAction={() => navigate(PATHS.dashboard_governance_actions)}
+        firstButtonLabel={t(
+          `dashboard.govActions.${
+            dRep?.isRegistered ? "reviewAndVote" : "view"
+          }`
+        )}
+        imageURL={IMAGES.govActionListImage}
+        title={t("dashboard.govActions.title")}
+      />
+      {/* GOV ACTIONS LIST CARD END*/}
     </Box>
   );
 };

From 1849e036a86680dcbba1c512fb77aad7298017df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:35:14 +0100
Subject: [PATCH 52/82] delete unnecessary code

---
 govtool/frontend/src/components/organisms/DashboardCards.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 8aa4cad6b..7e3ae3721 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -31,7 +31,7 @@ export const DashboardCards = () => {
   const navigate = useNavigate();
   const { currentDelegation, isCurrentDelegationLoading } =
     useGetAdaHolderCurrentDelegationQuery(stakeKey);
-  const { screenWidth, isMobile } = useScreenDimension();
+  const { screenWidth } = useScreenDimension();
   const { openModal } = useModal();
   const [isRetirementLoading, setIsRetirementLoading] =
     useState<boolean>(false);

From 249df28ac9d4942a65b327714da34b566b3f0b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:39:07 +0100
Subject: [PATCH 53/82] add feat to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b80f9c5f8..6830148d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
 ## [Unreleased]
+- Add Sole Voter card [Issue 141](https://github.com/IntersectMBO/govtool/issues/141)
 - Create DRep registration page about roles [Issue 205](https://github.com/IntersectMBO/govtool/issues/205)
 - Create Checkbox component. Improve Field and ControlledField [Issue 177](https://github.com/IntersectMBO/govtool/pull/177)
 - Vitest unit tests added for utils functions [Issue 81](https://github.com/IntersectMBO/govtool/issues/81)

From 50514fac2daebe8468bf784321236570d4101237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Fri, 16 Feb 2024 14:33:28 +0100
Subject: [PATCH 54/82] add sole voter into IMAGES

---
 govtool/frontend/src/consts/images.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/govtool/frontend/src/consts/images.ts b/govtool/frontend/src/consts/images.ts
index b74b473ea..e178dbf93 100644
--- a/govtool/frontend/src/consts/images.ts
+++ b/govtool/frontend/src/consts/images.ts
@@ -4,6 +4,8 @@ export const IMAGES = {
   bgBlue: "/images/BGBlue.png",
   bgOrange: "/images/BGOrange.png",
   errorPageImage: "/images/ErrorPageImage.png",
+  heroImage: "/images/HeroImage.png",
+  soleVoterImage: "/images/GovActionsSoleVoter.png",
   govActionDefaultImage: "/images/GovActionDefault.png",
   govActionDelegateImage: "/images/GovActionDelegate.png",
   govActionListImage: "/images/GovActionList.png",

From 13317821fb2382ee9fd50f8d34c3fc8d82de1352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Mon, 19 Feb 2024 09:00:16 +0100
Subject: [PATCH 55/82] add retire as sole voter screen

---
 govtool/frontend/src/App.tsx                  |   2 +
 .../components/organisms/DashboardCards.tsx   |  43 ++++-
 govtool/frontend/src/consts/paths.ts          |  23 +--
 govtool/frontend/src/context/wallet.tsx       |  11 ++
 govtool/frontend/src/i18n/locales/en.ts       |  10 +-
 .../frontend/src/pages/RetireAsSoleVoter.tsx  | 180 ++++++++++++++++++
 govtool/frontend/src/pages/index.ts           |   5 +-
 7 files changed, 250 insertions(+), 24 deletions(-)
 create mode 100644 govtool/frontend/src/pages/RetireAsSoleVoter.tsx

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index d48e4d55a..a36a89f8f 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -21,6 +21,7 @@ import {
   UpdatedRepMetadata,
   GovernanceActionsCategory,
   DashboardGovernanceActionsCategory,
+  RetireAsSoleVoter,
 } from "@pages";
 import {
   callAll,
@@ -120,6 +121,7 @@ export default function App() {
           path={PATHS.registerAsSoleVoter}
           element={<RegisterAsSoleVoter />}
         />
+        <Route path={PATHS.retireAsSoleVoter} element={<RetireAsSoleVoter />} />
         <Route path={PATHS.stakeKeys} element={<ChooseStakeKey />} />
         <Route path={PATHS.updateMetadata} element={<UpdatedRepMetadata />} />
         <Route path="*" element={<ErrorPage />} />
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 7e3ae3721..953c11c4c 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -27,6 +27,7 @@ export const DashboardCards = () => {
     isPendingTransaction,
     registerTransaction,
     stakeKey,
+    soleVoter,
   } = useCardano();
   const navigate = useNavigate();
   const { currentDelegation, isCurrentDelegationLoading } =
@@ -271,12 +272,12 @@ export const DashboardCards = () => {
     </Box>
   ) : (
     <Box
+      columnGap={3}
       display="grid"
-      rowGap={3}
-      columnGap={4}
       gridTemplateColumns={screenWidth < 1024 ? "1fr" : "1fr 1fr"}
       px={screenWidth < 1024 ? 2 : screenWidth < 1440 ? 5 : 4}
       py={3}
+      rowGap={4}
     >
       {/* DELEGATION CARD */}
       <DashboardActionCard
@@ -400,18 +401,35 @@ export const DashboardCards = () => {
       {/* DREP CARD END*/}
       {/* SOLE VOTER CARD */}
       <DashboardActionCard
-        dataTestidFirstButton={"register-as-sole-voter-button"}
-        firstButtonVariant={"contained"}
-        secondButtonVariant={"outlined"}
+        dataTestidFirstButton={
+          soleVoter?.isRegistered
+            ? "retire-as-sole-voter-button"
+            : "register-as-sole-voter-button"
+        }
         dataTestidSecondButton={"learn-more-button"}
         description={
           <Trans
-            i18nKey="dashboard.cards.registerAsSoleVoterDescription"
-            values={{ votingPower }}
+            i18nKey={
+              soleVoter?.isRegistered
+                ? "dashboard.cards.youAreSoleVoterDescription"
+                : "dashboard.cards.registerAsSoleVoterDescription"
+            }
+            values={{ votingPower: correctAdaFormat(votingPower) }}
           />
         }
-        firstButtonAction={() => navigateTo(PATHS.registerAsSoleVoter)}
-        firstButtonLabel={t("dashboard.registration.register")}
+        firstButtonAction={() =>
+          navigateTo(
+            soleVoter?.isRegistered
+              ? PATHS.retireAsSoleVoter
+              : PATHS.registerAsSoleVoter
+          )
+        }
+        firstButtonLabel={t(
+          soleVoter?.isRegistered
+            ? "dashboard.cards.retire"
+            : "dashboard.registration.register"
+        )}
+        firstButtonVariant={soleVoter?.isRegistered ? "outlined" : "contained"}
         imageURL={IMAGES.soleVoterImage}
         secondButtonAction={() =>
           openInNewTab(
@@ -419,7 +437,12 @@ export const DashboardCards = () => {
           )
         }
         secondButtonLabel={t("learnMore")}
-        title={t("dashboard.cards.registerAsSoleVoterTitle")}
+        secondButtonVariant={"outlined"}
+        title={t(
+          soleVoter?.isRegistered
+            ? "dashboard.cards.youAreSoleVoterTitle"
+            : "dashboard.cards.registerAsSoleVoterTitle"
+        )}
       />
       {/* REGISTARTION AS SOLE VOTER CARD END*/}
       {/* GOV ACTIONS LIST CARD */}
diff --git a/govtool/frontend/src/consts/paths.ts b/govtool/frontend/src/consts/paths.ts
index 8af3a6381..4ac0cbde2 100644
--- a/govtool/frontend/src/consts/paths.ts
+++ b/govtool/frontend/src/consts/paths.ts
@@ -1,22 +1,23 @@
 export const PATHS = {
-  home: "/",
-  dashboard: "/dashboard",
-  error: "/error",
-  governance_actions: "/governance_actions",
-  governance_actions_category: "/governance_actions/category/:category",
-  governance_actions_category_action:
-    "/governance_actions/category/:category/:proposalId",
-  governance_actions_action: "/governance_actions/:proposalId",
-  dashboard_governance_actions: "/connected/governance_actions",
   dashboard_governance_actions_action:
     "/connected/governance_actions/:proposalId",
   dashboard_governance_actions_category:
     "/connected/governance_actions/category/:category",
-  guides: "/guides",
-  faqs: "/faqs",
+  dashboard_governance_actions: "/connected/governance_actions",
+  dashboard: "/dashboard",
   delegateTodRep: "/delegate",
+  error: "/error",
+  faqs: "/faqs",
+  governance_actions_action: "/governance_actions/:proposalId",
+  governance_actions_category_action:
+    "/governance_actions/category/:category/:proposalId",
+  governance_actions_category: "/governance_actions/category/:category",
+  governance_actions: "/governance_actions",
+  guides: "/guides",
+  home: "/",
   registerAsdRep: "/register",
   registerAsSoleVoter: "/register_sole_voter",
+  retireAsSoleVoter: "/retire_sole_voter",
   stakeKeys: "/stake_keys",
   updateMetadata: "/update_metadata",
 };
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 765e24226..925f3d418 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -100,6 +100,8 @@ interface CardanoContext {
   isEnableLoading: string | null;
   error?: string;
   dRep: DRepInfo | undefined;
+  soleVoter: DRepInfo | undefined;
+  setSoleVoter: (key: undefined | DRepInfo) => void;
   isEnabled: boolean;
   pubDRepKey: string;
   dRepID: string;
@@ -168,6 +170,11 @@ function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
   const [isEnableLoading, setIsEnableLoading] = useState<string | null>(null);
   const [dRep, setDRep] = useState<DRepInfo | undefined>(undefined);
+  const [soleVoter, setSoleVoter] = useState<DRepInfo | undefined>({
+    deposit: 4000000,
+    isRegistered: false,
+    wasRegistered: false,
+  });
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
   );
@@ -1147,6 +1154,8 @@ function CardanoProvider(props: Props) {
       isDrepLoading,
       setIsDrepLoading,
       isEnableLoading,
+      soleVoter,
+      setSoleVoter,
     }),
     [
       address,
@@ -1180,6 +1189,8 @@ function CardanoProvider(props: Props) {
       isDrepLoading,
       setIsDrepLoading,
       isEnableLoading,
+      soleVoter,
+      setSoleVoter,
     ]
   );
 
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index ed247a1e1..bcdea545c 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -73,9 +73,13 @@ export const en = {
         view: "View governance actions",
       },
       cards: {
+        retire: "Retire",
+        youAreSoleVoterTitle: "You are a Sole Voter",
+        youAreSoleVoterDescription:
+          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
         registerAsSoleVoterTitle: "Become a Sole Voter",
         registerAsSoleVoterDescription:
-          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>",
+          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
       },
       registration: {
         changeMetadata: "Change metadata",
@@ -292,11 +296,15 @@ export const en = {
       viewAll: "View all",
     },
     soleVoter: {
+      retireSoleVoter: "Retire as a Sole Voter",
       becomeSoleVoter: "Become a Sole Voter",
       continueToRegister: "Continue to register",
       description:
         "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳2</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
       heading: "What this Means",
+      retirementHeading: "What Retirement Means",
+      retirementDescription:
+        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of <strong>{{deposit}} ADA</strong> will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\n<0>These options are listed in our Guides here:</0> <1>Voting options and Roles</1>",
     },
     system: {
       sanchoNet: "SanchoNet",
diff --git a/govtool/frontend/src/pages/RetireAsSoleVoter.tsx b/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
new file mode 100644
index 000000000..830f4ffd5
--- /dev/null
+++ b/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
@@ -0,0 +1,180 @@
+import { useCallback, useEffect, useMemo } from "react";
+import { useNavigate } from "react-router-dom";
+import { Trans } from "react-i18next";
+import { Box, Link } from "@mui/material";
+import ArrowBackIosIcon from "@mui/icons-material/ArrowBackIos";
+
+import { Background, Button, Typography } from "@atoms";
+import { useCardano } from "@context";
+import { ICONS, PATHS } from "@consts";
+import { useScreenDimension, useTranslation } from "@hooks";
+import { DashboardTopNav, Footer } from "@organisms";
+import {
+  WALLET_LS_KEY,
+  correctAdaFormat,
+  getItemFromLocalStorage,
+  openInNewTab,
+} from "@utils";
+import { theme } from "@/theme";
+
+export const RetireAsSoleVoter = () => {
+  const {
+    palette: { boxShadow2 },
+  } = theme;
+  const { isMobile, screenWidth } = useScreenDimension();
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+  const { soleVoter } = useCardano();
+
+  const navigateToDashboard = useCallback(
+    () => navigate(PATHS.dashboard),
+    [navigate]
+  );
+
+  useEffect(() => {
+    if (
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`) ||
+      !soleVoter?.isRegistered
+    ) {
+      navigate(PATHS.home);
+    }
+  }, []);
+
+  const renderBackButton = useMemo(() => {
+    return (
+      <Button
+        data-testid="back-button"
+        onClick={navigateToDashboard}
+        size="extraLarge"
+        sx={{
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+        }}
+        variant="outlined"
+      >
+        {t("cancel")}
+      </Button>
+    );
+  }, [isMobile, navigateToDashboard]);
+
+  const renderRegisterButton = useMemo(() => {
+    return (
+      <Button
+        data-testid="retire-button"
+        onClick={() => {}}
+        size="extraLarge"
+        sx={{
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+        }}
+        variant="contained"
+      >
+        {t("continue")}
+      </Button>
+    );
+  }, [isMobile]);
+
+  return (
+    <Background isReverted>
+      <Box display="flex" flexDirection="column" minHeight="100vh">
+        <DashboardTopNav
+          imageHeight={isMobile ? 24 : 35}
+          imageSRC={ICONS.appLogoIcon}
+          imageWidth={isMobile ? undefined : 42}
+          title={t("soleVoter.retireSoleVoter")}
+        />
+
+        <Box
+          height={isMobile ? "100%" : "auto"}
+          mt={isMobile ? 0 : 7}
+          sx={{
+            alignItems: screenWidth >= 768 ? "center" : "inherit",
+            marginTop: screenWidth < 1440 ? "97px" : "153px",
+            display: screenWidth < 1440 ? "flex" : "grid",
+            ...(screenWidth < 1440 && {
+              flexDirection: "column",
+            }),
+            ...(screenWidth >= 1440 && { gridTemplateColumns: "1fr auto 1fr" }),
+          }}
+        >
+          {isMobile && (
+            <Box borderColor="white" borderBottom={1}>
+              <Typography
+                variant="title1"
+                sx={{
+                  ml: 2,
+                  my: 3.25,
+                }}
+              >
+                {t("soleVoter.retireSoleVoter")}
+              </Typography>
+            </Box>
+          )}
+          <Link
+            data-testid="back-to-list-link"
+            sx={{
+              alignItems: "center",
+              alignSelf: "flex-start",
+              cursor: "pointer",
+              display: "flex",
+              justifyContent: "flex-start",
+              marginBottom: 3,
+              ml: screenWidth < 1440 ? 2 : 5,
+              mt: screenWidth < 1440 ? 3 : "none",
+              textDecoration: "none",
+            }}
+            onClick={navigateToDashboard}
+          >
+            <ArrowBackIosIcon sx={{ fontSize: 14 }} />
+            <Typography color="primary" fontWeight={400} variant="body2">
+              {t("backToDashboard")}
+            </Typography>
+          </Link>
+          <Box
+            borderRadius="20px"
+            boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
+            height="auto"
+            maxWidth={screenWidth > 768 ? 600 : undefined}
+            px={isMobile ? 2 : 18.75}
+            py={isMobile ? 6.25 : 10}
+          >
+            <Box display="flex" flexDirection="column">
+              <Typography sx={{ textAlign: "center" }} variant="headline4">
+                {t("soleVoter.retirementHeading")}
+              </Typography>
+              <Typography
+                fontWeight={400}
+                sx={{ py: 5, textAlign: "center", whiteSpace: "pre-line" }}
+                variant="body1"
+              >
+                <Trans
+                  components={[
+                    <Typography fontWeight={500} key={0} variant="body1" />,
+                    <Link
+                      key="1"
+                      onClick={() => openInNewTab("https://sancho.network/")}
+                      sx={{ cursor: "pointer" }}
+                    />,
+                  ]}
+                  i18nKey={"soleVoter.retirementDescription"}
+                  values={{ deposit: correctAdaFormat(soleVoter?.deposit) }}
+                />
+              </Typography>
+            </Box>
+            <Box
+              display="flex"
+              flexDirection={isMobile ? "column" : "row"}
+              justifyContent="space-between"
+            >
+              {isMobile ? renderRegisterButton : renderBackButton}
+              <Box px={2} py={isMobile ? 1.5 : 0} />
+              {isMobile ? renderBackButton : renderRegisterButton}
+            </Box>
+          </Box>
+          {isMobile && <Footer />}
+        </Box>
+      </Box>
+    </Background>
+  );
+};
diff --git a/govtool/frontend/src/pages/index.ts b/govtool/frontend/src/pages/index.ts
index e6cdcc6de..c2f422300 100644
--- a/govtool/frontend/src/pages/index.ts
+++ b/govtool/frontend/src/pages/index.ts
@@ -1,11 +1,12 @@
 export * from "./ChooseStakeKey";
 export * from "./Dashboard";
+export * from "./DashboardGovernanceActionsCategory";
 export * from "./DelegateTodRep";
+export * from "./ErrorPage";
 export * from "./GovernanceActionDetails";
 export * from "./GovernanceActions";
 export * from "./GovernanceActionsCategory";
-export * from "./DashboardGovernanceActionsCategory";
 export * from "./Home";
 export * from "./RegisterAsdRep";
+export * from "./RetireAsSoleVoter";
 export * from "./UpdatedRepMetadata";
-export * from "./ErrorPage";

From 82077a9708f303d89ac783355b28914e723eb9ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Mon, 19 Feb 2024 09:03:10 +0100
Subject: [PATCH 56/82] add retirement to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6830148d4..9c094e85f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
 ## [Unreleased]
+- Add retire as Sole Voter screen [Issue 198](https://github.com/IntersectMBO/govtool/issues/198)
 - Add Sole Voter card [Issue 141](https://github.com/IntersectMBO/govtool/issues/141)
 - Create DRep registration page about roles [Issue 205](https://github.com/IntersectMBO/govtool/issues/205)
 - Create Checkbox component. Improve Field and ControlledField [Issue 177](https://github.com/IntersectMBO/govtool/pull/177)

From cf3a1117bf39e8811fcf27f4d36adbfc8d0fdca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Mon, 19 Feb 2024 11:34:05 +0100
Subject: [PATCH 57/82] update home cards

---
 .../src/components/molecules/ActionCard.tsx   |  1 -
 .../components/organisms/DashboardCards.tsx   |  4 +-
 .../src/components/organisms/Hero.tsx         | 34 ++++++-
 .../src/components/organisms/HomeCards.tsx    | 93 ++++++++++++++-----
 govtool/frontend/src/i18n/locales/en.ts       | 28 +++++-
 govtool/frontend/src/pages/Home.tsx           |  8 +-
 6 files changed, 134 insertions(+), 34 deletions(-)

diff --git a/govtool/frontend/src/components/molecules/ActionCard.tsx b/govtool/frontend/src/components/molecules/ActionCard.tsx
index 63fc9eb03..3418c6471 100644
--- a/govtool/frontend/src/components/molecules/ActionCard.tsx
+++ b/govtool/frontend/src/components/molecules/ActionCard.tsx
@@ -94,7 +94,6 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
           <Button
             data-testid={dataTestIdFirstButton}
             onClick={firstButtonAction}
-            size="large"
             sx={{
               width: MOBILE_AND_WIDE_CONDITION ? "100%" : "auto",
             }}
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 953c11c4c..49ae2df2c 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -406,7 +406,9 @@ export const DashboardCards = () => {
             ? "retire-as-sole-voter-button"
             : "register-as-sole-voter-button"
         }
-        dataTestidSecondButton={"learn-more-button"}
+        firstButtonVariant="contained"
+        secondButtonVariant="outlined"
+        dataTestidSecondButton="learn-more-button"
         description={
           <Trans
             i18nKey={
diff --git a/govtool/frontend/src/components/organisms/Hero.tsx b/govtool/frontend/src/components/organisms/Hero.tsx
index 4854f84bc..497f230e0 100644
--- a/govtool/frontend/src/components/organisms/Hero.tsx
+++ b/govtool/frontend/src/components/organisms/Hero.tsx
@@ -1,10 +1,13 @@
-import { Box } from "@mui/material";
+import { useCallback } from "react";
 import { useNavigate } from "react-router-dom";
+import { Trans } from "react-i18next";
+import { Box, Link } from "@mui/material";
 
 import { Button, Typography } from "@atoms";
 import { IMAGES, PATHS } from "@consts";
 import { useCardano, useModal } from "@context";
 import { useScreenDimension, useTranslation } from "@hooks";
+import { openInNewTab } from "@utils";
 
 export const Hero = () => {
   const { isEnabled } = useCardano();
@@ -23,6 +26,12 @@ export const Hero = () => {
       ? 600
       : 720;
 
+  const onClickVotingPower = useCallback(
+    () =>
+      openInNewTab("https://docs.sanchogov.tools/faqs/what-is-voting-power"),
+    []
+  );
+
   return (
     <Box
       alignItems="center"
@@ -44,10 +53,29 @@ export const Hero = () => {
         </Typography>
         <Typography
           fontWeight={400}
-          sx={{ my: 4, ...(isMobile ? {} : { whiteSpace: "pre-line" }) }}
+          sx={{
+            maxWidth: 630,
+            my: 4,
+            ...(isMobile ? {} : { whiteSpace: "pre-line" }),
+          }}
           variant={isMobile ? "body2" : "title2"}
         >
-          {t("hero.description")}
+          <Trans
+            i18nKey={
+              screenWidth < 1024
+                ? "hero.description.mobile"
+                : "hero.description.wide"
+            }
+            components={[
+              <Link
+                data-testid="voting-power-link"
+                onClick={onClickVotingPower}
+                sx={{
+                  cursor: "pointer",
+                }}
+              ></Link>,
+            ]}
+          ></Trans>
         </Typography>
         <Button
           data-testid="hero-connect-wallet-button"
diff --git a/govtool/frontend/src/components/organisms/HomeCards.tsx b/govtool/frontend/src/components/organisms/HomeCards.tsx
index 66593a0ba..d8ca35a92 100644
--- a/govtool/frontend/src/components/organisms/HomeCards.tsx
+++ b/govtool/frontend/src/components/organisms/HomeCards.tsx
@@ -6,6 +6,7 @@ import { useModal } from "@context";
 import { ActionCard } from "@molecules";
 import { useScreenDimension, useTranslation } from "@hooks";
 import { openInNewTab } from "@utils";
+import { useCallback } from "react";
 
 export const HomeCards = () => {
   const navigate = useNavigate();
@@ -13,6 +14,36 @@ export const HomeCards = () => {
   const { isMobile, screenWidth } = useScreenDimension();
   const { t } = useTranslation();
 
+  const openWalletModal = useCallback(() => {
+    openModal({ type: "chooseWallet" });
+  }, [openModal]);
+
+  const onClickLearnMoreAboutDelegation = useCallback(
+    () =>
+      openInNewTab(
+        "https://docs.sanchogov.tools/faqs/ways-to-use-your-voting-power"
+      ),
+    []
+  );
+
+  const onClickLearnMoreAboutDRepRegistration = useCallback(
+    () =>
+      openInNewTab(
+        "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
+      ),
+    []
+  );
+
+  const onClickLearnMoreAboutSoleVoterRegistration = useCallback(
+    () => openInNewTab("https://www.google.com"),
+    []
+  );
+
+  const navigateToGovActions = useCallback(
+    () => navigate(PATHS.governance_actions),
+    [navigate]
+  );
+
   return (
     <Box
       columnGap={12}
@@ -35,60 +66,78 @@ export const HomeCards = () => {
         width={!isMobile && screenWidth < 1920 ? "90%" : "auto"}
         display="flex"
       >
+        {/* DELEGATE CARD */}
         <ActionCard
           dataTestIdFirstButton="delegate-connect-wallet-button"
           dataTestIdSecondButton="delegate-learn-more-button"
-          description={t("dashboard.delegation.description")}
-          firstButtonAction={() => openModal({ type: "chooseWallet" })}
-          firstButtonLabel={t("dashboard.delegation.connectToDelegate")}
+          description={t("home.cards.delegateDescription")}
+          firstButtonAction={openWalletModal}
+          firstButtonLabel={t("home.cards.delegateFirstButtonLabel")}
           imageHeight={80}
           imageURL={IMAGES.govActionDelegateImage}
           imageWidth={115}
-          secondButtonAction={() =>
-            openInNewTab(
-              "https://docs.sanchogov.tools/faqs/ways-to-use-your-voting-power"
-            )
-          }
+          secondButtonAction={onClickLearnMoreAboutDelegation}
           secondButtonLabel={t("learnMore")}
-          title={t("dashboard.delegation.useYourVotingPower")}
+          title={t("home.cards.delegateTitle")}
         />
+        {/* DELEGATE CARD END*/}
       </Box>
       <Box
         display="flex"
         width={!isMobile && screenWidth < 1920 ? "90%" : "auto"}
       >
+        {/* REGISTER AS DREP CARD */}
         <ActionCard
           dataTestIdFirstButton="register-connect-wallet-button"
           dataTestIdSecondButton="register-learn-more-button"
-          description={t("dashboard.registration.description")}
-          firstButtonAction={() => openModal({ type: "chooseWallet" })}
-          firstButtonLabel={t("dashboard.registration.connectToRegister")}
+          description={t("home.cards.registerAsDRepDescription")}
+          firstButtonAction={openWalletModal}
+          firstButtonLabel={t("home.cards.registerAsDRepFirstButtonLabel")}
           imageHeight={80}
           imageURL={IMAGES.govActionRegisterImage}
           imageWidth={70}
-          secondButtonAction={() =>
-            openInNewTab(
-              "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
-            )
-          }
+          secondButtonAction={onClickLearnMoreAboutDRepRegistration}
+          secondButtonLabel={t("learnMore")}
+          title={t("home.cards.registerAsDRepTitle")}
+        />
+        {/* REGISTER AS DREP CARD END */}
+      </Box>
+      <Box
+        display="flex"
+        width={!isMobile && screenWidth < 1920 ? "90%" : "auto"}
+      >
+        {/* REGISTER AS SOLE VOTER CARD */}
+        <ActionCard
+          dataTestIdFirstButton="register-as-sole-voter-button"
+          dataTestIdSecondButton="lear-more-about-sole-voter-button"
+          description={t("home.cards.registerAsSoleVoterDescription")}
+          firstButtonAction={openWalletModal}
+          firstButtonLabel={t("home.cards.registerAsSoleVoterFirstButtonLabel")}
+          imageHeight={84}
+          imageURL={IMAGES.soleVoterImage}
+          imageWidth={84}
+          secondButtonAction={onClickLearnMoreAboutSoleVoterRegistration}
           secondButtonLabel={t("learnMore")}
-          title={t("dashboard.registration.registerAsDRep")}
+          title={t("home.cards.registerAsSoleVoterTitle")}
         />
+        {/* REGISTER AS SOLE VOTER CARD END */}
       </Box>
       <Box
         display="flex"
         width={!isMobile && screenWidth < 1920 ? "90%" : "auto"}
       >
+        {/* GOV ACTIONS CARD */}
         <ActionCard
           dataTestIdFirstButton="move-to-governance-actions-button"
-          description={t("dashboard.govActions.description")}
-          firstButtonAction={() => navigate(PATHS.governance_actions)}
-          firstButtonLabel={t("dashboard.govActions.view")}
+          description={t("home.cards.governaneActionsDescription")}
+          firstButtonAction={navigateToGovActions}
+          firstButtonLabel={t("home.cards.governanceActionsFirstButtonLabel")}
           imageHeight={80}
           imageURL={IMAGES.govActionListImage}
           imageWidth={80}
-          title={t("dashboard.govActions.title")}
+          title={t("home.cards.governaneActionsTitle")}
         />
+        {/* GOV ACTIONS CARD */}
       </Box>
     </Box>
   );
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index bcdea545c..b1d413e2e 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -106,6 +106,25 @@ export const en = {
         youAreRegistered: "You are Registered as a DRep",
       },
     },
+    home: {
+      cards: {
+        delegateDescription: "Find a DRep to vote on your behalf.",
+        delegateFirstButtonLabel: "View DRep Direcotry",
+        delegateTitle: "Delegate your Voting Power",
+        governaneActionsDescription:
+          "See all the Governance Actions submitted on chain. ",
+        governanceActionsFirstButtonLabel: "View Governance Actions",
+        governaneActionsTitle: "View Governance Actions",
+        registerAsDRepDescription:
+          "Accept delegated voting power from other ADA holders, and combine it with your own voting power. Vote with the accumulated Power on  Governance Actions.",
+        registerAsDRepFirstButtonLabel: "Connect to Register",
+        registerAsDRepTitle: "Become a DRep",
+        registerAsSoleVoterDescription:
+          "Vote on Governance Actions using your own voting power",
+        registerAsSoleVoterFirstButtonLabel: "Connect to Register",
+        registerAsSoleVoterTitle: "Become a Sole Voter",
+      },
+    },
     delegation: {
       description:
         "You can delegate your voting power to a DRep or to a pre-defined voting option.",
@@ -220,8 +239,11 @@ export const en = {
     },
     hero: {
       connectWallet: "Connect your wallet",
-      description:
-        "Interact with SanchoNet using GovTool - a friendly user\ninterface connected to SanchoNet. You can delegate\nyour voting power (tAda) or become a SanchoNet DRep\nto allow people to delegate voting power to you.",
+      description: {
+        mobile:
+          "You can either delegate your voting power or become a DRep to allow people to delegate voting power to you.",
+        wide: "Anyone with a wallet containing ADA can participate in governance on Sanchonet.\n\nYour ADA balance entitles you to an equal amount of Voting Power.\n\nFor more info see the guide entry for <0>Voting Power</0>.",
+      },
       headline: "SanchoNet \n Governance Tool",
     },
     menu: {
@@ -362,7 +384,7 @@ export const en = {
         "Can’t see your wallet? Check what wallets are currently compatible with GovTool ",
       chooseWallet: "Choose the wallet you want to connect with:",
       connect: "Connect",
-      connectWallet: "Connect wallet",
+      connectWallet: "Connect Wallet",
       connectYourWallet: "Connect your Wallet",
       connectYourWalletButton: "Connect your wallet",
       connectedWallet: "Connected Wallet:",
diff --git a/govtool/frontend/src/pages/Home.tsx b/govtool/frontend/src/pages/Home.tsx
index 6ca5689f2..25942471c 100644
--- a/govtool/frontend/src/pages/Home.tsx
+++ b/govtool/frontend/src/pages/Home.tsx
@@ -1,12 +1,12 @@
 import { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
+import { Box } from "@mui/material";
 
 import { Background } from "@atoms";
-import { Box } from "@mui/material";
-import { TopNav, Hero, Footer, HomeCards } from "@organisms";
+import { PATHS } from "@consts";
 import { useCardano } from "@context";
-import { PATHS } from "@/consts";
-import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
+import { TopNav, Hero, Footer, HomeCards } from "@organisms";
+import { WALLET_LS_KEY, getItemFromLocalStorage } from "@utils";
 
 export const Home = () => {
   const { isEnabled } = useCardano();

From 2336e458263114b1990cf6591c51099ff27970fb Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Tue, 20 Feb 2024 11:44:03 +0100
Subject: [PATCH 58/82] Sole Voter transactions added and UI components
 unification

---
 .../frontend/public/icons/ArrowLeftThin.svg   |   5 +
 .../components/molecules/BottomBoxButtons.tsx |  75 ++++++++
 .../molecules/CenteredBoxPageWrapper.tsx      | 108 +++++++++++
 .../src/components/molecules/index.ts         |   2 +
 .../components/organisms/DashboardCards.tsx   |  23 ++-
 .../components/organisms/DashboardTopNav.tsx  |   5 +-
 .../organisms/RegisterAsSoleVoterBox.tsx      |  76 ++++++++
 .../RegisterAsSoleVoterBoxContent.tsx         |  48 +++++
 .../organisms/RetireAsSoleVoterBox.tsx        |  86 +++++++++
 .../organisms/RetireAsSoleVoterBoxContent.tsx |  43 +++++
 .../components/organisms/SoleVoterInfo.tsx    | 108 -----------
 .../src/components/organisms/index.ts         |   7 +-
 govtool/frontend/src/consts/icons.ts          |   1 +
 govtool/frontend/src/context/wallet.tsx       | 112 ++++++++++-
 govtool/frontend/src/context/walletUtils.ts   |   2 +-
 govtool/frontend/src/i18n/locales/en.ts       |  76 ++++----
 .../src/pages/RegisterAsSoleVoter.tsx         | 103 ++--------
 .../frontend/src/pages/RetireAsSoleVoter.tsx  | 178 ++----------------
 govtool/frontend/src/utils/localStorage.ts    |   2 +
 19 files changed, 649 insertions(+), 411 deletions(-)
 create mode 100644 govtool/frontend/public/icons/ArrowLeftThin.svg
 create mode 100644 govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
 create mode 100644 govtool/frontend/src/components/molecules/CenteredBoxPageWrapper.tsx
 create mode 100644 govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
 create mode 100644 govtool/frontend/src/components/organisms/RegisterAsSoleVoterBoxContent.tsx
 create mode 100644 govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
 create mode 100644 govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
 delete mode 100644 govtool/frontend/src/components/organisms/SoleVoterInfo.tsx

diff --git a/govtool/frontend/public/icons/ArrowLeftThin.svg b/govtool/frontend/public/icons/ArrowLeftThin.svg
new file mode 100644
index 000000000..38c648693
--- /dev/null
+++ b/govtool/frontend/public/icons/ArrowLeftThin.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="chevron-left">
+<path id="Vector" d="M12.5 15L7.5 10L12.5 5" stroke="#0033AD" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx b/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
new file mode 100644
index 000000000..c54a6627c
--- /dev/null
+++ b/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
@@ -0,0 +1,75 @@
+import { useMemo } from "react";
+import { Box } from "@mui/material";
+
+import { Button, LoadingButton } from "@atoms";
+import { useScreenDimension, useTranslation } from "@hooks";
+
+interface Props {
+  leftButtonAction: () => void;
+  rightButtonAction: () => void;
+  rightButtonIsLoading?: boolean;
+  leftButtonText?: string;
+  rightButtonText?: string;
+}
+
+export const BottomBoxButtons = ({
+  leftButtonAction,
+  rightButtonAction,
+  rightButtonIsLoading,
+  leftButtonText,
+  rightButtonText,
+}: Props) => {
+  const { isMobile } = useScreenDimension();
+  const { t } = useTranslation();
+
+  const renderBackButton = useMemo(() => {
+    return (
+      <Button
+        data-testid={"back-button"}
+        onClick={leftButtonAction}
+        size="extraLarge"
+        sx={{
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+        }}
+        variant="outlined"
+      >
+        {leftButtonText ?? t("cancel")}
+      </Button>
+    );
+  }, [isMobile]);
+
+  const renderRegisterButton = useMemo(() => {
+    return (
+      <LoadingButton
+        data-testid={"register-button"}
+        isLoading={rightButtonIsLoading}
+        onClick={rightButtonAction}
+        sx={{
+          borderRadius: 50,
+          textTransform: "none",
+          px: 6,
+          width: isMobile ? "100%" : "auto",
+          height: 48,
+          fontSize: 16,
+        }}
+        variant="contained"
+      >
+        {rightButtonText ?? t("continue")}
+      </LoadingButton>
+    );
+  }, [rightButtonIsLoading, isMobile]);
+
+  return (
+    <Box
+      display="flex"
+      flexDirection={isMobile ? "column" : "row"}
+      justifyContent="space-around"
+      mt={6}
+    >
+      {isMobile ? renderRegisterButton : renderBackButton}
+      <Box px={2} py={isMobile ? 1.5 : 0} />
+      {isMobile ? renderBackButton : renderRegisterButton}
+    </Box>
+  );
+};
diff --git a/govtool/frontend/src/components/molecules/CenteredBoxPageWrapper.tsx b/govtool/frontend/src/components/molecules/CenteredBoxPageWrapper.tsx
new file mode 100644
index 000000000..dc9cbe0da
--- /dev/null
+++ b/govtool/frontend/src/components/molecules/CenteredBoxPageWrapper.tsx
@@ -0,0 +1,108 @@
+import { FC, PropsWithChildren } from "react";
+import { Box, Link } from "@mui/material";
+
+import { Background, Typography } from "@atoms";
+import { ICONS } from "@consts";
+import { DashboardTopNav } from "@organisms";
+import { useScreenDimension } from "@hooks";
+import { useNavigate } from "react-router-dom";
+import { theme } from "@/theme";
+
+interface Props {
+  pageTitle: string;
+  backButtonText: string;
+  backButtonPath: string;
+  isVotingPowerHidden?: boolean;
+}
+export const CenteredBoxPageWrapper: FC<PropsWithChildren<Props>> = ({
+  pageTitle,
+  backButtonText,
+  backButtonPath,
+  isVotingPowerHidden,
+  children,
+}) => {
+  const { isMobile, screenWidth, pagePadding } = useScreenDimension();
+  const navigate = useNavigate();
+  const {
+    palette: { boxShadow2 },
+  } = theme;
+
+  return (
+    <Background isReverted>
+      <Box display={"flex"} minHeight={"100vh"} flexDirection="column">
+        <DashboardTopNav
+          imageSRC={ICONS.appLogoIcon}
+          imageWidth={isMobile ? undefined : 42}
+          imageHeight={isMobile ? 24 : 35}
+          title={pageTitle}
+          isVotingPowerHidden={isVotingPowerHidden}
+        />
+        <Box
+          display={"flex"}
+          justifyContent={"center"}
+          flexDirection={"column"}
+          mt={isMobile ? 0 : 7}
+          height={isMobile ? "100%" : "auto"}
+          sx={{ marginTop: "97px" }}
+        >
+          {isMobile && (
+            <Box borderBottom={1} borderColor={"#fff"}>
+              <Typography
+                variant="body2"
+                sx={{
+                  ml: 2,
+                  my: "26px",
+                  fontSize: "24px",
+                  fontWeight: 400,
+                }}
+              >
+                {pageTitle}
+              </Typography>
+            </Box>
+          )}
+          <Link
+            data-testid={"back-button"}
+            sx={{
+              cursor: "pointer",
+              display: "flex",
+              textDecoration: "none",
+              my: 3,
+              marginLeft: isMobile ? 2 : "40px",
+            }}
+            onClick={() => navigate(backButtonPath)}
+          >
+            <img
+              src={ICONS.arrowLeftThinIcon}
+              alt="arrow"
+              style={{ marginRight: "4px" }}
+            />
+            <Typography
+              variant="body2"
+              color="primary"
+              sx={{
+                fontWeight: 400,
+                paddingTop: "1px",
+              }}
+            >
+              {backButtonText}
+            </Typography>
+          </Link>
+          <Box display={"flex"} justifyContent={"center"}>
+            <Box
+              width={screenWidth < 768 ? "auto" : "52vw"}
+              boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
+              px={pagePadding}
+              py={isMobile ? 3 : 8}
+              borderRadius={"20px"}
+              height="auto"
+            >
+              <Box display="flex" flexDirection="column">
+                {children}
+              </Box>
+            </Box>
+          </Box>
+        </Box>
+      </Box>
+    </Background>
+  );
+};
diff --git a/govtool/frontend/src/components/molecules/index.ts b/govtool/frontend/src/components/molecules/index.ts
index 4fc87340a..cb5e9115b 100644
--- a/govtool/frontend/src/components/molecules/index.ts
+++ b/govtool/frontend/src/components/molecules/index.ts
@@ -1,4 +1,6 @@
 export * from "./ActionCard";
+export * from "./BottomBoxButtons";
+export * from "./CenteredBoxPageWrapper";
 export * from "./DashboardActionCard";
 export * from "./DataActionsBar";
 export * from "./DRepInfoCard";
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 49ae2df2c..e78353ccb 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -1,3 +1,4 @@
+import { useCallback, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { Box, CircularProgress } from "@mui/material";
 import { Trans } from "react-i18next";
@@ -11,7 +12,6 @@ import {
   useTranslation,
 } from "@hooks";
 import { DashboardActionCard } from "@molecules";
-import { useCallback, useMemo, useState } from "react";
 import { correctAdaFormat, formHexToBech32, openInNewTab } from "@utils";
 
 export const DashboardCards = () => {
@@ -26,6 +26,7 @@ export const DashboardCards = () => {
     isDrepLoading,
     isPendingTransaction,
     registerTransaction,
+    soleVoterTransaction,
     stakeKey,
     soleVoter,
   } = useCardano();
@@ -413,8 +414,8 @@ export const DashboardCards = () => {
           <Trans
             i18nKey={
               soleVoter?.isRegistered
-                ? "dashboard.cards.youAreSoleVoterDescription"
-                : "dashboard.cards.registerAsSoleVoterDescription"
+                ? "dashboard.soleVoter.youAreSoleVoterDescription"
+                : "dashboard.soleVoter.registerAsSoleVoterDescription"
             }
             values={{ votingPower: correctAdaFormat(votingPower) }}
           />
@@ -428,10 +429,18 @@ export const DashboardCards = () => {
         }
         firstButtonLabel={t(
           soleVoter?.isRegistered
-            ? "dashboard.cards.retire"
-            : "dashboard.registration.register"
+            ? "dashboard.soleVoter.retire"
+            : "dashboard.soleVoter.register"
         )}
         firstButtonVariant={soleVoter?.isRegistered ? "outlined" : "contained"}
+        secondButtonVariant={
+          soleVoterTransaction?.transactionHash
+            ? "outlined"
+            : soleVoter?.isRegistered
+            ? "text"
+            : "outlined"
+        }
+        inProgress={!!soleVoterTransaction?.transactionHash}
         imageURL={IMAGES.soleVoterImage}
         secondButtonAction={() =>
           openInNewTab(
@@ -442,8 +451,8 @@ export const DashboardCards = () => {
         secondButtonVariant={"outlined"}
         title={t(
           soleVoter?.isRegistered
-            ? "dashboard.cards.youAreSoleVoterTitle"
-            : "dashboard.cards.registerAsSoleVoterTitle"
+            ? "dashboard.soleVoter.youAreSoleVoterTitle"
+            : "dashboard.soleVoter.registerAsSoleVoterTitle"
         )}
       />
       {/* REGISTARTION AS SOLE VOTER CARD END*/}
diff --git a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
index 5bf0a3be4..b02a4c2ae 100644
--- a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
@@ -15,6 +15,7 @@ type DashboardTopNavProps = {
   imageHeight?: number;
   title: string;
   isDrawer?: boolean;
+  isVotingPowerHidden?: boolean;
 };
 
 const DRAWER_PADDING = 2;
@@ -25,6 +26,7 @@ export const DashboardTopNav = ({
   imageSRC,
   imageWidth,
   imageHeight,
+  isVotingPowerHidden,
 }: DashboardTopNavProps) => {
   const { isMobile, screenWidth } = useScreenDimension();
   const { dRep } = useCardano();
@@ -47,6 +49,7 @@ export const DashboardTopNav = ({
       zIndex={100}
       flex={1}
       width={"fill-available"}
+      height={"48px"}
     >
       <Box display={"flex"}>
         {imageSRC ? (
@@ -66,7 +69,7 @@ export const DashboardTopNav = ({
         ) : null}
       </Box>
       <Box display="flex">
-        <VotingPowerChips />
+        {!isVotingPowerHidden && <VotingPowerChips />}
         {isMobile && (
           <IconButton
             data-testid={"open-drawer-button"}
diff --git a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
new file mode 100644
index 000000000..4034e6f01
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
@@ -0,0 +1,76 @@
+import { useCallback, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+
+import { PATHS } from "@consts";
+import { RegisterAsSoleVoterBoxContent } from "@organisms";
+import { BottomBoxButtons } from "@molecules";
+import { useCardano, useModal } from "@context";
+
+export const RegisterAsSoleVoterBox = () => {
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  const { buildSignSubmitConwayCertTx, buildDRepRegCert } = useCardano();
+  const navigate = useNavigate();
+  const { openModal, closeModal } = useModal();
+  const { t } = useTranslation();
+
+  const onRegister = useCallback(async () => {
+    setIsLoading(true);
+
+    try {
+      const certBuilder = await buildDRepRegCert();
+      const result = await buildSignSubmitConwayCertTx({
+        certBuilder,
+        type: "soleVoterRegistration",
+        registrationType: "registration",
+      });
+      if (result)
+        openModal({
+          type: "statusModal",
+          state: {
+            status: "success",
+            title: t("modals.registration.title"),
+            message: t("modals.registration.message"),
+            link: "https://adanordic.com/latest_transactions",
+            buttonText: t("modals.common.goToDashboard"),
+            onSubmit: () => {
+              navigate(PATHS.dashboard);
+              closeModal();
+            },
+            dataTestId: "registration-transaction-submitted-modal",
+          },
+        });
+    } catch (e: any) {
+      const errorMessage = e.info ? e.info : e;
+
+      openModal({
+        type: "statusModal",
+        state: {
+          status: "warning",
+          title: t("modals.common.oops"),
+          message: errorMessage,
+          buttonText: t("modals.common.goToDashboard"),
+          onSubmit: () => {
+            navigate(PATHS.dashboard);
+            closeModal();
+          },
+          dataTestId: "registration-transaction-error-modal",
+        },
+      });
+    } finally {
+      setIsLoading(false);
+    }
+  }, [buildSignSubmitConwayCertTx, buildDRepRegCert, openModal]);
+
+  return (
+    <>
+      <RegisterAsSoleVoterBoxContent />
+      <BottomBoxButtons
+        leftButtonAction={() => navigate(PATHS.dashboard)}
+        rightButtonAction={onRegister}
+        rightButtonIsLoading={isLoading}
+      />
+    </>
+  );
+};
diff --git a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBoxContent.tsx
new file mode 100644
index 000000000..9308da9f5
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBoxContent.tsx
@@ -0,0 +1,48 @@
+import { Link } from "@mui/material";
+import { Trans } from "react-i18next";
+
+import { Typography } from "@atoms";
+import { useScreenDimension, useTranslation } from "@hooks";
+import {
+  PROTOCOL_PARAMS_KEY,
+  correctAdaFormat,
+  getItemFromLocalStorage,
+  openInNewTab,
+} from "@utils";
+
+export const RegisterAsSoleVoterBoxContent = () => {
+  const { isMobile } = useScreenDimension();
+  const { t } = useTranslation();
+
+  const epochParams = getItemFromLocalStorage(PROTOCOL_PARAMS_KEY);
+
+  return (
+    <>
+      <Typography sx={{ mt: 1, textAlign: "center" }} variant="headline4">
+        {t("soleVoter.registerHeading")}
+      </Typography>
+      <Typography
+        fontWeight={400}
+        sx={{
+          mb: 7,
+          mt: isMobile ? 4 : 10,
+          textAlign: "center",
+          whiteSpace: "pre-line",
+        }}
+        variant="body1"
+      >
+        <Trans
+          i18nKey="soleVoter.registerDescription"
+          values={{ deposit: correctAdaFormat(epochParams.drep_deposit) }}
+          components={[
+            <Link
+              onClick={() => openInNewTab("https://sancho.network/")}
+              sx={{ cursor: "pointer" }}
+              key="0"
+            />,
+          ]}
+        />
+      </Typography>
+    </>
+  );
+};
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
new file mode 100644
index 000000000..0b41dba29
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
@@ -0,0 +1,86 @@
+import { useCallback, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+
+import { PATHS } from "@consts";
+import { BottomBoxButtons } from "@molecules";
+import { useCardano, useModal } from "@context";
+import { RetireAsSoleVoterBoxContent } from "@organisms";
+
+export const RetireAsSoleVoterBox = () => {
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  const navigate = useNavigate();
+  const {
+    buildDRepRetirementCert,
+    buildSignSubmitConwayCertTx,
+    isPendingTransaction,
+  } = useCardano();
+  const { openModal, closeModal } = useModal();
+  const { t } = useTranslation();
+
+  const onRetire = useCallback(async () => {
+    try {
+      setIsLoading(true);
+      const isPendingTx = isPendingTransaction();
+      if (isPendingTx) return;
+      const certBuilder = await buildDRepRetirementCert();
+      const result = await buildSignSubmitConwayCertTx({
+        certBuilder,
+        type: "soleVoterRegistration",
+        registrationType: "retirement",
+      });
+      if (result)
+        openModal({
+          type: "statusModal",
+          state: {
+            status: "success",
+            title: t("modals.retirement.title"),
+            message: t("modals.retirement.message"),
+            link: `https://adanordic.com/latest_transactions`,
+            buttonText: t("modals.common.goToDashboard"),
+            dataTestId: "retirement-transaction-submitted-modal",
+            onSubmit: () => {
+              navigate(PATHS.dashboard);
+              closeModal();
+            },
+          },
+        });
+    } catch (error: any) {
+      const errorMessage = error.info ? error.info : error;
+
+      openModal({
+        type: "statusModal",
+        state: {
+          status: "warning",
+          message: errorMessage,
+          buttonText: t("modals.common.goToDashboard"),
+          title: t("modals.common.oops"),
+          dataTestId: "retirement-transaction-error-modal",
+          onSubmit: () => {
+            navigate(PATHS.dashboard);
+            closeModal();
+          },
+        },
+      });
+    } finally {
+      setIsLoading(false);
+    }
+  }, [
+    buildDRepRetirementCert,
+    buildSignSubmitConwayCertTx,
+    isPendingTransaction,
+    openModal,
+  ]);
+
+  return (
+    <>
+      <RetireAsSoleVoterBoxContent />
+      <BottomBoxButtons
+        leftButtonAction={() => navigate(PATHS.dashboard)}
+        rightButtonAction={onRetire}
+        rightButtonIsLoading={isLoading}
+      />
+    </>
+  );
+};
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
new file mode 100644
index 000000000..67fcc97d6
--- /dev/null
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
@@ -0,0 +1,43 @@
+import { Link } from "@mui/material";
+import { Trans } from "react-i18next";
+
+import { Typography } from "@atoms";
+import { useScreenDimension, useTranslation } from "@hooks";
+import { correctAdaFormat, openInNewTab } from "@/utils";
+import { useCardano } from "@/context";
+
+export const RetireAsSoleVoterBoxContent = () => {
+  const { isMobile } = useScreenDimension();
+  const { t } = useTranslation();
+  const { soleVoter } = useCardano();
+
+  return (
+    <>
+      <Typography sx={{ mt: 1, textAlign: "center" }} variant="headline4">
+        {t("soleVoter.retirementHeading")}
+      </Typography>
+      <Typography
+        fontWeight={400}
+        sx={{
+          mb: 7,
+          mt: isMobile ? 4 : 10,
+          textAlign: "center",
+          whiteSpace: "pre-line",
+        }}
+        variant="body1"
+      >
+        <Trans
+          i18nKey="soleVoter.retirementDescription"
+          values={{ deposit: correctAdaFormat(soleVoter?.deposit) }}
+          components={[
+            <Link
+              onClick={() => openInNewTab("https://sancho.network/")}
+              sx={{ cursor: "pointer" }}
+              key="0"
+            />,
+          ]}
+        />
+      </Typography>
+    </>
+  );
+};
diff --git a/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx b/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
deleted file mode 100644
index 4eb34dafe..000000000
--- a/govtool/frontend/src/components/organisms/SoleVoterInfo.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { useMemo } from "react";
-import { Box, Link } from "@mui/material";
-
-import { LoadingButton, Button, Typography } from "@atoms";
-import { theme } from "@/theme";
-import { useScreenDimension, useTranslation } from "@hooks";
-import { Trans } from "react-i18next";
-import { openInNewTab } from "@/utils";
-import { useNavigate } from "react-router-dom";
-import { PATHS } from "@consts";
-
-export const SoleVoterInfo = () => {
-  const {
-    palette: { boxShadow2 },
-  } = theme;
-  const { isMobile, pagePadding, screenWidth } = useScreenDimension();
-  const navigate = useNavigate();
-  const { t } = useTranslation();
-
-  const renderBackButton = useMemo(() => {
-    return (
-      <Button
-        data-testid={"back-button"}
-        onClick={() => navigate(PATHS.dashboard)}
-        size="extraLarge"
-        sx={{
-          px: 6,
-          width: isMobile ? "100%" : "auto",
-        }}
-        variant="outlined"
-      >
-        {t("cancel")}
-      </Button>
-    );
-  }, [isMobile]);
-
-  const renderRegisterButton = useMemo(() => {
-    return (
-      <LoadingButton
-        data-testid={"register-button"}
-        // isLoading={isLoading}
-        onClick={() => {}}
-        sx={{
-          borderRadius: 50,
-          textTransform: "none",
-          px: 6,
-          width: isMobile ? "100%" : "auto",
-          height: 48,
-        }}
-        variant="contained"
-      >
-        {t("soleVoter.continueToRegister")}
-      </LoadingButton>
-    );
-  }, [
-    // isLoading,
-    isMobile,
-  ]);
-
-  return (
-    <Box
-      width={screenWidth < 768 ? "auto" : screenWidth < 1024 ? "60vw" : "45vw"}
-      boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
-      px={pagePadding}
-      py={isMobile ? 3 : 8}
-      borderRadius={"20px"}
-      mb={isMobile ? 0 : 6}
-      height="auto"
-    >
-      <Box display="flex" flexDirection="column">
-        <Typography sx={{ mt: 1, textAlign: "center" }} variant="headline4">
-          {t("soleVoter.heading")}
-        </Typography>
-        <Typography
-          fontWeight={400}
-          sx={{
-            mb: 7,
-            mt: isMobile ? 4 : 10,
-            textAlign: "center",
-            whiteSpace: "pre-line",
-          }}
-          variant="body1"
-        >
-          <Trans
-            i18nKey="soleVoter.description"
-            components={[
-              <Link
-                onClick={() => openInNewTab("https://sancho.network/")}
-                sx={{ cursor: "pointer" }}
-                key="0"
-              />,
-            ]}
-          />
-        </Typography>
-      </Box>
-      <Box
-        display="flex"
-        flexDirection={isMobile ? "column" : "row"}
-        justifyContent="space-between"
-        mt={6}
-      >
-        {isMobile ? renderRegisterButton : renderBackButton}
-        <Box px={2} py={isMobile ? 1.5 : 0} />
-        {isMobile ? renderBackButton : renderRegisterButton}
-      </Box>
-    </Box>
-  );
-};
diff --git a/govtool/frontend/src/components/organisms/index.ts b/govtool/frontend/src/components/organisms/index.ts
index 1906a2e23..5387a425c 100644
--- a/govtool/frontend/src/components/organisms/index.ts
+++ b/govtool/frontend/src/components/organisms/index.ts
@@ -1,6 +1,7 @@
 export * from "./BgCard";
 export * from "./ChooseStakeKeyPanel";
 export * from "./ChooseWalletModal";
+export * from "./ControlledField";
 export * from "./DashboardCards";
 export * from "./DashboardCards";
 export * from "./DashboardGovernanceActionDetails";
@@ -21,8 +22,10 @@ export * from "./RegisterAsdRepStepOne";
 export * from "./RegisterAsdRepStepThree";
 export * from "./RegisterAsdRepStepTwo";
 export * from "./Slider";
+export * from "./RegisterAsSoleVoterBoxContent";
+export * from "./RegisterAsSoleVoterBox";
+export * from "./RetireAsSoleVoterBoxContent";
+export * from "./RetireAsSoleVoterBox";
 export * from "./StatusModal";
 export * from "./TopNav";
 export * from "./VotingPowerModal";
-
-export * from "./ControlledField";
diff --git a/govtool/frontend/src/consts/icons.ts b/govtool/frontend/src/consts/icons.ts
index c6facbf60..93574c43b 100644
--- a/govtool/frontend/src/consts/icons.ts
+++ b/govtool/frontend/src/consts/icons.ts
@@ -2,6 +2,7 @@ export const ICONS = {
   appLogoIcon: "/icons/AppLogo.svg",
   arrowDownIcon: "/icons/ArrowDown.svg",
   arrowRightIcon: "/icons/ArrowRight.svg",
+  arrowLeftThinIcon: "/icons/ArrowLeftThin.svg",
   checkCircleIcon: "/icons/CheckCircle.svg",
   closeDrawerIcon: "/icons/CloseIcon.svg",
   closeIcon: "/icons/Close.svg",
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 925f3d418..31eaf2626 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -66,6 +66,7 @@ import {
   SANCHO_INFO_KEY,
   VOTE_TRANSACTION_KEY,
   checkIsMaintenanceOn,
+  REGISTER_SOLE_VOTER_TRANSACTION_KEY,
 } from "@utils";
 import { getEpochParams, getTransactionStatus } from "@services";
 import {
@@ -122,7 +123,7 @@ interface CardanoContext {
   }: {
     certBuilder?: CertificatesBuilder;
     votingBuilder?: VotingBuilder;
-    type?: "delegation" | "registration" | "vote";
+    type?: "delegation" | "registration" | "soleVoterRegistration" | "vote";
     proposalId?: string;
     registrationType?: DRepActionType;
   }) => Promise<string>;
@@ -145,6 +146,9 @@ interface CardanoContext {
   ) => Promise<VotingBuilder>;
   delegateTransaction: TransactionHistoryItem;
   registerTransaction: TransactionHistoryItem & { type: DRepActionType };
+  soleVoterTransaction: TransactionHistoryItem & {
+    type: Omit<DRepActionType, "update">;
+  };
   delegateTo: string;
   voteTransaction: TransactionHistoryItem & { proposalId: string };
   isPendingTransaction: () => boolean;
@@ -208,6 +212,9 @@ function CardanoProvider(props: Props) {
   const [registerTransaction, setRegisterTransaction] = useState<
     TransactionHistoryItem & { type: DRepActionType }
   >({ time: undefined, transactionHash: "", type: "" });
+  const [soleVoterTransaction, setSoleVoterTransaction] = useState<
+    TransactionHistoryItem & { type: Omit<DRepActionType, "update"> }
+  >({ time: undefined, transactionHash: "", type: "" });
   const [voteTransaction, setVoteTransaction] = useState<
     { proposalId: string } & TransactionHistoryItem
   >({ time: undefined, transactionHash: "", proposalId: "" });
@@ -219,6 +226,7 @@ function CardanoProvider(props: Props) {
   const isPendingTransaction = useCallback(() => {
     if (
       registerTransaction?.transactionHash ||
+      soleVoterTransaction?.transactionHash ||
       delegateTransaction?.transactionHash ||
       voteTransaction?.transactionHash
     ) {
@@ -243,6 +251,7 @@ function CardanoProvider(props: Props) {
     delegateTransaction?.transactionHash,
     openModal,
     registerTransaction?.transactionHash,
+    soleVoterTransaction?.transactionHash,
     voteTransaction?.transactionHash,
   ]);
 
@@ -253,6 +262,11 @@ function CardanoProvider(props: Props) {
     const registerTransaction = JSON.parse(
       getItemFromLocalStorage(REGISTER_TRANSACTION_KEY + `_${stakeKey}`)
     );
+    const soleVoterTransaction = JSON.parse(
+      getItemFromLocalStorage(
+        REGISTER_SOLE_VOTER_TRANSACTION_KEY + `_${stakeKey}`
+      )
+    );
     const voteTransaction = JSON.parse(
       getItemFromLocalStorage(VOTE_TRANSACTION_KEY + `_${stakeKey}`)
     );
@@ -265,6 +279,9 @@ function CardanoProvider(props: Props) {
     if (registerTransaction?.transactionHash) {
       setRegisterTransaction(registerTransaction);
     }
+    if (soleVoterTransaction?.transactionHash) {
+      setSoleVoterTransaction(soleVoterTransaction);
+    }
     if (voteTransaction?.transactionHash) {
       setVoteTransaction(voteTransaction);
     }
@@ -385,6 +402,71 @@ function CardanoProvider(props: Props) {
       let interval = setInterval(checkRegisterTransaction, REFRESH_TIME);
       checkRegisterTransaction();
     }
+    if (soleVoterTransaction?.transactionHash) {
+      const checkRegisterTransaction = async () => {
+        const resetRegisterTransaction = () => {
+          clearInterval(interval);
+          removeItemFromLocalStorage(
+            REGISTER_SOLE_VOTER_TRANSACTION_KEY + `_${stakeKey}`
+          );
+          setSoleVoterTransaction({
+            time: undefined,
+            transactionHash: "",
+            type: "",
+          });
+        };
+        const status = await getTransactionStatus(
+          soleVoterTransaction.transactionHash
+        );
+        if (status.transactionConfirmed) {
+          if (isEnabled) {
+            await setLimitedRegistrationInterval(
+              3000,
+              10,
+              dRepID,
+              soleVoterTransaction.type,
+              setDRep
+            ).then((isRegistered) => {
+              if (soleVoterTransaction.type === "registration") {
+                if (isRegistered) {
+                  addSuccessAlert(t("alerts.soleVoterRegistration.success"));
+                } else {
+                  addWarningAlert(
+                    t("alerts.soleVoterRegistration.refreshPage")
+                  );
+                }
+              } else if (soleVoterTransaction.type === "retirement") {
+                if (!isRegistered) {
+                  addSuccessAlert(t("alerts.soleVoterRetirement.success"));
+                } else {
+                  addWarningAlert(t("alerts.soleVoterRetirement.refreshPage"));
+                }
+              }
+            });
+          }
+          resetRegisterTransaction();
+        }
+        if (
+          new Date().getTime() -
+            new Date(soleVoterTransaction?.time).getTime() >
+          TIME_TO_EXPIRE_TRANSACTION
+        ) {
+          resetRegisterTransaction();
+          if (isEnabled)
+            addErrorAlert(
+              t(
+                `alerts.${
+                  soleVoterTransaction.type === "retirement"
+                    ? "retirement.failed"
+                    : "registration.failed"
+                }`
+              )
+            );
+        }
+      };
+      let interval = setInterval(checkRegisterTransaction, REFRESH_TIME);
+      checkRegisterTransaction();
+    }
     if (voteTransaction?.transactionHash) {
       const checkVoteTransaction = async () => {
         const resetVoteTransaction = () => {
@@ -418,11 +500,17 @@ function CardanoProvider(props: Props) {
       isEnabled &&
       (voteTransaction?.transactionHash ||
         registerTransaction?.transactionHash ||
+        soleVoterTransaction?.transactionHash ||
         delegateTransaction?.transactionHash)
     ) {
       addWarningAlert(t("alerts.transactionInProgress"), 10000);
     }
-  }, [delegateTransaction, registerTransaction, voteTransaction]);
+  }, [
+    delegateTransaction,
+    registerTransaction,
+    soleVoterTransaction,
+    voteTransaction,
+  ]);
 
   const getChangeAddress = async (enabledApi: CardanoApiWallet) => {
     try {
@@ -726,7 +814,7 @@ function CardanoProvider(props: Props) {
     }: {
       certBuilder?: CertificatesBuilder;
       votingBuilder?: VotingBuilder;
-      type?: "delegation" | "registration" | "vote";
+      type?: "delegation" | "registration" | "soleVoterRegistration" | "vote";
       proposalId?: string;
       registrationType?: DRepActionType;
     }) => {
@@ -849,6 +937,21 @@ function CardanoProvider(props: Props) {
             })
           );
         }
+        if (type === "soleVoterRegistration" && registrationType !== "update") {
+          setSoleVoterTransaction({
+            time: new Date(),
+            transactionHash: resultHash,
+            type: registrationType ?? "",
+          });
+          setItemToLocalStorage(
+            REGISTER_SOLE_VOTER_TRANSACTION_KEY + `_${stakeKey}`,
+            JSON.stringify({
+              time: new Date(),
+              transactionHash: resultHash,
+              type: registrationType,
+            })
+          );
+        }
         if (type === "delegation") {
           setDelegateTransaction({
             time: new Date(),
@@ -899,6 +1002,7 @@ function CardanoProvider(props: Props) {
       walletApi,
       getUtxos,
       registerTransaction.transactionHash,
+      soleVoterTransaction.transactionHash,
       delegateTransaction.transactionHash,
       voteTransaction.transactionHash,
       stakeKey,
@@ -1148,6 +1252,7 @@ function CardanoProvider(props: Props) {
       buildVoteDelegationCert,
       delegateTransaction,
       registerTransaction,
+      soleVoterTransaction,
       delegateTo,
       voteTransaction,
       isPendingTransaction,
@@ -1183,6 +1288,7 @@ function CardanoProvider(props: Props) {
       buildVoteDelegationCert,
       delegateTransaction,
       registerTransaction,
+      soleVoterTransaction,
       delegateTo,
       voteTransaction,
       isPendingTransaction,
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index 5bf0be32a..e722e4c84 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -6,7 +6,7 @@ export const setLimitedRegistrationInterval = (
   intervalTime: number,
   attemptsNumber: number,
   dRepID: string,
-  transactionType: DRepActionType,
+  transactionType: DRepActionType | Omit<DRepActionType, "update">,
   setDRep: (key: undefined | DRepInfo) => void
 ): Promise<boolean> => {
   return new Promise(async (resolve) => {
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index b1d413e2e..267f26abf 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -23,6 +23,16 @@ export const en = {
           "You have successfully retired from being a DRep! Please refresh the page.",
         success: "You have successfully retired from being a DRep!",
       },
+      soleVoterRegistration: {
+        refreshPage:
+          "You have successfully registered as a Sole Voter! Please refresh the page.",
+        success: "You have successfully registered as a Sole Voter!",
+      },
+      soleVoterRetirement: {
+        refreshPage:
+          "You have successfully retired from being a Sole Voter! Please refresh the page.",
+        success: "You have successfully retired from being a SoleVoter!",
+      },
       voting: {
         failed: "Vote transaction failed",
         success: "You have successfully voted!",
@@ -37,11 +47,8 @@ export const en = {
       headingTwo: "See Active Governance Actions",
       delegation: {
         changeDelegation: "Change delegation",
-        connectToDelegate: "Connect to delegate",
         delegateOwnPower:
           "If you want to delegate your own voting power of ₳<strong>{{ada}}</strong>.",
-        description:
-          "If you want to delegate to a DRep or select a default option.",
         dRepDelegatedTo: "DRep you delegated to",
         toDRep:
           "You have delegated your voting power of ₳<strong>{{ada}}</strong> to a selected DRep.",
@@ -72,23 +79,11 @@ export const en = {
         title: "Governance Actions",
         view: "View governance actions",
       },
-      cards: {
-        retire: "Retire",
-        youAreSoleVoterTitle: "You are a Sole Voter",
-        youAreSoleVoterDescription:
-          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
-        registerAsSoleVoterTitle: "Become a Sole Voter",
-        registerAsSoleVoterDescription:
-          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
-      },
       registration: {
         changeMetadata: "Change metadata",
-        connectToRegister: "Connect to register",
         dRepRegistration: "DRep Registration",
         dRepRetirement: "DRep Retirement",
         dRepUpdate: "DRep Update",
-        description:
-          "If you want to directly participate in voting and have other ada holders delegate their voting power to you.",
         holdersCanDelegate:
           "Ada holders can delegate their voting power to you.",
         ifYouWant:
@@ -105,24 +100,15 @@ export const en = {
           "The retirement process is ongoing. This may take several minutes.",
         youAreRegistered: "You are Registered as a DRep",
       },
-    },
-    home: {
-      cards: {
-        delegateDescription: "Find a DRep to vote on your behalf.",
-        delegateFirstButtonLabel: "View DRep Direcotry",
-        delegateTitle: "Delegate your Voting Power",
-        governaneActionsDescription:
-          "See all the Governance Actions submitted on chain. ",
-        governanceActionsFirstButtonLabel: "View Governance Actions",
-        governaneActionsTitle: "View Governance Actions",
-        registerAsDRepDescription:
-          "Accept delegated voting power from other ADA holders, and combine it with your own voting power. Vote with the accumulated Power on  Governance Actions.",
-        registerAsDRepFirstButtonLabel: "Connect to Register",
-        registerAsDRepTitle: "Become a DRep",
+      soleVoter: {
+        register: "Register",
         registerAsSoleVoterDescription:
-          "Vote on Governance Actions using your own voting power",
-        registerAsSoleVoterFirstButtonLabel: "Connect to Register",
+          "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
         registerAsSoleVoterTitle: "Become a Sole Voter",
+        retire: "Retire",
+        youAreSoleVoterDescription:
+          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
+        youAreSoleVoterTitle: "You are a Sole Voter",
       },
     },
     delegation: {
@@ -246,6 +232,25 @@ export const en = {
       },
       headline: "SanchoNet \n Governance Tool",
     },
+    home: {
+      cards: {
+        delegateDescription: "Find a DRep to vote on your behalf.",
+        delegateFirstButtonLabel: "View DRep Direcotry",
+        delegateTitle: "Delegate your Voting Power",
+        governaneActionsDescription:
+          "See all the Governance Actions submitted on chain. ",
+        governanceActionsFirstButtonLabel: "View Governance Actions",
+        governaneActionsTitle: "View Governance Actions",
+        registerAsDRepDescription:
+          "Accept delegated voting power from other ADA holders, and combine it with your own voting power. Vote with the accumulated Power on  Governance Actions.",
+        registerAsDRepFirstButtonLabel: "Connect to Register",
+        registerAsDRepTitle: "Become a DRep",
+        registerAsSoleVoterDescription:
+          "Vote on Governance Actions using your own voting power",
+        registerAsSoleVoterFirstButtonLabel: "Connect to Register",
+        registerAsSoleVoterTitle: "Become a Sole Voter",
+      },
+    },
     menu: {
       faqs: "FAQs",
       guides: "Guides",
@@ -320,13 +325,12 @@ export const en = {
     soleVoter: {
       retireSoleVoter: "Retire as a Sole Voter",
       becomeSoleVoter: "Become a Sole Voter",
-      continueToRegister: "Continue to register",
-      description:
-        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳2</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
-      heading: "What this Means",
+      registerDescription:
+        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
+      registerHeading: "What this Means",
       retirementHeading: "What Retirement Means",
       retirementDescription:
-        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of <strong>{{deposit}} ADA</strong> will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\n<0>These options are listed in our Guides here:</0> <1>Voting options and Roles</1>",
+        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
     },
     system: {
       sanchoNet: "SanchoNet",
diff --git a/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx b/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
index 370a5fefc..ea7018a85 100644
--- a/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
+++ b/govtool/frontend/src/pages/RegisterAsSoleVoter.tsx
@@ -1,16 +1,13 @@
 import { useEffect } from "react";
-import { Box, Link } from "@mui/material";
-
-import { Background, Typography } from "@atoms";
-import { ICONS, PATHS } from "@consts";
-import { DashboardTopNav, Footer } from "@organisms";
-import { useScreenDimension, useTranslation } from "@hooks";
 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 { SoleVoterInfo } from "@/components/organisms/SoleVoterInfo";
+import { CenteredBoxPageWrapper } from "@molecules";
 
 export const RegisterAsSoleVoter = () => {
-  const { isMobile, screenWidth } = useScreenDimension();
   const navigate = useNavigate();
   const { t } = useTranslation();
 
@@ -24,87 +21,13 @@ export const RegisterAsSoleVoter = () => {
   }, []);
 
   return (
-    <Background isReverted>
-      <Box display={"flex"} minHeight={"100vh"} flexDirection="column">
-        <DashboardTopNav
-          imageSRC={ICONS.appLogoIcon}
-          imageWidth={isMobile ? undefined : 42}
-          imageHeight={isMobile ? 24 : 35}
-          title={t("soleVoter.becomeSoleVoter")}
-        />
-
-        <Box
-          mt={isMobile ? 0 : 7}
-          height={isMobile ? "100%" : "auto"}
-          sx={{
-            marginTop: isMobile ? "97px" : "153px",
-            display: isMobile ? "flex" : "grid",
-            ...(isMobile && {
-              flexDirection: "column",
-            }),
-            ...(!isMobile && { gridTemplateColumns: "1fr auto 1fr" }),
-          }}
-        >
-          {isMobile && (
-            <Box borderBottom={1} borderColor={"#fff"}>
-              <Typography
-                variant="body2"
-                sx={{
-                  ml: 2,
-                  my: "26px",
-                  fontSize: "24px",
-                  fontWeight: 400,
-                }}
-              >
-                {t("soleVoter.becomeSoleVoter")}
-              </Typography>
-            </Box>
-          )}
-          <Link
-            data-testid={"back-to-list-link"}
-            sx={{
-              cursor: "pointer",
-              alignSelf: "flex-start",
-              display: "flex",
-              justifyContent: "center",
-              textDecoration: "none",
-              marginBottom: 3,
-              mt: isMobile ? 3 : "none",
-              mx: isMobile ? 2 : 1,
-            }}
-            onClick={() => navigate(PATHS.dashboard)}
-          >
-            <img
-              src={ICONS.arrowRightIcon}
-              alt="arrow"
-              style={{
-                marginRight: isMobile
-                  ? "12px"
-                  : screenWidth < 950
-                  ? "8px"
-                  : "12px",
-                transform: "rotate(180deg)",
-              }}
-            />
-            <Typography
-              variant="body2"
-              color="primary"
-              sx={{
-                display: "inline-block",
-                fontSize: isMobile
-                  ? "14px"
-                  : screenWidth < 950
-                  ? "12px"
-                  : "14px",
-              }}
-            >
-              {t("backToDashboard")}
-            </Typography>
-          </Link>
-          <SoleVoterInfo />
-        </Box>
-        {isMobile && <Footer />}
-      </Box>
-    </Background>
+    <CenteredBoxPageWrapper
+      pageTitle={t("soleVoter.becomeSoleVoter")}
+      backButtonText={t("backToDashboard")}
+      backButtonPath={PATHS.dashboard}
+      isVotingPowerHidden
+    >
+      <RegisterAsSoleVoterBox />
+    </CenteredBoxPageWrapper>
   );
 };
diff --git a/govtool/frontend/src/pages/RetireAsSoleVoter.tsx b/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
index 830f4ffd5..c661be2cd 100644
--- a/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
+++ b/govtool/frontend/src/pages/RetireAsSoleVoter.tsx
@@ -1,180 +1,32 @@
-import { useCallback, useEffect, useMemo } from "react";
-import { useNavigate } from "react-router-dom";
-import { Trans } from "react-i18next";
-import { Box, Link } from "@mui/material";
-import ArrowBackIosIcon from "@mui/icons-material/ArrowBackIos";
+import { useEffect } from "react";
 
-import { Background, Button, Typography } from "@atoms";
-import { useCardano } from "@context";
-import { ICONS, PATHS } from "@consts";
-import { useScreenDimension, useTranslation } from "@hooks";
-import { DashboardTopNav, Footer } from "@organisms";
-import {
-  WALLET_LS_KEY,
-  correctAdaFormat,
-  getItemFromLocalStorage,
-  openInNewTab,
-} from "@utils";
-import { theme } from "@/theme";
+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";
 
 export const RetireAsSoleVoter = () => {
-  const {
-    palette: { boxShadow2 },
-  } = theme;
-  const { isMobile, screenWidth } = useScreenDimension();
   const navigate = useNavigate();
   const { t } = useTranslation();
-  const { soleVoter } = useCardano();
-
-  const navigateToDashboard = useCallback(
-    () => navigate(PATHS.dashboard),
-    [navigate]
-  );
 
   useEffect(() => {
     if (
       !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
-      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`) ||
-      !soleVoter?.isRegistered
+      !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`)
     ) {
       navigate(PATHS.home);
     }
   }, []);
 
-  const renderBackButton = useMemo(() => {
-    return (
-      <Button
-        data-testid="back-button"
-        onClick={navigateToDashboard}
-        size="extraLarge"
-        sx={{
-          px: 6,
-          width: isMobile ? "100%" : "auto",
-        }}
-        variant="outlined"
-      >
-        {t("cancel")}
-      </Button>
-    );
-  }, [isMobile, navigateToDashboard]);
-
-  const renderRegisterButton = useMemo(() => {
-    return (
-      <Button
-        data-testid="retire-button"
-        onClick={() => {}}
-        size="extraLarge"
-        sx={{
-          px: 6,
-          width: isMobile ? "100%" : "auto",
-        }}
-        variant="contained"
-      >
-        {t("continue")}
-      </Button>
-    );
-  }, [isMobile]);
-
   return (
-    <Background isReverted>
-      <Box display="flex" flexDirection="column" minHeight="100vh">
-        <DashboardTopNav
-          imageHeight={isMobile ? 24 : 35}
-          imageSRC={ICONS.appLogoIcon}
-          imageWidth={isMobile ? undefined : 42}
-          title={t("soleVoter.retireSoleVoter")}
-        />
-
-        <Box
-          height={isMobile ? "100%" : "auto"}
-          mt={isMobile ? 0 : 7}
-          sx={{
-            alignItems: screenWidth >= 768 ? "center" : "inherit",
-            marginTop: screenWidth < 1440 ? "97px" : "153px",
-            display: screenWidth < 1440 ? "flex" : "grid",
-            ...(screenWidth < 1440 && {
-              flexDirection: "column",
-            }),
-            ...(screenWidth >= 1440 && { gridTemplateColumns: "1fr auto 1fr" }),
-          }}
-        >
-          {isMobile && (
-            <Box borderColor="white" borderBottom={1}>
-              <Typography
-                variant="title1"
-                sx={{
-                  ml: 2,
-                  my: 3.25,
-                }}
-              >
-                {t("soleVoter.retireSoleVoter")}
-              </Typography>
-            </Box>
-          )}
-          <Link
-            data-testid="back-to-list-link"
-            sx={{
-              alignItems: "center",
-              alignSelf: "flex-start",
-              cursor: "pointer",
-              display: "flex",
-              justifyContent: "flex-start",
-              marginBottom: 3,
-              ml: screenWidth < 1440 ? 2 : 5,
-              mt: screenWidth < 1440 ? 3 : "none",
-              textDecoration: "none",
-            }}
-            onClick={navigateToDashboard}
-          >
-            <ArrowBackIosIcon sx={{ fontSize: 14 }} />
-            <Typography color="primary" fontWeight={400} variant="body2">
-              {t("backToDashboard")}
-            </Typography>
-          </Link>
-          <Box
-            borderRadius="20px"
-            boxShadow={isMobile ? "" : `2px 2px 20px 0px ${boxShadow2}`}
-            height="auto"
-            maxWidth={screenWidth > 768 ? 600 : undefined}
-            px={isMobile ? 2 : 18.75}
-            py={isMobile ? 6.25 : 10}
-          >
-            <Box display="flex" flexDirection="column">
-              <Typography sx={{ textAlign: "center" }} variant="headline4">
-                {t("soleVoter.retirementHeading")}
-              </Typography>
-              <Typography
-                fontWeight={400}
-                sx={{ py: 5, textAlign: "center", whiteSpace: "pre-line" }}
-                variant="body1"
-              >
-                <Trans
-                  components={[
-                    <Typography fontWeight={500} key={0} variant="body1" />,
-                    <Link
-                      key="1"
-                      onClick={() => openInNewTab("https://sancho.network/")}
-                      sx={{ cursor: "pointer" }}
-                    />,
-                  ]}
-                  i18nKey={"soleVoter.retirementDescription"}
-                  values={{ deposit: correctAdaFormat(soleVoter?.deposit) }}
-                />
-              </Typography>
-            </Box>
-            <Box
-              display="flex"
-              flexDirection={isMobile ? "column" : "row"}
-              justifyContent="space-between"
-            >
-              {isMobile ? renderRegisterButton : renderBackButton}
-              <Box px={2} py={isMobile ? 1.5 : 0} />
-              {isMobile ? renderBackButton : renderRegisterButton}
-            </Box>
-          </Box>
-          {isMobile && <Footer />}
-        </Box>
-      </Box>
-    </Background>
+    <CenteredBoxPageWrapper
+      pageTitle={t("soleVoter.retireSoleVoter")}
+      backButtonText={t("backToDashboard")}
+      backButtonPath={PATHS.dashboard}
+    >
+      <RetireAsSoleVoterBox />
+    </CenteredBoxPageWrapper>
   );
 };
diff --git a/govtool/frontend/src/utils/localStorage.ts b/govtool/frontend/src/utils/localStorage.ts
index 51d03347f..8655509fb 100644
--- a/govtool/frontend/src/utils/localStorage.ts
+++ b/govtool/frontend/src/utils/localStorage.ts
@@ -1,6 +1,8 @@
 export const WALLET_LS_KEY = "wallet_data";
 export const DELEGATE_TRANSACTION_KEY = "delegate_transaction";
 export const REGISTER_TRANSACTION_KEY = "register_transaction";
+export const REGISTER_SOLE_VOTER_TRANSACTION_KEY =
+  "register_sole_voter_transaction";
 export const DELEGATE_TO_KEY = "delegate_to_transaction";
 export const PROTOCOL_PARAMS_KEY = "protocol_params";
 export const SANCHO_INFO_KEY = "sancho_info";

From 758b83c3e91a53675df7dbab29f1edfa281154c0 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Wed, 21 Feb 2024 10:56:02 +0100
Subject: [PATCH 59/82] Minor refactor

---
 ...ttons.tsx => CenteredBoxBottomButtons.tsx} | 40 +++++++++----------
 .../src/components/molecules/index.ts         |  2 +-
 .../organisms/RegisterAsSoleVoterBox.tsx      | 10 ++---
 .../organisms/RetireAsSoleVoterBox.tsx        | 10 ++---
 .../organisms/RetireAsSoleVoterBoxContent.tsx |  1 +
 5 files changed, 32 insertions(+), 31 deletions(-)
 rename govtool/frontend/src/components/molecules/{BottomBoxButtons.tsx => CenteredBoxBottomButtons.tsx} (62%)

diff --git a/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx b/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
similarity index 62%
rename from govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
rename to govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
index c54a6627c..3da36563c 100644
--- a/govtool/frontend/src/components/molecules/BottomBoxButtons.tsx
+++ b/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
@@ -5,19 +5,19 @@ import { Button, LoadingButton } from "@atoms";
 import { useScreenDimension, useTranslation } from "@hooks";
 
 interface Props {
-  leftButtonAction: () => void;
-  rightButtonAction: () => void;
-  rightButtonIsLoading?: boolean;
-  leftButtonText?: string;
-  rightButtonText?: string;
+  onBackButton: () => void;
+  onActionButton: () => void;
+  isLoading?: boolean;
+  backButtonText?: string;
+  actionButtonText?: string;
 }
 
-export const BottomBoxButtons = ({
-  leftButtonAction,
-  rightButtonAction,
-  rightButtonIsLoading,
-  leftButtonText,
-  rightButtonText,
+export const CenteredBoxBottomButtons = ({
+  onBackButton,
+  onActionButton,
+  isLoading,
+  backButtonText,
+  actionButtonText,
 }: Props) => {
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
@@ -26,7 +26,7 @@ export const BottomBoxButtons = ({
     return (
       <Button
         data-testid={"back-button"}
-        onClick={leftButtonAction}
+        onClick={onBackButton}
         size="extraLarge"
         sx={{
           px: 6,
@@ -34,17 +34,17 @@ export const BottomBoxButtons = ({
         }}
         variant="outlined"
       >
-        {leftButtonText ?? t("cancel")}
+        {backButtonText ?? t("cancel")}
       </Button>
     );
   }, [isMobile]);
 
-  const renderRegisterButton = useMemo(() => {
+  const renderActionButton = useMemo(() => {
     return (
       <LoadingButton
         data-testid={"register-button"}
-        isLoading={rightButtonIsLoading}
-        onClick={rightButtonAction}
+        isLoading={isLoading}
+        onClick={onActionButton}
         sx={{
           borderRadius: 50,
           textTransform: "none",
@@ -55,10 +55,10 @@ export const BottomBoxButtons = ({
         }}
         variant="contained"
       >
-        {rightButtonText ?? t("continue")}
+        {actionButtonText ?? t("continue")}
       </LoadingButton>
     );
-  }, [rightButtonIsLoading, isMobile]);
+  }, [isLoading, isMobile]);
 
   return (
     <Box
@@ -67,9 +67,9 @@ export const BottomBoxButtons = ({
       justifyContent="space-around"
       mt={6}
     >
-      {isMobile ? renderRegisterButton : renderBackButton}
+      {isMobile ? renderActionButton : renderBackButton}
       <Box px={2} py={isMobile ? 1.5 : 0} />
-      {isMobile ? renderBackButton : renderRegisterButton}
+      {isMobile ? renderBackButton : renderActionButton}
     </Box>
   );
 };
diff --git a/govtool/frontend/src/components/molecules/index.ts b/govtool/frontend/src/components/molecules/index.ts
index cb5e9115b..7b4c1668f 100644
--- a/govtool/frontend/src/components/molecules/index.ts
+++ b/govtool/frontend/src/components/molecules/index.ts
@@ -1,5 +1,5 @@
 export * from "./ActionCard";
-export * from "./BottomBoxButtons";
+export * from "./CenteredBoxBottomButtons";
 export * from "./CenteredBoxPageWrapper";
 export * from "./DashboardActionCard";
 export * from "./DataActionsBar";
diff --git a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
index 4034e6f01..1794a7042 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 
 import { PATHS } from "@consts";
 import { RegisterAsSoleVoterBoxContent } from "@organisms";
-import { BottomBoxButtons } from "@molecules";
+import { CenteredBoxBottomButtons } from "@molecules";
 import { useCardano, useModal } from "@context";
 
 export const RegisterAsSoleVoterBox = () => {
@@ -66,10 +66,10 @@ export const RegisterAsSoleVoterBox = () => {
   return (
     <>
       <RegisterAsSoleVoterBoxContent />
-      <BottomBoxButtons
-        leftButtonAction={() => navigate(PATHS.dashboard)}
-        rightButtonAction={onRegister}
-        rightButtonIsLoading={isLoading}
+      <CenteredBoxBottomButtons
+        onBackButton={() => navigate(PATHS.dashboard)}
+        onActionButton={onRegister}
+        isLoading={isLoading}
       />
     </>
   );
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
index 0b41dba29..b2518b9e4 100644
--- a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBox.tsx
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 
 import { PATHS } from "@consts";
-import { BottomBoxButtons } from "@molecules";
+import { CenteredBoxBottomButtons } from "@molecules";
 import { useCardano, useModal } from "@context";
 import { RetireAsSoleVoterBoxContent } from "@organisms";
 
@@ -76,10 +76,10 @@ export const RetireAsSoleVoterBox = () => {
   return (
     <>
       <RetireAsSoleVoterBoxContent />
-      <BottomBoxButtons
-        leftButtonAction={() => navigate(PATHS.dashboard)}
-        rightButtonAction={onRetire}
-        rightButtonIsLoading={isLoading}
+      <CenteredBoxBottomButtons
+        onBackButton={() => navigate(PATHS.dashboard)}
+        onActionButton={onRetire}
+        isLoading={isLoading}
       />
     </>
   );
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
index 67fcc97d6..a05bb424b 100644
--- a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
@@ -23,6 +23,7 @@ export const RetireAsSoleVoterBoxContent = () => {
           mt: isMobile ? 4 : 10,
           textAlign: "center",
           whiteSpace: "pre-line",
+          textDecoration: "underline",
         }}
         variant="body1"
       >

From b0b5c87a6c6a9f7b2ba55f72ce6bc918efe02f29 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Mon, 26 Feb 2024 14:24:25 +0100
Subject: [PATCH 60/82] [#119] Fixes after CR

---
 .../components/molecules/CenteredBoxBottomButtons.tsx  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx b/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
index 3da36563c..5ca687317 100644
--- a/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
+++ b/govtool/frontend/src/components/molecules/CenteredBoxBottomButtons.tsx
@@ -30,7 +30,6 @@ export const CenteredBoxBottomButtons = ({
         size="extraLarge"
         sx={{
           px: 6,
-          width: isMobile ? "100%" : "auto",
         }}
         variant="outlined"
       >
@@ -46,10 +45,7 @@ export const CenteredBoxBottomButtons = ({
         isLoading={isLoading}
         onClick={onActionButton}
         sx={{
-          borderRadius: 50,
-          textTransform: "none",
           px: 6,
-          width: isMobile ? "100%" : "auto",
           height: 48,
           fontSize: 16,
         }}
@@ -63,13 +59,13 @@ export const CenteredBoxBottomButtons = ({
   return (
     <Box
       display="flex"
-      flexDirection={isMobile ? "column" : "row"}
+      flexDirection={isMobile ? "column-reverse" : "row"}
       justifyContent="space-around"
       mt={6}
     >
-      {isMobile ? renderActionButton : renderBackButton}
+      {renderBackButton}
       <Box px={2} py={isMobile ? 1.5 : 0} />
-      {isMobile ? renderBackButton : renderActionButton}
+      {renderActionButton}
     </Box>
   );
 };

From 60b67444eedb6efff9a3c22feacb66a9df4f61e4 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Thu, 22 Feb 2024 09:46:28 +0100
Subject: [PATCH 61/82] [#210] Sole voter wallet logic for registration and
 retirement

---
 govtool/frontend/src/App.tsx                  |  6 +--
 .../src/components/atoms/VotingPowerChips.tsx | 10 ++--
 .../components/molecules/VoteActionForm.tsx   |  4 +-
 .../components/organisms/DashboardCards.tsx   | 53 +++++++++----------
 .../DashboardGovernanceActionDetails.tsx      |  4 +-
 .../organisms/DashboardGovernanceActions.tsx  |  4 +-
 .../components/organisms/DashboardTopNav.tsx  |  4 +-
 .../organisms/DelegateTodRepStepOne.tsx       |  6 +--
 .../src/components/organisms/Drawer.tsx       |  4 +-
 .../organisms/RetireAsSoleVoterBoxContent.tsx |  4 +-
 govtool/frontend/src/context/wallet.tsx       | 30 +++++------
 govtool/frontend/src/context/walletUtils.ts   |  8 +--
 govtool/frontend/src/hooks/index.ts           |  1 -
 govtool/frontend/src/hooks/mutations/index.ts |  7 ---
 .../useAdaHolderDelegateAbstainMutation.ts    | 10 ----
 .../mutations/useAdaHolderDelegateMutation.ts | 10 ----
 .../useAdaHolderDelegateNoMutation.ts         | 10 ----
 .../useAdaHolderRemoveDelegationMutation.ts   | 10 ----
 .../mutations/useDRepRegisterMutation.ts      | 22 --------
 .../mutations/useDRepRemoveVoteMutation.ts    | 10 ----
 .../hooks/mutations/useDRepRetireMutation.ts  | 23 --------
 govtool/frontend/src/i18n/locales/en.ts       |  9 ++--
 govtool/frontend/src/models/api.ts            | 10 ++--
 .../DashboardGovernanceActionsCategory.tsx    |  4 +-
 .../src/pages/GovernanceActionsCategory.tsx   |  4 +-
 .../src/services/requests/getDRepInfo.ts      |  4 +-
 26 files changed, 84 insertions(+), 187 deletions(-)
 delete mode 100644 govtool/frontend/src/hooks/mutations/index.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts
 delete mode 100644 govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index a36a89f8f..fc659e428 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -34,7 +34,7 @@ import { useGetDRepInfo, useWalletConnectionListener } from "./hooks";
 import { RegisterAsSoleVoter } from "./pages/RegisterAsSoleVoter";
 
 export default function App() {
-  const { enable, setDRep, setIsDrepLoading } = useCardano();
+  const { enable, setUser, setIsDrepLoading } = useCardano();
   const navigate = useNavigate();
   const { data } = useGetDRepInfo();
   const { modal, openModal, modals } = useModal();
@@ -47,11 +47,11 @@ export default function App() {
 
   useEffect(() => {
     setIsDrepLoading(true);
-    setDRep(data);
+    setUser(data);
     const timer = setTimeout(() => setIsDrepLoading(false), 1000);
 
     return () => clearTimeout(timer);
-  }, [data?.isRegistered]);
+  }, [data?.isRegisteredAsDRep]);
 
   const checkTheWalletIsActive = useCallback(() => {
     const hrefCondition =
diff --git a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
index 897ec0ce8..6dbeb0d6a 100644
--- a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
+++ b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
@@ -13,7 +13,7 @@ import { correctAdaFormat } from "@utils";
 import { Tooltip } from "@atoms";
 
 export const VotingPowerChips = () => {
-  const { dRep, stakeKey, isDrepLoading } = useCardano();
+  const { user, stakeKey, isDrepLoading } = useCardano();
   const { dRepVotingPower, isDRepVotingPowerLoading } =
     useGetDRepVotingPowerQuery();
   const { votingPower, powerIsLoading } =
@@ -33,7 +33,7 @@ export const VotingPowerChips = () => {
       alignItems="center"
       maxHeight={isMobile ? undefined : 48}
     >
-      {dRep?.isRegistered && (
+      {user?.isRegisteredAsDRep && (
         <Tooltip
           heading={t("tooltips.votingPower.heading")}
           paragraphOne={t("tooltips.votingPower.paragraphOne")}
@@ -55,8 +55,8 @@ export const VotingPowerChips = () => {
           {t("votingPower")}
         </Typography>
       )}
-      {(dRep?.isRegistered && isDRepVotingPowerLoading) ||
-      (!dRep?.isRegistered && powerIsLoading) ||
+      {(user?.isRegisteredAsDRep && isDRepVotingPowerLoading) ||
+      (!user?.isRegisteredAsDRep && powerIsLoading) ||
       isDrepLoading ? (
         <CircularProgress size={20} color="primary" />
       ) : (
@@ -67,7 +67,7 @@ export const VotingPowerChips = () => {
           sx={{ whiteSpace: "nowrap" }}
         >
           ₳{" "}
-          {dRep?.isRegistered
+          {user?.isRegisteredAsDRep
             ? correctAdaFormat(dRepVotingPower) ?? 0
             : correctAdaFormat(votingPower) ?? 0}
         </Typography>
diff --git a/govtool/frontend/src/components/molecules/VoteActionForm.tsx b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
index 3c1645bd2..9a4efbb95 100644
--- a/govtool/frontend/src/components/molecules/VoteActionForm.tsx
+++ b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
@@ -25,7 +25,7 @@ export const VoteActionForm = ({
   const [isContext, setIsContext] = useState<boolean>(false);
   const { isMobile, screenWidth } = useScreenDimension();
   const { openModal } = useModal();
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -142,7 +142,7 @@ export const VoteActionForm = ({
             />
           </Box>
         </Box>
-        {dRep?.isRegistered && (
+        {user?.isRegisteredAsDRep && (
           <Button
             data-testid="show-votes-button"
             variant="text"
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index e78353ccb..5e360523c 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -20,7 +20,7 @@ export const DashboardCards = () => {
     buildSignSubmitConwayCertTx,
     delegateTo,
     delegateTransaction,
-    dRep,
+    user,
     dRepID,
     dRepIDBech32,
     isDrepLoading,
@@ -28,7 +28,6 @@ export const DashboardCards = () => {
     registerTransaction,
     soleVoterTransaction,
     stakeKey,
-    soleVoter,
   } = useCardano();
   const navigate = useNavigate();
   const { currentDelegation, isCurrentDelegationLoading } =
@@ -225,7 +224,7 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.metadataUpdateInProgress");
       }
-    } else if (dRep?.isRegistered || dRep?.wasRegistered) {
+    } else if (user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep) {
       return t("dashboard.registration.holdersCanDelegate");
     } else {
       return t("dashboard.registration.ifYouWant");
@@ -233,8 +232,8 @@ export const DashboardCards = () => {
   }, [
     registerTransaction.transactionHash,
     registerTransaction.type,
-    dRep?.isRegistered,
-    dRep?.wasRegistered,
+    user?.isRegisteredAsDRep,
+    user?.wasRegisteredAsDRep,
   ]);
 
   const registrationCardTitle = useMemo(() => {
@@ -247,9 +246,9 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.dRepUpdate");
       }
-    } else if (dRep?.isRegistered) {
+    } else if (user?.isRegisteredAsDRep) {
       return t("dashboard.registration.youAreRegistered");
-    } else if (dRep?.wasRegistered) {
+    } else if (user?.wasRegisteredAsDRep) {
       return t("dashboard.registration.registerAgain");
     } else {
       return t("dashboard.registration.registerAsDRep");
@@ -257,8 +256,8 @@ export const DashboardCards = () => {
   }, [
     registerTransaction?.transactionHash,
     registerTransaction.type,
-    dRep?.isRegistered,
-    dRep?.wasRegistered,
+    user?.isRegisteredAsDRep,
+    user?.wasRegisteredAsDRep,
   ]);
 
   return isDrepLoading ? (
@@ -340,25 +339,25 @@ export const DashboardCards = () => {
       {/* REGISTARTION AS DREP CARD */}
       <DashboardActionCard
         dataTestidFirstButton={
-          dRep?.isRegistered ? "retire-button" : "register-button"
+          user?.isRegisteredAsDRep ? "retire-button" : "register-button"
         }
         dataTestidDrepIdBox="my-drep-id"
-        firstButtonVariant={dRep?.isRegistered ? "outlined" : "contained"}
+        firstButtonVariant={user?.isRegisteredAsDRep ? "outlined" : "contained"}
         secondButtonVariant={
           registerTransaction?.transactionHash
             ? "outlined"
-            : dRep?.isRegistered
+            : user?.isRegisteredAsDRep
             ? "text"
             : "outlined"
         }
         dataTestidSecondButton={
-          dRep?.isRegistered
+          user?.isRegisteredAsDRep
             ? "change-metadata-button"
             : "register-learn-more-button"
         }
         description={registrationCardDescription}
         firstButtonAction={
-          dRep?.isRegistered
+          user?.isRegisteredAsDRep
             ? retireAsDrep
             : () => navigateTo(PATHS.registerAsdRep)
         }
@@ -368,7 +367,7 @@ export const DashboardCards = () => {
             ? ""
             : t(
                 `dashboard.registration.${
-                  dRep?.isRegistered ? "retire" : "register"
+                  user?.isRegisteredAsDRep ? "retire" : "register"
                 }`
               )
         }
@@ -377,7 +376,7 @@ export const DashboardCards = () => {
         secondButtonAction={
           registerTransaction?.transactionHash
             ? () => openInNewTab("https://adanordic.com/latest_transactions")
-            : dRep?.isRegistered
+            : user?.isRegisteredAsDRep
             ? () => {
                 navigateTo(PATHS.updateMetadata);
               }
@@ -389,13 +388,13 @@ export const DashboardCards = () => {
         secondButtonLabel={
           registerTransaction?.transactionHash
             ? t("seeTransaction")
-            : dRep?.isRegistered
+            : user?.isRegisteredAsDRep
             ? t("dashboard.registration.changeMetadata")
             : t("learnMore")
         }
-        cardId={dRep?.isRegistered || dRep?.wasRegistered ? dRepIDBech32 : ""}
+        cardId={user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep ? dRepIDBech32 : ""}
         cardTitle={
-          dRep?.isRegistered || dRep?.wasRegistered ? t("myDRepId") : ""
+          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep ? t("myDRepId") : ""
         }
         title={registrationCardTitle}
       />
@@ -403,7 +402,7 @@ export const DashboardCards = () => {
       {/* SOLE VOTER CARD */}
       <DashboardActionCard
         dataTestidFirstButton={
-          soleVoter?.isRegistered
+          user?.isRegisteredAsSoleVoter
             ? "retire-as-sole-voter-button"
             : "register-as-sole-voter-button"
         }
@@ -413,7 +412,7 @@ export const DashboardCards = () => {
         description={
           <Trans
             i18nKey={
-              soleVoter?.isRegistered
+              user?.isRegisteredAsSoleVoter
                 ? "dashboard.soleVoter.youAreSoleVoterDescription"
                 : "dashboard.soleVoter.registerAsSoleVoterDescription"
             }
@@ -422,21 +421,21 @@ export const DashboardCards = () => {
         }
         firstButtonAction={() =>
           navigateTo(
-            soleVoter?.isRegistered
+            user?.isRegisteredAsSoleVoter
               ? PATHS.retireAsSoleVoter
               : PATHS.registerAsSoleVoter
           )
         }
         firstButtonLabel={t(
-          soleVoter?.isRegistered
+          user?.isRegisteredAsSoleVoter
             ? "dashboard.soleVoter.retire"
             : "dashboard.soleVoter.register"
         )}
-        firstButtonVariant={soleVoter?.isRegistered ? "outlined" : "contained"}
+        firstButtonVariant={user?.isRegisteredAsSoleVoter ? "outlined" : "contained"}
         secondButtonVariant={
           soleVoterTransaction?.transactionHash
             ? "outlined"
-            : soleVoter?.isRegistered
+            : user?.isRegisteredAsSoleVoter
             ? "text"
             : "outlined"
         }
@@ -450,7 +449,7 @@ export const DashboardCards = () => {
         secondButtonLabel={t("learnMore")}
         secondButtonVariant={"outlined"}
         title={t(
-          soleVoter?.isRegistered
+          user?.isRegisteredAsSoleVoter
             ? "dashboard.soleVoter.youAreSoleVoterTitle"
             : "dashboard.soleVoter.registerAsSoleVoterTitle"
         )}
@@ -463,7 +462,7 @@ export const DashboardCards = () => {
         firstButtonAction={() => navigate(PATHS.dashboard_governance_actions)}
         firstButtonLabel={t(
           `dashboard.govActions.${
-            dRep?.isRegistered ? "reviewAndVote" : "view"
+            user?.isRegisteredAsDRep ? "reviewAndVote" : "view"
           }`
         )}
         imageURL={IMAGES.govActionListImage}
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
index a15148f94..50ac76595 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
@@ -28,7 +28,7 @@ import {
 } from "@utils";
 
 export const DashboardGovernanceActionDetails = () => {
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const { state, hash } = useLocation();
   const navigate = useNavigate();
   const { isMobile, screenWidth } = useScreenDimension();
@@ -134,7 +134,7 @@ export const DashboardGovernanceActionDetails = () => {
                 ? formatDisplayDate(state.expiryDate)
                 : formatDisplayDate(data.proposal.expiryDate)
             }
-            isDRep={dRep?.isRegistered}
+            isDRep={user?.isRegisteredAsDRep}
             noVotes={state ? state.noVotes : data.proposal.noVotes}
             type={
               state
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
index d942dd9a4..39c2b7cf4 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
@@ -65,7 +65,7 @@ export const DashboardGovernanceActions = () => {
     state && state.isVotedListOnLoad ? 1 : 0
   );
 
-  const { dRep, isDrepLoading } = useCardano();
+  const { user, isDrepLoading } = useCardano();
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
 
@@ -121,7 +121,7 @@ export const DashboardGovernanceActions = () => {
             sortingActive={Boolean(chosenSorting)}
             sortOpen={sortOpen}
           />
-          {dRep?.isRegistered && (
+          {user?.isRegisteredAsDRep && (
             <Tabs
               sx={{
                 marginTop: 3,
diff --git a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
index b02a4c2ae..b167ceb44 100644
--- a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
@@ -29,7 +29,7 @@ export const DashboardTopNav = ({
   isVotingPowerHidden,
 }: DashboardTopNavProps) => {
   const { isMobile, screenWidth } = useScreenDimension();
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const navigate = useNavigate();
   const [isDrawerOpen, setIsDrawerOpen] = useState<boolean>(false);
   const { t } = useTranslation();
@@ -168,7 +168,7 @@ export const DashboardTopNav = ({
                   </Grid>
                 </Grid>
               </Box>
-              {dRep?.isRegistered && <DRepInfoCard />}
+              {user?.isRegisteredAsDRep && <DRepInfoCard />}
               <Box py={2} />
               <WalletInfoCard />
             </Box>
diff --git a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
index 2e333a0c1..a03a4b7e0 100644
--- a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
+++ b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
@@ -21,7 +21,7 @@ interface DelegateProps {
 export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   const navigate = useNavigate();
   const {
-    dRep,
+    user,
     dRepID,
     buildSignSubmitConwayCertTx,
     buildVoteDelegationCert,
@@ -133,7 +133,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   }, [
     chosenOption,
     delegate,
-    dRep?.isRegistered,
+    user?.isRegisteredAsDRep,
     dRepID,
     isDelegationLoading,
     isMobile,
@@ -215,7 +215,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
           flexDirection={"column"}
           rowGap={3}
         >
-          {dRep?.isRegistered && currentDelegation !== dRepID && (
+          {user?.isRegisteredAsDRep && currentDelegation !== dRepID && (
             <Grid item>
               <ActionRadio
                 onChange={setChosenOption}
diff --git a/govtool/frontend/src/components/organisms/Drawer.tsx b/govtool/frontend/src/components/organisms/Drawer.tsx
index 922d920e9..43291e76c 100644
--- a/govtool/frontend/src/components/organisms/Drawer.tsx
+++ b/govtool/frontend/src/components/organisms/Drawer.tsx
@@ -9,7 +9,7 @@ import { openInNewTab } from "@/utils";
 import { useTranslation } from "@hooks";
 
 export const Drawer = () => {
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const { t } = useTranslation();
 
   return (
@@ -61,7 +61,7 @@ export const Drawer = () => {
           ))}
         </Grid>
         <Box px={2}>
-          {dRep?.isRegistered && <DRepInfoCard />}
+          {user?.isRegisteredAsDRep && <DRepInfoCard />}
           <Box py={2} />
           <WalletInfoCard />
           <Box my={1}>
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
index a05bb424b..90eff76ee 100644
--- a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
@@ -9,7 +9,7 @@ import { useCardano } from "@/context";
 export const RetireAsSoleVoterBoxContent = () => {
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
-  const { soleVoter } = useCardano();
+  const { user } = useCardano();
 
   return (
     <>
@@ -29,7 +29,7 @@ export const RetireAsSoleVoterBoxContent = () => {
       >
         <Trans
           i18nKey="soleVoter.retirementDescription"
-          values={{ deposit: correctAdaFormat(soleVoter?.deposit) }}
+          values={{ deposit: correctAdaFormat(user?.deposit) }}
           components={[
             <Link
               onClick={() => openInNewTab("https://sancho.network/")}
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 31eaf2626..b8abbf9f1 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -50,7 +50,7 @@ import { Trans } from "react-i18next";
 import { useModal, useSnackbar } from ".";
 
 import { PATHS } from "@consts";
-import { CardanoApiWallet, DRepInfo, Protocol } from "@models";
+import { CardanoApiWallet, userInfo, Protocol } from "@models";
 import type { StatusModalState } from "@organisms";
 import {
   getPubDRepID,
@@ -100,16 +100,14 @@ interface CardanoContext {
   enable: (walletName: string) => Promise<EnableResponse>;
   isEnableLoading: string | null;
   error?: string;
-  dRep: DRepInfo | undefined;
-  soleVoter: DRepInfo | undefined;
-  setSoleVoter: (key: undefined | DRepInfo) => void;
+  user: userInfo | undefined;
   isEnabled: boolean;
   pubDRepKey: string;
   dRepID: string;
   dRepIDBech32: string;
   isMainnet: boolean;
   stakeKey?: string;
-  setDRep: (key: undefined | DRepInfo) => void;
+  setUser: (key: undefined | userInfo) => void;
   setStakeKey: (key: string) => void;
   stakeKeys: string[];
   walletApi?: CardanoApiWallet;
@@ -358,7 +356,7 @@ function CardanoProvider(props: Props) {
                 10,
                 dRepID,
                 registerTransaction.type,
-                setDRep
+                setUser
               ).then((isRegistered) => {
                 if (registerTransaction.type === "registration") {
                   if (isRegistered) {
@@ -425,7 +423,7 @@ function CardanoProvider(props: Props) {
               10,
               dRepID,
               soleVoterTransaction.type,
-              setDRep
+              setUser
             ).then((isRegistered) => {
               if (soleVoterTransaction.type === "registration") {
                 if (isRegistered) {
@@ -855,9 +853,9 @@ function CardanoProvider(props: Props) {
         // Add output of 1 ADA to the address of our wallet
         let outputValue = BigNum.from_str("1000000");
 
-        if (registrationType === "retirement" && dRep?.deposit) {
+        if (registrationType === "retirement" && user?.deposit) {
           outputValue = outputValue.checked_add(
-            BigNum.from_str(`${dRep?.deposit}`)
+            BigNum.from_str(`${user?.deposit}`)
           );
         }
 
@@ -1007,7 +1005,7 @@ function CardanoProvider(props: Props) {
       voteTransaction.transactionHash,
       stakeKey,
       isPendingTransaction,
-      dRep,
+      user,
     ]
   );
 
@@ -1156,7 +1154,7 @@ function CardanoProvider(props: Props) {
 
         const dRepRetirementCert = DrepDeregistration.new(
           dRepCred,
-          BigNum.from_str(`${dRep?.deposit}`)
+          BigNum.from_str(`${user?.deposit}`)
         );
         // add cert to tbuilder
         certBuilder.add(
@@ -1168,7 +1166,7 @@ function CardanoProvider(props: Props) {
         console.log(e);
         throw e;
       }
-    }, [dRepID, dRep]);
+    }, [dRepID, user]);
 
   const buildVote = useCallback(
     async (
@@ -1229,7 +1227,7 @@ function CardanoProvider(props: Props) {
     () => ({
       address,
       enable,
-      dRep,
+      user,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1237,7 +1235,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setDRep,
+      setUser,
       setStakeKey,
       stakeKeys,
       walletApi,
@@ -1265,7 +1263,7 @@ function CardanoProvider(props: Props) {
     [
       address,
       enable,
-      dRep,
+      user,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1273,7 +1271,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setDRep,
+      setUser,
       setStakeKey,
       stakeKeys,
       walletApi,
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index e722e4c84..ea223a238 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -1,13 +1,13 @@
 import { getAdaHolderCurrentDelegation, getDRepInfo } from "@services";
 import { DRepActionType } from "./wallet";
-import { DRepInfo } from "@models";
+import { userInfo } from "@models";
 
 export const setLimitedRegistrationInterval = (
   intervalTime: number,
   attemptsNumber: number,
   dRepID: string,
   transactionType: DRepActionType | Omit<DRepActionType, "update">,
-  setDRep: (key: undefined | DRepInfo) => void
+  setUser: (key: undefined | userInfo) => void
 ): Promise<boolean> => {
   return new Promise(async (resolve) => {
     const desiredResult = transactionType === "registration" ? true : false;
@@ -20,8 +20,8 @@ export const setLimitedRegistrationInterval = (
         try {
           const data = await getDRepInfo(dRepID);
 
-          if (data.isRegistered === desiredResult) {
-            setDRep(data);
+          if (data.isRegisteredAsDRep === desiredResult) {
+            setUser(data);
             clearInterval(interval);
             resolve(desiredResult);
           }
diff --git a/govtool/frontend/src/hooks/index.ts b/govtool/frontend/src/hooks/index.ts
index e17b56d3a..84e427cfa 100644
--- a/govtool/frontend/src/hooks/index.ts
+++ b/govtool/frontend/src/hooks/index.ts
@@ -6,5 +6,4 @@ export * from "./useFetchNextPageDetector";
 export * from "./useWalletConnectionListener";
 
 export * from "./forms";
-export * from "./mutations";
 export * from "./queries";
diff --git a/govtool/frontend/src/hooks/mutations/index.ts b/govtool/frontend/src/hooks/mutations/index.ts
deleted file mode 100644
index 7ab26f25b..000000000
--- a/govtool/frontend/src/hooks/mutations/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from "./useDRepRegisterMutation";
-export * from "./useDRepRemoveVoteMutation";
-export * from "./useDRepRetireMutation";
-export * from "./useAdaHolderDelegateMutation";
-export * from "./useAdaHolderDelegateAbstainMutation";
-export * from "./useAdaHolderDelegateNoMutation";
-export * from "./useAdaHolderRemoveDelegationMutation";
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts
deleted file mode 100644
index 9d37a5a01..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateAbstainMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderDelegateAbstain } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderDelegateAbstainMutation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderDelegateAbstain, {});
-
-  return {
-    delegateAbstainAsAdaHolder: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts
deleted file mode 100644
index fe915c357..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderDelegate } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderDelegateMutation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderDelegate, {});
-
-  return {
-    delegateAsAdaHolder: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts
deleted file mode 100644
index 8491c4627..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderDelegateNoMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderDelegateNo } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderDelegateNoMutation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderDelegateNo, {});
-
-  return {
-    delegateNoAsAdaHolder: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts b/govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts
deleted file mode 100644
index 739a6b5e4..000000000
--- a/govtool/frontend/src/hooks/mutations/useAdaHolderRemoveDelegationMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postAdaHolderRemoveDelegation } from "@services";
-import { useMutation } from "react-query";
-
-export const useAdaHolderRemoveDelegation = () => {
-  const { mutateAsync } = useMutation(postAdaHolderRemoveDelegation);
-
-  return {
-    register: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
deleted file mode 100644
index d757d09b2..000000000
--- a/govtool/frontend/src/hooks/mutations/useDRepRegisterMutation.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useMutation } from "react-query";
-import { useCardano } from "@context";
-import { postDRepRegister } from "@services";
-
-export const useDRepRegisterMutation = () => {
-  const { setDRep } = useCardano();
-
-  const { mutateAsync, isLoading } = useMutation(postDRepRegister, {
-    onSuccess: () => {
-      setDRep({
-        deposit: 100,
-        isRegistered: true,
-        wasRegistered: false,
-      });
-    },
-  });
-
-  return {
-    isLoading: isLoading,
-    register: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts
deleted file mode 100644
index 7102ad95a..000000000
--- a/govtool/frontend/src/hooks/mutations/useDRepRemoveVoteMutation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { postDRepRemoveVote } from "@services";
-import { useMutation } from "react-query";
-
-export const useDRepRemoveVoteMutation = () => {
-  const { mutateAsync } = useMutation(postDRepRemoveVote);
-
-  return {
-    removeVote: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts b/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
deleted file mode 100644
index 8bf8973e1..000000000
--- a/govtool/frontend/src/hooks/mutations/useDRepRetireMutation.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useMutation } from "react-query";
-import { useCardano, useSnackbar } from "@context";
-import { postDRepRetire } from "@services";
-
-export const useDRepRetireMutation = () => {
-  const { setDRep } = useCardano();
-  const { addSuccessAlert } = useSnackbar();
-
-  const { mutateAsync } = useMutation(postDRepRetire, {
-    onSuccess: () => {
-      setDRep({
-        deposit: 100,
-        wasRegistered: true,
-        isRegistered: false,
-      });
-      addSuccessAlert("DRep retired.");
-    },
-  });
-
-  return {
-    retire: mutateAsync,
-  };
-};
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 267f26abf..6af937395 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -323,14 +323,15 @@ export const en = {
       viewAll: "View all",
     },
     soleVoter: {
-      retireSoleVoter: "Retire as a Sole Voter",
       becomeSoleVoter: "Become a Sole Voter",
       registerDescription:
-        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
+      "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
       registerHeading: "What this Means",
-      retirementHeading: "What Retirement Means",
+      reRegister:"Re-register",
       retirementDescription:
-        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
+      "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
+      retirementHeading: "What Retirement Means",
+      retireSoleVoter: "Retire as a Sole Voter",
     },
     system: {
       sanchoNet: "SanchoNet",
diff --git a/govtool/frontend/src/models/api.ts b/govtool/frontend/src/models/api.ts
index 5281e2a9e..ecbe1fc2e 100644
--- a/govtool/frontend/src/models/api.ts
+++ b/govtool/frontend/src/models/api.ts
@@ -1,7 +1,9 @@
-export interface DRepInfo {
-  isRegistered: boolean;
-  wasRegistered: boolean;
-  deposit: number | null;
+export interface userInfo {
+  isRegisteredAsDRep: boolean;
+  wasRegisteredAsDRep: boolean;
+  isRegisteredAsSoleVoter: boolean;
+  wasRegisteredAsSoleVoter: boolean;
+  deposit: number;
 }
 
 export interface DRepData {
diff --git a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
index 5097fd091..d71a5e317 100644
--- a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
@@ -38,7 +38,7 @@ export const DashboardGovernanceActionsCategory = () => {
   const [chosenSorting, setChosenSorting] = useState<string>("");
   const { isMobile, screenWidth } = useScreenDimension();
   const navigate = useNavigate();
-  const { dRep, isDrepLoading, voteTransaction } = useCardano();
+  const { user, isDrepLoading, voteTransaction } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -88,7 +88,7 @@ export const DashboardGovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [proposals, dRep?.isRegistered, searchText, isProposalsFetchingNextPage]);
+  }, [proposals, user?.isRegisteredAsDRep, searchText, isProposalsFetchingNextPage]);
 
   const closeSorts = useCallback(() => {
     setSortOpen(false);
diff --git a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
index b7cd4982e..0293c1379 100644
--- a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
@@ -36,7 +36,7 @@ export const GovernanceActionsCategory = () => {
   const { isMobile, pagePadding, screenWidth } = useScreenDimension();
   const { isEnabled } = useCardano();
   const navigate = useNavigate();
-  const { dRep } = useCardano();
+  const { user } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -86,7 +86,7 @@ export const GovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [dRep?.isRegistered, isProposalsFetchingNextPage, proposals, searchText]);
+  }, [user?.isRegisteredAsDRep, isProposalsFetchingNextPage, proposals, searchText]);
 
   useEffect(() => {
     if (isEnabled && getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`)) {
diff --git a/govtool/frontend/src/services/requests/getDRepInfo.ts b/govtool/frontend/src/services/requests/getDRepInfo.ts
index 00925091e..1b36cdb09 100644
--- a/govtool/frontend/src/services/requests/getDRepInfo.ts
+++ b/govtool/frontend/src/services/requests/getDRepInfo.ts
@@ -1,9 +1,9 @@
 import { API } from "../API";
 
-import type { DRepInfo } from "@models";
+import type { userInfo } from "@models";
 
 export const getDRepInfo = async (dRepID: string) => {
-  const response = await API.get<DRepInfo>(`/drep/info/${dRepID}`);
+  const response = await API.get<userInfo>(`/drep/info/${dRepID}`);
 
   return response.data;
 };

From 680e9ef3f187a3faf3471e83943f1eeb7253bf57 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Mon, 26 Feb 2024 16:25:15 +0100
Subject: [PATCH 62/82] [#210] Sole voter wallet logic for registration and
 retirement - part 2

---
 govtool/frontend/src/App.tsx                  |  2 +-
 .../molecules/DashboardActionCard.tsx         |  2 +-
 .../components/organisms/DashboardCards.tsx   | 99 +++++++++++++------
 govtool/frontend/src/context/walletUtils.ts   |  5 +-
 govtool/frontend/src/i18n/locales/en.ts       | 23 +++--
 5 files changed, 93 insertions(+), 38 deletions(-)

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index fc659e428..41c45a03b 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -51,7 +51,7 @@ export default function App() {
     const timer = setTimeout(() => setIsDrepLoading(false), 1000);
 
     return () => clearTimeout(timer);
-  }, [data?.isRegisteredAsDRep]);
+  }, [data?.isRegisteredAsDRep, data?.isRegisteredAsSoleVoter]);
 
   const checkTheWalletIsActive = useCallback(() => {
     const hrefCondition =
diff --git a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
index 90cfce5ca..48bd969ec 100644
--- a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
+++ b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
@@ -112,7 +112,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
         ) : null}
         {inProgress && !isLoading ? (
           <Typography variant="title2" fontWeight={700}>
-            in progress
+            In Progress
           </Typography>
         ) : null}
         {description ? (
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 5e360523c..0f2dbe19c 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -236,6 +236,28 @@ export const DashboardCards = () => {
     user?.wasRegisteredAsDRep,
   ]);
 
+  const soleVoterCardDescription = useMemo(() => {
+    if (soleVoterTransaction.transactionHash) {
+      switch (soleVoterTransaction.type) {
+        case "retirement":
+          return "dashboard.soleVoter.retirementInProgress";
+        default:
+          return "dashboard.soleVoter.registrationInProgress";
+      }
+    } else if (user?.isRegisteredAsSoleVoter) {
+      return "dashboard.soleVoter.isRegisteredDescription";
+    } else if (user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep) {
+      return "dashboard.soleVoter.wasRegisteredDescription";
+    } else {
+      return "dashboard.soleVoter.registerDescription";
+    }
+  }, [
+    soleVoterTransaction.transactionHash,
+    soleVoterTransaction.type,
+    user?.isRegisteredAsSoleVoter,
+    user?.wasRegisteredAsSoleVoter,
+  ]);
+
   const registrationCardTitle = useMemo(() => {
     if (registerTransaction?.transactionHash) {
       switch (registerTransaction.type) {
@@ -260,6 +282,28 @@ export const DashboardCards = () => {
     user?.wasRegisteredAsDRep,
   ]);
 
+  const soleVoterCardTitle = useMemo(() => {
+    if (soleVoterTransaction?.transactionHash) {
+      switch (soleVoterTransaction.type) {
+        case "retirement":
+          return t("dashboard.soleVoter.retirement");
+        default:
+          return t("dashboard.soleVoter.registration");
+      }
+    } else if (user?.isRegisteredAsSoleVoter) {
+      return t("dashboard.soleVoter.youAreSoleVoterTitle");
+    } else if (user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep) {
+      return t("dashboard.soleVoter.retireTitle");
+    } else {
+      return t("dashboard.soleVoter.registerTitle");
+    }
+  }, [
+    soleVoterTransaction?.transactionHash,
+    soleVoterTransaction.type,
+    user?.isRegisteredAsSoleVoter,
+    user?.isRegisteredAsSoleVoter,
+  ]);
+
   return isDrepLoading ? (
     <Box
       alignItems="center"
@@ -392,33 +436,46 @@ export const DashboardCards = () => {
             ? t("dashboard.registration.changeMetadata")
             : t("learnMore")
         }
-        cardId={user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep ? dRepIDBech32 : ""}
+        cardId={
+          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep
+            ? dRepIDBech32
+            : ""
+        }
         cardTitle={
-          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep ? t("myDRepId") : ""
+          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep
+            ? t("myDRepId")
+            : ""
         }
         title={registrationCardTitle}
       />
       {/* DREP CARD END*/}
       {/* SOLE VOTER CARD */}
       <DashboardActionCard
+        title={soleVoterCardTitle}
+        inProgress={!!soleVoterTransaction?.transactionHash}
         dataTestidFirstButton={
           user?.isRegisteredAsSoleVoter
             ? "retire-as-sole-voter-button"
             : "register-as-sole-voter-button"
         }
-        firstButtonVariant="contained"
-        secondButtonVariant="outlined"
         dataTestidSecondButton="learn-more-button"
         description={
           <Trans
-            i18nKey={
-              user?.isRegisteredAsSoleVoter
-                ? "dashboard.soleVoter.youAreSoleVoterDescription"
-                : "dashboard.soleVoter.registerAsSoleVoterDescription"
-            }
+            i18nKey={soleVoterCardDescription}
             values={{ votingPower: correctAdaFormat(votingPower) }}
           />
         }
+        firstButtonLabel={
+          soleVoterTransaction?.transactionHash
+            ? ""
+            : t(
+                user?.isRegisteredAsSoleVoter
+                  ? "dashboard.soleVoter.retire"
+                  : user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep
+                  ? "dashboard.soleVoter.reRegister"
+                  : "dashboard.soleVoter.register"
+              )
+        }
         firstButtonAction={() =>
           navigateTo(
             user?.isRegisteredAsSoleVoter
@@ -426,21 +483,10 @@ export const DashboardCards = () => {
               : PATHS.registerAsSoleVoter
           )
         }
-        firstButtonLabel={t(
-          user?.isRegisteredAsSoleVoter
-            ? "dashboard.soleVoter.retire"
-            : "dashboard.soleVoter.register"
-        )}
-        firstButtonVariant={user?.isRegisteredAsSoleVoter ? "outlined" : "contained"}
-        secondButtonVariant={
-          soleVoterTransaction?.transactionHash
-            ? "outlined"
-            : user?.isRegisteredAsSoleVoter
-            ? "text"
-            : "outlined"
+        firstButtonVariant={
+          user?.isRegisteredAsSoleVoter ? "outlined" : "contained"
         }
-        inProgress={!!soleVoterTransaction?.transactionHash}
-        imageURL={IMAGES.soleVoterImage}
+        secondButtonLabel={t("learnMore")}
         secondButtonAction={() =>
           openInNewTab(
             "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
@@ -448,11 +494,8 @@ export const DashboardCards = () => {
         }
         secondButtonLabel={t("learnMore")}
         secondButtonVariant={"outlined"}
-        title={t(
-          user?.isRegisteredAsSoleVoter
-            ? "dashboard.soleVoter.youAreSoleVoterTitle"
-            : "dashboard.soleVoter.registerAsSoleVoterTitle"
-        )}
+        dataTestidSecondButton="learn-more-button"
+        imageURL={IMAGES.soleVoterImage}
       />
       {/* REGISTARTION AS SOLE VOTER CARD END*/}
       {/* GOV ACTIONS LIST CARD */}
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index ea223a238..2b0dfe136 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -20,7 +20,10 @@ export const setLimitedRegistrationInterval = (
         try {
           const data = await getDRepInfo(dRepID);
 
-          if (data.isRegisteredAsDRep === desiredResult) {
+          if (
+            data.isRegisteredAsDRep === desiredResult ||
+            data.isRegisteredAsSoleVoter === desiredResult
+          ) {
             setUser(data);
             clearInterval(interval);
             resolve(desiredResult);
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 6af937395..d67d642ac 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -101,13 +101,23 @@ export const en = {
         youAreRegistered: "You are Registered as a DRep",
       },
       soleVoter: {
+        isRegisteredDescription:
+          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
         register: "Register",
-        registerAsSoleVoterDescription:
+        registerDescription:
           "Vote on Governance Actions using your own voting power of ₳<strong>{{votingPower}}</strong>.",
-        registerAsSoleVoterTitle: "Become a Sole Voter",
+        registerTitle: "Become a Sole Voter",
+        reRegister: "Re-register",
+        registration: "Sole Voter Registration",
+        registrationInProgress:
+          "The registration process is ongoing. This may take several minutes.",
         retire: "Retire",
-        youAreSoleVoterDescription:
-          "Your Voting Power of ₳<strong>{{votingPower}}</strong> can be used to vote.",
+        retireTitle: "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.",
         youAreSoleVoterTitle: "You are a Sole Voter",
       },
     },
@@ -325,11 +335,10 @@ export const en = {
     soleVoter: {
       becomeSoleVoter: "Become a Sole Voter",
       registerDescription:
-      "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
+        "A Sole Voter is someone that can vote on any Governance Action with their own Voting Power, which is equal to the balance of ADA in their connected wallet. <0>Learn More</0> about Sole Voter.\n\nBecoming a Sole Voter will require a refundable deposit of <strong>₳{{deposit}}</strong>.\n\nYour deposit will be refunded if you either retire or delegate your voting power to someone else (a DRep)",
       registerHeading: "What this Means",
-      reRegister:"Re-register",
       retirementDescription:
-      "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
+        "By Retiring you are giving up your Voting Power. You will not be able to vote on any Governance Actions. Your deposit of {{deposit}} ADA will be refunded.\n\nYou can at any time in the future re-register to become a Sole Voter, or you can delegate your Voting Power to someone else, or become a DRep.\n\nThese options are listed in our Guides here: <0>Voting options and Roles</0>",
       retirementHeading: "What Retirement Means",
       retireSoleVoter: "Retire as a Sole Voter",
     },

From 78b7c0d36cec72f44f7a9ba221ad338969212920 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Mon, 26 Feb 2024 18:40:17 +0100
Subject: [PATCH 63/82] [#210] 'user' changed to 'voter'

---
 govtool/frontend/src/App.tsx                  |  4 +-
 .../src/components/atoms/VotingPowerChips.tsx | 10 +--
 .../components/molecules/VoteActionForm.tsx   |  4 +-
 .../components/organisms/DashboardCards.tsx   | 65 ++++++++++---------
 .../DashboardGovernanceActionDetails.tsx      |  4 +-
 .../organisms/DashboardGovernanceActions.tsx  |  4 +-
 .../components/organisms/DashboardTopNav.tsx  |  4 +-
 .../organisms/DelegateTodRepStepOne.tsx       |  6 +-
 .../src/components/organisms/Drawer.tsx       |  4 +-
 .../organisms/RetireAsSoleVoterBoxContent.tsx |  4 +-
 govtool/frontend/src/context/wallet.tsx       | 34 ++++------
 govtool/frontend/src/context/walletUtils.ts   |  4 +-
 .../DashboardGovernanceActionsCategory.tsx    |  9 ++-
 .../src/pages/GovernanceActionsCategory.tsx   |  9 ++-
 14 files changed, 86 insertions(+), 79 deletions(-)

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index 41c45a03b..a282b9e74 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -34,7 +34,7 @@ import { useGetDRepInfo, useWalletConnectionListener } from "./hooks";
 import { RegisterAsSoleVoter } from "./pages/RegisterAsSoleVoter";
 
 export default function App() {
-  const { enable, setUser, setIsDrepLoading } = useCardano();
+  const { enable, setVoter, setIsDrepLoading } = useCardano();
   const navigate = useNavigate();
   const { data } = useGetDRepInfo();
   const { modal, openModal, modals } = useModal();
@@ -47,7 +47,7 @@ export default function App() {
 
   useEffect(() => {
     setIsDrepLoading(true);
-    setUser(data);
+    setVoter(data);
     const timer = setTimeout(() => setIsDrepLoading(false), 1000);
 
     return () => clearTimeout(timer);
diff --git a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
index 6dbeb0d6a..ad707be93 100644
--- a/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
+++ b/govtool/frontend/src/components/atoms/VotingPowerChips.tsx
@@ -13,7 +13,7 @@ import { correctAdaFormat } from "@utils";
 import { Tooltip } from "@atoms";
 
 export const VotingPowerChips = () => {
-  const { user, stakeKey, isDrepLoading } = useCardano();
+  const { voter, stakeKey, isDrepLoading } = useCardano();
   const { dRepVotingPower, isDRepVotingPowerLoading } =
     useGetDRepVotingPowerQuery();
   const { votingPower, powerIsLoading } =
@@ -33,7 +33,7 @@ export const VotingPowerChips = () => {
       alignItems="center"
       maxHeight={isMobile ? undefined : 48}
     >
-      {user?.isRegisteredAsDRep && (
+      {voter?.isRegisteredAsDRep && (
         <Tooltip
           heading={t("tooltips.votingPower.heading")}
           paragraphOne={t("tooltips.votingPower.paragraphOne")}
@@ -55,8 +55,8 @@ export const VotingPowerChips = () => {
           {t("votingPower")}
         </Typography>
       )}
-      {(user?.isRegisteredAsDRep && isDRepVotingPowerLoading) ||
-      (!user?.isRegisteredAsDRep && powerIsLoading) ||
+      {(voter?.isRegisteredAsDRep && isDRepVotingPowerLoading) ||
+      (!voter?.isRegisteredAsDRep && powerIsLoading) ||
       isDrepLoading ? (
         <CircularProgress size={20} color="primary" />
       ) : (
@@ -67,7 +67,7 @@ export const VotingPowerChips = () => {
           sx={{ whiteSpace: "nowrap" }}
         >
           ₳{" "}
-          {user?.isRegisteredAsDRep
+          {voter?.isRegisteredAsDRep
             ? correctAdaFormat(dRepVotingPower) ?? 0
             : correctAdaFormat(votingPower) ?? 0}
         </Typography>
diff --git a/govtool/frontend/src/components/molecules/VoteActionForm.tsx b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
index 9a4efbb95..211d6ad50 100644
--- a/govtool/frontend/src/components/molecules/VoteActionForm.tsx
+++ b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
@@ -25,7 +25,7 @@ export const VoteActionForm = ({
   const [isContext, setIsContext] = useState<boolean>(false);
   const { isMobile, screenWidth } = useScreenDimension();
   const { openModal } = useModal();
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -142,7 +142,7 @@ export const VoteActionForm = ({
             />
           </Box>
         </Box>
-        {user?.isRegisteredAsDRep && (
+        {voter?.isRegisteredAsDRep && (
           <Button
             data-testid="show-votes-button"
             variant="text"
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 0f2dbe19c..b7ad772d0 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -20,7 +20,7 @@ export const DashboardCards = () => {
     buildSignSubmitConwayCertTx,
     delegateTo,
     delegateTransaction,
-    user,
+    voter,
     dRepID,
     dRepIDBech32,
     isDrepLoading,
@@ -224,7 +224,7 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.metadataUpdateInProgress");
       }
-    } else if (user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep) {
+    } else if (voter?.isRegisteredAsDRep || voter?.wasRegisteredAsDRep) {
       return t("dashboard.registration.holdersCanDelegate");
     } else {
       return t("dashboard.registration.ifYouWant");
@@ -232,8 +232,8 @@ export const DashboardCards = () => {
   }, [
     registerTransaction.transactionHash,
     registerTransaction.type,
-    user?.isRegisteredAsDRep,
-    user?.wasRegisteredAsDRep,
+    voter?.isRegisteredAsDRep,
+    voter?.wasRegisteredAsDRep,
   ]);
 
   const soleVoterCardDescription = useMemo(() => {
@@ -244,9 +244,9 @@ export const DashboardCards = () => {
         default:
           return "dashboard.soleVoter.registrationInProgress";
       }
-    } else if (user?.isRegisteredAsSoleVoter) {
+    } else if (voter?.isRegisteredAsSoleVoter) {
       return "dashboard.soleVoter.isRegisteredDescription";
-    } else if (user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep) {
+    } else if (voter?.wasRegisteredAsSoleVoter && !voter?.isRegisteredAsDRep) {
       return "dashboard.soleVoter.wasRegisteredDescription";
     } else {
       return "dashboard.soleVoter.registerDescription";
@@ -254,8 +254,8 @@ export const DashboardCards = () => {
   }, [
     soleVoterTransaction.transactionHash,
     soleVoterTransaction.type,
-    user?.isRegisteredAsSoleVoter,
-    user?.wasRegisteredAsSoleVoter,
+    voter?.isRegisteredAsSoleVoter,
+    voter?.wasRegisteredAsSoleVoter,
   ]);
 
   const registrationCardTitle = useMemo(() => {
@@ -268,9 +268,9 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.registration.dRepUpdate");
       }
-    } else if (user?.isRegisteredAsDRep) {
+    } else if (voter?.isRegisteredAsDRep) {
       return t("dashboard.registration.youAreRegistered");
-    } else if (user?.wasRegisteredAsDRep) {
+    } else if (voter?.wasRegisteredAsDRep) {
       return t("dashboard.registration.registerAgain");
     } else {
       return t("dashboard.registration.registerAsDRep");
@@ -278,8 +278,8 @@ export const DashboardCards = () => {
   }, [
     registerTransaction?.transactionHash,
     registerTransaction.type,
-    user?.isRegisteredAsDRep,
-    user?.wasRegisteredAsDRep,
+    voter?.isRegisteredAsDRep,
+    voter?.wasRegisteredAsDRep,
   ]);
 
   const soleVoterCardTitle = useMemo(() => {
@@ -290,9 +290,9 @@ export const DashboardCards = () => {
         default:
           return t("dashboard.soleVoter.registration");
       }
-    } else if (user?.isRegisteredAsSoleVoter) {
+    } else if (voter?.isRegisteredAsSoleVoter) {
       return t("dashboard.soleVoter.youAreSoleVoterTitle");
-    } else if (user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep) {
+    } else if (voter?.wasRegisteredAsSoleVoter && !voter?.isRegisteredAsDRep) {
       return t("dashboard.soleVoter.retireTitle");
     } else {
       return t("dashboard.soleVoter.registerTitle");
@@ -300,8 +300,8 @@ export const DashboardCards = () => {
   }, [
     soleVoterTransaction?.transactionHash,
     soleVoterTransaction.type,
-    user?.isRegisteredAsSoleVoter,
-    user?.isRegisteredAsSoleVoter,
+    voter?.isRegisteredAsSoleVoter,
+    voter?.isRegisteredAsSoleVoter,
   ]);
 
   return isDrepLoading ? (
@@ -383,25 +383,27 @@ export const DashboardCards = () => {
       {/* REGISTARTION AS DREP CARD */}
       <DashboardActionCard
         dataTestidFirstButton={
-          user?.isRegisteredAsDRep ? "retire-button" : "register-button"
+          voter?.isRegisteredAsDRep ? "retire-button" : "register-button"
         }
         dataTestidDrepIdBox="my-drep-id"
-        firstButtonVariant={user?.isRegisteredAsDRep ? "outlined" : "contained"}
+        firstButtonVariant={
+          voter?.isRegisteredAsDRep ? "outlined" : "contained"
+        }
         secondButtonVariant={
           registerTransaction?.transactionHash
             ? "outlined"
-            : user?.isRegisteredAsDRep
+            : voter?.isRegisteredAsDRep
             ? "text"
             : "outlined"
         }
         dataTestidSecondButton={
-          user?.isRegisteredAsDRep
+          voter?.isRegisteredAsDRep
             ? "change-metadata-button"
             : "register-learn-more-button"
         }
         description={registrationCardDescription}
         firstButtonAction={
-          user?.isRegisteredAsDRep
+          voter?.isRegisteredAsDRep
             ? retireAsDrep
             : () => navigateTo(PATHS.registerAsdRep)
         }
@@ -411,7 +413,7 @@ export const DashboardCards = () => {
             ? ""
             : t(
                 `dashboard.registration.${
-                  user?.isRegisteredAsDRep ? "retire" : "register"
+                  voter?.isRegisteredAsDRep ? "retire" : "register"
                 }`
               )
         }
@@ -420,7 +422,7 @@ export const DashboardCards = () => {
         secondButtonAction={
           registerTransaction?.transactionHash
             ? () => openInNewTab("https://adanordic.com/latest_transactions")
-            : user?.isRegisteredAsDRep
+            : voter?.isRegisteredAsDRep
             ? () => {
                 navigateTo(PATHS.updateMetadata);
               }
@@ -432,17 +434,17 @@ export const DashboardCards = () => {
         secondButtonLabel={
           registerTransaction?.transactionHash
             ? t("seeTransaction")
-            : user?.isRegisteredAsDRep
+            : voter?.isRegisteredAsDRep
             ? t("dashboard.registration.changeMetadata")
             : t("learnMore")
         }
         cardId={
-          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep
+          voter?.isRegisteredAsDRep || voter?.wasRegisteredAsDRep
             ? dRepIDBech32
             : ""
         }
         cardTitle={
-          user?.isRegisteredAsDRep || user?.wasRegisteredAsDRep
+          voter?.isRegisteredAsDRep || voter?.wasRegisteredAsDRep
             ? t("myDRepId")
             : ""
         }
@@ -469,22 +471,23 @@ export const DashboardCards = () => {
           soleVoterTransaction?.transactionHash
             ? ""
             : t(
-                user?.isRegisteredAsSoleVoter
+                voter?.isRegisteredAsSoleVoter
                   ? "dashboard.soleVoter.retire"
-                  : user?.wasRegisteredAsSoleVoter && !user?.isRegisteredAsDRep
+                  : voter?.wasRegisteredAsSoleVoter &&
+                    !voter?.isRegisteredAsDRep
                   ? "dashboard.soleVoter.reRegister"
                   : "dashboard.soleVoter.register"
               )
         }
         firstButtonAction={() =>
           navigateTo(
-            user?.isRegisteredAsSoleVoter
+            voter?.isRegisteredAsSoleVoter
               ? PATHS.retireAsSoleVoter
               : PATHS.registerAsSoleVoter
           )
         }
         firstButtonVariant={
-          user?.isRegisteredAsSoleVoter ? "outlined" : "contained"
+          voter?.isRegisteredAsSoleVoter ? "outlined" : "contained"
         }
         secondButtonLabel={t("learnMore")}
         secondButtonAction={() =>
@@ -505,7 +508,7 @@ export const DashboardCards = () => {
         firstButtonAction={() => navigate(PATHS.dashboard_governance_actions)}
         firstButtonLabel={t(
           `dashboard.govActions.${
-            user?.isRegisteredAsDRep ? "reviewAndVote" : "view"
+            voter?.isRegisteredAsDRep ? "reviewAndVote" : "view"
           }`
         )}
         imageURL={IMAGES.govActionListImage}
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
index 50ac76595..b197c3f6b 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
@@ -28,7 +28,7 @@ import {
 } from "@utils";
 
 export const DashboardGovernanceActionDetails = () => {
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const { state, hash } = useLocation();
   const navigate = useNavigate();
   const { isMobile, screenWidth } = useScreenDimension();
@@ -134,7 +134,7 @@ export const DashboardGovernanceActionDetails = () => {
                 ? formatDisplayDate(state.expiryDate)
                 : formatDisplayDate(data.proposal.expiryDate)
             }
-            isDRep={user?.isRegisteredAsDRep}
+            isDRep={voter?.isRegisteredAsDRep}
             noVotes={state ? state.noVotes : data.proposal.noVotes}
             type={
               state
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
index 39c2b7cf4..a8d769f06 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
@@ -65,7 +65,7 @@ export const DashboardGovernanceActions = () => {
     state && state.isVotedListOnLoad ? 1 : 0
   );
 
-  const { user, isDrepLoading } = useCardano();
+  const { voter, isDrepLoading } = useCardano();
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
 
@@ -121,7 +121,7 @@ export const DashboardGovernanceActions = () => {
             sortingActive={Boolean(chosenSorting)}
             sortOpen={sortOpen}
           />
-          {user?.isRegisteredAsDRep && (
+          {voter?.isRegisteredAsDRep && (
             <Tabs
               sx={{
                 marginTop: 3,
diff --git a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
index b167ceb44..3b28a149c 100644
--- a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
@@ -29,7 +29,7 @@ export const DashboardTopNav = ({
   isVotingPowerHidden,
 }: DashboardTopNavProps) => {
   const { isMobile, screenWidth } = useScreenDimension();
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const navigate = useNavigate();
   const [isDrawerOpen, setIsDrawerOpen] = useState<boolean>(false);
   const { t } = useTranslation();
@@ -168,7 +168,7 @@ export const DashboardTopNav = ({
                   </Grid>
                 </Grid>
               </Box>
-              {user?.isRegisteredAsDRep && <DRepInfoCard />}
+              {voter?.isRegisteredAsDRep && <DRepInfoCard />}
               <Box py={2} />
               <WalletInfoCard />
             </Box>
diff --git a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
index a03a4b7e0..f46a454c1 100644
--- a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
+++ b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
@@ -21,7 +21,7 @@ interface DelegateProps {
 export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   const navigate = useNavigate();
   const {
-    user,
+    voter,
     dRepID,
     buildSignSubmitConwayCertTx,
     buildVoteDelegationCert,
@@ -133,7 +133,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
   }, [
     chosenOption,
     delegate,
-    user?.isRegisteredAsDRep,
+    voter?.isRegisteredAsDRep,
     dRepID,
     isDelegationLoading,
     isMobile,
@@ -215,7 +215,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
           flexDirection={"column"}
           rowGap={3}
         >
-          {user?.isRegisteredAsDRep && currentDelegation !== dRepID && (
+          {voter?.isRegisteredAsDRep && currentDelegation !== dRepID && (
             <Grid item>
               <ActionRadio
                 onChange={setChosenOption}
diff --git a/govtool/frontend/src/components/organisms/Drawer.tsx b/govtool/frontend/src/components/organisms/Drawer.tsx
index 43291e76c..914674bda 100644
--- a/govtool/frontend/src/components/organisms/Drawer.tsx
+++ b/govtool/frontend/src/components/organisms/Drawer.tsx
@@ -9,7 +9,7 @@ import { openInNewTab } from "@/utils";
 import { useTranslation } from "@hooks";
 
 export const Drawer = () => {
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const { t } = useTranslation();
 
   return (
@@ -61,7 +61,7 @@ export const Drawer = () => {
           ))}
         </Grid>
         <Box px={2}>
-          {user?.isRegisteredAsDRep && <DRepInfoCard />}
+          {voter?.isRegisteredAsDRep && <DRepInfoCard />}
           <Box py={2} />
           <WalletInfoCard />
           <Box my={1}>
diff --git a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
index 90eff76ee..bb371f0c4 100644
--- a/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
+++ b/govtool/frontend/src/components/organisms/RetireAsSoleVoterBoxContent.tsx
@@ -9,7 +9,7 @@ import { useCardano } from "@/context";
 export const RetireAsSoleVoterBoxContent = () => {
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
-  const { user } = useCardano();
+  const { voter } = useCardano();
 
   return (
     <>
@@ -29,7 +29,7 @@ export const RetireAsSoleVoterBoxContent = () => {
       >
         <Trans
           i18nKey="soleVoter.retirementDescription"
-          values={{ deposit: correctAdaFormat(user?.deposit) }}
+          values={{ deposit: correctAdaFormat(voter?.deposit) }}
           components={[
             <Link
               onClick={() => openInNewTab("https://sancho.network/")}
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index b8abbf9f1..dbda6cf99 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -100,14 +100,14 @@ interface CardanoContext {
   enable: (walletName: string) => Promise<EnableResponse>;
   isEnableLoading: string | null;
   error?: string;
-  user: userInfo | undefined;
+  voter: userInfo | undefined;
   isEnabled: boolean;
   pubDRepKey: string;
   dRepID: string;
   dRepIDBech32: string;
   isMainnet: boolean;
   stakeKey?: string;
-  setUser: (key: undefined | userInfo) => void;
+  setVoter: (key: undefined | userInfo) => void;
   setStakeKey: (key: string) => void;
   stakeKeys: string[];
   walletApi?: CardanoApiWallet;
@@ -170,13 +170,7 @@ CardanoContext.displayName = "CardanoContext";
 
 function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
-  const [isEnableLoading, setIsEnableLoading] = useState<string | null>(null);
-  const [dRep, setDRep] = useState<DRepInfo | undefined>(undefined);
-  const [soleVoter, setSoleVoter] = useState<DRepInfo | undefined>({
-    deposit: 4000000,
-    isRegistered: false,
-    wasRegistered: false,
-  });
+  const [voter, setVoter] = useState<userInfo | undefined>(undefined);
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
   );
@@ -356,7 +350,7 @@ function CardanoProvider(props: Props) {
                 10,
                 dRepID,
                 registerTransaction.type,
-                setUser
+                setVoter
               ).then((isRegistered) => {
                 if (registerTransaction.type === "registration") {
                   if (isRegistered) {
@@ -423,7 +417,7 @@ function CardanoProvider(props: Props) {
               10,
               dRepID,
               soleVoterTransaction.type,
-              setUser
+              setVoter
             ).then((isRegistered) => {
               if (soleVoterTransaction.type === "registration") {
                 if (isRegistered) {
@@ -853,9 +847,9 @@ function CardanoProvider(props: Props) {
         // Add output of 1 ADA to the address of our wallet
         let outputValue = BigNum.from_str("1000000");
 
-        if (registrationType === "retirement" && user?.deposit) {
+        if (registrationType === "retirement" && voter?.deposit) {
           outputValue = outputValue.checked_add(
-            BigNum.from_str(`${user?.deposit}`)
+            BigNum.from_str(`${voter?.deposit}`)
           );
         }
 
@@ -1005,7 +999,7 @@ function CardanoProvider(props: Props) {
       voteTransaction.transactionHash,
       stakeKey,
       isPendingTransaction,
-      user,
+      voter,
     ]
   );
 
@@ -1154,7 +1148,7 @@ function CardanoProvider(props: Props) {
 
         const dRepRetirementCert = DrepDeregistration.new(
           dRepCred,
-          BigNum.from_str(`${user?.deposit}`)
+          BigNum.from_str(`${voter?.deposit}`)
         );
         // add cert to tbuilder
         certBuilder.add(
@@ -1166,7 +1160,7 @@ function CardanoProvider(props: Props) {
         console.log(e);
         throw e;
       }
-    }, [dRepID, user]);
+    }, [dRepID, voter]);
 
   const buildVote = useCallback(
     async (
@@ -1227,7 +1221,7 @@ function CardanoProvider(props: Props) {
     () => ({
       address,
       enable,
-      user,
+      voter,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1235,7 +1229,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setUser,
+      setVoter,
       setStakeKey,
       stakeKeys,
       walletApi,
@@ -1263,7 +1257,7 @@ function CardanoProvider(props: Props) {
     [
       address,
       enable,
-      user,
+      voter,
       isEnabled,
       isMainnet,
       disconnectWallet,
@@ -1271,7 +1265,7 @@ function CardanoProvider(props: Props) {
       dRepIDBech32,
       pubDRepKey,
       stakeKey,
-      setUser,
+      setVoter,
       setStakeKey,
       stakeKeys,
       walletApi,
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index 2b0dfe136..feb134841 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -7,7 +7,7 @@ export const setLimitedRegistrationInterval = (
   attemptsNumber: number,
   dRepID: string,
   transactionType: DRepActionType | Omit<DRepActionType, "update">,
-  setUser: (key: undefined | userInfo) => void
+  setVoter: (key: undefined | userInfo) => void
 ): Promise<boolean> => {
   return new Promise(async (resolve) => {
     const desiredResult = transactionType === "registration" ? true : false;
@@ -24,7 +24,7 @@ export const setLimitedRegistrationInterval = (
             data.isRegisteredAsDRep === desiredResult ||
             data.isRegisteredAsSoleVoter === desiredResult
           ) {
-            setUser(data);
+            setVoter(data);
             clearInterval(interval);
             resolve(desiredResult);
           }
diff --git a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
index d71a5e317..1fffa539d 100644
--- a/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx
@@ -38,7 +38,7 @@ export const DashboardGovernanceActionsCategory = () => {
   const [chosenSorting, setChosenSorting] = useState<string>("");
   const { isMobile, screenWidth } = useScreenDimension();
   const navigate = useNavigate();
-  const { user, isDrepLoading, voteTransaction } = useCardano();
+  const { voter, isDrepLoading, voteTransaction } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -88,7 +88,12 @@ export const DashboardGovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [proposals, user?.isRegisteredAsDRep, searchText, isProposalsFetchingNextPage]);
+  }, [
+    proposals,
+    voter?.isRegisteredAsDRep,
+    searchText,
+    isProposalsFetchingNextPage,
+  ]);
 
   const closeSorts = useCallback(() => {
     setSortOpen(false);
diff --git a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
index 0293c1379..ef6c40a50 100644
--- a/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
+++ b/govtool/frontend/src/pages/GovernanceActionsCategory.tsx
@@ -36,7 +36,7 @@ export const GovernanceActionsCategory = () => {
   const { isMobile, pagePadding, screenWidth } = useScreenDimension();
   const { isEnabled } = useCardano();
   const navigate = useNavigate();
-  const { user } = useCardano();
+  const { voter } = useCardano();
   const { t } = useTranslation();
 
   const {
@@ -86,7 +86,12 @@ export const GovernanceActionsCategory = () => {
         .toLowerCase()
         .includes(searchText.toLowerCase())
     );
-  }, [user?.isRegisteredAsDRep, isProposalsFetchingNextPage, proposals, searchText]);
+  }, [
+    voter?.isRegisteredAsDRep,
+    isProposalsFetchingNextPage,
+    proposals,
+    searchText,
+  ]);
 
   useEffect(() => {
     if (isEnabled && getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`)) {

From e4d8f1bf9d814c9f50cbfc60263b511f6cec1ebc Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Mon, 26 Feb 2024 18:43:26 +0100
Subject: [PATCH 64/82] [#210] 'UserInfo' changed to 'VoterInfo'

---
 govtool/frontend/src/context/wallet.tsx               | 8 ++++----
 govtool/frontend/src/context/walletUtils.ts           | 4 ++--
 govtool/frontend/src/models/api.ts                    | 2 +-
 govtool/frontend/src/services/requests/getDRepInfo.ts | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index dbda6cf99..26e5244c4 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -50,7 +50,7 @@ import { Trans } from "react-i18next";
 import { useModal, useSnackbar } from ".";
 
 import { PATHS } from "@consts";
-import { CardanoApiWallet, userInfo, Protocol } from "@models";
+import { CardanoApiWallet, VoterInfo, Protocol } from "@models";
 import type { StatusModalState } from "@organisms";
 import {
   getPubDRepID,
@@ -100,14 +100,14 @@ interface CardanoContext {
   enable: (walletName: string) => Promise<EnableResponse>;
   isEnableLoading: string | null;
   error?: string;
-  voter: userInfo | undefined;
+  voter: VoterInfo | undefined;
   isEnabled: boolean;
   pubDRepKey: string;
   dRepID: string;
   dRepIDBech32: string;
   isMainnet: boolean;
   stakeKey?: string;
-  setVoter: (key: undefined | userInfo) => void;
+  setVoter: (key: undefined | VoterInfo) => void;
   setStakeKey: (key: string) => void;
   stakeKeys: string[];
   walletApi?: CardanoApiWallet;
@@ -170,7 +170,7 @@ CardanoContext.displayName = "CardanoContext";
 
 function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
-  const [voter, setVoter] = useState<userInfo | undefined>(undefined);
+  const [voter, setVoter] = useState<VoterInfo | undefined>(undefined);
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
   );
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index feb134841..d68d8e7cf 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/govtool/frontend/src/context/walletUtils.ts
@@ -1,13 +1,13 @@
 import { getAdaHolderCurrentDelegation, getDRepInfo } from "@services";
 import { DRepActionType } from "./wallet";
-import { userInfo } from "@models";
+import { VoterInfo } from "@models";
 
 export const setLimitedRegistrationInterval = (
   intervalTime: number,
   attemptsNumber: number,
   dRepID: string,
   transactionType: DRepActionType | Omit<DRepActionType, "update">,
-  setVoter: (key: undefined | userInfo) => void
+  setVoter: (key: undefined | VoterInfo) => void
 ): Promise<boolean> => {
   return new Promise(async (resolve) => {
     const desiredResult = transactionType === "registration" ? true : false;
diff --git a/govtool/frontend/src/models/api.ts b/govtool/frontend/src/models/api.ts
index ecbe1fc2e..9f16b07ff 100644
--- a/govtool/frontend/src/models/api.ts
+++ b/govtool/frontend/src/models/api.ts
@@ -1,4 +1,4 @@
-export interface userInfo {
+export interface VoterInfo {
   isRegisteredAsDRep: boolean;
   wasRegisteredAsDRep: boolean;
   isRegisteredAsSoleVoter: boolean;
diff --git a/govtool/frontend/src/services/requests/getDRepInfo.ts b/govtool/frontend/src/services/requests/getDRepInfo.ts
index 1b36cdb09..869fcd337 100644
--- a/govtool/frontend/src/services/requests/getDRepInfo.ts
+++ b/govtool/frontend/src/services/requests/getDRepInfo.ts
@@ -1,9 +1,9 @@
 import { API } from "../API";
 
-import type { userInfo } from "@models";
+import type { VoterInfo } from "@models";
 
 export const getDRepInfo = async (dRepID: string) => {
-  const response = await API.get<userInfo>(`/drep/info/${dRepID}`);
+  const response = await API.get<VoterInfo>(`/drep/info/${dRepID}`);
 
   return response.data;
 };

From d65b44bd3d07384deccf3ac13fd04e75c4fc36a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Tue, 27 Feb 2024 08:59:21 +0100
Subject: [PATCH 65/82] [#119] add registration as sole voter

---
 CHANGELOG.md                                        |  3 +--
 .../src/components/organisms/DashboardCards.tsx     |  4 +---
 govtool/frontend/src/context/wallet.tsx             |  5 +----
 .../src/hooks/queries/useGetDRepVotingPowerQuery.ts | 13 ++++++++++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c094e85f..a181f9b9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,7 @@ As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
 ## [Unreleased]
-- Add retire as Sole Voter screen [Issue 198](https://github.com/IntersectMBO/govtool/issues/198)
-- Add Sole Voter card [Issue 141](https://github.com/IntersectMBO/govtool/issues/141)
+- Add possibility to vote on behalf of myself - Sole Voter [Issue 119](https://github.com/IntersectMBO/govtool/issues/119)
 - Create DRep registration page about roles [Issue 205](https://github.com/IntersectMBO/govtool/issues/205)
 - Create Checkbox component. Improve Field and ControlledField [Issue 177](https://github.com/IntersectMBO/govtool/pull/177)
 - Vitest unit tests added for utils functions [Issue 81](https://github.com/IntersectMBO/govtool/issues/81)
diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index b7ad772d0..34018f07a 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -456,7 +456,7 @@ export const DashboardCards = () => {
         title={soleVoterCardTitle}
         inProgress={!!soleVoterTransaction?.transactionHash}
         dataTestidFirstButton={
-          user?.isRegisteredAsSoleVoter
+          voter?.isRegisteredAsSoleVoter
             ? "retire-as-sole-voter-button"
             : "register-as-sole-voter-button"
         }
@@ -495,9 +495,7 @@ export const DashboardCards = () => {
             "https://docs.sanchogov.tools/faqs/what-does-it-mean-to-register-as-a-drep"
           )
         }
-        secondButtonLabel={t("learnMore")}
         secondButtonVariant={"outlined"}
-        dataTestidSecondButton="learn-more-button"
         imageURL={IMAGES.soleVoterImage}
       />
       {/* REGISTARTION AS SOLE VOTER CARD END*/}
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index 26e5244c4..1b29b1d5d 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -170,6 +170,7 @@ CardanoContext.displayName = "CardanoContext";
 
 function CardanoProvider(props: Props) {
   const [isEnabled, setIsEnabled] = useState(false);
+  const [isEnableLoading, setIsEnableLoading] = useState<string | null>(null);
   const [voter, setVoter] = useState<VoterInfo | undefined>(undefined);
   const [walletApi, setWalletApi] = useState<CardanoApiWallet | undefined>(
     undefined
@@ -1251,8 +1252,6 @@ function CardanoProvider(props: Props) {
       isDrepLoading,
       setIsDrepLoading,
       isEnableLoading,
-      soleVoter,
-      setSoleVoter,
     }),
     [
       address,
@@ -1287,8 +1286,6 @@ function CardanoProvider(props: Props) {
       isDrepLoading,
       setIsDrepLoading,
       isEnableLoading,
-      soleVoter,
-      setSoleVoter,
     ]
   );
 
diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
index 836946aa9..4accd00fb 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerQuery.ts
@@ -5,14 +5,21 @@ import { useCardano } from "@context";
 import { getDRepVotingPower } from "@services";
 
 export const useGetDRepVotingPowerQuery = () => {
-  const { dRepID, dRep } = useCardano();
+  const { dRepID, voter } = useCardano();
 
   const { data, isLoading } = useQuery({
-    queryKey: [QUERY_KEYS.useGetDRepVotingPowerKey, dRepID, dRep?.isRegistered],
+    queryKey: [
+      QUERY_KEYS.useGetDRepVotingPowerKey,
+      dRepID,
+      voter?.isRegisteredAsDRep,
+      voter?.isRegisteredAsSoleVoter,
+    ],
     queryFn: async () => {
       return await getDRepVotingPower({ dRepID });
     },
-    enabled: !!dRepID && !!dRep?.isRegistered,
+    enabled:
+      !!dRepID &&
+      (!!voter?.isRegisteredAsDRep || !!voter?.isRegisteredAsSoleVoter),
   });
 
   return { dRepVotingPower: data, isDRepVotingPowerLoading: isLoading };

From ebe8130112102b57eb698289ee9bdc5b5874e1fd Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Tue, 27 Feb 2024 09:54:05 +0100
Subject: [PATCH 66/82] [#119] Duplicated lines removed

---
 govtool/frontend/src/consts/images.ts   | 2 --
 govtool/frontend/src/i18n/locales/en.ts | 1 -
 2 files changed, 3 deletions(-)

diff --git a/govtool/frontend/src/consts/images.ts b/govtool/frontend/src/consts/images.ts
index e178dbf93..72f60559d 100644
--- a/govtool/frontend/src/consts/images.ts
+++ b/govtool/frontend/src/consts/images.ts
@@ -10,8 +10,6 @@ export const IMAGES = {
   govActionDelegateImage: "/images/GovActionDelegate.png",
   govActionListImage: "/images/GovActionList.png",
   govActionRegisterImage: "/images/GovActionRegister.png",
-  heroImage: "/images/HeroImage.png",
-  soleVoterImage: "/images/GovActionsSoleVoter.png",
   successImage: "/images/Success.png",
   warningImage: "/images/Warning.png",
   warningYellowImage: "/images/WarningYellow.png",
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index d67d642ac..e3ec7bdea 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -416,7 +416,6 @@ export const en = {
     back: "Back",
     backToDashboard: "Back to dashboard",
     backToList: "Back to the list",
-    backToDashboard: "Back to dashboard",
     cancel: "Cancel",
     clear: "Clear",
     confirm: "Confirm",

From 62bbe0409c1b3be786238edaa661528299426215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Tue, 27 Feb 2024 10:41:26 +0100
Subject: [PATCH 67/82] [#119] Make voting on governance actions possible

---
 .../src/components/organisms/BgCard.tsx       |  2 +-
 .../DashboardGovernanceActionDetails.tsx      |  2 +-
 .../organisms/DashboardGovernanceActions.tsx  |  2 +-
 .../components/organisms/DashboardTopNav.tsx  |  5 ++-
 .../organisms/DelegateTodRepStepOne.tsx       | 42 ++++++++++---------
 .../organisms/RegisterAsdRepStepTwo.tsx       |  4 +-
 govtool/frontend/src/i18n/locales/en.ts       |  1 +
 7 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/govtool/frontend/src/components/organisms/BgCard.tsx b/govtool/frontend/src/components/organisms/BgCard.tsx
index 98f537eee..94c7b9ee8 100644
--- a/govtool/frontend/src/components/organisms/BgCard.tsx
+++ b/govtool/frontend/src/components/organisms/BgCard.tsx
@@ -61,7 +61,7 @@ export const BgCard = ({
         {actionButtonLabel}
       </LoadingButton>
     );
-  }, [isLoadingActionButton, isMobile]);
+  }, [isLoadingActionButton, isMobile, actionButtonLabel]);
 
   return (
     <Box
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
index b197c3f6b..413f76818 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActionDetails.tsx
@@ -134,7 +134,7 @@ export const DashboardGovernanceActionDetails = () => {
                 ? formatDisplayDate(state.expiryDate)
                 : formatDisplayDate(data.proposal.expiryDate)
             }
-            isDRep={voter?.isRegisteredAsDRep}
+            isDRep={voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter}
             noVotes={state ? state.noVotes : data.proposal.noVotes}
             type={
               state
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
index a8d769f06..c8b18afb6 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
@@ -121,7 +121,7 @@ export const DashboardGovernanceActions = () => {
             sortingActive={Boolean(chosenSorting)}
             sortOpen={sortOpen}
           />
-          {voter?.isRegisteredAsDRep && (
+          {(voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter) && (
             <Tabs
               sx={{
                 marginTop: 3,
diff --git a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
index 3b28a149c..00f44fedd 100644
--- a/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardTopNav.tsx
@@ -44,7 +44,7 @@ export const DashboardTopNav = ({
       alignItems={"center"}
       justifyContent={"space-between"}
       borderBottom={1}
-      borderColor={"#D6E2FF"}
+      borderColor="#D6E2FF"
       position="fixed"
       zIndex={100}
       flex={1}
@@ -168,7 +168,8 @@ export const DashboardTopNav = ({
                   </Grid>
                 </Grid>
               </Box>
-              {voter?.isRegisteredAsDRep && <DRepInfoCard />}
+              {(voter?.isRegisteredAsDRep ||
+                voter?.isRegisteredAsSoleVoter) && <DRepInfoCard />}
               <Box py={2} />
               <WalletInfoCard />
             </Box>
diff --git a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
index f46a454c1..3f38f8ba8 100644
--- a/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
+++ b/govtool/frontend/src/components/organisms/DelegateTodRepStepOne.tsx
@@ -134,6 +134,7 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
     chosenOption,
     delegate,
     voter?.isRegisteredAsDRep,
+    voter?.isRegisteredAsSoleVoter,
     dRepID,
     isDelegationLoading,
     isMobile,
@@ -177,9 +178,9 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
             <Box
               border={1}
               borderColor="#D6E2FF"
-              py={"12px"}
-              px={"24px"}
-              mb={"32px"}
+              py="12px"
+              px="24px"
+              mb="32px"
               borderRadius={3}
             >
               <Box sx={{ display: "flex", alignItems: "center" }}>
@@ -211,24 +212,27 @@ export const DelegateTodRepStepOne = ({ setStep }: DelegateProps) => {
         <Grid
           container
           columns={1}
-          display={"flex"}
-          flexDirection={"column"}
+          display="flex"
+          flexDirection="column"
           rowGap={3}
         >
-          {voter?.isRegisteredAsDRep && currentDelegation !== dRepID && (
-            <Grid item>
-              <ActionRadio
-                onChange={setChosenOption}
-                tooltipTitle={t("tooltips.delegateTodRep.toMyself.heading")}
-                tooltipText={t("tooltips.delegateTodRep.toMyself.paragraphOne")}
-                isChecked={chosenOption === dRepID}
-                subtitle={t("delegation.toMyself.subtitle")}
-                title={t("delegation.toMyself.title")}
-                value={dRepID}
-                dataTestId="delegate-to-myself-card"
-              />
-            </Grid>
-          )}
+          {(voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter) &&
+            currentDelegation !== dRepID && (
+              <Grid item>
+                <ActionRadio
+                  onChange={setChosenOption}
+                  tooltipTitle={t("tooltips.delegateTodRep.toMyself.heading")}
+                  tooltipText={t(
+                    "tooltips.delegateTodRep.toMyself.paragraphOne"
+                  )}
+                  isChecked={chosenOption === dRepID}
+                  subtitle={t("delegation.toMyself.subtitle")}
+                  title={t("delegation.toMyself.title")}
+                  value={dRepID}
+                  dataTestId="delegate-to-myself-card"
+                />
+              </Grid>
+            )}
           <Grid item>
             <ActionRadio
               onChange={setChosenOption}
diff --git a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
index 2c1a0f37d..2e6acdebb 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
@@ -18,7 +18,7 @@ interface Props {
 export const RegisterAsdRepStepTwo = ({ setStep }: Props) => {
   const { t } = useTranslation();
   const { isMobile } = useScreenDimension();
-  const { control, errors } = useRegisterAsdRepFormContext();
+  const { showSubmitButton, control, errors } = useRegisterAsdRepFormContext();
 
   const onClickContinue = useCallback(() => setStep(3), []);
 
@@ -26,7 +26,7 @@ export const RegisterAsdRepStepTwo = ({ setStep }: Props) => {
 
   return (
     <BgCard
-      actionButtonLabel={t("skip")}
+      actionButtonLabel={showSubmitButton ? t("continue") : t("skip")}
       onClickActionButton={onClickContinue}
       onClickBackButton={onClickBackButton}
     >
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index e3ec7bdea..edf57f75d 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -431,6 +431,7 @@ export const en = {
     ok: "Ok",
     select: "Select",
     seeTransaction: "See transaction",
+    submit: "Submit",
     skip: "Skip",
     sortBy: "Sort by",
     thisLink: "this link",

From 4bef8d1e28209155c936f51f3bddf9494cdde926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Tue, 27 Feb 2024 10:54:10 +0100
Subject: [PATCH 68/82] [#119] Post code review adjustments

---
 .../src/components/molecules/DashboardActionCard.tsx       | 5 +++--
 .../frontend/src/components/molecules/VoteActionForm.tsx   | 2 +-
 govtool/frontend/src/pages/Dashboard.tsx                   | 7 ++-----
 govtool/frontend/src/pages/DelegateTodRep.tsx              | 7 ++-----
 govtool/frontend/src/pages/RegisterAsSoleVoter.tsx         | 7 ++-----
 govtool/frontend/src/pages/RegisterAsdRep.tsx              | 7 ++-----
 govtool/frontend/src/pages/RetireAsSoleVoter.tsx           | 7 ++-----
 govtool/frontend/src/pages/UpdatedRepMetadata.tsx          | 7 ++-----
 govtool/frontend/src/utils/checkIsWalletConnected.ts       | 5 +++++
 govtool/frontend/src/utils/index.ts                        | 3 ++-
 10 files changed, 23 insertions(+), 34 deletions(-)
 create mode 100644 govtool/frontend/src/utils/checkIsWalletConnected.ts

diff --git a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
index 48bd969ec..d394c12a4 100644
--- 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
index 211d6ad50..920021f24 100644
--- 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
index db72fd2a2..7899270cc 100644
--- 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
index 8749bb225..05b11cc44 100644
--- 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
index ea7018a85..822d809ce 100644
--- 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
index 791c30feb..3653b806d 100644
--- 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
index c661be2cd..7b8fde1cc 100644
--- 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
index 6d5b0cb22..3d80064e7 100644
--- 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
new file mode 100644
index 000000000..4c91a1137
--- /dev/null
+++ 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
index f28259282..95c368dd8 100644
--- 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";

From 8b58407bafd03aedeb4ceeb6c6d927b0351e86db Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Wed, 21 Feb 2024 17:29:51 +0100
Subject: [PATCH 69/82] [#212] provide sole voter information in drep/info

Extend the drep/info endpoint by adding isRegisteredAsSoleVoter and wasRegisteredAsSoleVoter fields
---
 govtool/backend/sql/get-drep-info.sql | 44 ++++++++++++++++++++++++---
 govtool/backend/src/VVA/API.hs        |  6 ++--
 govtool/backend/src/VVA/API/Types.hs  | 12 +++++---
 govtool/backend/src/VVA/DRep.hs       | 10 +++---
 govtool/backend/src/VVA/Types.hs      |  6 ++--
 5 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/govtool/backend/sql/get-drep-info.sql b/govtool/backend/sql/get-drep-info.sql
index 341dbabbc..65611fe76 100644
--- a/govtool/backend/sql/get-drep-info.sql
+++ b/govtool/backend/sql/get-drep-info.sql
@@ -1,6 +1,6 @@
 WITH DRepId AS (
     SELECT decode(?, 'hex') as raw
-), IsRegistered AS (
+), IsRegisteredAsDRep AS (
     SELECT (deposit>0) as value,
            deposit as deposit
     FROM drep_registration
@@ -9,9 +9,10 @@ WITH DRepId AS (
     CROSS JOIN DRepId
     WHERE drep_hash.raw = DRepId.raw
     and deposit is not null
+    and drep_registration.voting_anchor_id is not null
     ORDER BY drep_registration.tx_id DESC
     LIMIT 1
-), WasRegistered AS (
+), WasRegisteredAsDRep AS (
     select (EXISTS (
         SELECT *
         FROM drep_registration
@@ -20,9 +21,42 @@ WITH DRepId AS (
         CROSS JOIN DRepId
         WHERE drep_hash.raw = DRepId.raw
         and drep_registration.deposit > 0
+        and drep_registration.voting_anchor_id is not null
+    )) as value
+), IsRegisteredAsSoleVoter AS (
+    SELECT (deposit>0) as value,
+           deposit as deposit
+    FROM drep_registration
+    JOIN drep_hash
+    ON drep_hash.id = drep_registration.drep_hash_id
+    CROSS JOIN DRepId
+    WHERE drep_hash.raw = DRepId.raw
+    and deposit is not null
+    and drep_registration.voting_anchor_id is null
+    ORDER BY drep_registration.tx_id DESC
+    LIMIT 1
+), WasRegisteredAsSoleVoter AS (
+    select (EXISTS (
+        SELECT *
+        FROM drep_registration
+        JOIN drep_hash
+        ON drep_hash.id = drep_registration.drep_hash_id
+        CROSS JOIN DRepId
+        WHERE drep_hash.raw = DRepId.raw
+        and drep_registration.deposit > 0
+        and drep_registration.voting_anchor_id is null
     )) as value
 )
-SELECT IsRegistered.value, WasRegistered.value, IsRegistered.deposit
-FROM WasRegistered
-LEFT JOIN IsRegistered
+SELECT
+    IsRegisteredAsDrep.value,
+    WasRegisteredAsDRep.value,
+    IsRegisteredAsSoleVoter.value,
+    WasRegisteredAsSoleVoter.value,
+    coalesce(IsRegisteredAsDRep.deposit, IsRegisteredAsSoleVoter.deposit)
+FROM WasRegisteredAsDRep
+LEFT JOIN IsRegisteredAsDRep
+ON 1=1
+LEFT JOIN WasRegisteredAsSoleVoter
+ON 1=1
+LEFT JOIN IsRegisteredAsSoleVoter
 ON 1=1
\ No newline at end of file
diff --git a/govtool/backend/src/VVA/API.hs b/govtool/backend/src/VVA/API.hs
index ed0b5f193..30557f6c6 100644
--- a/govtool/backend/src/VVA/API.hs
+++ b/govtool/backend/src/VVA/API.hs
@@ -153,8 +153,10 @@ drepInfo (unHexText -> dRepId) = do
   CacheEnv {dRepInfoCache} <- asks vvaCache
   Types.DRepInfo {..} <- cacheRequest dRepInfoCache dRepId $ DRep.getDRepInfo dRepId
   return $ DRepInfoResponse
-    { dRepInfoResponseIsRegistered = dRepInfoIsRegistered
-    , dRepInfoResponseWasRegistered = dRepInfoWasRegistered
+    { dRepInfoResponseIsRegisteredAsDRep = dRepInfoIsRegisteredAsDRep
+    , dRepInfoResponseWasRegisteredAsDRep = dRepInfoWasRegisteredAsDRep
+    , dRepInfoResponseIsRegisteredAsSoleVoter = dRepInfoIsRegisteredAsSoleVoter
+    , dRepInfoResponseWasRegisteredAsSoleVoter = dRepInfoWasRegisteredAsSoleVoter
     , dRepInfoResponseDeposit = dRepInfoDeposit
     }
 
diff --git a/govtool/backend/src/VVA/API/Types.hs b/govtool/backend/src/VVA/API/Types.hs
index 208e2b4f4..459e72563 100644
--- a/govtool/backend/src/VVA/API/Types.hs
+++ b/govtool/backend/src/VVA/API/Types.hs
@@ -375,8 +375,10 @@ instance ToSchema VoteResponse where
             ?~ toJSON exampleVoteResponse
 
 data DRepInfoResponse = DRepInfoResponse
-  { dRepInfoResponseIsRegistered :: Bool
-  , dRepInfoResponseWasRegistered :: Bool
+  { dRepInfoResponseIsRegisteredAsDRep :: Bool
+  , dRepInfoResponseWasRegisteredAsDRep :: Bool
+  , dRepInfoResponseIsRegisteredAsSoleVoter :: Bool
+  , dRepInfoResponseWasRegisteredAsSoleVoter :: Bool
   , dRepInfoResponseDeposit :: Maybe Integer
   } deriving (Generic, Show)
 
@@ -384,8 +386,10 @@ deriveJSON (jsonOptions "dRepInfoResponse") ''DRepInfoResponse
 
 exampleDRepInfoResponse :: Text
 exampleDRepInfoResponse =
-    "{\"isRegistered\": false,"
-  <> "\"wasRegistered\": true,"
+    "{\"isRegisteredAsDRep\": false,"
+  <> "\"wasRegisteredAsDRep\": true,"
+  <> "\"wasRegisteredAsSoleVoter\": true,"
+  <> "\"wasRegisteredAsSoleVoter\": true,"
   <> "\"deposit\": 2000000}"
 
 instance ToSchema DRepInfoResponse where
diff --git a/govtool/backend/src/VVA/DRep.hs b/govtool/backend/src/VVA/DRep.hs
index 0661f0f82..4a29872ea 100644
--- a/govtool/backend/src/VVA/DRep.hs
+++ b/govtool/backend/src/VVA/DRep.hs
@@ -99,10 +99,12 @@ getDRepInfo
 getDRepInfo drepId = withPool $ \conn -> do
   result <- liftIO $ SQL.query conn getDRepInfoSql (SQL.Only drepId)
   case result of
-    [(isRegistered, wasRegistered, deposit)] ->
+    [(isRegisteredAsDRep, wasRegisteredAsDRep, isRegisteredAsSoleVoter, wasRegisteredAsSoleVoter, deposit)] ->
       return $ DRepInfo
-        { dRepInfoIsRegistered = fromMaybe False isRegistered
-        , dRepInfoWasRegistered = fromMaybe False wasRegistered
+        { dRepInfoIsRegisteredAsDRep = fromMaybe False isRegisteredAsDRep
+        , dRepInfoWasRegisteredAsDRep = fromMaybe False wasRegisteredAsDRep
+        , dRepInfoIsRegisteredAsSoleVoter = fromMaybe False isRegisteredAsSoleVoter
+        , dRepInfoWasRegisteredAsSoleVoter = fromMaybe False wasRegisteredAsSoleVoter
         , dRepInfoDeposit = deposit
         }
-    [] -> return $ DRepInfo False False Nothing
\ No newline at end of file
+    [] -> return $ DRepInfo False False False False Nothing
\ No newline at end of file
diff --git a/govtool/backend/src/VVA/Types.hs b/govtool/backend/src/VVA/Types.hs
index dc4438d18..4d5d2e0db 100644
--- a/govtool/backend/src/VVA/Types.hs
+++ b/govtool/backend/src/VVA/Types.hs
@@ -59,8 +59,10 @@ data Vote = Vote
   }
 
 data DRepInfo = DRepInfo
-  { dRepInfoIsRegistered :: Bool
-  , dRepInfoWasRegistered :: Bool
+  { dRepInfoIsRegisteredAsDRep :: Bool
+  , dRepInfoWasRegisteredAsDRep :: Bool
+  , dRepInfoIsRegisteredAsSoleVoter :: Bool
+  , dRepInfoWasRegisteredAsSoleVoter :: Bool
   , dRepInfoDeposit :: Maybe Integer
   }
 

From c8f9a266f5cafc1ae721fb5b10d548868bcd5125 Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Wed, 21 Feb 2024 17:33:12 +0100
Subject: [PATCH 70/82] [#212] udpate CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a181f9b9f..101a6893a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@ changes.
 - Vitest unit tests added for utils functions [Issue 81](https://github.com/IntersectMBO/govtool/issues/81)
 - i18next library added to FE [Issue 80](https://github.com/IntersectMBO/govtool/issues/80)
 
+### Added
+- Added `isRegisteredAsSoleVoter` and `wasRegisteredAsSoleVoter` fields to the drep/info response [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
+
 ### Fixed
 - Fix make button disble when wallet tries connect [Issue 265](https://github.com/IntersectMBO/govtool/issues/265)
 - Fix drep voting power calculation [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
@@ -28,6 +31,7 @@ changes.
 - Fixed get drep voting power incorrectly executed endpoint [Issue 280](https://github.com/IntersectMBO/govtool/issues/280)
 
 ### Changed
+- `isRegistered` and `wasRegistered` fields in the drep/info endpoint changed to `isRegisteredAsDRep` and `wasRegisteredAsDRep` respectively [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
 - Update Cardano-Serialization-Lib to 12.0.0-alpha.16 [Issue 156](https://github.com/IntersectMBO/govtool/issues/156)
 - Changed and improved working conventions docs, PR template and codeowners file, addressing [Issue 88](https://github.com/IntersectMBO/govtool/issues/88).
 - Changed Node version from 8.7.1-pre to 8.8.0-pre and DbSync version from sancho-2-3-0 to sancho-4-0-0-fix-config, addressing also [Issue 181](https://github.com/IntersectMBO/govtool/issues/181).

From c7c65dffab071288967a956ee5e43f24134cb917 Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Mon, 26 Feb 2024 11:16:10 +0100
Subject: [PATCH 71/82] [#212] fix swagger drep info example

Signed-off-by: jankun4 <michaljankun@gmail.com>
---
 govtool/backend/src/VVA/API/Types.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/govtool/backend/src/VVA/API/Types.hs b/govtool/backend/src/VVA/API/Types.hs
index 459e72563..a3c29fc57 100644
--- a/govtool/backend/src/VVA/API/Types.hs
+++ b/govtool/backend/src/VVA/API/Types.hs
@@ -388,7 +388,7 @@ exampleDRepInfoResponse :: Text
 exampleDRepInfoResponse =
     "{\"isRegisteredAsDRep\": false,"
   <> "\"wasRegisteredAsDRep\": true,"
-  <> "\"wasRegisteredAsSoleVoter\": true,"
+  <> "\"isRegisteredAsSoleVoter\": true,"
   <> "\"wasRegisteredAsSoleVoter\": true,"
   <> "\"deposit\": 2000000}"
 

From 669dfe1fc4c596973f6585f1820b24e6a94a7032 Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Tue, 27 Feb 2024 11:35:24 +0100
Subject: [PATCH 72/82] [#212] fix drep/info sql query

Signed-off-by: jankun4 <michaljankun@gmail.com>
---
 govtool/backend/sql/get-drep-info.sql | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/govtool/backend/sql/get-drep-info.sql b/govtool/backend/sql/get-drep-info.sql
index 65611fe76..e1bfcbbc6 100644
--- a/govtool/backend/sql/get-drep-info.sql
+++ b/govtool/backend/sql/get-drep-info.sql
@@ -1,7 +1,7 @@
 WITH DRepId AS (
     SELECT decode(?, 'hex') as raw
 ), IsRegisteredAsDRep AS (
-    SELECT (deposit>0) as value,
+    SELECT (drep_registration.voting_anchor_id is not null and deposit>0) as value,
            deposit as deposit
     FROM drep_registration
     JOIN drep_hash
@@ -9,7 +9,6 @@ WITH DRepId AS (
     CROSS JOIN DRepId
     WHERE drep_hash.raw = DRepId.raw
     and deposit is not null
-    and drep_registration.voting_anchor_id is not null
     ORDER BY drep_registration.tx_id DESC
     LIMIT 1
 ), WasRegisteredAsDRep AS (
@@ -24,7 +23,7 @@ WITH DRepId AS (
         and drep_registration.voting_anchor_id is not null
     )) as value
 ), IsRegisteredAsSoleVoter AS (
-    SELECT (deposit>0) as value,
+    SELECT (drep_registration.voting_anchor_id is null and deposit>0) as value,
            deposit as deposit
     FROM drep_registration
     JOIN drep_hash
@@ -32,7 +31,6 @@ WITH DRepId AS (
     CROSS JOIN DRepId
     WHERE drep_hash.raw = DRepId.raw
     and deposit is not null
-    and drep_registration.voting_anchor_id is null
     ORDER BY drep_registration.tx_id DESC
     LIMIT 1
 ), WasRegisteredAsSoleVoter AS (

From 39318e6627a680d06298bbf2b79938ba2b4e0629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Placzy=C5=84ski?= <placzynski.pawel@gmail.com>
Date: Mon, 26 Feb 2024 08:56:25 +0100
Subject: [PATCH 73/82] [#291] Allow Sentry error reporting in CSP settings
 across environments

Updated CSP settings in Traefik configuration for beta, dev, staging,
and test environments to include Sentry's domain without the ingest
subdomain. This change permits Sentry error logging and reporting to
function correctly without being blocked by the CSP. The adjustment
ensures Sentry can capture and report runtime errors, facilitating
better monitoring and debugging capabilities across our development,
testing, and staging phases.

- Modified CSP `connect-src` directive to set
  `o4506155985141760.ingest.sentry.io` replacing old Sentry
  sources.
- Ensured that the updated settings adhere to our security policies by
  only allowing necessary and trusted sources.

This update addresses the need for comprehensive error reporting through
Sentry, enhancing our ability to quickly identify and resolve issues in
our application's environments.
---
 scripts/govtool/docker-compose.beta.yml    | 2 +-
 scripts/govtool/docker-compose.dev.yml     | 2 +-
 scripts/govtool/docker-compose.staging.yml | 2 +-
 scripts/govtool/docker-compose.test.yml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/govtool/docker-compose.beta.yml b/scripts/govtool/docker-compose.beta.yml
index 0a608601f..9e4e9e41f 100644
--- a/scripts/govtool/docker-compose.beta.yml
+++ b/scripts/govtool/docker-compose.beta.yml
@@ -209,7 +209,7 @@ services:
       - "traefik.http.routers.frontend.rule=Host(`sanchogov.tools`)"
       - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
-      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' https://o4506155985141760.ingest.sentry.io/api/4506156032196608/envelope/ *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
+      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' o4506155985141760.ingest.sentry.io *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
       - "traefik.http.routers.frontend.middlewares=frontend-csp@docker"
       - "traefik.http.services.frontend.loadbalancer.server.port=80"
 
diff --git a/scripts/govtool/docker-compose.dev.yml b/scripts/govtool/docker-compose.dev.yml
index a43d63137..ea64ba147 100644
--- a/scripts/govtool/docker-compose.dev.yml
+++ b/scripts/govtool/docker-compose.dev.yml
@@ -209,7 +209,7 @@ services:
       - "traefik.http.routers.frontend.rule=Host(`dev-sanchonet.govtool.byron.network`)"
       - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
-      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' https://o4506155985141760.ingest.sentry.io/api/4506156032196608/envelope/ *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
+      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' o4506155985141760.ingest.sentry.io *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
       - "traefik.http.routers.frontend.middlewares=frontend-csp@docker"
       - "traefik.http.services.frontend.loadbalancer.server.port=80"
 
diff --git a/scripts/govtool/docker-compose.staging.yml b/scripts/govtool/docker-compose.staging.yml
index 24de7ae0a..6ab455d3a 100644
--- a/scripts/govtool/docker-compose.staging.yml
+++ b/scripts/govtool/docker-compose.staging.yml
@@ -209,7 +209,7 @@ services:
       - "traefik.http.routers.frontend.rule=Host(`staging.govtool.byron.network`)"
       - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
-      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' https://o4506155985141760.ingest.sentry.io/api/4506156032196608/envelope/ *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
+      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' o4506155985141760.ingest.sentry.io *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
       - "traefik.http.routers.frontend.middlewares=frontend-csp@docker"
       - "traefik.http.services.frontend.loadbalancer.server.port=80"
 
diff --git a/scripts/govtool/docker-compose.test.yml b/scripts/govtool/docker-compose.test.yml
index 08aa25dd2..d35544e82 100644
--- a/scripts/govtool/docker-compose.test.yml
+++ b/scripts/govtool/docker-compose.test.yml
@@ -209,7 +209,7 @@ services:
       - "traefik.http.routers.frontend.rule=Host(`test-sanchonet.govtool.byron.network`)"
       - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
-      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' https://o4506155985141760.ingest.sentry.io/api/4506156032196608/envelope/ *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
+      - "traefik.http.middlewares.frontend-csp.headers.contentSecurityPolicy=default-src 'self'; img-src *.usersnap.com 'self' data:; script-src *.usersnap.com 'self' 'unsafe-inline' https://www.googletagmanager.com https://browser.sentry-cdn.com; style-src *.usersnap.com *.googleapis.com 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src *.usersnap.com https://s3.eu-central-1.amazonaws.com/upload.usersnap.com 'self' o4506155985141760.ingest.sentry.io *.google-analytics.com; font-src *.usersnap.com *.gstatic.com 'self' 'unsafe-inline' https://fonts.gstatic.com; worker-src blob:"
       - "traefik.http.routers.frontend.middlewares=frontend-csp@docker"
       - "traefik.http.services.frontend.loadbalancer.server.port=80"
 

From 83145c60f89a4ddbcad10945680ffd383f6cddb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Placzy=C5=84ski?= <placzynski.pawel@gmail.com>
Date: Mon, 26 Feb 2024 07:48:38 +0100
Subject: [PATCH 74/82] Updated CHANGELOG.md to include recent enhancements

- Integrated OAuth for secure Slack deployment notifications #194.
- Streamlined build and deployment process for faster CD and reduced
  resource use #246.
- Allow Sentry error reporting in CSP settings across environments #291.
---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 101a6893a..efa898655 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,8 @@ changes.
 - Fixed vote calculation problems related to NoConfidence DRep [Issue 59](https://github.com/IntersectMBO/govtool/issues/59)
 - Fixed ada-holder/get-current-delegation error when delegated to NoConfidence or AlwaysAbstain dreps. [Issue 82](https://github.com/IntersectMBO/govtool/issues/82)
 - Fixed deployment scripts to address [Issue 171](https://github.com/IntersectMBO/govtool/issues/171).
-- Fixed get drep voting power incorrectly executed endpoint [Issue 280](https://github.com/IntersectMBO/govtool/issues/280)
+- Fixed get drep voting power incorrectly executed endpoint [Issue 280](https://github.com/IntersectMBO/govtool/issues/280).
+- Fixed CSP settings to allow error reports with Sentry [Issue 291](https://github.com/IntersectMBO/govtool/issues/291).
 
 ### Changed
 - `isRegistered` and `wasRegistered` fields in the drep/info endpoint changed to `isRegisteredAsDRep` and `wasRegisteredAsDRep` respectively [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
@@ -39,6 +40,8 @@ changes.
 - Renamed project from VVA to GovTool [Issue 97](https://github.com/IntersectMBO/govtool/issues/97).
 - (`docs/update-working-conventions`) Addressing [Issue 25](https://github.com/IntersectMBO/govtool/issues/25) changed working conventions documentation to improve intended flows.
 - Adjusted Nix configuration to meet projects needs [Issue 187](https://github.com/IntersectMBO/govtool/issues/187).
+- Integrated OAuth to securely notify about deployment status in Slack [Issue 194](https://github.com/IntersectMBO/govtool/issues/194).
+- Streamlined the application build and deployment process, thereby accelerating continuous delivery (CD) and reducing the resource burden [Issue 246](https://github.com/IntersectMBO/govtool/issues/246).
 
 ### Removed
 -

From f3f80806e86485c67362873e49400a218ddcc659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Placzy=C5=84ski?= <placzynski.pawel@gmail.com>
Date: Mon, 26 Feb 2024 11:20:32 +0100
Subject: [PATCH 75/82] Add environment-specific warning to .env.example for
 clarity and safety

This commit introduces a significant update to the `.env.example` file
within the `scripts/govtool` directory to enhance usability and prevent
configuration mistakes. Key changes include:

- Addition of Vim modeline at the beginning of the file (`# vim: set
  ft=bash`) to ensure that when editing the file with Vim, the correct
  filetype (bash) is automatically set. This facilitates syntax
  highlighting and other filetype-specific features, improving the editing
  experience.
- Introduction of a conditional warning mechanism that activates when
  the environment is not set to 'dev'. This mechanism employs bash
  scripting to alert to users, especially those working in
  non-development environments, to proceed with caution and be aware of
  their current configuration context. The warning message explicitly
  states the current environment value, reinforcing the need for
  attentiveness.

These enhancements are designed to minimize the risk of misconfiguration
by providing clear, environment-specific warnings and improving file
readability and editing support.
---
 scripts/govtool/.env.example | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/govtool/.env.example b/scripts/govtool/.env.example
index 47fb60653..adc906cb9 100644
--- a/scripts/govtool/.env.example
+++ b/scripts/govtool/.env.example
@@ -1,3 +1,5 @@
+# vim: set ft=bash
+
 use nix shell.nix
 
 export AWS_PROFILE=govtool
@@ -27,3 +29,13 @@ export GRAFANA_ADMIN_PASSWORD=<grafana_admin_password>
 export GRAFANA_SLACK_RECIPIENT=<grafana_slack_recipient>
 export GRAFANA_SLACK_WEBHOOK=<grafana_slack_webhook>
 export GRAFANA_SLACK_OAUTH_TOKEN=<grafana_slack_oauth_token>
+export DOMAIN="${ENVIRONMENT}-${CARDANO_NETWORK}.govtool.byron.network"
+#export DOMAIN="staging.govtool.byron.network"
+#export DOMAIN="sanchogov.tools"
+
+if [ "$ENVIRONMENT" != "dev" ]; then
+  tput setaf 1 # set text color to red
+  tput bold
+  echo "THIS IS NOT A DEVELOPMENT ENVIRONMENT! It is '$ENVIRONMENT'. BE CAREFUL…"
+  tput sgr0 # reset text formatting to normal
+fi

From 1a8c4cfa40a285b5ae11769b8b0afc6efa4a3c10 Mon Sep 17 00:00:00 2001
From: jankun4 <michaljankun@gmail.com>
Date: Tue, 27 Feb 2024 20:51:03 +0100
Subject: [PATCH 76/82] [#333] fix drep type detection

Signed-off-by: jankun4 <michaljankun@gmail.com>
---
 CHANGELOG.md                          |   1 +
 govtool/backend/sql/get-drep-info.sql | 130 +++++++++++++++-----------
 2 files changed, 79 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efa898655..6a81c409b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ changes.
 - Added `isRegisteredAsSoleVoter` and `wasRegisteredAsSoleVoter` fields to the drep/info response [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
 
 ### Fixed
+- Fix drep type detection when changing metadata [Issue 333](https://github.com/IntersectMBO/govtool/issues/333)
 - Fix make button disble when wallet tries connect [Issue 265](https://github.com/IntersectMBO/govtool/issues/265)
 - Fix drep voting power calculation [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
 - Fix proposal/list and network/metrics bug that appeared when noone has delegated their funds either to drep_always_abstain or drep_always_no_confidence [Issue 231](https://github.com/IntersectMBO/govtool/issues/231)
diff --git a/govtool/backend/sql/get-drep-info.sql b/govtool/backend/sql/get-drep-info.sql
index e1bfcbbc6..de5048afb 100644
--- a/govtool/backend/sql/get-drep-info.sql
+++ b/govtool/backend/sql/get-drep-info.sql
@@ -1,60 +1,86 @@
 WITH DRepId AS (
-    SELECT decode(?, 'hex') as raw
-), IsRegisteredAsDRep AS (
-    SELECT (drep_registration.voting_anchor_id is not null and deposit>0) as value,
-           deposit as deposit
-    FROM drep_registration
-    JOIN drep_hash
-    ON drep_hash.id = drep_registration.drep_hash_id
-    CROSS JOIN DRepId
-    WHERE drep_hash.raw = DRepId.raw
-    and deposit is not null
-    ORDER BY drep_registration.tx_id DESC
+    SELECT
+        decode(?, 'hex') AS raw
+),
+LatestRegistrationEntry AS (
+    SELECT
+        drep_registration.voting_anchor_id AS voting_anchor_id,
+        deposit AS deposit
+    FROM
+        drep_registration
+        CROSS JOIN DrepId
+        JOIN drep_hash ON drep_hash.id = drep_registration.drep_hash_id
+    WHERE
+        drep_hash.raw = DRepId.raw
+    ORDER BY
+        drep_registration.tx_id DESC
     LIMIT 1
-), WasRegisteredAsDRep AS (
-    select (EXISTS (
-        SELECT *
-        FROM drep_registration
-        JOIN drep_hash
-        ON drep_hash.id = drep_registration.drep_hash_id
-        CROSS JOIN DRepId
-        WHERE drep_hash.raw = DRepId.raw
-        and drep_registration.deposit > 0
-        and drep_registration.voting_anchor_id is not null
-    )) as value
-), IsRegisteredAsSoleVoter AS (
-    SELECT (drep_registration.voting_anchor_id is null and deposit>0) as value,
-           deposit as deposit
-    FROM drep_registration
-    JOIN drep_hash
-    ON drep_hash.id = drep_registration.drep_hash_id
-    CROSS JOIN DRepId
-    WHERE drep_hash.raw = DRepId.raw
-    and deposit is not null
-    ORDER BY drep_registration.tx_id DESC
+),
+IsRegisteredAsDRep AS (
+    SELECT
+        (LatestRegistrationEntry.deposit is null or LatestRegistrationEntry.deposit > 0)
+        AND LatestRegistrationEntry.voting_anchor_id IS NOT NULL AS value
+    FROM
+        LatestRegistrationEntry
+),
+IsRegisteredAsSoleVoter AS (
+    SELECT
+        (LatestRegistrationEntry.deposit is null or LatestRegistrationEntry.deposit > 0)
+        AND LatestRegistrationEntry.voting_anchor_id IS NULL AS value
+    FROM
+        LatestRegistrationEntry
+),
+CurrentDeposit AS (
+    SELECT
+        GREATEST(drep_registration.deposit, 0) AS value
+FROM
+    drep_registration
+    join drep_hash
+    on drep_hash.id = drep_registration.drep_hash_id
+    cross join DRepId
+
+    WHERE
+        drep_registration.deposit IS NOT NULL
+        and drep_hash.raw = DRepId.raw
+    ORDER BY
+        drep_registration.tx_id DESC
     LIMIT 1
-), WasRegisteredAsSoleVoter AS (
-    select (EXISTS (
-        SELECT *
-        FROM drep_registration
-        JOIN drep_hash
-        ON drep_hash.id = drep_registration.drep_hash_id
-        CROSS JOIN DRepId
-        WHERE drep_hash.raw = DRepId.raw
-        and drep_registration.deposit > 0
-        and drep_registration.voting_anchor_id is null
-    )) as value
+),
+WasRegisteredAsDRep AS (
+    SELECT
+        (EXISTS (
+                SELECT
+                    *
+                FROM
+                    drep_registration
+                    JOIN drep_hash ON drep_hash.id = drep_registration.drep_hash_id
+                    CROSS JOIN DRepId
+                WHERE
+                    drep_hash.raw = DRepId.raw
+                    AND drep_registration.voting_anchor_id IS NOT NULL)) AS value
+),
+WasRegisteredAsSoleVoter AS (
+    SELECT
+        (EXISTS (
+                SELECT
+                    *
+                FROM
+                    drep_registration
+                    JOIN drep_hash ON drep_hash.id = drep_registration.drep_hash_id
+                    CROSS JOIN DRepId
+                WHERE
+                    drep_hash.raw = DRepId.raw
+                    AND drep_registration.voting_anchor_id IS NULL)) AS value
 )
 SELECT
-    IsRegisteredAsDrep.value,
+    IsRegisteredAsDRep.value,
     WasRegisteredAsDRep.value,
     IsRegisteredAsSoleVoter.value,
     WasRegisteredAsSoleVoter.value,
-    coalesce(IsRegisteredAsDRep.deposit, IsRegisteredAsSoleVoter.deposit)
-FROM WasRegisteredAsDRep
-LEFT JOIN IsRegisteredAsDRep
-ON 1=1
-LEFT JOIN WasRegisteredAsSoleVoter
-ON 1=1
-LEFT JOIN IsRegisteredAsSoleVoter
-ON 1=1
\ No newline at end of file
+    CurrentDeposit.value
+FROM
+    IsRegisteredAsDRep
+    CROSS JOIN IsRegisteredAsSoleVoter
+    CROSS JOIN WasRegisteredAsDRep
+    CROSS JOIN WasRegisteredAsSoleVoter
+    CROSS JOIN CurrentDeposit

From 76913d5b6ec367b433165297192f3b07249aae2e Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Wed, 28 Feb 2024 14:20:15 +0100
Subject: [PATCH 77/82] [#239 #240 #338] DRep can become Sole Voter, Sole Voter
 can become DRep

---
 .../components/organisms/DashboardCards.tsx   |  9 +++----
 .../organisms/RegisterAsSoleVoterBox.tsx      | 11 ++++++--
 .../forms/useRegisterAsdRepFormContext.tsx    | 25 +++++++++++++------
 .../hooks/forms/useUpdatedRepMetadataForm.tsx | 11 ++++++--
 .../src/hooks/queries/useGetDRepInfoQuery.ts  |  3 ++-
 govtool/frontend/src/i18n/locales/en.ts       |  2 +-
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/govtool/frontend/src/components/organisms/DashboardCards.tsx b/govtool/frontend/src/components/organisms/DashboardCards.tsx
index 34018f07a..73208b3cb 100644
--- a/govtool/frontend/src/components/organisms/DashboardCards.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardCards.tsx
@@ -246,7 +246,7 @@ export const DashboardCards = () => {
       }
     } else if (voter?.isRegisteredAsSoleVoter) {
       return "dashboard.soleVoter.isRegisteredDescription";
-    } else if (voter?.wasRegisteredAsSoleVoter && !voter?.isRegisteredAsDRep) {
+    } else if (voter?.wasRegisteredAsSoleVoter) {
       return "dashboard.soleVoter.wasRegisteredDescription";
     } else {
       return "dashboard.soleVoter.registerDescription";
@@ -292,8 +292,8 @@ export const DashboardCards = () => {
       }
     } else if (voter?.isRegisteredAsSoleVoter) {
       return t("dashboard.soleVoter.youAreSoleVoterTitle");
-    } else if (voter?.wasRegisteredAsSoleVoter && !voter?.isRegisteredAsDRep) {
-      return t("dashboard.soleVoter.retireTitle");
+    } else if (voter?.wasRegisteredAsSoleVoter) {
+      return t("dashboard.soleVoter.wasSoleVoterTitle");
     } else {
       return t("dashboard.soleVoter.registerTitle");
     }
@@ -473,8 +473,7 @@ export const DashboardCards = () => {
             : t(
                 voter?.isRegisteredAsSoleVoter
                   ? "dashboard.soleVoter.retire"
-                  : voter?.wasRegisteredAsSoleVoter &&
-                    !voter?.isRegisteredAsDRep
+                  : voter?.wasRegisteredAsSoleVoter
                   ? "dashboard.soleVoter.reRegister"
                   : "dashboard.soleVoter.register"
               )
diff --git a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
index 1794a7042..f55acb106 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsSoleVoterBox.tsx
@@ -10,7 +10,12 @@ import { useCardano, useModal } from "@context";
 export const RegisterAsSoleVoterBox = () => {
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
-  const { buildSignSubmitConwayCertTx, buildDRepRegCert } = useCardano();
+  const {
+    buildSignSubmitConwayCertTx,
+    buildDRepRegCert,
+    buildDRepUpdateCert,
+    voter,
+  } = useCardano();
   const navigate = useNavigate();
   const { openModal, closeModal } = useModal();
   const { t } = useTranslation();
@@ -19,7 +24,9 @@ export const RegisterAsSoleVoterBox = () => {
     setIsLoading(true);
 
     try {
-      const certBuilder = await buildDRepRegCert();
+      const certBuilder = voter?.isRegisteredAsDRep
+        ? await buildDRepUpdateCert()
+        : await buildDRepRegCert();
       const result = await buildSignSubmitConwayCertTx({
         certBuilder,
         type: "soleVoterRegistration",
diff --git a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx b/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
index 27a9fc6a5..d88396d34 100644
--- a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
+++ b/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
@@ -7,7 +7,12 @@ import { useCardano, useModal } from "@context";
 import { UrlAndHashFormValues, useTranslation } from "@hooks";
 
 export const useRegisterAsdRepFormContext = () => {
-  const { buildSignSubmitConwayCertTx, buildDRepRegCert } = useCardano();
+  const {
+    buildSignSubmitConwayCertTx,
+    buildDRepRegCert,
+    buildDRepUpdateCert,
+    voter,
+  } = useCardano();
   const { openModal, closeModal } = useModal();
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const navigate = useNavigate();
@@ -31,15 +36,21 @@ export const useRegisterAsdRepFormContext = () => {
     async (values: UrlAndHashFormValues) => {
       const { url, hash } = values;
 
-      const urlSubmitValue = url ?? "";
-      const hashSubmitValue = hash ?? "";
+      // 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;
       setIsLoading(true);
 
       try {
-        const certBuilder = await buildDRepRegCert(
-          urlSubmitValue,
-          hashSubmitValue
-        );
+        const certBuilder = voter?.isRegisteredAsSoleVoter
+          ? await buildDRepUpdateCert(urlSubmitValue, hashSubmitValue)
+          : await buildDRepRegCert(urlSubmitValue, hashSubmitValue);
         const result = await buildSignSubmitConwayCertTx({
           certBuilder,
           type: "registration",
diff --git a/govtool/frontend/src/hooks/forms/useUpdatedRepMetadataForm.tsx b/govtool/frontend/src/hooks/forms/useUpdatedRepMetadataForm.tsx
index da48b2250..4e2e3c3dc 100644
--- a/govtool/frontend/src/hooks/forms/useUpdatedRepMetadataForm.tsx
+++ b/govtool/frontend/src/hooks/forms/useUpdatedRepMetadataForm.tsx
@@ -26,8 +26,15 @@ export const useUpdatedRepMetadataForm = () => {
     async (values: UrlAndHashFormValues) => {
       const { url, hash } = values;
 
-      const urlSubmitValue = url ?? "";
-      const hashSubmitValue = hash ?? "";
+      // 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;
       setIsLoading(true);
       try {
         const certBuilder = await buildDRepUpdateCert(
diff --git a/govtool/frontend/src/hooks/queries/useGetDRepInfoQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepInfoQuery.ts
index 217aecde8..8b6528fc7 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepInfoQuery.ts
+++ b/govtool/frontend/src/hooks/queries/useGetDRepInfoQuery.ts
@@ -5,12 +5,13 @@ import { useCardano } from "@context";
 import { getDRepInfo } from "@services";
 
 export const useGetDRepInfo = () => {
-  const { dRepID, registerTransaction } = useCardano();
+  const { dRepID, registerTransaction, soleVoterTransaction } = useCardano();
 
   const { data, isLoading } = useQuery({
     queryKey: [
       QUERY_KEYS.useGetDRepInfoKey,
       registerTransaction?.transactionHash,
+      soleVoterTransaction?.transactionHash,
     ],
     enabled: !!dRepID,
     queryFn: async () => await getDRepInfo(dRepID),
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index edf57f75d..c45c2f057 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -112,7 +112,7 @@ export const en = {
         registrationInProgress:
           "The registration process is ongoing. This may take several minutes.",
         retire: "Retire",
-        retireTitle: "You Have Retired as a Sole Voter",
+        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.",

From 81df058f539d639c7c8ed2564968df17a40fa546 Mon Sep 17 00:00:00 2001
From: Jan Jaroszczak <jan.jaroszczak@binarapps.com>
Date: Wed, 28 Feb 2024 15:50:12 +0100
Subject: [PATCH 78/82] [#239 #240 #338] Fixes after CR

---
 govtool/frontend/src/App.tsx                       |  4 ++--
 govtool/frontend/src/context/walletUtils.ts        |  4 ++--
 .../hooks/forms/useRegisterAsdRepFormContext.tsx   | 14 ++++++--------
 .../src/hooks/forms/useUpdatedRepMetadataForm.tsx  | 14 ++++++--------
 govtool/frontend/src/hooks/queries/index.ts        |  2 +-
 ...GetDRepInfoQuery.ts => useGetVoterInfoQuery.ts} |  6 +++---
 govtool/frontend/src/i18n/locales/en.ts            |  4 ++--
 .../requests/{getDRepInfo.ts => getVoterInfo.ts}   |  2 +-
 govtool/frontend/src/services/requests/index.ts    |  2 +-
 9 files changed, 24 insertions(+), 28 deletions(-)
 rename govtool/frontend/src/hooks/queries/{useGetDRepInfoQuery.ts => useGetVoterInfoQuery.ts} (77%)
 rename govtool/frontend/src/services/requests/{getDRepInfo.ts => getVoterInfo.ts} (75%)

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index a282b9e74..13bc34a7d 100644
--- a/govtool/frontend/src/App.tsx
+++ b/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();
diff --git a/govtool/frontend/src/context/walletUtils.ts b/govtool/frontend/src/context/walletUtils.ts
index d68d8e7cf..ef6a8a00b 100644
--- a/govtool/frontend/src/context/walletUtils.ts
+++ b/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 ||
diff --git a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx b/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
index d88396d34..28cc2a557 100644
--- a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
+++ b/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 {
diff --git a/govtool/frontend/src/hooks/forms/useUpdatedRepMetadataForm.tsx b/govtool/frontend/src/hooks/forms/useUpdatedRepMetadataForm.tsx
index 4e2e3c3dc..fd35f8474 100644
--- a/govtool/frontend/src/hooks/forms/useUpdatedRepMetadataForm.tsx
+++ b/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(
diff --git a/govtool/frontend/src/hooks/queries/index.ts b/govtool/frontend/src/hooks/queries/index.ts
index 7733019b0..192e18b0d 100644
--- a/govtool/frontend/src/hooks/queries/index.ts
+++ b/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";
diff --git a/govtool/frontend/src/hooks/queries/useGetDRepInfoQuery.ts b/govtool/frontend/src/hooks/queries/useGetVoterInfoQuery.ts
similarity index 77%
rename from govtool/frontend/src/hooks/queries/useGetDRepInfoQuery.ts
rename to govtool/frontend/src/hooks/queries/useGetVoterInfoQuery.ts
index 8b6528fc7..63f8f97c8 100644
--- a/govtool/frontend/src/hooks/queries/useGetDRepInfoQuery.ts
+++ b/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 };
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index c45c2f057..967863ecf 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/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",
       },
     },
diff --git a/govtool/frontend/src/services/requests/getDRepInfo.ts b/govtool/frontend/src/services/requests/getVoterInfo.ts
similarity index 75%
rename from govtool/frontend/src/services/requests/getDRepInfo.ts
rename to govtool/frontend/src/services/requests/getVoterInfo.ts
index 869fcd337..8233aa7c8 100644
--- a/govtool/frontend/src/services/requests/getDRepInfo.ts
+++ b/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;
diff --git a/govtool/frontend/src/services/requests/index.ts b/govtool/frontend/src/services/requests/index.ts
index f5809f815..16f5cb743 100644
--- a/govtool/frontend/src/services/requests/index.ts
+++ b/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";

From 9b2f2bcbc0fa800ab527de45747fdef6aec7a04e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Wed, 28 Feb 2024 16:30:38 +0100
Subject: [PATCH 79/82] [#152] change step 3 components

---
 CHANGELOG.md                                  |  1 +
 .../src/components/organisms/BgCard.tsx       | 11 ++-
 .../organisms/RegisterAsdRepStepThree.tsx     | 75 +++++++++++--------
 .../organisms/RegisterAsdRepStepTwo.tsx       |  4 +-
 .../src/components/organisms/types.ts         |  1 +
 .../forms/useRegisterAsdRepFormContext.tsx    | 15 +---
 .../forms/useUrlAndHashFormController.tsx     |  6 +-
 govtool/frontend/src/i18n/locales/en.ts       |  4 +
 8 files changed, 70 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a81c409b..6303146a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
 ## [Unreleased]
+- Change step 3 components [Issue 152](https://github.com/intersectMBO/govtool/issues/152)
 - Add possibility to vote on behalf of myself - Sole Voter [Issue 119](https://github.com/IntersectMBO/govtool/issues/119)
 - Create DRep registration page about roles [Issue 205](https://github.com/IntersectMBO/govtool/issues/205)
 - Create Checkbox component. Improve Field and ControlledField [Issue 177](https://github.com/IntersectMBO/govtool/pull/177)
diff --git a/govtool/frontend/src/components/organisms/BgCard.tsx b/govtool/frontend/src/components/organisms/BgCard.tsx
index 94c7b9ee8..638acd9cb 100644
--- a/govtool/frontend/src/components/organisms/BgCard.tsx
+++ b/govtool/frontend/src/components/organisms/BgCard.tsx
@@ -14,6 +14,7 @@ export const BgCard = ({
   backButtonLabel,
   children,
   isLoadingActionButton,
+  isActionButtonDisabled,
   onClickBackButton,
   onClickActionButton,
   sx,
@@ -50,9 +51,10 @@ export const BgCard = ({
     return (
       <LoadingButton
         data-testid="retire-button"
+        disabled={isActionButtonDisabled}
+        isLoading={isLoadingActionButton}
         onClick={onClickActionButton}
         size="extraLarge"
-        isLoading={isLoadingActionButton}
         sx={{
           px: 6,
         }}
@@ -61,7 +63,12 @@ export const BgCard = ({
         {actionButtonLabel}
       </LoadingButton>
     );
-  }, [isLoadingActionButton, isMobile, actionButtonLabel]);
+  }, [
+    actionButtonLabel,
+    isActionButtonDisabled,
+    isLoadingActionButton,
+    isMobile,
+  ]);
 
   return (
     <Box
diff --git a/govtool/frontend/src/components/organisms/RegisterAsdRepStepThree.tsx b/govtool/frontend/src/components/organisms/RegisterAsdRepStepThree.tsx
index 72baf20bc..5fd57ad08 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsdRepStepThree.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsdRepStepThree.tsx
@@ -1,50 +1,65 @@
-import { Dispatch, SetStateAction, useCallback } from "react";
-import { Box } from "@mui/material";
+import { Dispatch, SetStateAction } from "react";
+import { Box, Link } from "@mui/material";
 
-import { Typography } from "@atoms";
+import { Spacer, Typography } from "@atoms";
 import {
   useRegisterAsdRepFormContext,
   useScreenDimension,
   useTranslation,
 } from "@hooks";
+import { openInNewTab } from "@utils";
 
-import { BgCard } from ".";
+import { BgCard, ControlledField } from ".";
 
-interface Props {
+export const RegisterAsdRepStepThree = ({
+  setStep,
+}: {
   setStep: Dispatch<SetStateAction<number>>;
-}
-
-export const RegisterAsdRepStepThree = ({ setStep }: Props) => {
-  const { isLoading, submitForm } = useRegisterAsdRepFormContext();
-  const { isMobile } = useScreenDimension();
+}) => {
   const { t } = useTranslation();
+  const { isMobile } = useScreenDimension();
+  const { control, errors, submitForm, isRegistrationAsDRepLoading, watch } =
+    useRegisterAsdRepFormContext();
+
+  const onClickBackButton = () => setStep(2);
+
+  const isContinueDisabled = !watch("storeData");
 
-  const onClickBackButton = useCallback(() => setStep(2), []);
+  // TODO: Add link about store data when available
+  const openLink = () => openInNewTab("https://sancho.network/get-started");
 
   return (
     <BgCard
-      actionButtonLabel={t("registration.register")}
-      isLoadingActionButton={isLoading}
+      actionButtonLabel={t("continue")}
+      isActionButtonDisabled={isContinueDisabled}
+      isLoadingActionButton={isRegistrationAsDRepLoading}
       onClickActionButton={submitForm}
       onClickBackButton={onClickBackButton}
     >
-      <Box display="flex" flexDirection="column">
-        <Typography sx={{ mt: 1, textAlign: "center" }} variant="headline4">
-          {t("registration.headingStepTwo")}
-        </Typography>
-        <Typography
-          fontWeight={400}
-          sx={{
-            mb: 7,
-            mt: isMobile ? 4 : 10,
-            textAlign: "center",
-            whiteSpace: "pre-line",
-          }}
-          variant="body1"
-        >
-          {t("registration.descriptionStepTwo")}
-        </Typography>
-      </Box>
+      <Typography sx={{ textAlign: "center" }} variant="headline4">
+        {t("registration.storeDataTitle")}
+      </Typography>
+      <Link
+        onClick={openLink}
+        sx={{
+          cursor: "pointer",
+          fontSize: 16,
+          fontWeight: 500,
+          fontFamily: "Poppins",
+          my: 4,
+          textAlign: "center",
+          textDecoration: "none",
+        }}
+      >
+        {t("registration.storeDataLink")}
+      </Link>
+      <ControlledField.Checkbox
+        {...{ control, errors }}
+        name="storeData"
+        label={t("registration.storeDataCheckboxLabel")}
+      />
+      <Spacer y={isMobile ? 4 : 12.5} />
+      <Box display="flex" flex={1} />
     </BgCard>
   );
 };
diff --git a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
index 2e6acdebb..2ef784b41 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
@@ -18,7 +18,7 @@ interface Props {
 export const RegisterAsdRepStepTwo = ({ setStep }: Props) => {
   const { t } = useTranslation();
   const { isMobile } = useScreenDimension();
-  const { showSubmitButton, control, errors } = useRegisterAsdRepFormContext();
+  const { control, errors } = useRegisterAsdRepFormContext();
 
   const onClickContinue = useCallback(() => setStep(3), []);
 
@@ -26,7 +26,7 @@ export const RegisterAsdRepStepTwo = ({ setStep }: Props) => {
 
   return (
     <BgCard
-      actionButtonLabel={showSubmitButton ? t("continue") : t("skip")}
+      actionButtonLabel={t("continue")}
       onClickActionButton={onClickContinue}
       onClickBackButton={onClickBackButton}
     >
diff --git a/govtool/frontend/src/components/organisms/types.ts b/govtool/frontend/src/components/organisms/types.ts
index 4c66d325a..0eaad74af 100644
--- a/govtool/frontend/src/components/organisms/types.ts
+++ b/govtool/frontend/src/components/organisms/types.ts
@@ -5,6 +5,7 @@ export type BgCardProps = {
   backButtonLabel?: string;
   children: React.ReactNode;
   isLoadingActionButton?: boolean;
+  isActionButtonDisabled?:boolean;
   onClickBackButton?: () => void;
   onClickActionButton: () => void;
   sx?: SxProps;
diff --git a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx b/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
index 28cc2a557..92e43b3e5 100644
--- a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
+++ b/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { useFormContext, useWatch } from "react-hook-form";
+import { useFormContext } from "react-hook-form";
 
 import { PATHS } from "@consts";
 import { useCardano, useModal } from "@context";
@@ -22,16 +22,9 @@ export const useRegisterAsdRepFormContext = () => {
     control,
     handleSubmit,
     formState: { errors, isValid },
+    watch,
   } = useFormContext<UrlAndHashFormValues>();
 
-  const watch = useWatch({
-    control,
-  });
-
-  const isUrlNullOrFilledIn = watch.url !== "" && watch.url !== null;
-  const isHashNullOrFilledIn = watch.hash !== "" && watch.hash !== null;
-  const showSubmitButton = isUrlNullOrFilledIn || isHashNullOrFilledIn;
-
   const onSubmit = useCallback(
     async (values: UrlAndHashFormValues) => {
       const { url, hash } = values;
@@ -95,11 +88,11 @@ export const useRegisterAsdRepFormContext = () => {
   );
 
   return {
-    isLoading,
+    isRegistrationAsDRepLoading: isLoading,
     control,
     errors,
     isValid,
-    showSubmitButton,
+    watch,
     submitForm: handleSubmit(onSubmit),
   };
 };
diff --git a/govtool/frontend/src/hooks/forms/useUrlAndHashFormController.tsx b/govtool/frontend/src/hooks/forms/useUrlAndHashFormController.tsx
index 062f8b566..74f9de0fc 100644
--- a/govtool/frontend/src/hooks/forms/useUrlAndHashFormController.tsx
+++ b/govtool/frontend/src/hooks/forms/useUrlAndHashFormController.tsx
@@ -6,8 +6,9 @@ import { HASH_REGEX, URL_REGEX } from "@utils";
 import { useTranslation } from "@hooks";
 
 export interface UrlAndHashFormValues {
-  url?: string;
   hash?: string;
+  storeData?: boolean;
+  url?: string;
 }
 
 export const useUrlAndHashFormController = () => {
@@ -42,12 +43,13 @@ export const useUrlAndHashFormController = () => {
               return !value || HASH_REGEX.test(value);
             }
           ),
+        storeData: Yup.boolean(),
       }),
     []
   );
 
   return useForm<UrlAndHashFormValues>({
-    defaultValues: { url: "", hash: "" },
+    defaultValues: { url: "", hash: "", storeData: false },
     mode: "onChange",
     resolver: yupResolver<UrlAndHashFormValues>(validationSchema),
   });
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index 967863ecf..d18c1b4b8 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -327,6 +327,10 @@ export const en = {
       rolesAndResponsibilitiesDescription:
         "DReps are fundamental users that govern the Cardano network. This is an important role which requires work and dedication to fulfil.\n\nA DRep is expected to actively participate in governance and act as a representative of other Cardano members in  governance matters. Therefore, DReps will be expected to keep abreast of Governance Actions so they can make informed and wise decisions.\n<0>Learn More</0> about DRep.\n\nPlease register as a DRep if you have time to dedicate to making Cardano a better and more well-governed place.\n\nBecoming a DRep will require a refundable deposit of ₳<strong>{{deposit}}</strong>.\n\nYou will be refunded your deposit when you retire.",
       rolesAndResponsibilitiesTitle: "Roles & Responsibilities",
+      storeDataCheckboxLabel:
+        "I agree to store correctly this information and to maintain them over the years",
+      storeDataLink: "Learn more about storing information",
+      storeDataTitle: "Store and maintain the data yourself",
     },
     slider: {
       showAll: "Show all",

From 554222ecb18d290be94018f6e7f111dba43e6b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Wed, 28 Feb 2024 17:03:59 +0100
Subject: [PATCH 80/82] [#152] improve form

---
 .../src/components/organisms/RegisterAsdRepStepTwo.tsx      | 5 +++--
 .../src/hooks/forms/useRegisterAsdRepFormContext.tsx        | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
index 2ef784b41..40a673b9b 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
@@ -18,7 +18,7 @@ interface Props {
 export const RegisterAsdRepStepTwo = ({ setStep }: Props) => {
   const { t } = useTranslation();
   const { isMobile } = useScreenDimension();
-  const { control, errors } = useRegisterAsdRepFormContext();
+  const { control, errors,isContinueButtonDisabled, isSkipButton  } = useRegisterAsdRepFormContext();
 
   const onClickContinue = useCallback(() => setStep(3), []);
 
@@ -26,8 +26,9 @@ export const RegisterAsdRepStepTwo = ({ setStep }: Props) => {
 
   return (
     <BgCard
-      actionButtonLabel={t("continue")}
+      actionButtonLabel={isSkipButton ? t("skip") : t("continue")}
       onClickActionButton={onClickContinue}
+      isActionButtonDisabled={isContinueButtonDisabled}
       onClickBackButton={onClickBackButton}
     >
       <Typography
diff --git a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx b/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
index 92e43b3e5..575e4ce6a 100644
--- a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
+++ b/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
@@ -25,6 +25,10 @@ export const useRegisterAsdRepFormContext = () => {
     watch,
   } = useFormContext<UrlAndHashFormValues>();
 
+  const isSkipButton = !watch('hash')?.trim() && !watch("url")?.trim()
+
+  const isContinueButtonDisabled = !!Object.keys(errors).length
+
   const onSubmit = useCallback(
     async (values: UrlAndHashFormValues) => {
       const { url, hash } = values;
@@ -92,6 +96,8 @@ export const useRegisterAsdRepFormContext = () => {
     control,
     errors,
     isValid,
+    isContinueButtonDisabled,
+    isSkipButton,
     watch,
     submitForm: handleSubmit(onSubmit),
   };

From fc27fbddf58d900f02fc7d263ceb01bc9cc083db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Wed, 28 Feb 2024 17:52:42 +0100
Subject: [PATCH 81/82] [#152] fix inprogress copy

---
 .../frontend/src/components/molecules/DashboardActionCard.tsx | 4 ++--
 govtool/frontend/src/i18n/locales/en.ts                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
index d394c12a4..b654d61a3 100644
--- a/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
+++ b/govtool/frontend/src/components/molecules/DashboardActionCard.tsx
@@ -84,7 +84,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
           }}
         >
           <Typography color={"orangeDark"} variant="body2">
-            {t("inProgress").toLocaleUpperCase()}
+            {t("inProgress")}
           </Typography>
         </Box>
       )}
@@ -113,7 +113,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
         ) : null}
         {inProgress && !isLoading ? (
           <Typography variant="title2" fontWeight={700}>
-            In Progress
+            {t("inProgress")}
           </Typography>
         ) : null}
         {description ? (
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index d18c1b4b8..b6a35cbb6 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -426,7 +426,7 @@ export const en = {
     continue: "Continue",
     delegate: "Delegate",
     here: "here",
-    inProgress: "In progress",
+    inProgress: "In Progress",
     learnMore: "Learn more",
     loading: "Loading...",
     myDRepId: "My DRep ID:",

From 63fc880f235cee432dd4360495150497166ae7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Sworze=C5=84?= <b.sworzen@gmail.com>
Date: Wed, 28 Feb 2024 18:29:49 +0100
Subject: [PATCH 82/82] [#152] change continue on register/ reset store data
 agreement when back to previous step

---
 .../organisms/RegisterAsdRepStepThree.tsx       | 17 +++++++++++++----
 .../organisms/RegisterAsdRepStepTwo.tsx         |  3 ++-
 .../forms/useRegisterAsdRepFormContext.tsx      | 12 +++++++-----
 govtool/frontend/src/i18n/locales/en.ts         |  5 +++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/govtool/frontend/src/components/organisms/RegisterAsdRepStepThree.tsx b/govtool/frontend/src/components/organisms/RegisterAsdRepStepThree.tsx
index 5fd57ad08..6b5a3df4d 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsdRepStepThree.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsdRepStepThree.tsx
@@ -18,10 +18,19 @@ export const RegisterAsdRepStepThree = ({
 }) => {
   const { t } = useTranslation();
   const { isMobile } = useScreenDimension();
-  const { control, errors, submitForm, isRegistrationAsDRepLoading, watch } =
-    useRegisterAsdRepFormContext();
+  const {
+    control,
+    errors,
+    isRegistrationAsDRepLoading,
+    resetField,
+    submitForm,
+    watch,
+  } = useRegisterAsdRepFormContext();
 
-  const onClickBackButton = () => setStep(2);
+  const onClickBackButton = () => {
+    setStep(2);
+    resetField("storeData");
+  };
 
   const isContinueDisabled = !watch("storeData");
 
@@ -30,7 +39,7 @@ export const RegisterAsdRepStepThree = ({
 
   return (
     <BgCard
-      actionButtonLabel={t("continue")}
+      actionButtonLabel={t("register")}
       isActionButtonDisabled={isContinueDisabled}
       isLoadingActionButton={isRegistrationAsDRepLoading}
       onClickActionButton={submitForm}
diff --git a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
index 40a673b9b..f384349bf 100644
--- a/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
+++ b/govtool/frontend/src/components/organisms/RegisterAsdRepStepTwo.tsx
@@ -18,7 +18,8 @@ interface Props {
 export const RegisterAsdRepStepTwo = ({ setStep }: Props) => {
   const { t } = useTranslation();
   const { isMobile } = useScreenDimension();
-  const { control, errors,isContinueButtonDisabled, isSkipButton  } = useRegisterAsdRepFormContext();
+  const { control, errors, isContinueButtonDisabled, isSkipButton } =
+    useRegisterAsdRepFormContext();
 
   const onClickContinue = useCallback(() => setStep(3), []);
 
diff --git a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx b/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
index 575e4ce6a..504680a0e 100644
--- a/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
+++ b/govtool/frontend/src/hooks/forms/useRegisterAsdRepFormContext.tsx
@@ -22,12 +22,13 @@ export const useRegisterAsdRepFormContext = () => {
     control,
     handleSubmit,
     formState: { errors, isValid },
+    resetField,
     watch,
   } = useFormContext<UrlAndHashFormValues>();
 
-  const isSkipButton = !watch('hash')?.trim() && !watch("url")?.trim()
+  const isSkipButton = !watch("hash")?.trim() && !watch("url")?.trim();
 
-  const isContinueButtonDisabled = !!Object.keys(errors).length
+  const isContinueButtonDisabled = !!Object.keys(errors).length;
 
   const onSubmit = useCallback(
     async (values: UrlAndHashFormValues) => {
@@ -92,13 +93,14 @@ export const useRegisterAsdRepFormContext = () => {
   );
 
   return {
-    isRegistrationAsDRepLoading: isLoading,
     control,
     errors,
-    isValid,
     isContinueButtonDisabled,
+    isRegistrationAsDRepLoading: isLoading,
     isSkipButton,
-    watch,
+    isValid,
+    resetField,
     submitForm: handleSubmit(onSubmit),
+    watch,
   };
 };
diff --git a/govtool/frontend/src/i18n/locales/en.ts b/govtool/frontend/src/i18n/locales/en.ts
index b6a35cbb6..f205ffcca 100644
--- a/govtool/frontend/src/i18n/locales/en.ts
+++ b/govtool/frontend/src/i18n/locales/en.ts
@@ -433,11 +433,12 @@ export const en = {
     nextStep: "Next step",
     no: "No",
     ok: "Ok",
-    select: "Select",
+    register:"Register",
     seeTransaction: "See transaction",
-    submit: "Submit",
+    select: "Select",
     skip: "Skip",
     sortBy: "Sort by",
+    submit: "Submit",
     thisLink: "this link",
     votingPower: "Voting power:",
     yes: "Yes",