From 1536b6d05fdb92849d9a41fcecc0f86a31176a30 Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Sat, 14 Oct 2023 12:12:34 -0700
Subject: [PATCH 1/7] Refactor components to be screens

---
 src/app/auth/_layout.tsx                      |   1 +
 .../Login.tsx => app/auth/login.tsx}          |  34 ++--
 src/app/auth/onboarding.tsx                   | 174 +++++++++++++++++-
 src/app/auth/signup.tsx                       |  72 +++++++-
 src/app/index.tsx                             |   6 +-
 src/app/settings.tsx                          |  11 +-
 src/components/Account.tsx                    | 169 -----------------
 7 files changed, 263 insertions(+), 204 deletions(-)
 rename src/{components/Login.tsx => app/auth/login.tsx} (73%)
 delete mode 100644 src/components/Account.tsx

diff --git a/src/app/auth/_layout.tsx b/src/app/auth/_layout.tsx
index 0578a39c..cf7d8349 100644
--- a/src/app/auth/_layout.tsx
+++ b/src/app/auth/_layout.tsx
@@ -5,6 +5,7 @@ function StackLayout() {
     <Stack>
       <Stack.Screen name="index" options={{ headerShown: false }} />
       <Stack.Screen name="signup" options={{ headerShown: false }} />
+      <Stack.Screen name="login" options={{ headerShown: false }} />
       <Stack.Screen name="onboarding" options={{ headerShown: false }} />
     </Stack>
   );
diff --git a/src/components/Login.tsx b/src/app/auth/login.tsx
similarity index 73%
rename from src/components/Login.tsx
rename to src/app/auth/login.tsx
index 4868fe27..aa1cb78b 100644
--- a/src/components/Login.tsx
+++ b/src/app/auth/login.tsx
@@ -1,7 +1,9 @@
 import React, { useState } from 'react';
+import { Redirect } from 'expo-router';
 import { Alert, StyleSheet, View } from 'react-native';
+import { useSession } from '../../utils/AuthContext';
 import { Button, Input } from 'react-native-elements';
