Skip to content

Commit

Permalink
Fix/20092022 bug sweep (#870)
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

* fixes Update Token Cards on DAO Home View #857"

* puts shaman below members

* fixes nv token transfer error on summon

* handles cnacelled state in prop cards and history

* cleanup

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 22, 2022
1 parent 2ff2f21 commit a6efa12
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 26 deletions.
3 changes: 2 additions & 1 deletion apps/core-app/src/components/GovernanceSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
fromWei,
getNetwork,
INFO_COPY,
lowerCaseLootToken,
} from '@daohaus/common-utilities';
import { useMemo } from 'react';
import { useParams } from 'react-router-dom';
Expand Down Expand Up @@ -206,7 +207,7 @@ export const GovernanceSettings = ({ dao }: GovernanceSettingsProps) => {
<DataIndicator
size="sm"
label="Name"
data={charLimit(dao.lootTokenName, 12)}
data={charLimit(lowerCaseLootToken(dao.lootTokenName), 12)}
/>
<DataIndicator
size="sm"
Expand Down
11 changes: 8 additions & 3 deletions apps/core-app/src/components/MembersOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import styled from 'styled-components';
import { Card, Theme, DataIndicator, widthQuery } from '@daohaus/ui';

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

const MembersOverviewCard = styled(Card)`
background-color: ${({ theme }: { theme: Theme }) => theme.card.hoverBg};
Expand Down Expand Up @@ -34,7 +39,7 @@ export const MembersOverview = ({ dao }: MembersOverviewProps) => {
return (
<MembersOverviewCard>
<DataGrid>
<DataIndicator label="Members" data={dao.activeMemberCount} />
<DataIndicator label="Token Holders" data={dao.activeMemberCount} />
<DataIndicator label="Shamans" data={dao.shamen?.length || '0'} />
<DataIndicator
label={charLimit(dao.shareTokenName, 12)}
Expand All @@ -45,7 +50,7 @@ export const MembersOverview = ({ dao }: MembersOverviewProps) => {
})}
/>
<DataIndicator
label={charLimit(dao.lootTokenName, 12)}
label={charLimit(lowerCaseLootToken(dao.lootTokenName), 12)}
data={formatValueTo({
value: fromWei(dao.totalLoot),
decimals: 2,
Expand Down
1 change: 1 addition & 0 deletions apps/core-app/src/components/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
votingPowerPercentage,
} from '@daohaus/common-utilities';
import { TMembership, useDao } from '@daohaus/dao-context';

import { MemberProfileMenu } from './MemberProfileMenu';

const AvatarLarge = styled(Avatar)`
Expand Down
7 changes: 1 addition & 6 deletions apps/core-app/src/components/proposalCards/Cancelled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ export const Cancelled = ({ proposal }: { proposal: ITransformedProposal }) => {
<ActionTemplate
proposal={proposal}
statusDisplay="Proposal Cancelled"
main={
<>
<VotingBar proposal={proposal} />
<Verdict passed={false} />{' '}
</>
}
main={<VotingBar proposal={proposal} />}
/>
);
};
19 changes: 12 additions & 7 deletions apps/core-app/src/pages/DaoOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ import {
} from '@daohaus/ui';
import { useDao } from '@daohaus/dao-context';
import { DaoProfile } from '../components/DaoProfile';
import { charLimit, formatValueTo, fromWei } from '@daohaus/common-utilities';
import {
charLimit,
formatValueTo,
fromWei,
lowerCaseLootToken,
} from '@daohaus/common-utilities';

