Proposals UI update

src/models/Choice.ts

@@ -0,0 +1,12 @@
+export interface Choice {
+  _id?: string
+  name: string
+  pollID: string
+  walletAddresses: WalletAddress[]
+  selected?: boolean
+}
+
+export interface WalletAddress {
+  address: string
+  balanceAtReferenceBlock: string
+}

src/models/Community.ts

@@ -0,0 +1,26 @@
+export interface Community {
+  _id?: string
+  name: string
+  description: string
+  linkToTerms: string
+  members: string[]
+  tokenAddress: string
+  polls: string[]
+  tokenType?: string
+  symbol: string
+  tokenID: string
+  picUri: string
+  requiredTokenOwnership: boolean
+  allowPublicAccess: boolean
+  decimals?: string
+  network: string
+}
+
+export interface CommunityToken {
+  _id?: string
+  daoID: string
+  tokenID: number
+  symbol: string
+  tokenAddress: string
+  decimals: string
+}

src/models/Polls.ts

@@ -0,0 +1,32 @@
+export enum ProposalStatus {
+  ACTIVE = "active",
+  CLOSED = "closed"
+}
+export interface Poll {
+  _id?: string
+  daoID: string
+  description: string
+  name: string
+  referenceBlock?: string
+  startTime: string
+  endTime: string
+  totalSupplyAtReferenceBlock?: any
+  choices: string[]
+  externalLink: ""
+  author: string
+  isActive?: ProposalStatus
+  timeFormatted?: string
+  tokenSymbol?: string
+  tokenAddress?: string
+  tokenDecimals?: string
+  votes?: Vote[]
+  votingStrategy: number
+  endTimeMinutes?: number | null
+  endTimeHours?: number | null
+  endTimeDays?: number | null
+}
+
+export interface Vote {
+  address: string
+  balanceAtReferenceBlock: string
+}

src/models/Proposal.ts

@@ -0,0 +1,15 @@
+export interface Proposal {
+  id?: string
+  title: string
+  description: string
+  externalLink: string
+  choices: string[]
+  startTime: number
+  endTime: number
+  daoID: string
+}
+
+interface Choice {
+  index: number
+  description: string
+}

src/modules/explorer/components/AllProposalsList.tsx

@@ -1,20 +1,23 @@
-import { Collapse, Grid, IconButton, Typography } from "@material-ui/core"
+import { Collapse, Grid, Theme, Typography } from "@material-ui/core"
 import { styled } from "@material-ui/styles"
 import { ProposalItem } from "modules/explorer/pages/User"
-import React, { useCallback, useEffect, useMemo, useState } from "react"
+import React, { useCallback, useEffect, useState } from "react"
 import { Link } from "react-router-dom"
-import { Proposal, ProposalStatus } from "services/indexer/dao/mappers/proposal/types"
+import { Proposal } from "services/indexer/dao/mappers/proposal/types"
 import { ContentContainer } from "./ContentContainer"
-import { Dropdown } from "./Dropdown"
+import { ProposalFilter } from "./ProposalsFilter"
 
 const TableContainer = styled(ContentContainer)({
   width: "100%"
 })
 
