Update icons, screenshots, and UX improvements

- Refactor icon picker to use full Ionicons set dynamically - Add date sort toggle to My Answers screen - Fix match deduplication and show total count on home - Clear stale data when switching chats - Update app store screenshots - Bump build number to 25 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-10-31 18:19:43 +00:00 · 2026-01-08 19:58:29 +00:00
1 parent c48936686e
commit b60b72a289
@@ -30,11 +30,10 @@
        "emoji-mart": "^5.6.0",
        "lucide-react": "^0.309.0",
        "openai": "^4.24.0",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
-        "react-icons": "^4.12.0",
-        "react-router-dom": "^6.21.0",
-
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
+        "react-icons": "^4.12.0",
+        "react-router-dom": "^6.21.0",
        "recharts": "^3.6.0",
        "sonner": "^1.3.1",
        "tailwind-merge": "^2.2.0"
@@ -1,48 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import type { IconType } from 'react-icons';
-import {
-    IoHeartOutline,
-    IoHeartHalfOutline,
-    IoHeartCircleOutline,
-    IoChatbubblesOutline,
-    IoChatboxOutline,
-    IoMailOutline,
-    IoFlowerOutline,
-    IoWineOutline,
-    IoRestaurantOutline,
-    IoCafeOutline,
-    IoAirplaneOutline,
-    IoCarOutline,
-    IoCompassOutline,
-    IoMapOutline,
-    IoHomeOutline,
-    IoPeopleOutline,
-    IoPersonOutline,
-    IoEyeOffOutline,
-    IoKeyOutline,
-    IoLockClosedOutline,
-    IoDiceOutline,
-    IoGiftOutline,
-    IoSparklesOutline,
-    IoStarOutline,
-    IoFlameOutline,
-    IoFlashOutline,
-    IoMoonOutline,
-    IoSunnyOutline,
-    IoFlagOutline,
-    IoCalendarOutline,
-    IoCheckboxOutline,
-    IoTrophyOutline,
-    IoLayersOutline,
-    IoCubeOutline,
-    IoFolderOutline,
-    IoBookmarkOutline,
-    IoBulbOutline,
-    IoColorWandOutline,
-    IoSyncOutline,
-    IoRefreshOutline,
-    IoBriefcaseOutline,
-} from 'react-icons/io5';
+import * as Io5Icons from 'react-icons/io5';
 import { Button } from './button';
 import { Input } from './input';

@@ -51,68 +9,28 @@ interface IconOption {
    Icon: IconType;
 }

