From 8fe9d08b2d4856f2cd5dc1fed34cba2ed66ed4ad Mon Sep 17 00:00:00 2001
From: ingawei <ingawei@gmail.com>
Date: Sat, 30 Jul 2022 00:13:59 -0700
Subject: [PATCH] wat

---
 common/user.ts                        |  2 +-
 firestore.rules                       |  2 +-
 web/components/onboarding/welcome.tsx | 14 ++++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/common/user.ts b/common/user.ts
index 2df7213f..78b76511 100644
--- a/common/user.ts
+++ b/common/user.ts
@@ -40,7 +40,7 @@ export type User = {
   referredByContractId?: string
   referredByGroupId?: string
   lastPingTime?: number
-  showWelcome: boolean
+  shouldShowWelcome?: boolean
 }
 
 export const STARTING_BALANCE = ENV_CONFIG.startingBalance ?? 1000
diff --git a/firestore.rules b/firestore.rules
index 48c36ad2..05721dcf 100644
--- a/firestore.rules
+++ b/firestore.rules
@@ -22,7 +22,7 @@ service cloud.firestore {
       allow read;
       allow update: if resource.data.id == request.auth.uid
                        && request.resource.data.diff(resource.data).affectedKeys()
-                                                                    .hasOnly(['bio', 'bannerUrl', 'website', 'twitterHandle', 'discordHandle', 'followedCategories', 'lastPingTime','showWelcome']);
+                                                                    .hasOnly(['bio', 'bannerUrl', 'website', 'twitterHandle', 'discordHandle', 'followedCategories', 'lastPingTime','shouldShowWelcome']);
       // User referral rules
       allow update: if resource.data.id == request.auth.uid
                          && request.resource.data.diff(resource.data).affectedKeys()
diff --git a/web/components/onboarding/welcome.tsx b/web/components/onboarding/welcome.tsx
index 0b9a0cf6..42a98ace 100644
--- a/web/components/onboarding/welcome.tsx
+++ b/web/components/onboarding/welcome.tsx
@@ -12,10 +12,10 @@ export default function Welcome() {
   const user = useUser()
   const [open, setOpen] = useState(true)
   const [page, setPage] = useState(0)
-  const totalpages = 4
+  const TOTAL_PAGES = 4
 
   function increasePage() {
-    if (page < totalpages - 1) {
+    if (page < TOTAL_PAGES - 1) {
       setPage(page + 1)
     }
   }
@@ -27,14 +27,12 @@ export default function Welcome() {
   }
 
   async function setUserHasSeenWelcome() {
-    // await changeUserInfo({ showWelcome: false })
     if (user) {
-      console.log('setuserwelcome called')
-      await updateUser(user.id, { ['showWelcome']: false })
+      await updateUser(user.id, { ['shouldShowWelcome']: false })
     }
   }
 
-  if (!user || !user.showWelcome) {
+  if (!user || !user.shouldShowWelcome) {
     return <></>
   } else
     return (
@@ -60,11 +58,11 @@ export default function Welcome() {
                 )}
                 onClick={decreasePage}
               />
-              <PageIndicator page={page} totalpages={totalpages} />
+              <PageIndicator page={page} totalpages={TOTAL_PAGES} />
               <ChevronRightIcon
                 className={clsx(
                   'h-10 w-10 text-indigo-500 hover:text-indigo-600',
-                  page === totalpages - 1 ? 'disabled invisible' : ''
+                  page === TOTAL_PAGES - 1 ? 'disabled invisible' : ''
                 )}
                 onClick={increasePage}
               />