diff --git a/src/modules/creator/index.tsx b/src/modules/creator/index.tsx index af13181e..3fd579f0 100644 --- a/src/modules/creator/index.tsx +++ b/src/modules/creator/index.tsx @@ -41,6 +41,7 @@ const StepContentContainer = styled(Grid)({ const StyledStepper = styled(Stepper)({ "background": "inherit", + "paddingTop": 48, "& .MuiStepLabel-label": { fontSize: 14, lineHeight: 14 @@ -176,7 +177,7 @@ export const DAOCreate: React.FC = () => { - {step < 5 && } + {step < 4 && } diff --git a/src/modules/creator/state/context.tsx b/src/modules/creator/state/context.tsx index 69b3b0d6..c303e679 100644 --- a/src/modules/creator/state/context.tsx +++ b/src/modules/creator/state/context.tsx @@ -11,7 +11,7 @@ const deploymentStatus = { const LOCAL_STORAGE_KEY = "creatorParams" export const INITIAL_MIGRATION_STATE: MigrationParams = { - template: "", + template: "lambda", orgSettings: { name: "", symbol: "", diff --git a/src/modules/creator/steps/DaoSettings.tsx b/src/modules/creator/steps/DaoSettings.tsx index fe3bf71c..a79740a9 100644 --- a/src/modules/creator/steps/DaoSettings.tsx +++ b/src/modules/creator/steps/DaoSettings.tsx @@ -86,20 +86,23 @@ const MetadataContainer = styled(Grid)({ }) const CustomTextarea = styled(withTheme(TextareaAutosize))(props => ({ - minHeight: 152, - boxSizing: "border-box", - width: "100%", - marginTop: 14, - fontWeight: 300, - padding: "21px 20px", - fontFamily: "system-ui", - border: "none", - fontSize: 16, - color: props.theme.palette.text.secondary, - background: "#2F3438", - borderRadius: 8, - paddingRight: 40, - wordBreak: "break-word" + "minHeight": 152, + "boxSizing": "border-box", + "width": "100%", + "marginTop": 14, + "fontWeight": 300, + "padding": "21px 20px", + "fontFamily": "system-ui", + "border": "none", + "fontSize": 16, + "color": props.theme.palette.text.secondary, + "background": "#2F3438", + "borderRadius": 8, + "paddingRight": 40, + "wordBreak": "break-word", + "&:focus-visible": { + outline: "none" + } })) const ErrorText = styled(Typography)({ @@ -120,10 +123,12 @@ const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors, useEffect(() => { if (tokenMetadata) { setFieldValue("governanceToken.tokenMetadata", tokenMetadata) + setFieldValue("symbol", tokenMetadata.symbol) } if (error) { setFieldValue("governanceToken.tokenMetadata", undefined) + setFieldValue("symbol", undefined) } }, [error, setFieldValue, tokenMetadata]) @@ -140,10 +145,6 @@ const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors, submitForm(values) }, text: "Continue" - }, - back: { - handler: () => history.push(`templates`), - text: "Back" } }) } @@ -167,15 +168,15 @@ const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors, inputProps={{ maxLength: 36 }} - InputProps={{ - endAdornment: ( - - - - - - ) - }} + // InputProps={{ + // endAdornment: ( + // + // + // + // + // + // ) + // }} /> {errors.governanceToken?.address && touched.governanceToken?.address ? ( @@ -193,15 +194,15 @@ const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors, placeholder="0" name="governanceToken.tokenId" component={CustomFormikTextField} - InputProps={{ - endAdornment: ( - - - - - - ) - }} + // InputProps={{ + // endAdornment: ( + // + // + // + // + // + // ) + // }} /> {errors.governanceToken?.tokenId && touched.governanceToken?.tokenId ? ( @@ -216,7 +217,7 @@ const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors, )} - + {" "} DAO Name{" "} @@ -228,21 +229,21 @@ const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors, type="text" placeholder="My Group’s Token" component={CustomFormikTextField} - InputProps={{ - endAdornment: ( - - - - - - ) - }} + // InputProps={{ + // endAdornment: ( + // + // + // + // + // + // ) + // }} > {errors.name && touched.name ? {errors.name} : null} - + {/* {" "} Token Symbol{" "} @@ -269,7 +270,7 @@ const DaoSettingsForm = withRouter(({ submitForm, values, setFieldValue, errors, > {errors.symbol && touched.symbol ? {errors.symbol} : null} - + */} diff --git a/src/modules/creator/steps/index.tsx b/src/modules/creator/steps/index.tsx index 901db6a3..2e0c3e20 100644 --- a/src/modules/creator/steps/index.tsx +++ b/src/modules/creator/steps/index.tsx @@ -11,20 +11,18 @@ import mixpanel from "mixpanel-browser" import { Template } from "./Template" export const STEPS: StepInfo[] = [ - { title: "Select Template", index: 0 }, - { title: "Configure DAO settings", index: 1 }, - { title: "Configure Proposal & Voting", index: 2 }, - { title: "Adjust Quorum", index: 3 }, - { title: "Review information", index: 4 } + { title: "Configure DAO settings", index: 0 }, + { title: "Configure Proposal & Voting", index: 1 }, + { title: "Adjust Quorum", index: 2 }, + { title: "Review information", index: 3 } ] const urlToStepMap: Record = { - template: 0, - dao: 1, - voting: 2, - quorum: 3, - summary: 4, - review: 5 + dao: 0, + voting: 1, + quorum: 2, + summary: 3, + review: 4 } const AnalyticsWrappedStep: React.FC<{ name: string; index: number }> = ({ name, index, children }) => { @@ -44,37 +42,37 @@ export const StepRouter: React.FC = () => { return ( - + {/*