const OverviewCard = styled(Card)`
width: 64rem;
Expand Down Expand Up @@ -67,10 +72,10 @@ export function DaoOverview() {
</DataGrid>
</OverviewCard>
<TokensCard>
<H4>{charLimit(dao.shareTokenName, 23)}</H4>
<H4>Tokens</H4>
<DataGrid>
<DataIndicator
label="Voting Tokens"
label="Voting"
data={charLimit(dao.shareTokenName, 8)}
/>
<DataIndicator
Expand All @@ -81,10 +86,10 @@ export function DaoOverview() {
format: 'numberShort',
})}
/>
<DataIndicator label="Token Holders" data="--" />
<DataIndicator label="Holders" data="--" />
<DataIndicator
label="Economic Tokens"
data={charLimit(dao.lootTokenName, 8)}
label="Non-Voting"
data={charLimit(lowerCaseLootToken(dao.lootTokenName), 8)}
/>
<DataIndicator
label="Supply"
Expand All @@ -94,7 +99,7 @@ export function DaoOverview() {
format: 'numberShort',
})}
/>
<DataIndicator label="Token Holders" data="--" />
<DataIndicator label="Holders" data="--" />
</DataGrid>
</TokensCard>
</>
Expand Down
5 changes: 4 additions & 1 deletion apps/core-app/src/pages/Members.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
formatDateFromSeconds,
formatValueTo,
fromWei,
lowerCaseLootToken,
sharesDelegatedToMember,
votingPowerPercentage,
} from '@daohaus/common-utilities';
Expand Down Expand Up @@ -151,7 +152,9 @@ export function Members() {
},
{
Header: () => {
return <div>{charLimit(dao?.lootTokenName, 6)}</div>;
return (
<div>{charLimit(lowerCaseLootToken(dao?.lootTokenName), 6)}</div>
);
},
accessor: 'loot',
Cell: ({ value }: { value: string }) => {
Expand Down
19 changes: 19 additions & 0 deletions apps/core-app/src/utils/historyHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ export const buildProposalHistory = ({
if (proposal.status === PROPOSAL_STATUS.unsponsored) {
return buildUnsponsoredElements({ proposal, networkData });
}
if (proposal.status === PROPOSAL_STATUS.cancelled) {
return buildCancelledElements({ proposal, networkData });
}
if (proposal.status === PROPOSAL_STATUS.voting) {
return buildVotingElements({ proposal, networkData });
}
Expand Down Expand Up @@ -202,6 +205,22 @@ const buildVotingElements = ({
];
};

const buildCancelledElements = ({
proposal,
networkData,
}: ElementBuildArgs): ProposalHistoryElement[] => {
return [
buildSubmitted({ proposal, networkData }),
buildSponsored({ proposal }),
buildVotingPast({ proposal }),
{
title: 'Proposal Cancelled',
active: false,
canExpand: false,
},
];
};

const buildUnsponsoredElements = ({
proposal,
networkData,
Expand Down
2 changes: 1 addition & 1 deletion apps/summon-app/src/layouts/SummonerForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ export const SummonerForm = ({
<StakeTokensSegment formDisabled={formDisabled} />
<TimingSegment formDisabled={formDisabled} />
<AdvancedSegment formDisabled={formDisabled} />
<ShamanSegment formDisabled={formDisabled} />
<MembersSegment formDisabled={formDisabled} />
<ShamanSegment formDisabled={formDisabled} />
{!isConnected && <ConnectBox />}
<Button
fullWidth
Expand Down
2 changes: 1 addition & 1 deletion apps/summon-app/src/utils/summonTx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { FORM_KEYS } from './formKeys';

const tokenConfigTX = (formValues: FormValues) => {
const pauseVoteToken = !formValues.votingTransferable;
const pauseNvToken = !formValues.votingTransferable;
const pauseNvToken = !formValues.nvTransferable;

const encoded = encodeFunction(LOCAL_ABI.BAAL, 'setAdminConfig', [
pauseVoteToken,
Expand Down
5 changes: 5 additions & 0 deletions libs/common-utilities/src/utils/general.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,8 @@ export const sharesDelegatedToMember = (
): number => {
return Number(delegateShares) - Number(memberShares);
};

export const lowerCaseLootToken = (tokenName?: string): string => {
if (!tokenName) return '';
return tokenName.replace('LOOT', 'Loot');
};
7 changes: 4 additions & 3 deletions libs/daohaus-connect-feature/src/utils/common.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
export const TEMPORARY_RPC = {
'0x1': `https://${import.meta.env.VITE_RIVET_KEY}.eth.rpc.rivet.cloud/`,
'0x4': `https://${import.meta.env.VITE_RIVET_KEY}.rinkeby.rpc.rivet.cloud/`,
'0x5': `https://goerli.infura.io/v3/${
import.meta.env.VITE_INFURA_PROJECT_ID
}`,
// '0x5': `https://goerli.infura.io/v3/${
// import.meta.env.VITE_INFURA_PROJECT_ID
// }`,
'0x5': `https://${import.meta.env.VITE_RIVET_KEY}.goerli.rpc.rivet.cloud/`,
'0x2a': `https://kovan.infura.io/v3/${
import.meta.env.VITE_INFURA_PROJECT_ID
}`,
Expand Down
7 changes: 4 additions & 3 deletions libs/tx-builder-feature/src/utils/abi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ export const isProxyABI = (abi: ABI) => {

export const TEMPORARY_RPC = {
'0x1': `https://${import.meta.env['VITE_RIVET_KEY']}.eth.rpc.rivet.cloud/`,
'0x5': `https://goerli.infura.io/v3/${
import.meta.env['VITE_INFURA_PROJECT_ID']
}`,
// '0x5': `https://goerli.infura.io/v3/${
// import.meta.env['VITE_INFURA_PROJECT_ID']
// }`,
'0x5': `https://${import.meta.env['VITE_RIVET_KEY']}.goerli.rpc.rivet.cloud/`,
'0x64': 'https://rpc.gnosischain.com/',
};

Expand Down

0 comments on commit a6efa12

Please sign in to comment.