@@ -23,7 +23,7 @@ import {
2323 CustomTextarea
2424} from "components/ui/DaoCreator"
2525import { StyledTextField } from "components/ui"
26- import React from "react"
26+ import React , { useEffect } from "react"
2727import { StyledRadio } from "components/ui"
2828
2929import { ErrorText } from "modules/creator/token/ui"
@@ -127,9 +127,21 @@ export const EvmDaoBasics: React.FC<EvmDaoBasicsProps> = () => {
127127 tokenDeploymentMechanism : daoData ?. tokenDeploymentMechanism || "new" ,
128128 underlyingTokenAddress : daoData ?. underlyingTokenAddress || "" ,
129129 wrappedTokenSymbol : daoData ?. wrappedTokenSymbol || "" ,
130- governanceToken : daoData ?. governanceToken || { address : "" , symbol : "" , tokenDecimals : 18 , tokenSymbol : "" }
130+ governanceToken : daoData ?. governanceToken
131+ ? {
132+ ...daoData . governanceToken ,
133+ tokenDecimals : 18
134+ }
135+ : { address : "" , symbol : "" , tokenDecimals : 18 , tokenSymbol : "" }
131136 }
132137
138+ // Fixes existing Zustand Cache Store
139+ useEffect ( ( ) => {
140+ if ( daoData ?. governanceToken ?. tokenDecimals !== 18 ) {
141+ setFieldValue ( "governanceToken.tokenDecimals" , 18 )
142+ }
143+ } , [ daoData ?. tokenDeploymentMechanism , daoData ?. governanceToken ?. tokenDecimals , setFieldValue ] )
144+
133145 return (
134146 < Box >
135147 < TitleBlock
@@ -276,7 +288,11 @@ export const EvmDaoBasics: React.FC<EvmDaoBasicsProps> = () => {
276288 < StyledTextField
277289 name = "governanceToken.tokenDecimals"
278290 type = "number"
279- value = { values . governanceToken ?. tokenDecimals || 18 }
291+ value = {
292+ values . tokenDeploymentMechanism === "new"
293+ ? 18
294+ : values . governanceToken ?. tokenDecimals || 18
295+ }
280296 disabled
281297 InputProps = { {
282298 endAdornment : (
0 commit comments