diff --git a/components/NewRealmWizard/PageTemplate.tsx b/components/NewRealmWizard/PageTemplate.tsx index 1be63a52ac..966ad50be1 100644 --- a/components/NewRealmWizard/PageTemplate.tsx +++ b/components/NewRealmWizard/PageTemplate.tsx @@ -1,7 +1,6 @@ -import { useEffect } from 'react' +import { useEffect, useState } from 'react' import { useRouter } from 'next/router' -import useLocalStorageState from '@hooks/useLocalStorageState' import { isWizardValid } from '@utils/formValidation' import CreateDAOWizard from '@components/NewRealmWizard/CreateDAOWizard' @@ -19,28 +18,18 @@ export const Section = ({ children }) => { export default function FormPage({ type, - ssFormKey, steps, handleSubmit, submissionPending, }) { const { connected, current: wallet } = useWalletStore((s) => s) const userAddress = wallet?.publicKey?.toBase58() - const [formData, setFormData] = useLocalStorageState(ssFormKey, { + const [formData, setFormData] = useState({ memberAddresses: userAddress ? [userAddress] : undefined, }) const { query, push } = useRouter() const currentStep = formData?.currentStep || 0 - useEffect(() => { - window.addEventListener('beforeunload', promptUserBeforeLeaving) - window.addEventListener('unload', purgeFormData) - return () => { - window.removeEventListener('beforeunload', promptUserBeforeLeaving) - window.removeEventListener('unload', purgeFormData) - } - }, []) - useEffect(() => { async function tryToConnect() { try { @@ -64,17 +53,6 @@ export default function FormPage({ } }, [currentStep]) - function promptUserBeforeLeaving(ev) { - ev.preventDefault() - if (formData) { - ev.returnValue = true - } - } - - function purgeFormData() { - setFormData({}) - } - function handleNextButtonClick({ step: fromStep, data }) { const updatedFormState = { ...formData, @@ -109,7 +87,6 @@ export default function FormPage({ ) if (fromStep === 0) { - purgeFormData() push( { pathname: '/realms/new/', diff --git a/components/NewRealmWizard/components/steps/InviteMembersForm.tsx b/components/NewRealmWizard/components/steps/InviteMembersForm.tsx index 93405a393c..38f378a2bf 100644 --- a/components/NewRealmWizard/components/steps/InviteMembersForm.tsx +++ b/components/NewRealmWizard/components/steps/InviteMembersForm.tsx @@ -4,6 +4,7 @@ import { yupResolver } from '@hookform/resolvers/yup' import * as yup from 'yup' import clsx from 'clsx' +import useWalletStore from 'stores/useWalletStore' import FormHeader from '@components/NewRealmWizard/components/FormHeader' import FormField from '@components/NewRealmWizard/components/FormField' import FormFooter from '@components/NewRealmWizard/components/FormFooter' @@ -124,6 +125,8 @@ export default function InviteMembersForm({ currentStep, totalSteps, }) { + const { current } = useWalletStore((s) => s) + const userAddress = current?.publicKey?.toBase58() const inputElement = useRef(null) const [inviteList, setInviteList] = useState([]) const [invalidAddresses, setInvalidAddresses] = useState([]) @@ -249,6 +252,7 @@ export default function InviteMembersForm({ removeAddressFromInviteList(address)} /> diff --git a/pages/realms/new/multisig/index.tsx b/pages/realms/new/multisig/index.tsx index d3f1495062..4d9984d730 100644 --- a/pages/realms/new/multisig/index.tsx +++ b/pages/realms/new/multisig/index.tsx @@ -103,7 +103,6 @@ export default function MultiSigWizard() { return (