From 2c3602cdfa79218095bfce9fd9d4e2fa3caf1df0 Mon Sep 17 00:00:00 2001
From: Luke Vella <me@lukevella.com>
Date: Mon, 18 Sep 2023 16:06:13 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Clear=20session=20store=20when?=
 =?UTF-8?q?=20leaving=20new=20page=20(#871)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/components/create-poll.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/create-poll.tsx b/apps/web/src/components/create-poll.tsx
index 4dd612f7e..3183e014a 100644
--- a/apps/web/src/components/create-poll.tsx
+++ b/apps/web/src/components/create-poll.tsx
@@ -12,6 +12,7 @@ import { useRouter } from "next/router";
 import React from "react";
 import { useForm } from "react-hook-form";
 import useFormPersist from "react-hook-form-persist";
+import { useUnmount } from "react-use";
 
 import { PollSettingsForm } from "@/components/forms/poll-settings";
 import { Trans } from "@/components/trans";
@@ -51,11 +52,13 @@ export const CreatePoll: React.FunctionComponent = () => {
     },
   });
 
-  useFormPersist("new-poll", {
+  const { clear } = useFormPersist("new-poll", {
     watch: form.watch,
     setValue: form.setValue,
   });
 
+  useUnmount(clear);
+
   const posthog = usePostHog();
   const queryClient = trpc.useContext();
   const createPoll = trpc.polls.create.useMutation();
@@ -90,7 +93,7 @@ export const CreatePoll: React.FunctionComponent = () => {
                   optionsView: formData?.view,
                 });
                 queryClient.polls.list.invalidate();
-                router.replace(`/poll/${res.id}`);
+                router.push(`/poll/${res.id}`);
               },
             },
           );