From e43864e6a9198f214ff5a65eb5243071f13ca208 Mon Sep 17 00:00:00 2001
From: Luke Vella <me@lukevella.com>
Date: Thu, 6 Jul 2023 10:48:03 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20client=20error=20being=20t?=
 =?UTF-8?q?hrown=20(#725)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/package.json                                    | 2 +-
 apps/web/src/components/layouts/poll-layout.tsx          | 2 +-
 apps/web/src/components/poll/mobile-poll/poll-option.tsx | 2 +-
 apps/web/src/components/poll/score-summary.tsx           | 2 +-
 apps/web/src/pages/auth/login.tsx                        | 4 +++-
 yarn.lock                                                | 9 +++++++++
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/apps/web/package.json b/apps/web/package.json
index 99d087451..8f598dacf 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -40,7 +40,7 @@
     "color-hash": "^2.0.2",
     "crypto": "^1.0.1",
     "dayjs": "^1.11.8",
-    "framer-motion": "^6.5.1",
+    "framer-motion": "^10.12.18",
     "i18next": "^22.4.9",
     "i18next-icu": "^2.3.0",
     "ics": "^3.1.0",
diff --git a/apps/web/src/components/layouts/poll-layout.tsx b/apps/web/src/components/layouts/poll-layout.tsx
index e86b14b84..95b7c334e 100644
--- a/apps/web/src/components/layouts/poll-layout.tsx
+++ b/apps/web/src/components/layouts/poll-layout.tsx
@@ -277,7 +277,7 @@ const Prefetch = ({ children }: React.PropsWithChildren) => {
     return <Error404 />;
   }
 
-  if (!poll.isFetched || !watchers.isFetched || !participants.isFetched) {
+  if (!poll.data || !watchers.data || !participants.data) {
     return (
       <div>
         <TopBar className="flex flex-col items-start justify-between gap-y-2 gap-x-4 sm:flex-row">
diff --git a/apps/web/src/components/poll/mobile-poll/poll-option.tsx b/apps/web/src/components/poll/mobile-poll/poll-option.tsx
index 4bde42d25..a76c43158 100644
--- a/apps/web/src/components/poll/mobile-poll/poll-option.tsx
+++ b/apps/web/src/components/poll/mobile-poll/poll-option.tsx
@@ -243,7 +243,7 @@ const PollOption: React.FunctionComponent<PollOptionProps> = ({
               />
             </div>
           ) : (
-            <AnimatePresence initial={false} exitBeforeEnter={true}>
+            <AnimatePresence initial={false} mode="wait">
               <PopInOut
                 key={vote}
                 className="flex h-full w-9 items-center justify-center"
diff --git a/apps/web/src/components/poll/score-summary.tsx b/apps/web/src/components/poll/score-summary.tsx
index 9f4caac68..b12bee0a7 100644
--- a/apps/web/src/components/poll/score-summary.tsx
+++ b/apps/web/src/components/poll/score-summary.tsx
@@ -55,7 +55,7 @@ export const ScoreSummary: React.FunctionComponent<PopularityScoreProps> =
         }}
       >
         <User2Icon className="h-3 w-3" />
-        <AnimatePresence initial={false} exitBeforeEnter={true}>
+        <AnimatePresence initial={false} mode="wait">
           <m.span
             transition={{
               duration: 0.1,
diff --git a/apps/web/src/pages/auth/login.tsx b/apps/web/src/pages/auth/login.tsx
index f4337ebe7..c63d43348 100644
--- a/apps/web/src/pages/auth/login.tsx
+++ b/apps/web/src/pages/auth/login.tsx
@@ -22,6 +22,8 @@ export const Page = () => {
   const router = useRouter();
   const { token } = router.query;
   const posthog = usePostHog();
+  const queryClient = trpc.useContext();
+
   const authenticate = trpc.whoami.authenticate.useMutation();
 
   useMount(() => {
@@ -33,7 +35,7 @@ export const Page = () => {
             name: user.name,
             email: user.email,
           });
-
+          queryClient.invalidate();
           setTimeout(() => {
             router.replace(defaultRedirectPath);
           }, 1000);
diff --git a/yarn.lock b/yarn.lock
index 7015c8e30..0940fb669 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5946,6 +5946,15 @@ fraction.js@^4.2.0:
   resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"
   integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
 
+framer-motion@^10.12.18:
+  version "10.12.18"
+  resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-10.12.18.tgz#92015860b6468a82e76c4739fcae81e1f6723b3f"
+  integrity sha512-cfhiUpPbj+0eEWKjuD+5cz5cMqH71xOtMxGiS/cSGfHn2OlHIEAqFnFyzEMENw5PxWR9bMVhatzzpD6lexmHZQ==
+  dependencies:
+    tslib "^2.4.0"
+  optionalDependencies:
+    "@emotion/is-prop-valid" "^0.8.2"
+
 framer-motion@^6.5.1:
   version "6.5.1"
   resolved "https://registry.npmjs.org/framer-motion/-/framer-motion-6.5.1.tgz"