Skip to content

Commit

Permalink
Feature/dao context pkg (#804)
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.

* pending proposal status

* fixes the mapping for self sponsor

* adds token type labels to token settings form

* removes nft count

* pull dao context out of core-app and updates core app

* fixes build

* adds daocontainer

* Update DaoContext.tsx

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 Sep 2, 2022
1 parent a8241f5 commit f8bfd74
Show file tree
Hide file tree
Showing 59 changed files with 740 additions and 117 deletions.
14 changes: 3 additions & 11 deletions apps/core-app/src/Routes.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React from 'react';
import { Routes as RoutesDom, Route } from 'react-router-dom';
import { Banner } from '@daohaus/ui';

import { DaoContextProvider } from './contexts/DaoContext';
import Home from './pages/Home';
import Dao from './pages/Dao';
import DaoOverview from './pages/DaoOverview';
import Members from './pages/Members';
import Member from './pages/Member';
Expand All @@ -14,22 +13,15 @@ import Settings from './pages/Settings';
import NewProposal from './pages/NewProposal';
import UpdateSettings from './pages/UpdateSettings';
import ProposalDetails from './pages/ProposalDetails';
import { Banner } from '@daohaus/ui';
import { DaoContainer } from './pages/DaoContainer';

const Routes = () => {
return (
<>
<Banner />
<RoutesDom>
<Route path="/" element={<Home />} />
<Route
path="molochv3/:daochain/:daoid"
element={
<DaoContextProvider>
<Dao />
</DaoContextProvider>
}
>
<Route path="molochv3/:daochain/:daoid" element={<DaoContainer />}>
<Route index element={<DaoOverview />} />
<Route path="formtest" element={<FormTest />} />
<Route path="proposals" element={<Proposals />} />
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/DaoProfile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
Button,
Link,
} from '@daohaus/ui';
import { TDao } from '@daohaus/dao-context';

import { TDao } from '../contexts/DaoContext';
import { TagList } from './TagList';
import { missingDaoProfileData } from '../utils/general';

Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/FakeMarkdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
SuccessMessage,
WrappedTextArea,
} from '@daohaus/ui';
import { useDao } from '../contexts/DaoContext';
import { useDao } from '@daohaus/dao-context';
import { useParams } from 'react-router-dom';
import {
ENDPOINTS,
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/GovernanceSettings.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from 'styled-components';
import { H3, H4, DataIndicator, ParSm, widthQuery, Theme } from '@daohaus/ui';

import { TDao } from '../contexts/DaoContext';
import { TDao } from '@daohaus/dao-context';
import {
charLimit,
formatPeriods,
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/MembersOverview.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from 'styled-components';
import { Card, Theme, DataIndicator, widthQuery } from '@daohaus/ui';

import { TDao } from '../contexts/DaoContext';
import { TDao } from '@daohaus/dao-context';
import { charLimit, formatValueTo, fromWei } from '@daohaus/common-utilities';

const MembersOverviewCard = styled(Card)`
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 @@ -10,7 +10,7 @@ import {
Link,
} from '@daohaus/ui';

import { TDao, useConnectedMembership } from '../contexts/DaoContext';
import { TDao, useConnectedMembership } from '@daohaus/dao-context';
import { TagList } from '../components/TagList';
import { useParams } from 'react-router-dom';
import { charLimit, Keychain } from '@daohaus/common-utilities';
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
votingPowerPercentage,
} from '@daohaus/common-utilities';

import { TMembership, useDao } from '../contexts/DaoContext';
import { TMembership, useDao } from '@daohaus/dao-context';

const AvatarLarge = styled(Avatar)`
height: 12rem;
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/ProposalCardOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
Keychain,
} from '@daohaus/common-utilities';

import { TProposals } from '../contexts/DaoContext';
import { TProposals } from '@daohaus/dao-context';
import { getProposalTypeLabel } from '../utils/general';

const OverviewContainer = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/ProposalDetailsGuts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
Keychain,
} from '@daohaus/common-utilities';

import { TProposals } from '../contexts/DaoContext';
import { TProposals } from '@daohaus/dao-context';
import { ProposalWarning } from './ProposalWarning';

const OverviewContainer = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/ProposalHistory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useParams } from 'react-router-dom';
import styled from 'styled-components';
import { getNetwork } from '@daohaus/common-utilities';

import { TProposals } from '../contexts/DaoContext';
import { TProposals } from '@daohaus/dao-context';
import { ProposalHistoryCard } from './ProposalHistoryCard';
import {
buildProposalHistory,
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/ProposalHistoryCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
ProposalHistoryElement,
ProposalHistoryElementData,
} from '../utils/historyHelpers';
import { TProposals } from '../contexts/DaoContext';
import { TProposals } from '@daohaus/dao-context';
import { VoteList } from './VoteList';