-import { useSession } from '../utils/AuthContext';
+import { Link } from 'expo-router';
 
 const styles = StyleSheet.create({
   container: {
@@ -18,8 +20,13 @@ const styles = StyleSheet.create({
   },
 });
 
-export default function Login() {
+function LoginScreen() {
   const sessionHandler = useSession();
+
+  if (sessionHandler.session) {
+    return <Redirect href={'/home'} />;
+  }
+
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [loading, setLoading] = useState(false);
@@ -32,21 +39,6 @@ export default function Login() {
     setLoading(false);
   };
 
-  const signUpWithEmail = async () => {
-    setLoading(true);
-    const { error } = await sessionHandler.signUp(email, password);
-
-    if (error) {
-      Alert.alert(error.message);
-      console.error(error);
-    } else {
-      Alert.alert(
-        'Please follow the directions in the confirmation email to activate your account.',
-      );
-    }
-    setLoading(false);
-  };
-
   return (
     <View style={styles.container}>
       <View style={[styles.verticallySpaced, styles.mt20]}>
@@ -70,12 +62,14 @@ export default function Login() {
           autoCapitalize="none"
         />
       </View>
+
+      <Link href={'/auth/signup'}>Don't have an account? Sign up</Link>
+
       <View style={[styles.verticallySpaced, styles.mt20]}>
         <Button title="Sign in" disabled={loading} onPress={signInWithEmail} />
       </View>
-      <View style={styles.verticallySpaced}>
-        <Button title="Sign up" disabled={loading} onPress={signUpWithEmail} />
-      </View>
     </View>
   );
 }
+
+export default LoginScreen;
diff --git a/src/app/auth/onboarding.tsx b/src/app/auth/onboarding.tsx
index 2f0f643d..72189398 100644
--- a/src/app/auth/onboarding.tsx
+++ b/src/app/auth/onboarding.tsx
@@ -1,15 +1,175 @@
-import { View } from 'react-native';
-import Login from '../../components/Login';
-import Account from '../../components/Account';
+import { useState, useEffect } from 'react';
+import { StyleSheet, View, Alert, ScrollView, Platform } from 'react-native';
+import { Button, Input } from 'react-native-elements';
+import DateTimePicker from '@react-native-community/datetimepicker';
+import supabase from '../../utils/supabase';
+import UserStringInput from '../../components/UserStringInput';
 import { useSession } from '../../utils/AuthContext';
+import { Redirect } from 'expo-router';
+
+const styles = StyleSheet.create({
+  container: {
+    marginTop: 40,
+    padding: 12,
+  },
+  verticallySpaced: {
+    paddingTop: 4,
+    paddingBottom: 4,
+    alignSelf: 'stretch',
+  },
+  mt20: {
+    marginTop: 20,
+  },
+});
 
 function OnboardingScreen() {
-  const { session } = useSession();
+  const { session, signOut } = useSession();
+
+  if (!session) {
+    return <Redirect href={'/auth/login'} />;
+  }
+
+  const [loading, setLoading] = useState(true);
+  const [firstName, setFirstName] = useState('');
+  const [lastName, setLastName] = useState('');
+  const [birthday, setBirthday] = useState(new Date());
+  const [gender, setGender] = useState('');
+  const [raceEthnicity, setRaceEthnicity] = useState('');
+  const [showDatePicker, setShowDatePicker] = useState(Platform.OS === 'ios');
+
+  const getProfile = async () => {
+    try {
+      setLoading(true);
+      if (!session?.user) throw new Error('No user on the session!');
+
+      const { data, error, status } = await supabase
+        .from('profiles')
+        .select(`first_name, last_name, birthday, gender, race_ethnicity`)
+        .eq('user_id', session?.user.id)
+        .single();
+
+      if (error && status !== 406) {
+        throw error;
+      }
+
+      if (data) {
+        setFirstName(data.first_name || firstName);
+        setLastName(data.last_name || lastName);
+        setBirthday(new Date(data.birthday) || birthday);
+        setGender(data.gender || gender);
+        setRaceEthnicity(data.race_ethnicity || raceEthnicity);
+      }
+    } catch (error) {
+      if (error instanceof Error) {
+        Alert.alert(`Get profile error: ${error.message}`);
+      }
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    if (session) getProfile();
+  }, [session]);
+
+  const updateProfile = async () => {
+    try {
+      setLoading(true);
+      if (!session?.user) throw new Error('No user on the session!');
+
+      // Only update values that are not blank
+      const updates = {
+        ...(firstName && { first_name: firstName }),
+        ...(lastName && { last_name: lastName }),
+        ...(gender && { gender }),
+        ...(raceEthnicity && { race_ethnicity: raceEthnicity }),
+        ...(birthday && { birthday }),
+      };
+
+      // Check if user exists
+      const { count } = await supabase
+        .from('profiles')
+        .select(`*`, { count: 'exact' })
+        .eq('user_id', session?.user.id);
+
+      if (count && count >= 1) {
+        // Update user if they exist
+        const { error } = await supabase
+          .from('profiles')
+          .update(updates)
+          .eq('user_id', session?.user.id)
+          .select('*');
+
+        if (error) throw error;
+      } else {
+        // Create user if they don't exist
+        const { error } = await supabase.from('profiles').insert(updates);
+
+        if (error) throw error;
+      }
+
+      Alert.alert('Succesfully updated user!');
+    } catch (error) {
+      if (error instanceof Error) {
+        Alert.alert(error.message);
+      }
+    } finally {
+      setLoading(false);
+    }
+  };
 
   return (
-    <View>
-      {session && session.user ? <Account key={session.user.id} /> : <Login />}
-    </View>
+    <ScrollView style={styles.container}>
+      <View style={[styles.verticallySpaced, styles.mt20]}>
+        <Input label="Email" value={session?.user?.email} disabled />
+      </View>
+      <UserStringInput
+        label="First Name"
+        value={firstName}
+        onChange={setFirstName}
+      />
+      <UserStringInput
+        label="Last Name"
+        value={lastName}
+        onChange={setLastName}
+      />
+      <UserStringInput label="Gender" value={gender} onChange={setGender} />
+      <UserStringInput
+        label="Race/Ethnicity"
+        value={raceEthnicity}
+        onChange={setRaceEthnicity}
+      />
+
+      {Platform.OS !== 'ios' && (
+        <Button
+          title="Change Birthday"
+          onPress={() => setShowDatePicker(true)}
+        />
+      )}
+      {showDatePicker && (
+        <DateTimePicker
+          testID="dateTimePicker"
+          value={birthday}
+          mode="date"
+          onChange={date => {
+            setShowDatePicker(Platform.OS === 'ios');
+            if (date.nativeEvent.timestamp) {
+              setBirthday(new Date(date.nativeEvent.timestamp));
+            }
+          }}
+        />
+      )}
+      <View style={[styles.verticallySpaced, styles.mt20]}>
+        <Button
+          title={loading ? 'Loading ...' : 'Update'}
+          onPress={updateProfile}
+          disabled={loading}
+        />
+      </View>
+      <View style={styles.verticallySpaced}>
+        <Button title="Sign Out" onPress={signOut} />
+      </View>
+    </ScrollView>
   );
 }
 
diff --git a/src/app/auth/signup.tsx b/src/app/auth/signup.tsx
index 8072d3c9..c5c8e246 100644
--- a/src/app/auth/signup.tsx
+++ b/src/app/auth/signup.tsx
@@ -1,14 +1,74 @@
-import { View } from 'react-native';
-import Account from '../../components/Account';
-import Login from '../../components/Login';
+import React, { useState } from 'react';
+import { Redirect, Link } from 'expo-router';
+import { Alert, StyleSheet, View } from 'react-native';
 import { useSession } from '../../utils/AuthContext';
+import { Button, Input } from 'react-native-elements';
+
+const styles = StyleSheet.create({
+  container: {
+    marginTop: 40,
+    padding: 12,
+  },
+  verticallySpaced: {
+    paddingTop: 4,
+    paddingBottom: 4,
+    alignSelf: 'stretch',
+  },
+  mt20: {
+    marginTop: 20,
+  },
+});
 
 function SignUpScreen() {
-  const { session } = useSession();
+  const sessionHandler = useSession();
+
+  if (sessionHandler.session) {
+    return <Redirect href={'/home'} />;
+  }
+
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [loading, setLoading] = useState(false);
+
+  const signUpWithEmail = async () => {
+    setLoading(true);
+    const { error } = await sessionHandler.signUp(email, password);
+
+    if (error) Alert.alert(error.message);
+    else
+      Alert.alert(
+        'Please follow the instructions in your email to verify your account',
+      );
+    setLoading(false);
+  };
 
   return (
-    <View>
-      {session && session.user ? <Account key={session.user.id} /> : <Login />}
+    <View style={styles.container}>
+      <View style={[styles.verticallySpaced, styles.mt20]}>
+        <Input
+          label="Email"
+          leftIcon={{ type: 'font-awesome', name: 'envelope' }}
+          onChangeText={text => setEmail(text)}
+          value={email}
+          placeholder="email@address.com"
+          autoCapitalize="none"
+        />
+      </View>
+      <View style={styles.verticallySpaced}>
+        <Input
+          label="Password"
+          leftIcon={{ type: 'font-awesome', name: 'lock' }}
+          onChangeText={text => setPassword(text)}
+          value={password}
+          secureTextEntry
+          placeholder="Password"
+          autoCapitalize="none"
+        />
+      </View>
+      <Link href={'/auth/login'}>Already have an account? Log In</Link>
+      <View style={[styles.verticallySpaced, styles.mt20]}>
+        <Button title="Sign up" disabled={loading} onPress={signUpWithEmail} />
+      </View>
     </View>
   );
 }
diff --git a/src/app/index.tsx b/src/app/index.tsx
index 91b8d926..8280abec 100644
--- a/src/app/index.tsx
+++ b/src/app/index.tsx
@@ -1,7 +1,11 @@
 import { Redirect } from 'expo-router';
+import { useSession } from '../utils/AuthContext';
 
 function StartPage() {
-  return <Redirect href="/auth" />;
+  const { session } = useSession();
+
+  if (!session) return <Redirect href="/auth/login" />;
+  else return <Redirect href={'/home'} />;
 }
 
 export default StartPage;
diff --git a/src/app/settings.tsx b/src/app/settings.tsx
index a2735d99..8e5d7b20 100644
--- a/src/app/settings.tsx
+++ b/src/app/settings.tsx
@@ -1,11 +1,20 @@
-import { Text } from 'react-native';
+import { Redirect } from 'expo-router';
+import { Text, View } from 'react-native';
+import { Button } from 'react-native-elements';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import globalStyles from '../../globalStyles';
+import { useSession } from '../utils/AuthContext';
 
 function SettingsScreen() {
+  const { session, signOut } = useSession();
+
+  if (!session) return <Redirect href={'/auth/login'} />;
   return (
     <SafeAreaView style={globalStyles.container}>
       <Text style={globalStyles.h1}>Settings</Text>
+      <View>
+        <Button title="Sign Out" onPress={signOut} />
+      </View>
     </SafeAreaView>
   );
 }
diff --git a/src/components/Account.tsx b/src/components/Account.tsx
deleted file mode 100644
index ebe214f1..00000000
--- a/src/components/Account.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-import { useState, useEffect } from 'react';
-import { StyleSheet, View, Alert, ScrollView, Platform } from 'react-native';
-import { Button, Input } from 'react-native-elements';
-import DateTimePicker from '@react-native-community/datetimepicker';
-import supabase from '../utils/supabase';
-import UserStringInput from './UserStringInput';
-import { useSession } from '../utils/AuthContext';
-
-const styles = StyleSheet.create({
-  container: {
-    marginTop: 40,
-    padding: 12,
-  },
-  verticallySpaced: {
-    paddingTop: 4,
-    paddingBottom: 4,
-    alignSelf: 'stretch',
-  },
-  mt20: {
-    marginTop: 20,
-  },
-});
-
-export default function Account() {
-  const { session, signOut } = useSession();
-
-  const [loading, setLoading] = useState(true);
-  const [firstName, setFirstName] = useState('');
-  const [lastName, setLastName] = useState('');
-  const [birthday, setBirthday] = useState(new Date());
-  const [gender, setGender] = useState('');
-  const [raceEthnicity, setRaceEthnicity] = useState('');
-  const [showDatePicker, setShowDatePicker] = useState(Platform.OS === 'ios');
-
-  const getProfile = async () => {
-    try {
-      setLoading(true);
-      if (!session?.user) throw new Error('No user on the session!');
-
-      const { data, error, status } = await supabase
-        .from('profiles')
-        .select(`first_name, last_name, birthday, gender, race_ethnicity`)
-        .eq('user_id', session?.user.id)
-        .single();
-
-      if (error && status !== 406) {
-        throw error;
-      }
-
-      if (data) {
-        setFirstName(data.first_name || firstName);
-        setLastName(data.last_name || lastName);
-        setBirthday(new Date(data.birthday) || birthday);
-        setGender(data.gender || gender);
-        setRaceEthnicity(data.race_ethnicity || raceEthnicity);
-      }
-    } catch (error) {
-      if (error instanceof Error) {
-        Alert.alert(`Get profile error: ${error.message}`);
-      }
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  useEffect(() => {
-    if (session) getProfile();
-  }, [session]);
-
-  const updateProfile = async () => {
-    try {
-      setLoading(true);
-      if (!session?.user) throw new Error('No user on the session!');
-
-      // Only update values that are not blank
-      const updates = {
-        ...(firstName && { first_name: firstName }),
-        ...(lastName && { last_name: lastName }),
-        ...(gender && { gender }),
-        ...(raceEthnicity && { race_ethnicity: raceEthnicity }),
-        ...(birthday && { birthday }),
-      };
-
-      // Check if user exists
-      const { count } = await supabase
-        .from('profiles')
-        .select(`*`, { count: 'exact' })
-        .eq('user_id', session?.user.id);
-
-      if (count && count >= 1) {
-        // Update user if they exist
-        const { error } = await supabase
-          .from('profiles')
-          .update(updates)
-          .eq('user_id', session?.user.id)
-          .select('*');
-
-        if (error) throw error;
-      } else {
-        // Create user if they don't exist
-        const { error } = await supabase.from('profiles').insert(updates);
-
-        if (error) throw error;
-      }
-
-      Alert.alert('Succesfully updated user!');
-    } catch (error) {
-      if (error instanceof Error) {
-        Alert.alert(error.message);
-      }
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  return (
-    <ScrollView style={styles.container}>
-      <View style={[styles.verticallySpaced, styles.mt20]}>
-        <Input label="Email" value={session?.user?.email} disabled />
-      </View>
-      <UserStringInput
-        label="First Name"
-        value={firstName}
-        onChange={setFirstName}
-      />
-      <UserStringInput
-        label="Last Name"
-        value={lastName}
-        onChange={setLastName}
-      />
-      <UserStringInput label="Gender" value={gender} onChange={setGender} />
-      <UserStringInput
-        label="Race/Ethnicity"
-        value={raceEthnicity}
-        onChange={setRaceEthnicity}
-      />
-
-      {Platform.OS !== 'ios' && (
-        <Button
-          title="Change Birthday"
-          onPress={() => setShowDatePicker(true)}
-        />
-      )}
-      {showDatePicker && (
-        <DateTimePicker
-          testID="dateTimePicker"
-          value={birthday}
-          mode="date"
-          onChange={date => {
-            setShowDatePicker(Platform.OS === 'ios');
-            if (date.nativeEvent.timestamp) {
-              setBirthday(new Date(date.nativeEvent.timestamp));
-            }
-          }}
-        />
-      )}
-      <View style={[styles.verticallySpaced, styles.mt20]}>
-        <Button
-          title={loading ? 'Loading ...' : 'Update'}
-          onPress={updateProfile}
-          disabled={loading}
-        />
-      </View>
-      <View style={styles.verticallySpaced}>
-        <Button title="Sign Out" onPress={signOut} />
-      </View>
-    </ScrollView>
-  );
-}

From 7636c47ef6b0aa7161c05c2527125db7e34d6456 Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Mon, 16 Oct 2023 17:43:57 -0700
Subject: [PATCH 2/7] Working on email verification redirect

---
 src/app/auth/login.tsx    | 11 ++++++++---
 src/app/auth/signup.tsx   | 32 ++++++++++++++++++++++++--------
 src/utils/AuthContext.tsx | 13 ++++++++++++-
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/app/auth/login.tsx b/src/app/auth/login.tsx
index aa1cb78b..eb766b40 100644
--- a/src/app/auth/login.tsx
+++ b/src/app/auth/login.tsx
@@ -33,7 +33,12 @@ function LoginScreen() {
 
   const signInWithEmail = async () => {
     setLoading(true);
-    const { error } = await sessionHandler.signInWithEmail(email, password);
+    const { error, data } = await sessionHandler.signInWithEmail(
+      email,
+      password,
+    );
+
+    console.log(data);
 
     if (error) Alert.alert(error.message);
     setLoading(false);
@@ -63,10 +68,10 @@ function LoginScreen() {
         />
       </View>
 
-      <Link href={'/auth/signup'}>Don't have an account? Sign up</Link>
+      <Link href={'/auth/signup'}>Don't have an account? Sign Up</Link>
 
       <View style={[styles.verticallySpaced, styles.mt20]}>
-        <Button title="Sign in" disabled={loading} onPress={signInWithEmail} />
+        <Button title="Log In" disabled={loading} onPress={signInWithEmail} />
       </View>
     </View>
   );
diff --git a/src/app/auth/signup.tsx b/src/app/auth/signup.tsx
index c5c8e246..1ee7c5a5 100644
--- a/src/app/auth/signup.tsx
+++ b/src/app/auth/signup.tsx
@@ -1,6 +1,6 @@
-import React, { useState } from 'react';
-import { Redirect, Link } from 'expo-router';
-import { Alert, StyleSheet, View } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import { Redirect, Link, router } from 'expo-router';
+import { Alert, StyleSheet, View, Text } from 'react-native';
 import { useSession } from '../../utils/AuthContext';
 import { Button, Input } from 'react-native-elements';
 
@@ -20,25 +20,40 @@ const styles = StyleSheet.create({
 });
 
 function SignUpScreen() {
-  const sessionHandler = useSession();
+  const { session, emailVerified, signUp, signInWithEmail } = useSession();
 
-  if (sessionHandler.session) {
+  if (session) {
     return <Redirect href={'/home'} />;
   }
 
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [loading, setLoading] = useState(false);
+  const [verifyingEmail, setVerifyingEmail] = useState(false);
+
+  useEffect(() => {
+    console.log(`update to session: ${session}`);
+    if (session) router.push('/home');
+  }, [session]);
+
+  useEffect(() => {
+    console.log(`update to emailVerified: ${emailVerified}`);
+    if (emailVerified) {
+      signInWithEmail(email, password).catch(console.error);
+    }
+  }, [emailVerified]);
 
   const signUpWithEmail = async () => {
     setLoading(true);
-    const { error } = await sessionHandler.signUp(email, password);
+    const { error } = await signUp(email, password);
 
     if (error) Alert.alert(error.message);
-    else
+    else {
+      setVerifyingEmail(true);
       Alert.alert(
         'Please follow the instructions in your email to verify your account',
       );
+    }
     setLoading(false);
   };
 
@@ -67,8 +82,9 @@ function SignUpScreen() {
       </View>
       <Link href={'/auth/login'}>Already have an account? Log In</Link>
       <View style={[styles.verticallySpaced, styles.mt20]}>
-        <Button title="Sign up" disabled={loading} onPress={signUpWithEmail} />
+        <Button title="Sign Up" disabled={loading} onPress={signUpWithEmail} />
       </View>
+      {verifyingEmail && <Text>Waiting for email to be verified...</Text>}
     </View>
   );
 }
diff --git a/src/utils/AuthContext.tsx b/src/utils/AuthContext.tsx
index 30630fa9..de7128e1 100644
--- a/src/utils/AuthContext.tsx
+++ b/src/utils/AuthContext.tsx
@@ -10,6 +10,7 @@ import supabase from './supabase';
 
 export interface AuthState {
   session: Session | null;
+  emailVerified: boolean;
   signIn: (newSession: Session | null) => void;
   signUp: (email: string, password: string) => Promise<AuthResponse>;
   signInWithEmail: (email: string, password: string) => Promise<AuthResponse>;
@@ -37,13 +38,20 @@ export function AuthContextProvider({
   children: React.ReactNode;
 }) {
   const [session, setSession] = useState<Session | null>(null);
+  const [emailVerified, setEmailVerified] = useState(false);
 
   useEffect(() => {
     supabase.auth.getSession().then(({ data: { session: newSession } }) => {
       setSession(newSession);
     });
 
-    supabase.auth.onAuthStateChange((_event, newSession) => {
+    supabase.auth.onAuthStateChange((event, newSession) => {
+      console.log(
+        `Auth state change:  ${JSON.stringify({ event, newSession })}`,
+      );
+      if (event == 'INITIAL_SESSION') {
+        setEmailVerified(true);
+      }
       setSession(newSession);
     });
   }, []);
@@ -57,11 +65,13 @@ export function AuthContextProvider({
       email,
       password,
     }); // will trigger the use effect to update the session
+
   const signUp = async (email: string, password: string) =>
     supabase.auth.signUp({
       email,
       password,
     }); // will trigger the use effect to update the session
+
   const signOut = () => {
     supabase.auth.signOut();
     setSession(null);
@@ -70,6 +80,7 @@ export function AuthContextProvider({
   const authContextValue = useMemo(
     () => ({
       session,
+      emailVerified,
       signUp,
       signIn,
       signInWithEmail,

From 73f85fb1acee1b376e7a3bea056968a6ecbe2b73 Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Mon, 16 Oct 2023 18:00:05 -0700
Subject: [PATCH 3/7] Redirect to onboarding after sign up

---
 src/app/auth/onboarding.tsx |  4 ++--
 src/app/auth/signup.tsx     | 47 ++++++++++++++++++++++---------------
 src/utils/AuthContext.tsx   |  9 -------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/app/auth/onboarding.tsx b/src/app/auth/onboarding.tsx
index 72189398..5dab7687 100644
--- a/src/app/auth/onboarding.tsx
+++ b/src/app/auth/onboarding.tsx
@@ -5,7 +5,7 @@ import DateTimePicker from '@react-native-community/datetimepicker';
 import supabase from '../../utils/supabase';
 import UserStringInput from '../../components/UserStringInput';
 import { useSession } from '../../utils/AuthContext';
-import { Redirect } from 'expo-router';
+import { Redirect, router } from 'expo-router';
 
 const styles = StyleSheet.create({
   container: {
@@ -167,7 +167,7 @@ function OnboardingScreen() {
         />
       </View>
       <View style={styles.verticallySpaced}>
-        <Button title="Sign Out" onPress={signOut} />
+        <Button title="Skip for now" onPress={() => router.push('/home')} />
       </View>
     </ScrollView>
   );
diff --git a/src/app/auth/signup.tsx b/src/app/auth/signup.tsx
index 1ee7c5a5..35d301f2 100644
--- a/src/app/auth/signup.tsx
+++ b/src/app/auth/signup.tsx
@@ -20,7 +20,7 @@ const styles = StyleSheet.create({
 });
 
 function SignUpScreen() {
-  const { session, emailVerified, signUp, signInWithEmail } = useSession();
+  const { session, signUp, signInWithEmail } = useSession();
 
   if (session) {
     return <Redirect href={'/home'} />;
@@ -29,19 +29,17 @@ function SignUpScreen() {
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [loading, setLoading] = useState(false);
-  const [verifyingEmail, setVerifyingEmail] = useState(false);
+  const [signedUp, setSignedUp] = useState(false);
 
-  useEffect(() => {
-    console.log(`update to session: ${session}`);
-    if (session) router.push('/home');
-  }, [session]);
+  const signIn = async () => {
+    setLoading(true);
+    const { error } = await signInWithEmail(email, password);
 
-  useEffect(() => {
-    console.log(`update to emailVerified: ${emailVerified}`);
-    if (emailVerified) {
-      signInWithEmail(email, password).catch(console.error);
-    }
-  }, [emailVerified]);
+    if (error) Alert.alert(error.message);
+    else router.push('/auth/onboarding');
+
+    setLoading(false);
+  };
 
   const signUpWithEmail = async () => {
     setLoading(true);
@@ -49,10 +47,10 @@ function SignUpScreen() {
 
     if (error) Alert.alert(error.message);
     else {
-      setVerifyingEmail(true);
       Alert.alert(
-        'Please follow the instructions in your email to verify your account',
+        'Please follow the instructions in your email to verify your account, then login',
       );
+      setSignedUp(true);
     }
     setLoading(false);
   };
@@ -80,11 +78,22 @@ function SignUpScreen() {
           autoCapitalize="none"
         />
       </View>
-      <Link href={'/auth/login'}>Already have an account? Log In</Link>
-      <View style={[styles.verticallySpaced, styles.mt20]}>
-        <Button title="Sign Up" disabled={loading} onPress={signUpWithEmail} />
-      </View>
-      {verifyingEmail && <Text>Waiting for email to be verified...</Text>}
+      {signedUp ? (
+        <View style={[styles.verticallySpaced, styles.mt20]}>
+          <Button title="Log In" disabled={loading} onPress={signIn} />
+        </View>
+      ) : (
+        <>
+          <Link href={'/auth/login'}>Already have an account? Log In</Link>
+          <View style={[styles.verticallySpaced, styles.mt20]}>
+            <Button
+              title="Sign Up"
+              disabled={loading}
+              onPress={signUpWithEmail}
+            />
+          </View>
+        </>
+      )}
     </View>
   );
 }
diff --git a/src/utils/AuthContext.tsx b/src/utils/AuthContext.tsx
index de7128e1..2dd567b6 100644
--- a/src/utils/AuthContext.tsx
+++ b/src/utils/AuthContext.tsx
@@ -10,7 +10,6 @@ import supabase from './supabase';
 
 export interface AuthState {
   session: Session | null;
-  emailVerified: boolean;
   signIn: (newSession: Session | null) => void;
   signUp: (email: string, password: string) => Promise<AuthResponse>;
   signInWithEmail: (email: string, password: string) => Promise<AuthResponse>;
@@ -38,7 +37,6 @@ export function AuthContextProvider({
   children: React.ReactNode;
 }) {
   const [session, setSession] = useState<Session | null>(null);
-  const [emailVerified, setEmailVerified] = useState(false);
 
   useEffect(() => {
     supabase.auth.getSession().then(({ data: { session: newSession } }) => {
@@ -46,12 +44,6 @@ export function AuthContextProvider({
     });
 
     supabase.auth.onAuthStateChange((event, newSession) => {
-      console.log(
-        `Auth state change:  ${JSON.stringify({ event, newSession })}`,
-      );
-      if (event == 'INITIAL_SESSION') {
-        setEmailVerified(true);
-      }
       setSession(newSession);
     });
   }, []);
@@ -80,7 +72,6 @@ export function AuthContextProvider({
   const authContextValue = useMemo(
     () => ({
       session,
-      emailVerified,
       signUp,
       signIn,
       signInWithEmail,

From 7164ab78d52519cd48e944804804682dc0befd52 Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Mon, 16 Oct 2023 18:04:10 -0700
Subject: [PATCH 4/7] Fix eslint errors

---
 src/app/auth/login.tsx      | 16 +++++++---------
 src/app/auth/onboarding.tsx | 11 +++++------
 src/app/auth/signup.tsx     | 12 ++++++------
 src/app/index.tsx           |  2 +-
 src/app/settings.tsx        |  2 +-
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/app/auth/login.tsx b/src/app/auth/login.tsx
index eb766b40..cbb30e16 100644
--- a/src/app/auth/login.tsx
+++ b/src/app/auth/login.tsx
@@ -1,9 +1,8 @@
 import React, { useState } from 'react';
-import { Redirect } from 'expo-router';
+import { Redirect, Link } from 'expo-router';
 import { Alert, StyleSheet, View } from 'react-native';
-import { useSession } from '../../utils/AuthContext';
 import { Button, Input } from 'react-native-elements';
-import { Link } from 'expo-router';
+import { useSession } from '../../utils/AuthContext';
 
 const styles = StyleSheet.create({
   container: {
@@ -22,15 +21,14 @@ const styles = StyleSheet.create({
 
 function LoginScreen() {
   const sessionHandler = useSession();
-
-  if (sessionHandler.session) {
-    return <Redirect href={'/home'} />;
-  }
-
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [loading, setLoading] = useState(false);
 
+  if (sessionHandler.session) {
+    return <Redirect href="/home" />;
+  }
+
   const signInWithEmail = async () => {
     setLoading(true);
     const { error, data } = await sessionHandler.signInWithEmail(
@@ -68,7 +66,7 @@ function LoginScreen() {
         />
       </View>
 
-      <Link href={'/auth/signup'}>Don't have an account? Sign Up</Link>
+      <Link href="/auth/signup">Don&apos;t have an account? Sign Up</Link>
 
       <View style={[styles.verticallySpaced, styles.mt20]}>
         <Button title="Log In" disabled={loading} onPress={signInWithEmail} />
diff --git a/src/app/auth/onboarding.tsx b/src/app/auth/onboarding.tsx
index 5dab7687..9b1c36b7 100644
--- a/src/app/auth/onboarding.tsx
+++ b/src/app/auth/onboarding.tsx
@@ -2,10 +2,10 @@ import { useState, useEffect } from 'react';
 import { StyleSheet, View, Alert, ScrollView, Platform } from 'react-native';
 import { Button, Input } from 'react-native-elements';
 import DateTimePicker from '@react-native-community/datetimepicker';
+import { Redirect, router } from 'expo-router';
 import supabase from '../../utils/supabase';
 import UserStringInput from '../../components/UserStringInput';
 import { useSession } from '../../utils/AuthContext';
-import { Redirect, router } from 'expo-router';
 
 const styles = StyleSheet.create({
   container: {
@@ -24,11 +24,6 @@ const styles = StyleSheet.create({
 
 function OnboardingScreen() {
   const { session, signOut } = useSession();
-
-  if (!session) {
-    return <Redirect href={'/auth/login'} />;
-  }
-
   const [loading, setLoading] = useState(true);
   const [firstName, setFirstName] = useState('');
   const [lastName, setLastName] = useState('');
@@ -118,6 +113,10 @@ function OnboardingScreen() {
     }
   };
 
+  if (!session) {
+    return <Redirect href="/auth/login" />;
+  }
+
   return (
     <ScrollView style={styles.container}>
       <View style={[styles.verticallySpaced, styles.mt20]}>
diff --git a/src/app/auth/signup.tsx b/src/app/auth/signup.tsx
index 35d301f2..a23d837e 100644
--- a/src/app/auth/signup.tsx
+++ b/src/app/auth/signup.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { Redirect, Link, router } from 'expo-router';
 import { Alert, StyleSheet, View, Text } from 'react-native';
-import { useSession } from '../../utils/AuthContext';
 import { Button, Input } from 'react-native-elements';
+import { useSession } from '../../utils/AuthContext';
 
 const styles = StyleSheet.create({
   container: {
@@ -22,15 +22,15 @@ const styles = StyleSheet.create({
 function SignUpScreen() {
   const { session, signUp, signInWithEmail } = useSession();
 
-  if (session) {
-    return <Redirect href={'/home'} />;
-  }
-
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [loading, setLoading] = useState(false);
   const [signedUp, setSignedUp] = useState(false);
 
+  if (session) {
+    return <Redirect href="/home" />;
+  }
+
   const signIn = async () => {
     setLoading(true);
     const { error } = await signInWithEmail(email, password);
@@ -84,7 +84,7 @@ function SignUpScreen() {
         </View>
       ) : (
         <>
-          <Link href={'/auth/login'}>Already have an account? Log In</Link>
+          <Link href="/auth/login">Already have an account? Log In</Link>
           <View style={[styles.verticallySpaced, styles.mt20]}>
             <Button
               title="Sign Up"
diff --git a/src/app/index.tsx b/src/app/index.tsx
index 8280abec..d834a1a6 100644
--- a/src/app/index.tsx
+++ b/src/app/index.tsx
@@ -5,7 +5,7 @@ function StartPage() {
   const { session } = useSession();
 
   if (!session) return <Redirect href="/auth/login" />;
-  else return <Redirect href={'/home'} />;
+  return <Redirect href="/home" />;
 }
 
 export default StartPage;
diff --git a/src/app/settings.tsx b/src/app/settings.tsx
index 8e5d7b20..0a5c5146 100644
--- a/src/app/settings.tsx
+++ b/src/app/settings.tsx
@@ -8,7 +8,7 @@ import { useSession } from '../utils/AuthContext';
 function SettingsScreen() {
   const { session, signOut } = useSession();
 
-  if (!session) return <Redirect href={'/auth/login'} />;
+  if (!session) return <Redirect href="/auth/login" />;
   return (
     <SafeAreaView style={globalStyles.container}>
       <Text style={globalStyles.h1}>Settings</Text>

From 84ba22eaa29708153bc9324804182ad501497fc4 Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Mon, 16 Oct 2023 18:13:13 -0700
Subject: [PATCH 5/7] Run prettier

---
 src/app/settings.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/settings.tsx b/src/app/settings.tsx
index 292f9ccd..93ab0f28 100644
--- a/src/app/settings.tsx
+++ b/src/app/settings.tsx
@@ -5,7 +5,6 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 import { useSession } from '../utils/AuthContext';
 import globalStyles from '../styles/globalStyles';
 
-
 function SettingsScreen() {
   const { session, signOut } = useSession();
 

From 06770f7ea3e8391b01f9777c7d2eaae49095f993 Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Tue, 17 Oct 2023 19:06:07 -0700
Subject: [PATCH 6/7] Fix navigation and global styles

---
 src/app/auth/login.tsx      | 20 ++------------------
 src/app/auth/onboarding.tsx | 25 ++++++-------------------
 src/app/auth/signup.tsx     | 20 +++-----------------
 src/styles/globalStyles.ts  |  8 ++++++++
 4 files changed, 19 insertions(+), 54 deletions(-)

diff --git a/src/app/auth/login.tsx b/src/app/auth/login.tsx
index cbb30e16..0c02b8cb 100644
--- a/src/app/auth/login.tsx
+++ b/src/app/auth/login.tsx
@@ -1,23 +1,9 @@
 import React, { useState } from 'react';
 import { Redirect, Link } from 'expo-router';
-import { Alert, StyleSheet, View } from 'react-native';
+import { Alert, View } from 'react-native';
 import { Button, Input } from 'react-native-elements';
 import { useSession } from '../../utils/AuthContext';
-
-const styles = StyleSheet.create({
-  container: {
-    marginTop: 40,
-    padding: 12,
-  },
-  verticallySpaced: {
-    paddingTop: 4,
-    paddingBottom: 4,
-    alignSelf: 'stretch',
-  },
-  mt20: {
-    marginTop: 20,
-  },
-});
+import styles from '../../styles/globalStyles';
 
 function LoginScreen() {
   const sessionHandler = useSession();
@@ -36,8 +22,6 @@ function LoginScreen() {
       password,
     );
 
-    console.log(data);
-
     if (error) Alert.alert(error.message);
     setLoading(false);
   };
diff --git a/src/app/auth/onboarding.tsx b/src/app/auth/onboarding.tsx
index 9b1c36b7..56165c8e 100644
--- a/src/app/auth/onboarding.tsx
+++ b/src/app/auth/onboarding.tsx
@@ -1,26 +1,12 @@
 import { useState, useEffect } from 'react';
-import { StyleSheet, View, Alert, ScrollView, Platform } from 'react-native';
+import { View, Alert, ScrollView, Platform } from 'react-native';
 import { Button, Input } from 'react-native-elements';
 import DateTimePicker from '@react-native-community/datetimepicker';
 import { Redirect, router } from 'expo-router';
 import supabase from '../../utils/supabase';
 import UserStringInput from '../../components/UserStringInput';
 import { useSession } from '../../utils/AuthContext';
-
-const styles = StyleSheet.create({
-  container: {
-    marginTop: 40,
-    padding: 12,
-  },
-  verticallySpaced: {
-    paddingTop: 4,
-    paddingBottom: 4,
-    alignSelf: 'stretch',
-  },
-  mt20: {
-    marginTop: 20,
-  },
-});
+import styles from '../../styles/globalStyles';
 
 function OnboardingScreen() {
   const { session, signOut } = useSession();
@@ -67,7 +53,7 @@ function OnboardingScreen() {
     if (session) getProfile();
   }, [session]);
 
-  const updateProfile = async () => {
+  const updateProfileAndGoHome = async () => {
     try {
       setLoading(true);
       if (!session?.user) throw new Error('No user on the session!');
@@ -104,6 +90,7 @@ function OnboardingScreen() {
       }
 
       Alert.alert('Succesfully updated user!');
+      router.replace('/home');
     } catch (error) {
       if (error instanceof Error) {
         Alert.alert(error.message);
@@ -160,8 +147,8 @@ function OnboardingScreen() {
       )}
       <View style={[styles.verticallySpaced, styles.mt20]}>
         <Button
-          title={loading ? 'Loading ...' : 'Update'}
-          onPress={updateProfile}
+          title={loading ? 'Loading ...' : 'Update profile'}
+          onPress={updateProfileAndGoHome}
           disabled={loading}
         />
       </View>
diff --git a/src/app/auth/signup.tsx b/src/app/auth/signup.tsx
index a23d837e..6638602f 100644
--- a/src/app/auth/signup.tsx
+++ b/src/app/auth/signup.tsx
@@ -1,23 +1,9 @@
 import React, { useEffect, useState } from 'react';
 import { Redirect, Link, router } from 'expo-router';
-import { Alert, StyleSheet, View, Text } from 'react-native';
+import { Alert, View, Text } from 'react-native';
 import { Button, Input } from 'react-native-elements';
 import { useSession } from '../../utils/AuthContext';
-
-const styles = StyleSheet.create({
-  container: {
-    marginTop: 40,
-    padding: 12,
-  },
-  verticallySpaced: {
-    paddingTop: 4,
-    paddingBottom: 4,
-    alignSelf: 'stretch',
-  },
-  mt20: {
-    marginTop: 20,
-  },
-});
+import styles from '../../styles/globalStyles';
 
 function SignUpScreen() {
   const { session, signUp, signInWithEmail } = useSession();
@@ -36,7 +22,7 @@ function SignUpScreen() {
     const { error } = await signInWithEmail(email, password);
 
     if (error) Alert.alert(error.message);
-    else router.push('/auth/onboarding');
+    else router.replace('/auth/onboarding');
 
     setLoading(false);
   };
diff --git a/src/styles/globalStyles.ts b/src/styles/globalStyles.ts
index 2a4e3ad7..003a6d10 100644
--- a/src/styles/globalStyles.ts
+++ b/src/styles/globalStyles.ts
@@ -59,4 +59,12 @@ export default StyleSheet.create({
     textAlign: 'left',
     color: 'black',
   },
+  verticallySpaced: {
+    paddingTop: 4,
+    paddingBottom: 4,
+    alignSelf: 'stretch',
+  },
+  mt20: {
+    marginTop: 20,
+  },
 });

From c58ac50aa2c61f96ef075a25155c83520570692b Mon Sep 17 00:00:00 2001
From: Aditya Pawar <aditya.pawar@warriorlife.net>
Date: Tue, 17 Oct 2023 19:15:13 -0700
Subject: [PATCH 7/7] Add update profile to setting page

---
 src/app/auth/login.tsx      | 10 +++++-----
 src/app/auth/onboarding.tsx | 12 ++++++------
 src/app/auth/signup.tsx     | 12 ++++++------
 src/app/settings.tsx        |  6 +++++-
 src/styles/globalStyles.ts  |  4 ++++
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/app/auth/login.tsx b/src/app/auth/login.tsx
index 0c02b8cb..4015aabd 100644
--- a/src/app/auth/login.tsx
+++ b/src/app/auth/login.tsx
@@ -3,7 +3,7 @@ import { Redirect, Link } from 'expo-router';
 import { Alert, View } from 'react-native';
 import { Button, Input } from 'react-native-elements';
 import { useSession } from '../../utils/AuthContext';
-import styles from '../../styles/globalStyles';
+import globalStyles from '../../styles/globalStyles';
 
 function LoginScreen() {
   const sessionHandler = useSession();
@@ -27,8 +27,8 @@ function LoginScreen() {
   };
 
   return (
-    <View style={styles.container}>
-      <View style={[styles.verticallySpaced, styles.mt20]}>
+    <View style={globalStyles.auth_container}>
+      <View style={[globalStyles.verticallySpaced, globalStyles.mt20]}>
         <Input
           label="Email"
           leftIcon={{ type: 'font-awesome', name: 'envelope' }}
@@ -38,7 +38,7 @@ function LoginScreen() {
           autoCapitalize="none"
         />
       </View>
-      <View style={styles.verticallySpaced}>
+      <View style={globalStyles.verticallySpaced}>
         <Input
           label="Password"
           leftIcon={{ type: 'font-awesome', name: 'lock' }}
@@ -52,7 +52,7 @@ function LoginScreen() {
 
       <Link href="/auth/signup">Don&apos;t have an account? Sign Up</Link>
 
-      <View style={[styles.verticallySpaced, styles.mt20]}>
+      <View style={[globalStyles.verticallySpaced, globalStyles.mt20]}>
         <Button title="Log In" disabled={loading} onPress={signInWithEmail} />
       </View>
     </View>
diff --git a/src/app/auth/onboarding.tsx b/src/app/auth/onboarding.tsx
index 56165c8e..78b16b02 100644
--- a/src/app/auth/onboarding.tsx
+++ b/src/app/auth/onboarding.tsx
@@ -6,7 +6,7 @@ import { Redirect, router } from 'expo-router';
 import supabase from '../../utils/supabase';
 import UserStringInput from '../../components/UserStringInput';
 import { useSession } from '../../utils/AuthContext';
-import styles from '../../styles/globalStyles';
+import globalStyles from '../../styles/globalStyles';
 
 function OnboardingScreen() {
   const { session, signOut } = useSession();
@@ -105,8 +105,8 @@ function OnboardingScreen() {
   }
 
   return (
-    <ScrollView style={styles.container}>
-      <View style={[styles.verticallySpaced, styles.mt20]}>
+    <ScrollView style={globalStyles.auth_container}>
+      <View style={[globalStyles.verticallySpaced, globalStyles.mt20]}>
         <Input label="Email" value={session?.user?.email} disabled />
       </View>
       <UserStringInput
@@ -145,15 +145,15 @@ function OnboardingScreen() {
           }}
         />
       )}
-      <View style={[styles.verticallySpaced, styles.mt20]}>
+      <View style={[globalStyles.verticallySpaced, globalStyles.mt20]}>
         <Button
           title={loading ? 'Loading ...' : 'Update profile'}
           onPress={updateProfileAndGoHome}
           disabled={loading}
         />
       </View>
-      <View style={styles.verticallySpaced}>
-        <Button title="Skip for now" onPress={() => router.push('/home')} />
+      <View style={globalStyles.verticallySpaced}>
+        <Button title="Skip" onPress={() => router.push('/home')} />
       </View>
     </ScrollView>
   );
diff --git a/src/app/auth/signup.tsx b/src/app/auth/signup.tsx
index 6638602f..94db3d4f 100644
--- a/src/app/auth/signup.tsx
+++ b/src/app/auth/signup.tsx
@@ -3,7 +3,7 @@ import { Redirect, Link, router } from 'expo-router';
 import { Alert, View, Text } from 'react-native';
 import { Button, Input } from 'react-native-elements';
 import { useSession } from '../../utils/AuthContext';
-import styles from '../../styles/globalStyles';
+import globalStyles from '../../styles/globalStyles';
 
 function SignUpScreen() {
   const { session, signUp, signInWithEmail } = useSession();
@@ -42,8 +42,8 @@ function SignUpScreen() {
   };
 
   return (
-    <View style={styles.container}>
-      <View style={[styles.verticallySpaced, styles.mt20]}>
+    <View style={globalStyles.auth_container}>
+      <View style={[globalStyles.verticallySpaced, globalStyles.mt20]}>
         <Input
           label="Email"
           leftIcon={{ type: 'font-awesome', name: 'envelope' }}
@@ -53,7 +53,7 @@ function SignUpScreen() {
           autoCapitalize="none"
         />
       </View>
-      <View style={styles.verticallySpaced}>
+      <View style={globalStyles.verticallySpaced}>
         <Input
           label="Password"
           leftIcon={{ type: 'font-awesome', name: 'lock' }}
@@ -65,13 +65,13 @@ function SignUpScreen() {
         />
       </View>
       {signedUp ? (
-        <View style={[styles.verticallySpaced, styles.mt20]}>
+        <View style={[globalStyles.verticallySpaced, globalStyles.mt20]}>
           <Button title="Log In" disabled={loading} onPress={signIn} />
         </View>
       ) : (
         <>
           <Link href="/auth/login">Already have an account? Log In</Link>
-          <View style={[styles.verticallySpaced, styles.mt20]}>
+          <View style={[globalStyles.verticallySpaced, globalStyles.mt20]}>
             <Button
               title="Sign Up"
               disabled={loading}
diff --git a/src/app/settings.tsx b/src/app/settings.tsx
index 93ab0f28..9528acc6 100644
--- a/src/app/settings.tsx
+++ b/src/app/settings.tsx
@@ -1,4 +1,4 @@
-import { Redirect } from 'expo-router';
+import { Redirect, router } from 'expo-router';
 import { Text, View } from 'react-native';
 import { Button } from 'react-native-elements';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -13,6 +13,10 @@ function SettingsScreen() {
     <SafeAreaView style={globalStyles.container}>
       <Text style={globalStyles.h1}>Settings</Text>
       <View>
+        <Button
+          title="Update Profile"
+          onPress={() => router.push('/auth/onboarding')}
+        />
         <Button title="Sign Out" onPress={signOut} />
       </View>
     </SafeAreaView>
diff --git a/src/styles/globalStyles.ts b/src/styles/globalStyles.ts
index 003a6d10..cbe46541 100644
--- a/src/styles/globalStyles.ts
+++ b/src/styles/globalStyles.ts
@@ -9,6 +9,10 @@ export default StyleSheet.create({
     paddingLeft: 24,
     paddingRight: 24,
   },
+  auth_container: {
+    marginTop: 40,
+    padding: 12,
+  },
   h1: {
     // fontFamily: 'DMSans-Bold',
     fontSize: 50,