feat: Vesting & updates for enacted bids (#1630)

* bid vestings * feat: use isProject function and update notification texts * chore: update notification body text --------- Co-authored-by: Andy Espagnolo <[email protected]>
decentraland · Feb 5, 2024 · 64089bb · 64089bb
1 parent 20939c4
commit 64089bb
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 27 deletions.
diff --git a/src/back/routes/proposal.ts b/src/back/routes/proposal.ts
@@ -71,6 +71,7 @@ import {
   isAlreadyACatalyst,
   isAlreadyBannedName,
   isAlreadyPointOfInterest,
+  isProjectProposal,
   isValidName,
   isValidPointOfInterest,
   isValidUpdateProposalStatus,
@@ -538,15 +539,15 @@ export async function updateProposalStatus(req: WithAuth<Request<{ proposal: str
     updated_at: new Date(),
   }
 
+  const isProject = isProjectProposal(proposal.type)
   const isEnactedStatus = update.status === ProposalStatus.Enacted
-  const isGrantProposal = proposal.type === ProposalType.Grant
   if (isEnactedStatus) {
     update.enacted = true
     update.enacted_by = user
-    if (isGrantProposal) {
+    if (isProject) {
       const { vesting_addresses } = configuration
       if (!vesting_addresses || vesting_addresses.length === 0) {
-        throw new RequestError('Vesting addresses are required for grant proposals', RequestError.BadRequest)
+        throw new RequestError('Vesting addresses are required for grant or bid proposals', RequestError.BadRequest)
       }
       if (vesting_addresses.some((address) => !isEthereumAddress(address))) {
         throw new RequestError('Some vesting address is invalid', RequestError.BadRequest)
@@ -571,8 +572,8 @@ export async function updateProposalStatus(req: WithAuth<Request<{ proposal: str
   }
 
   await ProposalModel.update<ProposalAttributes>(update, { id })
-  if (isEnactedStatus && isGrantProposal) {
-    NotificationService.grantProposalEnacted(proposal)
+  if (isEnactedStatus && isProject) {
+    NotificationService.projectProposalEnacted(proposal)
   }
 
   const updatedProposal = await ProposalModel.findOne<ProposalAttributes>({

diff --git a/src/back/services/notification.ts b/src/back/services/notification.ts
@@ -123,7 +123,7 @@ export class NotificationService {
     }
   }
 
-  static grantProposalEnacted(proposal: ProposalAttributes) {
+  static projectProposalEnacted(proposal: ProposalAttributes) {
     inBackground(async () => {
       try {
         const coauthors = await CoauthorService.getAllFromProposalId(proposal.id)
@@ -134,8 +134,8 @@ export class NotificationService {
           throw new Error('Invalid addresses')
         }
 
-        const title = Notifications.GrantEnacted.title
-        const body = Notifications.GrantEnacted.body
+        const title = Notifications.ProjectEnacted.title
+        const body = Notifications.ProjectEnacted.body
 
         const validatedUsers = await UserModel.getActiveDiscordIds(addresses)
         for (const user of validatedUsers) {

diff --git a/src/components/Modal/UpdateProposalStatusModal/UpdateProposalStatusModal.tsx b/src/components/Modal/UpdateProposalStatusModal/UpdateProposalStatusModal.tsx
@@ -12,7 +12,8 @@ import Icon from 'semantic-ui-react/dist/commonjs/elements/Icon'
 import isEthereumAddress from 'validator/lib/isEthereumAddress'
 
 import { Governance } from '../../../clients/Governance'
-import { ProposalAttributes, ProposalStatus, ProposalType } from '../../../entities/Proposal/types'
+import { ProposalAttributes, ProposalStatus } from '../../../entities/Proposal/types'
+import { isProjectProposal } from '../../../entities/Proposal/utils'
 import { validateUniqueAddresses } from '../../../entities/Transparency/utils'
 import useFormatMessage from '../../../hooks/useFormatMessage'
 import Label from '../../Common/Typography/Label'
@@ -86,8 +87,8 @@ export function UpdateProposalStatusModal({
 
   const values = useWatch({ control })
 
-  const isGrantProposal = proposal?.type === ProposalType.Grant
-  const showAddButton = isGrantProposal && !!vesting_addresses && vesting_addresses.length > 0
+  const isProject = isProjectProposal(proposal?.type)
+  const showAddButton = isProject && !!vesting_addresses && vesting_addresses.length > 0
   const hasValues = values.vestingAddresses && values.vestingAddresses.filter((value) => value.length > 0).length > 0
 
   useEffect(() => {
@@ -136,7 +137,7 @@ export function UpdateProposalStatusModal({
           const updateProposal = await Governance.get().updateProposalStatus(
             proposal.id,
             status,
-            isGrantProposal ? filteredVestingContracts : undefined
+            isProject ? filteredVestingContracts : undefined
           )
           onClose()
           return updateProposal
@@ -182,7 +183,7 @@ export function UpdateProposalStatusModal({
             <Markdown size="lg">{t('modal.update_status_proposal.description', { status }) || ''}</Markdown>
           </div>
 
-          {proposal && isGrantProposal && (
+          {proposal && isProject && (
             <div className="ProposalModal__GrantTransaction">
               <Label>{t('modal.update_status_proposal.grant_vesting_addresses')}</Label>
               {values.vestingAddresses?.map((address, idx) => (
@@ -226,7 +227,7 @@ export function UpdateProposalStatusModal({
               type="submit"
               primary
               fluid
-              disabled={isSubmitting || (isGrantProposal && !hasValues)}
+              disabled={isSubmitting || (isProject && !hasValues)}
               loading={loading && isSubmitting}
             >
               {t(getPrimaryButtonTextKey(status, showAddButton))}

diff --git a/src/components/Proposal/ProposalSidebar.tsx b/src/components/Proposal/ProposalSidebar.tsx
@@ -4,7 +4,8 @@ import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext
 import useTrackContext from 'decentraland-gatsby/dist/context/Track/useTrackContext'
 
 import { SegmentEvent } from '../../entities/Events/types'
-import { ProposalAttributes, ProposalStatus, ProposalType } from '../../entities/Proposal/types'
+import { ProposalAttributes, ProposalStatus } from '../../entities/Proposal/types'
+import { isProjectProposal } from '../../entities/Proposal/utils'
 import { SubscriptionAttributes } from '../../entities/Subscription/types'
 import { Survey } from '../../entities/SurveyTopic/types'
 import { UpdateAttributes } from '../../entities/Updates/types'
@@ -112,7 +113,7 @@ export default function ProposalSidebar({
   const showProposalUpdatesActions =
     proposal &&
     isProposalStatusWithUpdates(proposal?.status) &&
-    proposal?.type === ProposalType.Grant &&
+    isProjectProposal(proposal?.type) &&
     (isOwner || isCoauthor)
   const showProposalThresholdsSummary = !!(
     proposal &&

diff --git a/src/components/Proposal/Update/ProposalUpdates.tsx b/src/components/Proposal/Update/ProposalUpdates.tsx
@@ -1,6 +1,5 @@
-import { ProposalAttributes, ProposalType } from '../../../entities/Proposal/types'
+import { ProposalAttributes } from '../../../entities/Proposal/types'
 import { UpdateAttributes } from '../../../entities/Updates/types'
-import { isProposalStatusWithUpdates } from '../../../entities/Updates/utils'
 import useFormatMessage from '../../../hooks/useFormatMessage'
 import Empty from '../../Common/Empty'
 import Megaphone from '../../Icon/Megaphone'
@@ -19,10 +18,7 @@ interface Props {
 export default function ProposalUpdates({ proposal, updates, isCoauthor, onUpdateDeleted }: Props) {
   const t = useFormatMessage()
 
-  const showProposalUpdates =
-    updates && isProposalStatusWithUpdates(proposal?.status) && proposal?.type === ProposalType.Grant
-
-  if (!updates || !proposal || !showProposalUpdates) {
+  if (!updates || !proposal) {
     return null
   }
 

diff --git a/src/entities/Proposal/utils.ts b/src/entities/Proposal/utils.ts
@@ -312,3 +312,7 @@ export function getDisplayedPriorityProposals(
     return showTheProposal
   })
 }
+
+export function isProjectProposal(proposalType?: ProposalType) {
+  return proposalType === ProposalType.Grant || proposalType === ProposalType.Bid
+}
diff --git a/src/pages/proposal.tsx b/src/pages/proposal.tsx
@@ -49,7 +49,11 @@ import ProposalImagesPreview from '../components/Proposal/View/ProposalImagesPre
 import ProposalMarkdown from '../components/Proposal/View/ProposalMarkdown'
 import { OldGrantCategory } from '../entities/Grant/types'
 import { ProposalAttributes, ProposalStatus, ProposalType } from '../entities/Proposal/types'
-import { isBiddingAndTenderingProposal, isGovernanceProcessProposal } from '../entities/Proposal/utils'
+import {
+  isBiddingAndTenderingProposal,
+  isGovernanceProcessProposal,
+  isProjectProposal,
+} from '../entities/Proposal/utils'
 import { Survey } from '../entities/SurveyTopic/types'
 import { SurveyEncoder } from '../entities/SurveyTopic/utils'
 import { isProposalStatusWithUpdates } from '../entities/Updates/utils'
@@ -165,7 +169,7 @@ export default function ProposalPage() {
 
   const { publicUpdates, pendingUpdates, nextUpdate, currentUpdate, refetchUpdates } = useProposalUpdates(proposal?.id)
   const showProposalUpdates =
-    publicUpdates && isProposalStatusWithUpdates(proposal?.status) && proposal?.type === ProposalType.Grant
+    publicUpdates && isProposalStatusWithUpdates(proposal?.status) && isProjectProposal(proposal?.type)
 
   const { surveyTopics, isLoadingSurveyTopics, voteWithSurvey, showSurveyResults } = useSurvey(
     proposal,

diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
@@ -36,8 +36,8 @@ export const Notifications = {
     title: 'Co-author Request Received',
     body: "You've been invited to collaborate as a co-author on a published proposal. Accept it or reject it here",
   },
-  GrantEnacted: {
-    title: 'Grant Proposal Enacted',
-    body: 'Congratulations! Your Grant Proposal has been successfully enacted and a Vesting Contract was added',
+  ProjectEnacted: {
+    title: 'Your Project has been funded',
+    body: 'Congratulations! Your Project has been successfully enacted and a funding Vesting Contract was created',
   },
 }