const ElementContainer = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/ShamanList.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from 'styled-components';
import { AddressDisplay, Button, DataSm, widthQuery } from '@daohaus/ui';

import { TDao } from '../contexts/DaoContext';
import { TDao } from '@daohaus/dao-context';
import { useParams } from 'react-router-dom';
import { Keychain } from '@daohaus/common-utilities';

Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/ShamanSettings.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from 'styled-components';
import { H3, ParSm } from '@daohaus/ui';

import { TDao } from '../contexts/DaoContext';
import { TDao } from '@daohaus/dao-context';
import { ShamanList } from './ShamanList';

const ShamanContainer = styled.div`
Expand Down
3 changes: 2 additions & 1 deletion apps/core-app/src/components/VaultOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ import {
Keychain,
} from '@daohaus/common-utilities';

import { TDao } from '../contexts/DaoContext';
import { TDao } from '@daohaus/dao-context';

const VaultOverviewCard = styled(Card)`
background-color: ${({ theme }: { theme: Theme }) => theme.card.hoverBg};
border: none;
padding: 3rem;
width: 100%;
`;

const VaultCardHeader = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/VoteList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from '@daohaus/common-utilities';
import { AddressDisplay, DataMd, ParMd } from '@daohaus/ui';

import { TProposals } from '../contexts/DaoContext';
import { TProposals } from '@daohaus/dao-context';
import { useParams } from 'react-router-dom';

const VotesContainer = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/customFields/RequestERC20.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Buildable, Button, WrappedInputSelect } from '@daohaus/ui';
import { useMemo } from 'react';
import { RegisterOptions, useFormContext } from 'react-hook-form';
import { useParams } from 'react-router-dom';
import { useDao } from '../../contexts/DaoContext';
import { useDao } from '@daohaus/dao-context';
import { getErc20s } from '../../utils/tokenData';

export enum InputStates {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '@daohaus/common-utilities';
import { Buildable, Button, WrappedInput } from '@daohaus/ui';

import { useDao } from '../../contexts/DaoContext';
import { useDao } from '@daohaus/dao-context';
import { getNetworkToken } from '../../utils/tokenData';

// enum InputStates {
Expand Down
83 changes: 51 additions & 32 deletions apps/core-app/src/components/customFields/SelectApplicant.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
import { useCallback, useEffect, useState } from 'react';
import { useFormContext } from 'react-hook-form';
import { useParams } from 'react-router-dom';
import { useMembers } from '../../contexts/DaoContext';
import { useMembers } from '@daohaus/dao-context';
import { Keychain } from '@daohaus/common-utilities';
import { Buildable, Button, ErrorMessage, Field, OptionType, WrappedInput, WrappedSelect } from '@daohaus/ui';
import {
Buildable,
Button,
ErrorMessage,
Field,
OptionType,
WrappedInput,
WrappedSelect,
} from '@daohaus/ui';

import { isActiveMember } from '../../utils/dataFetchHelpers';

type SelectApplicantProps = Buildable<Field & {
daoMemberOnly?: boolean;
}>;
type SelectApplicantProps = Buildable<
Field & {
daoMemberOnly?: boolean;
}
>;

export const SelectApplicant = ({ daoMemberOnly, ...props }: SelectApplicantProps) => {
export const SelectApplicant = ({
daoMemberOnly,
...props
}: SelectApplicantProps) => {
const [textMode, toggleTextMode] = useState(false);
const [memberList, setMemberList] = useState<Array<OptionType>>([]);
const [memberLoading, setMemberLoading] = useState(false);
Expand All @@ -32,40 +45,49 @@ export const SelectApplicant = ({ daoMemberOnly, ...props }: SelectApplicantProp
setValError(undefined);
}, [setValue]);

const fetchMember = useCallback(async (memberAddress: string, validateMember: boolean) => {
if (daochain && daoid) {
const rs = await isActiveMember({
daochain: daochain as keyof Keychain,
daoid,
address: memberAddress,
setMemberLoading,
});
if (rs.member) {
setValue('memberShares', rs.member.shares);
setValue('memberLoot', rs.member.loot);
const fetchMember = useCallback(
async (memberAddress: string, validateMember: boolean) => {
if (daochain && daoid) {
const rs = await isActiveMember({
daochain: daochain as keyof Keychain,
daoid,
address: memberAddress,
setMemberLoading,
});
if (rs.member) {
setValue('memberShares', rs.member.shares);
setValue('memberLoot', rs.member.loot);
}
if (validateMember && rs.error) setValError(rs.error);
}
if (validateMember && rs.error) setValError(rs.error);
}
}, [daochain, daoid, setValue]);
},
[daochain, daoid, setValue]
);

const ToggeButton = () => {
return (
<Button sm tertiary onClick={() => {
setValue(props.id, '');
toggleTextMode(!textMode);
}}>
<Button
sm
tertiary
onClick={() => {
setValue(props.id, '');
toggleTextMode(!textMode);
}}
>
{textMode ? 'Select Member' : 'Input Address'}
</Button>
)
);
};

useEffect(() => {
if (members) {
// TODO: WHat about pagination?
setMemberList(members.map(m => ({
name: m.memberAddress,
value: m.memberAddress,
})))
setMemberList(
members.map((m) => ({
name: m.memberAddress,
value: m.memberAddress,
}))
);
}
}, [members]);

Expand All @@ -87,6 +109,3 @@ export const SelectApplicant = ({ daoMemberOnly, ...props }: SelectApplicantProp
/>
);
};



2 changes: 1 addition & 1 deletion apps/core-app/src/components/customFields/ShamanDeluxe.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@daohaus/common-utilities';
import { Buildable, DataSm, ShamanPermission } from '@daohaus/ui';

import { useDao } from '../../contexts/DaoContext';
import { useDao } from '@daohaus/dao-context';

const Secondary = styled.span`
color: ${(props) => props.theme.secondary};
Expand Down
35 changes: 21 additions & 14 deletions apps/core-app/src/components/customFields/proposalExpiry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,24 @@ import {
WrappedInput,
InputSelect,
} from '@daohaus/ui';
import { useDao } from '../../contexts/DaoContext';
import { useDao } from '@daohaus/dao-context';

