Add banner and DAO Info Bar item for active threshold.

DA0-DA0 · Oct 3, 2023 · a157127 · a157127
1 parent ccdba33
commit a157127
Show file tree

Hide file tree

Showing 15 changed files with 228 additions and 24 deletions.
diff --git a/packages/i18n/locales/en/translation.json b/packages/i18n/locales/en/translation.json
@@ -296,6 +296,9 @@
     "counterpartyBalanceInsufficient": "The counterparty's balance of {{amount}} ${{tokenSymbol}} is insufficient. They may be unable to complete this swap.",
     "daoAndSubDaosAlreadyOnV2": "This DAO (and all of its SubDAOs, if it has any) have already been upgraded.",
     "daoFeatureUnsupported": "{{name}} does not support {{feature}} yet.",
+    "daoIsInactive_absolute_one": "This DAO is inactive. Proposals cannot be created until {{count}} token is staked.",
+    "daoIsInactive_absolute_other": "This DAO is inactive. Proposals cannot be created until {{count}} tokens are staked.",
+    "daoIsInactive_percent": "This DAO is inactive. Proposals cannot be created until {{percent}} of voting power is staked.",
     "daoIsPaused": "You cannot create a proposal when the DAO is paused.",
     "discordAuthFailed": "Discord authentication unexpectedly failed. Try again or reach out to us for assistance.",
     "emptyFile": "File is empty.",

diff --git a/packages/stateful/components/dao/DaoInfoBar.tsx b/packages/stateful/components/dao/DaoInfoBar.tsx
@@ -1,4 +1,4 @@
-import { AccountBalanceOutlined } from '@mui/icons-material'
+import { AccountBalanceOutlined, LockOpenOutlined } from '@mui/icons-material'
 import { useTranslation } from 'react-i18next'
 
 import { daoTvlSelector } from '@dao-dao/state'
@@ -10,6 +10,10 @@ import {
   useChain,
   useDaoInfoContext,
 } from '@dao-dao/stateless'