-const TableHeader = styled(Grid)({
+const TableHeader = styled(Grid)(({ theme }: { theme: Theme }) => ({
   padding: "16px 46px",
-  minHeight: 34
-})
+  minHeight: 34,
+  [theme.breakpoints.down("sm")]: {
+    gap: 10
+  }
+}))
 
 const ProposalsFooter = styled(Grid)({
   padding: "16px 46px",
@@ -32,13 +35,13 @@ interface Props {
 
 export const AllProposalsList: React.FC<Props> = ({ currentLevel, proposals, title, showFooter, rightItem }) => {
   const [filteredProposal, setFilteredProposals] = useState(proposals)
-  const [filter, setFilter] = useState("All")
+  const [filter, setFilter] = useState("all")
 
   const filterProposals = useCallback(
     (status?: any) => {
-      if (status === "All") {
+      if (status === "all") {
         return setFilteredProposals(proposals)
-      } else if (status !== "All" && status !== undefined) {
+      } else if (status !== "all" && status !== undefined) {
         const filtered = proposals.filter(proposal => proposal["cachedStatus"]?.status === status)
         setFilteredProposals(filtered)
       } else {
@@ -66,32 +69,11 @@ export const AllProposalsList: React.FC<Props> = ({ currentLevel, proposals, tit
       <Grid container direction="column" wrap={"nowrap"}>
         <TableHeader item container justifyContent="space-between" alignItems="center">
           <Grid item>
-            <Typography variant="body2" style={{ fontWeight: "500" }} color="textPrimary">
+            <Typography variant="body1" style={{ fontWeight: "500" }} color="textPrimary">
               {title}
             </Typography>
           </Grid>
-          {proposals.length ? (
-            <Grid item>
-              <IconButton aria-label="expand row" size="small">
-                <Dropdown
-                  options={[
-                    { name: "All", value: "All" },
-                    { name: ProposalStatus.ACTIVE, value: ProposalStatus.ACTIVE },
-                    { name: ProposalStatus.DROPPED, value: ProposalStatus.DROPPED },
-                    { name: ProposalStatus.EXECUTABLE, value: ProposalStatus.EXECUTABLE },
-                    { name: ProposalStatus.EXECUTED, value: ProposalStatus.EXECUTED },
-                    { name: ProposalStatus.EXPIRED, value: ProposalStatus.EXPIRED },
-                    { name: ProposalStatus.NO_QUORUM, value: ProposalStatus.NO_QUORUM },
-                    { name: ProposalStatus.PASSED, value: ProposalStatus.PASSED },
-                    { name: ProposalStatus.PENDING, value: ProposalStatus.PENDING },
-                    { name: ProposalStatus.REJECTED, value: ProposalStatus.REJECTED }
-                  ]}
-                  value={"All"}
-                  onSelected={filterProposalByStatus}
-                />{" "}
-              </IconButton>
-            </Grid>
-          ) : null}
+          {proposals.length ? <ProposalFilter filterProposalByStatus={filterProposalByStatus} /> : null}
         </TableHeader>
         {filteredProposal.length ? (
           <Grid

src/modules/explorer/components/ConfigProposalFormLambda.tsx

@@ -87,7 +87,7 @@ enum LambdaProposalState {
 const codeEditorPlaceholder = {
   addLambda: `Write Michelson Code for Lambda's Implementation
 
-Eg:- 
+Eg:-
 
 (Left (Left (Pair (Pair { DROP ;
     NIL operation ;
@@ -102,7 +102,7 @@ Eg:-
   `,
   lambdaExecuteArgumentsCode: `Write Michelson Code for the input Paramerers of your Lambda
 
-Eg:- 
+Eg:-
 
 {
   "prim": "pair",
@@ -127,7 +127,7 @@ Eg:-
 `,
   lambdaExecuteParams: `Enter the values for the given params in a JSON/JavaScript Object format.
 
-Eg:- 
+Eg:-
 
 {
   xtz_transfer_type: {
@@ -352,7 +352,7 @@ export const ProposalFormLambda: React.FC<Props> = ({ open, handleClose, action
         open={open}
         onClose={handleClose}
         title={ProposalAction[action] + " Lambda Proposal"}
-        template="lambda"
+        template="md"
       >
         {state === LambdaProposalState.write_action ? (
           <>

src/modules/explorer/components/NavigationMenu.tsx

@@ -133,12 +133,6 @@ const getPages = (daoId: string): Page[] => [
     name: "User",
     icon: UserIcon,
     href: `/explorer/dao/${daoId}/user`
-  },
-  {
-    pathId: "config",
-    name: "Config",
-    icon: ConfigIcon,
-    href: `/explorer/dao/${daoId}/config`
   }
 ]