Merge pull request #3319 from IntersectMBO/develop

fix: handle incorrect routing on connecting wallet on budget discussion page

Author: MSzalowski

CHANGELOG.md

@@ -15,6 +15,7 @@ changes.
 ### Fixed
 
 - Fix scroll on a drawer on smaller resolution
+- Fix incorrect routing on connecting wallet on budget discussion page
 
 ### Changed
 

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

@@ -1,7 +1,13 @@
 import { useLocation, useNavigate } from "react-router-dom";
 import { Box, Button, Typography } from "@mui/material";
 
-import { PDF_PATHS, PATHS, gray, OUTCOMES_PATHS } from "@consts";
+import {
+  PDF_PATHS,
+  PATHS,
+  gray,
+  OUTCOMES_PATHS,
+  BUDGET_DISCUSSION_PATHS,
+} from "@consts";
 import { useCardano } from "@context";
 import { useTranslation } from "@hooks";
 import { Card } from "./Card";
@@ -14,15 +20,23 @@ export const WalletInfoCard = () => {
 
   const onClickDisconnect = async () => {
     await disconnectWallet();
+
+    const isBudgetDiscussion = window.location.pathname.includes(
+      BUDGET_DISCUSSION_PATHS.budgetDiscussion.replace("/", ""),
+    );
+
     const isProposalDiscussionForum = window.location.pathname.includes(
       PDF_PATHS.proposalDiscussion.replace("/", ""),
     );
 
     const isGovernanceOutcomesPillar = window.location.pathname.includes(
       OUTCOMES_PATHS.governanceActionsOutcomes.replace("/", ""),
     );
-
-    if (!isProposalDiscussionForum && !isGovernanceOutcomesPillar) {
+    if (
+      !isBudgetDiscussion &&
+      !isProposalDiscussionForum &&
+      !isGovernanceOutcomesPillar
+    ) {
       navigate(
         pathname.includes("/connected")
           ? `${pathname.replace("/connected", "")}${hash ?? ""}`

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

@@ -2,7 +2,12 @@ import { FC, useCallback } from "react";
 import { To, useNavigate, useLocation } from "react-router-dom";
 import { Box, CircularProgress, Typography } from "@mui/material";
 
-import { OUTCOMES_PATHS, PATHS, PDF_PATHS } from "@consts";
+import {
+  BUDGET_DISCUSSION_PATHS,
+  OUTCOMES_PATHS,
+  PATHS,
+  PDF_PATHS,
+} from "@consts";
 import { useCardano } from "@context";
 import { theme } from "@/theme";
 
@@ -32,6 +37,10 @@ export const WalletOptionButton: FC<WalletOption> = ({
 
   const enableByWalletName = useCallback(async () => {
     if (isEnableLoading) return;
+    const isBudgetDiscussion = window.location.pathname.includes(
+      BUDGET_DISCUSSION_PATHS.budgetDiscussion.replace("/", ""),
+    );
+
     const isProposalDiscussionForum = window.location.pathname.includes(
       PDF_PATHS.proposalDiscussion.replace("/", ""),
     );
@@ -43,7 +52,12 @@ export const WalletOptionButton: FC<WalletOption> = ({
     const result = await enable(name);
 
     if (result?.stakeKey) {
-      if (isProposalDiscussionForum || isGovernanceOutcomesPillar) return;
+      if (
+        isBudgetDiscussion ||
+        isProposalDiscussionForum ||
+        isGovernanceOutcomesPillar
+      )
+        return;
       navigate(
         // eslint-disable-next-line no-unneeded-ternary
         pathToNavigate