Merge pull request #663 from dOrgTech/develop

Merge Develop to Master

Author: Man-Jain

package.json

@@ -37,6 +37,7 @@
     "@types/mixpanel-browser": "^2.35.7",
     "@types/prismjs": "^1.26.0",
     "@types/react-router-hash-link": "^2.4.5",
+    "@types/valid-url": "^1.0.4",
     "assert": "^2.0.0",
     "bignumber.js": "^9.0.1",
     "blockies-ts": "^1.0.0",
@@ -77,6 +78,7 @@
     "stream-http": "^3.2.0",
     "url": "^0.11.0",
     "util": "^0.12.5",
+    "valid-url": "^1.0.9",
     "yup": "^0.32.9"
   },
   "devDependencies": {
@@ -131,4 +133,4 @@
       "yarn lint:check"
     ]
   }
-}
+}

src/models/Community.ts

@@ -14,6 +14,7 @@ export interface Community {
   allowPublicAccess: boolean
   decimals?: string
   network: string
+  votingAddressesCount: number
 }
 
 export interface CommunityToken {
@@ -23,4 +24,5 @@ export interface CommunityToken {
   symbol: string
   tokenAddress: string
   decimals: string
+  message?: string
 }

src/modules/common/SmallButton.tsx

@@ -7,6 +7,8 @@ export const SmallButton = styled(Button)({
   "transition": ".15s ease-out",
   "textTransform": "capitalize",
   "borderRadius": 8,
+  "backgroundColor": "#81feb7 !important",
+  "color": "#1c1f23",
 
   "&$disabled": {
     boxShadow: "none"

src/modules/creator/deployment/index.tsx

@@ -76,7 +76,7 @@ const ProgressContainer = styled(Grid)(({ theme }) => ({
   background: "#2F3438",
   display: "grid",
   borderRadius: 8,
-  maxHeight: 410,
+  maxHeight: 460,
   paddingTop: 20,
   position: "sticky",
   top: 125
@@ -92,6 +92,21 @@ const StyledStepper = styled(Stepper)({
   "cursor": "pointer"
 })
 
+const FAQClickToAction = styled(Typography)(({ theme }) => ({
+  color: theme.palette.secondary.main,
+  fontSize: "14px",
+  cursor: "pointer",
+  textAlign: "center",
+  textDecoration: "underline"
+}))
+
+const FAQClickText = styled(Typography)(({ theme }) => ({
+  color: theme.palette.secondary.main,
+  fontSize: "14px",
+  cursor: "pointer",
+  textAlign: "center"
+}))
+
 export const Deployment: React.FC = () => {
   const creator = useContext(DeploymentContext)
 
@@ -102,7 +117,11 @@ export const Deployment: React.FC = () => {
 
   const history = useHistory()
   const step = useDeploymentStepNumber()
-  const progress = useMemo(() => step * 50, [step])
+  const progress = useMemo(() => step * 45, [step])
+
+  const goToFAQ = (): void => {
+    history.push("/faq")
+  }
 
   return (
     <PageContainer container direction="row">
@@ -120,10 +139,15 @@ export const Deployment: React.FC = () => {
                 trackStrokeColor={"rgba(255, 255, 255, 0.2)"}
               >
                 <Box className="indicator">
-                  <IndicatorValue>{progress === 0.5 ? 0 : step * 50}%</IndicatorValue>
+                  <IndicatorValue>{progress === 0.5 ? 0 : step * 45}%</IndicatorValue>
                 </Box>
               </ProgressBar>
 
+              <Box onClick={goToFAQ}>
+                <FAQClickText>New to DAOs?</FAQClickText>
+                <FAQClickToAction> Read our FAQ </FAQClickToAction>
+              </Box>
+
               <StyledStepper activeStep={step} orientation="vertical">
                 {STEPS.map(({ title, path }: StepInfo, index: number) => (
                   <Step key={title}>

src/modules/creator/deployment/steps/Config.tsx

@@ -27,7 +27,7 @@ const CustomTextarea = styled(withTheme(TextareaAutosize))(props => ({
   "boxSizing": "border-box",
   "width": "100%",
   "marginTop": 14,
-  "fontWeight": 400,
+  "fontWeight": 300,
   "padding": "21px 20px",
   "fontFamily": "Roboto Mono",
   "border": "none",
@@ -66,19 +66,24 @@ const CustomFormikTextField = withStyles({
 })(FormikTextField)
 
 const CustomInputContainer = styled(Grid)(({ theme }) => ({
-  height: 54,
-  boxSizing: "border-box",
-  marginTop: 14,
-  background: "#2F3438",
-  borderRadius: 8,
-  alignItems: "center",
-  display: "flex",
-  padding: "13px 23px"
+  "height": 54,
+  "boxSizing": "border-box",
+  "marginTop": 14,
+  "background": "#2F3438",
+  "borderRadius": 8,
+  "alignItems": "center",
+  "display": "flex",
+  "padding": "13px 23px",
+  "fontWeight": 300,
+  "& input::placeholder": {
+    fontWeight: 300
+  }
 }))
 
 const ErrorText = styled(Typography)({
   fontSize: 14,
-  color: "red"
+  color: "red",
+  marginTop: 4
 })
 
 const TextareaContainer = styled(Grid)({
@@ -116,6 +121,8 @@ const TokenSettingsForm = ({ submitForm, values, errors, touched, setFieldValue,
   const { dispatch } = useContext(DeploymentContext)
   const match = useRouteMatch()
   const history = useHistory()
+  const theme = useTheme()
+  const isMobileSmall = useMediaQuery(theme.breakpoints.down("sm"))
 
   useEffect(() => {
     if (values) {
@@ -126,6 +133,10 @@ const TokenSettingsForm = ({ submitForm, values, errors, touched, setFieldValue,
             submitForm(values)
           },
           text: "Continue"
+        },
+        back: {
+          text: "Back",
+          handler: () => history.push("/creator/ownership")
         }
       })
     }
@@ -137,10 +148,10 @@ const TokenSettingsForm = ({ submitForm, values, errors, touched, setFieldValue,
         <Grid item xs={12}>
           <Typography variant="subtitle1" color="textSecondary">
             {" "}
-            Contract name{" "}
+            Contract Name{" "}
           </Typography>
           <CustomInputContainer>
-            <Field id="outlined-basic" placeholder="Contract name" name="name" component={CustomFormikTextField} />
+            <Field id="outlined-basic" placeholder="Contract Name" name="name" component={CustomFormikTextField} />
           </CustomInputContainer>
           {errors.name && touched.name ? <ErrorText>{errors.name}</ErrorText> : null}
         </Grid>
@@ -157,7 +168,7 @@ const TokenSettingsForm = ({ submitForm, values, errors, touched, setFieldValue,
                 <CustomTextarea
                   maxLength={1500}
                   aria-label="empty textarea"
-                  placeholder="Description"
+                  placeholder="Type a description"
                   value={getIn(values, "description")}
                   onChange={(newValue: any) => {
                     setFieldValue("description", newValue.target.value)
@@ -178,15 +189,15 @@ const TokenSettingsForm = ({ submitForm, values, errors, touched, setFieldValue,
               <Field
                 id="outlined-basic"
                 type="number"
-                placeholder="Supply"
+                placeholder="0"
                 name="totalSupply"
                 component={CustomFormikTextField}
                 onKeyDown={(e: FieldChange) => handleNegativeInput(e)}
               />
             </CustomInputContainer>
             {errors.totalSupply && touched.totalSupply ? <ErrorText>{errors.totalSupply}</ErrorText> : null}
           </Grid>
-          <Grid item xs={6}>
+          <Grid item xs={isMobileSmall ? 6 : 3}>
             <Typography variant="subtitle1" color="textSecondary">
               {" "}
               Decimals{" "}
@@ -195,7 +206,7 @@ const TokenSettingsForm = ({ submitForm, values, errors, touched, setFieldValue,
               <Field
                 id="outlined-basic"
                 type="number"
-                placeholder="Decimals"
+                placeholder="0"
                 name="decimals"
                 component={CustomFormikTextField}
                 onKeyDown={(e: FieldChange) => handleChange(e)}
@@ -209,21 +220,21 @@ const TokenSettingsForm = ({ submitForm, values, errors, touched, setFieldValue,
           <Grid item xs={6}>
             <Typography variant="subtitle1" color="textSecondary">
               {" "}
-              Symbol{" "}
+              Icon{" "}
             </Typography>
             <CustomInputContainer>
-              <Field id="outlined-basic" placeholder="Symbol" name="symbol" component={CustomFormikTextField} />
+              <Field id="outlined-basic" placeholder="URL" name="icon" component={CustomFormikTextField} />
             </CustomInputContainer>
-            {errors.symbol && touched.symbol ? <ErrorText>{errors.symbol}</ErrorText> : null}
           </Grid>
-          <Grid item xs={6}>
+          <Grid item xs={isMobileSmall ? 6 : 3}>
             <Typography variant="subtitle1" color="textSecondary">
               {" "}
-              Icon{" "}
+              Symbol{" "}
             </Typography>
             <CustomInputContainer>
-              <Field id="outlined-basic" placeholder="Icon" name="icon" component={CustomFormikTextField} />
+              <Field id="outlined-basic" placeholder="TEZ" name="symbol" component={CustomFormikTextField} />
             </CustomInputContainer>
+            {errors.symbol && touched.symbol ? <ErrorText>{errors.symbol}</ErrorText> : null}
           </Grid>
         </Grid>
       </Grid>
@@ -252,7 +263,9 @@ export const ConfigContract: React.FC = () => {
     <>
       <Grid container direction="column">
         <Grid>
-          <TitleBlock title="Configure token contract" description={""}></TitleBlock>
+          <Typography style={{ marginBottom: 32 }} variant="h5" color="textSecondary">
+            Configure Token Contract
+          </Typography>
         </Grid>
 
         <Formik