+import {
+  convertMicroDenomToDenomWithDecimals,
+  formatPercentOf100,
+} from '@dao-dao/utils'
 
 import {
   useCw20CommonGovernanceTokenInfoIfExists,
@@ -27,13 +31,14 @@ const InnerDaoInfoBar = () => {
   const { t } = useTranslation()
   const { chain_id: chainId } = useChain()
   const {
-    hooks: { useDaoInfoBarItems },
+    hooks: { useDaoInfoBarItems, useCommonGovernanceTokenInfo },
   } = useVotingModuleAdapter()
   const votingModuleItems = useDaoInfoBarItems()
-  const { coreAddress } = useDaoInfoContext()
+  const { coreAddress, activeThreshold } = useDaoInfoContext()
 
   const { denomOrAddress: cw20GovernanceTokenAddress } =
     useCw20CommonGovernanceTokenInfoIfExists() ?? {}
+  const tokenInfo = useCommonGovernanceTokenInfo?.()
 
   const treasuryUsdcValueLoading = useCachedLoading(
     daoTvlSelector({
@@ -75,6 +80,30 @@ const InnerDaoInfoBar = () => {
             />
           ),
         },
+        ...(activeThreshold
+          ? [
+              {
+                Icon: LockOpenOutlined,
+                label: t('title.activeThreshold'),
+                tooltip: t('info.activeThresholdDescription'),
+                value:
+                  'percentage' in activeThreshold
+                    ? formatPercentOf100(
+                        Number(activeThreshold.percentage.percent) * 100
+                      )
+                    : tokenInfo && (
+                        <TokenAmountDisplay
+                          amount={convertMicroDenomToDenomWithDecimals(
+                            activeThreshold.absolute_count.count,
+                            tokenInfo.decimals
+                          )}
+                          decimals={tokenInfo.decimals}
+                          symbol={tokenInfo.symbol}
+                        />
+                      ),
+              },
+            ]
+          : []),
         // Voting module-specific items.
         ...votingModuleItems,
       ]}

diff --git a/...dapter/adapters/DaoProposalMultiple/common/components/NewProposal/NewProposal.stories.tsx b/...dapter/adapters/DaoProposalMultiple/common/components/NewProposal/NewProposal.stories.tsx
@@ -50,6 +50,8 @@ Default.args = {
   },
   loading: false,
   isPaused: false,
+  isActive: true,
+  activeThreshold: null,
   isMember: { loading: false, data: true },
   depositUnsatisfied: false,
   connected: true,

diff --git a/...module-adapter/adapters/DaoProposalMultiple/common/components/NewProposal/NewProposal.tsx b/...module-adapter/adapters/DaoProposalMultiple/common/components/NewProposal/NewProposal.tsx
@@ -39,10 +39,12 @@ import {
   SuspenseLoaderProps,
 } from '@dao-dao/types'
 import { MultipleChoiceOptionType } from '@dao-dao/types/contracts/DaoProposalMultiple'
+import { ActiveThreshold } from '@dao-dao/types/contracts/DaoVotingCw20Staked'
 import {
   MAX_NUM_PROPOSAL_CHOICES,
   convertActionsToMessages,
   formatDateTime,
+  formatPercentOf100,
   formatTime,
   processError,
   validateRequired,
@@ -76,6 +78,8 @@ export interface NewProposalProps
   createProposal: (newProposalData: NewProposalData) => Promise<void>
   loading: boolean
   isPaused: boolean
+  isActive: boolean
+  activeThreshold: ActiveThreshold | null
   isMember: LoadingData<boolean>
   anyoneCanPropose: boolean
   depositUnsatisfied: boolean
@@ -91,6 +95,8 @@ export const NewProposal = ({
   createProposal,
   loading,
   isPaused,
+  isActive,
+  activeThreshold,
   isMember,
   anyoneCanPropose,
   depositUnsatisfied,
@@ -333,6 +339,23 @@ export const NewProposal = ({
                   ? t('error.notEnoughForDeposit')
                   : isPaused
                   ? t('error.daoIsPaused')
+                  : !isActive && activeThreshold
+                  ? t('error.daoIsInactive', {
+                      context:
+                        'percentage' in activeThreshold
+                          ? 'percent'
+                          : 'absolute',
+                      percent:
+                        'percentage' in activeThreshold
+                          ? formatPercentOf100(
+                              Number(activeThreshold.percentage.percent) * 100
+                            )
+                          : undefined,
+                      count:
+                        'percentage' in activeThreshold
+                          ? undefined
+                          : Number(activeThreshold.absolute_count.count),
+                    })
                   : choices.length < 2
                   ? t('error.tooFewChoices')
                   : choices.length > MAX_NUM_PROPOSAL_CHOICES
@@ -348,6 +371,7 @@ export const NewProposal = ({
                   (!anyoneCanPropose && !isMember.loading && !isMember.data) ||
                   depositUnsatisfied ||
                   isPaused ||
+                  !isActive ||
                   choices.length < 2 ||
                   choices.length > MAX_NUM_PROPOSAL_CHOICES
                 }

diff --git a/...posal-module-adapter/adapters/DaoProposalMultiple/common/components/NewProposal/index.tsx b/...posal-module-adapter/adapters/DaoProposalMultiple/common/components/NewProposal/index.tsx
@@ -51,6 +51,8 @@ export const NewProposal = ({
     name: daoName,
     imageUrl: daoImageUrl,
     coreAddress,
+    isActive,
+    activeThreshold,
   } = useDaoInfoContext()
   const { isWalletConnected, getStargateClient } = useWallet()
 
@@ -206,11 +208,13 @@ export const NewProposal = ({
     <StatelessNewProposal
       EntityDisplay={EntityDisplay}
       SuspenseLoader={SuspenseLoader}
+      activeThreshold={activeThreshold}
       anyoneCanPropose={anyoneCanPropose}
       categories={categories}
       connected={isWalletConnected}
       createProposal={createProposal}
       depositUnsatisfied={depositUnsatisfied}
+      isActive={isActive}
       isMember={
         membershipLoading
           ? { loading: true }

diff --git a/...-adapter/adapters/DaoProposalSingle/common/components/NewProposal/NewProposal.stories.tsx b/...-adapter/adapters/DaoProposalSingle/common/components/NewProposal/NewProposal.stories.tsx
@@ -50,6 +50,8 @@ Default.args = {
   },
   loading: false,
   isPaused: false,
+  isActive: true,
+  activeThreshold: null,
   isMember: { loading: false, data: true },
   depositUnsatisfied: false,
   connected: true,

diff --git a/...l-module-adapter/adapters/DaoProposalSingle/common/components/NewProposal/NewProposal.tsx b/...l-module-adapter/adapters/DaoProposalSingle/common/components/NewProposal/NewProposal.tsx
@@ -39,9 +39,11 @@ import {
   StatefulEntityDisplayProps,
   SuspenseLoaderProps,
 } from '@dao-dao/types'
+import { ActiveThreshold } from '@dao-dao/types/contracts/DaoVotingCw20Staked'
 import {
   convertActionsToMessages,
   formatDateTime,
+  formatPercentOf100,
   formatTime,
   processError,
   validateRequired,
@@ -70,6 +72,8 @@ export interface NewProposalProps
   createProposal: (newProposalData: NewProposalData) => Promise<void>
   loading: boolean
   isPaused: boolean
+  isActive: boolean
+  activeThreshold: ActiveThreshold | null
   isMember: LoadingData<boolean>
   anyoneCanPropose: boolean
   depositUnsatisfied: boolean
@@ -85,6 +89,8 @@ export const NewProposal = ({
   createProposal,
   loading,
   isPaused,
+  isActive,
+  activeThreshold,
   isMember,
   anyoneCanPropose,
   depositUnsatisfied,
@@ -280,6 +286,23 @@ export const NewProposal = ({
                   ? t('error.notEnoughForDeposit')
                   : isPaused
                   ? t('error.daoIsPaused')
+                  : !isActive && activeThreshold
+                  ? t('error.daoIsInactive', {
+                      context:
+                        'percentage' in activeThreshold
+                          ? 'percent'
+                          : 'absolute',
+                      percent:
+                        'percentage' in activeThreshold
+                          ? formatPercentOf100(
+                              Number(activeThreshold.percentage.percent) * 100
+                            )
+                          : undefined,
+                      count:
+                        'percentage' in activeThreshold
+                          ? undefined
+                          : Number(activeThreshold.absolute_count.count),
+                    })
                   : undefined
               }
             >
@@ -288,7 +311,8 @@ export const NewProposal = ({
                   !connected ||
                   (!anyoneCanPropose && !isMember.loading && !isMember.data) ||
                   depositUnsatisfied ||
-                  isPaused
+                  isPaused ||
+                  !isActive
                 }
                 loading={loading}
                 type="submit"

diff --git a/...roposal-module-adapter/adapters/DaoProposalSingle/common/components/NewProposal/index.tsx b/...roposal-module-adapter/adapters/DaoProposalSingle/common/components/NewProposal/index.tsx
@@ -51,6 +51,8 @@ export const NewProposal = ({
     name: daoName,
     imageUrl: daoImageUrl,
     coreAddress,
+    isActive,
+    activeThreshold,
   } = useDaoInfoContext()
   const { isWalletConnected, getStargateClient } = useWallet()
 
@@ -215,11 +217,13 @@ export const NewProposal = ({
     <StatelessNewProposal
       EntityDisplay={EntityDisplay}
       SuspenseLoader={SuspenseLoader}
+      activeThreshold={activeThreshold}
       anyoneCanPropose={anyoneCanPropose}
       categories={categories}
       connected={isWalletConnected}
       createProposal={createProposal}
       depositUnsatisfied={depositUnsatisfied}
+      isActive={isActive}
       isMember={
         membershipLoading
           ? { loading: true }

diff --git a/packages/stateful/recoil/selectors/dao/misc.ts b/packages/stateful/recoil/selectors/dao/misc.ts
@@ -1,4 +1,4 @@
-import { RecoilValueReadOnly, selectorFamily } from 'recoil'
+import { RecoilValueReadOnly, selectorFamily, waitForAllSettled } from 'recoil'
 
 import {
   DaoCoreV2Selectors,
@@ -183,6 +183,33 @@ export const daoInfoSelector: (param: {
       const votingModuleContractName =
         votingModuleInfo?.info.contract || 'fallback'
 
+      // All voting modules use the same isActive query, so it's safe to just
+      // use one here.
+      const [isActiveResponse, activeThresholdResponse] = get(
+        waitForAllSettled([
+          DaoVotingCw20StakedSelectors.isActiveSelector({
+            contractAddress: dumpState.voting_module,
+            chainId,
+            params: [],
+          }),
+          DaoVotingCw20StakedSelectors.activeThresholdSelector({
+            contractAddress: dumpState.voting_module,
+            chainId,
+            params: [],
+          }),
+        ])
+      )
+      // Some voting modules don't support the isActive query, so if the query
+      // fails, assume active.
+      const isActive =
+        isActiveResponse.state === 'hasError' ||
+        (isActiveResponse.state === 'hasValue' &&
+          isActiveResponse.contents.active)
+      const activeThreshold =
+        (activeThresholdResponse.state === 'hasValue' &&
+          activeThresholdResponse.contents.active_threshold) ||
+        null
+
       const proposalModules = get(
         daoCoreProposalModulesSelector({
           coreAddress,
@@ -293,6 +320,8 @@ export const daoInfoSelector: (param: {
         description: dumpState.config.description,
         imageUrl: dumpState.config.image_url || null,
         created,
+        isActive,
+        activeThreshold,
         items,
         polytoneProxies,
         parentDao: parentDaoInfo