Merge pull request #21 from jjbrunton/staging

chore(release): publish v1.0.7 metadata

apps/mobile/app/(app)/matches.tsx

@@ -69,12 +69,10 @@ export default function MatchesScreen() {
         checkNudgeCooldown,
     } = useMatchStore();
     const { user, couple, partner } = useAuthStore();
-    const userId = user?.id;
     const router = useRouter();
     const { width } = useWindowDimensions();
     const isWideScreen = width > MAX_CONTENT_WIDTH;
     const [showTutorial, setShowTutorial] = useState(false);
-    const tutorialDismissedRef = useRef(false);
     const [nudgeFeedback, setNudgeFeedback] = useState<string | null>(null);
     const [headerHeight, setHeaderHeight] = useState(130);
 
@@ -106,30 +104,21 @@ export default function MatchesScreen() {
     // Check if tutorial should be shown when screen is focused or matches change
     useFocusEffect(
         useCallback(() => {
-            let isActive = true;
-
             const checkTutorial = async () => {
-                if (matches.length > 0 && userId) {
+                if (matches.length > 0) {
-                    const seen = await hasSeenMatchesTutorial(userId);
+                    const seen = await hasSeenMatchesTutorial();
-                    if (isActive && !tutorialDismissedRef.current && !seen) {
+                    if (!seen) {
                         setShowTutorial(true);
                     }
                 }
             };
-            void checkTutorial();
+            checkTutorial();
-
+        }, [matches.length])
-            return () => {
-                isActive = false;
-            };
-        }, [matches.length, userId])
     );
 
     const handleTutorialComplete = async () => {
-        if (!userId) return;
+        await markMatchesTutorialSeen();
-
-        tutorialDismissedRef.current = true;
         setShowTutorial(false);
-        await markMatchesTutorialSeen(userId);
     };
 
     // Load whichever view is showing, once. Returning to this tab reuses what is

apps/mobile/src/__tests__/lib/matchesTutorialSeen.test.ts

@@ -1,45 +0,0 @@
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import * as SecureStore from "expo-secure-store";
-import {
-    hasSeenMatchesTutorial,
-    markMatchesTutorialSeen,
-    resetMatchesTutorial,
-} from "@/lib/matchesTutorialSeen";
-
-jest.mock("expo-secure-store", () => ({
-    getItemAsync: jest.fn(),
-}));
-
-describe("matchesTutorialSeen", () => {
-    beforeEach(async () => {
-        await AsyncStorage.clear();
-        jest.mocked(SecureStore.getItemAsync).mockReset();
-        jest.mocked(SecureStore.getItemAsync).mockResolvedValue(null);
-    });
-
-    it("persists a dismissal for the signed-in account", async () => {
-        await markMatchesTutorialSeen("user-1");
-
-        await expect(hasSeenMatchesTutorial("user-1")).resolves.toBe(true);
-    });
-
-    it("does not dismiss the tutorial for another account on the same device", async () => {
-        await markMatchesTutorialSeen("user-1");
-
-        await expect(hasSeenMatchesTutorial("user-2")).resolves.toBe(false);
-    });
-
-    it("migrates an existing legacy dismissal into durable account storage", async () => {
-        jest.mocked(SecureStore.getItemAsync).mockResolvedValue("true");
-
-        await expect(hasSeenMatchesTutorial("user-1")).resolves.toBe(true);
-        await expect(AsyncStorage.getItem("matches_tutorial_seen_user-1")).resolves.toBe("true");
-    });
-
-    it("lets the development reset show the tutorial for the current account again", async () => {
-        await markMatchesTutorialSeen("user-1");
-        await resetMatchesTutorial("user-1");
-
-        await expect(hasSeenMatchesTutorial("user-1")).resolves.toBe(false);
-    });
-});

apps/mobile/src/features/profile/ProfileScreen.tsx

@@ -223,8 +223,7 @@ export function ProfileScreen() {
                             label="Reset Matches Tutorial"
                             description="Show the tutorial again"
                             onPress={async () => {
-                                if (!user?.id) return;
+                                await resetMatchesTutorial();
-                                await resetMatchesTutorial(user.id);
                                 Alert.alert("Success", "Matches tutorial has been reset.");
                             }}
                         />

apps/mobile/src/lib/matchesTutorialSeen.ts

@@ -1,70 +1,51 @@
-import AsyncStorage from "@react-native-async-storage/async-storage";
+import * as SecureStore from "expo-secure-store";
-import * as SecureStore from "expo-secure-store";
+import { Platform } from "react-native";
-import { Platform } from "react-native";
+
-
+const STORAGE_KEY = "matches_tutorial_seen";
-const STORAGE_KEY_PREFIX = "matches_tutorial_seen";
+
-const LEGACY_STORAGE_KEY = "matches_tutorial_seen";
+async function getStorage(): Promise<boolean> {
-
+    try {
-const buildKey = (userId: string): string => `${STORAGE_KEY_PREFIX}_${userId}`;
+        let data: string | null = null;
-
+
-async function getStorage(userId: string): Promise<boolean> {
+        if (Platform.OS === "web") {
-    try {
+            if (typeof window !== "undefined" && typeof window.localStorage !== "undefined") {
-        const key = buildKey(userId);
+                data = window.localStorage.getItem(STORAGE_KEY);
-
+            }
-        if (Platform.OS === "web") {
+        } else {
-            if (typeof window !== "undefined" && typeof window.localStorage !== "undefined") {
+            data = await SecureStore.getItemAsync(STORAGE_KEY);
-                return window.localStorage.getItem(key) === "true";
+        }
-            }
+
-
+        return data === "true";
-            return false;
+    } catch (error) {
-        }
+        console.error("Error reading matches tutorial state:", error);
-
+    }
-        const storedValue = await AsyncStorage.getItem(key);
+    return false;
-        if (storedValue !== null) {
+}
-            return storedValue === "true";
+
-        }
+async function setStorage(seen: boolean): Promise<void> {
-
+    try {
-        // Keep dismissals made before the account-scoped AsyncStorage key was
+        const data = seen ? "true" : "false";
-        // introduced. Future reads use the durable app storage key above.
+
-        const legacyValue = await SecureStore.getItemAsync(LEGACY_STORAGE_KEY);
+        if (Platform.OS === "web") {
-        if (legacyValue === "true") {
+            if (typeof window !== "undefined" && typeof window.localStorage !== "undefined") {
-            await AsyncStorage.setItem(key, "true");
+                window.localStorage.setItem(STORAGE_KEY, data);
-            return true;
+            }
-        }
+        } else {
-
+            await SecureStore.setItemAsync(STORAGE_KEY, data);
-        return false;
+        }
-    } catch (error) {
+    } catch (error) {
-        console.error("Error reading matches tutorial state:", error);
+        console.error("Error saving matches tutorial state:", error);
-    }
+    }
-    return false;
+}
-}
+
-
+export async function hasSeenMatchesTutorial(): Promise<boolean> {
-async function setStorage(userId: string, seen: boolean): Promise<void> {
+    return getStorage();
-    try {
+}
-        const data = seen ? "true" : "false";
+
-        const key = buildKey(userId);
+export async function markMatchesTutorialSeen(): Promise<void> {
-
+    await setStorage(true);
-        if (Platform.OS === "web") {
+}
-            if (typeof window !== "undefined" && typeof window.localStorage !== "undefined") {
+
-                window.localStorage.setItem(key, data);
+export async function resetMatchesTutorial(): Promise<void> {
-            }
+    await setStorage(false);
-        } else {
+}
-            await AsyncStorage.setItem(key, data);
-        }
-    } catch (error) {
-        console.error("Error saving matches tutorial state:", error);
-    }
-}
-
-/** The Matches tutorial is shown at most once per signed-in account. */
-export async function hasSeenMatchesTutorial(userId: string): Promise<boolean> {
-    return getStorage(userId);
-}
-
-export async function markMatchesTutorialSeen(userId: string): Promise<void> {
-    await setStorage(userId, true);
-}
-
-export async function resetMatchesTutorial(userId: string): Promise<void> {
-    await setStorage(userId, false);
-}