-const ICON_OPTIONS: IconOption[] = [
-    // Relationships & Love
-    { name: 'heart-outline', Icon: IoHeartOutline },
-    { name: 'heart-half-outline', Icon: IoHeartHalfOutline },
-    { name: 'heart-circle-outline', Icon: IoHeartCircleOutline },
+/**
+ * Convert PascalCase component name to kebab-case Ionicon name.
+ * e.g., "IoHeartOutline" -> "heart-outline"
+ */
+function toKebabCase(componentName: string): string {
+    // Remove "Io" prefix
+    const withoutPrefix = componentName.slice(2);
+    // Convert PascalCase to kebab-case
+    return withoutPrefix
+        .replace(/([a-z])([A-Z])/g, '$1-$2')
+        .replace(/([A-Z])([A-Z][a-z])/g, '$1-$2')
+        .toLowerCase();
+}

-    // Communication
-    { name: 'chatbubbles-outline', Icon: IoChatbubblesOutline },
-    { name: 'chatbox-outline', Icon: IoChatboxOutline },
-    { name: 'mail-outline', Icon: IoMailOutline },
-
-    // Romance & Dates
-    { name: 'flower-outline', Icon: IoFlowerOutline },
-    { name: 'wine-outline', Icon: IoWineOutline },
-    { name: 'restaurant-outline', Icon: IoRestaurantOutline },
-    { name: 'cafe-outline', Icon: IoCafeOutline },
-
-    // Adventure & Travel
-    { name: 'airplane-outline', Icon: IoAirplaneOutline },
-    { name: 'car-outline', Icon: IoCarOutline },
-    { name: 'compass-outline', Icon: IoCompassOutline },
-    { name: 'map-outline', Icon: IoMapOutline },
-
-    // Home & Family
-    { name: 'home-outline', Icon: IoHomeOutline },
-    { name: 'people-outline', Icon: IoPeopleOutline },
-    { name: 'person-outline', Icon: IoPersonOutline },
-
-    // Mystery & Secrets
-    { name: 'eye-off-outline', Icon: IoEyeOffOutline },
-    { name: 'key-outline', Icon: IoKeyOutline },
-    { name: 'lock-closed-outline', Icon: IoLockClosedOutline },
-
-    // Fun & Games
-    { name: 'dice-outline', Icon: IoDiceOutline },
-    { name: 'gift-outline', Icon: IoGiftOutline },
-    { name: 'sparkles-outline', Icon: IoSparklesOutline },
-    { name: 'star-outline', Icon: IoStarOutline },
-
-    // Intimacy
-    { name: 'flame-outline', Icon: IoFlameOutline },
-    { name: 'flash-outline', Icon: IoFlashOutline },
-    { name: 'moon-outline', Icon: IoMoonOutline },
-    { name: 'sunny-outline', Icon: IoSunnyOutline },
-
-    // Goals & Planning
-    { name: 'flag-outline', Icon: IoFlagOutline },
-    { name: 'calendar-outline', Icon: IoCalendarOutline },
-    { name: 'checkbox-outline', Icon: IoCheckboxOutline },
-    { name: 'trophy-outline', Icon: IoTrophyOutline },
-
-    // General
-    { name: 'layers-outline', Icon: IoLayersOutline },
-    { name: 'cube-outline', Icon: IoCubeOutline },
-    { name: 'folder-outline', Icon: IoFolderOutline },
-    { name: 'bookmark-outline', Icon: IoBookmarkOutline },
-    { name: 'bulb-outline', Icon: IoBulbOutline },
-    { name: 'color-wand-outline', Icon: IoColorWandOutline },
-    { name: 'sync-outline', Icon: IoSyncOutline },
-    { name: 'refresh-outline', Icon: IoRefreshOutline },
-    { name: 'briefcase-outline', Icon: IoBriefcaseOutline },
-];
+// Build icon options from all Io5 icons dynamically
+const ICON_OPTIONS: IconOption[] = Object.entries(Io5Icons)
+    .filter(([name]) => name.startsWith('Io'))
+    .map(([componentName, Icon]) => ({
+        name: toKebabCase(componentName),
+        Icon: Icon as IconType,
+    }))
+    .sort((a, b) => a.name.localeCompare(b.name));

 const ICONS_BY_NAME = ICON_OPTIONS.reduce<Record<string, IconOption>>((acc, option) => {
    acc[option.name] = option;
@@ -168,8 +86,9 @@ export function IconPicker({ value, onChange }: IconPickerProps) {
        return ICON_OPTIONS.filter((option) => option.name.includes(normalized));
    }, [query]);

-    const SelectedIcon = ICONS_BY_NAME[value]?.Icon;
-    const buttonLabel = SelectedIcon ? value : value ? 'Legacy icon' : 'Select an icon';
+    const selectedOption = ICONS_BY_NAME[value];
+    const SelectedIcon = selectedOption?.Icon;
+    const buttonLabel = selectedOption ? value : value ? 'Legacy icon' : 'Select an icon';

    return (
        <div className="relative" ref={containerRef}>
@@ -16,7 +16,7 @@
    "ios": {
      "supportsTablet": false,
      "bundleIdentifier": "com.sauci.app",
-      "buildNumber": "24",
+      "buildNumber": "25",
      "usesAppleSignIn": true,
      "infoPlist": {
        "UIBackgroundModes": [
@@ -22,7 +22,7 @@ const ACCENT_COLOR = colors.primary;

 export default function HomeScreen() {
    const { user, partner, couple } = useAuthStore();
-    const { matches, newMatchesCount, fetchMatches } = useMatchStore();
+    const { matches, newMatchesCount, totalCount, fetchMatches } = useMatchStore();
    const { enabledPackIds, fetchPacks } = usePacksStore();
    const { width } = useWindowDimensions();

@@ -146,7 +146,7 @@ export default function HomeScreen() {
                                        color={matches.length > 0 ? colors.text : ACCENT_COLOR}
                                    />
                                </View>
-                                <Text style={styles.statNumber}>{matches.length}</Text>
+                                <Text style={styles.statNumber}>{totalCount ?? matches.length}</Text>
                                <Text style={styles.statLabel}>Matches</Text>
                            </View>
                        </TouchableOpacity>
@@ -47,7 +47,7 @@ const AnimatedSectionList = Animated.createAnimatedComponent(SectionList);
 type GroupByOption = "pack" | "date" | "answer";

 export default function MyAnswersScreen() {
-    const { responses, isLoading, isLoadingMore, hasMore, groupBy, fetchResponses, setGroupBy, totalCount } = useResponsesStore();
+    const { responses, isLoading, isLoadingMore, hasMore, groupBy, dateSortOrder, fetchResponses, setGroupBy, toggleDateSortOrder, totalCount } = useResponsesStore();
    const { user } = useAuthStore();
    const router = useRouter();
    const params = useLocalSearchParams();
@@ -123,7 +123,7 @@ export default function MyAnswersScreen() {
        }
    }, [isLoading, isLoadingMore, hasMore]);

-    const sections = groupResponses(responses, groupBy);
+    const sections = groupResponses(responses, groupBy, dateSortOrder);

    const handleEditPress = (response: ResponseWithQuestion) => {
        setSelectedResponse(response);
@@ -164,16 +164,39 @@ export default function MyAnswersScreen() {
        );
    };

-    const GroupByButton = ({ option, label }: { option: GroupByOption; label: string }) => (
-        <TouchableOpacity
-            style={[styles.groupByButton, groupBy === option && styles.groupByButtonActive]}
-            onPress={() => setGroupBy(option)}
-        >
-            <Text style={[styles.groupByText, groupBy === option && styles.groupByTextActive]}>
-                {label}
-            </Text>
-        </TouchableOpacity>
-    );
+    const GroupByButton = ({ option, label }: { option: GroupByOption; label: string }) => {
+        const isActive = groupBy === option;
+        const isDateButton = option === "date";
+        const showChevron = isDateButton && isActive;
+
+        const handlePress = () => {
+            if (isDateButton && isActive) {
+                // Toggle sort order when date is already selected
+                toggleDateSortOrder();
+            } else {
+                setGroupBy(option);
+            }
+        };
+
+        return (
+            <TouchableOpacity
+                style={[styles.groupByButton, isActive && styles.groupByButtonActive]}
+                onPress={handlePress}
+            >
+                <Text style={[styles.groupByText, isActive && styles.groupByTextActive]}>
+                    {label}
+                </Text>
+                {showChevron && (
+                    <Ionicons
+                        name={dateSortOrder === "newest" ? "chevron-down" : "chevron-up"}
+                        size={14}
+                        color={ACCENT}
+                        style={styles.sortChevron}
+                    />
+                )}
+            </TouchableOpacity>
+        );
+    };

    if (!user) {
        return (
@@ -441,6 +464,8 @@ const styles = StyleSheet.create({
        marginTop: spacing.md,
    },
    groupByButton: {
+        flexDirection: "row",
+        alignItems: "center",
        paddingHorizontal: spacing.md,
        paddingVertical: spacing.sm,
        borderRadius: radius.full,
@@ -461,6 +486,9 @@ const styles = StyleSheet.create({
        color: ACCENT,
        fontWeight: "600",
    },
+    sortChevron: {
+        marginLeft: spacing.xs,
+    },
    // Section header
    sectionHeader: {
        paddingVertical: spacing.sm,
@@ -47,7 +47,7 @@
      </dict>
    </array>
    <key>CFBundleVersion</key>
-    <string>20</string>
+    <string>25</string>
    <key>LSMinimumSystemVersion</key>
    <string>12.0</string>
    <key>LSRequiresIPhoneOS</key>
@@ -60,7 +60,7 @@
      <true/>
    </dict>
    <key>NSCameraUsageDescription</key>
-    <string>Sauci uses your camera to take photos and videos that you can share privately with your partner in encrypted chat messages.</string>
+    <string>Sauci uses your camera to take photos and videos that you can share privately with your partner.</string>
    <key>NSFaceIDUsageDescription</key>
    <string>Sauci uses Face ID to unlock the app and keep your conversations private.</string>
    <key>NSMicrophoneUsageDescription</key>
@@ -68,7 +68,7 @@
    <key>NSPhotoLibraryAddUsageDescription</key>
    <string>Sauci saves photos and videos from your partner's messages to your photo library when you tap the save button.</string>
    <key>NSPhotoLibraryUsageDescription</key>
-    <string>Sauci uses your photo library so you can select photos and videos to share privately with your partner in encrypted chat messages.</string>
+    <string>Sauci uses your photo library so you can select photos and videos to share privately with your partner.</string>
    <key>NSUserActivityTypes</key>
    <array>
      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
@@ -149,6 +149,7 @@ export const ChatScreen: React.FC = () => {
        if (!matchId) return;

        const fetchMatch = async () => {
+            setMatch(null); // Clear previous match data immediately
            const { data } = await supabase
                .from("matches")
                .select("*, question:questions(*)")
@@ -104,6 +104,7 @@ export const useMessageSubscription = (

        const fetchMessagesAndMarkRead = async () => {
            setLoading(true);
+            setAllMessages([]); // Clear previous chat's messages immediately

            const { data } = await supabase
                .from('messages')
@@ -1,7 +1,15 @@
-import type { Ionicons } from "@expo/vector-icons";
+import { Ionicons } from "@expo/vector-icons";

 type IoniconsName = keyof typeof Ionicons.glyphMap;

+/**
+ * Checks if a string is a valid Ionicons name.
+ * Uses the actual Ionicons.glyphMap for runtime validation.
+ */
+function isValidIonicon(name: string): name is IoniconsName {
+    return name in Ionicons.glyphMap;
+}
+
 // Legacy emoji mappings (for backwards compatibility with existing packs)
 const EMOJI_TO_IONICON: Record<string, IoniconsName> = {
    // Career & Professional
@@ -49,63 +57,20 @@ export const PACK_ICON_MAP = EMOJI_TO_IONICON;

 export const DEFAULT_PACK_ICON: IoniconsName = "layers-outline";

-// List of valid Ionicon names (subset we support)
-const VALID_IONICONS = new Set([
-    "heart-outline",
-    "heart-half-outline",
-    "heart-circle-outline",
-    "chatbubbles-outline",
-    "chatbox-outline",
-    "mail-outline",
-    "flower-outline",
-    "wine-outline",
-    "restaurant-outline",
-    "cafe-outline",
-    "airplane-outline",
-    "car-outline",
-    "compass-outline",
-    "map-outline",
-    "home-outline",
-    "people-outline",
-    "person-outline",
-    "eye-off-outline",
-    "key-outline",
-    "lock-closed-outline",
-    "dice-outline",
-    "gift-outline",
-    "sparkles-outline",
-    "star-outline",
-    "flame-outline",
-    "flash-outline",
-    "moon-outline",
-    "sunny-outline",
-    "flag-outline",
-    "calendar-outline",
-    "checkbox-outline",
-    "trophy-outline",
-    "layers-outline",
-    "cube-outline",
-    "folder-outline",
-    "bookmark-outline",
-    "bulb-outline",
-    "color-wand-outline",
-    "sync-outline",
-    "refresh-outline",
-    "briefcase-outline",
-]);
-
 /**
 * Converts an icon value to an Ionicons name.
 * Handles both:
- * - Ionicon names directly (new packs): "briefcase-outline" -> "briefcase-outline"
+ * - Any valid Ionicon name directly: "briefcase-outline" -> "briefcase-outline"
 * - Legacy emojis (existing packs): "💼" -> "briefcase-outline"
 */
 export function getPackIconName(icon: string | null | undefined): IoniconsName {
    if (!icon) return DEFAULT_PACK_ICON;

-    if (VALID_IONICONS.has(icon)) {
-        return icon as IoniconsName;
+    // Check if it's a valid Ionicon name (supports the full Ionicons set)
+    if (isValidIonicon(icon)) {
+        return icon;
    }

+    // Fall back to emoji mapping for legacy packs
    return EMOJI_TO_IONICON[icon] || DEFAULT_PACK_ICON;
 }
@@ -5,4 +5,4 @@ export { usePacksStore } from "./packsStore";
 export { useMessageStore } from "./messageStore";
 export { useSubscriptionStore } from "./subscriptionStore";
 export { useResponsesStore, groupResponses } from "./responsesStore";
-export type { ResponseWithQuestion, UpdateResponseResult, GroupByOption } from "./responsesStore";
+export type { ResponseWithQuestion, UpdateResponseResult, GroupByOption, DateSortOrder } from "./responsesStore";
@@ -147,15 +147,27 @@ export const useMatchStore = create<MatchState>((set, get) => ({
            // Ideally we should have a separate query for count, but we'll just count in current batch
            const newMatchesInBatch = sortedData.filter((m) => m.is_new).length;
            
-            set((state) => ({
-                matches: refresh ? sortedData : [...state.matches, ...sortedData],
+            set((state) => {
+                // Deduplicate matches by ID when appending new pages
+                const mergedMatches = refresh
+                    ? sortedData
+                    : [...state.matches, ...sortedData].reduce<Match[]>((acc, match) => {
+                        if (!acc.some((m: Match) => m.id === match.id)) {
+                            acc.push(match);
+                        }
+                        return acc;
+                    }, []);
+
+                return {
+                matches: mergedMatches,
                newMatchesCount: refresh ? newMatchesInBatch : state.newMatchesCount + newMatchesInBatch,
                totalCount: refresh ? totalCount : state.totalCount,
                isLoading: false,
                isLoadingMore: false,
                page: currentPage + 1,
                hasMore: matches.length === BATCH_SIZE
-            }));
+                };
+            });
        } catch (err) {
            console.error("Error fetching matches:", err);
            set({ error: "Failed to load matches", isLoading: false, isLoadingMore: false });
@@ -32,6 +32,7 @@ export interface UpdateResponseResult {
 }

 export type GroupByOption = "pack" | "date" | "answer";
+export type DateSortOrder = "newest" | "oldest";

 const BATCH_SIZE = 20;

@@ -40,6 +41,7 @@ interface ResponsesState {
    isLoading: boolean;
    isLoadingMore: boolean;
    groupBy: GroupByOption;
+    dateSortOrder: DateSortOrder;
    hasMore: boolean;
    page: number;
    totalCount: number | null;
@@ -50,6 +52,8 @@ interface ResponsesState {
        confirmDelete?: boolean
    ) => Promise<UpdateResponseResult>;
    setGroupBy: (groupBy: GroupByOption) => void;
+    setDateSortOrder: (order: DateSortOrder) => void;
+    toggleDateSortOrder: () => void;
    clearResponses: () => void;
 }

@@ -57,7 +61,8 @@ export const useResponsesStore = create<ResponsesState>((set, get) => ({
    responses: [],
    isLoading: false,
    isLoadingMore: false,
-    groupBy: "pack",
+    groupBy: "date",
+    dateSortOrder: "newest",
    hasMore: true,
    page: 0,
    totalCount: null,
@@ -270,15 +275,26 @@ export const useResponsesStore = create<ResponsesState>((set, get) => ({
        set({ groupBy });
    },

-clearResponses: () => {
-        set({ responses: [], isLoading: false, groupBy: "pack", page: 0, hasMore: true, isLoadingMore: false, totalCount: null });
+    setDateSortOrder: (order: DateSortOrder) => {
+        set({ dateSortOrder: order });
+    },
+
+    toggleDateSortOrder: () => {
+        set((state) => ({
+            dateSortOrder: state.dateSortOrder === "newest" ? "oldest" : "newest",
+        }));
+    },
+
+    clearResponses: () => {
+        set({ responses: [], isLoading: false, groupBy: "date", dateSortOrder: "newest", page: 0, hasMore: true, isLoadingMore: false, totalCount: null });
    },
 }));

 // Helper function to group responses
 export function groupResponses(
    responses: ResponseWithQuestion[],
-    groupBy: GroupByOption
+    groupBy: GroupByOption,
+    dateSortOrder: DateSortOrder = "newest"
 ): { title: string; data: ResponseWithQuestion[] }[] {
    if (groupBy === "pack") {
        // Group by pack name
@@ -307,9 +323,16 @@ export function groupResponses(
    }

    if (groupBy === "date") {
+        // Sort responses by date based on sort order
+        const sortedResponses = [...responses].sort((a, b) => {
+            const dateA = new Date(a.created_at).getTime();
+            const dateB = new Date(b.created_at).getTime();
+            return dateSortOrder === "newest" ? dateB - dateA : dateA - dateB;
+        });
+
        // Group by date (day)
        const groups = new Map<string, ResponseWithQuestion[]>();
-        responses.forEach((r) => {
+        sortedResponses.forEach((r) => {
            const date = new Date(r.created_at).toLocaleDateString("en-US", {
                year: "numeric",
                month: "long",
@@ -0,0 +1,173 @@
+-- Filter individual questions by user's max_intensity preference
+-- This fixes a bug where users would see intense questions despite having a gentle comfort zone
+
+CREATE OR REPLACE FUNCTION get_recommended_questions(target_pack_id UUID DEFAULT NULL)
+RETURNS TABLE(
+  id UUID,
+  text TEXT,
+  partner_text TEXT,
+  is_two_part BOOLEAN,
+  pack_id UUID,
+  intensity INTEGER,
+  partner_answered BOOLEAN,
+  allowed_couple_genders TEXT[],
+  target_user_genders TEXT[]
+)
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = 'public'
+AS $$
+DECLARE
+  v_user_id UUID;
+  v_couple_id UUID;
+  v_partner_id UUID;
+  v_user_gender TEXT;
+  v_partner_gender TEXT;
+  v_couple_type TEXT;
+  v_has_premium BOOLEAN;
+  v_gap_threshold INTEGER;
+  v_gap_count INTEGER;
+  v_user_max_intensity INTEGER;
+BEGIN
+  v_user_id := auth.uid();
+
+  SELECT p.couple_id, p.gender, COALESCE(p.max_intensity, 5)
+  INTO v_couple_id, v_user_gender, v_user_max_intensity
+  FROM public.profiles p
+  WHERE p.id = v_user_id;
+
+  IF v_couple_id IS NULL THEN
+    RETURN;
+  END IF;
+
+  SELECT p.id, p.gender INTO v_partner_id, v_partner_gender
+  FROM public.profiles p
+  WHERE p.couple_id = v_couple_id AND p.id != v_user_id
+  LIMIT 1;
+
+  -- Check answer gap threshold (only when not browsing a specific pack)
+  IF v_partner_id IS NOT NULL AND target_pack_id IS NULL THEN
+    -- Get threshold from app_config
+    SELECT COALESCE(ac.answer_gap_threshold, 10) INTO v_gap_threshold
+    FROM app_config ac
+    LIMIT 1;
+
+    -- If threshold > 0, check the gap
+    IF v_gap_threshold > 0 THEN
+      -- Count questions in ENABLED packs where user answered but partner hasn't
+      WITH enabled_packs AS (
+        SELECT cp.pack_id
+        FROM couple_packs cp
+        WHERE cp.couple_id = v_couple_id AND cp.enabled = true
+      )
+      SELECT COUNT(*)::integer INTO v_gap_count
+      FROM responses r
+      INNER JOIN questions q ON q.id = r.question_id
+      WHERE r.user_id = v_user_id
+      AND r.couple_id = v_couple_id
+      AND EXISTS (SELECT 1 FROM enabled_packs)
+      AND q.pack_id IN (SELECT ep.pack_id FROM enabled_packs ep)
+      AND NOT EXISTS (
+        SELECT 1 FROM responses pr
+        WHERE pr.question_id = r.question_id
+        AND pr.user_id = v_partner_id
+      );
+
+      -- If over threshold, return empty (old apps see "All caught up!")
+      IF v_gap_count >= v_gap_threshold THEN
+        RETURN;
+      END IF;
+    END IF;
+  END IF;
+
+  IF v_user_gender IS NOT NULL AND v_partner_gender IS NOT NULL THEN
+      IF v_user_gender < v_partner_gender THEN
+        v_couple_type := v_user_gender || '+' || v_partner_gender;
+      ELSE
+        v_couple_type := v_partner_gender || '+' || v_user_gender;
+      END IF;
+  END IF;
+
+  v_has_premium := public.has_premium_access(v_user_id);
+
+  RETURN QUERY
+  WITH user_config_exists AS (
+    SELECT 1 FROM public.couple_packs WHERE couple_id = v_couple_id LIMIT 1
+  ),
+  active_packs AS (
+    SELECT target_pack_id AS pack_id
+    WHERE target_pack_id IS NOT NULL
+    AND EXISTS (
+      SELECT 1 FROM public.question_packs qp
+      WHERE qp.id = target_pack_id
+      AND (qp.is_premium = FALSE OR v_has_premium = TRUE)
+    )
+    UNION ALL
+    SELECT cp.pack_id FROM public.couple_packs cp
+    INNER JOIN public.question_packs qp ON qp.id = cp.pack_id
+    WHERE target_pack_id IS NULL
+    AND cp.couple_id = v_couple_id
+    AND cp.enabled = TRUE
+    AND (qp.is_premium = FALSE OR v_has_premium = TRUE)
+    AND EXISTS (SELECT 1 FROM user_config_exists)
+    UNION ALL
+    SELECT p.id AS pack_id FROM public.question_packs p
+    WHERE target_pack_id IS NULL
+    AND p.is_public = TRUE
+    AND (p.is_premium = FALSE OR v_has_premium = TRUE)
+    AND NOT EXISTS (SELECT 1 FROM user_config_exists)
+  )
+  SELECT
+    q.id,
+    CASE
+      WHEN q.partner_text IS NOT NULL AND EXISTS (
+        SELECT 1 FROM public.responses r
+        WHERE r.question_id = q.id
+        AND r.couple_id = v_couple_id
+        AND r.user_id != v_user_id
+      ) THEN q.partner_text
+      ELSE q.text
+    END as text,
+    q.partner_text,
+    q.partner_text IS NOT NULL as is_two_part,
+    q.pack_id,
+    q.intensity,
+    EXISTS (
+      SELECT 1 FROM public.responses r
+      WHERE r.question_id = q.id
+      AND r.couple_id = v_couple_id
+      AND r.user_id != v_user_id
+    ) AS partner_answered,
+    q.allowed_couple_genders,
+    q.target_user_genders
+  FROM public.questions q
+  WHERE q.pack_id IN (SELECT ap.pack_id FROM active_packs ap)
+  AND NOT EXISTS (
+    SELECT 1 FROM public.responses r
+    WHERE r.question_id = q.id
+    AND r.user_id = v_user_id
+  )
+  AND (
+    q.allowed_couple_genders IS NULL
+    OR v_couple_type IS NULL
+    OR v_couple_type = ANY(q.allowed_couple_genders)
+  )
+  AND (
+    q.target_user_genders IS NULL
+    OR v_user_gender = ANY(q.target_user_genders)
+    OR EXISTS (
+      SELECT 1 FROM public.responses r
+      WHERE r.question_id = q.id
+      AND r.couple_id = v_couple_id
+      AND r.user_id != v_user_id
+    )
+  )
+  -- Filter by user's max_intensity preference
+  AND (
+    q.intensity IS NULL
+    OR q.intensity <= v_user_max_intensity
+  );
+END;
+$$;
+
+COMMENT ON FUNCTION get_recommended_questions(UUID) IS 'Returns recommended questions for user filtered by their intensity preference. When user is too far ahead of partner (answer gap threshold exceeded), returns empty.';