fix: passing random sorting to governance actions request

IntersectMBO · Jan 10, 2025 · b916ee6 · b916ee6
1 parent a06cbf4
commit b916ee6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ changes.
 
 - Fix counting submitted votes [Issue 2609](https://github.com/IntersectMBO/govtool/issues/2609)
 - Fix opening relative paths in external links
+- Fix passing random sorting to governance actions on disconnected wallet
 
 ### Changed
 

diff --git a/govtool/frontend/src/context/dataActionsBar.tsx b/govtool/frontend/src/context/dataActionsBar.tsx
@@ -8,6 +8,7 @@ import React, {
   useEffect,
   useMemo,
   FC,
+  useRef,
 } from "react";
 import { useLocation } from "react-router-dom";
 
@@ -41,7 +42,7 @@ interface ProviderProps {
 }
 
 const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
-  const [isAdjusting, setIsAdjusting] = useState<boolean>(true);
+  const isAdjusting = useRef<boolean>(false);
   const [searchText, setSearchText] = useState<string>("");
   const debouncedSearchText = useDebounce(searchText, 300);
   const [filtersOpen, setFiltersOpen] = useState<boolean>(false);
@@ -64,11 +65,12 @@ const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
     setSearchText("");
     setChosenFilters([]);
     setChosenSorting("");
-    setIsAdjusting(false);
+    isAdjusting.current = false;
   }, []);
 
   const userMovedToDifferentAppArea =
-    pathname !== lastPath && !pathname.startsWith(lastPath);
+    pathname !== lastPath &&
+    (!pathname.startsWith(lastPath) || lastPath === "");
   const userOpenedGADetailsFromCategoryPage =
     lastPath.includes("governance_actions/category") &&
     pathname.includes("governance_actions/");
@@ -77,7 +79,8 @@ const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
     pathname.includes("governance_actions/category");
 
   useEffect(() => {
-    setIsAdjusting(true);
+    isAdjusting.current = true;
+
     if (
       (!pathname.includes("drep_directory") &&
         userMovedToDifferentAppArea &&
@@ -94,7 +97,7 @@ const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
 
   const contextValue = useMemo(
     () => ({
-      isAdjusting,
+      isAdjusting: isAdjusting.current,
       chosenFilters,
       chosenFiltersLength: chosenFilters.length,
       chosenSorting,
@@ -111,7 +114,6 @@ const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
       sortOpen,
     }),
     [
-      isAdjusting,
       chosenFilters,
       chosenSorting,
       debouncedSearchText,
@@ -120,6 +122,7 @@ const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
       sortOpen,
       closeFilters,
       closeSorts,
+      pathname,
     ],
   );
 

diff --git a/govtool/frontend/src/pages/GovernanceActions.tsx b/govtool/frontend/src/pages/GovernanceActions.tsx
@@ -23,7 +23,8 @@ const defaultCategories = GOVERNANCE_ACTIONS_FILTERS.map(
 );
 
 export const GovernanceActions = () => {
-  const { debouncedSearchText, ...dataActionsBarProps } = useDataActionsBar();
+  const { debouncedSearchText, isAdjusting, ...dataActionsBarProps } =
+    useDataActionsBar();
   const { chosenFilters, chosenSorting } = dataActionsBarProps;
   const { isMobile, pagePadding } = useScreenDimension();
   const { isEnabled } = useCardano();
@@ -37,6 +38,7 @@ export const GovernanceActions = () => {
     filters: queryFilters,
     sorting: chosenSorting,
     searchPhrase: debouncedSearchText,
+    enabled: !isAdjusting,
   });
 
   useEffect(() => {