const INPUT_ID = 'expiryValue';
const SELECT_ID = 'expiryPeriod'
const SELECT_ID = 'expiryPeriod';

type ProposalExpiryProps = Buildable<Field & {
defaultValue?: string;
label: string;
}>;
type ProposalExpiryProps = Buildable<
Field & {
defaultValue?: string;
label: string;
}
>;

export const ProposalExpiry = ({ id, defaultValue, rules, ...props }: ProposalExpiryProps) => {
export const ProposalExpiry = ({
id,
defaultValue,
rules,
...props
}: ProposalExpiryProps) => {
const { watch, register, setValue } = useFormContext();
const [periodValue, periodMultiplier] = watch([INPUT_ID, SELECT_ID]);
const { dao } = useDao();
Expand All @@ -47,8 +54,8 @@ export const ProposalExpiry = ({ id, defaultValue, rules, ...props }: ProposalEx
expiryDateString,
format(
addSeconds(new Date(), absoluteExtendedPeriod),
"MMM dd, yyyy 'at' hh:mmaaa OOO",
),
"MMM dd, yyyy 'at' hh:mmaaa OOO"
)
);
}
}, [dao, expiryDateString, id, periodValue, periodMultiplier, setValue]);
Expand All @@ -69,15 +76,15 @@ export const ProposalExpiry = ({ id, defaultValue, rules, ...props }: ProposalEx
</FieldSpacer>
<FieldSpacer>
<HighlightInputText
id='highlightProposalExpiry'
description='Expiration will be on:'
highlightColor='#B4D7CE'
id="highlightProposalExpiry"
description="Expiration will be on:"
highlightColor="#B4D7CE"
highlightInputId={expiryDateString}
/>
</FieldSpacer>
<HighlightInputText
id='expirationDateDescription'
description='The expiration date includes Voting and Grace Periods. Adjust the days or hour to update the expiration.'
id="expirationDateDescription"
description="The expiration date includes Voting and Grace Periods. Adjust the days or hour to update the expiration."
/>
<WrappedInput id={id} hidden />
<WrappedInput id={expiryDateString} hidden />
Expand Down
2 changes: 1 addition & 1 deletion apps/core-app/src/components/proposalCards/HasNotVoted.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useHausConnect } from '@daohaus/daohaus-connect-feature';
import { useTxBuilder } from '@daohaus/tx-builder-feature';
import { ParMd, TintSecondary, useToast } from '@daohaus/ui';

import { useConnectedMembership, useDao } from '../../contexts/DaoContext';
import { useConnectedMembership, useDao } from '@daohaus/dao-context';
import { ACTION_TX } from '../../legos/tx';
import {
ActionTemplate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import styled from 'styled-components';
import { ActionTemplate, GasDisplay, Verdict } from './ActionPrimitives';
import { useParams } from 'react-router-dom';
import { useHausConnect } from '@daohaus/daohaus-connect-feature';
import { useDao } from '../../contexts/DaoContext';
import { useDao } from '@daohaus/dao-context';
import { useTxBuilder } from '@daohaus/tx-builder-feature';
import {
handleErrorMessage,
Expand Down
Loading

0 comments on commit f8bfd74

Please sign in to comment.