Show the current council budget

Joystream · Apr 2, 2024 · c4bda5c · c4bda5c
1 parent bf2060b
commit c4bda5c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/packages/ui/src/app/pages/Proposals/CurrentProposals.stories.tsx b/packages/ui/src/app/pages/Proposals/CurrentProposals.stories.tsx
@@ -1553,7 +1553,7 @@ export const SpecificParametersDecreaseCouncilBudget: Story = {
       const nextButton = getButtonByText(modal, 'Create proposal')
       expect(nextButton).toBeDisabled()
 
-      const amountField = await modal.findByLabelText('Amount')
+      const amountField = await modal.findByLabelText('Decrease budget by')
 
       // Invalid price set to 0
       await userEvent.type(amountField, '0')

diff --git a/packages/ui/src/mocks/data/proposals.ts b/packages/ui/src/mocks/data/proposals.ts
@@ -93,9 +93,7 @@ const proposalDetails: Record<ProposalDetailsType, RecursivePartial<ProposalWith
   UpdateWorkingGroupBudgetProposalDetails: { amount: joy(200), group: workingGroup },
   VetoProposalDetails: { proposal: { __typename: 'Proposal', id: '0', title: random.words(4) } },
   UpdateGlobalNftLimitProposalDetails: {},
-  DecreaseCouncilBudgetProposalDetails: {
-    amount: joy(1_000_000),
-  },
+  DecreaseCouncilBudgetProposalDetails: { amount: joy(100) },
 }
 
 export const proposalDetailsMap = mapValues(proposalDetails, (value, key) => {

diff --git a/packages/ui/src/proposals/components/ProposalDetails/ProposalDetails.tsx b/packages/ui/src/proposals/components/ProposalDetails/ProposalDetails.tsx
@@ -89,7 +89,7 @@ export const ProposalDetails = ({ proposalDetails, gracePeriod, exactExecutionBl
       ] as RenderNode[]
     }
 
-    if (proposalDetails?.type === 'fundingRequest') {
+    if (proposalDetails?.type === 'fundingRequest' || proposalDetails?.type === 'decreaseCouncilBudget') {
       return [
         {
           renderType: 'Amount',

diff --git a/packages/ui/src/proposals/helpers/getDetailsRenderStructure.ts b/packages/ui/src/proposals/helpers/getDetailsRenderStructure.ts
@@ -226,6 +226,7 @@ const amountMapper =
     const overriddenLabelsBy: Partial<Record<ProposalType, string>> = {
       decreaseWorkingGroupLeadStake: 'Decrease stake amount',
       slashWorkingGroupLead: 'Slashing amount',
+      decreaseCouncilBudget: 'Decrease budget by',
     }
     return [
       {

diff --git a/...c/proposals/modals/AddNewProposal/components/SpecificParameters/DecreaseCouncilBudget.tsx b/...c/proposals/modals/AddNewProposal/components/SpecificParameters/DecreaseCouncilBudget.tsx
@@ -1,24 +1,37 @@
 import React from 'react'
 
+import { useApi } from '@/api/hooks/useApi'
 import { CurrencyName } from '@/app/constants/currency'
 import { TokenInput, TokenInputComponent } from '@/common/components/forms'
 import { Row } from '@/common/components/Modal'
 import { RowGapBlock } from '@/common/components/page/PageContent'
-import { TextMedium } from '@/common/components/typography'
+import { TextMedium, TokenValue } from '@/common/components/typography'
+import { useFirstObservableValue } from '@/common/hooks/useFirstObservableValue'
 
 export const DecreaseCouncilBudget = () => {
+  const { api } = useApi()
+  const current = useFirstObservableValue(() => api?.query.council.budget(), [api?.isConnected])
+
   return (
     <RowGapBlock gap={24}>
       <Row>
         <RowGapBlock gap={8}>
           <h4>Specific parameters</h4>
-          <TextMedium lighter>Decrease Council Budget</TextMedium>
+          <TextMedium lighter>
+            Decrease Council Budget.
+            {current && (
+              <>
+                {' '}
+                The current budget is <TokenValue value={current} />.
+              </>
+            )}
+          </TextMedium>
         </RowGapBlock>
       </Row>
       <Row>
         <RowGapBlock gap={20}>
           <TokenInputComponent
-            label="Amount"
+            label="Decrease budget by"
             tight
             units={CurrencyName.integerValue}
             required