Skip to content

Commit

Permalink
Fix/rage calcs (#973)
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

* delegate smalls

* rager DAO caps

* more smalls

* Update HasNotVoted.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 Oct 13, 2022
1 parent b11a5f9 commit 7b1f8a8
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 24 deletions.
2 changes: 1 addition & 1 deletion apps/core-app/src/components/CancelProposal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export const CancelProposal = ({

return isProposer || sponsorBelowThreshold || isGovernorShaman
? true
: `Proposal can only be cancelled by the proposer, by a governance shaman or if the sponsor's shares have fallen below the sponsor threshold`;
: `Proposal can only be cancelled by the proposer, by a governance shaman or if the sponsor's voting token balance has fallen below the sponsor threshold`;
}, [proposal, address, dao]);

if (proposal.status !== PROPOSAL_STATUS.voting) {
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
Expand Up @@ -173,7 +173,7 @@ export const GovernanceSettings = ({ dao }: GovernanceSettingsProps) => {
<DataIndicator
size="sm"
label="Sponsor Threshold"
data={`${fromWei(dao.sponsorThreshold)} Shares`}
data={`${fromWei(dao.sponsorThreshold)} Voting Tokens`}
info={INFO_COPY.SPONSOR_THRESHOLD}
/>
</DataGrid>
Expand Down
4 changes: 2 additions & 2 deletions apps/core-app/src/components/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@ export const Profile = ({ profile, membership }: ProfileProps) => {
})}
/>
<DataIndicator
label="Shares"
label="Voting Tokens"
data={formatValueTo({
value: fromWei(membership.shares),
decimals: 2,
format: 'number',
})}
/>
<DataIndicator
label="Loot"
label="Non-Voting Tokens"
data={formatValueTo({
value: fromWei(membership.loot),
decimals: 2,
Expand Down
8 changes: 4 additions & 4 deletions apps/core-app/src/components/ShamanSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ export const ShamanSettings = ({ dao }: ShamanSettingsProps) => {
</ShamanCardHeader>
<div className="description">
<ParSm>
Shamans are contracts that can adjust governance, shares, and
memberships without proposals. Because shamans can affect the security
of the DAO, be cautious when adding new shamans, and remove any that
are no longer needed.
Shamans are contracts that can adjust governance settings, token
settings, and memberships without proposals. Because shamans can
affect the security of the DAO, be cautious when adding new shamans,
and remove any that are no longer needed.
</ParSm>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ export const RagequitTokenList = (props: Buildable<Field>) => {
value: memberTokenBalanceShare(
token.balance,
dao.totalShares || 0,
dao.totalLoot || 0,
sharesToBurn || 0,
lootToBurn || 0,
token.token?.decimals || 18
Expand All @@ -152,6 +153,7 @@ export const RagequitTokenList = (props: Buildable<Field>) => {
value: memberUsdValueShare(
token.fiatBalance,
dao.totalShares || 0,
dao.totalLoot || 0,
sharesToBurn || 0,
lootToBurn || 0
),
Expand Down
4 changes: 2 additions & 2 deletions apps/core-app/src/components/customFields/delegateInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ export const DelegateInput = (props: Buildable<Field>) => {
setValue(props.id, connectedMembership?.memberAddress);
};

const votingPowerMessage = `${dao?.shareTokenName} (${formatValueTo({
const votingPowerMessage = `${formatValueTo({
value: fromWei(connectedMembership?.shares || '0'),
decimals: 2,
format: 'number',
})} - ${votingPowerPercentage(
})} ${dao?.shareTokenName} (${votingPowerPercentage(
dao?.totalShares || '0',
connectedMembership?.shares || '0'
)}% voting power) `;
Expand Down
11 changes: 6 additions & 5 deletions apps/core-app/src/components/proposalCards/HasNotVoted.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,14 @@ export const HasNotVoted = ({
});
};

const readableVotePower = connectedMembership?.shares
? `Cast Your Vote (${formatShares(connectedMembership.shares)})`
: undefined;
const readableVotePower =
connectedMembership && Number(connectedMembership?.delegateShares)
? `Cast Your Vote (${formatShares(connectedMembership.delegateShares)})`
: undefined;

const hasShares = connectedMembership?.shares
const hasShares = Number(connectedMembership?.delegateShares)
? true
: 'You must have shares to vote';
: 'You must have voting tokens to vote';

const isConnectedToDao =
chainId === daochain
Expand Down
4 changes: 2 additions & 2 deletions apps/core-app/src/legos/fields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const FIELD: Record<string, CustomFieldLego> = {
DELEGATE: {
id: 'delegatingTo',
type: 'delegateInput',
label: 'Delgate to',
label: 'Delegate to',
placeholder: '0x0...',
},
PROPOSAL_EXPIRY: {
Expand Down Expand Up @@ -113,5 +113,5 @@ export const FIELD: Record<string, CustomFieldLego> = {
label: 'WalletConnect Link',
info: 'After connecting WalletConnect to another dApp, copy the link and paste it to this input field',
placeholder: 'wc:',
}
},
};
2 changes: 1 addition & 1 deletion apps/core-app/src/legos/form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ export const COMMON_FORMS: Record<string, CustomFormLego> = {
id: 'tokenAddresses',
type: 'formSegment',
title:
'Step 2. Select treasury tokens you want to receive in exchange for your dao tokens',
'Step 2. Select treasury tokens you want to receive in exchange for your DAO tokens',
fields: [
// @ts-expect-error: cannot resolve type within formSegment using custom fields sent from the core-app
{ id: 'tokens', type: 'ragequitTokenList' },
Expand Down
3 changes: 3 additions & 0 deletions apps/core-app/src/pages/Member.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export function Member() {
value: memberUsdValueShare(
bal.fiatBalance,
dao.totalShares || 0,
dao.totalLoot || 0,
currentMember.shares || 0,
currentMember.loot || 0
),
Expand All @@ -169,6 +170,7 @@ export function Member() {
value: memberTokenBalanceShare(
bal.balance,
dao.totalShares || 0,
dao.totalLoot || 0,
currentMember.shares || 0,
currentMember.loot || 0,
bal.token?.decimals || 18
Expand Down Expand Up @@ -263,6 +265,7 @@ export function Member() {
value: memberUsdValueShare(
dao?.fiatTotal || 0,
dao?.totalShares || 0,
dao?.totalLoot || 0,
currentMember.shares || 0,
currentMember.loot || 0
),
Expand Down
5 changes: 3 additions & 2 deletions apps/core-app/src/pages/Members.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,15 @@ export function Members() {
);
return (
<div className="hide-sm">
{votingPowerPercentage(dao?.totalShares || '0', value)}{' '}
{votingPowerPercentage(dao?.totalShares || '0', value)}
{' %'}
{delegatedShares > 0 && (
<Tooltip
content={`${formatValueTo({
value: fromWei(delegatedShares.toFixed()),
decimals: 2,
format: 'number',
})} shares are delegated to this member`}
})} voting tokens are delegated to this member`}
side="bottom"
/>
)}
Expand Down
14 changes: 10 additions & 4 deletions libs/common-utilities/src/utils/general.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@ export const nowInSeconds = (): number => new Date().getTime() / 1000;
export const memberTokenBalanceShare = (
tokenBalance: string | number,
daoTotalShares: string | number,
daoTotalLoot: string | number,
memberShares: string | number,
memberLoot: string | number,
decimals: string | number = 18
): number => {
const daoSharesAndLoot =
Number(ethers.utils.formatEther(daoTotalShares)) +
Number(ethers.utils.formatEther(daoTotalLoot));
const sharesAndLoot =
Number(ethers.utils.formatEther(memberShares)) +
Number(ethers.utils.formatEther(memberLoot));

const ratio =
sharesAndLoot / Number(ethers.utils.formatEther(daoTotalShares));
const ratio = sharesAndLoot / daoSharesAndLoot;

const memberSharesWei = Number(tokenBalance) * ratio;
return memberSharesWei / 10 ** Number(decimals);
Expand All @@ -37,15 +40,18 @@ export const memberTokenBalanceShare = (
export const memberUsdValueShare = (
usdValue: string | number,
daoTotalShares: string | number,
daoTotalLoot: string | number,
memberShares: string | number,
memberLoot: string | number
): number => {
const daoSharesAndLoot =
Number(ethers.utils.formatEther(daoTotalShares)) +
Number(ethers.utils.formatEther(daoTotalLoot));
const sharesAndLoot =
Number(ethers.utils.formatEther(memberShares)) +
Number(ethers.utils.formatEther(memberLoot));

const ratio =
sharesAndLoot / Number(ethers.utils.formatEther(daoTotalShares));
const ratio = sharesAndLoot / daoSharesAndLoot;

return Number(usdValue) * ratio;
};
Expand Down

0 comments on commit 7b1f8a8

Please sign in to comment.