[#1117] change implementation of checkIsWalletConnected

IntersectMBO · Jul 26, 2024 · 93f4210 · 93f4210
1 parent d28b355
commit 93f4210
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 19 deletions.
diff --git a/govtool/frontend/src/pages/CreateGovernanceAction.tsx b/govtool/frontend/src/pages/CreateGovernanceAction.tsx
@@ -37,7 +37,7 @@ export const CreateGovernanceAction = () => {
   });
 
   useEffect(() => {
-    if (checkIsWalletConnected()) {
+    if (!checkIsWalletConnected()) {
       navigate(PATHS.home);
     }
   }, []);

diff --git a/govtool/frontend/src/pages/DRepDirectory.tsx b/govtool/frontend/src/pages/DRepDirectory.tsx
@@ -10,9 +10,7 @@ import { checkIsWalletConnected } from "@utils";
 export const DRepDirectory = () => {
   const { t } = useTranslation();
 
-  const isConnected = !checkIsWalletConnected();
-
-  if (isConnected) {
+  if (checkIsWalletConnected()) {
     return (
       <PagePaddingBox
         sx={{ display: "flex", flex: 1, flexDirection: "column", py: 2 }}

diff --git a/govtool/frontend/src/pages/Dashboard.tsx b/govtool/frontend/src/pages/Dashboard.tsx
@@ -33,7 +33,7 @@ export const Dashboard = () => {
   }, [pathname, divRef]);
 
   useEffect(() => {
-    if (checkIsWalletConnected()) {
+    if (!checkIsWalletConnected()) {
       if (window.location.pathname === PATHS.dashboard) {
         navigate(PATHS.home);
       } else {

diff --git a/govtool/frontend/src/pages/EditDRepMetadata.tsx b/govtool/frontend/src/pages/EditDRepMetadata.tsx
@@ -56,7 +56,7 @@ export const EditDRepMetadata = () => {
     });
 
   useEffect(() => {
-    if (checkIsWalletConnected()) {
+    if (!checkIsWalletConnected()) {
       navigate(PATHS.home);
       return;
     }

diff --git a/govtool/frontend/src/pages/PublicRoute.tsx b/govtool/frontend/src/pages/PublicRoute.tsx
@@ -4,12 +4,10 @@ import { useLocation, useNavigate } from "react-router-dom";
 import { checkIsWalletConnected } from "../utils";
 
 export const PublicRoute: FC<{ children: ReactNode }> = ({ children }) => {
-  // checkIsWalletConnected returns true if wallet is NOT connected
-  const isConnected = !checkIsWalletConnected();
   const navigate = useNavigate();
   const { pathname } = useLocation();
 
-  if (isConnected && !pathname.startsWith("/connected")) {
+  if (checkIsWalletConnected() && !pathname.startsWith("/connected")) {
     navigate(`/connected${pathname}`);
   }
 

diff --git a/govtool/frontend/src/pages/RegisterAsDirectVoter.tsx b/govtool/frontend/src/pages/RegisterAsDirectVoter.tsx
@@ -94,7 +94,7 @@ export const RegisterAsDirectVoter = () => {
   );
 
   useEffect(() => {
-    if (checkIsWalletConnected()) {
+    if (!checkIsWalletConnected()) {
       navigate(PATHS.home);
     }
   }, []);

diff --git a/govtool/frontend/src/pages/RegisterAsdRep.tsx b/govtool/frontend/src/pages/RegisterAsdRep.tsx
@@ -55,7 +55,7 @@ export const RegisterAsdRep = () => {
     });
 
   useEffect(() => {
-    if (checkIsWalletConnected()) {
+    if (!checkIsWalletConnected()) {
       navigate(PATHS.home);
     }
   }, []);

diff --git a/govtool/frontend/src/pages/RetireAsDirectVoter.tsx b/govtool/frontend/src/pages/RetireAsDirectVoter.tsx
@@ -81,7 +81,7 @@ export const RetireAsDirectVoter = () => {
   );
 
   useEffect(() => {
-    if (checkIsWalletConnected()) {
+    if (!checkIsWalletConnected()) {
       navigate(PATHS.home);
     }
   }, []);

diff --git a/govtool/frontend/src/pages/RetireAsDrep.tsx b/govtool/frontend/src/pages/RetireAsDrep.tsx
@@ -15,7 +15,7 @@ export const RetireAsDrep = () => {
   const { isMobile } = useScreenDimension();
 
   useEffect(() => {
-    if (checkIsWalletConnected()) {
+    if (!checkIsWalletConnected()) {
       navigate(PATHS.home);
     }
   }, []);

diff --git a/govtool/frontend/src/utils/checkIsWalletConnected.ts b/govtool/frontend/src/utils/checkIsWalletConnected.ts
@@ -1,5 +1,5 @@
 import { WALLET_LS_KEY, getItemFromLocalStorage } from "@/utils/localStorage";
 
 export const checkIsWalletConnected = () =>
-  !getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) ||
-  !getItemFromLocalStorage(`${WALLET_LS_KEY}_name`);
+  getItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`) &&
+  getItemFromLocalStorage(`${WALLET_LS_KEY}_name`);
diff --git a/govtool/frontend/src/utils/tests/checkIsWalletConnected.test.ts b/govtool/frontend/src/utils/tests/checkIsWalletConnected.test.ts
@@ -6,20 +6,20 @@ import {
 } from "@/utils/localStorage";
 
 describe("checkIsWalletConnected function", () => {
-  it("returns false when wallet information is present in local storage", () => {
+  it("returns true when wallet information is present in local storage", () => {
     setItemToLocalStorage(`${WALLET_LS_KEY}_name`, "Nami");
     setItemToLocalStorage(`${WALLET_LS_KEY}_stake_key`, "teststakekey");
     const isConnected = checkIsWalletConnected();
 
-    expect(isConnected).toBe(false);
+    expect(isConnected).toBe(true);
   });
 
-  it("returns true when wallet information is missing in local storage", () => {
+  it("returns false when wallet information is missing in local storage", () => {
     removeItemFromLocalStorage(`${WALLET_LS_KEY}_name`);
     removeItemFromLocalStorage(`${WALLET_LS_KEY}_stake_key`);
 
     const isConnected = checkIsWalletConnected();
 
-    expect(isConnected).toBe(true);
+    expect(isConnected).toBe(false);
   });
 });