From 7a562b393d2aefc70182774edb4128eb88205a0d Mon Sep 17 00:00:00 2001 From: Sam Kuhlmann Date: Fri, 14 Oct 2022 16:56:34 -0600 Subject: [PATCH] Fix/14102022 friday sweep (#988) * 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 <53406838+jordanlesich@users.noreply.github.com> Co-authored-by: Jonathan Prozzi * 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 * 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 * 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 Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann * 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 Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann * conflicts * correctly types the onChange for the input * cleans up unsed imports * naming * fix build error Co-authored-by: Alexander Keating Co-authored-by: Rowdy Co-authored-by: Brian Rossetti * 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 Co-authored-by: Rowdy Co-authored-by: Jord <53406838+jordanlesich@users.noreply.github.com> Co-authored-by: Spencer Graham Co-authored-by: Brian Rossetti Co-authored-by: Alexander Keating * Revert "Publish new lib versions. (#412)" This reverts commit bab7077ded01a2e5e0e4cd8ef59c4fd0fb9e4b96. * 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 Co-authored-by: Jord <53406838+jordanlesich@users.noreply.github.com> * 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 <53406838+jordanlesich@users.noreply.github.com> Co-authored-by: Jonathan Prozzi * 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 * 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 * 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 Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann * 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 Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann * conflicts * correctly types the onChange for the input * cleans up unsed imports * naming * fix build error Co-authored-by: Alexander Keating Co-authored-by: Rowdy Co-authored-by: Brian Rossetti * 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 Co-authored-by: Rowdy Co-authored-by: Jord <53406838+jordanlesich@users.noreply.github.com> Co-authored-by: Spencer Graham Co-authored-by: Brian Rossetti Co-authored-by: Alexander Keating * Revert "Publish new lib versions. (#412)" This reverts commit bab7077ded01a2e5e0e4cd8ef59c4fd0fb9e4b96. * 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 Co-authored-by: Alexander Keating Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy Co-authored-by: Spencer Graham Co-authored-by: Brian Rossetti * 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 * 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 Co-authored-by: Jord <53406838+jordanlesich@users.noreply.github.com> Co-authored-by: Alexander Keating Co-authored-by: jordan Co-authored-by: Jonathan Prozzi Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy Co-authored-by: Spencer Graham * Revert "develop to master (#482)" (#492) This reverts commit 5f7d121f9c49b9559d352bb17fce3c1ec598dfbe. Co-authored-by: Sam Kuhlmann * 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 <53406838+jordanlesich@users.noreply.github.com> Co-authored-by: Jonathan Prozzi * 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 * 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 * 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 Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann * 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 Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy * fixing doc display name from <[object Object]> to displayName (#402) Co-authored-by: Sam Kuhlmann * conflicts * correctly types the onChange for the input * cleans up unsed imports * naming * fix build error Co-authored-by: Alexander Keating Co-authored-by: Rowdy Co-authored-by: Brian Rossetti * 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 Co-authored-by: Rowdy Co-authored-by: Jord <53406838+jordanlesich@users.noreply.github.com> Co-authored-by: Spencer Graham Co-authored-by: Brian Rossetti Co-authored-by: Alexander Keating * Revert "Publish new lib versions. (#412)" This reverts commit bab7077ded01a2e5e0e4cd8ef59c4fd0fb9e4b96. * 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 Co-authored-by: Alexander Keating Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy Co-authored-by: Spencer Graham Co-authored-by: Brian Rossetti * Fix build (#563) * Fix build * Almost * More changes Co-authored-by: Jord <53406838+jordanlesich@users.noreply.github.com> Co-authored-by: Jonathan Prozzi Co-authored-by: Sam Kuhlmann Co-authored-by: Rowdy Co-authored-by: Spencer Graham Co-authored-by: Brian Rossetti * Revert "Develop into master (#577)" This reverts commit b8644d3afa3204e0e4275b62a8e360109aac11cd. * gets member profile menu setup * active proposal logic update * lowercase v * processed to executed * adds profile link to main nav for connected user * active proposals on overview * history cleanup * touching buttons * padding on delegate tool in member list * fixes import issue Co-authored-by: Jonathan Prozzi Co-authored-by: Alexander Keating Co-authored-by: Rowdy Co-authored-by: Jord <53406838+jordanlesich@users.noreply.github.com> Co-authored-by: Spencer Graham Co-authored-by: Brian Rossetti Co-authored-by: jordan --- apps/core-app/src/components/DaoCard.tsx | 15 ++++++--- .../src/components/MetadataSettings.tsx | 2 +- .../proposalCards/ReadyForProcessing.tsx | 12 +++---- apps/core-app/src/pages/Dao.tsx | 33 +++++++++++++++---- apps/core-app/src/pages/DaoOverview.tsx | 3 +- apps/core-app/src/pages/Members.tsx | 13 ++++---- apps/core-app/src/utils/constants.ts | 2 +- apps/core-app/src/utils/historyHelpers.ts | 9 ++--- .../src/layouts/SummonerSuccess.tsx | 1 + apps/summon-safe-app/index.html | 2 +- .../src/constants/proposals.ts | 8 ++--- libs/dao-data/src/Profile.ts | 4 ++- libs/dao-data/src/Query.ts | 3 ++ .../src/subgraph/queries/daos.generated.ts | 13 +++++--- .../src/subgraph/queries/daos.graphql | 22 +++++++++++-- libs/dao-data/src/utils/transformers.ts | 2 +- 16 files changed, 97 insertions(+), 47 deletions(-) diff --git a/apps/core-app/src/components/DaoCard.tsx b/apps/core-app/src/components/DaoCard.tsx index 621c535a8..201d5c5e1 100644 --- a/apps/core-app/src/components/DaoCard.tsx +++ b/apps/core-app/src/components/DaoCard.tsx @@ -14,6 +14,7 @@ import { ParMd, ProfileAvatar, Tag, + Tooltip, } from '@daohaus/ui'; import { ButtonLink } from './ButtonLink'; @@ -72,10 +73,16 @@ export const DaoCard = ({
{activeProposalCount > 0 && ( - + } /> )}
diff --git a/apps/core-app/src/components/MetadataSettings.tsx b/apps/core-app/src/components/MetadataSettings.tsx index 71160699b..6e4fef6cc 100644 --- a/apps/core-app/src/components/MetadataSettings.tsx +++ b/apps/core-app/src/components/MetadataSettings.tsx @@ -98,7 +98,7 @@ export const MetadataSettings = ({ dao }: MetadataSettingsProps) => {
DAO Contracts
- Moloch V3 + Moloch v3 ( - 'Checking Process data.' + 'Checking execution data.' ); const [isLoading, setIsLoading] = React.useState(false); @@ -110,12 +110,12 @@ export const ReadyForProcessing = ({ const errMsg = handleErrorMessage({ error, }); - errorToast({ title: 'Process Failed', description: errMsg }); + errorToast({ title: 'Execution Failed', description: errMsg }); setIsLoading(false); }, onTxSuccess: () => { defaultToast({ - title: 'Process Success', + title: 'Execution Success', description: 'Please wait for subgraph to sync', }); }, @@ -128,8 +128,8 @@ export const ReadyForProcessing = ({ }, onPollSuccess: () => { successToast({ - title: 'Process Success', - description: 'Proposal processed', + title: 'Execution Success', + description: 'Proposal executed', }); refreshAll(); setIsLoading(false); @@ -165,7 +165,7 @@ export const ReadyForProcessing = ({ return ( diff --git a/apps/core-app/src/pages/Dao.tsx b/apps/core-app/src/pages/Dao.tsx index 1f67e1fdd..b38d7c132 100644 --- a/apps/core-app/src/pages/Dao.tsx +++ b/apps/core-app/src/pages/Dao.tsx @@ -1,13 +1,37 @@ import { useParams, Outlet, useLocation } from 'react-router-dom'; import { HausLayout, useHausConnect } from '@daohaus/daohaus-connect-feature'; -import { useDao } from '@daohaus/dao-context'; +import { useConnectedMembership, useDao } from '@daohaus/dao-context'; import { TXBuilder } from '@daohaus/tx-builder-feature'; +import { useMemo } from 'react'; export function Dao() { const { daochain, daoid } = useParams(); const location = useLocation(); const { provider, address } = useHausConnect(); const { dao } = useDao(); + const { connectedMembership } = useConnectedMembership(); + + const moreLinks = useMemo(() => { + if (connectedMembership) { + return [ + { + label: 'Settings', + href: `/molochv3/${daochain}/${daoid}/settings`, + }, + { + label: 'Profile', + href: `/molochv3/${daochain}/${daoid}/members/${connectedMembership.memberAddress}`, + }, + ]; + } else { + return [ + { + label: 'Settings', + href: `/molochv3/${daochain}/${daoid}/settings`, + }, + ]; + } + }, [connectedMembership, daochain, daoid]); return ( diff --git a/apps/core-app/src/pages/DaoOverview.tsx b/apps/core-app/src/pages/DaoOverview.tsx index b6d956a9a..bb7f0a703 100644 --- a/apps/core-app/src/pages/DaoOverview.tsx +++ b/apps/core-app/src/pages/DaoOverview.tsx @@ -61,9 +61,10 @@ export function DaoOverview() { })} /> + diff --git a/apps/core-app/src/pages/Members.tsx b/apps/core-app/src/pages/Members.tsx index b2ce3a4c8..296452b4b 100644 --- a/apps/core-app/src/pages/Members.tsx +++ b/apps/core-app/src/pages/Members.tsx @@ -11,11 +11,9 @@ import { Tooltip, } from '@daohaus/ui'; import { - charLimit, formatDateFromSeconds, formatValueTo, fromWei, - lowerCaseLootToken, sharesDelegatedToMember, votingPowerPercentage, } from '@daohaus/common-utilities'; @@ -59,6 +57,11 @@ const MemberContainer = styled(Card)` th { min-width: 10rem; } + .hide-sm { + button { + padding-left: 0.5rem; + } + } @media ${widthQuery.lg} { max-width: 100%; min-width: 0; @@ -143,7 +146,7 @@ export function Members() { }, { Header: () => { - return <>{charLimit(dao?.shareTokenName, 6)}; + return <>Voting; }, accessor: 'shares', Cell: ({ value }: { value: string }) => { @@ -160,9 +163,7 @@ export function Members() { }, { Header: () => { - return ( -
{charLimit(lowerCaseLootToken(dao?.lootTokenName), 6)}
- ); + return
Non-Voting
; }, accessor: 'loot', Cell: ({ value }: { value: string }) => { diff --git a/apps/core-app/src/utils/constants.ts b/apps/core-app/src/utils/constants.ts index cfb2f60eb..8a999e106 100644 --- a/apps/core-app/src/utils/constants.ts +++ b/apps/core-app/src/utils/constants.ts @@ -2,7 +2,7 @@ export const PROPOSAL_FILTERS: { [key: string]: string } = { unsponsored: 'Unsponsored', voting: 'In Voting', grace: 'In Grace', - needsProcessing: 'Ready to Process', + needsProcessing: 'Ready to Execute', passed: 'Passed', actionFailed: 'Action Failed', failed: 'Defeated', diff --git a/apps/core-app/src/utils/historyHelpers.ts b/apps/core-app/src/utils/historyHelpers.ts index ec643abc3..ec4e60231 100644 --- a/apps/core-app/src/utils/historyHelpers.ts +++ b/apps/core-app/src/utils/historyHelpers.ts @@ -121,16 +121,11 @@ const buildCompletedElements = ({ { title: `Proposal Complete`, active: false, - text: `${ - proposal.status === PROPOSAL_STATUS.actionFailed - ? 'Execution failed at' - : '' - } ${formatDateTimeFromSeconds(proposal.processTxAt)}`, canExpand: true, dataElements: [ { dataType: 'member', - label: 'Processed By', + label: 'Executed By', data: proposal.processedBy || '--', }, ], @@ -151,7 +146,7 @@ const buildNeedsProcessingElements = ({ { title: 'Proposal Complete', active: proposal.status === PROPOSAL_STATUS.needsProcessing, - text: `Waiting to be processed...`, + text: `Waiting to be executed...`, canExpand: false, }, ]; diff --git a/apps/summon-app/src/layouts/SummonerSuccess.tsx b/apps/summon-app/src/layouts/SummonerSuccess.tsx index 537d58598..846b38df0 100644 --- a/apps/summon-app/src/layouts/SummonerSuccess.tsx +++ b/apps/summon-app/src/layouts/SummonerSuccess.tsx @@ -35,6 +35,7 @@ const AddressInfoSection = styled(InfoSection)` const ButtonGroup = styled.div` display: flex; + gap: 3rem; a { button { width: 200px; diff --git a/apps/summon-safe-app/index.html b/apps/summon-safe-app/index.html index e84deed7d..fc598e0a1 100644 --- a/apps/summon-safe-app/index.html +++ b/apps/summon-safe-app/index.html @@ -24,7 +24,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - Moloch V3 Summoner App + Moloch v3 Summoner App diff --git a/libs/common-utilities/src/constants/proposals.ts b/libs/common-utilities/src/constants/proposals.ts index 4711a23fa..e5a02ce36 100644 --- a/libs/common-utilities/src/constants/proposals.ts +++ b/libs/common-utilities/src/constants/proposals.ts @@ -4,10 +4,10 @@ export type ProposalStatus = | 'Grace' | 'Expired' | 'Cancelled' - | 'Ready for Processing' + | 'Ready for Execution' | 'Failed' | 'Passed' - | 'Processing Failed' + | 'Execution Failed' | 'Unknown'; export const PROPOSAL_STATUS: { [index: string]: ProposalStatus } = { @@ -16,10 +16,10 @@ export const PROPOSAL_STATUS: { [index: string]: ProposalStatus } = { grace: 'Grace', expired: 'Expired', cancelled: 'Cancelled', - needsProcessing: 'Ready for Processing', + needsProcessing: 'Ready for Execution', failed: 'Failed', passed: 'Passed', - actionFailed: 'Processing Failed', + actionFailed: 'Execution Failed', unknown: 'Unknown', }; diff --git a/libs/dao-data/src/Profile.ts b/libs/dao-data/src/Profile.ts index 1c0be7e9b..40aa2fdf4 100644 --- a/libs/dao-data/src/Profile.ts +++ b/libs/dao-data/src/Profile.ts @@ -3,12 +3,12 @@ import { DaoTokenBalances, ITransformedMembershipsQuery, Keychain, + nowInSeconds, } from '@daohaus/common-utilities'; import { ICrossNetworkMemberListArguments, ListMembershipsDocument, ListMembershipsQuery, - ListMembershipsQueryVariables, Member_OrderBy, IFindQueryResult, Dao_OrderBy, @@ -21,6 +21,7 @@ import { ListConnectedMemberProposalsQueryVariables, ListConnectedMemberProposalsQuery, ListConnectedMemberProposalsDocument, + ListMembershipsQueryVariables, } from './types'; import { transformMembershipList, @@ -130,6 +131,7 @@ export default class Profile { ...daoFilter, }, memberWhere: { memberAddress }, + now: nowInSeconds().toFixed(), orderBy: ordering.orderBy, orderDirection: ordering.orderDirection, } diff --git a/libs/dao-data/src/Query.ts b/libs/dao-data/src/Query.ts index 72bf6cbe4..711f82296 100644 --- a/libs/dao-data/src/Query.ts +++ b/libs/dao-data/src/Query.ts @@ -3,6 +3,7 @@ import { ENDPOINTS, Keychain, KeychainList, + nowInSeconds, TokenBalance, } from '@daohaus/common-utilities'; @@ -113,6 +114,7 @@ export default class Query { url, { where: { ...filter, id_gt: paging.lastId || '' }, + now: nowInSeconds().toFixed(), orderBy: paging.lastId ? 'id' : ordering.orderBy, orderDirection: paging.lastId ? 'asc' : ordering.orderDirection, first: paging.pageSize + 1, @@ -349,6 +351,7 @@ export default class Query { networkId, { id: dao.toLowerCase(), + now: nowInSeconds().toFixed(), } ); diff --git a/libs/dao-data/src/subgraph/queries/daos.generated.ts b/libs/dao-data/src/subgraph/queries/daos.generated.ts index c4344a9fe..f00e2e9eb 100644 --- a/libs/dao-data/src/subgraph/queries/daos.generated.ts +++ b/libs/dao-data/src/subgraph/queries/daos.generated.ts @@ -3,6 +3,7 @@ import * as Types from '../schema.generated'; import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core'; export type ListDaosQueryVariables = Types.Exact<{ where?: Types.Dao_Filter; + now?: Types.Scalars['BigInt']; skip?: Types.Scalars['Int']; first?: Types.Scalars['Int']; orderBy?: Types.Dao_OrderBy; @@ -10,18 +11,20 @@ export type ListDaosQueryVariables = Types.Exact<{ }>; -export type ListDaosQuery = { daos: Array<{ id: string, createdAt: string, createdBy: string, txHash: string, safeAddress: string, lootPaused: boolean, sharesPaused: boolean, gracePeriod: string, votingPeriod: string, proposalOffering: string, quorumPercent: string, sponsorThreshold: string, minRetentionPercent: string, shareTokenName?: string | undefined, shareTokenSymbol?: string | undefined, sharesAddress: string, lootTokenName?: string | undefined, lootTokenSymbol?: string | undefined, lootAddress: string, totalShares: string, totalLoot: string, latestSponsoredProposalId: string, proposalCount: string, activeMemberCount: string, existingSafe: boolean, name?: string | undefined, profile?: Array<{ createdAt: string, createdBy: string, contentType: string, content: string }> | undefined, shamen?: Array<{ id: string, createdAt: string, shamanAddress: string, permissions: string }> | undefined }> }; +export type ListDaosQuery = { daos: Array<{ id: string, createdAt: string, createdBy: string, txHash: string, safeAddress: string, lootPaused: boolean, sharesPaused: boolean, gracePeriod: string, votingPeriod: string, proposalOffering: string, quorumPercent: string, sponsorThreshold: string, minRetentionPercent: string, shareTokenName?: string | undefined, shareTokenSymbol?: string | undefined, sharesAddress: string, lootTokenName?: string | undefined, lootTokenSymbol?: string | undefined, lootAddress: string, totalShares: string, totalLoot: string, latestSponsoredProposalId: string, proposalCount: string, activeMemberCount: string, existingSafe: boolean, name?: string | undefined, profile?: Array<{ createdAt: string, createdBy: string, contentType: string, content: string }> | undefined, shamen?: Array<{ id: string, createdAt: string, shamanAddress: string, permissions: string }> | undefined, activeProposals?: Array<{ id: string }> | undefined }> }; export type FindDaoQueryVariables = Types.Exact<{ id: Types.Scalars['ID']; + now?: Types.Scalars['BigInt']; }>; -export type FindDaoQuery = { dao?: { id: string, createdAt: string, createdBy: string, txHash: string, safeAddress: string, lootPaused: boolean, sharesPaused: boolean, gracePeriod: string, votingPeriod: string, proposalOffering: string, quorumPercent: string, sponsorThreshold: string, minRetentionPercent: string, shareTokenName?: string | undefined, shareTokenSymbol?: string | undefined, sharesAddress: string, lootTokenName?: string | undefined, lootTokenSymbol?: string | undefined, lootAddress: string, totalShares: string, totalLoot: string, latestSponsoredProposalId: string, proposalCount: string, activeMemberCount: string, existingSafe: boolean, name?: string | undefined, profile?: Array<{ createdAt: string, createdBy: string, contentType: string, content: string }> | undefined, shamen?: Array<{ id: string, createdAt: string, shamanAddress: string, permissions: string }> | undefined } | undefined }; +export type FindDaoQuery = { dao?: { id: string, createdAt: string, createdBy: string, txHash: string, safeAddress: string, lootPaused: boolean, sharesPaused: boolean, gracePeriod: string, votingPeriod: string, proposalOffering: string, quorumPercent: string, sponsorThreshold: string, minRetentionPercent: string, shareTokenName?: string | undefined, shareTokenSymbol?: string | undefined, sharesAddress: string, lootTokenName?: string | undefined, lootTokenSymbol?: string | undefined, lootAddress: string, totalShares: string, totalLoot: string, latestSponsoredProposalId: string, proposalCount: string, activeMemberCount: string, existingSafe: boolean, name?: string | undefined, profile?: Array<{ createdAt: string, createdBy: string, contentType: string, content: string }> | undefined, shamen?: Array<{ id: string, createdAt: string, shamanAddress: string, permissions: string }> | undefined, activeProposals?: Array<{ id: string }> | undefined } | undefined }; export type ListMembershipsQueryVariables = Types.Exact<{ where?: Types.Dao_Filter; memberWhere?: Types.Member_Filter; + now?: Types.Scalars['BigInt']; skip?: Types.Scalars['Int']; first?: Types.Scalars['Int']; orderBy?: Types.Dao_OrderBy; @@ -32,6 +35,6 @@ export type ListMembershipsQueryVariables = Types.Exact<{ export type ListMembershipsQuery = { daos: Array<{ id: string, createdAt: string, createdBy: string, txHash: string, safeAddress: string, lootPaused: boolean, sharesPaused: boolean, gracePeriod: string, votingPeriod: string, proposalOffering: string, quorumPercent: string, sponsorThreshold: string, minRetentionPercent: string, shareTokenName?: string | undefined, shareTokenSymbol?: string | undefined, sharesAddress: string, lootTokenName?: string | undefined, lootTokenSymbol?: string | undefined, lootAddress: string, totalShares: string, totalLoot: string, latestSponsoredProposalId: string, proposalCount: string, activeMemberCount: string, existingSafe: boolean, name?: string | undefined, profile?: Array<{ createdAt: string, createdBy: string, contentType: string, content: string }> | undefined, shamen?: Array<{ id: string, createdAt: string, shamanAddress: string, permissions: string }> | undefined, activeProposals?: Array<{ id: string }> | undefined, members: Array<{ id: string, createdAt: string, memberAddress: string, shares: string, loot: string, delegatingTo: string, delegateShares: string, delegateOfCount: string, votes?: Array<{ txHash: string, createdAt: string, approved: boolean, balance: string }> | undefined }> }> }; -export const ListDaosDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"listDaos"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"where"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Dao_filter"}}},"defaultValue":{"kind":"ObjectValue","fields":[]}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"skip"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"defaultValue":{"kind":"IntValue","value":"0"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"first"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"defaultValue":{"kind":"IntValue","value":"100"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orderBy"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Dao_orderBy"}}},"defaultValue":{"kind":"EnumValue","value":"id"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orderDirection"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"OrderDirection"}}},"defaultValue":{"kind":"EnumValue","value":"asc"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"daos"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"Variable","name":{"kind":"Name","value":"where"}}},{"kind":"Argument","name":{"kind":"Name","value":"skip"},"value":{"kind":"Variable","name":{"kind":"Name","value":"skip"}}},{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"Variable","name":{"kind":"Name","value":"first"}}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orderBy"}}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orderDirection"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"txHash"}},{"kind":"Field","name":{"kind":"Name","value":"safeAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootPaused"}},{"kind":"Field","name":{"kind":"Name","value":"sharesPaused"}},{"kind":"Field","name":{"kind":"Name","value":"gracePeriod"}},{"kind":"Field","name":{"kind":"Name","value":"votingPeriod"}},{"kind":"Field","name":{"kind":"Name","value":"proposalOffering"}},{"kind":"Field","name":{"kind":"Name","value":"quorumPercent"}},{"kind":"Field","name":{"kind":"Name","value":"sponsorThreshold"}},{"kind":"Field","name":{"kind":"Name","value":"minRetentionPercent"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"sharesAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"lootAddress"}},{"kind":"Field","name":{"kind":"Name","value":"totalShares"}},{"kind":"Field","name":{"kind":"Name","value":"totalLoot"}},{"kind":"Field","name":{"kind":"Name","value":"latestSponsoredProposalId"}},{"kind":"Field","name":{"kind":"Name","value":"proposalCount"}},{"kind":"Field","name":{"kind":"Name","value":"activeMemberCount"}},{"kind":"Field","name":{"kind":"Name","value":"existingSafe"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","alias":{"kind":"Name","value":"profile"},"name":{"kind":"Name","value":"records"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"table"},"value":{"kind":"StringValue","value":"daoProfile","block":false}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"contentType"}},{"kind":"Field","name":{"kind":"Name","value":"content"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"shamen"},"name":{"kind":"Name","value":"shaman"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"shamanAddress"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}}]}}]}}]}}]} as unknown as DocumentNode; -export const FindDaoDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"findDao"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"dao"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"txHash"}},{"kind":"Field","name":{"kind":"Name","value":"safeAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootPaused"}},{"kind":"Field","name":{"kind":"Name","value":"sharesPaused"}},{"kind":"Field","name":{"kind":"Name","value":"gracePeriod"}},{"kind":"Field","name":{"kind":"Name","value":"votingPeriod"}},{"kind":"Field","name":{"kind":"Name","value":"proposalOffering"}},{"kind":"Field","name":{"kind":"Name","value":"quorumPercent"}},{"kind":"Field","name":{"kind":"Name","value":"sponsorThreshold"}},{"kind":"Field","name":{"kind":"Name","value":"minRetentionPercent"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"sharesAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"lootAddress"}},{"kind":"Field","name":{"kind":"Name","value":"totalShares"}},{"kind":"Field","name":{"kind":"Name","value":"totalLoot"}},{"kind":"Field","name":{"kind":"Name","value":"latestSponsoredProposalId"}},{"kind":"Field","name":{"kind":"Name","value":"proposalCount"}},{"kind":"Field","name":{"kind":"Name","value":"activeMemberCount"}},{"kind":"Field","name":{"kind":"Name","value":"existingSafe"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","alias":{"kind":"Name","value":"profile"},"name":{"kind":"Name","value":"records"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"table"},"value":{"kind":"StringValue","value":"daoProfile","block":false}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"contentType"}},{"kind":"Field","name":{"kind":"Name","value":"content"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"shamen"},"name":{"kind":"Name","value":"shaman"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"shamanAddress"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}}]}}]}}]}}]} as unknown as DocumentNode; -export const ListMembershipsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"listMemberships"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"where"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Dao_filter"}}},"defaultValue":{"kind":"ObjectValue","fields":[]}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberWhere"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Member_filter"}}},"defaultValue":{"kind":"ObjectValue","fields":[]}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"skip"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"defaultValue":{"kind":"IntValue","value":"0"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"first"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"defaultValue":{"kind":"IntValue","value":"100"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orderBy"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Dao_orderBy"}}},"defaultValue":{"kind":"EnumValue","value":"id"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orderDirection"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"OrderDirection"}}},"defaultValue":{"kind":"EnumValue","value":"asc"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"daos"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"Variable","name":{"kind":"Name","value":"where"}}},{"kind":"Argument","name":{"kind":"Name","value":"skip"},"value":{"kind":"Variable","name":{"kind":"Name","value":"skip"}}},{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"Variable","name":{"kind":"Name","value":"first"}}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orderBy"}}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orderDirection"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"txHash"}},{"kind":"Field","name":{"kind":"Name","value":"safeAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootPaused"}},{"kind":"Field","name":{"kind":"Name","value":"sharesPaused"}},{"kind":"Field","name":{"kind":"Name","value":"gracePeriod"}},{"kind":"Field","name":{"kind":"Name","value":"votingPeriod"}},{"kind":"Field","name":{"kind":"Name","value":"proposalOffering"}},{"kind":"Field","name":{"kind":"Name","value":"quorumPercent"}},{"kind":"Field","name":{"kind":"Name","value":"sponsorThreshold"}},{"kind":"Field","name":{"kind":"Name","value":"minRetentionPercent"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"sharesAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"lootAddress"}},{"kind":"Field","name":{"kind":"Name","value":"totalShares"}},{"kind":"Field","name":{"kind":"Name","value":"totalLoot"}},{"kind":"Field","name":{"kind":"Name","value":"latestSponsoredProposalId"}},{"kind":"Field","name":{"kind":"Name","value":"proposalCount"}},{"kind":"Field","name":{"kind":"Name","value":"activeMemberCount"}},{"kind":"Field","name":{"kind":"Name","value":"existingSafe"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","alias":{"kind":"Name","value":"profile"},"name":{"kind":"Name","value":"records"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"table"},"value":{"kind":"StringValue","value":"daoProfile","block":false}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"contentType"}},{"kind":"Field","name":{"kind":"Name","value":"content"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"shamen"},"name":{"kind":"Name","value":"shaman"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"shamanAddress"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"activeProposals"},"name":{"kind":"Name","value":"proposals"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"101"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"cancelled"},"value":{"kind":"BooleanValue","value":false}},{"kind":"ObjectField","name":{"kind":"Name","value":"processed"},"value":{"kind":"BooleanValue","value":false}},{"kind":"ObjectField","name":{"kind":"Name","value":"actionFailed"},"value":{"kind":"BooleanValue","value":false}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"members"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberWhere"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"memberAddress"}},{"kind":"Field","name":{"kind":"Name","value":"shares"}},{"kind":"Field","name":{"kind":"Name","value":"loot"}},{"kind":"Field","name":{"kind":"Name","value":"delegatingTo"}},{"kind":"Field","name":{"kind":"Name","value":"delegateShares"}},{"kind":"Field","name":{"kind":"Name","value":"delegateOfCount"}},{"kind":"Field","name":{"kind":"Name","value":"votes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"txHash"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"approved"}},{"kind":"Field","name":{"kind":"Name","value":"balance"}}]}}]}}]}}]}}]} as unknown as DocumentNode; \ No newline at end of file +export const ListDaosDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"listDaos"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"where"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Dao_filter"}}},"defaultValue":{"kind":"ObjectValue","fields":[]}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"now"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"BigInt"}}},"defaultValue":{"kind":"IntValue","value":"0"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"skip"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"defaultValue":{"kind":"IntValue","value":"0"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"first"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"defaultValue":{"kind":"IntValue","value":"100"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orderBy"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Dao_orderBy"}}},"defaultValue":{"kind":"EnumValue","value":"id"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orderDirection"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"OrderDirection"}}},"defaultValue":{"kind":"EnumValue","value":"asc"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"daos"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"Variable","name":{"kind":"Name","value":"where"}}},{"kind":"Argument","name":{"kind":"Name","value":"skip"},"value":{"kind":"Variable","name":{"kind":"Name","value":"skip"}}},{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"Variable","name":{"kind":"Name","value":"first"}}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orderBy"}}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orderDirection"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"txHash"}},{"kind":"Field","name":{"kind":"Name","value":"safeAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootPaused"}},{"kind":"Field","name":{"kind":"Name","value":"sharesPaused"}},{"kind":"Field","name":{"kind":"Name","value":"gracePeriod"}},{"kind":"Field","name":{"kind":"Name","value":"votingPeriod"}},{"kind":"Field","name":{"kind":"Name","value":"proposalOffering"}},{"kind":"Field","name":{"kind":"Name","value":"quorumPercent"}},{"kind":"Field","name":{"kind":"Name","value":"sponsorThreshold"}},{"kind":"Field","name":{"kind":"Name","value":"minRetentionPercent"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"sharesAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"lootAddress"}},{"kind":"Field","name":{"kind":"Name","value":"totalShares"}},{"kind":"Field","name":{"kind":"Name","value":"totalLoot"}},{"kind":"Field","name":{"kind":"Name","value":"latestSponsoredProposalId"}},{"kind":"Field","name":{"kind":"Name","value":"proposalCount"}},{"kind":"Field","name":{"kind":"Name","value":"activeMemberCount"}},{"kind":"Field","name":{"kind":"Name","value":"existingSafe"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","alias":{"kind":"Name","value":"profile"},"name":{"kind":"Name","value":"records"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"table"},"value":{"kind":"StringValue","value":"daoProfile","block":false}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"contentType"}},{"kind":"Field","name":{"kind":"Name","value":"content"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"shamen"},"name":{"kind":"Name","value":"shaman"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"shamanAddress"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"activeProposals"},"name":{"kind":"Name","value":"proposals"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"101"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"cancelled"},"value":{"kind":"BooleanValue","value":false}},{"kind":"ObjectField","name":{"kind":"Name","value":"sponsored"},"value":{"kind":"BooleanValue","value":true}},{"kind":"ObjectField","name":{"kind":"Name","value":"graceEnds_gt"},"value":{"kind":"Variable","name":{"kind":"Name","value":"now"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode; +export const FindDaoDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"findDao"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"now"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"BigInt"}}},"defaultValue":{"kind":"IntValue","value":"0"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"dao"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"txHash"}},{"kind":"Field","name":{"kind":"Name","value":"safeAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootPaused"}},{"kind":"Field","name":{"kind":"Name","value":"sharesPaused"}},{"kind":"Field","name":{"kind":"Name","value":"gracePeriod"}},{"kind":"Field","name":{"kind":"Name","value":"votingPeriod"}},{"kind":"Field","name":{"kind":"Name","value":"proposalOffering"}},{"kind":"Field","name":{"kind":"Name","value":"quorumPercent"}},{"kind":"Field","name":{"kind":"Name","value":"sponsorThreshold"}},{"kind":"Field","name":{"kind":"Name","value":"minRetentionPercent"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"sharesAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"lootAddress"}},{"kind":"Field","name":{"kind":"Name","value":"totalShares"}},{"kind":"Field","name":{"kind":"Name","value":"totalLoot"}},{"kind":"Field","name":{"kind":"Name","value":"latestSponsoredProposalId"}},{"kind":"Field","name":{"kind":"Name","value":"proposalCount"}},{"kind":"Field","name":{"kind":"Name","value":"activeMemberCount"}},{"kind":"Field","name":{"kind":"Name","value":"existingSafe"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","alias":{"kind":"Name","value":"profile"},"name":{"kind":"Name","value":"records"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"table"},"value":{"kind":"StringValue","value":"daoProfile","block":false}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"contentType"}},{"kind":"Field","name":{"kind":"Name","value":"content"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"shamen"},"name":{"kind":"Name","value":"shaman"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"shamanAddress"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"activeProposals"},"name":{"kind":"Name","value":"proposals"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"101"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"cancelled"},"value":{"kind":"BooleanValue","value":false}},{"kind":"ObjectField","name":{"kind":"Name","value":"sponsored"},"value":{"kind":"BooleanValue","value":true}},{"kind":"ObjectField","name":{"kind":"Name","value":"graceEnds_gt"},"value":{"kind":"Variable","name":{"kind":"Name","value":"now"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode; +export const ListMembershipsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"listMemberships"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"where"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Dao_filter"}}},"defaultValue":{"kind":"ObjectValue","fields":[]}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberWhere"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Member_filter"}}},"defaultValue":{"kind":"ObjectValue","fields":[]}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"now"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"BigInt"}}},"defaultValue":{"kind":"IntValue","value":"0"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"skip"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"defaultValue":{"kind":"IntValue","value":"0"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"first"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"defaultValue":{"kind":"IntValue","value":"100"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orderBy"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Dao_orderBy"}}},"defaultValue":{"kind":"EnumValue","value":"id"}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orderDirection"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"OrderDirection"}}},"defaultValue":{"kind":"EnumValue","value":"asc"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"daos"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"Variable","name":{"kind":"Name","value":"where"}}},{"kind":"Argument","name":{"kind":"Name","value":"skip"},"value":{"kind":"Variable","name":{"kind":"Name","value":"skip"}}},{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"Variable","name":{"kind":"Name","value":"first"}}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orderBy"}}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orderDirection"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"txHash"}},{"kind":"Field","name":{"kind":"Name","value":"safeAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootPaused"}},{"kind":"Field","name":{"kind":"Name","value":"sharesPaused"}},{"kind":"Field","name":{"kind":"Name","value":"gracePeriod"}},{"kind":"Field","name":{"kind":"Name","value":"votingPeriod"}},{"kind":"Field","name":{"kind":"Name","value":"proposalOffering"}},{"kind":"Field","name":{"kind":"Name","value":"quorumPercent"}},{"kind":"Field","name":{"kind":"Name","value":"sponsorThreshold"}},{"kind":"Field","name":{"kind":"Name","value":"minRetentionPercent"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"shareTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"sharesAddress"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenName"}},{"kind":"Field","name":{"kind":"Name","value":"lootTokenSymbol"}},{"kind":"Field","name":{"kind":"Name","value":"lootAddress"}},{"kind":"Field","name":{"kind":"Name","value":"totalShares"}},{"kind":"Field","name":{"kind":"Name","value":"totalLoot"}},{"kind":"Field","name":{"kind":"Name","value":"latestSponsoredProposalId"}},{"kind":"Field","name":{"kind":"Name","value":"proposalCount"}},{"kind":"Field","name":{"kind":"Name","value":"activeMemberCount"}},{"kind":"Field","name":{"kind":"Name","value":"existingSafe"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","alias":{"kind":"Name","value":"profile"},"name":{"kind":"Name","value":"records"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"table"},"value":{"kind":"StringValue","value":"daoProfile","block":false}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"}},{"kind":"Field","name":{"kind":"Name","value":"contentType"}},{"kind":"Field","name":{"kind":"Name","value":"content"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"shamen"},"name":{"kind":"Name","value":"shaman"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"shamanAddress"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"activeProposals"},"name":{"kind":"Name","value":"proposals"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"101"}},{"kind":"Argument","name":{"kind":"Name","value":"orderBy"},"value":{"kind":"EnumValue","value":"createdAt"}},{"kind":"Argument","name":{"kind":"Name","value":"orderDirection"},"value":{"kind":"EnumValue","value":"desc"}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"cancelled"},"value":{"kind":"BooleanValue","value":false}},{"kind":"ObjectField","name":{"kind":"Name","value":"sponsored"},"value":{"kind":"BooleanValue","value":true}},{"kind":"ObjectField","name":{"kind":"Name","value":"graceEnds_gt"},"value":{"kind":"Variable","name":{"kind":"Name","value":"now"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"members"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberWhere"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"memberAddress"}},{"kind":"Field","name":{"kind":"Name","value":"shares"}},{"kind":"Field","name":{"kind":"Name","value":"loot"}},{"kind":"Field","name":{"kind":"Name","value":"delegatingTo"}},{"kind":"Field","name":{"kind":"Name","value":"delegateShares"}},{"kind":"Field","name":{"kind":"Name","value":"delegateOfCount"}},{"kind":"Field","name":{"kind":"Name","value":"votes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"txHash"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"approved"}},{"kind":"Field","name":{"kind":"Name","value":"balance"}}]}}]}}]}}]}}]} as unknown as DocumentNode; \ No newline at end of file diff --git a/libs/dao-data/src/subgraph/queries/daos.graphql b/libs/dao-data/src/subgraph/queries/daos.graphql index 772a83191..5e4af610b 100644 --- a/libs/dao-data/src/subgraph/queries/daos.graphql +++ b/libs/dao-data/src/subgraph/queries/daos.graphql @@ -1,5 +1,6 @@ query listDaos( $where: Dao_filter! = {} + $now: BigInt! = 0 $skip: Int! = 0 $first: Int! = 100 $orderBy: Dao_orderBy! = id @@ -13,18 +14,35 @@ query listDaos( orderDirection: $orderDirection ) { ...daoFields + activeProposals: proposals( + first: 101 + orderBy: createdAt + orderDirection: desc + where: { cancelled: false, sponsored: true, graceEnds_gt: $now } + ) { + id + } } } -query findDao($id: ID!) { +query findDao($id: ID!, $now: BigInt! = 0) { dao: dao(id: $id) { ...daoFields + activeProposals: proposals( + first: 101 + orderBy: createdAt + orderDirection: desc + where: { cancelled: false, sponsored: true, graceEnds_gt: $now } + ) { + id + } } } query listMemberships( $where: Dao_filter! = {} $memberWhere: Member_filter! = {} + $now: BigInt! = 0 $skip: Int! = 0 $first: Int! = 100 $orderBy: Dao_orderBy! = id @@ -42,7 +60,7 @@ query listMemberships( first: 101 orderBy: createdAt orderDirection: desc - where: { cancelled: false, processed: false, actionFailed: false } + where: { cancelled: false, sponsored: true, graceEnds_gt: $now } ) { id } diff --git a/libs/dao-data/src/utils/transformers.ts b/libs/dao-data/src/utils/transformers.ts index b53f5cf5d..e03ec931a 100644 --- a/libs/dao-data/src/utils/transformers.ts +++ b/libs/dao-data/src/utils/transformers.ts @@ -85,7 +85,7 @@ export const transformMembershipList = ( : undefined, isDelegate: Number(dao.members[0].delegateOfCount) > 0, memberAddress: dao.members[0].memberAddress, - contractType: 'Moloch V3', + contractType: 'Moloch v3', }; } );