Feature/filter issues reorg (#919)

* Publish new lib versions. (#412) * fix/fix-table-types (#354) * removed the any types from hub * renamed Table to DaoTable and DataTable to DaoTable to be more consistent with DaoCard * removed commented out DaoData type * one more comment -- thought i got both before * Fix/355 summon params mixup (#356) * more ignore * fixes bad init params order in summon tx * Feature/tag component (#349) * Created basic tag component * Added dynamic color selections for tags * Bumped versions fixed filer * Added icon support to tag component Co-authored-by: Jord <[email protected]> Co-authored-by: Jonathan Prozzi <[email protected]> * Feature/delegate play (#357) * more ignore * fixes bad init params order in summon tx * delegate testing and subgraph field updates * finishes mapping * update dao-data query and transformer * adds delegate tag to list view and hooks up delegate filtering * refactors filter into query helper * Spencer's Summon tooltip suggestions (#370) * Spencer's Summon tooltip suggestions - Summon portion of #365 * Delimiter references #368 For now, just referencing spaces. But if tabs, commas, or other delimiters are also supported, those should be references in the tooltips as well. * Address Jord's comments Co-authored-by: Sam Kuhlmann <[email protected]> * Fix/summon poll (#375) * more ignore * fixes bad init params order in summon tx * delegate testing and subgraph field updates * finishes mapping * update dao-data query and transformer * adds delegate tag to list view and hooks up delegate filtering * adds schema field to tx entity * updates poll for tx entity made before dao entity * Feature/alpha baal update (#376) * new abis * updates summoner tx logic and contract addresses * fixes transaction entity creation location; * fixes some test * Feature/unit utils (#380) * create custom d.ts for human-format * type and convert unit fn from V2 * readableNumber util accepts number strings, throws error if string but number string * fix 0 to 1 utils, extend MaxDecimals to shorten decimal places * refine spacer and unit symbol placement * update new card to handle new params * update table * corrections * alter d.ts file * potential solutions to ts bug * implement keating's d.ts fix * fix comment * Fix/network switcher (#381) * better error handling * fix bug * remove log * get react-table TS to stop yelling (#382) Co-authored-by: Sam Kuhlmann <[email protected]> * Feature/hub sort (#383) * wip * gets query working on dao entity after lots of subgraph updates * updates front end for sort * fixes type issue * fixes build issue * reviewing v3 monorepo and saw some networks missing (#399) * Feature/public profile (#384) * Add some stuff * Add public profile * Add ens * Get build to pass * Update apps/hub-app/src/pages/PublicProfilePage.tsx Co-authored-by: Rowdy <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann <[email protected]> * adds search (#401) * adds search wip * correctly types the onChange for the input * cleans up unsed imports * naming * Feature/public profile (#384) * Add some stuff * Add public profile * Add ens * Get build to pass * Update apps/hub-app/src/pages/PublicProfilePage.tsx Co-authored-by: Rowdy <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann <[email protected]> * conflicts * correctly types the onChange for the input * cleans up unsed imports * naming * fix build error Co-authored-by: Alexander Keating <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> * Release/12072022 (#411) * adds search wip * correctly types the onChange for the input * cleans up unsed imports * naming * conflicts * correctly types the onChange for the input * cleans up unsed imports * naming * fix build error * feature bump Co-authored-by: Jonathan Prozzi <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Jord <[email protected]> Co-authored-by: Spencer Graham <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> Co-authored-by: Alexander Keating <[email protected]> * Revert "Publish new lib versions. (#412)" This reverts commit bab7077. * develop to master (#482) * UI/layout cleanup (#438) * run generator * import connect, theme libs. Add eindow.global. Ensure main.tsx uses React 17 API. * deletes app test * updates favicon and title * remove nx defaults * rough in layout box, target DH connect nav with class * remove even more css. World's dubest layout component * switches to connect class padding for mobile * extract base layout component to storybook * hook export chain, change name to outerlayout * extract formSegment from summon-app; replace in all instances in summon * extract split-column, replace all instances in summon * document future changes in comments * fix exports * switch core-app to nx default project * fix spacing * Fix/split column bug (#444) - fix bug * Layouts/subnav (#447) * clear out extra app.t.tsx * build sub-nav * style sub-nav * test subnav * extract subNavLink into component * subnavlink story * build subnavlink story * fix broken as prop * add mobile view, icon button trigger * add tsc command to core-app * adds human-format, removes profanity * Fix summon (#446) * Fix summon * clear out extra app.t.tsx * build sub-nav * style sub-nav * test subnav * extract subNavLink into component * subnavlink story * build subnavlink story * fix broken as prop * Fix summon * add mobile view, icon button trigger * add tsc command to core-app * adds human-format, removes profanity * add human-format to dao-data * move dts file Co-authored-by: jordan <[email protected]> Co-authored-by: Jord <[email protected]> * Haus layout (#451) * Publish new lib versions. (#412) * fix/fix-table-types (#354) * removed the any types from hub * renamed Table to DaoTable and DataTable to DaoTable to be more consistent with DaoCard * removed commented out DaoData type * one more comment -- thought i got both before * Fix/355 summon params mixup (#356) * more ignore * fixes bad init params order in summon tx * Feature/tag component (#349) * Created basic tag component * Added dynamic color selections for tags * Bumped versions fixed filer * Added icon support to tag component Co-authored-by: Jord <[email protected]> Co-authored-by: Jonathan Prozzi <[email protected]> * Feature/delegate play (#357) * more ignore * fixes bad init params order in summon tx * delegate testing and subgraph field updates * finishes mapping * update dao-data query and transformer * adds delegate tag to list view and hooks up delegate filtering * refactors filter into query helper * Spencer's Summon tooltip suggestions (#370) * Spencer's Summon tooltip suggestions - Summon portion of #365 * Delimiter references #368 For now, just referencing spaces. But if tabs, commas, or other delimiters are also supported, those should be references in the tooltips as well. * Address Jord's comments Co-authored-by: Sam Kuhlmann <[email protected]> * Fix/summon poll (#375) * more ignore * fixes bad init params order in summon tx * delegate testing and subgraph field updates * finishes mapping * update dao-data query and transformer * adds delegate tag to list view and hooks up delegate filtering * adds schema field to tx entity * updates poll for tx entity made before dao entity * Feature/alpha baal update (#376) * new abis * updates summoner tx logic and contract addresses * fixes transaction entity creation location; * fixes some test * Feature/unit utils (#380) * create custom d.ts for human-format * type and convert unit fn from V2 * readableNumber util accepts number strings, throws error if string but number string * fix 0 to 1 utils, extend MaxDecimals to shorten decimal places * refine spacer and unit symbol placement * update new card to handle new params * update table * corrections * alter d.ts file * potential solutions to ts bug * implement keating's d.ts fix * fix comment * Fix/network switcher (#381) * better error handling * fix bug * remove log * get react-table TS to stop yelling (#382) Co-authored-by: Sam Kuhlmann <[email protected]> * Feature/hub sort (#383) * wip * gets query working on dao entity after lots of subgraph updates * updates front end for sort * fixes type issue * fixes build issue * reviewing v3 monorepo and saw some networks missing (#399) * Feature/public profile (#384) * Add some stuff * Add public profile * Add ens * Get build to pass * Update apps/hub-app/src/pages/PublicProfilePage.tsx Co-authored-by: Rowdy <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann <[email protected]> * adds search (#401) * adds search wip * correctly types the onChange for the input * cleans up unsed imports * naming * Feature/public profile (#384) * Add some stuff * Add public profile * Add ens * Get build to pass * Update apps/hub-app/src/pages/PublicProfilePage.tsx Co-authored-by: Rowdy <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann <[email protected]> * conflicts * correctly types the onChange for the input * cleans up unsed imports * naming * fix build error Co-authored-by: Alexander Keating <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> * Release/12072022 (#411) * adds search wip * correctly types the onChange for the input * cleans up unsed imports * naming * conflicts * correctly types the onChange for the input * cleans up unsed imports * naming * fix build error * feature bump Co-authored-by: Jonathan Prozzi <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Jord <[email protected]> Co-authored-by: Spencer Graham <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> Co-authored-by: Alexander Keating <[email protected]> * Revert "Publish new lib versions. (#412)" This reverts commit bab7077. * build formLayout Component * type correction * build formLayout story * rough in bicolumn layout * handle bicolumn mobile switch, finish bicolumn * fix mainlayout naming * build story for bi-column layout * build dh layout one shot? * yes, one shot * fix import * change prop name Co-authored-by: Jonathan Prozzi <[email protected]> Co-authored-by: Alexander Keating <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Spencer Graham <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> * bumping packages that were published pre revert last week - causing fialures with package publishing (#460) * removing period from info content which casues confusing tooltip (#453) Co-authored-by: Sam Kuhlmann <[email protected]> * Feature/hub profile menu fix (#480) * fixes profile link and layout * dao list style * adds toast to share link * Readme tables preferred (#483) * adjusting breakdown of apps and libs to tables * adding additoonal app references and libs * adding timestamp and address fields to many events (#468) * adding timestamps and address fields to many events * addressing code review * shortening naming convention on proposals, top level txHash defined as txHash going forward * update version * deploy subgraph and generate query types Co-authored-by: skuhlmann <[email protected]> Co-authored-by: Jord <[email protected]> Co-authored-by: Alexander Keating <[email protected]> Co-authored-by: jordan <[email protected]> Co-authored-by: Jonathan Prozzi <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Spencer Graham <[email protected]> * Revert "develop to master (#482)" (#492) This reverts commit 5f7d121. Co-authored-by: Sam Kuhlmann <[email protected]> * Develop into master (#577) * Feature/form builder (#553) * Publish new lib versions. (#412) * fix/fix-table-types (#354) * removed the any types from hub * renamed Table to DaoTable and DataTable to DaoTable to be more consistent with DaoCard * removed commented out DaoData type * one more comment -- thought i got both before * Fix/355 summon params mixup (#356) * more ignore * fixes bad init params order in summon tx * Feature/tag component (#349) * Created basic tag component * Added dynamic color selections for tags * Bumped versions fixed filer * Added icon support to tag component Co-authored-by: Jord <[email protected]> Co-authored-by: Jonathan Prozzi <[email protected]> * Feature/delegate play (#357) * more ignore * fixes bad init params order in summon tx * delegate testing and subgraph field updates * finishes mapping * update dao-data query and transformer * adds delegate tag to list view and hooks up delegate filtering * refactors filter into query helper * Spencer's Summon tooltip suggestions (#370) * Spencer's Summon tooltip suggestions - Summon portion of #365 * Delimiter references #368 For now, just referencing spaces. But if tabs, commas, or other delimiters are also supported, those should be references in the tooltips as well. * Address Jord's comments Co-authored-by: Sam Kuhlmann <[email protected]> * Fix/summon poll (#375) * more ignore * fixes bad init params order in summon tx * delegate testing and subgraph field updates * finishes mapping * update dao-data query and transformer * adds delegate tag to list view and hooks up delegate filtering * adds schema field to tx entity * updates poll for tx entity made before dao entity * Feature/alpha baal update (#376) * new abis * updates summoner tx logic and contract addresses * fixes transaction entity creation location; * fixes some test * Feature/unit utils (#380) * create custom d.ts for human-format * type and convert unit fn from V2 * readableNumber util accepts number strings, throws error if string but number string * fix 0 to 1 utils, extend MaxDecimals to shorten decimal places * refine spacer and unit symbol placement * update new card to handle new params * update table * corrections * alter d.ts file * potential solutions to ts bug * implement keating's d.ts fix * fix comment * Fix/network switcher (#381) * better error handling * fix bug * remove log * get react-table TS to stop yelling (#382) Co-authored-by: Sam Kuhlmann <[email protected]> * Feature/hub sort (#383) * wip * gets query working on dao entity after lots of subgraph updates * updates front end for sort * fixes type issue * fixes build issue * reviewing v3 monorepo and saw some networks missing (#399) * Feature/public profile (#384) * Add some stuff * Add public profile * Add ens * Get build to pass * Update apps/hub-app/src/pages/PublicProfilePage.tsx Co-authored-by: Rowdy <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann <[email protected]> * adds search (#401) * adds search wip * correctly types the onChange for the input * cleans up unsed imports * naming * Feature/public profile (#384) * Add some stuff * Add public profile * Add ens * Get build to pass * Update apps/hub-app/src/pages/PublicProfilePage.tsx Co-authored-by: Rowdy <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann <[email protected]> * conflicts * correctly types the onChange for the input * cleans up unsed imports * naming * fix build error Co-authored-by: Alexander Keating <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> * Release/12072022 (#411) * adds search wip * correctly types the onChange for the input * cleans up unsed imports * naming * conflicts * correctly types the onChange for the input * cleans up unsed imports * naming * fix build error * feature bump Co-authored-by: Jonathan Prozzi <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Jord <[email protected]> Co-authored-by: Spencer Graham <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> Co-authored-by: Alexander Keating <[email protected]> * Revert "Publish new lib versions. (#412)" This reverts commit bab7077. * build formLayout Component * type correction * build formLayout story * rough in bicolumn layout * handle bicolumn mobile switch, finish bicolumn * fix mainlayout naming * build story for bi-column layout * scaffold formBuilder library * rough in formBuilder * restructure types * refactor component structure * test render inputs * add core fields to builder enum * add row layout to builder * built logger, fix logger bug * add disable all functionality * handle asynchronous callback as props to form builder * remove some comments * put submit button in form footer * fix code based on review * build validation pipeline * clean form and field types * revise types again, simplify rules API * commit after refactor carnage * roll back to react-hook-form v6, finally get some traction * found source of bug, trying new rhf version * ...and the bug was slain, returned to that cold, miserable shit heap from whence it came. * reintroduce devtool and logger * build metadata form, form segment subForm component * clean, add custom submit btn text * clean * build string validations * derive validation type from function obj * wrestled types into validation system * rebuild form builder as context * build formBuilder hook, use it in the factory * create sample test * update form placement * more post merge corrections * write validation updaters and add to pipeline, test required updaters, test validation, test pipeline * try jest testing * ensure field state updates on formState change * more cleaning * reorg files * build metadata form * tweak button styles, add defaultValues to formBuilder * good place to stop * remove comments * fix Jest errors * fix field wrapper stories, update lock * may have fixed jest errors Co-authored-by: Jonathan Prozzi <[email protected]> Co-authored-by: Alexander Keating <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Spencer Graham <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> * Fix build (#563) * Fix build * Almost * More changes Co-authored-by: Jord <[email protected]> Co-authored-by: Jonathan Prozzi <[email protected]> Co-authored-by: Sam Kuhlmann <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Spencer Graham <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> * Revert "Develop into master (#577)" This reverts commit b8644d3. * gets member profile menu setup * inits dao context breakdown * fixes filters and some other bugs * moves load more into hook * moves some of the helper functions into the new hooks * cleanup * removes "filter:" from active filter Co-authored-by: Jonathan Prozzi <[email protected]> Co-authored-by: Alexander Keating <[email protected]> Co-authored-by: Rowdy <[email protected]> Co-authored-by: Jord <[email protected]> Co-authored-by: Spencer Graham <[email protected]> Co-authored-by: Brian Rossetti <[email protected]> Co-authored-by: jordan <[email protected]>
HausDAO · Sep 30, 2022 · fa336ae · fa336ae
1 parent 5a79f9b
commit fa336ae
Show file tree

Hide file tree

Showing 31 changed files with 471 additions and 460 deletions.
diff --git a/apps/core-app/src/components/FilterDropdown.tsx b/apps/core-app/src/components/FilterDropdown.tsx
@@ -39,7 +39,7 @@ const FilterDropdown = ({ filter, toggleFilter }: FilterDropdownProps) => {
       spacing=".6rem"
       trigger={
         <Button secondary IconLeft={IconFilter}>
-          Filter{filter && `: ${PROPOSAL_FILTERS[filter]}`}
+          {filter ? `${PROPOSAL_FILTERS[filter]}` : 'Filter'}
         </Button>
       }
     >

diff --git a/apps/core-app/src/components/proposalCards/ActionPrimitives.tsx b/apps/core-app/src/components/proposalCards/ActionPrimitives.tsx
@@ -173,6 +173,7 @@ export const ActionTemplate = ({
     return helperDisplay;
   }, [helperDisplay, theme]);
 
+  const hideQuorum = proposal.dao.quorumPercent === '0';
   const yesPerc = percentage(
     Number(proposal.yesBalance),
     Number(proposal.dao.totalShares)
@@ -182,7 +183,7 @@ export const ActionTemplate = ({
     <TemplateBox>
       <div className="top-section">
         {displayUI}
-        {isMobile || (
+        {isMobile || hideQuorum || (
           <QuorumDisplay
             yesPerc={yesPerc}
             daoQuorum={proposal.dao.quorumPercent}

diff --git a/apps/core-app/src/components/proposalCards/Cancelled.tsx b/apps/core-app/src/components/proposalCards/Cancelled.tsx
@@ -1,7 +1,7 @@
 import { ITransformedProposal } from '@daohaus/dao-data';
 import React from 'react';
 import { VotingBar } from '../VotingBar';
-import { ActionTemplate, Verdict } from './ActionPrimitives';
+import { ActionTemplate } from './ActionPrimitives';
 
 export const Cancelled = ({ proposal }: { proposal: ITransformedProposal }) => {
   return (

diff --git a/apps/core-app/src/components/proposalCards/Expired.tsx b/apps/core-app/src/components/proposalCards/Expired.tsx
@@ -6,7 +6,7 @@ export const Expired = ({ proposal }: { proposal: ITransformedProposal }) => {
   return (
     <ActionTemplate
       proposal={proposal}
-      statusDisplay="Proposal expired"
+      statusDisplay="Proposal Expired"
       main={
         <>
           <VotingBar proposal={proposal} />

diff --git a/apps/core-app/src/pages/Members.tsx b/apps/core-app/src/pages/Members.tsx
@@ -1,4 +1,4 @@
-import { MouseEvent, useMemo } from 'react';
+import { useMemo } from 'react';
 import styled from 'styled-components';
 import { Column, Row } from 'react-table';
 import {
@@ -25,14 +25,14 @@ import {
   useDao,
   TMembers,
   useConnectedMembership,
-  defaultDaoData,
 } from '@daohaus/dao-context';
 import { MembersOverview } from '../components/MembersOverview';
 import { ProfileLink } from '../components/ProfileLink';
 import { DaoTable } from '../components/DaohausTable';
 import { useParams } from 'react-router-dom';
 import { MemberProfileMenu } from '../components/MemberProfileMenu';
 import { ButtonLink } from '../components/ButtonLink';
+import { Member_OrderBy } from '@daohaus/dao-data';
 
 const Actions = styled.div`
   display: flex;
@@ -76,13 +76,8 @@ export type MembersTableType = TMembers[number];
 
 export function Members() {
   const { dao } = useDao();
-  const {
-    members,
-    setMembersPaging,
-    membersNextPaging,
-    setMembersSort,
-    setMembers,
-  } = useMembers();
+  const { members, membersNextPaging, loadMoreMembers, sortMembers } =
+    useMembers();
   const { connectedMembership } = useConnectedMembership();
   const isMobile = useBreakpoint(widthQuery.sm);
   const { daoid, daochain } = useParams();
@@ -222,24 +217,11 @@ export function Members() {
     [dao]
   );
 
-  // TODO: Move these into the context as new hooks:
-  // - loadMoreMembers (adds on to current members list - this is default)
-  // - loadNextPageMembers (replaces current list)
-  // - sort/filter (replaces current list)
-  const handleLoadMore = (event: MouseEvent<HTMLButtonElement>) => {
-    setMembersPaging(membersNextPaging);
-  };
-
   const handleColumnSort = (
     orderBy: string,
     orderDirection: 'asc' | 'desc'
   ) => {
-    // TODO: how can we dynamically pass the proper order by here
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    setMembersSort({ orderBy, orderDirection });
-    setMembersPaging(defaultDaoData.membersPaging);
-    setMembers(undefined);
+    sortMembers(orderBy as Member_OrderBy, orderDirection);
   };
 
   return (
@@ -274,7 +256,7 @@ export function Members() {
             tableData={tableData}
             columns={columns}
             hasNextPaging={membersNextPaging !== undefined}
-            handleLoadMore={handleLoadMore}
+            handleLoadMore={loadMoreMembers}
             handleColumnSort={handleColumnSort}
             sortableColumns={
               isMobile

diff --git a/apps/core-app/src/pages/NewProposal.tsx b/apps/core-app/src/pages/NewProposal.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { useLocation } from 'react-router-dom';
+import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import { FormBuilder } from '@daohaus/haus-form-builder';
 
 import { getFormLegoById } from '../legos/form';
@@ -8,10 +8,13 @@ import { useDao } from '@daohaus/dao-context';
 
 export function NewProposal() {
   const location = useLocation();
+  const navigate = useNavigate();
+  const { daoid, daochain } = useParams();
   const { refreshAll } = useDao();
 
   const onFormComplete = () => {
     refreshAll?.();
+    navigate(`/molochV3/${daochain}/${daoid}/proposals`);
   };
 
   const formLego = useMemo(() => {

diff --git a/apps/core-app/src/pages/Proposals.tsx b/apps/core-app/src/pages/Proposals.tsx
@@ -11,7 +11,7 @@ import {
 import { statusFilter } from '@daohaus/dao-data';
 import { BsPlusLg } from 'react-icons/bs';
 
-import { defaultDaoData, useDao, useProposals } from '@daohaus/dao-context';
+import { useDao, useProposals } from '@daohaus/dao-context';
 import { NewProposalList } from '../components/NewProposalList';
 import { PROPOSAL_FORMS } from '../legos/form';
 import SearchInput from '../components/SearchInput';
@@ -39,13 +39,8 @@ const SearchFilterContainer = styled.div`
 `;
 
 export function Proposals() {
-  const {
-    proposals,
-    setProposalsPaging,
-    proposalsNextPaging,
-    setProposalsFilter,
-    setProposals,
-  } = useProposals();
+  const { proposals, proposalsNextPaging, loadMoreProposals, filterProposals } =
+    useProposals();
   const { dao } = useDao();
   const [searchTerm, setSearchTerm] = useState<string>('');
   const [filter, setFilter] = useState<string>('');
@@ -64,17 +59,13 @@ export function Proposals() {
           )
         : undefined;
 
-    if (searchTerm && searchTerm.length > 0) {
-      setProposals(undefined);
-      setProposalsFilter({
+    if (term && term.length > 0) {
+      filterProposals({
         ...filterQuery,
-        title_contains_nocase: searchTerm,
+        title_contains_nocase: term,
       });
-      setProposalsPaging(defaultDaoData.proposalsPaging);
     } else {
-      setProposals(undefined);
-      setProposalsFilter(filterQuery);
-      setProposalsPaging(defaultDaoData.proposalsPaging);
+      filterProposals(filterQuery);
     }
   };
 
@@ -83,9 +74,7 @@ export function Proposals() {
       searchTerm !== '' ? { title_contains_nocase: searchTerm } : undefined;
     setFilter((prevState) => {
       if (prevState === event.currentTarget.value) {
-        setProposalsFilter(searchQuery);
-        setProposalsPaging(defaultDaoData.proposalsPaging);
-        setProposals(undefined);
+        filterProposals(searchQuery);
         return '';
       } else {
         const votingPlusGraceDuration =
@@ -94,18 +83,12 @@ export function Proposals() {
           PROPOSAL_STATUS[event.currentTarget.value],
           votingPlusGraceDuration
         );
-        setProposalsFilter({ ...filterQuery, ...searchQuery });
-        setProposalsPaging(defaultDaoData.proposalsPaging);
-        setProposals(undefined);
+        filterProposals({ ...filterQuery, ...searchQuery });
         return event.currentTarget.value;
       }
     });
   };
 
-  const handleLoadMore = (event: MouseEvent<HTMLButtonElement>) => {
-    setProposalsPaging(proposalsNextPaging);
-  };
-
   return (
     <SingleColumnLayout title="Proposals">
       <ActionsContainer>
@@ -133,7 +116,7 @@ export function Proposals() {
         ))}
 
       {proposalsNextPaging !== undefined && (
-        <Button tertiary sm onClick={handleLoadMore}>
+        <Button tertiary sm onClick={loadMoreProposals}>
           Show More Proposals
         </Button>
       )}