From edc0d4a8c3ebbcc7467cff03a2c0e0f5b94a7680 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Mon, 8 Aug 2022 22:34:53 -0700
Subject: [PATCH] Rename `user` -> `serverUser`

---
 web/components/auth-context.tsx | 9 ++++++---
 web/pages/_app.tsx              | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/components/auth-context.tsx b/web/components/auth-context.tsx
index d7eb9bdf..3460d02a 100644
--- a/web/components/auth-context.tsx
+++ b/web/components/auth-context.tsx
@@ -30,9 +30,12 @@ const ensureDeviceToken = () => {
 
 export const AuthContext = createContext<AuthUser>(undefined)
 
-export function AuthProvider(props: { children: ReactNode; user?: AuthUser }) {
-  const { children, user } = props
-  const [authUser, setAuthUser] = useStateCheckEquality<AuthUser>(user)
+export function AuthProvider(props: {
+  children: ReactNode
+  serverUser?: AuthUser
+}) {
+  const { children, serverUser } = props
+  const [authUser, setAuthUser] = useStateCheckEquality<AuthUser>(serverUser)
   useEffect(() => {
     const cachedUser = localStorage.getItem(CACHED_USER_KEY)
     setAuthUser(cachedUser && JSON.parse(cachedUser))
diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
index 9fdc7301..42b5e922 100644
--- a/web/pages/_app.tsx
+++ b/web/pages/_app.tsx
@@ -79,7 +79,7 @@ function MyApp({ Component, pageProps }: AppProps) {
           content="width=device-width, initial-scale=1, maximum-scale=1"
         />
       </Head>
-      <AuthProvider user={pageProps.user}>
+      <AuthProvider serverUser={pageProps.user}>
         <QueryClientProvider client={queryClient}>
           <Welcome {...pageProps} />
           <Component {...pageProps} />