Revert "Fix Back button on GA category view and tests"

This reverts commit d86def3.

Author: aaboyle878

govtool/frontend/src/App.tsx

@@ -81,10 +81,7 @@ export default () => {
           enable(walletName);
           return;
         }
-        // eslint-disable-next-line no-await-in-loop
-        await new Promise((resolve) => {
-          setTimeout(resolve, interval);
-        });
+        await new Promise(resolve => setTimeout(resolve, interval));
       }
 
       if (!isOnAllowedPage) {

govtool/frontend/src/components/atoms/types.ts

@@ -1,5 +1,4 @@
 import { ChangeEvent } from "react";
-import { LinkProps } from "react-router-dom";
 import {
   ButtonProps as MUIButtonProps,
   CheckboxProps as MUICheckboxProps,
@@ -14,10 +13,6 @@ export type ButtonProps = Omit<MUIButtonProps, "size"> & {
   isLoading?: boolean;
   size?: "small" | "medium" | "large" | "extraLarge";
   dataTestId?: string;
-  to?: LinkProps["to"];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  state?: any;
-  component?: React.ElementType;
 };
 
 export type LoadingButtonProps = ButtonProps & {

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

@@ -40,7 +40,6 @@ export const GovernanceActionCard: FC<ActionTypeProps> = ({
   inProgress = false,
   expiryDate,
   expiryEpochNo,
-  onClick,
   createdDate,
   createdEpochNo,
   txHash,
@@ -59,8 +58,7 @@ export const GovernanceActionCard: FC<ActionTypeProps> = ({
     bech32Prefix: "gov_action",
   });
 
-  const pathname = useLocation().pathname.replace(/governance_actions.*/g, "governance_actions");
-  const isCategoryView = useLocation().pathname.includes("category");
+  const location = useLocation();
 
   return (
     <Box
@@ -154,23 +152,8 @@ export const GovernanceActionCard: FC<ActionTypeProps> = ({
           <Skeleton width="100%" height="40px" sx={{ borderRadius: "20px" }} />
         ) : (
           <Button
-            onClick={onClick}
             component={Link}
-            to={`${pathname}/${govActionId}`}
-            state={{
-              proposal: {
-                  abstract,
-                  type,
-                  expiryDate,
-                  expiryEpochNo,
-                  createdDate,
-                  createdEpochNo,
-                  txHash,
-                  index,
-                  title,
-              },
-              openedFromCategoryPage: isCategoryView
-            }}
+            to={`${location.pathname}/${govActionId}`}
             variant={inProgress ? "outlined" : "contained"}
             size="large"
             sx={{

govtool/frontend/src/components/organisms/ValidatedGovernanceActionCard.tsx

@@ -1,8 +1,8 @@
 import { useState, useEffect } from "react";
 
-import { GovernanceActionCard } from "@molecules";
 import { useValidateMutation } from "@/hooks/mutations";
 import { MetadataStandard, ProposalData } from "@/models";
+import { GovernanceActionCard } from "@molecules";
 
 type ActionTypeProps = Omit<
   ProposalData,
@@ -14,7 +14,6 @@ type ActionTypeProps = Omit<
   | "rationale"
   | "motivation"
 > & {
-  onClick?: () => void;
   inProgress?: boolean;
 };
 export const ValidatedGovernanceActionCard = (props: ActionTypeProps) => {

govtool/frontend/src/pages/DashboardGovernanceActionsCategory.tsx

@@ -1,5 +1,5 @@
 import { useMemo, useRef } from "react";
-import { useNavigate, useParams } from "react-router-dom";
+import { generatePath, useNavigate, useParams } from "react-router-dom";
 import { Box, CircularProgress, Link } from "@mui/material";
 
 import { Background, Typography } from "@atoms";
@@ -18,6 +18,7 @@ import {
   useTranslation,
 } from "@hooks";
 import {
+  getFullGovActionId,
   getProposalTypeLabel,
   removeDuplicatedProposals,
 } from "@utils";
@@ -140,6 +141,18 @@ export const DashboardGovernanceActionsCategory = () => {
                   }
                   onClick={() => {
                     saveScrollPosition();
+
+                    navigate(
+                      generatePath(PATHS.dashboardGovernanceActionsAction, {
+                        proposalId: getFullGovActionId(item.txHash, item.index),
+                      }),
+                      {
+                        state: {
+                          proposal: item,
+                          openedFromCategoryPage: true,
+                        },
+                      },
+                    );
                   }}
                   txHash={item.txHash}
                 />

govtool/frontend/src/pages/GovernanceActionsCategory.tsx

@@ -20,6 +20,7 @@ import {
 } from "@hooks";
 import {
   WALLET_LS_KEY,
+  getFullGovActionId,
   getItemFromLocalStorage,
   getProposalTypeLabel,
   removeDuplicatedProposals,
@@ -141,6 +142,19 @@ export const GovernanceActionsCategory = () => {
                         {...item}
                         onClick={() => {
                           saveScrollPosition();
+
+                          navigate(
+                            PATHS.governanceActionsAction.replace(
+                              ":proposalId",
+                              getFullGovActionId(item.txHash, item.index),
+                            ),
+                            {
+                              state: {
+                                proposal: item,
+                                openedFromCategoryPage: true,
+                              },
+                            },
+                          );
                         }}
                       />
                     </Box>

govtool/frontend/src/stories/Slider.stories.tsx

@@ -58,6 +58,6 @@ export const SliderComponentOverflow: Story = {
     await expect(canvas.getByText("Slider title")).toBeInTheDocument();
     await expect(canvas.getAllByTestId("slider")).toHaveLength(6);
 
-    await expect(canvas.getByRole("link")).toBeEnabled();
+    await expect(canvas.getByRole("button")).toBeEnabled();
   },
 };