Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions app/src/app/(account)/account-settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,25 @@ import PrimaryButton from "@components/ui/PrimaryButton";

export default function AccountSettings() {
const router = useRouter();
const { user, username, setUsername } = useSession();
const { originalUsername, loading, handleUpdateProfile } = useAccountSettings();
const { user, setUsername: setUsernameContext } = useSession();
const {
username,
setUsername: setUsernameLocal,
originalUsername,
loading,
handleUpdateProfile,
} = useAccountSettings();

function prevCallback() {
router.replace("/(tabs)/account");
}

// Keep local draft in sync and also push to session context
const handleUsernameChange = (value: string) => {
setUsernameLocal(value); // updates the input instantly
setUsernameContext(value); // persist draft to context (and DB via SessionContext)
};

useFocusEffect(
React.useCallback(() => {
const backAction = () => {
Expand Down Expand Up @@ -45,7 +57,7 @@ export default function AccountSettings() {
<OutlinedTextInput
label="Username"
value={username || ""}
onChangeText={setUsername}
onChangeText={handleUsernameChange}
testID="username"
/>
</View>
Expand Down
4 changes: 4 additions & 0 deletions app/src/app/(auth)/sign-up.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import PrimaryButton from "@components/ui/PrimaryButton";

import { supabase } from "@utils/supabase";
import { createUserProfile, checkUsernameExists } from "@services/account-service";
import { useSession } from "@contexts/SessionContext";

const back = require("@assets/left-arrow.png");

Expand All @@ -24,6 +25,7 @@ const signUpSchema = z.object({

export default function SignUp() {
const router = useRouter();
const { setUsername } = useSession();

const [form, setForm] = useState({ username: "", email: "", password: "", isCommuter: false });
const [loading, setLoading] = useState(false);
Expand Down Expand Up @@ -74,6 +76,8 @@ export default function SignUp() {

try {
await createUserProfile(user.id, form.username, form.isCommuter);
// Update global session context so other components can see the new username right away
setUsername(form.username);
Alert.alert("Sign-up successful!");
} catch (err) {
let errorMessage = "An unknown error occurred.";
Expand Down
5 changes: 5 additions & 0 deletions app/src/app/(tabs)/account.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import { Text, SafeAreaView, View, Alert, ScrollView } from "react-native";
import Constants from "expo-constants";

import { logoutUser } from "@services/account-service";
import { useSession } from "@contexts/SessionContext";
Expand All @@ -20,6 +21,9 @@ export default function Account() {
const { user, username } = useSession();
const { userRole, points, joinedDate, loading } = useAccountDetails(user?.id);

const appVersion =
Constants.expoConfig?.version ?? (Constants?.manifest as any)?.version ?? "dev";

async function handleLogout() {
try {
await logoutUser();
Expand Down Expand Up @@ -96,6 +100,7 @@ export default function Account() {
)}
</View>
<SecondaryButton label="Log out" onPress={handleLogoutPress} />
<Text className="text-gray-500 text-center mt-4">Version {appVersion}</Text>
</View>
</ScrollView>
</SafeAreaView>
Expand Down
Loading