Merge pull request #2286 from IntersectMBO/fix/drep-list-stack-on-loa…

…ding fix(#2285): fix infinite DRep list loading
IntersectMBO · Oct 31, 2024 · 52f1f9a · 52f1f9a
2 parents 431270a + ba5a4f9
commit 52f1f9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,7 @@ changes.
 
 ### Fixed
 
--
+- Fix infinite DRep list loading [Issue 2285](https://github.com/IntersectMBO/govtool/issues/2285)
 
 ### Changed
 

diff --git a/govtool/frontend/src/context/dataActionsBar.tsx b/govtool/frontend/src/context/dataActionsBar.tsx
@@ -75,7 +75,9 @@ const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
 
   useEffect(() => {
     if (
-      (userMovedToDifferentAppArea && !userOpenedGADetailsFromCategoryPage) ||
+      (!pathname.includes("drep_directory") &&
+        userMovedToDifferentAppArea &&
+        !userOpenedGADetailsFromCategoryPage) ||
       userMovedFromGAListToCategoryPage
     ) {
       resetState();
@@ -116,7 +118,7 @@ const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
   );
 
   return (
-    <DataActionsBarContext.Provider value={contextValue}>
+    <DataActionsBarContext.Provider value={contextValue} key={pathname}>
       {children}
     </DataActionsBarContext.Provider>
   );

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepListQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepListQuery.ts
@@ -33,7 +33,7 @@ export const useGetDRepListInfiniteQuery = (
         pendingTransaction.registerAsDrep ||
         pendingTransaction.retireAsDirectVoter ||
         pendingTransaction.retireAsDrep
-      )?.transactionHash ?? 'noPendingTransaction',
+      )?.transactionHash ?? "noPendingTransaction",
       filters.length ? filters : "",
       searchPhrase ?? "",
       sorting ?? "",
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ changes. @@
     ### Fixed
-    -
+    - Fix infinite DRep list loading [Issue 2285](https://github.com/IntersectMBO/govtool/issues/2285)
     ### Changed
@@ Expand Down @@