Merge pull request #780 from alleslabs/fix/proposal-votes-table

fix: proposal votes pagination, scrolling
alleslabs · Feb 13, 2024 · e46291c · e46291c
2 parents c70b717 + 00c9aa2
commit e46291c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -70,6 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#780](https://github.com/alleslabs/celatone-frontend/pull/780) Fix proposal vote table, scroll to top on table
 - [#761](https://github.com/alleslabs/celatone-frontend/pull/761) Fix copy button tooltip alignment
 - [#754](https://github.com/alleslabs/celatone-frontend/pull/754) Fix mobile guard incorrect behavior
 - [#751](https://github.com/alleslabs/celatone-frontend/pull/751) Fix fail txs should have no logs and remove stone-12-1

diff --git a/src/lib/pages/proposal-details/components/vote-details/voting-period/votes-table/index.tsx b/src/lib/pages/proposal-details/components/vote-details/voting-period/votes-table/index.tsx
@@ -87,6 +87,8 @@ enum AnswerType {
   WEIGHTED = "weighted",
 }
 
+const tableHeaderId = "proposalVotesTable";
+
 export const ProposalVotesTable = ({
   id,
   answers,
@@ -96,14 +98,6 @@ export const ProposalVotesTable = ({
   const [search, setSearch] = useState("");
   const debouncedSearch = useDebounce(search);
 
-  const { data, isLoading } = useProposalVotes(
-    id,
-    10,
-    0,
-    answerFilter,
-    debouncedSearch
-  );
-
   const {
     pagesQuantity,
     currentPage,
@@ -120,6 +114,14 @@ export const ProposalVotesTable = ({
     },
   });
 
+  const { data, isLoading } = useProposalVotes(
+    id,
+    pageSize,
+    offset,
+    answerFilter,
+    debouncedSearch
+  );
+
   const isSearching = debouncedSearch !== "" || answerFilter !== AnswerType.ALL;
 
   const total = answers?.total ?? 0;
@@ -182,7 +184,7 @@ export const ProposalVotesTable = ({
   };
 
   return (
-    <Box>
+    <Box id={tableHeaderId}>
       {fullVersion && (
         <Grid gap={4} templateColumns={{ base: "1fr", md: "240px auto" }}>
           <GridItem>
@@ -215,6 +217,7 @@ export const ProposalVotesTable = ({
         <Pagination
           currentPage={currentPage}
           pagesQuantity={pagesQuantity}
+          scrollComponentId={tableHeaderId}
           offset={offset}
           totalData={total}
           pageSize={pageSize}