Merge branch 'develop' into zcash-milestones

# Conflicts:
#	frontend/client/modules/create/utils.ts

backend/grant/utils/enums.py

@@ -43,7 +43,6 @@ ProposalStage = ProposalStageEnum()
 
 
 class CategoryEnum(CustomEnum):
-    DAPP = 'DAPP'
     DEV_TOOL = 'DEV_TOOL'
     CORE_DEV = 'CORE_DEV'
     COMMUNITY = 'COMMUNITY'

frontend/client/api/constants.ts

@@ -9,7 +9,6 @@ export const SORT_LABELS: { [key in PROPOSAL_SORT]: string } = {
 };
 
 export enum PROPOSAL_CATEGORY {
-  DAPP = 'DAPP',
   DEV_TOOL = 'DEV_TOOL',
   CORE_DEV = 'CORE_DEV',
   COMMUNITY = 'COMMUNITY',
@@ -24,11 +23,6 @@ interface CategoryUI {
 }
 
 export const CATEGORY_UI: { [key in PROPOSAL_CATEGORY]: CategoryUI } = {
-  DAPP: {
-    label: 'DApp',
-    color: '#8e44ad',
-    icon: 'appstore',
-  },
   DEV_TOOL: {
     label: 'Developer tool',
     color: '#2c3e50',

frontend/client/modules/create/utils.ts

@@ -199,7 +199,7 @@ export function makeProposalPreviewFromDraft(draft: ProposalDraft): ProposalDeta
     contributionMatching: 0,
     percentFunded: 0,
     stage: PROPOSAL_STAGE.PREVIEW,
-    category: draft.category || PROPOSAL_CATEGORY.DAPP,
+    category: draft.category || PROPOSAL_CATEGORY.CORE_DEV,
     isStaked: true,
     arbiter: {
       status: PROPOSAL_ARBITER_STATUS.ACCEPTED,