Skip to content

Commit

Permalink
Fix/14102022 friday sweep (#988)
Browse files Browse the repository at this point in the history
* 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

* 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 <[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]>
  • Loading branch information
8 people authored Oct 14, 2022
1 parent 8c7ff93 commit 7a562b3
Show file tree
Hide file tree
Showing 16 changed files with 97 additions and 47 deletions.
15 changes: 11 additions & 4 deletions apps/core-app/src/components/DaoCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
ParMd,
ProfileAvatar,
Tag,
Tooltip,
} from '@daohaus/ui';

import { ButtonLink } from './ButtonLink';
Expand Down Expand Up @@ -72,10 +73,16 @@ export const DaoCard = ({
<div className="alert-box">
<ProfileAvatar size="xl" address={dao} />
{activeProposalCount > 0 && (
<Badge
badgeSize="sm"
badgeLabel={activeProposalCount}
className="badge"
<Tooltip
content={`${activeProposalCount} Active Proposals (in voting or grace period)`}
triggerEl={
<Badge
badgeSize="sm"
badgeLabel={activeProposalCount}
className="badge"
badgeColor="blue"
/>
}
/>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/MetadataSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const MetadataSettings = ({ dao }: MetadataSettingsProps) => {
<div>
<ParMd>DAO Contracts</ParMd>
<div className="contract">
<ParSm>Moloch V3</ParSm>
<ParSm>Moloch v3</ParSm>
<AddressDisplay
address={dao.id}
copy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export const ReadyForProcessing = ({
const isMobile = useBreakpoint(widthQuery.sm);

const [canProcess, setCanProcess] = React.useState<string | true>(
'Checking Process data.'
'Checking execution data.'
);
const [isLoading, setIsLoading] = React.useState(false);

Expand Down Expand Up @@ -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',
});
},
Expand All @@ -128,8 +128,8 @@ export const ReadyForProcessing = ({
},
onPollSuccess: () => {
successToast({
title: 'Process Success',
description: 'Proposal processed',
title: 'Execution Success',
description: 'Proposal executed',
});
refreshAll();
setIsLoading(false);
Expand Down Expand Up @@ -165,7 +165,7 @@ export const ReadyForProcessing = ({
return (
<ActionTemplate
proposal={proposal}
statusDisplay="Ready For Processing"
statusDisplay="Ready for Execution"
main={
<>
<VotingBar proposal={proposal} />
Expand Down
33 changes: 26 additions & 7 deletions apps/core-app/src/pages/Dao.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<TXBuilder
Expand All @@ -33,12 +57,7 @@ export function Dao() {
href: `/molochv3/${daochain}/${daoid}/members`,
},
]}
dropdownLinks={[
{
label: 'Settings',
href: `/molochv3/${daochain}/${daoid}/settings`,
},
]}
dropdownLinks={moreLinks}
>
<Outlet />
</HausLayout>
Expand Down
3 changes: 2 additions & 1 deletion apps/core-app/src/pages/DaoOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ export function DaoOverview() {
})}
/>
<DataIndicator label="Members" data={dao.activeMemberCount} />
<DataIndicator label="Proposals" data={dao.proposalCount} />
<DataIndicator
label="Active Proposals"
data={dao.proposalCount}
data={dao.activeProposals?.length || '0'}
/>
</DataGrid>
</OverviewCard>
Expand Down
13 changes: 7 additions & 6 deletions apps/core-app/src/pages/Members.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ import {
Tooltip,
} from '@daohaus/ui';
import {
charLimit,
formatDateFromSeconds,
formatValueTo,
fromWei,
lowerCaseLootToken,
sharesDelegatedToMember,
votingPowerPercentage,
} from '@daohaus/common-utilities';
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -143,7 +146,7 @@ export function Members() {
},
{
Header: () => {
return <>{charLimit(dao?.shareTokenName, 6)}</>;
return <>Voting</>;
},
accessor: 'shares',
Cell: ({ value }: { value: string }) => {
Expand All @@ -160,9 +163,7 @@ export function Members() {
},
{
Header: () => {
return (
<div>{charLimit(lowerCaseLootToken(dao?.lootTokenName), 6)}</div>
);
return <div>Non-Voting</div>;
},
accessor: 'loot',
Cell: ({ value }: { value: string }) => {
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/utils/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
9 changes: 2 additions & 7 deletions apps/core-app/src/utils/historyHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 || '--',
},
],
Expand All @@ -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,
},
];
Expand Down
1 change: 1 addition & 0 deletions apps/summon-app/src/layouts/SummonerSuccess.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const AddressInfoSection = styled(InfoSection)`

const ButtonGroup = styled.div`
display: flex;
gap: 3rem;
a {
button {
width: 200px;
Expand Down
2 changes: 1 addition & 1 deletion apps/summon-safe-app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
-->
<title>Moloch V3 Summoner App</title>
<title>Moloch v3 Summoner App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
8 changes: 4 additions & 4 deletions libs/common-utilities/src/constants/proposals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 } = {
Expand All @@ -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',
};

Expand Down
4 changes: 3 additions & 1 deletion libs/dao-data/src/Profile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import {
DaoTokenBalances,
ITransformedMembershipsQuery,
Keychain,
nowInSeconds,
} from '@daohaus/common-utilities';
import {
ICrossNetworkMemberListArguments,
ListMembershipsDocument,
ListMembershipsQuery,
ListMembershipsQueryVariables,
Member_OrderBy,
IFindQueryResult,
Dao_OrderBy,
Expand All @@ -21,6 +21,7 @@ import {
ListConnectedMemberProposalsQueryVariables,
ListConnectedMemberProposalsQuery,
ListConnectedMemberProposalsDocument,
ListMembershipsQueryVariables,
} from './types';
import {
transformMembershipList,
Expand Down Expand Up @@ -130,6 +131,7 @@ export default class Profile {
...daoFilter,
},
memberWhere: { memberAddress },
now: nowInSeconds().toFixed(),
orderBy: ordering.orderBy,
orderDirection: ordering.orderDirection,
}
Expand Down
3 changes: 3 additions & 0 deletions libs/dao-data/src/Query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
ENDPOINTS,
Keychain,
KeychainList,
nowInSeconds,
TokenBalance,
} from '@daohaus/common-utilities';

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -349,6 +351,7 @@ export default class Query {
networkId,
{
id: dao.toLowerCase(),
now: nowInSeconds().toFixed(),
}
);

Expand Down
Loading

0 comments on commit 7a562b3

Please sign in to comment.