From aa9aabdf2eb8c655ac11ae7e270e8bf3f5760cfc Mon Sep 17 00:00:00 2001
From: David Zhang <david.d.zhang@gmail.com>
Date: Sat, 8 Aug 2026 19:13:11 -0400
Subject: [PATCH 1/8] fix: make mobile emulator and beta Firebase profiles
 explicit

Failure-Class: none
---
 .github/workflows/mobile-app-checks.yml       |  12 +-
 .gitignore                                    |   1 +
 app/README.md                                 |  26 +++
 app/android/app/src/dev/AndroidManifest.xml   |  12 +
 app/android/app/src/main/AndroidManifest.xml  |   6 -
 app/android/app/src/prod/AndroidManifest.xml  |  18 ++
 app/ios/Flutter/Base.xcconfig                 |   1 +
 app/ios/Flutter/devDebug.xcconfig             |   2 +
 app/ios/Flutter/devProfile.xcconfig           |   2 +
 app/ios/Flutter/devRelease.xcconfig           |   2 +
 app/ios/Flutter/raybanDatDebug.xcconfig       |   2 +
 app/ios/Flutter/raybanDatProfile.xcconfig     |   2 +
 app/ios/Flutter/raybanDatRelease.xcconfig     |   2 +
 app/ios/Runner/Info-Dev.plist                 | 216 ++++++++++++++++++
 app/ios/Runner/Info.plist                     |   2 +-
 app/lib/env/env.dart                          | 114 ++++++++-
 app/lib/env/environment_profile.dart          |  62 +++++
 app/lib/firebase_options_local.dart           |  62 +++++
 app/lib/main.dart                             |  20 +-
 app/lib/services/auth_service.dart            |  12 +-
 app/lib/startup_routing.dart                  |  10 +-
 app/setup.sh                                  | 153 +++++++++----
 .../prebuilt/GoogleService-Info-Local.plist   |  30 +++
 .../prebuilt/firebase_options_local.dart      |  62 +++++
 app/setup/prebuilt/google-services-local.json |  28 +++
 app/setup/scripts/setup.ps1                   | 104 ++++++---
 app/test.sh                                   |  20 +-
 app/test/unit/env_test.dart                   |  68 +++++-
 28 files changed, 931 insertions(+), 120 deletions(-)
 create mode 100644 app/android/app/src/dev/AndroidManifest.xml
 create mode 100644 app/android/app/src/prod/AndroidManifest.xml
 create mode 100644 app/ios/Runner/Info-Dev.plist
 create mode 100644 app/lib/env/environment_profile.dart
 create mode 100644 app/lib/firebase_options_local.dart
 create mode 100644 app/setup/prebuilt/GoogleService-Info-Local.plist
 create mode 100644 app/setup/prebuilt/firebase_options_local.dart
 create mode 100644 app/setup/prebuilt/google-services-local.json

diff --git a/.github/workflows/mobile-app-checks.yml b/.github/workflows/mobile-app-checks.yml
index 4120cf6ec45..2cac7a0e888 100644
--- a/.github/workflows/mobile-app-checks.yml
+++ b/.github/workflows/mobile-app-checks.yml
@@ -126,8 +126,8 @@ jobs:
       - name: Prepare Flutter dev compile inputs
         working-directory: app
         run: |
-          cp setup/prebuilt/firebase_options.dart lib/firebase_options_dev.dart
-          cp setup/prebuilt/firebase_options.dart lib/firebase_options_prod.dart
+          cp setup/prebuilt/firebase_options_local.dart lib/firebase_options_dev.dart
+          cp setup/prebuilt/firebase_options_local.dart lib/firebase_options_prod.dart
           {
             echo "API_BASE_URL="
             echo "USE_WEB_AUTH=true"
@@ -262,10 +262,10 @@ jobs:
         working-directory: app
         run: |
           mkdir -p android/app/src/dev/ android/app/src/prod/
-          cp setup/prebuilt/firebase_options.dart lib/firebase_options_dev.dart
-          cp setup/prebuilt/firebase_options.dart lib/firebase_options_prod.dart
-          cp setup/prebuilt/google-services.json android/app/src/dev/
-          cp setup/prebuilt/google-services.json android/app/src/prod/
+          cp setup/prebuilt/firebase_options_local.dart lib/firebase_options_dev.dart
+          cp setup/prebuilt/firebase_options_local.dart lib/firebase_options_prod.dart
+          cp setup/prebuilt/google-services-local.json android/app/src/dev/google-services.json
+          cp setup/prebuilt/google-services-local.json android/app/src/prod/google-services.json
           cp setup/prebuilt/key.properties android/key.properties
           {
             echo "API_BASE_URL="
diff --git a/.gitignore b/.gitignore
index 284d5bb7c5d..ed030823669 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@ src/recordings
 # Apps
 /app/lib/firebase_options.dart
 /app/lib/firebase_options_*.dart
+!/app/lib/firebase_options_local.dart
 /app/firebase.json
 
 # Solidworks models
diff --git a/app/README.md b/app/README.md
index 0a3dc52d92c..985ef243b91 100644
--- a/app/README.md
+++ b/app/README.md
@@ -27,7 +27,33 @@ Before getting started, make sure your device is connected and unlocked. If you'
    .\setup\scripts\setup.ps1 android
    ```
 
+   `bash setup.sh ios` is the safe local-development path: it uses the local
+   API/emulator harness and the `demo-omi-local` Firebase project. For a real
+   iPhone, set `OMI_DEV_HOST` to the Mac's LAN address when the local harness is
+   reachable from the device.
+
    iOS setup requires macOS/Xcode, so Windows developers should use the Android setup path.
+
+### Mobile beta / dogfood
+
+The mobile beta is an explicit production-data profile. It uses the production
+Firebase project and user IDs, but routes serving traffic to
+`https://api.omiapi.com/`, matching the macOS beta serving plane:
+
+```bash
+export FIREBASE_SERVICE_ACCOUNT_KEY=/secure/path/to/firebase-service-account.json
+bash setup.sh ios beta
+
+# Android beta uses the existing prod flavor and package
+bash setup.sh android beta
+```
+
+The Firebase service account must be able to generate the production mobile
+configuration, and the beta bundle ID must be registered with both Firebase and
+the Apple team. Override the default bundle ID with
+`OMI_MOBILE_BETA_BUNDLE_ID` when your team uses a different registered ID. The
+beta build uses the `mobile_beta` profile and the `omi-beta://auth/callback`
+scheme; it must not be treated as a local-emulator build.
  
 3. Ensure GitHub SSH access is set up correctly for pulling certificates from repositories. After running the command below, if you're prompted for a passphrase, enter your SSH passphrase — or simply press Enter/Return if you haven't set one.
     ```bash
diff --git a/app/android/app/src/dev/AndroidManifest.xml b/app/android/app/src/dev/AndroidManifest.xml
new file mode 100644
index 00000000000..2edddbeea29
--- /dev/null
+++ b/app/android/app/src/dev/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="omi-dev" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
index b05eeaf9d1d..368a1768aeb 100644
--- a/app/android/app/src/main/AndroidManifest.xml
+++ b/app/android/app/src/main/AndroidManifest.xml
@@ -169,12 +169,6 @@
                     android:scheme="https"
                     android:pathPattern="/tasks/.*" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="omi" />
-            </intent-filter>
         </activity>
 
         <!-- Don't delete the meta-data below.
diff --git a/app/android/app/src/prod/AndroidManifest.xml b/app/android/app/src/prod/AndroidManifest.xml
new file mode 100644
index 00000000000..6c5cf30b940
--- /dev/null
+++ b/app/android/app/src/prod/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="omi" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="omi-beta" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/app/ios/Flutter/Base.xcconfig b/app/ios/Flutter/Base.xcconfig
index b26243b74dd..208861f038e 100644
--- a/app/ios/Flutter/Base.xcconfig
+++ b/app/ios/Flutter/Base.xcconfig
@@ -1,4 +1,5 @@
 APP_BUNDLE_IDENTIFIER=com.friend-app-with-wearable.ios12
+AUTH_CALLBACK_SCHEME=omi
 
 // Ray-Ban Meta (Meta Wearables DAT) credentials — optional, git-ignored.
 // Copy RayBanMetaCredentials.xcconfig.template to RayBanMetaCredentials.xcconfig
diff --git a/app/ios/Flutter/devDebug.xcconfig b/app/ios/Flutter/devDebug.xcconfig
index f1ced2ba12f..6ae7ac83bc2 100644
--- a/app/ios/Flutter/devDebug.xcconfig
+++ b/app/ios/Flutter/devDebug.xcconfig
@@ -7,4 +7,6 @@ ASSET_PREFIX=dev
 BUNDLE_NAME=Omi Dev
 BUNDLE_DISPLAY_NAME=Omi Dev
 APP_BUNDLE_IDENTIFIER=com.friend-app-with-wearable.ios12.development
+AUTH_CALLBACK_SCHEME=omi-dev
+INFOPLIST_FILE=Runner/Info-Dev.plist
 GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.1031333818730-dusn243nct6i5rgfpfkj5mchuj1qnmde
diff --git a/app/ios/Flutter/devProfile.xcconfig b/app/ios/Flutter/devProfile.xcconfig
index 4e679340e2e..db9e8de23d0 100644
--- a/app/ios/Flutter/devProfile.xcconfig
+++ b/app/ios/Flutter/devProfile.xcconfig
@@ -6,3 +6,5 @@
 ASSET_PREFIX=dev
 BUNDLE_NAME=Omi Dev
 BUNDLE_DISPLAY_NAME=Omi Dev
+AUTH_CALLBACK_SCHEME=omi-dev
+INFOPLIST_FILE=Runner/Info-Dev.plist
diff --git a/app/ios/Flutter/devRelease.xcconfig b/app/ios/Flutter/devRelease.xcconfig
index 4e679340e2e..db9e8de23d0 100644
--- a/app/ios/Flutter/devRelease.xcconfig
+++ b/app/ios/Flutter/devRelease.xcconfig
@@ -6,3 +6,5 @@
 ASSET_PREFIX=dev
 BUNDLE_NAME=Omi Dev
 BUNDLE_DISPLAY_NAME=Omi Dev
+AUTH_CALLBACK_SCHEME=omi-dev
+INFOPLIST_FILE=Runner/Info-Dev.plist
diff --git a/app/ios/Flutter/raybanDatDebug.xcconfig b/app/ios/Flutter/raybanDatDebug.xcconfig
index 13da8ef11c9..fc927004a7c 100644
--- a/app/ios/Flutter/raybanDatDebug.xcconfig
+++ b/app/ios/Flutter/raybanDatDebug.xcconfig
@@ -7,6 +7,8 @@ ASSET_PREFIX=dev
 BUNDLE_NAME=Omi Dev
 BUNDLE_DISPLAY_NAME=Omi Dev
 APP_BUNDLE_IDENTIFIER=com.friend-app-with-wearable.ios12.development
+AUTH_CALLBACK_SCHEME=omi-dev
+INFOPLIST_FILE=Runner/Info-Dev.plist
 GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.1031333818730-dusn243nct6i5rgfpfkj5mchuj1qnmde
 DEVELOPMENT_TEAM=9536L8KLMP
 IPHONEOS_DEPLOYMENT_TARGET=15.2
diff --git a/app/ios/Flutter/raybanDatProfile.xcconfig b/app/ios/Flutter/raybanDatProfile.xcconfig
index b91c96d572f..920d88a37b4 100644
--- a/app/ios/Flutter/raybanDatProfile.xcconfig
+++ b/app/ios/Flutter/raybanDatProfile.xcconfig
@@ -7,6 +7,8 @@ ASSET_PREFIX=dev
 BUNDLE_NAME=Omi Dev
 BUNDLE_DISPLAY_NAME=Omi Dev
 APP_BUNDLE_IDENTIFIER=com.friend-app-with-wearable.ios12.development
+AUTH_CALLBACK_SCHEME=omi-dev
+INFOPLIST_FILE=Runner/Info-Dev.plist
 GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.1031333818730-dusn243nct6i5rgfpfkj5mchuj1qnmde
 DEVELOPMENT_TEAM=9536L8KLMP
 IPHONEOS_DEPLOYMENT_TARGET=15.2
diff --git a/app/ios/Flutter/raybanDatRelease.xcconfig b/app/ios/Flutter/raybanDatRelease.xcconfig
index 3b480ed371f..71a26d4ab71 100644
--- a/app/ios/Flutter/raybanDatRelease.xcconfig
+++ b/app/ios/Flutter/raybanDatRelease.xcconfig
@@ -7,6 +7,8 @@ ASSET_PREFIX=dev
 BUNDLE_NAME=Omi Dev
 BUNDLE_DISPLAY_NAME=Omi Dev
 APP_BUNDLE_IDENTIFIER=com.friend-app-with-wearable.ios12.development
+AUTH_CALLBACK_SCHEME=omi-dev
+INFOPLIST_FILE=Runner/Info-Dev.plist
 GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.1031333818730-dusn243nct6i5rgfpfkj5mchuj1qnmde
 DEVELOPMENT_TEAM=9536L8KLMP
 IPHONEOS_DEPLOYMENT_TARGET=15.2
diff --git a/app/ios/Runner/Info-Dev.plist b/app/ios/Runner/Info-Dev.plist
new file mode 100644
index 00000000000..859a2e7778b
--- /dev/null
+++ b/app/ios/Runner/Info-Dev.plist
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BGTaskSchedulerPermittedIdentifiers</key>
+	<array>
+		<string>daily-summary</string>
+		<string>com.friend-app-with-wearable.ios12.daily-summary</string>
+		<string>dev.flutter.background.refresh</string>
+		<string>com.pravera.flutter_foreground_task.refresh</string>
+	</array>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>$(BUNDLE_DISPLAY_NAME)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>ar</string>
+		<string>bg</string>
+		<string>ca</string>
+		<string>cs</string>
+		<string>da</string>
+		<string>de</string>
+		<string>el</string>
+		<string>en</string>
+		<string>es</string>
+		<string>et</string>
+		<string>fi</string>
+		<string>fr</string>
+		<string>hi</string>
+		<string>hu</string>
+		<string>id</string>
+		<string>it</string>
+		<string>ja</string>
+		<string>ko</string>
+		<string>lt</string>
+		<string>lv</string>
+		<string>ms</string>
+		<string>nl</string>
+		<string>no</string>
+		<string>pl</string>
+		<string>pt</string>
+		<string>ro</string>
+		<string>ru</string>
+		<string>sk</string>
+		<string>sv</string>
+		<string>th</string>
+		<string>tr</string>
+		<string>uk</string>
+		<string>vi</string>
+		<string>zh</string>
+	</array>
+	<key>CFBundleName</key>
+	<string>$(BUNDLE_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>h.omi.me</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>https</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>h.omi.me</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>$(GOOGLE_REVERSE_CLIENT_ID)</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>omi.auth</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>$(AUTH_CALLBACK_SCHEME)</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>rayban-meta-callback</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>omirayban</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>FlutterDeepLinkingEnabled</key>
+	<false/>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>comgooglemaps</string>
+		<string>iosamap</string>
+	</array>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MWDAT</key>
+	<dict>
+		<key>AppLinkURLScheme</key>
+		<string>omirayban://</string>
+		<key>DAMEnabled</key>
+		<true/>
+	</dict>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>Omi uses Bluetooth to connect to your Omi wearable and stream its microphone audio to your phone — for example, to transcribe your meetings into notes and check the device's battery.</string>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>Omi uses Bluetooth to connect to your Omi wearable and stream its microphone audio to your phone — for example, to transcribe your meetings into notes and check the device's battery.</string>
+	<key>NSCalendarsFullAccessUsageDescription</key>
+	<string>Access most functions for calendar viewing and editing.</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>Access most functions for calendar viewing and editing.</string>
+	<key>NSCameraUsageDescription</key>
+	<string>Camera access is required to report issues</string>
+	<key>NSContactsUsageDescription</key>
+	<string>Access contacts for event attendee editing and to share conversation summaries via SMS.</string>
+	<key>NSHealthShareUsageDescription</key>
+	<string>Omi reads your steps, walking and running distance, active energy, heart rate, sleep, and workouts from Apple Health so you can ask about your fitness, sleep, and activity in Omi Chat. Omi never writes to Apple Health.</string>
+	<key>NSHealthUpdateUsageDescription</key>
+	<string>Omi does not write any data to Apple Health. This string is only present because iOS requires it when the HealthKit framework is linked.</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>When creating your memories, we use your location for determining where they were created.</string>
+	<key>NSLocationUsageDescription</key>
+	<string>When creating your memories, we use your location for determining where they were created.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>When creating your memories, we use your location for determining where they were created.</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsLocalNetworking</key>
+		<true/>
+	</dict>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>We need access to your microphone so you can share audio explanations of Bugs you find, and for voice commands.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>We need access to your photo library to allow you to upload and share photos through Instabug.</string>
+	<key>NSRemindersFullAccessUsageDescription</key>
+	<string>We need access to your reminders to export action items from Omi conversations.</string>
+	<key>NSRemindersUsageDescription</key>
+	<string>We need access to your reminders to export action items from Omi conversations.</string>
+	<key>NSSpeechRecognitionUsageDescription</key>
+	<string>We use speech recognition to convert your speech to text for processing on your device.</string>
+	<key>PermissionGroupNotification</key>
+	<string>You need to enable notifications to receive your pro-active feedback.</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+		<string>location</string>
+		<string>bluetooth-central</string>
+		<string>fetch</string>
+		<string>processing</string>
+		<string>remote-notification</string>
+		<string>voip</string>
+	</array>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>UIStatusBarHidden</key>
+	<false/>
+	<key>UISupportedExternalAccessoryProtocols</key>
+	<array>
+		<string>com.meta.ar.wearable</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+	<key>WKCompanionAppBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>com.posthog.posthog.AUTO_INIT</key>
+	<false/>
+</dict>
+</plist>
diff --git a/app/ios/Runner/Info.plist b/app/ios/Runner/Info.plist
index 178cc5646fa..766e8c7f5ba 100644
--- a/app/ios/Runner/Info.plist
+++ b/app/ios/Runner/Info.plist
@@ -95,7 +95,7 @@
 			<string>omi.auth</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>omi</string>
+				<string>$(AUTH_CALLBACK_SCHEME)</string>
 			</array>
 		</dict>
 		<dict>
diff --git a/app/lib/env/env.dart b/app/lib/env/env.dart
index 7f18eabcca9..1ee07291940 100644
--- a/app/lib/env/env.dart
+++ b/app/lib/env/env.dart
@@ -1,11 +1,30 @@
+import 'package:omi/flavors.dart';
+
+import 'environment_profile.dart';
+
 abstract class Env {
   static const productionApiBaseUrl = 'https://api.omi.me/';
   static const productionAgentProxyWsUrl = 'wss://agent.omi.me/v1/agent/ws';
+  static const _apiBaseUrlFromDefine = String.fromEnvironment(
+    'OMI_API_BASE_URL',
+  );
+  static const firebaseAuthEmulatorHost = String.fromEnvironment(
+    'OMI_FIREBASE_AUTH_EMULATOR_HOST',
+    defaultValue: '127.0.0.1',
+  );
+  static const _firebaseAuthEmulatorPort = String.fromEnvironment(
+    'OMI_FIREBASE_AUTH_EMULATOR_PORT',
+    defaultValue: '9099',
+  );
   static late final EnvFields _instance;
   static String? _apiBaseUrlOverride;
   static String? _agentProxyWsUrlOverride;
   static bool isTestFlight = false;
 
+  static AppEnvironmentProfile get profile => AppEnvironmentProfile.forFlavor(
+        productionFlavor: F.env == Environment.prod,
+      );
+
   static void init(EnvFields instance) {
     _instance = instance;
   }
@@ -27,18 +46,78 @@ abstract class Env {
   static String? get posthogApiKey => _instance.posthogApiKey;
 
   // static String? get apiBaseUrl => 'https://omi-backend.ngrok.app/';
-  static String? get apiBaseUrl => _apiBaseUrlOverride ?? _instance.apiBaseUrl;
+  static String? get apiBaseUrl {
+    if (_apiBaseUrlOverride != null) return _apiBaseUrlOverride;
+    if (_apiBaseUrlFromDefine.isNotEmpty) return _apiBaseUrlFromDefine;
+    final configuredApiBaseUrl = _instance.apiBaseUrl;
+    if (configuredApiBaseUrl != null && configuredApiBaseUrl.isNotEmpty) {
+      return configuredApiBaseUrl;
+    }
+    return profile.defaultApiBaseUrl;
+  }
+
+  static int get firebaseAuthEmulatorPort => int.tryParse(_firebaseAuthEmulatorPort) ?? 9099;
+
+  static String get authCallbackScheme => profile.authCallbackScheme;
+
+  static String get authRedirectUri => '$authCallbackScheme://auth/callback';
+
+  static void validateProfilePairing() {
+    final productionFlavor = F.env == Environment.prod;
+    if (!productionFlavor && profile != AppEnvironmentProfile.localDev) {
+      throw StateError(
+        'Profile ${profile.name} must be built with the prod flavor.',
+      );
+    }
+    if (productionFlavor && profile == AppEnvironmentProfile.localDev) {
+      throw StateError('The prod flavor cannot use the local_dev profile.');
+    }
+  }
+
+  static void validateFirebaseProject({required String projectId}) {
+    if (projectId != profile.firebaseProjectId) {
+      throw StateError(
+        'Mobile profile ${profile.name} requires Firebase project ${profile.firebaseProjectId}, '
+        'but the app was initialized with $projectId.',
+      );
+    }
+  }
 
   /// Production-family packages have one pinned backend authority. This runs
   /// during startup so a misconfigured signing group fails before networking.
-  static void validateStartupRouting({required bool productionFamily, String? configuredApiBaseUrl}) {
-    if (!productionFamily) return;
+  static void validateStartupRouting({
+    required bool productionFamily,
+    String? configuredApiBaseUrl,
+    AppEnvironmentProfile? configuredProfile,
+  }) {
+    final effectiveProfile = configuredProfile ?? (productionFamily ? AppEnvironmentProfile.production : profile);
     final normalized = (configuredApiBaseUrl ?? apiBaseUrl ?? '').trim().replaceFirst(RegExp(r'/+$'), '');
-    if (normalized != productionApiBaseUrl.replaceFirst(RegExp(r'/+$'), '')) {
-      throw StateError('Production packages require API_BASE_URL=https://api.omi.me/');
+    final expected = effectiveProfile.defaultApiBaseUrl.replaceFirst(
+      RegExp(r'/+$'),
+      '',
+    );
+
+    if (effectiveProfile == AppEnvironmentProfile.localDev) {
+      if (!_isLocalDevelopmentApi(normalized)) {
+        throw StateError(
+          'Profile local_dev requires a loopback or private-network API endpoint; '
+          'use mobile_beta for https://api.omiapi.com/.',
+        );
+      }
+      return;
     }
-    if (_agentProxyWsUrlFor(normalized) != productionAgentProxyWsUrl) {
-      throw StateError('Production packages require the production agent WebSocket endpoint.');
+
+    if (normalized != expected) {
+      throw StateError(
+        'Profile ${effectiveProfile.name} requires API_BASE_URL=${effectiveProfile.defaultApiBaseUrl}',
+      );
+    }
+
+    if (effectiveProfile == AppEnvironmentProfile.production &&
+        _agentProxyWsUrlFor(normalized) != productionAgentProxyWsUrl) {
+      throw StateError(
+        'Production packages require the production agent WebSocket endpoint.',
+      );
     }
   }
 
@@ -57,6 +136,27 @@ abstract class Env {
     return 'wss://$host/v1/agent/ws';
   }
 
+  static bool _isLocalDevelopmentApi(String base) {
+    final uri = Uri.tryParse(base);
+    if (uri == null || uri.host.isEmpty || (uri.scheme != 'http' && uri.scheme != 'https')) {
+      return false;
+    }
+    final host = uri.host.toLowerCase();
+    if (host == 'localhost' || host == 'host.docker.internal' || host == '::1') {
+      return true;
+    }
+    final octets = host.split('.').map(int.tryParse).toList();
+    if (octets.length != 4 || octets.any((octet) => octet == null || octet < 0 || octet > 255)) {
+      return false;
+    }
+    final first = octets[0]!;
+    final second = octets[1]!;
+    return first == 10 ||
+        (first == 172 && second >= 16 && second <= 31) ||
+        (first == 192 && second == 168) ||
+        (first == 127);
+  }
+
   static String? get googleMapsApiKey => _instance.googleMapsApiKey;
 
   static String? get intercomAppId => _instance.intercomAppId;
diff --git a/app/lib/env/environment_profile.dart b/app/lib/env/environment_profile.dart
new file mode 100644
index 00000000000..45231fbb339
--- /dev/null
+++ b/app/lib/env/environment_profile.dart
@@ -0,0 +1,62 @@
+/// The supported mobile trust/data planes.
+///
+/// A profile is intentionally selected at build time. The default for the
+/// `dev` flavor is local emulators; access to production Firebase identity and
+/// data requires the explicit `mobile_beta` profile.
+enum AppEnvironmentProfile {
+  localDev(
+    name: 'local_dev',
+    defaultApiBaseUrl: 'http://127.0.0.1:8000/',
+    firebaseProjectId: 'demo-omi-local',
+    authCallbackScheme: 'omi-dev',
+    usesFirebaseAuthEmulator: true,
+    allowsProductionData: false,
+  ),
+  mobileBeta(
+    name: 'mobile_beta',
+    defaultApiBaseUrl: 'https://api.omiapi.com/',
+    firebaseProjectId: 'based-hardware',
+    authCallbackScheme: 'omi-beta',
+    usesFirebaseAuthEmulator: false,
+    allowsProductionData: true,
+  ),
+  production(
+    name: 'production',
+    defaultApiBaseUrl: 'https://api.omi.me/',
+    firebaseProjectId: 'based-hardware',
+    authCallbackScheme: 'omi',
+    usesFirebaseAuthEmulator: false,
+    allowsProductionData: true,
+  );
+
+  const AppEnvironmentProfile({
+    required this.name,
+    required this.defaultApiBaseUrl,
+    required this.firebaseProjectId,
+    required this.authCallbackScheme,
+    required this.usesFirebaseAuthEmulator,
+    required this.allowsProductionData,
+  });
+
+  final String name;
+  final String defaultApiBaseUrl;
+  final String firebaseProjectId;
+  final String authCallbackScheme;
+  final bool usesFirebaseAuthEmulator;
+  final bool allowsProductionData;
+
+  static AppEnvironmentProfile forFlavor({required bool productionFlavor}) {
+    const requested = String.fromEnvironment('OMI_APP_PROFILE');
+    if (requested.isEmpty) {
+      return productionFlavor ? AppEnvironmentProfile.production : AppEnvironmentProfile.localDev;
+    }
+
+    return AppEnvironmentProfile.values.firstWhere(
+      (profile) => profile.name == requested,
+      orElse: () => throw StateError(
+        'Unknown OMI_APP_PROFILE "$requested". '
+        'Use local_dev, mobile_beta, or production.',
+      ),
+    );
+  }
+}
diff --git a/app/lib/firebase_options_local.dart b/app/lib/firebase_options_local.dart
new file mode 100644
index 00000000000..d1b3b832239
--- /dev/null
+++ b/app/lib/firebase_options_local.dart
@@ -0,0 +1,62 @@
+// Local-only Firebase options for the emulator harness.
+// These values are intentionally non-secret placeholders. They keep the
+// client project identity aligned with demo-omi-local while Auth is routed to
+// the local emulator by main.dart.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+class DefaultFirebaseOptions {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) return web;
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        return macos;
+      case TargetPlatform.windows:
+      case TargetPlatform.linux:
+      case TargetPlatform.fuchsia:
+        throw UnsupportedError(
+          'Local Firebase options are not configured for this platform.',
+        );
+    }
+  }
+
+  static const android = FirebaseOptions(
+    apiKey: 'local-firebase-auth-emulator-api-key',
+    appId: '1:000000000000:android:omi-dev-local',
+    messagingSenderId: '000000000000',
+    projectId: 'demo-omi-local',
+    storageBucket: 'demo-omi-local.localhost',
+  );
+
+  static const ios = FirebaseOptions(
+    apiKey: 'local-firebase-auth-emulator-api-key',
+    appId: '1:000000000000:ios:omi-dev-local',
+    messagingSenderId: '000000000000',
+    projectId: 'demo-omi-local',
+    storageBucket: 'demo-omi-local.localhost',
+    iosBundleId: 'com.friend-app-with-wearable.ios12.development',
+  );
+
+  static const macos = FirebaseOptions(
+    apiKey: 'local-firebase-auth-emulator-api-key',
+    appId: '1:000000000000:ios:omi-dev-local',
+    messagingSenderId: '000000000000',
+    projectId: 'demo-omi-local',
+    storageBucket: 'demo-omi-local.localhost',
+    iosBundleId: 'com.friend-app-with-wearable.ios12.development',
+  );
+
+  static const web = FirebaseOptions(
+    apiKey: 'local-firebase-auth-emulator-api-key',
+    appId: '1:000000000000:web:omi-dev-local',
+    messagingSenderId: '000000000000',
+    projectId: 'demo-omi-local',
+    authDomain: 'demo-omi-local.firebaseapp.com',
+    storageBucket: 'demo-omi-local.localhost',
+  );
+}
diff --git a/app/lib/main.dart b/app/lib/main.dart
index d2799b9b637..16c1657a125 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -31,8 +31,9 @@ import 'package:omi/coordinators/provider_capture_external_actions.dart';
 import 'package:omi/core/app_shell.dart';
 import 'package:omi/env/dev_env.dart';
 import 'package:omi/env/env.dart';
+import 'package:omi/env/environment_profile.dart';
 import 'package:omi/env/prod_env.dart';
-import 'package:omi/firebase_options_dev.dart' as dev;
+import 'package:omi/firebase_options_local.dart' as local;
 import 'package:omi/firebase_options_prod.dart' as prod;
 import 'package:omi/flavors.dart';
 import 'package:omi/startup_routing.dart';
@@ -129,6 +130,7 @@ Future _init() async {
   } else {
     Env.init(DevEnv());
   }
+  Env.validateProfilePairing();
   validateApplicationStartupRouting();
 
   FlutterForegroundTask.initCommunicationPort();
@@ -139,13 +141,23 @@ Future _init() async {
 
   // Firebase
   if (Firebase.apps.isEmpty) {
-    final options = F.env == Environment.prod
-        ? prod.DefaultFirebaseOptions.currentPlatform
-        : dev.DefaultFirebaseOptions.currentPlatform;
+    final profile = Env.profile;
+    final options = profile == AppEnvironmentProfile.localDev
+        ? local.DefaultFirebaseOptions.currentPlatform
+        : prod.DefaultFirebaseOptions.currentPlatform;
+    Env.validateFirebaseProject(projectId: options.projectId);
     await Firebase.initializeApp(options: options);
   } else {
     // Firebase may already be initialized by native SDK (macOS)
     debugPrint('Firebase already initialized.');
+    Env.validateFirebaseProject(projectId: Firebase.app().options.projectId);
+  }
+
+  if (Env.profile.usesFirebaseAuthEmulator) {
+    await FirebaseAuth.instance.useAuthEmulator(
+      Env.firebaseAuthEmulatorHost,
+      Env.firebaseAuthEmulatorPort,
+    );
   }
 
   await PlatformManager.initializeServices();
diff --git a/app/lib/services/auth_service.dart b/app/lib/services/auth_service.dart
index 252c2bcc485..889279819dd 100644
--- a/app/lib/services/auth_service.dart
+++ b/app/lib/services/auth_service.dart
@@ -460,7 +460,8 @@ class AuthService {
       final state = _generateState();
       final codeVerifier = _generateCodeVerifier();
       final codeChallenge = _codeChallengeForVerifier(codeVerifier);
-      const redirectUri = 'omi://auth/callback';
+      final redirectUri = Env.authRedirectUri;
+      final callbackScheme = Env.authCallbackScheme;
 
       Logger.debug('Starting OAuth flow for provider: $provider');
 
@@ -485,7 +486,7 @@ class AuthService {
       linkSubscription = appLinks.uriLinkStream.listen(
         (Uri uri) {
           Logger.debug('Received callback URI via app_links: $uri');
-          if (uri.scheme == 'omi' && uri.host == 'auth' && uri.path == '/callback') {
+          if (uri.scheme == callbackScheme && uri.host == 'auth' && uri.path == '/callback') {
             if (!completer.isCompleted) {
               linkSubscription.cancel();
               completer.complete(uri.toString());
@@ -507,7 +508,7 @@ class AuthService {
           final urlString = call.arguments as String;
           Logger.debug('Received callback URI via method channel: $urlString');
           final uri = Uri.parse(urlString);
-          if (uri.scheme == 'omi' && uri.host == 'auth' && uri.path == '/callback') {
+          if (uri.scheme == callbackScheme && uri.host == 'auth' && uri.path == '/callback') {
             if (!completer.isCompleted) {
               linkSubscription.cancel();
               _deepLinkChannel.setMethodCallHandler(null);
@@ -815,7 +816,8 @@ class AuthService {
       final state = _generateState();
       final codeVerifier = _generateCodeVerifier();
       final codeChallenge = _codeChallengeForVerifier(codeVerifier);
-      const redirectUri = 'omi://auth/callback';
+      final redirectUri = Env.authRedirectUri;
+      final callbackScheme = Env.authCallbackScheme;
 
       Logger.debug('Starting OAuth linking flow for provider: $provider');
 
@@ -845,7 +847,7 @@ class AuthService {
       linkSubscription = appLinks.uriLinkStream.listen(
         (Uri uri) {
           Logger.debug('Received callback URI: $uri');
-          if (uri.scheme == 'omi' && uri.host == 'auth' && uri.path == '/callback') {
+          if (uri.scheme == callbackScheme && uri.host == 'auth' && uri.path == '/callback') {
             linkSubscription.cancel();
             completer.complete(uri.toString());
           }
diff --git a/app/lib/startup_routing.dart b/app/lib/startup_routing.dart
index 98a7b813d85..98928f61ede 100644
--- a/app/lib/startup_routing.dart
+++ b/app/lib/startup_routing.dart
@@ -1,10 +1,18 @@
 import 'package:omi/env/env.dart';
+import 'package:omi/env/environment_profile.dart';
 import 'package:omi/flavors.dart';
 
 /// The startup boundary used by [main] before any networked service starts.
-void validateApplicationStartupRouting({Environment? environment, String? configuredApiBaseUrl}) {
+void validateApplicationStartupRouting({
+  Environment? environment,
+  String? configuredApiBaseUrl,
+}) {
+  final configuredProfile = environment == null
+      ? Env.profile
+      : (environment == Environment.prod ? AppEnvironmentProfile.production : AppEnvironmentProfile.localDev);
   Env.validateStartupRouting(
     productionFamily: (environment ?? F.env) == Environment.prod,
     configuredApiBaseUrl: configuredApiBaseUrl,
+    configuredProfile: configuredProfile,
   );
 }
diff --git a/app/setup.sh b/app/setup.sh
index 8d40a3e7e22..aa403067d8b 100644
--- a/app/setup.sh
+++ b/app/setup.sh
@@ -46,10 +46,14 @@ echo ""
 echo "Usages:"
 echo "- bash setup.sh ios"
 echo "- bash setup.sh android"
+echo "- bash setup.sh ios beta   # explicit production-data dogfood build"
 echo ""
 
-
-API_BASE_URL=https://api.omiapi.com/
+LOCAL_DEV_HOST="${OMI_DEV_HOST:-127.0.0.1}"
+LOCAL_API_BASE_URL="${OMI_LOCAL_API_BASE_URL:-http://${LOCAL_DEV_HOST}:8000/}"
+ANDROID_DEV_HOST="${OMI_ANDROID_DEV_HOST:-${OMI_DEV_HOST:-10.0.2.2}}"
+ANDROID_LOCAL_API_BASE_URL="${OMI_LOCAL_API_BASE_URL:-http://${ANDROID_DEV_HOST}:8000/}"
+BETA_API_BASE_URL="${OMI_BETA_API_BASE_URL:-https://api.omiapi.com/}"
 
 ######################################
 # Generate device suffix from hostname
@@ -64,58 +68,62 @@ function generate_device_suffix() {
 # Generate custom configs for iOS
 ######################################
 function generate_ios_custom_config() {
-  bash scripts/generate_ios_custom_config.sh ios/Config/Dev/GoogleService-Info.plist ios/Flutter \
-
-  # Custom bundle identifier
-  SUFFIX=$(generate_device_suffix)
-  CUSTOM_BUNDLE="com.friend-app-with-wearable.ios12-${SUFFIX}"
-  echo APP_BUNDLE_IDENTIFIER=${CUSTOM_BUNDLE} >> "ios/Flutter/Custom.xcconfig"
+  local config_name="${1:-Dev}"
+  local callback_scheme="${2:-omi-dev}"
+  bash scripts/generate_ios_custom_config.sh "ios/Config/${config_name}/GoogleService-Info.plist" ios/Flutter
+
+  if [[ "$config_name" == "Dev" ]]; then
+    # Keep ordinary local builds installable beside the App Store build.
+    local suffix
+    suffix=$(generate_device_suffix)
+    echo "APP_BUNDLE_IDENTIFIER=com.friend-app-with-wearable.ios12-${suffix}" >> ios/Flutter/Custom.xcconfig
+  else
+    # Beta uses a distinct bundle/callback identity and must be provisioned
+    # explicitly by the developer's Apple team.
+    echo "APP_BUNDLE_IDENTIFIER=${OMI_MOBILE_BETA_BUNDLE_ID:-com.friend-app-with-wearable.ios12.beta}" >> ios/Flutter/Custom.xcconfig
+    echo "AUTH_CALLBACK_SCHEME=${callback_scheme}" >> ios/Flutter/Custom.xcconfig
+  fi
 }
 
 ######################################
 # Setup Firebase with prebuilt configs
 ######################################
 function setup_firebase() {
-  mkdir -p android/app/src/dev/ ios/Config/Dev/ ios/Runner/
-  cp setup/prebuilt/firebase_options.dart lib/firebase_options_dev.dart
-  cp setup/prebuilt/google-services.json android/app/src/dev/
-  cp setup/prebuilt/GoogleService-Info.plist ios/Config/Dev/
-  cp setup/prebuilt/GoogleService-Info.plist ios/Runner/
-
-  # Warn: Mocking, should remove
-  mkdir -p android/app/src/prod/ ios/Config/Prod/
-  cp setup/prebuilt/firebase_options.dart lib/firebase_options_prod.dart
-  cp setup/prebuilt/google-services.json android/app/src/prod/
-  cp setup/prebuilt/GoogleService-Info.plist ios/Config/Prod/
+  mkdir -p android/app/src/dev/ android/app/src/prod/ ios/Config/Dev/ ios/Config/Prod/ ios/Runner/
+  cp setup/prebuilt/firebase_options_local.dart lib/firebase_options_dev.dart
+  cp setup/prebuilt/firebase_options_local.dart lib/firebase_options_prod.dart
+  cp setup/prebuilt/google-services-local.json android/app/src/dev/google-services.json
+  cp setup/prebuilt/google-services-local.json android/app/src/prod/google-services.json
+  cp setup/prebuilt/GoogleService-Info-Local.plist ios/Config/Dev/GoogleService-Info.plist
+  cp setup/prebuilt/GoogleService-Info-Local.plist ios/Config/Prod/GoogleService-Info.plist
+  cp setup/prebuilt/GoogleService-Info-Local.plist ios/Runner/GoogleService-Info.plist
 }
 
 ##########################################
 # Setup Firebase with Service Account Json
 ##########################################
-function setup_firebase_with_service_account() {
+function setup_firebase_with_service_account_ios() {
   dart pub global activate flutterfire_cli
   flutterfire config \
-    --platforms="android,ios,web" \
-    --out=lib/firebase_options_dev.dart \
-    --ios-bundle-id=com.friend-app-with-wearable.ios12.development \
-    --android-app-id=com.friend.ios.dev \
-    --android-out=android/app/src/dev/  \
-    --ios-out=ios/Config/Dev/ \
+    --platforms=ios \
+    --out=lib/firebase_options_prod.dart \
+    --ios-bundle-id=${OMI_MOBILE_BETA_BUNDLE_ID:-com.friend-app-with-wearable.ios12.beta} \
+    --ios-out=ios/Config/Prod/ \
     --service-account="$FIREBASE_SERVICE_ACCOUNT_KEY" \
-    --project="based-hardware-dev" \
+    --project="based-hardware" \
     --ios-target="Runner" \
     --yes
+}
 
+function setup_firebase_with_service_account_android() {
+  dart pub global activate flutterfire_cli
   flutterfire config \
-    --platforms="android,ios,web" \
+    --platforms=android \
     --out=lib/firebase_options_prod.dart \
-    --ios-bundle-id=com.friend-app-with-wearable.ios12 \
-    --android-app-id=com.friend.ios.dev \
+    --android-app-id=com.friend.ios \
     --android-out=android/app/src/prod/ \
-    --ios-out=ios/Config/Prod/ \
     --service-account="$FIREBASE_SERVICE_ACCOUNT_KEY" \
-    --project="based-hardware-dev" \
-    --ios-target="Runner" \
+    --project="based-hardware" \
     --yes
 }
 
@@ -139,9 +147,15 @@ function setup_provisioning_profile() {
 # Set up App .env
 #################
 function setup_app_env() {
-  echo API_BASE_URL=$API_BASE_URL > .dev.env
-  echo USE_WEB_AUTH=true >> .dev.env
-  echo USE_AUTH_CUSTOM_TOKEN=true >> .dev.env
+  local profile="${1:-local_dev}"
+  local configured_api_base_url="${2:-}"
+  local env_file='.dev.env'
+  local api_base_url="${configured_api_base_url:-$LOCAL_API_BASE_URL}"
+  if [[ "$profile" == "mobile_beta" ]]; then
+    env_file='.env'
+    api_base_url="$BETA_API_BASE_URL"
+  fi
+  printf 'API_BASE_URL=%s\nUSE_WEB_AUTH=true\nUSE_AUTH_CUSTOM_TOKEN=true\n' "$api_base_url" > "$env_file"
 }
 
 # #######################
@@ -155,36 +169,83 @@ function setup_keystore_android() {
 # Build
 # #####
 function run_build_android() {
+  local flavor="${1:-dev}"
+  local profile='local_dev'
+  local api_base_url="$ANDROID_LOCAL_API_BASE_URL"
+  local emulator_host="$ANDROID_DEV_HOST"
+  if [[ "$flavor" == "prod" ]]; then
+    profile='mobile_beta'
+    api_base_url="$BETA_API_BASE_URL"
+    emulator_host=''
+  fi
+  local flutter_args=(
+    --flavor "$flavor"
+    "--dart-define=OMI_APP_PROFILE=$profile"
+    "--dart-define=OMI_API_BASE_URL=$api_base_url"
+  )
+  if [[ -n "$emulator_host" ]]; then
+    flutter_args+=("--dart-define=OMI_FIREBASE_AUTH_EMULATOR_HOST=$emulator_host")
+  fi
   flutter pub get \
     && dart run build_runner build \
-    && flutter run --flavor dev
+    && flutter run "${flutter_args[@]}"
 }
 
 # #########
 # Build iOS
 # #########
 function run_build_ios() {
+  local flavor="${1:-dev}"
+  shift || true
   flutter pub get \
     && pushd ios && pod install --repo-update && popd \
     && dart run build_runner build \
-    && flutter run --flavor dev
+    && flutter run --flavor "$flavor" "$@"
 }
 
 
 case "${1}" in
   ios)
+    if [[ "${2:-}" == "beta" ]]; then
+      if [[ -z "${FIREBASE_SERVICE_ACCOUNT_KEY:-}" ]]; then
+        echo "ios beta requires FIREBASE_SERVICE_ACCOUNT_KEY so the production Firebase app config can be generated." >&2
+        exit 1
+      fi
+      setup_firebase \
+        && setup_firebase_with_service_account_ios \
+        && generate_ios_custom_config Prod omi-beta \
+        && setup_app_env mobile_beta \
+        && run_build_ios prod --dart-define=OMI_APP_PROFILE=mobile_beta
+    else
       setup_firebase \
-      && generate_ios_custom_config \
-      && setup_app_env \
-      && run_build_ios
+        && generate_ios_custom_config Dev omi-dev \
+        && setup_app_env local_dev \
+        && run_build_ios dev \
+          --dart-define=OMI_APP_PROFILE=local_dev \
+          --dart-define=OMI_API_BASE_URL="$LOCAL_API_BASE_URL" \
+          --dart-define=OMI_FIREBASE_AUTH_EMULATOR_HOST="$LOCAL_DEV_HOST"
+    fi
     ;;
   android)
-    setup_keystore_android \
-      && setup_firebase \
-      && setup_app_env \
-      && run_build_android
+    if [[ "${2:-}" == "beta" ]]; then
+      if [[ -z "${FIREBASE_SERVICE_ACCOUNT_KEY:-}" ]]; then
+        echo "android beta requires FIREBASE_SERVICE_ACCOUNT_KEY so the production Firebase app config can be generated." >&2
+        exit 1
+      fi
+      setup_keystore_android \
+        && setup_firebase \
+        && setup_firebase_with_service_account_android \
+        && setup_app_env mobile_beta "$BETA_API_BASE_URL" \
+        && run_build_android prod
+    else
+      setup_keystore_android \
+        && setup_firebase \
+        && setup_app_env local_dev "$ANDROID_LOCAL_API_BASE_URL" \
+        && run_build_android dev
+    fi
     ;;
   *)
-    error "Unexpected platform '${1}'"
+    echo "Unexpected platform '${1}'" >&2
+    exit 1
     ;;
 esac
diff --git a/app/setup/prebuilt/GoogleService-Info-Local.plist b/app/setup/prebuilt/GoogleService-Info-Local.plist
new file mode 100644
index 00000000000..3844d595bb2
--- /dev/null
+++ b/app/setup/prebuilt/GoogleService-Info-Local.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>local-firebase-auth-emulator-api-key</string>
+	<key>BUNDLE_ID</key>
+	<string>com.friend-app-with-wearable.ios12.development</string>
+	<key>GCM_SENDER_ID</key>
+	<string>000000000000</string>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:000000000000:ios:omi-dev-local</string>
+	<key>IS_ADS_ENABLED</key>
+	<false/>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false/>
+	<key>IS_APPINVITE_ENABLED</key>
+	<false/>
+	<key>IS_GCM_ENABLED</key>
+	<false/>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true/>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>PROJECT_ID</key>
+	<string>demo-omi-local</string>
+	<key>STORAGE_BUCKET</key>
+	<string>demo-omi-local.localhost</string>
+</dict>
+</plist>
diff --git a/app/setup/prebuilt/firebase_options_local.dart b/app/setup/prebuilt/firebase_options_local.dart
new file mode 100644
index 00000000000..d1b3b832239
--- /dev/null
+++ b/app/setup/prebuilt/firebase_options_local.dart
@@ -0,0 +1,62 @@
+// Local-only Firebase options for the emulator harness.
+// These values are intentionally non-secret placeholders. They keep the
+// client project identity aligned with demo-omi-local while Auth is routed to
+// the local emulator by main.dart.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+class DefaultFirebaseOptions {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) return web;
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        return macos;
+      case TargetPlatform.windows:
+      case TargetPlatform.linux:
+      case TargetPlatform.fuchsia:
+        throw UnsupportedError(
+          'Local Firebase options are not configured for this platform.',
+        );
+    }
+  }
+
+  static const android = FirebaseOptions(
+    apiKey: 'local-firebase-auth-emulator-api-key',
+    appId: '1:000000000000:android:omi-dev-local',
+    messagingSenderId: '000000000000',
+    projectId: 'demo-omi-local',
+    storageBucket: 'demo-omi-local.localhost',
+  );
+
+  static const ios = FirebaseOptions(
+    apiKey: 'local-firebase-auth-emulator-api-key',
+    appId: '1:000000000000:ios:omi-dev-local',
+    messagingSenderId: '000000000000',
+    projectId: 'demo-omi-local',
+    storageBucket: 'demo-omi-local.localhost',
+    iosBundleId: 'com.friend-app-with-wearable.ios12.development',
+  );
+
+  static const macos = FirebaseOptions(
+    apiKey: 'local-firebase-auth-emulator-api-key',
+    appId: '1:000000000000:ios:omi-dev-local',
+    messagingSenderId: '000000000000',
+    projectId: 'demo-omi-local',
+    storageBucket: 'demo-omi-local.localhost',
+    iosBundleId: 'com.friend-app-with-wearable.ios12.development',
+  );
+
+  static const web = FirebaseOptions(
+    apiKey: 'local-firebase-auth-emulator-api-key',
+    appId: '1:000000000000:web:omi-dev-local',
+    messagingSenderId: '000000000000',
+    projectId: 'demo-omi-local',
+    authDomain: 'demo-omi-local.firebaseapp.com',
+    storageBucket: 'demo-omi-local.localhost',
+  );
+}
diff --git a/app/setup/prebuilt/google-services-local.json b/app/setup/prebuilt/google-services-local.json
new file mode 100644
index 00000000000..1d86ffba4f0
--- /dev/null
+++ b/app/setup/prebuilt/google-services-local.json
@@ -0,0 +1,28 @@
+{
+  "project_info": {
+    "project_number": "000000000000",
+    "project_id": "demo-omi-local",
+    "storage_bucket": "demo-omi-local.localhost"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:000000000000:android:omi-dev-local",
+        "android_client_info": {
+          "package_name": "com.friend.ios.dev"
+        }
+      },
+      "api_key": [
+        {
+          "current_key": "local-firebase-auth-emulator-api-key"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/app/setup/scripts/setup.ps1 b/app/setup/scripts/setup.ps1
index d455f797f54..e4149b05d73 100644
--- a/app/setup/scripts/setup.ps1
+++ b/app/setup/scripts/setup.ps1
@@ -46,46 +46,43 @@ function SetupFirebase {
     New-Item -ItemType Directory -Force -Path "android/app/src/dev/", "ios/Config/Dev/", "ios/Runner/"
     
     # Copy files
-    Copy-Item "setup/prebuilt/firebase_options.dart" -Destination "lib/firebase_options_dev.dart"
-    Copy-Item "setup/prebuilt/google-services.json" -Destination "android/app/src/dev/"
-    Copy-Item "setup/prebuilt/GoogleService-Info.plist" -Destination "ios/Config/Dev/"
-    Copy-Item "setup/prebuilt/GoogleService-Info.plist" -Destination "ios/Runner/"
+    Copy-Item "setup/prebuilt/firebase_options_local.dart" -Destination "lib/firebase_options_dev.dart"
+    Copy-Item "setup/prebuilt/google-services-local.json" -Destination "android/app/src/dev/google-services.json"
+    Copy-Item "setup/prebuilt/GoogleService-Info-Local.plist" -Destination "ios/Config/Dev/GoogleService-Info.plist"
+    Copy-Item "setup/prebuilt/GoogleService-Info-Local.plist" -Destination "ios/Runner/GoogleService-Info.plist"
 
     # Mocking setup
     New-Item -ItemType Directory -Force -Path "android/app/src/prod/", "ios/Config/Prod/"
-    Copy-Item "setup/prebuilt/firebase_options.dart" -Destination "lib/firebase_options_prod.dart"
-    Copy-Item "setup/prebuilt/google-services.json" -Destination "android/app/src/prod/"
-    Copy-Item "setup/prebuilt/GoogleService-Info.plist" -Destination "ios/Config/Prod/"
+    Copy-Item "setup/prebuilt/firebase_options_local.dart" -Destination "lib/firebase_options_prod.dart"
+    Copy-Item "setup/prebuilt/google-services-local.json" -Destination "android/app/src/prod/google-services.json"
+    Copy-Item "setup/prebuilt/GoogleService-Info-Local.plist" -Destination "ios/Config/Prod/GoogleService-Info.plist"
 }
 
 
-function SetupFirebaseWithServiceAccount {
+function SetupFirebaseWithServiceAccountIos {
     dart pub global activate flutterfire_cli
 
-    # Dev configuration
     flutterfire config `
-        --platforms="android,ios,web" `
-        --out="lib/firebase_options_dev.dart" `
-        --ios-bundle-id="com.friend-app-with-wearable.ios12.development" `
-        --android-app-id="com.friend.ios.dev" `
-        --android-out="android/app/src/dev/" `
-        --ios-out="ios/Config/Dev/" `
+        --platforms="ios" `
+        --out="lib/firebase_options_prod.dart" `
+        --ios-bundle-id="com.friend-app-with-wearable.ios12.beta" `
+        --ios-out="ios/Config/Prod/" `
         --service-account="$env:FIREBASE_SERVICE_ACCOUNT_KEY" `
-        --project="based-hardware-dev" `
+        --project="based-hardware" `
         --ios-target="Runner" `
         --yes
+}
+
+function SetupFirebaseWithServiceAccountAndroid {
+    dart pub global activate flutterfire_cli
 
-    # Prod configuration
     flutterfire config `
-        --platforms="android,ios,web" `
+        --platforms="android" `
         --out="lib/firebase_options_prod.dart" `
-        --ios-bundle-id="com.friend-app-with-wearable.ios12" `
-        --android-app-id="com.friend.ios.dev" `
+        --android-app-id="com.friend.ios" `
         --android-out="android/app/src/prod/" `
-        --ios-out="ios/Config/Prod/" `
         --service-account="$env:FIREBASE_SERVICE_ACCOUNT_KEY" `
-        --project="based-hardware-dev" `
-        --ios-target="Runner" `
+        --project="based-hardware" `
         --yes
 }
 
@@ -104,10 +101,23 @@ function SetupProvisioningProfile {
 
 
 function SetupAppEnv {
-    $API_BASE_URL = "https://api.omiapi.com/"
+    param(
+        [string]$Profile = "local_dev",
+        [string]$ApiBaseUrl = ""
+    )
+    if ([string]::IsNullOrWhiteSpace($ApiBaseUrl)) {
+        $devHost = if ($env:OMI_DEV_HOST) { $env:OMI_DEV_HOST } else { "10.0.2.2" }
+        $ApiBaseUrl = "http://$devHost`:8000/"
+    }
+    if ($Profile -eq "mobile_beta") {
+        $ApiBaseUrl = if ($env:OMI_BETA_API_BASE_URL) { $env:OMI_BETA_API_BASE_URL } else { "https://api.omiapi.com/" }
+        $envFile = ".env"
+    } else {
+        $envFile = ".dev.env"
+    }
     # Using Set-Content with UTF8 encoding
-    $content = "API_BASE_URL=$API_BASE_URL"
-    [System.IO.File]::WriteAllText((Join-Path (Get-Location) ".dev.env"), $content, [System.Text.Encoding]::UTF8)
+    $content = "API_BASE_URL=$ApiBaseUrl`nUSE_WEB_AUTH=true`nUSE_AUTH_CUSTOM_TOKEN=true"
+    [System.IO.File]::WriteAllText((Join-Path (Get-Location) $envFile), $content, [System.Text.Encoding]::UTF8)
 }
 
 function SetupKeystoreAndroid {
@@ -128,7 +138,25 @@ function BuildiOS {
 }
 
 function RunDev {
-    flutter run --flavor dev
+    $devHost = if ($env:OMI_DEV_HOST) { $env:OMI_DEV_HOST } else { "10.0.2.2" }
+    $apiBaseUrl = if ($env:OMI_LOCAL_API_BASE_URL) { $env:OMI_LOCAL_API_BASE_URL } else { "http://$devHost`:8000/" }
+    $flutterArgs = @(
+        "run", "--flavor", "dev",
+        "--dart-define=OMI_APP_PROFILE=local_dev",
+        "--dart-define=OMI_API_BASE_URL=$apiBaseUrl",
+        "--dart-define=OMI_FIREBASE_AUTH_EMULATOR_HOST=$devHost"
+    )
+    & flutter @flutterArgs
+}
+
+function RunAndroidBeta {
+    $apiBaseUrl = if ($env:OMI_BETA_API_BASE_URL) { $env:OMI_BETA_API_BASE_URL } else { "https://api.omiapi.com/" }
+    $flutterArgs = @(
+        "run", "--flavor", "prod",
+        "--dart-define=OMI_APP_PROFILE=mobile_beta",
+        "--dart-define=OMI_API_BASE_URL=$apiBaseUrl"
+    )
+    & flutter @flutterArgs
 }
 
 # Function to show menu and get platform choice
@@ -169,10 +197,24 @@ switch ($platform.ToLower()) {
     }
     "android" {
         Write-Host "`nSetting up Android platform..."
-        SetupKeystoreAndroid
-        SetupFirebase
-        SetupAppEnv
-        Build
+        if ($args.Count -gt 1 -and $args[1].ToLower() -eq "beta") {
+            if ([string]::IsNullOrWhiteSpace($env:FIREBASE_SERVICE_ACCOUNT_KEY)) {
+                Write-Error "android beta requires FIREBASE_SERVICE_ACCOUNT_KEY"
+                exit 1
+            }
+            SetupKeystoreAndroid
+            SetupFirebase
+            SetupFirebaseWithServiceAccountAndroid
+            SetupAppEnv -Profile "mobile_beta"
+            Build
+            RunAndroidBeta
+        } else {
+            SetupKeystoreAndroid
+            SetupFirebase
+            SetupAppEnv -Profile "local_dev"
+            Build
+            RunDev
+        }
     }
     default {
         Write-Host "Unexpected platform '$platform'. Please use 'ios' or 'android'"
diff --git a/app/test.sh b/app/test.sh
index 1bf0aa930ae..14fa663dc10 100755
--- a/app/test.sh
+++ b/app/test.sh
@@ -23,18 +23,18 @@ if [[ ${#missing_files[@]} -gt 0 ]]; then
   echo "Running setup prerequisites..."
 
   mkdir -p android/app/src/dev/ ios/Config/Dev/ ios/Runner/ macos/ macos/Config/Dev
-  cp setup/prebuilt/firebase_options.dart lib/firebase_options_dev.dart
-  cp setup/prebuilt/google-services.json android/app/src/dev/
-  cp setup/prebuilt/GoogleService-Info.plist ios/Config/Dev/
-  cp setup/prebuilt/GoogleService-Info.plist ios/Runner/
-  cp setup/prebuilt/GoogleService-Info.plist macos/
-  cp setup/prebuilt/GoogleService-Info.plist macos/Config/Dev/
+  cp setup/prebuilt/firebase_options_local.dart lib/firebase_options_dev.dart
+  cp setup/prebuilt/google-services-local.json android/app/src/dev/google-services.json
+  cp setup/prebuilt/GoogleService-Info-Local.plist ios/Config/Dev/GoogleService-Info.plist
+  cp setup/prebuilt/GoogleService-Info-Local.plist ios/Runner/GoogleService-Info.plist
+  cp setup/prebuilt/GoogleService-Info-Local.plist macos/GoogleService-Info.plist
+  cp setup/prebuilt/GoogleService-Info-Local.plist macos/Config/Dev/
 
   mkdir -p android/app/src/prod/ ios/Config/Prod/ macos/Config/Prod
-  cp setup/prebuilt/firebase_options.dart lib/firebase_options_prod.dart
-  cp setup/prebuilt/google-services.json android/app/src/prod/
-  cp setup/prebuilt/GoogleService-Info.plist ios/Config/Prod/
-  cp setup/prebuilt/GoogleService-Info.plist macos/Config/Prod/
+  cp setup/prebuilt/firebase_options_local.dart lib/firebase_options_prod.dart
+  cp setup/prebuilt/google-services-local.json android/app/src/prod/google-services.json
+  cp setup/prebuilt/GoogleService-Info-Local.plist ios/Config/Prod/GoogleService-Info.plist
+  cp setup/prebuilt/GoogleService-Info-Local.plist macos/Config/Prod/GoogleService-Info.plist
 
   if [[ -n "${OMI_APP_TEST_API_BASE_URL:-}" ]]; then
     echo "API_BASE_URL=${OMI_APP_TEST_API_BASE_URL}" > .dev.env
diff --git a/app/test/unit/env_test.dart b/app/test/unit/env_test.dart
index 77d46558cde..ad95e309535 100644
--- a/app/test/unit/env_test.dart
+++ b/app/test/unit/env_test.dart
@@ -1,5 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:omi/env/env.dart';
+import 'package:omi/env/environment_profile.dart';
 import 'package:omi/flavors.dart';
 import 'package:omi/startup_routing.dart';
 import 'dart:io';
@@ -13,7 +14,7 @@ class _TestEnvFields implements EnvFields {
   @override
   String? get posthogApiKey => null;
   @override
-  String? get apiBaseUrl => 'https://api.omi.me/';
+  String? get apiBaseUrl => null;
   @override
   String? get googleMapsApiKey => null;
   @override
@@ -52,7 +53,46 @@ void main() {
     });
   });
 
+  group('mobile environment profiles', () {
+    test('local development is emulator-first and does not allow production data', () {
+      expect(AppEnvironmentProfile.localDev.defaultApiBaseUrl, 'http://127.0.0.1:8000/');
+      expect(AppEnvironmentProfile.localDev.firebaseProjectId, 'demo-omi-local');
+      expect(AppEnvironmentProfile.localDev.usesFirebaseAuthEmulator, isTrue);
+      expect(AppEnvironmentProfile.localDev.allowsProductionData, isFalse);
+    });
+
+    test('mobile beta explicitly pairs production Firebase with the dev serving plane', () {
+      expect(AppEnvironmentProfile.mobileBeta.defaultApiBaseUrl, 'https://api.omiapi.com/');
+      expect(AppEnvironmentProfile.mobileBeta.firebaseProjectId, 'based-hardware');
+      expect(AppEnvironmentProfile.mobileBeta.usesFirebaseAuthEmulator, isFalse);
+      expect(AppEnvironmentProfile.mobileBeta.allowsProductionData, isTrue);
+      expect(AppEnvironmentProfile.mobileBeta.authCallbackScheme, 'omi-beta');
+    });
+
+    test('local profile rejects a production Firebase project', () {
+      expect(
+        () => Env.validateFirebaseProject(projectId: 'based-hardware'),
+        throwsStateError,
+      );
+    });
+
+    test('flavor defaults map to production and local profiles', () {
+      expect(
+        AppEnvironmentProfile.forFlavor(productionFlavor: true),
+        AppEnvironmentProfile.production,
+      );
+      expect(
+        AppEnvironmentProfile.forFlavor(productionFlavor: false),
+        AppEnvironmentProfile.localDev,
+      );
+    });
+  });
+
   group('Env.apiBaseUrl', () {
+    test('uses the local emulator API when development env has no URL', () {
+      expect(Env.apiBaseUrl, 'http://127.0.0.1:8000/');
+    });
+
     test('returns override when set', () {
       Env.overrideApiBaseUrl('https://override.example.com/');
       expect(Env.apiBaseUrl, 'https://override.example.com/');
@@ -69,6 +109,14 @@ void main() {
       expect(Env.productionAgentProxyWsUrl, 'wss://agent.omi.me/v1/agent/ws');
     });
 
+    test('mobile beta accepts the dev serving plane with production identity', () {
+      Env.validateStartupRouting(
+        productionFamily: true,
+        configuredProfile: AppEnvironmentProfile.mobileBeta,
+        configuredApiBaseUrl: 'https://api.omiapi.com/',
+      );
+    });
+
     test('production startup rejects legacy Beta, dev, staging, and arbitrary endpoints', () {
       for (final endpoint in [
         'https://api-beta.omi.me/',
@@ -84,15 +132,25 @@ void main() {
       }
     });
 
-    test('development startup remains configurable', () {
+    test('local development startup accepts the emulator API', () {
       expect(
         () => validateApplicationStartupRouting(
           environment: Environment.dev,
-          configuredApiBaseUrl: 'https://api.omi.dev/',
+          configuredApiBaseUrl: 'http://127.0.0.1:8000/',
         ),
         returnsNormally,
       );
     });
+
+    test('local development rejects the remote dev serving plane', () {
+      expect(
+        () => validateApplicationStartupRouting(
+          environment: Environment.dev,
+          configuredApiBaseUrl: 'https://api.omiapi.com/',
+        ),
+        throwsStateError,
+      );
+    });
   });
 
   test('main invokes the production startup routing seam before services initialize', () {
@@ -103,5 +161,9 @@ void main() {
       mainSource.indexOf('validateApplicationStartupRouting();'),
       lessThan(mainSource.indexOf('ServiceManager.init()')),
     );
+    expect(
+      mainSource,
+      contains('Env.validateFirebaseProject(projectId: Firebase.app().options.projectId);'),
+    );
   });
 }

From ddd8339d8021e2284d1998dfdf83865ef06ea4fd Mon Sep 17 00:00:00 2001
From: David Zhang <david.d.zhang@gmail.com>
Date: Sat, 8 Aug 2026 21:14:09 -0400
Subject: [PATCH 2/8] fix: harden mobile environment setup

Disable local Crashlytics mapping uploads and address review findings around iOS beta OAuth, plist generation, setup defaults, and profile-isolated Firebase validation.\n\nFailure-Class: none
---
 .gitignore                                 |   1 +
 app/android/app/build.gradle               |   6 +
 app/ios/Flutter/prodDebug.xcconfig         |   1 -
 app/ios/Flutter/prodProfile.xcconfig       |   1 -
 app/ios/Flutter/prodRelease.xcconfig       |   1 -
 app/ios/Runner/Info-Dev.plist              | 216 ---------------------
 app/lib/env/env.dart                       |  10 +-
 app/scripts/generate_ios_dev_info_plist.sh |  16 ++
 app/setup.sh                               |   1 +
 app/setup/scripts/setup.ps1                |  24 +--
 app/test.sh                                |   2 +-
 app/test/unit/env_test.dart                |   5 +-
 12 files changed, 45 insertions(+), 239 deletions(-)
 delete mode 100644 app/ios/Runner/Info-Dev.plist
 create mode 100755 app/scripts/generate_ios_dev_info_plist.sh

diff --git a/.gitignore b/.gitignore
index ed030823669..5cb3d9d96fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,6 +126,7 @@ src/recordings
 /app/lib/firebase_options.dart
 /app/lib/firebase_options_*.dart
 !/app/lib/firebase_options_local.dart
+/app/ios/Runner/Info-Dev.plist
 /app/firebase.json
 
 # Solidworks models
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
index 7401dc88a5f..969fc35017e 100644
--- a/app/android/app/build.gradle
+++ b/app/android/app/build.gradle
@@ -165,3 +165,9 @@ dependencies {
     implementation 'io.intercom.android:intercom-sdk:latest.release'
     implementation 'com.twilio:voice-android:6.10.2'
 }
+
+// Local dev uses the non-production Firebase emulator project. Do not try to
+// upload its mapping files to Crashlytics; production variants retain uploads.
+tasks.matching { task -> task.name.startsWith('uploadCrashlyticsMappingFileDev') }.configureEach {
+    enabled = false
+}
diff --git a/app/ios/Flutter/prodDebug.xcconfig b/app/ios/Flutter/prodDebug.xcconfig
index eac7859048f..a76743ea9c2 100644
--- a/app/ios/Flutter/prodDebug.xcconfig
+++ b/app/ios/Flutter/prodDebug.xcconfig
@@ -6,4 +6,3 @@
 ASSET_PREFIX=prod
 BUNDLE_NAME=Omi
 BUNDLE_DISPLAY_NAME=Omi
-GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.208440318997-ukinsq3sijhcetkhr26ssqp1terbq7as
diff --git a/app/ios/Flutter/prodProfile.xcconfig b/app/ios/Flutter/prodProfile.xcconfig
index ddc27a7f798..3024241ef2e 100644
--- a/app/ios/Flutter/prodProfile.xcconfig
+++ b/app/ios/Flutter/prodProfile.xcconfig
@@ -6,4 +6,3 @@
 ASSET_PREFIX=prod
 BUNDLE_NAME=Omi
 BUNDLE_DISPLAY_NAME=Omi
-GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.208440318997-ukinsq3sijhcetkhr26ssqp1terbq7as
diff --git a/app/ios/Flutter/prodRelease.xcconfig b/app/ios/Flutter/prodRelease.xcconfig
index ddc27a7f798..3024241ef2e 100644
--- a/app/ios/Flutter/prodRelease.xcconfig
+++ b/app/ios/Flutter/prodRelease.xcconfig
@@ -6,4 +6,3 @@
 ASSET_PREFIX=prod
 BUNDLE_NAME=Omi
 BUNDLE_DISPLAY_NAME=Omi
-GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.208440318997-ukinsq3sijhcetkhr26ssqp1terbq7as
diff --git a/app/ios/Runner/Info-Dev.plist b/app/ios/Runner/Info-Dev.plist
deleted file mode 100644
index 859a2e7778b..00000000000
--- a/app/ios/Runner/Info-Dev.plist
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BGTaskSchedulerPermittedIdentifiers</key>
-	<array>
-		<string>daily-summary</string>
-		<string>com.friend-app-with-wearable.ios12.daily-summary</string>
-		<string>dev.flutter.background.refresh</string>
-		<string>com.pravera.flutter_foreground_task.refresh</string>
-	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>$(BUNDLE_DISPLAY_NAME)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>ar</string>
-		<string>bg</string>
-		<string>ca</string>
-		<string>cs</string>
-		<string>da</string>
-		<string>de</string>
-		<string>el</string>
-		<string>en</string>
-		<string>es</string>
-		<string>et</string>
-		<string>fi</string>
-		<string>fr</string>
-		<string>hi</string>
-		<string>hu</string>
-		<string>id</string>
-		<string>it</string>
-		<string>ja</string>
-		<string>ko</string>
-		<string>lt</string>
-		<string>lv</string>
-		<string>ms</string>
-		<string>nl</string>
-		<string>no</string>
-		<string>pl</string>
-		<string>pt</string>
-		<string>ro</string>
-		<string>ru</string>
-		<string>sk</string>
-		<string>sv</string>
-		<string>th</string>
-		<string>tr</string>
-		<string>uk</string>
-		<string>vi</string>
-		<string>zh</string>
-	</array>
-	<key>CFBundleName</key>
-	<string>$(BUNDLE_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>h.omi.me</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>https</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>h.omi.me</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>$(GOOGLE_REVERSE_CLIENT_ID)</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>omi.auth</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>$(AUTH_CALLBACK_SCHEME)</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>rayban-meta-callback</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>omirayban</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>FlutterDeepLinkingEnabled</key>
-	<false/>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>comgooglemaps</string>
-		<string>iosamap</string>
-	</array>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>MWDAT</key>
-	<dict>
-		<key>AppLinkURLScheme</key>
-		<string>omirayban://</string>
-		<key>DAMEnabled</key>
-		<true/>
-	</dict>
-	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>Omi uses Bluetooth to connect to your Omi wearable and stream its microphone audio to your phone — for example, to transcribe your meetings into notes and check the device's battery.</string>
-	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>Omi uses Bluetooth to connect to your Omi wearable and stream its microphone audio to your phone — for example, to transcribe your meetings into notes and check the device's battery.</string>
-	<key>NSCalendarsFullAccessUsageDescription</key>
-	<string>Access most functions for calendar viewing and editing.</string>
-	<key>NSCalendarsUsageDescription</key>
-	<string>Access most functions for calendar viewing and editing.</string>
-	<key>NSCameraUsageDescription</key>
-	<string>Camera access is required to report issues</string>
-	<key>NSContactsUsageDescription</key>
-	<string>Access contacts for event attendee editing and to share conversation summaries via SMS.</string>
-	<key>NSHealthShareUsageDescription</key>
-	<string>Omi reads your steps, walking and running distance, active energy, heart rate, sleep, and workouts from Apple Health so you can ask about your fitness, sleep, and activity in Omi Chat. Omi never writes to Apple Health.</string>
-	<key>NSHealthUpdateUsageDescription</key>
-	<string>Omi does not write any data to Apple Health. This string is only present because iOS requires it when the HealthKit framework is linked.</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>When creating your memories, we use your location for determining where they were created.</string>
-	<key>NSLocationUsageDescription</key>
-	<string>When creating your memories, we use your location for determining where they were created.</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>When creating your memories, we use your location for determining where they were created.</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsLocalNetworking</key>
-		<true/>
-	</dict>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>We need access to your microphone so you can share audio explanations of Bugs you find, and for voice commands.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>We need access to your photo library to allow you to upload and share photos through Instabug.</string>
-	<key>NSRemindersFullAccessUsageDescription</key>
-	<string>We need access to your reminders to export action items from Omi conversations.</string>
-	<key>NSRemindersUsageDescription</key>
-	<string>We need access to your reminders to export action items from Omi conversations.</string>
-	<key>NSSpeechRecognitionUsageDescription</key>
-	<string>We use speech recognition to convert your speech to text for processing on your device.</string>
-	<key>PermissionGroupNotification</key>
-	<string>You need to enable notifications to receive your pro-active feedback.</string>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>audio</string>
-		<string>location</string>
-		<string>bluetooth-central</string>
-		<string>fetch</string>
-		<string>processing</string>
-		<string>remote-notification</string>
-		<string>voip</string>
-	</array>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIRequiresFullScreen</key>
-	<true/>
-	<key>UIStatusBarHidden</key>
-	<false/>
-	<key>UISupportedExternalAccessoryProtocols</key>
-	<array>
-		<string>com.meta.ar.wearable</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-	<key>WKCompanionAppBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>com.posthog.posthog.AUTO_INIT</key>
-	<false/>
-</dict>
-</plist>
diff --git a/app/lib/env/env.dart b/app/lib/env/env.dart
index 1ee07291940..ec85f8cebcf 100644
--- a/app/lib/env/env.dart
+++ b/app/lib/env/env.dart
@@ -74,10 +74,14 @@ abstract class Env {
     }
   }
 
-  static void validateFirebaseProject({required String projectId}) {
-    if (projectId != profile.firebaseProjectId) {
+  static void validateFirebaseProject({
+    required String projectId,
+    AppEnvironmentProfile? configuredProfile,
+  }) {
+    final effectiveProfile = configuredProfile ?? profile;
+    if (projectId != effectiveProfile.firebaseProjectId) {
       throw StateError(
-        'Mobile profile ${profile.name} requires Firebase project ${profile.firebaseProjectId}, '
+        'Mobile profile ${effectiveProfile.name} requires Firebase project ${effectiveProfile.firebaseProjectId}, '
         'but the app was initialized with $projectId.',
       );
     }
diff --git a/app/scripts/generate_ios_dev_info_plist.sh b/app/scripts/generate_ios_dev_info_plist.sh
new file mode 100755
index 00000000000..d487436efdd
--- /dev/null
+++ b/app/scripts/generate_ios_dev_info_plist.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SOURCE_PLIST="${1:-ios/Runner/Info.plist}"
+OUTPUT_PLIST="${2:-ios/Runner/Info-Dev.plist}"
+
+if [[ ! -f "$SOURCE_PLIST" ]]; then
+  echo "Missing source plist: $SOURCE_PLIST" >&2
+  exit 1
+fi
+
+mkdir -p "$(dirname "$OUTPUT_PLIST")"
+cp "$SOURCE_PLIST" "$OUTPUT_PLIST"
+/usr/libexec/PlistBuddy -c 'Add :NSAppTransportSecurity dict' "$OUTPUT_PLIST"
+/usr/libexec/PlistBuddy -c 'Add :NSAppTransportSecurity:NSAllowsLocalNetworking bool true' "$OUTPUT_PLIST"
+plutil -lint "$OUTPUT_PLIST" >/dev/null
diff --git a/app/setup.sh b/app/setup.sh
index aa403067d8b..5ce7208a16d 100644
--- a/app/setup.sh
+++ b/app/setup.sh
@@ -218,6 +218,7 @@ case "${1}" in
         && run_build_ios prod --dart-define=OMI_APP_PROFILE=mobile_beta
     else
       setup_firebase \
+        && bash scripts/generate_ios_dev_info_plist.sh \
         && generate_ios_custom_config Dev omi-dev \
         && setup_app_env local_dev \
         && run_build_ios dev \
diff --git a/app/setup/scripts/setup.ps1 b/app/setup/scripts/setup.ps1
index e4149b05d73..b41011c1407 100644
--- a/app/setup/scripts/setup.ps1
+++ b/app/setup/scripts/setup.ps1
@@ -59,20 +59,6 @@ function SetupFirebase {
 }
 
 
-function SetupFirebaseWithServiceAccountIos {
-    dart pub global activate flutterfire_cli
-
-    flutterfire config `
-        --platforms="ios" `
-        --out="lib/firebase_options_prod.dart" `
-        --ios-bundle-id="com.friend-app-with-wearable.ios12.beta" `
-        --ios-out="ios/Config/Prod/" `
-        --service-account="$env:FIREBASE_SERVICE_ACCOUNT_KEY" `
-        --project="based-hardware" `
-        --ios-target="Runner" `
-        --yes
-}
-
 function SetupFirebaseWithServiceAccountAndroid {
     dart pub global activate flutterfire_cli
 
@@ -106,7 +92,7 @@ function SetupAppEnv {
         [string]$ApiBaseUrl = ""
     )
     if ([string]::IsNullOrWhiteSpace($ApiBaseUrl)) {
-        $devHost = if ($env:OMI_DEV_HOST) { $env:OMI_DEV_HOST } else { "10.0.2.2" }
+        $devHost = if ($env:OMI_DEV_HOST) { $env:OMI_DEV_HOST } else { "127.0.0.1" }
         $ApiBaseUrl = "http://$devHost`:8000/"
     }
     if ($Profile -eq "mobile_beta") {
@@ -189,6 +175,14 @@ $platform = if ($args.Count -eq 0) {
 # Replace the existing switch block with this:
 switch ($platform.ToLower()) {
     "ios" {
+        if ($args.Count -gt 1) {
+            if ($args[1].ToLower() -eq "beta") {
+                Write-Error "ios beta is only supported by bash setup.sh on macOS; use 'bash setup.sh ios beta'."
+            } else {
+                Write-Error "Unsupported iOS setup profile '$($args[1])'."
+            }
+            exit 1
+        }
         Write-Host "`nSetting up iOS platform..."
         SetupFirebase
         SetupAppEnv
diff --git a/app/test.sh b/app/test.sh
index 14fa663dc10..3458e0d6e9a 100755
--- a/app/test.sh
+++ b/app/test.sh
@@ -28,7 +28,7 @@ if [[ ${#missing_files[@]} -gt 0 ]]; then
   cp setup/prebuilt/GoogleService-Info-Local.plist ios/Config/Dev/GoogleService-Info.plist
   cp setup/prebuilt/GoogleService-Info-Local.plist ios/Runner/GoogleService-Info.plist
   cp setup/prebuilt/GoogleService-Info-Local.plist macos/GoogleService-Info.plist
-  cp setup/prebuilt/GoogleService-Info-Local.plist macos/Config/Dev/
+  cp setup/prebuilt/GoogleService-Info-Local.plist macos/Config/Dev/GoogleService-Info.plist
 
   mkdir -p android/app/src/prod/ ios/Config/Prod/ macos/Config/Prod
   cp setup/prebuilt/firebase_options_local.dart lib/firebase_options_prod.dart
diff --git a/app/test/unit/env_test.dart b/app/test/unit/env_test.dart
index ad95e309535..84495d585e6 100644
--- a/app/test/unit/env_test.dart
+++ b/app/test/unit/env_test.dart
@@ -71,7 +71,10 @@ void main() {
 
     test('local profile rejects a production Firebase project', () {
       expect(
-        () => Env.validateFirebaseProject(projectId: 'based-hardware'),
+        () => Env.validateFirebaseProject(
+          projectId: 'based-hardware',
+          configuredProfile: AppEnvironmentProfile.localDev,
+        ),
         throwsStateError,
       );
     });

From 9b779ca5b5d61086d432102c3f14278e6f173a7c Mon Sep 17 00:00:00 2001
From: David Zhang <david.d.zhang@gmail.com>
Date: Mon, 10 Aug 2026 18:10:47 -0400
Subject: [PATCH 3/8] Improve mobile conversation responsiveness

---
 app/lib/pages/apps/page.dart                  |  15 +-
 app/lib/pages/conversation_detail/page.dart   |  17 ++-
 .../conversations/conversations_page.dart     | 139 +++++++++++++++---
 .../widgets/conversation_list_item.dart       |  50 ++++---
 .../widgets/conversations_group_widget.dart   |  37 +++--
 app/lib/pages/home/page.dart                  |  58 +++++---
 app/lib/providers/app_provider.dart           |  85 +++++++++--
 app/lib/providers/conversation_provider.dart  |   5 +-
 app/lib/widgets/bottom_nav_bar.dart           |  36 +++--
 .../conversations_group_widget_test.dart      |  37 +++++
 .../providers/app_provider_load_test.dart     |  83 +++++++++++
 .../conversation_provider_tap_test.dart       |  38 +++++
 app/test/widgets/bottom_nav_bar_test.dart     |  69 +++++++++
 13 files changed, 567 insertions(+), 102 deletions(-)
 create mode 100644 app/test/pages/conversations_group_widget_test.dart
 create mode 100644 app/test/providers/app_provider_load_test.dart
 create mode 100644 app/test/providers/conversation_provider_tap_test.dart
 create mode 100644 app/test/widgets/bottom_nav_bar_test.dart

diff --git a/app/lib/pages/apps/page.dart b/app/lib/pages/apps/page.dart
index 19aabeb053a..2fa2af6a467 100644
--- a/app/lib/pages/apps/page.dart
+++ b/app/lib/pages/apps/page.dart
@@ -1,10 +1,11 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
 import 'package:omi/backend/schema/app.dart';
 import 'package:omi/pages/apps/explore_install_page.dart';
-import 'package:omi/pages/apps/providers/add_app_provider.dart';
 import 'package:omi/providers/app_provider.dart';
 import 'package:omi/providers/connectivity_provider.dart';
 import 'package:omi/utils/l10n_extensions.dart';
@@ -23,10 +24,18 @@ class AppsPageState extends State<AppsPage> with AutomaticKeepAliveClientMixin {
 
   @override
   void initState() {
+    super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      context.read<AddAppProvider>().getCategories();
+      if (mounted) unawaited(_loadApps());
     });
-    super.initState();
+  }
+
+  Future<void> _loadApps() async {
+    final appProvider = context.read<AppProvider>();
+    await appProvider.getApps();
+    if (mounted) {
+      await appProvider.getPopularApps();
+    }
   }
 
   void scrollToTop() {
diff --git a/app/lib/pages/conversation_detail/page.dart b/app/lib/pages/conversation_detail/page.dart
index 1b7733e9d39..6e0a6a21841 100644
--- a/app/lib/pages/conversation_detail/page.dart
+++ b/app/lib/pages/conversation_detail/page.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:omi/utils/platform/platform_manager.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -199,8 +201,6 @@ class _ConversationDetailPageState extends State<ConversationDetailPage> with Ti
       provider.setCachedConversation(widget.conversation);
       _providerInitialized = true;
 
-      conversationProvider.groupConversationsByDate();
-
       // Find the proper date and index for this conversation in the grouped conversations
       final result = conversationProvider.getConversationDateAndIndex(widget.conversation);
       if (result != null) {
@@ -216,9 +216,18 @@ class _ConversationDetailPageState extends State<ConversationDetailPage> with Ti
         final date = provider.selectedDate;
         final idx = conversationProvider.getConversationIndexById(provider.conversation.id, date);
         if (idx != -1) {
-          await conversationProvider.updateSearchedConvoDetails(provider.conversation.id, date, idx);
+          // The initial list payload is enough to render the detail page. Fill
+          // in omitted app results after the first usable frame instead of
+          // holding the destination's startup sequence on this request.
+          unawaited(
+            conversationProvider.updateSearchedConvoDetails(provider.conversation.id, date, idx).then((_) {
+              if (!mounted || provider.conversationOrNull?.id != widget.conversation.id) return;
+              provider.updateConversation(widget.conversation.id, date);
+            }),
+          );
+        } else {
+          provider.updateConversation(provider.conversation.id, provider.selectedDate);
         }
-        provider.updateConversation(provider.conversation.id, provider.selectedDate);
       }
 
       // Check if this is the first conversation and show app review prompt
diff --git a/app/lib/pages/conversations/conversations_page.dart b/app/lib/pages/conversations/conversations_page.dart
index 149539695c3..da8c950dfea 100644
--- a/app/lib/pages/conversations/conversations_page.dart
+++ b/app/lib/pages/conversations/conversations_page.dart
@@ -26,7 +26,93 @@ import 'package:omi/utils/l10n_extensions.dart';
 import 'package:omi/utils/logger.dart';
 import 'package:omi/utils/ui_guidelines.dart';
 import 'widgets/conversations_group_widget.dart';
+import 'widgets/conversation_list_item.dart';
+import 'widgets/date_list_item.dart';
 import 'widgets/empty_conversations.dart';
+import 'widgets/recording_list_item.dart';
+
+enum _ConversationListRowKind { topSpacer, dateHeader, conversation, recording, groupSpacer }
+
+typedef _ConversationListRow = ({
+  _ConversationListRowKind kind,
+  DateTime date,
+  bool isFirst,
+  ServerConversation? conversation,
+  LocalRecording? recording,
+  int conversationIndex,
+});
+
+List<_ConversationListRow> _buildConversationListRows({
+  required List<DateTime> dates,
+  required Map<DateTime, List<ServerConversation>> conversationsByDate,
+  required Map<DateTime, List<LocalRecording>> recordingsByDate,
+}) {
+  final rows = <_ConversationListRow>[];
+  var hasRenderedDate = false;
+
+  for (var dateIndex = 0; dateIndex < dates.length; dateIndex++) {
+    final date = dates[dateIndex];
+    final conversations = conversationsByDate[date] ?? const <ServerConversation>[];
+    final recordings = recordingsByDate[date] ?? const <LocalRecording>[];
+    final entries = buildConversationGroupEntries(conversations: conversations, recordings: recordings);
+    if (entries.isEmpty) continue;
+
+    if (!hasRenderedDate) {
+      rows.add((
+        kind: _ConversationListRowKind.topSpacer,
+        date: date,
+        isFirst: true,
+        conversation: null,
+        recording: null,
+        conversationIndex: -1,
+      ));
+    }
+    rows.add((
+      kind: _ConversationListRowKind.dateHeader,
+      date: date,
+      isFirst: !hasRenderedDate,
+      conversation: null,
+      recording: null,
+      conversationIndex: -1,
+    ));
+
+    for (final entry in entries) {
+      final conversation = entry.conversation;
+      final recording = entry.recording;
+      if (conversation != null) {
+        rows.add((
+          kind: _ConversationListRowKind.conversation,
+          date: date,
+          isFirst: false,
+          conversation: conversation,
+          recording: null,
+          conversationIndex: conversations.indexOf(conversation),
+        ));
+      } else {
+        rows.add((
+          kind: _ConversationListRowKind.recording,
+          date: date,
+          isFirst: false,
+          conversation: null,
+          recording: recording,
+          conversationIndex: -1,
+        ));
+      }
+    }
+
+    rows.add((
+      kind: _ConversationListRowKind.groupSpacer,
+      date: date,
+      isFirst: false,
+      conversation: null,
+      recording: null,
+      conversationIndex: -1,
+    ));
+    hasRenderedDate = true;
+  }
+
+  return rows;
+}
 
 class ConversationsPage extends StatefulWidget {
   const ConversationsPage({super.key});
@@ -264,6 +350,11 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
         final bool hasRecordings = recordingsByDate.isNotEmpty;
         final mergedDates = <DateTime>{...convoProvider.groupedConversations.keys, ...recordingsByDate.keys}.toList()
           ..sort((a, b) => b.compareTo(a));
+        final conversationRows = _buildConversationListRows(
+          dates: mergedDates,
+          conversationsByDate: convoProvider.groupedConversations,
+          recordingsByDate: recordingsByDate,
+        );
 
         return RefreshIndicator(
           onRefresh: () async {
@@ -412,8 +503,8 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
                 _buildLoadingShimmer()
               else
                 SliverList(
-                  delegate: SliverChildBuilderDelegate(childCount: mergedDates.length + 1, (context, index) {
-                    if (index == mergedDates.length) {
+                  delegate: SliverChildBuilderDelegate(childCount: conversationRows.length + 1, (context, index) {
+                    if (index == conversationRows.length) {
                       Logger.debug('loading more conversations');
                       if (convoProvider.isLoadingConversations) {
                         return _buildLoadMoreShimmer();
@@ -437,24 +528,32 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
                         },
                         child: const SizedBox(height: 20, width: double.maxFinite),
                       );
-                    } else {
-                      var date = mergedDates[index];
-                      List<ServerConversation> memoriesForDate =
-                          convoProvider.groupedConversations[date] ?? const <ServerConversation>[];
-                      List<LocalRecording> recordingsForDate = recordingsByDate[date] ?? const <LocalRecording>[];
-                      return Column(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          if (index == 0) const SizedBox(height: 10),
-                          ConversationsGroupWidget(
-                            key: ValueKey(date),
-                            isFirst: index == 0,
-                            conversations: memoriesForDate,
-                            recordings: recordingsForDate,
-                            date: date,
-                          ),
-                        ],
-                      );
+                    }
+
+                    final row = conversationRows[index];
+                    switch (row.kind) {
+                      case _ConversationListRowKind.topSpacer:
+                        return const SizedBox(height: 10);
+                      case _ConversationListRowKind.dateHeader:
+                        return DateListItem(
+                          key: ValueKey('date_${row.date.toIso8601String()}'),
+                          date: row.date,
+                          isFirst: row.isFirst,
+                        );
+                      case _ConversationListRowKind.conversation:
+                        return ConversationListItem(
+                          key: ValueKey(row.conversation!.id),
+                          conversation: row.conversation!,
+                          conversationIdx: row.conversationIndex,
+                          date: row.date,
+                        );
+                      case _ConversationListRowKind.recording:
+                        return RecordingListItem(
+                          key: ValueKey('rec_${row.recording!.id}'),
+                          recording: row.recording!,
+                        );
+                      case _ConversationListRowKind.groupSpacer:
+                        return const SizedBox(height: 10);
                     }
                   }),
                 ),
diff --git a/app/lib/pages/conversations/widgets/conversation_list_item.dart b/app/lib/pages/conversations/widgets/conversation_list_item.dart
index 8012b5729ce..4c7076ee76b 100644
--- a/app/lib/pages/conversations/widgets/conversation_list_item.dart
+++ b/app/lib/pages/conversations/widgets/conversation_list_item.dart
@@ -4,6 +4,7 @@ import 'dart:ui';
 import 'package:omi/utils/platform/platform_manager.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -103,35 +104,38 @@ class _ConversationListItemState extends State<ConversationListItem> {
               routeToPage(context, const UsagePage(showUpgradeDialog: true));
               return;
             }
-            // Calculate time difference
-            int hoursSinceConversation = DateTime.now().difference(widget.conversation.createdAt).inHours;
-
-            // Check if user is searching
-            String searchQuery = provider.previousQuery;
-            if (searchQuery.isNotEmpty) {
-              // Track conversation opened from search
-              PlatformManager.instance.analytics.conversationOpenedFromSearch(
-                conversation: widget.conversation,
-                searchQuery: searchQuery,
-                conversationIndexInResults: widget.conversationIdx,
-              );
-            } else {
-              // Track normal conversation list item click with time difference
-              PlatformManager.instance.analytics.conversationListItemClickedWithTimeDifference(
-                conversation: widget.conversation,
-                conversationIndex: widget.conversationIdx,
-                hoursSinceConversation: hoursSinceConversation,
-              );
-            }
-
             context.read<ConversationDetailProvider>().updateConversation(widget.conversation.id, widget.date);
             String startingTitle = context.read<ConversationDetailProvider>().conversation.structured.title;
-            provider.onConversationTap(widget.conversation.id);
 
-            var result = await routeToPage(
+            final searchQuery = provider.previousQuery;
+            final resultFuture = routeToPage(
               context,
               ConversationDetailPage(conversation: widget.conversation, isFromOnboarding: widget.isFromOnboarding),
             );
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              if (!mounted) return;
+              provider.onConversationTap(widget.conversation.id);
+              unawaited(
+                SchedulerBinding.instance.scheduleTask<void>(() {
+                  if (!mounted) return;
+                  if (searchQuery.isNotEmpty) {
+                    PlatformManager.instance.analytics.conversationOpenedFromSearch(
+                      conversation: widget.conversation,
+                      searchQuery: searchQuery,
+                      conversationIndexInResults: widget.conversationIdx,
+                    );
+                  } else {
+                    PlatformManager.instance.analytics.conversationListItemClickedWithTimeDifference(
+                      conversation: widget.conversation,
+                      conversationIndex: widget.conversationIdx,
+                      hoursSinceConversation: DateTime.now().difference(widget.conversation.createdAt).inHours,
+                    );
+                  }
+                }, Priority.idle),
+              );
+            });
+
+            var result = await resultFuture;
             if (context.mounted) {
               // Don't upsert if the conversation was deleted while on the detail page
               if (result is Map && result['deleted'] == true) return;
diff --git a/app/lib/pages/conversations/widgets/conversations_group_widget.dart b/app/lib/pages/conversations/widgets/conversations_group_widget.dart
index 6e47aca38a3..a43055beb48 100644
--- a/app/lib/pages/conversations/widgets/conversations_group_widget.dart
+++ b/app/lib/pages/conversations/widgets/conversations_group_widget.dart
@@ -28,30 +28,45 @@ class ConversationsGroupWidget extends StatelessWidget {
       return const SizedBox.shrink();
     }
 
-    // Merge conversations and recordings into one time-sorted list (newest first),
-    // matching how conversations are ordered within a date.
-    final entries = <({DateTime time, ServerConversation? convo, LocalRecording? rec})>[
-      for (final c in conversations) (time: c.startedAt ?? c.createdAt, convo: c, rec: null),
-      for (final r in recordings) (time: r.startedAt, convo: null, rec: r),
-    ]..sort((a, b) => b.time.compareTo(a.time));
+    final entries = buildConversationGroupEntries(conversations: conversations, recordings: recordings);
 
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
         DateListItem(date: date, isFirst: isFirst),
         ...entries.map((e) {
-          if (e.convo != null) {
+          if (e.conversation != null) {
             return ConversationListItem(
-              key: ValueKey(e.convo!.id),
-              conversation: e.convo!,
-              conversationIdx: conversations.indexOf(e.convo!),
+              key: ValueKey(e.conversation!.id),
+              conversation: e.conversation!,
+              conversationIdx: conversations.indexOf(e.conversation!),
               date: date,
             );
           }
-          return RecordingListItem(key: ValueKey('rec_${e.rec!.id}'), recording: e.rec!);
+          return RecordingListItem(key: ValueKey('rec_${e.recording!.id}'), recording: e.recording!);
         }),
         const SizedBox(height: 10),
       ],
     );
   }
 }
+
+typedef ConversationGroupEntry = ({
+  DateTime time,
+  ServerConversation? conversation,
+  LocalRecording? recording,
+});
+
+/// Merge conversations and local recordings into the time-sorted order used by
+/// the conversations page. The page consumes these lightweight descriptors in
+/// a sliver builder so only visible rows become widgets.
+List<ConversationGroupEntry> buildConversationGroupEntries({
+  required List<ServerConversation> conversations,
+  required List<LocalRecording> recordings,
+}) {
+  return <ConversationGroupEntry>[
+    for (final conversation in conversations)
+      (time: conversation.startedAt ?? conversation.createdAt, conversation: conversation, recording: null),
+    for (final recording in recordings) (time: recording.startedAt, conversation: null, recording: recording),
+  ]..sort((a, b) => b.time.compareTo(a.time));
+}
diff --git a/app/lib/pages/home/page.dart b/app/lib/pages/home/page.dart
index 0604710b5cf..e02f5b5d86b 100644
--- a/app/lib/pages/home/page.dart
+++ b/app/lib/pages/home/page.dart
@@ -142,7 +142,6 @@ class HomePage extends StatefulWidget {
 
 class _HomePageState extends State<HomePage> with WidgetsBindingObserver, TickerProviderStateMixin {
   ForegroundUtil foregroundUtil = ForegroundUtil();
-  List<Widget> screens = [Container(), const SizedBox(), const SizedBox(), const SizedBox()];
 
   final _upgrader = MyUpgrader(debugLogging: false, debugDisplayOnce: false);
   bool scriptsInProgress = false;
@@ -152,7 +151,10 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
   final GlobalKey<State<ConversationsPage>> _conversationsPageKey = GlobalKey<State<ConversationsPage>>();
   final GlobalKey<State<ActionItemsPage>> _actionItemsPageKey = GlobalKey<State<ActionItemsPage>>();
   final GlobalKey<AppsPageState> _appsPageKey = GlobalKey<AppsPageState>();
-  late final List<Widget> _pages;
+  // Keep the IndexedStack slots stable, but defer constructing non-selected
+  // tabs until the user visits them. Once created, a tab remains in the stack
+  // so its scroll position and other state are preserved.
+  final List<Widget?> _pages = List<Widget?>.filled(4, null);
 
   // Freemium switch handler for auto-switch dialogs
   final FreemiumSwitchHandler _freemiumHandler = FreemiumSwitchHandler();
@@ -161,9 +163,28 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
   DeviceProvider? _deviceProviderForQuickActions;
   CaptureProvider? _captureProviderForQuickActions;
 
-  void _initiateApps() {
-    context.read<AppProvider>().getApps();
-    context.read<AppProvider>().getPopularApps();
+  void _ensurePageInitialized(int pageIndex) {
+    if (pageIndex < 0 || pageIndex >= _pages.length || _pages[pageIndex] != null) return;
+
+    switch (pageIndex) {
+      case 0:
+        _pages[pageIndex] = HomeContentPage(key: _homeContentPageKey);
+        break;
+      case 1:
+        _pages[pageIndex] = ConversationsPage(key: _conversationsPageKey);
+        break;
+      case 2:
+        _pages[pageIndex] = ActionItemsPage(key: _actionItemsPageKey, onAddGoal: _addGoal);
+        break;
+      case 3:
+        _pages[pageIndex] = AppsPage(key: _appsPageKey);
+        break;
+    }
+  }
+
+  List<Widget> _buildPages(int selectedIndex) {
+    _ensurePageInitialized(selectedIndex);
+    return [for (final page in _pages) page ?? const SizedBox.shrink()];
   }
 
   void _scrollToTop(int pageIndex) {
@@ -190,11 +211,15 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
   }
 
   void _addGoal() {
+    _ensurePageInitialized(1);
     context.read<HomeProvider>().setIndex(1);
-    final conversationsState = _conversationsPageKey.currentState;
-    if (conversationsState != null) {
-      (conversationsState as dynamic).addGoal();
-    }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      final conversationsState = _conversationsPageKey.currentState;
+      if (conversationsState != null) {
+        (conversationsState as dynamic).addGoal();
+      }
+    });
   }
 
   @override
@@ -270,12 +295,6 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
 
   @override
   void initState() {
-    _pages = [
-      HomeContentPage(key: _homeContentPageKey),
-      ConversationsPage(key: _conversationsPageKey),
-      ActionItemsPage(key: _actionItemsPageKey, onAddGoal: _addGoal),
-      AppsPage(key: _appsPageKey),
-    ];
     SharedPreferencesUtil().onboardingCompleted = true;
     if (!SharedPreferencesUtil().permissionsCompleted) {
       SharedPreferencesUtil().permissionsCompleted = true;
@@ -315,6 +334,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
 
     // Home controller
     context.read<HomeProvider>().selectedIndex = homePageIdx;
+    _ensurePageInitialized(homePageIdx);
     WidgetsBinding.instance.addObserver(this);
 
     // Pre-warm agent VM and WebSocket so session is ready by the time the user opens chat
@@ -329,8 +349,6 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
     }
 
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      _initiateApps();
-
       final permission = await Geolocator.checkPermission();
       if (permission == LocationPermission.always || permission == LocationPermission.whileInUse) {
         await ForegroundUtil.initializeForegroundService();
@@ -728,7 +746,10 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
                         // Show slim green call bar on non-home/conversations tabs when a call is active
                         if (homeProvider.selectedIndex > 1) const ActiveCallTopBar(),
                         Expanded(
-                          child: IndexedStack(index: context.watch<HomeProvider>().selectedIndex, children: _pages),
+                          child: IndexedStack(
+                            index: homeProvider.selectedIndex,
+                            children: _buildPages(homeProvider.selectedIndex),
+                          ),
                         ),
                       ],
                     ),
@@ -752,6 +773,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
                                     final cp = context.read<ConversationProvider>();
                                     if (cp.showDailySummaries) cp.toggleDailySummaries();
                                   }
+                                  _ensurePageInitialized(index);
                                   home.setIndex(index);
                                 }
                               },
diff --git a/app/lib/providers/app_provider.dart b/app/lib/providers/app_provider.dart
index 87202bdd5dc..32111349d5e 100644
--- a/app/lib/providers/app_provider.dart
+++ b/app/lib/providers/app_provider.dart
@@ -23,6 +23,15 @@ class AppProvider extends BaseProvider {
   @visibleForTesting
   Future<void> Function(String appId)? disableAppOverride;
 
+  @visibleForTesting
+  Future<List<Map<String, dynamic>>> Function()? retrieveAppsGroupedOverride;
+
+  @visibleForTesting
+  Future<List<String>> Function()? getEnabledAppsOverride;
+
+  @visibleForTesting
+  Future<List<App>> Function()? retrievePopularAppsOverride;
+
   List<App> apps = [];
   List<App> popularApps = [];
   // v2 grouped apps: [{ category: {id,title}, data: List<App>, pagination: {...} }]
@@ -44,6 +53,13 @@ class AppProvider extends BaseProvider {
   bool isLoading = false;
   bool isSearching = false;
 
+  // Share an in-flight load with callers that arrive while the Apps tab is
+  // being initialized. This prevents a rebuild or deep link from starting a
+  // second catalog request while preserving explicit later refreshes.
+  Future<void>? _appsLoad;
+  Future<void>? _popularAppsLoad;
+  int _activeCatalogLoads = 0;
+
   List<Category> categories = [];
   List<AppCapability> capabilities = [];
   Map<String, dynamic> filters = {};
@@ -396,6 +412,16 @@ class AppProvider extends BaseProvider {
     notifyListeners();
   }
 
+  void _beginCatalogLoad() {
+    _activeCatalogLoads++;
+    if (!isLoading) setIsLoading(true);
+  }
+
+  void _endCatalogLoad() {
+    _activeCatalogLoads--;
+    if (_activeCatalogLoads == 0 && isLoading) setIsLoading(false);
+  }
+
   void setSelectedChatAppId(String? appId) {
     final newAppId = appId ?? "";
     if (selectedChatAppId != newAppId) {
@@ -428,9 +454,28 @@ class AppProvider extends BaseProvider {
     notifyListeners();
   }
 
-  Future getApps() async {
-    if (isLoading) return;
-    setIsLoading(true);
+  Future<void> getApps() {
+    final inFlight = _appsLoad;
+    if (inFlight != null) return inFlight;
+
+    final completer = Completer<void>();
+    final sharedLoad = completer.future;
+    _appsLoad = sharedLoad;
+    unawaited(() async {
+      try {
+        await _loadApps();
+        completer.complete();
+      } catch (error, stackTrace) {
+        completer.completeError(error, stackTrace);
+      } finally {
+        if (identical(_appsLoad, sharedLoad)) _appsLoad = null;
+      }
+    }());
+    return sharedLoad;
+  }
+
+  Future<void> _loadApps() async {
+    _beginCatalogLoad();
 
     try {
       // Performance optimization: Load from cache first for immediate UI
@@ -440,8 +485,8 @@ class AppProvider extends BaseProvider {
 
       // Fetch grouped apps and user's enabled app IDs in parallel
       final results = await Future.wait([
-        retrieveAppsGrouped(offset: 0, limit: 20, includeReviews: true),
-        getEnabledAppsServer(),
+        retrieveAppsGroupedOverride?.call() ?? retrieveAppsGrouped(offset: 0, limit: 20, includeReviews: true),
+        getEnabledAppsOverride?.call() ?? getEnabledAppsServer(),
       ]);
       final groups = results[0] as List<Map<String, dynamic>>;
       final enabledAppIds = (results[1] as List<String>).toSet();
@@ -472,22 +517,40 @@ class AppProvider extends BaseProvider {
       // Fallback to cached data
       setAppsFromCache();
     } finally {
-      setIsLoading(false);
+      _endCatalogLoad();
     }
   }
 
-  Future getPopularApps() async {
-    if (isLoading) return; // Prevent concurrent operations
+  Future<void> getPopularApps() {
+    final inFlight = _popularAppsLoad;
+    if (inFlight != null) return inFlight;
+
+    final completer = Completer<void>();
+    final sharedLoad = completer.future;
+    _popularAppsLoad = sharedLoad;
+    unawaited(() async {
+      try {
+        await _loadPopularApps();
+        completer.complete();
+      } catch (error, stackTrace) {
+        completer.completeError(error, stackTrace);
+      } finally {
+        if (identical(_popularAppsLoad, sharedLoad)) _popularAppsLoad = null;
+      }
+    }());
+    return sharedLoad;
+  }
 
+  Future<void> _loadPopularApps() async {
+    _beginCatalogLoad();
     try {
-      setIsLoading(true);
-      popularApps = await retrievePopularApps();
+      popularApps = await (retrievePopularAppsOverride?.call() ?? retrievePopularApps());
     } catch (e) {
       Logger.debug('Error loading popular apps: $e');
       // Fallback to cached data or empty list
       popularApps = [];
     } finally {
-      setIsLoading(false);
+      _endCatalogLoad();
     }
   }
 
diff --git a/app/lib/providers/conversation_provider.dart b/app/lib/providers/conversation_provider.dart
index 3ded964b0c2..942ac225d9e 100644
--- a/app/lib/providers/conversation_provider.dart
+++ b/app/lib/providers/conversation_provider.dart
@@ -266,7 +266,10 @@ class ConversationProvider extends ChangeNotifier {
     if (idx == -1) return;
     if (conversations[idx].isNew) {
       conversations[idx].isNew = false;
-      groupConversationsByDate();
+      // The grouped lists contain the same conversation objects. Rebuilding
+      // and sorting every date here makes a tap pay the full list cost even
+      // though only this item's badge changed.
+      notifyListeners();
     }
   }
 
diff --git a/app/lib/widgets/bottom_nav_bar.dart b/app/lib/widgets/bottom_nav_bar.dart
index 64e8f6c4501..b11fee215e8 100644
--- a/app/lib/widgets/bottom_nav_bar.dart
+++ b/app/lib/widgets/bottom_nav_bar.dart
@@ -7,15 +7,26 @@ import 'package:provider/provider.dart';
 
 import 'package:omi/providers/home_provider.dart';
 
-class BottomNavBar extends StatelessWidget {
+class BottomNavBar extends StatefulWidget {
   const BottomNavBar({super.key, required this.onTabTap});
 
   final void Function(int index, bool isRepeat) onTabTap;
 
   @override
-  Widget build(BuildContext context) {
-    return Consumer<HomeProvider>(
-      builder: (context, home, child) {
+  State<BottomNavBar> createState() => _BottomNavBarState();
+}
+
+class _BottomNavBarState extends State<BottomNavBar> {
+  // Keep the provider-dependent subtree stable when HomePage's broad Consumer
+  // rebuilds for unrelated focus or loading changes.
+  late final Widget _navigation;
+
+  @override
+  void initState() {
+    super.initState();
+    _navigation = Selector<HomeProvider, int>(
+      selector: (_, home) => home.selectedIndex,
+      builder: (context, selectedIndex, _) {
         return Align(
           alignment: Alignment.bottomCenter,
           child: Container(
@@ -32,10 +43,10 @@ class BottomNavBar extends StatelessWidget {
             ),
             child: Row(
               children: [
-                _buildTab(context, home, 0, FontAwesomeIcons.house, 'Home'),
-                _buildTab(context, home, 1, FontAwesomeIcons.comments, 'Conversations'),
-                _buildTab(context, home, 2, FontAwesomeIcons.listCheck, 'Tasks'),
-                _buildTab(context, home, 3, FontAwesomeIcons.puzzlePiece, 'Apps'),
+                _buildTab(context, selectedIndex, 0, FontAwesomeIcons.house, 'Home'),
+                _buildTab(context, selectedIndex, 1, FontAwesomeIcons.comments, 'Conversations'),
+                _buildTab(context, selectedIndex, 2, FontAwesomeIcons.listCheck, 'Tasks'),
+                _buildTab(context, selectedIndex, 3, FontAwesomeIcons.puzzlePiece, 'Apps'),
               ],
             ),
           ),
@@ -44,18 +55,21 @@ class BottomNavBar extends StatelessWidget {
     );
   }
 
-  Widget _buildTab(BuildContext context, HomeProvider home, int index, FaIconData icon, String label) {
+  @override
+  Widget build(BuildContext context) => _navigation;
+
+  Widget _buildTab(BuildContext context, int selectedIndex, int index, FaIconData icon, String label) {
     return Expanded(
       child: InkWell(
         onTap: () {
           HapticFeedback.mediumImpact();
           PlatformManager.instance.analytics.bottomNavigationTabClicked(label);
           primaryFocus?.unfocus();
-          onTabTap(index, home.selectedIndex == index);
+          widget.onTabTap(index, context.read<HomeProvider>().selectedIndex == index);
         },
         child: SizedBox(
           height: 90,
-          child: Center(child: FaIcon(icon, color: home.selectedIndex == index ? Colors.white : Colors.grey, size: 26)),
+          child: Center(child: FaIcon(icon, color: selectedIndex == index ? Colors.white : Colors.grey, size: 26)),
         ),
       ),
     );
diff --git a/app/test/pages/conversations_group_widget_test.dart b/app/test/pages/conversations_group_widget_test.dart
new file mode 100644
index 00000000000..d6cd675fa0d
--- /dev/null
+++ b/app/test/pages/conversations_group_widget_test.dart
@@ -0,0 +1,37 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:omi/backend/schema/bt_device/bt_device.dart';
+import 'package:omi/backend/schema/conversation.dart';
+import 'package:omi/backend/schema/structured.dart';
+import 'package:omi/models/local_recording.dart';
+import 'package:omi/pages/conversations/widgets/conversations_group_widget.dart';
+
+void main() {
+  test('conversation group entries preserve newest-first ordering across sources', () {
+    final olderConversation = _conversation('older', DateTime.utc(2026, 8, 10, 9));
+    final newerRecording = _recording('newer.bin', DateTime.utc(2026, 8, 10, 10));
+    final entries = buildConversationGroupEntries(
+      conversations: [olderConversation],
+      recordings: [newerRecording],
+    );
+
+    expect(entries.map((entry) => entry.conversation?.id ?? entry.recording?.id), ['newer.bin', 'older']);
+  });
+}
+
+ServerConversation _conversation(String id, DateTime createdAt) => ServerConversation(
+      id: id,
+      createdAt: createdAt,
+      structured: Structured('Title', 'Overview'),
+    );
+
+LocalRecording _recording(String fileName, DateTime startedAt) => LocalRecording(
+      fileName: fileName,
+      filePath: '/tmp/$fileName',
+      timerStart: startedAt.millisecondsSinceEpoch ~/ 1000,
+      codec: BleAudioCodec.opus,
+      frameSize: 160,
+      sizeBytes: 1024,
+      seconds: 1,
+      state: LocalRecordingState.pending,
+    );
diff --git a/app/test/providers/app_provider_load_test.dart b/app/test/providers/app_provider_load_test.dart
new file mode 100644
index 00000000000..4d4a045f41e
--- /dev/null
+++ b/app/test/providers/app_provider_load_test.dart
@@ -0,0 +1,83 @@
+import 'dart:async';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:omi/backend/preferences.dart';
+import 'package:omi/backend/schema/app.dart';
+import 'package:omi/providers/app_provider.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  setUp(() async {
+    SharedPreferences.setMockInitialValues({});
+    await SharedPreferencesUtil.init();
+  });
+
+  test('coalesces duplicate catalog loads', () async {
+    final provider = AppProvider();
+    addTearDown(provider.dispose);
+    final catalog = Completer<List<Map<String, dynamic>>>();
+    var requestCount = 0;
+    provider.retrieveAppsGroupedOverride = () {
+      requestCount++;
+      return catalog.future;
+    };
+    provider.getEnabledAppsOverride = () async => <String>[];
+    Future<void>? reentrantLoad;
+    provider.addListener(() {
+      if (provider.isLoading) reentrantLoad ??= provider.getApps();
+    });
+
+    final first = provider.getApps();
+    final second = provider.getApps();
+
+    expect(requestCount, 1);
+    expect(provider.isLoading, isTrue);
+    catalog.complete(<Map<String, dynamic>>[]);
+    await Future.wait([first, second, reentrantLoad!]);
+    expect(provider.isLoading, isFalse);
+  });
+
+  test('allows catalog and popular loads to overlap without clearing loading early', () async {
+    final provider = AppProvider();
+    addTearDown(provider.dispose);
+    final catalog = Completer<List<Map<String, dynamic>>>();
+    final popular = Completer<List<App>>();
+    provider.retrieveAppsGroupedOverride = () => catalog.future;
+    provider.getEnabledAppsOverride = () async => <String>[];
+    provider.retrievePopularAppsOverride = () => popular.future;
+
+    final catalogLoad = provider.getApps();
+    final popularLoad = provider.getPopularApps();
+    expect(provider.isLoading, isTrue);
+
+    popular.complete(<App>[]);
+    await popularLoad;
+    expect(provider.isLoading, isTrue);
+
+    catalog.complete(<Map<String, dynamic>>[]);
+    await catalogLoad;
+    expect(provider.isLoading, isFalse);
+  });
+
+  test('coalesces duplicate popular app loads', () async {
+    final provider = AppProvider();
+    addTearDown(provider.dispose);
+    final popular = Completer<List<App>>();
+    var requestCount = 0;
+    provider.retrievePopularAppsOverride = () {
+      requestCount++;
+      return popular.future;
+    };
+
+    final first = provider.getPopularApps();
+    final second = provider.getPopularApps();
+
+    expect(requestCount, 1);
+    popular.complete(<App>[]);
+    await Future.wait([first, second]);
+    expect(provider.isLoading, isFalse);
+  });
+}
diff --git a/app/test/providers/conversation_provider_tap_test.dart b/app/test/providers/conversation_provider_tap_test.dart
new file mode 100644
index 00000000000..aa3fcfacce3
--- /dev/null
+++ b/app/test/providers/conversation_provider_tap_test.dart
@@ -0,0 +1,38 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:omi/backend/preferences.dart';
+import 'package:omi/backend/schema/conversation.dart';
+import 'package:omi/backend/schema/structured.dart';
+import 'package:omi/providers/conversation_provider.dart';
+
+void main() {
+  setUp(() async {
+    SharedPreferences.setMockInitialValues({});
+    await SharedPreferencesUtil.init();
+  });
+
+  test('marking a conversation read does not regroup the entire list', () {
+    final conversation = ServerConversation(
+      id: 'c1',
+      createdAt: DateTime.utc(2026, 8, 10),
+      structured: Structured('Title', 'Overview'),
+    )..isNew = true;
+    final provider = ConversationProvider(
+      conversationListFetcher: () async => (items: <ServerConversation>[], ok: true),
+      isSignedIn: () => true,
+    );
+    addTearDown(provider.dispose);
+    provider.conversations = [conversation];
+    provider.groupConversationsByDate();
+    final groupedBeforeTap = provider.groupedConversations;
+    var notificationCount = 0;
+    provider.addListener(() => notificationCount++);
+
+    provider.onConversationTap(conversation.id);
+
+    expect(conversation.isNew, isFalse);
+    expect(identical(provider.groupedConversations, groupedBeforeTap), isTrue);
+    expect(notificationCount, 1);
+  });
+}
diff --git a/app/test/widgets/bottom_nav_bar_test.dart b/app/test/widgets/bottom_nav_bar_test.dart
new file mode 100644
index 00000000000..c3156015117
--- /dev/null
+++ b/app/test/widgets/bottom_nav_bar_test.dart
@@ -0,0 +1,69 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:provider/provider.dart';
+
+import 'package:omi/providers/home_provider.dart';
+import 'package:omi/widgets/bottom_nav_bar.dart';
+
+void main() {
+  test('HomeProvider preserves selection callback and notification semantics', () {
+    final provider = HomeProvider();
+    addTearDown(provider.dispose);
+
+    var notificationCount = 0;
+    final callbackIndices = <int>[];
+    provider.addListener(() => notificationCount++);
+    provider.onSelectedIndexChanged = callbackIndices.add;
+
+    provider.setIndex(2);
+    provider.setIndex(2);
+
+    expect(provider.selectedIndex, 2);
+    expect(callbackIndices, [2, 2]);
+    expect(notificationCount, 2);
+  });
+
+  testWidgets('updates selection and detects a repeat tap before rebuilding', (tester) async {
+    final provider = HomeProvider();
+    addTearDown(provider.dispose);
+
+    final taps = <(int, bool)>[];
+    await tester.pumpWidget(
+      ChangeNotifierProvider<HomeProvider>.value(
+        value: provider,
+        child: MaterialApp(
+          home: Scaffold(
+            body: BottomNavBar(
+              onTabTap: (index, isRepeat) {
+                taps.add((index, isRepeat));
+                provider.setIndex(index);
+              },
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(_colorFor(tester, FontAwesomeIcons.house), Colors.white);
+    expect(_colorFor(tester, FontAwesomeIcons.listCheck), Colors.grey);
+
+    provider.setIndex(2);
+    await tester.pump();
+
+    expect(_colorFor(tester, FontAwesomeIcons.house), Colors.grey);
+    expect(_colorFor(tester, FontAwesomeIcons.listCheck), Colors.white);
+
+    provider.setIndex(0);
+    await tester.pump();
+
+    await tester.tap(_findIcon(FontAwesomeIcons.listCheck));
+    await tester.tap(_findIcon(FontAwesomeIcons.listCheck));
+
+    expect(taps, [(2, false), (2, true)]);
+  });
+}
+
+Finder _findIcon(FaIconData icon) => find.byWidgetPredicate((widget) => widget is FaIcon && widget.icon == icon.data);
+
+Color _colorFor(WidgetTester tester, FaIconData icon) => tester.widget<FaIcon>(_findIcon(icon)).color!;

From b774a3b8da9c23e142b9e557e6121fbc7243cc80 Mon Sep 17 00:00:00 2001
From: David Zhang <david.d.zhang@gmail.com>
Date: Mon, 10 Aug 2026 19:16:24 -0400
Subject: [PATCH 4/8] Remove formatter-only merge noise

---
 backend/tests/unit/test_language_catalog.py |   4 +-
 web/app/src/hooks/useRecording.ts           | 260 +++++++++-----------
 web/app/src/lib/transcriptSegments.test.ts  |   5 +-
 web/app/src/lib/transcriptSegments.ts       |   6 +-
 4 files changed, 117 insertions(+), 158 deletions(-)

diff --git a/backend/tests/unit/test_language_catalog.py b/backend/tests/unit/test_language_catalog.py
index 1cf13ff7685..cd08513a23b 100644
--- a/backend/tests/unit/test_language_catalog.py
+++ b/backend/tests/unit/test_language_catalog.py
@@ -24,9 +24,7 @@ def test_offered_codes_round_trip_unchanged():
     # A code that normalizes to something else would leave the picker showing one
     # language while the account stores another.
     drifted = [
-        (code, normalize_user_language(code))
-        for code, _ in PRIMARY_LANGUAGE_OPTIONS
-        if normalize_user_language(code) != code
+        (code, normalize_user_language(code)) for code, _ in PRIMARY_LANGUAGE_OPTIONS if normalize_user_language(code) != code
     ]
     assert drifted == [], f"code changes on save: {drifted}"
 
diff --git a/web/app/src/hooks/useRecording.ts b/web/app/src/hooks/useRecording.ts
index 31c5e10d742..8dfdb26efbe 100644
--- a/web/app/src/hooks/useRecording.ts
+++ b/web/app/src/hooks/useRecording.ts
@@ -1,18 +1,13 @@
 'use client';
 
 import { useEffect, useRef, useCallback } from 'react';
+import { useRecordingContext, TranscriptSegment, type AudioMode } from '@/components/recording/RecordingContext';
 import {
-  useRecordingContext,
-  TranscriptSegment,
-  type AudioMode,
-} from '@/components/recording/RecordingContext';
-import { createAudioCapture, isAudioCaptureSupported } from '@/lib/audioCapture';
+  createAudioCapture,
+  isAudioCaptureSupported,
+} from '@/lib/audioCapture';
 import { createTranscriptionSocket } from '@/lib/transcriptionSocket';
-import {
-  processInProgressConversation,
-  finalizeConversationById,
-  getTranscriptionPreferences,
-} from '@/lib/api';
+import { processInProgressConversation, finalizeConversationById, getTranscriptionPreferences } from '@/lib/api';
 import { applyLiveTranscriptSegment } from '@/lib/transcriptSegments';
 
 /**
@@ -60,135 +55,118 @@ export function useRecording() {
   const intentionalSocketDisconnectRef = useRef<boolean>(false);
 
   // Start recording
-  const startRecording = useCallback(
-    async (overrideMode?: AudioMode) => {
-      if (!isAudioCaptureSupported()) {
-        setError('Audio recording is not supported in this browser');
-        return;
+  const startRecording = useCallback(async (overrideMode?: AudioMode) => {
+    if (!isAudioCaptureSupported()) {
+      setError('Audio recording is not supported in this browser');
+      return;
+    }
+
+    // Use override mode if provided, otherwise use context audioMode
+    const effectiveMode = overrideMode ?? audioMode;
+
+    intentionalSocketDisconnectRef.current = false;
+    setState('initializing');
+    setSegments([]);
+    setDuration(0);
+    setError(null);
+    startTimeRef.current = Date.now();
+    pausedDurationRef.current = 0;
+
+    try {
+      // Fetch user's transcription preferences to get language and single_language_mode
+      // If single_language_mode is true, we must send the specific language (not 'multi')
+      // to avoid the backend falling back to English
+      let language = 'multi';
+      try {
+        const prefs = await getTranscriptionPreferences();
+        // Use user's language if set, or 'multi' for multi-language detection
+        // When single_language_mode is true, the backend needs the specific language
+        language = prefs.language || 'multi';
+      } catch (langErr) {
+        console.warn('Failed to fetch transcription preferences, using multi:', langErr);
       }
 
-      // Use override mode if provided, otherwise use context audioMode
-      const effectiveMode = overrideMode ?? audioMode;
+      // Create transcription socket
+      const clientConversationId = crypto.randomUUID();
+      conversationIdRef.current = clientConversationId;
+      const socket = createTranscriptionSocket({
+        language,
+        clientConversationId,
+        onSegment: (segment: TranscriptSegment) => {
+          if (!isMountedRef.current) return;
+          // Bound the live UI list so ~1h sessions do not freeze Chrome (#5399).
+          // Server audio still holds the full session for finalize-on-stop.
+          setSegments((prev) => applyLiveTranscriptSegment(prev, segment));
+        },
+        onConversationSession: (conversationId) => {
+          conversationIdRef.current = conversationId;
+        },
+        onError: (err) => {
+          console.error('Transcription socket error:', err);
+          // Don't set error state for socket issues - just log them
+        },
+        onConnected: () => {
+          // Socket connected
+        },
+        onDisconnected: () => {
+          // Surface disconnects that leave recording "alive" while audio drops
+          // (#5399 / #10941). Token-refresh close events are ignored inside the socket.
+          if (!isMountedRef.current) return;
+          if (intentionalSocketDisconnectRef.current) {
+            intentionalSocketDisconnectRef.current = false;
+            return;
+          }
+          console.warn('Transcription socket disconnected while recording may still be active');
+        },
+      });
 
-      intentionalSocketDisconnectRef.current = false;
-      setState('initializing');
-      setSegments([]);
-      setDuration(0);
-      setError(null);
-      startTimeRef.current = Date.now();
-      pausedDurationRef.current = 0;
+      transcriptionSocketRef.current = socket;
+
+      // Connect WebSocket
+      await socket.connect();
+
+      // Create audio capture
+      const audioCapture = createAudioCapture({
+        mode: effectiveMode,
+        onAudioData: (pcmData) => {
+          socket.sendAudio(pcmData);
+        },
+        onMicLevel: setMicLevel,
+        onSystemLevel: setSystemLevel,
+        onError: (err) => {
+          setError(err);
+        },
+      });
 
-      try {
-        // Fetch user's transcription preferences to get language and single_language_mode
-        // If single_language_mode is true, we must send the specific language (not 'multi')
-        // to avoid the backend falling back to English
-        let language = 'multi';
-        try {
-          const prefs = await getTranscriptionPreferences();
-          // Use user's language if set, or 'multi' for multi-language detection
-          // When single_language_mode is true, the backend needs the specific language
-          language = prefs.language || 'multi';
-        } catch (langErr) {
-          console.warn(
-            'Failed to fetch transcription preferences, using multi:',
-            langErr,
-          );
-        }
+      audioCaptureRef.current = audioCapture;
 
-        // Create transcription socket
-        const clientConversationId = crypto.randomUUID();
-        conversationIdRef.current = clientConversationId;
-        const socket = createTranscriptionSocket({
-          language,
-          clientConversationId,
-          onSegment: (segment: TranscriptSegment) => {
-            if (!isMountedRef.current) return;
-            // Bound the live UI list so ~1h sessions do not freeze Chrome (#5399).
-            // Server audio still holds the full session for finalize-on-stop.
-            setSegments((prev) => applyLiveTranscriptSegment(prev, segment));
-          },
-          onConversationSession: (conversationId) => {
-            conversationIdRef.current = conversationId;
-          },
-          onError: (err) => {
-            console.error('Transcription socket error:', err);
-            // Don't set error state for socket issues - just log them
-          },
-          onConnected: () => {
-            // Socket connected
-          },
-          onDisconnected: () => {
-            // Surface disconnects that leave recording "alive" while audio drops
-            // (#5399 / #10941). Token-refresh close events are ignored inside the socket.
-            if (!isMountedRef.current) return;
-            if (intentionalSocketDisconnectRef.current) {
-              intentionalSocketDisconnectRef.current = false;
-              return;
-            }
-            console.warn(
-              'Transcription socket disconnected while recording may still be active',
-            );
-          },
-        });
-
-        transcriptionSocketRef.current = socket;
-
-        // Connect WebSocket
-        await socket.connect();
-
-        // Create audio capture
-        const audioCapture = createAudioCapture({
-          mode: effectiveMode,
-          onAudioData: (pcmData) => {
-            socket.sendAudio(pcmData);
-          },
-          onMicLevel: setMicLevel,
-          onSystemLevel: setSystemLevel,
-          onError: (err) => {
-            setError(err);
-          },
-        });
-
-        audioCaptureRef.current = audioCapture;
-
-        // Start audio capture
-        await audioCapture.start();
-
-        // Start duration timer
-        durationIntervalRef.current = setInterval(() => {
-          const elapsed = Math.floor((Date.now() - startTimeRef.current) / 1000);
-          setDuration(elapsed - pausedDurationRef.current);
-        }, 1000);
-
-        setState('recording');
-
-        // Expand widget when recording starts
-        setWidgetExpanded(true);
-      } catch (err) {
-        console.error('Failed to start recording:', err);
-        const message = err instanceof Error ? err.message : 'Failed to start recording';
-        setError(message);
-        setState('idle');
-
-        // Cleanup on error
-        if (transcriptionSocketRef.current) {
-          intentionalSocketDisconnectRef.current = true;
-          transcriptionSocketRef.current.disconnect();
-          transcriptionSocketRef.current = null;
-        }
+      // Start audio capture
+      await audioCapture.start();
+
+      // Start duration timer
+      durationIntervalRef.current = setInterval(() => {
+        const elapsed = Math.floor((Date.now() - startTimeRef.current) / 1000);
+        setDuration(elapsed - pausedDurationRef.current);
+      }, 1000);
+
+      setState('recording');
+
+      // Expand widget when recording starts
+      setWidgetExpanded(true);
+    } catch (err) {
+      console.error('Failed to start recording:', err);
+      const message = err instanceof Error ? err.message : 'Failed to start recording';
+      setError(message);
+      setState('idle');
+
+      // Cleanup on error
+      if (transcriptionSocketRef.current) {
+        intentionalSocketDisconnectRef.current = true;
+        transcriptionSocketRef.current.disconnect();
+        transcriptionSocketRef.current = null;
       }
-    },
-    [
-      audioMode,
-      setState,
-      setSegments,
-      setDuration,
-      setError,
-      setMicLevel,
-      setSystemLevel,
-      setWidgetExpanded,
-    ],
-  );
+    }
+  }, [audioMode, setState, setSegments, setDuration, setError, setMicLevel, setSystemLevel, setWidgetExpanded]);
 
   // Pause recording
   const pauseRecording = useCallback(() => {
@@ -199,8 +177,7 @@ export function useRecording() {
     }
 
     // Track paused duration
-    pausedDurationRef.current =
-      Math.floor((Date.now() - startTimeRef.current) / 1000) - duration;
+    pausedDurationRef.current = Math.floor((Date.now() - startTimeRef.current) / 1000) - duration;
 
     setState('paused');
     setMicLevel(0);
@@ -216,7 +193,7 @@ export function useRecording() {
     }
 
     // Adjust start time to account for pause
-    startTimeRef.current = Date.now() - duration * 1000;
+    startTimeRef.current = Date.now() - (duration * 1000);
 
     setState('recording');
   }, [state, duration, setState]);
@@ -273,16 +250,7 @@ export function useRecording() {
     pauseRecordingRef.current = pauseRecording;
     resumeRecordingRef.current = resumeRecording;
     stopRecordingRef.current = stopRecording;
-  }, [
-    startRecording,
-    pauseRecording,
-    resumeRecording,
-    stopRecording,
-    startRecordingRef,
-    pauseRecordingRef,
-    resumeRecordingRef,
-    stopRecordingRef,
-  ]);
+  }, [startRecording, pauseRecording, resumeRecording, stopRecording, startRecordingRef, pauseRecordingRef, resumeRecordingRef, stopRecordingRef]);
 
   // Track mounted state for this hook instance
   // Note: We do NOT cleanup audio/WebSocket on unmount because they are shared via context
diff --git a/web/app/src/lib/transcriptSegments.test.ts b/web/app/src/lib/transcriptSegments.test.ts
index afd878e3dae..cff30b6c207 100644
--- a/web/app/src/lib/transcriptSegments.test.ts
+++ b/web/app/src/lib/transcriptSegments.test.ts
@@ -7,10 +7,7 @@ import {
   upsertTranscriptSegment,
 } from './transcriptSegments';
 
-function seg(
-  id: string,
-  text = id,
-): { id: string; text: string; speaker: number; isUser: boolean; timestamp: number } {
+function seg(id: string, text = id): { id: string; text: string; speaker: number; isUser: boolean; timestamp: number } {
   return { id, text, speaker: 0, isUser: false, timestamp: 0 };
 }
 
diff --git a/web/app/src/lib/transcriptSegments.ts b/web/app/src/lib/transcriptSegments.ts
index 2b4615abff9..dc9dc7e897d 100644
--- a/web/app/src/lib/transcriptSegments.ts
+++ b/web/app/src/lib/transcriptSegments.ts
@@ -77,9 +77,5 @@ export function applyLiveTranscriptSegment<T extends LiveTranscriptSegmentLike>(
   segment: T,
   maxSegments: number = DEFAULT_MAX_LIVE_SEGMENTS,
 ): T[] {
-  return trimTranscriptSegments(
-    upsertTranscriptSegment(segments, segment),
-    maxSegments,
-    segment.id,
-  );
+  return trimTranscriptSegments(upsertTranscriptSegment(segments, segment), maxSegments, segment.id);
 }

From c16b936710e5fb7a826ae3fa7d48ead81e6ac6ec Mon Sep 17 00:00:00 2001
From: David Zhang <9387252+Git-on-my-level@users.noreply.github.com>
Date: Tue, 11 Aug 2026 08:08:49 +0700
Subject: [PATCH 5/8] fix: contain _loadApps errors in AppsPage

Addresses Cubic P2 review feedback: wrap the unawaited _loadApps() body
in try/catch so a future provider error cannot surface as an unhandled
async exception from initState's post-frame callback.
---
 app/lib/pages/apps/page.dart | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/lib/pages/apps/page.dart b/app/lib/pages/apps/page.dart
index 2fa2af6a467..4540c21979d 100644
--- a/app/lib/pages/apps/page.dart
+++ b/app/lib/pages/apps/page.dart
@@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
 import 'package:omi/backend/schema/app.dart';
 import 'package:omi/pages/apps/explore_install_page.dart';
 import 'package:omi/providers/app_provider.dart';
+import 'package:omi/utils/logger.dart';
 import 'package:omi/providers/connectivity_provider.dart';
 import 'package:omi/utils/l10n_extensions.dart';
 
@@ -31,10 +32,14 @@ class AppsPageState extends State<AppsPage> with AutomaticKeepAliveClientMixin {
   }
 
   Future<void> _loadApps() async {
-    final appProvider = context.read<AppProvider>();
-    await appProvider.getApps();
-    if (mounted) {
-      await appProvider.getPopularApps();
+    try {
+      final appProvider = context.read<AppProvider>();
+      await appProvider.getApps();
+      if (mounted) {
+        await appProvider.getPopularApps();
+      }
+    } catch (e, s) {
+      Logger.handle(e, s, message: 'Error loading apps page data');
     }
   }
 

From fa284f2f712622a3f33f71b251eff1abd7faa51a Mon Sep 17 00:00:00 2001
From: David Zhang <david.d.zhang@gmail.com>
Date: Tue, 11 Aug 2026 15:14:16 -0400
Subject: [PATCH 6/8] Fix mobile conversation rendering stalls

---
 .../pages/action_items/action_items_page.dart |  11 +-
 app/lib/pages/conversation_detail/page.dart   |  13 +-
 .../pages/conversation_detail/widgets.dart    | 206 ++++++-
 .../widgets/conversation_markdown_widget.dart | 248 +++++++-
 .../conversations/conversations_page.dart     | 207 +++++--
 .../widgets/conversation_list_item.dart       | 553 ++++++++++--------
 .../conversations/widgets/goals_widget.dart   |  19 +-
 app/lib/pages/home/home_content.dart          |  85 +++
 app/lib/pages/home/page.dart                  |  97 ++-
 .../settings/daily_summary_detail_page.dart   | 126 ++--
 app/lib/widgets/bottom_nav_bar.dart           |  15 +-
 app/test/widgets/bottom_nav_bar_test.dart     |   3 +
 ...nversation_list_item_performance_test.dart |  63 ++
 .../conversation_markdown_widget_test.dart    |  61 ++
 .../daily_summary_detail_page_test.dart       |  74 +++
 .../goals_widget_performance_test.dart        |  22 +
 .../home_conversations_preview_test.dart      |  62 ++
 17 files changed, 1408 insertions(+), 457 deletions(-)
 create mode 100644 app/test/widgets/conversation_list_item_performance_test.dart
 create mode 100644 app/test/widgets/conversation_markdown_widget_test.dart
 create mode 100644 app/test/widgets/daily_summary_detail_page_test.dart
 create mode 100644 app/test/widgets/goals_widget_performance_test.dart
 create mode 100644 app/test/widgets/home_conversations_preview_test.dart

diff --git a/app/lib/pages/action_items/action_items_page.dart b/app/lib/pages/action_items/action_items_page.dart
index 442ad934aa9..0b537426856 100644
--- a/app/lib/pages/action_items/action_items_page.dart
+++ b/app/lib/pages/action_items/action_items_page.dart
@@ -15,6 +15,7 @@ import 'package:omi/services/app_review_service.dart';
 import 'package:omi/utils/l10n_extensions.dart';
 import 'package:omi/utils/other/debouncer.dart';
 import 'widgets/action_item_form_sheet.dart';
+import 'widgets/action_item_shimmer_widget.dart';
 
 // Re-export Goal from goals.dart for use in this file
 export 'package:omi/backend/http/api/goals.dart' show Goal;
@@ -589,7 +590,15 @@ class _ActionItemsPageState extends State<ActionItemsPage> with AutomaticKeepAli
   }
 
   Widget _buildLoadingState() {
-    return const Center(child: CircularProgressIndicator(color: Colors.deepPurple));
+    return CustomScrollView(
+      controller: _scrollController,
+      physics: const NeverScrollableScrollPhysics(),
+      slivers: const [
+        SliverPadding(padding: EdgeInsets.only(top: 16)),
+        ActionItemsShimmerList(itemCount: 7),
+        SliverPadding(padding: EdgeInsets.only(bottom: 100)),
+      ],
+    );
   }
 
   Widget _buildEmptyTasksList() {
diff --git a/app/lib/pages/conversation_detail/page.dart b/app/lib/pages/conversation_detail/page.dart
index 39889cc3724..bde986d3feb 100644
--- a/app/lib/pages/conversation_detail/page.dart
+++ b/app/lib/pages/conversation_detail/page.dart
@@ -1445,13 +1445,12 @@ class _SummaryTabState extends State<SummaryTab> with AutomaticKeepAliveClientMi
         builder: (context, data, child) {
           return Stack(
             children: [
-              ListView(
-                shrinkWrap: true,
+              CustomScrollView(
                 keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.manual,
-                children: [
-                  const GetSummaryWidgets(),
+                slivers: [
+                  const SliverToBoxAdapter(child: GetSummaryWidgets()),
                   data.item1
-                      ? const ReprocessDiscardedWidget()
+                      ? const SliverToBoxAdapter(child: ReprocessDiscardedWidget())
                       : GetAppsWidgets(
                           searchQuery: widget.searchQuery,
                           currentResultIndex: widget.currentResultIndex,
@@ -1470,8 +1469,8 @@ class _SummaryTabState extends State<SummaryTab> with AutomaticKeepAliveClientMi
                             context.read<ConversationDetailProvider>().saveEditingSummary(appId, newContent);
                           },
                         ),
-                  const GetGeolocationWidgets(),
-                  const SizedBox(height: 150),
+                  const SliverToBoxAdapter(child: GetGeolocationWidgets()),
+                  const SliverToBoxAdapter(child: SizedBox(height: 150)),
                 ],
               ),
             ],
diff --git a/app/lib/pages/conversation_detail/widgets.dart b/app/lib/pages/conversation_detail/widgets.dart
index ddae7cdc3d4..6c014e33469 100644
--- a/app/lib/pages/conversation_detail/widgets.dart
+++ b/app/lib/pages/conversation_detail/widgets.dart
@@ -786,6 +786,7 @@ class AppResultDetailWidget extends StatefulWidget {
   final VoidCallback? onEditStarted;
   final VoidCallback? onEditCancelled;
   final bool Function()? canStartEditing;
+  final bool asSliver;
 
   const AppResultDetailWidget({
     super.key,
@@ -798,6 +799,7 @@ class AppResultDetailWidget extends StatefulWidget {
     this.onEditStarted,
     this.onEditCancelled,
     this.canStartEditing,
+    this.asSliver = false,
   });
 
   @override
@@ -857,6 +859,10 @@ class _AppResultDetailWidgetState extends State<AppResultDetailWidget> {
   Widget build(BuildContext context) {
     final String content = widget.appResponse.content.trim().decodeString;
 
+    if (widget.asSliver) {
+      return _buildSliver(context, content);
+    }
+
     return Container(
       margin: const EdgeInsets.only(bottom: 20),
       child: Column(
@@ -988,8 +994,8 @@ class _AppResultDetailWidgetState extends State<AppResultDetailWidget> {
                             ),
                           ),
                           const SizedBox(
-                            child: Icon(Icons.arrow_forward_ios, color: Colors.white, size: 20),
                             width: 42,
+                            child: Icon(Icons.arrow_forward_ios, color: Colors.white, size: 20),
                           ),
                         ],
                       ),
@@ -1073,31 +1079,28 @@ class GetAppsWidgets extends StatelessWidget {
     return Consumer<ConversationDetailProvider>(
       builder: (context, provider, child) {
         final summarizedApp = provider.getSummarizedApp();
-        return Column(
-          mainAxisSize: MainAxisSize.min,
-          mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: summarizedApp == null ? CrossAxisAlignment.center : CrossAxisAlignment.start,
-          children: summarizedApp == null
-              ? [child!]
-              : [
-                  // Show the summarized app
-                  if (!provider.conversation.discarded) ...[
-                    AppResultDetailWidget(
-                      appResponse: summarizedApp,
-                      app: provider.findAppById(summarizedApp.appId),
-                      conversation: provider.conversation,
-                      searchQuery: searchQuery,
-                      currentResultIndex: currentResultIndex,
-                      canStartEditing: canStartEditing,
-                      onEditStarted: onEditStarted == null ? null : () => onEditStarted!(summarizedApp.appId),
-                      onEditCancelled: onEditCancelled == null ? null : () => onEditCancelled!(summarizedApp.appId),
-                      onSaveSummary: onSaveSummary == null
-                          ? null
-                          : (newContent) => onSaveSummary!(summarizedApp.appId, newContent),
-                    ),
-                  ],
-                  const SizedBox(height: 8),
-                ],
+        if (summarizedApp == null) {
+          return SliverToBoxAdapter(child: child!);
+        }
+
+        return SliverMainAxisGroup(
+          slivers: [
+            if (!provider.conversation.discarded)
+              AppResultDetailWidget(
+                appResponse: summarizedApp,
+                app: provider.findAppById(summarizedApp.appId),
+                conversation: provider.conversation,
+                searchQuery: searchQuery,
+                currentResultIndex: currentResultIndex,
+                canStartEditing: canStartEditing,
+                onEditStarted: onEditStarted == null ? null : () => onEditStarted!(summarizedApp.appId),
+                onEditCancelled: onEditCancelled == null ? null : () => onEditCancelled!(summarizedApp.appId),
+                onSaveSummary:
+                    onSaveSummary == null ? null : (newContent) => onSaveSummary!(summarizedApp.appId, newContent),
+                asSliver: true,
+              ),
+            const SliverToBoxAdapter(child: SizedBox(height: 8)),
+          ],
         );
       },
       child: ListView(
@@ -1282,6 +1285,157 @@ class GetGeolocationWidgets extends StatelessWidget {
   }
 }
 
+extension _AppResultDetailWidgetSliver on _AppResultDetailWidgetState {
+  Widget _buildSliver(BuildContext context, String content) {
+    if (content.isEmpty || _isEditing) {
+      return SliverMainAxisGroup(
+        slivers: [
+          SliverToBoxAdapter(
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 8),
+              child: content.isEmpty
+                  ? Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Expanded(
+                          child: GestureDetector(
+                            onTap: () {
+                              showModalBottomSheet(
+                                context: context,
+                                isScrollControlled: true,
+                                backgroundColor: Colors.transparent,
+                                builder: (context) => const SummarizedAppsBottomSheet(),
+                              );
+                            },
+                            child: RichText(
+                              text: TextSpan(
+                                style: const TextStyle(color: Colors.grey),
+                                text: context.l10n.noSummaryForApp,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    )
+                  : _buildEditor(context, content),
+            ),
+          ),
+          const SliverToBoxAdapter(child: SizedBox(height: 20)),
+        ],
+      );
+    }
+
+    return SliverMainAxisGroup(
+      slivers: [
+        SliverPadding(
+          padding: const EdgeInsets.only(bottom: 20),
+          sliver: ConversationMarkdownSliver(
+            content: content,
+            searchQuery: widget.searchQuery,
+            currentResultIndex: widget.currentResultIndex,
+            onDoubleTap: widget.onSaveSummary == null ? null : () => _startEditing(content),
+          ),
+        ),
+        SliverToBoxAdapter(child: _buildAppAttribution(context)),
+      ],
+    );
+  }
+
+  Widget _buildAppAttribution(BuildContext context) {
+    return GestureDetector(
+      onTap: () async {
+        if (widget.app != null) {
+          PlatformManager.instance.analytics.pageOpened('App Detail');
+          await routeToPage(context, AppDetailPage(app: widget.app!));
+        }
+      },
+      child: Padding(
+        padding: const EdgeInsets.only(top: 12, left: 4),
+        child: Row(
+          children: [
+            widget.app != null
+                ? CachedNetworkImage(
+                    imageUrl: widget.app!.getImageUrl(),
+                    imageBuilder: (context, imageProvider) {
+                      return CircleAvatar(
+                        backgroundColor: Colors.white,
+                        radius: 12,
+                        backgroundImage: imageProvider,
+                      );
+                    },
+                    errorWidget: (context, url, error) {
+                      return const CircleAvatar(
+                        backgroundColor: Colors.white,
+                        radius: 12,
+                        child: Icon(Icons.error_outline_rounded, size: 12),
+                      );
+                    },
+                    progressIndicatorBuilder: (context, url, progress) => CircleAvatar(
+                      backgroundColor: Colors.white,
+                      radius: 12,
+                      child: CircularProgressIndicator(
+                        value: progress.progress,
+                        valueColor: const AlwaysStoppedAnimation<Color>(Colors.white),
+                        strokeWidth: 2,
+                      ),
+                    ),
+                  )
+                : Container(
+                    decoration: BoxDecoration(
+                      image: DecorationImage(
+                        image: AssetImage(Assets.images.background.path),
+                        fit: BoxFit.cover,
+                      ),
+                      borderRadius: const BorderRadius.all(Radius.circular(12.0)),
+                    ),
+                    height: 24,
+                    width: 24,
+                    child: Stack(
+                      alignment: Alignment.center,
+                      children: [Image.asset(Assets.images.herologo.path, height: 16, width: 16)],
+                    ),
+                  ),
+            const SizedBox(width: 8),
+            Expanded(
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          widget.app != null ? widget.app!.name.decodeString : context.l10n.unknownApp,
+                          maxLines: 1,
+                          style: const TextStyle(
+                            fontWeight: FontWeight.w500,
+                            color: Colors.white,
+                            fontSize: 14,
+                          ),
+                        ),
+                        if (widget.app != null)
+                          Text(
+                            widget.app!.description.decodeString,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: const TextStyle(color: Colors.grey, fontSize: 12),
+                          ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(
+                    width: 42,
+                    child: Icon(Icons.arrow_forward_ios, color: Colors.white, size: 20),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 ///************************************************
 ///************ SETTINGS BOTTOM SHEET *************
 ///************************************************
diff --git a/app/lib/pages/conversation_detail/widgets/conversation_markdown_widget.dart b/app/lib/pages/conversation_detail/widgets/conversation_markdown_widget.dart
index f15c571c018..f9713a9f493 100644
--- a/app/lib/pages/conversation_detail/widgets/conversation_markdown_widget.dart
+++ b/app/lib/pages/conversation_detail/widgets/conversation_markdown_widget.dart
@@ -3,6 +3,25 @@ import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:markdown/markdown.dart' as md;
 
+MarkdownStyleSheet _conversationMarkdownStyle(BuildContext context) {
+  const style = TextStyle(color: Colors.white, fontSize: 16, height: 1.5);
+
+  return MarkdownStyleSheet.fromTheme(Theme.of(context)).copyWith(
+    a: style,
+    p: style.copyWith(height: 1.5),
+    pPadding: const EdgeInsets.only(bottom: 12),
+    blockquote: style.copyWith(backgroundColor: Colors.transparent, color: Colors.white),
+    blockquoteDecoration: BoxDecoration(color: const Color(0xFF35343B), borderRadius: BorderRadius.circular(4)),
+    code: style.copyWith(
+      backgroundColor: Colors.transparent,
+      decoration: TextDecoration.none,
+      color: Colors.white,
+      fontWeight: FontWeight.w500,
+    ),
+    strong: style.copyWith(fontWeight: FontWeight.bold),
+  );
+}
+
 class ConversationMarkdownWidget extends StatefulWidget {
   final String content;
   final String searchQuery;
@@ -200,8 +219,6 @@ class _ConversationMarkdownWidgetState extends State<ConversationMarkdownWidget>
     String searchQuery = '',
     int currentResultIndex = -1,
   }) {
-    var style = const TextStyle(color: Colors.white, fontSize: 16, height: 1.5);
-
     String processedContent = content;
 
     // If there's a search query, inject highlight tags
@@ -214,20 +231,7 @@ class _ConversationMarkdownWidgetState extends State<ConversationMarkdownWidget>
       shrinkWrap: true,
       builders: searchQuery.isNotEmpty ? {'highlight': _SearchHighlightBuilder()} : {},
       inlineSyntaxes: searchQuery.isNotEmpty ? [_SearchHighlightSyntax()] : [],
-      styleSheet: MarkdownStyleSheet.fromTheme(Theme.of(context)).copyWith(
-        a: style,
-        p: style.copyWith(height: 1.5),
-        pPadding: const EdgeInsets.only(bottom: 12),
-        blockquote: style.copyWith(backgroundColor: Colors.transparent, color: Colors.white),
-        blockquoteDecoration: BoxDecoration(color: const Color(0xFF35343B), borderRadius: BorderRadius.circular(4)),
-        code: style.copyWith(
-          backgroundColor: Colors.transparent,
-          decoration: TextDecoration.none,
-          color: Colors.white,
-          fontWeight: FontWeight.w500,
-        ),
-        strong: style.copyWith(fontWeight: FontWeight.bold),
-      ),
+      styleSheet: _conversationMarkdownStyle(context),
       data: processedContent,
     );
   }
@@ -266,6 +270,218 @@ class _ConversationMarkdownWidgetState extends State<ConversationMarkdownWidget>
   }
 }
 
+/// A sliver-backed Markdown renderer for the conversation summary.
+///
+/// [MarkdownBody] eagerly lays out every parsed block when it is placed inside
+/// the summary's shrink-wrapped scroll view. The normal path uses the
+/// flutter_markdown AST widgets directly in a [SliverList], so only blocks in
+/// or near the viewport participate in layout and paint. Search keeps the
+/// paragraph-level structure used by the existing highlight/scroll behavior.
+class ConversationMarkdownSliver extends StatefulWidget {
+  final String content;
+  final String searchQuery;
+  final int currentResultIndex;
+  final VoidCallback? onDoubleTap;
+
+  const ConversationMarkdownSliver({
+    super.key,
+    required this.content,
+    this.searchQuery = '',
+    this.currentResultIndex = -1,
+    this.onDoubleTap,
+  });
+
+  @override
+  State<ConversationMarkdownSliver> createState() => _ConversationMarkdownSliverState();
+}
+
+class _ConversationMarkdownSliverState extends State<ConversationMarkdownSliver> {
+  final List<GlobalKey> _paragraphKeys = [];
+  List<String> _paragraphs = [];
+  int _previousSearchResultIndex = -1;
+
+  @override
+  void initState() {
+    super.initState();
+    _initializeParagraphs();
+  }
+
+  @override
+  void didUpdateWidget(ConversationMarkdownSliver oldWidget) {
+    super.didUpdateWidget(oldWidget);
+
+    if (widget.content != oldWidget.content) {
+      _initializeParagraphs();
+    }
+
+    if (widget.currentResultIndex != _previousSearchResultIndex &&
+        widget.currentResultIndex >= 0 &&
+        widget.searchQuery.isNotEmpty) {
+      _previousSearchResultIndex = widget.currentResultIndex;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _scrollToSearchResult();
+      });
+    }
+  }
+
+  void _initializeParagraphs() {
+    _paragraphs = widget.content.split('\n').where((p) => p.trim().isNotEmpty).toList();
+    _paragraphKeys
+      ..clear()
+      ..addAll(List.generate(_paragraphs.length, (index) => GlobalKey()));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.content.isEmpty) {
+      return const SliverToBoxAdapter(child: SizedBox.shrink());
+    }
+
+    if (widget.searchQuery.isNotEmpty) {
+      return SliverList.builder(
+        itemCount: _paragraphs.length,
+        itemBuilder: (context, index) {
+          final paragraph = _paragraphs[index];
+          return Container(
+            key: index < _paragraphKeys.length ? _paragraphKeys[index] : null,
+            margin: const EdgeInsets.only(bottom: 8),
+            child: GestureDetector(
+              behavior: HitTestBehavior.translucent,
+              onDoubleTap: widget.onDoubleTap,
+              child: _buildMarkdownBody(
+                context,
+                _highlightSearchInMarkdown(paragraph, widget.searchQuery, _getLocalSearchIndex(index)),
+                searchEnabled: true,
+              ),
+            ),
+          );
+        },
+      );
+    }
+
+    return _LazyConversationMarkdown(
+      data: widget.content,
+      styleSheet: _conversationMarkdownStyle(context),
+      onDoubleTap: widget.onDoubleTap,
+    );
+  }
+
+  Widget _buildMarkdownBody(BuildContext context, String content, {required bool searchEnabled}) {
+    return MarkdownBody(
+      selectable: false,
+      shrinkWrap: true,
+      builders: searchEnabled ? {'highlight': _SearchHighlightBuilder()} : {},
+      inlineSyntaxes: searchEnabled ? [_SearchHighlightSyntax()] : [],
+      styleSheet: _conversationMarkdownStyle(context),
+      data: content,
+    );
+  }
+
+  int _getLocalSearchIndex(int paragraphIndex) {
+    if (widget.searchQuery.isEmpty || widget.currentResultIndex < 0) return -1;
+
+    int currentMatchCount = 0;
+    final searchQuery = widget.searchQuery.toLowerCase();
+
+    for (int i = 0; i < paragraphIndex; i++) {
+      currentMatchCount += _countMatches(_paragraphs[i].toLowerCase(), searchQuery);
+    }
+
+    final paragraphMatches = _countMatches(_paragraphs[paragraphIndex].toLowerCase(), searchQuery);
+    if (widget.currentResultIndex >= currentMatchCount &&
+        widget.currentResultIndex < currentMatchCount + paragraphMatches) {
+      return widget.currentResultIndex - currentMatchCount;
+    }
+
+    return -1;
+  }
+
+  int _countMatches(String text, String query) {
+    if (query.isEmpty) return 0;
+    var count = 0;
+    var start = 0;
+    while (true) {
+      final index = text.indexOf(query, start);
+      if (index == -1) return count;
+      count++;
+      start = index + query.length;
+    }
+  }
+
+  void _scrollToSearchResult() {
+    final targetParagraphIndex = _findParagraphForSearchResult();
+    if (targetParagraphIndex >= 0 && targetParagraphIndex < _paragraphKeys.length) {
+      final targetContext = _paragraphKeys[targetParagraphIndex].currentContext;
+      if (targetContext != null) {
+        Scrollable.ensureVisible(
+          targetContext,
+          duration: const Duration(milliseconds: 500),
+          curve: Curves.easeInOut,
+          alignment: 0.40,
+        );
+      }
+    }
+  }
+
+  int _findParagraphForSearchResult() {
+    if (widget.searchQuery.isEmpty || widget.currentResultIndex < 0) return -1;
+
+    var currentMatchCount = 0;
+    final searchQuery = widget.searchQuery.toLowerCase();
+    for (int i = 0; i < _paragraphs.length; i++) {
+      final paragraphMatches = _countMatches(_paragraphs[i].toLowerCase(), searchQuery);
+      if (widget.currentResultIndex < currentMatchCount + paragraphMatches) return i;
+      currentMatchCount += paragraphMatches;
+    }
+    return -1;
+  }
+
+  String _highlightSearchInMarkdown(String content, String searchQuery, int currentResultIndex) {
+    if (searchQuery.isEmpty) return content;
+
+    final matches = RegExp(RegExp.escape(searchQuery), caseSensitive: false).allMatches(content);
+    if (matches.isEmpty) return content;
+
+    var result = content;
+    var offset = 0;
+    var matchIndex = 0;
+    for (final match in matches) {
+      final isCurrentMatch = matchIndex == currentResultIndex;
+      final openTag = isCurrentMatch ? '{{H current}}' : '{{H}}';
+      const closeTag = '{{/H}}';
+      final start = match.start + offset;
+      final end = match.end + offset;
+      result = result.substring(0, start) + openTag + result.substring(start, end) + closeTag + result.substring(end);
+      offset += openTag.length + closeTag.length;
+      matchIndex++;
+    }
+    return result;
+  }
+}
+
+class _LazyConversationMarkdown extends Markdown {
+  final VoidCallback? onDoubleTap;
+
+  const _LazyConversationMarkdown({required super.data, required super.styleSheet, this.onDoubleTap});
+
+  @override
+  Widget build(BuildContext context, List<Widget>? children) {
+    final markdownChildren = children ?? const <Widget>[];
+    if (markdownChildren.isEmpty) {
+      return const SliverToBoxAdapter(child: SizedBox.shrink());
+    }
+
+    return SliverList.builder(
+      itemCount: markdownChildren.length,
+      itemBuilder: (context, index) => GestureDetector(
+        behavior: HitTestBehavior.translucent,
+        onDoubleTap: onDoubleTap,
+        child: markdownChildren[index],
+      ),
+    );
+  }
+}
+
 class _SearchHighlightSyntax extends md.InlineSyntax {
   _SearchHighlightSyntax() : super(r'(\{\{H(?: current)?\}\})(.*?)(\{\{/H\}\})');
 
diff --git a/app/lib/pages/conversations/conversations_page.dart b/app/lib/pages/conversations/conversations_page.dart
index f166db74339..7cb589b47f2 100644
--- a/app/lib/pages/conversations/conversations_page.dart
+++ b/app/lib/pages/conversations/conversations_page.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -42,6 +44,57 @@ typedef _ConversationListRow = ({
   int conversationIndex,
 });
 
+typedef _ConversationPageSnapshot = ({
+  List<ServerConversation> conversations,
+  Map<DateTime, List<ServerConversation>> groupedConversations,
+  List<ServerConversation> processingConversations,
+  List<LocalRecording> recordings,
+  String previousQuery,
+  String? selectedFolderId,
+  String? selectedSpeakerId,
+  DateTime? selectedDate,
+  bool showStarredOnly,
+  bool showDailySummaries,
+  bool hasDailySummaries,
+  bool isSelectionModeActive,
+  bool isLoadingConversations,
+  bool isFetchingConversations,
+  bool isAwaitingInitialFetchRetry,
+  int conversationIdentitySignature,
+  int processingIdentitySignature,
+  int recordingIdentitySignature,
+  int pendingDeleteCount,
+});
+
+int _identitySignature(Iterable<Object> values) => Object.hashAll(values.map(identityHashCode));
+
+_ConversationPageSnapshot _conversationPageSnapshot(
+  ConversationProvider conversations,
+  LocalRecordingsProvider recordings,
+) {
+  return (
+    conversations: conversations.conversations,
+    groupedConversations: conversations.groupedConversations,
+    processingConversations: conversations.processingConversations,
+    recordings: recordings.recordings,
+    previousQuery: conversations.previousQuery,
+    selectedFolderId: conversations.selectedFolderId,
+    selectedSpeakerId: conversations.selectedSpeakerId,
+    selectedDate: conversations.selectedDate,
+    showStarredOnly: conversations.showStarredOnly,
+    showDailySummaries: conversations.showDailySummaries,
+    hasDailySummaries: conversations.hasDailySummaries,
+    isSelectionModeActive: conversations.isSelectionModeActive,
+    isLoadingConversations: conversations.isLoadingConversations,
+    isFetchingConversations: conversations.isFetchingConversations,
+    isAwaitingInitialFetchRetry: conversations.isAwaitingInitialFetchRetry,
+    conversationIdentitySignature: _identitySignature(conversations.conversations),
+    processingIdentitySignature: _identitySignature(conversations.processingConversations),
+    recordingIdentitySignature: _identitySignature(recordings.recordings),
+    pendingDeleteCount: conversations.memoriesToDelete.length,
+  );
+}
+
 List<_ConversationListRow> _buildConversationListRows({
   required List<DateTime> dates,
   required Map<DateTime, List<ServerConversation>> conversationsByDate,
@@ -129,6 +182,9 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
   final AppReviewService _appReviewService = AppReviewService();
   final ScrollController _scrollController = ScrollController();
   final GlobalKey<GoalsWidgetState> _goalsWidgetKey = GlobalKey<GoalsWidgetState>();
+  String? _loadMoreFilterKey;
+  String? _lastLoadMoreRequestKey;
+  bool _isBootstrapping = true;
 
   void _refreshGoals() {}
 
@@ -146,31 +202,88 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       if (!mounted) return;
       final conversationProvider = context.read<ConversationProvider>();
-      if (conversationProvider.conversations.isEmpty) {
-        await conversationProvider.getInitialConversations();
-      } else {
-        // Still check for daily summaries even if conversations are cached
-        conversationProvider.checkHasDailySummaries();
+      try {
+        if (conversationProvider.conversations.isEmpty) {
+          await conversationProvider.getInitialConversations();
+        } else {
+          // Still check for daily summaries even if conversations are cached
+          _scheduleDeferred(conversationProvider.checkHasDailySummaries);
+        }
+      } finally {
+        if (mounted) setState(() => _isBootstrapping = false);
       }
 
       if (!mounted) return;
 
-      // Surface any unsynced batch recordings written by the native layer.
-      context.read<LocalRecordingsProvider>().refresh();
+      // Keep filesystem scanning off the first navigation/scroll frame.
+      _scheduleDeferred(context.read<LocalRecordingsProvider>().refresh);
 
       // Load folders for folder tabs
       final folderProvider = context.read<FolderProvider>();
       if (folderProvider.folders.isEmpty) {
-        await folderProvider.loadFolders();
+        _scheduleDeferred(folderProvider.loadFolders);
       }
 
       // Check if we should show the app review prompt for first conversation
       if (mounted && conversationProvider.conversations.isNotEmpty) {
-        await _appReviewService.showReviewPromptIfNeeded(context, isProcessingFirstConversation: true);
+        _scheduleDeferred(
+          () => _appReviewService.showReviewPromptIfNeeded(context, isProcessingFirstConversation: true),
+        );
       }
     });
   }
 
+  void _scheduleDeferred(Future<void> Function() operation) {
+    unawaited(
+      Future<void>.delayed(const Duration(milliseconds: 200), () async {
+        if (!mounted) return;
+        try {
+          await operation();
+        } catch (error, stackTrace) {
+          Logger.error('Deferred conversations-page work failed: $error\n$stackTrace');
+        }
+      }),
+    );
+  }
+
+  bool _requestMoreIfNeeded(ConversationProvider provider) {
+    if (provider.isLoadingConversations) return false;
+
+    final filterKey = [
+      provider.previousQuery,
+      provider.selectedFolderId ?? '',
+      provider.selectedSpeakerId ?? '',
+      provider.selectedDate?.toIso8601String() ?? '',
+      provider.showStarredOnly,
+    ].join('|');
+    if (_loadMoreFilterKey != filterKey) {
+      _loadMoreFilterKey = filterKey;
+      _lastLoadMoreRequestKey = null;
+    }
+
+    final String pageOrCount;
+    final isSearch = provider.previousQuery.isNotEmpty || provider.selectedSpeakerId != null;
+    if (isSearch) {
+      if (provider.totalSearchPages <= provider.currentSearchPage) return false;
+      pageOrCount = 'page:${provider.currentSearchPage}';
+    } else {
+      final count = provider.conversations.length + provider.memoriesToDelete.length;
+      if (count == 0 || count % 50 != 0) return false;
+      pageOrCount = 'count:$count';
+    }
+
+    final requestKey = '$filterKey|$pageOrCount';
+    if (_lastLoadMoreRequestKey == requestKey) return false;
+    _lastLoadMoreRequestKey = requestKey;
+
+    if (isSearch) {
+      unawaited(provider.searchMoreConversations());
+    } else {
+      unawaited(provider.getMoreConversationsFromServer());
+    }
+    return true;
+  }
+
   void scrollToTop() {
     if (_scrollController.hasClients) {
       _scrollController.animateTo(0.0, duration: const Duration(milliseconds: 500), curve: Curves.easeOutCubic);
@@ -330,12 +443,14 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
   Widget build(BuildContext context) {
     Logger.debug('building conversations page');
     super.build(context);
-    return Consumer<ConversationProvider>(
-      builder: (context, convoProvider, child) {
+    return Selector2<ConversationProvider, LocalRecordingsProvider, _ConversationPageSnapshot>(
+      selector: (_, conversationProvider, recordingsProvider) =>
+          _conversationPageSnapshot(conversationProvider, recordingsProvider),
+      builder: (context, snapshot, child) {
+        final convoProvider = context.read<ConversationProvider>();
         // Unsynced local recordings (batch/offline mode) shown inline with conversations,
         // grouped into the same date buckets. Only in the default view (no search/folder/
         // starred/daily-summaries filter).
-        final recordingsProvider = context.watch<LocalRecordingsProvider>();
         final bool showRecordings = convoProvider.previousQuery.isEmpty &&
             convoProvider.selectedFolderId == null &&
             !convoProvider.showStarredOnly &&
@@ -344,13 +459,18 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
         if (showRecordings) {
           // Batch/offline-mode recordings captured locally — a separate subsystem
           // from device offline-sync (which lives on the Sync page).
-          for (final rec in recordingsProvider.recordings) {
+          for (final rec in snapshot.recordings) {
             final dt = DateTime.fromMillisecondsSinceEpoch(rec.timerStart * 1000);
             final day = DateTime(dt.year, dt.month, dt.day);
             (recordingsByDate[day] ??= <LocalRecording>[]).add(rec);
           }
         }
         final bool hasRecordings = recordingsByDate.isNotEmpty;
+        final bool isWaitingForInitialData = _isBootstrapping && snapshot.conversations.isEmpty && !hasRecordings;
+        final bool isShowingConversationSkeleton = isWaitingForInitialData ||
+            convoProvider.isLoadingConversations ||
+            convoProvider.isFetchingConversations ||
+            convoProvider.isAwaitingInitialFetchRetry;
         final mergedDates = <DateTime>{...convoProvider.groupedConversations.keys, ...recordingsByDate.keys}.toList()
           ..sort((a, b) => b.compareTo(a));
         final conversationRows = _buildConversationListRows(
@@ -362,6 +482,7 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
         return RefreshIndicator(
           onRefresh: () async {
             HapticFeedback.mediumImpact();
+            _lastLoadMoreRequestKey = null;
             Provider.of<CaptureProvider>(context, listen: false).refreshInProgressConversations();
             // Refresh goals widget
             _goalsWidgetKey.currentState?.refresh();
@@ -369,7 +490,7 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
             await Future.wait([
               convoProvider.getInitialConversations(),
               Provider.of<FolderProvider>(context, listen: false).loadFolders(),
-              recordingsProvider.refresh(),
+              Provider.of<LocalRecordingsProvider>(context, listen: false).refresh(),
             ]);
           },
           color: Colors.deepPurpleAccent,
@@ -384,9 +505,10 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
               const SliverToBoxAdapter(child: ActiveCallBanner()),
 
               // Search bar
-              Consumer2<HomeProvider, ConversationProvider>(
-                builder: (context, homeProvider, convoProvider, _) {
-                  bool shouldShowSearchBar = homeProvider.showConvoSearchBar || convoProvider.previousQuery.isNotEmpty;
+              Selector<HomeProvider, bool>(
+                selector: (_, homeProvider) => homeProvider.showConvoSearchBar,
+                builder: (context, showConvoSearchBar, _) {
+                  bool shouldShowSearchBar = showConvoSearchBar || convoProvider.previousQuery.isNotEmpty;
                   if (!shouldShowSearchBar) {
                     return const SliverToBoxAdapter(child: SizedBox.shrink());
                   }
@@ -399,9 +521,10 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
               getProcessingConversationsWidget(convoProvider.processingConversations),
 
               // Today's Tasks and Goals widgets - hide when showing daily recaps, search bar is active, or calendar filter is active
-              Consumer<HomeProvider>(
-                builder: (context, homeProvider, _) {
-                  final isSearchActive = homeProvider.showConvoSearchBar || convoProvider.previousQuery.isNotEmpty;
+              Selector<HomeProvider, bool>(
+                selector: (_, homeProvider) => homeProvider.showConvoSearchBar,
+                builder: (context, showConvoSearchBar, _) {
+                  final isSearchActive = showConvoSearchBar || convoProvider.previousQuery.isNotEmpty;
                   final hasCalendarFilter = convoProvider.selectedDate != null;
                   final prefs = SharedPreferencesUtil();
                   if (convoProvider.showDailySummaries || isSearchActive || hasCalendarFilter) {
@@ -413,7 +536,10 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
                   }
                   return SliverToBoxAdapter(
                     child: Column(
-                      children: [if (showGoals) GoalsWidget(key: _goalsWidgetKey, onRefresh: _refreshGoals)],
+                      children: [
+                        if (showGoals)
+                          RepaintBoundary(child: GoalsWidget(key: _goalsWidgetKey, onRefresh: _refreshGoals)),
+                      ],
                     ),
                   );
                 },
@@ -425,8 +551,7 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
               // users get the empty-state hero below instead.
               if (convoProvider.showDailySummaries ||
                   _nonDiscardedConversationCount(convoProvider) > 0 ||
-                  convoProvider.isLoadingConversations ||
-                  convoProvider.isFetchingConversations ||
+                  isShowingConversationSkeleton ||
                   _hasActiveFilter(convoProvider))
                 SliverToBoxAdapter(
                   child: Builder(
@@ -452,11 +577,10 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
               // clear it, even when the filtered result is empty.
               if (!convoProvider.showDailySummaries &&
                   (_nonDiscardedConversationCount(convoProvider) > 0 ||
-                      convoProvider.isLoadingConversations ||
-                      convoProvider.isFetchingConversations ||
+                      isShowingConversationSkeleton ||
                       _hasActiveFilter(convoProvider)))
-                Consumer2<FolderProvider, ConversationProvider>(
-                  builder: (context, folderProvider, convoProvider, _) {
+                Consumer<FolderProvider>(
+                  builder: (context, folderProvider, _) {
                     return SliverToBoxAdapter(
                       child: FolderTabs(
                         folders: folderProvider.folders,
@@ -478,18 +602,12 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
                 const DailySummariesList()
               else if (_nonDiscardedConversationCount(convoProvider) == 0 &&
                   !hasRecordings &&
-                  !convoProvider.isLoadingConversations &&
-                  !convoProvider.isFetchingConversations &&
-                  !convoProvider.isAwaitingInitialFetchRetry &&
+                  !isShowingConversationSkeleton &&
                   !_hasActiveFilter(convoProvider))
                 // Friendly hero for brand-new users with zero conversations —
                 // matches the polished Tasks empty state.
                 SliverFillRemaining(hasScrollBody: false, child: Center(child: _buildNoConversationsHero(context)))
-              else if (convoProvider.groupedConversations.isEmpty &&
-                  !hasRecordings &&
-                  !convoProvider.isLoadingConversations &&
-                  !convoProvider.isFetchingConversations &&
-                  !convoProvider.isAwaitingInitialFetchRetry)
+              else if (convoProvider.groupedConversations.isEmpty && !hasRecordings && !isShowingConversationSkeleton)
                 SliverToBoxAdapter(
                   child: Center(
                     child: Padding(
@@ -498,11 +616,7 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
                     ),
                   ),
                 )
-              else if (convoProvider.groupedConversations.isEmpty &&
-                  !hasRecordings &&
-                  (convoProvider.isLoadingConversations ||
-                      convoProvider.isFetchingConversations ||
-                      convoProvider.isAwaitingInitialFetchRetry))
+              else if (convoProvider.groupedConversations.isEmpty && !hasRecordings && isShowingConversationSkeleton)
                 _buildLoadingShimmer()
               else
                 SliverList(
@@ -516,17 +630,8 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
                       return VisibilityDetector(
                         key: const Key('conversations-key'),
                         onVisibilityChanged: (visibilityInfo) {
-                          var provider = Provider.of<ConversationProvider>(context, listen: false);
-                          if (provider.previousQuery.isNotEmpty) {
-                            if (visibilityInfo.visibleFraction > 0 &&
-                                !provider.isLoadingConversations &&
-                                (provider.totalSearchPages > provider.currentSearchPage)) {
-                              provider.searchMoreConversations();
-                            }
-                          } else {
-                            if (visibilityInfo.visibleFraction > 0 && !convoProvider.isLoadingConversations) {
-                              convoProvider.getMoreConversationsFromServer();
-                            }
+                          if (visibilityInfo.visibleFraction > 0) {
+                            _requestMoreIfNeeded(context.read<ConversationProvider>());
                           }
                         },
                         child: const SizedBox(height: 20, width: double.maxFinite),
diff --git a/app/lib/pages/conversations/widgets/conversation_list_item.dart b/app/lib/pages/conversations/widgets/conversation_list_item.dart
index 2de5150bea8..3c0a2dc1464 100644
--- a/app/lib/pages/conversations/widgets/conversation_list_item.dart
+++ b/app/lib/pages/conversations/widgets/conversation_list_item.dart
@@ -1,6 +1,4 @@
 import 'dart:async';
-import 'dart:ui';
-
 import 'package:omi/utils/platform/platform_manager.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -47,6 +45,21 @@ class _ConversationListItemState extends State<ConversationListItem> {
   Timer? _conversationNewStatusResetTimer;
   bool isNew = false;
 
+  int _visualSignature(ServerConversation conversation) => Object.hash(
+        conversation.structured.title,
+        conversation.structured.emoji,
+        conversation.structured.category,
+        conversation.status,
+        conversation.discarded,
+        conversation.starred,
+        conversation.folderId,
+        conversation.visibility,
+        conversation.startedAt,
+        conversation.finishedAt,
+        conversation.photos.length,
+        conversation.transcriptSegments.length,
+      );
+
   @override
   void dispose() {
     _conversationNewStatusResetTimer?.cancel();
@@ -71,271 +84,297 @@ class _ConversationListItemState extends State<ConversationListItem> {
       });
     }
 
-    return Consumer<ConversationProvider>(
-      builder: (context, provider, child) {
-        final isSelectionMode = provider.isSelectionModeActive;
-        final isSelected = provider.isConversationSelected(widget.conversation.id);
-        final isMerging = provider.isConversationMerging(widget.conversation.id);
-        final isEligible = provider.isConversationEligibleForMerge(widget.conversation.id);
-
-        return GestureDetector(
-          onTap: () async {
-            // If in selection mode, toggle selection only if eligible
-            if (isSelectionMode) {
-              if (!isEligible) {
-                // Show feedback that this conversation cannot be merged
-                HapticFeedback.lightImpact();
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text(context.l10n.conversationCannotBeMerged),
-                    duration: const Duration(seconds: 2),
-                  ),
-                );
+    return RepaintBoundary(
+      child: Selector<
+          ConversationProvider,
+          ({
+            int visualSignature,
+            bool isSelectionMode,
+            bool isSelected,
+            bool isMerging,
+            bool isEligible,
+          })>(
+        selector: (context, provider) => (
+          // ServerConversation is mutable. Select the visible primitive fields
+          // instead of object identity so star/title/status updates are not lost.
+          visualSignature: _visualSignature(widget.conversation),
+          isSelectionMode: provider.isSelectionModeActive,
+          isSelected: provider.isConversationSelected(widget.conversation.id),
+          isMerging: provider.isConversationMerging(widget.conversation.id),
+          isEligible: provider.isConversationEligibleForMerge(widget.conversation.id),
+        ),
+        builder: (context, rowState, child) {
+          final provider = context.read<ConversationProvider>();
+          final isSelectionMode = rowState.isSelectionMode;
+          final isSelected = rowState.isSelected;
+          final isMerging = rowState.isMerging;
+          final isEligible = rowState.isEligible;
+
+          return GestureDetector(
+            onTap: () async {
+              // If in selection mode, toggle selection only if eligible
+              if (isSelectionMode) {
+                if (!isEligible) {
+                  // Show feedback that this conversation cannot be merged
+                  HapticFeedback.lightImpact();
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text(context.l10n.conversationCannotBeMerged),
+                      duration: const Duration(seconds: 2),
+                    ),
+                  );
+                  return;
+                }
+                HapticFeedback.selectionClick();
+                provider.toggleConversationSelection(widget.conversation.id);
+                return;
+              }
+
+              if (widget.conversation.isLocked) {
+                if (!context.read<UsageProvider>().showSubscriptionUI) return;
+                PlatformManager.instance.analytics.paywallOpened('Conversation List Item');
+                routeToPage(context, const UsagePage(showUpgradeDialog: true));
                 return;
               }
               HapticFeedback.selectionClick();
-              provider.toggleConversationSelection(widget.conversation.id);
-              return;
-            }
-
-            if (widget.conversation.isLocked) {
-              if (!context.read<UsageProvider>().showSubscriptionUI) return;
-              PlatformManager.instance.analytics.paywallOpened('Conversation List Item');
-              routeToPage(context, const UsagePage(showUpgradeDialog: true));
-              return;
-            }
-            context.read<ConversationDetailProvider>().updateConversation(widget.conversation.id, widget.date);
-            String startingTitle = context.read<ConversationDetailProvider>().conversation.structured.title;
-
-            final searchQuery = provider.previousQuery;
-            final hoursSinceConversation = DateTime.now().difference(widget.conversation.createdAt).inHours;
-            final resultFuture = routeToPage(
-              context,
-              ConversationDetailPage(conversation: widget.conversation, isFromOnboarding: widget.isFromOnboarding),
-            );
-            WidgetsBinding.instance.addPostFrameCallback((_) {
-              if (!mounted) return;
-              provider.onConversationTap(widget.conversation.id);
-              unawaited(
-                SchedulerBinding.instance.scheduleTask<void>(() {
-                  if (!mounted) return;
-                  if (searchQuery.isNotEmpty) {
-                    PlatformManager.instance.analytics.conversationOpenedFromSearch(
-                      conversation: widget.conversation,
-                      searchQuery: searchQuery,
-                      conversationIndexInResults: widget.conversationIdx,
-                    );
-                  } else {
-                    PlatformManager.instance.analytics.conversationListItemClickedWithTimeDifference(
-                      conversation: widget.conversation,
-                      conversationIndex: widget.conversationIdx,
-                      hoursSinceConversation: hoursSinceConversation,
-                    );
-                  }
-                }, Priority.idle),
+              // The detail page seeds its provider from the supplied conversation
+              // after its first frame. Notifying that provider before pushing the
+              // route delayed visible navigation and rebuilt listeners behind it.
+              final startingTitle = widget.conversation.structured.title;
+
+              final searchQuery = provider.previousQuery;
+              final hoursSinceConversation = DateTime.now().difference(widget.conversation.createdAt).inHours;
+              final resultFuture = routeToPage(
+                context,
+                ConversationDetailPage(conversation: widget.conversation, isFromOnboarding: widget.isFromOnboarding),
               );
-            });
-
-            var result = await resultFuture;
-            if (context.mounted) {
-              // Don't upsert if the conversation was deleted while on the detail page
-              if (result is Map && result['deleted'] == true) return;
-              bool stillExists = provider.conversations.any((c) => c.id == widget.conversation.id);
-              if (stillExists) {
-                String newTitle = context.read<ConversationDetailProvider>().conversation.structured.title;
-                if (startingTitle != newTitle) {
-                  widget.conversation.structured.title = newTitle;
-                  provider.upsertConversation(widget.conversation);
+              WidgetsBinding.instance.addPostFrameCallback((_) {
+                if (!mounted) return;
+                provider.onConversationTap(widget.conversation.id);
+                unawaited(
+                  SchedulerBinding.instance.scheduleTask<void>(() {
+                    if (!mounted) return;
+                    if (searchQuery.isNotEmpty) {
+                      PlatformManager.instance.analytics.conversationOpenedFromSearch(
+                        conversation: widget.conversation,
+                        searchQuery: searchQuery,
+                        conversationIndexInResults: widget.conversationIdx,
+                      );
+                    } else {
+                      PlatformManager.instance.analytics.conversationListItemClickedWithTimeDifference(
+                        conversation: widget.conversation,
+                        conversationIndex: widget.conversationIdx,
+                        hoursSinceConversation: hoursSinceConversation,
+                      );
+                    }
+                  }, Priority.idle),
+                );
+              });
+
+              var result = await resultFuture;
+              if (context.mounted) {
+                // Don't upsert if the conversation was deleted while on the detail page
+                if (result is Map && result['deleted'] == true) return;
+                bool stillExists = provider.conversations.any((c) => c.id == widget.conversation.id);
+                if (stillExists) {
+                  String newTitle = context.read<ConversationDetailProvider>().conversation.structured.title;
+                  if (startingTitle != newTitle) {
+                    widget.conversation.structured.title = newTitle;
+                    provider.upsertConversation(widget.conversation);
+                  }
                 }
               }
-            }
-          },
-          onLongPress: () {
-            // Enter selection mode on long press
-            if (!isSelectionMode && !isMerging) {
-              HapticFeedback.mediumImpact();
-              provider.enterSelectionMode();
-              provider.toggleConversationSelection(widget.conversation.id);
-            }
-          },
-          child: Stack(
-            children: [
-              Padding(
-                padding: EdgeInsets.only(
-                  top: 12,
-                  left: widget.isFromOnboarding ? 0 : 16,
-                  right: widget.isFromOnboarding ? 0 : 16,
-                ),
-                child: AnimatedOpacity(
-                  duration: const Duration(milliseconds: 200),
-                  opacity: (isSelectionMode && !isEligible) ? 0.6 : 1.0,
-                  child: AnimatedContainer(
+            },
+            onLongPress: () {
+              // Enter selection mode on long press
+              if (!isSelectionMode && !isMerging) {
+                HapticFeedback.mediumImpact();
+                provider.enterSelectionMode();
+                provider.toggleConversationSelection(widget.conversation.id);
+              }
+            },
+            child: Stack(
+              children: [
+                Padding(
+                  padding: EdgeInsets.only(
+                    top: 12,
+                    left: widget.isFromOnboarding ? 0 : 16,
+                    right: widget.isFromOnboarding ? 0 : 16,
+                  ),
+                  child: AnimatedOpacity(
                     duration: const Duration(milliseconds: 200),
-                    width: double.maxFinite,
-                    decoration: BoxDecoration(
-                      color: isSelected
-                          ? Colors.deepPurple.withValues(alpha: 0.3)
-                          : (isSelectionMode && !isEligible)
-                              ? Colors.grey.shade800
-                              : const Color(0xFF1F1F25),
-                      borderRadius: BorderRadius.circular(24.0),
-                      border: isSelected
-                          ? Border.all(color: Colors.deepPurple, width: 2)
-                          : (isSelectionMode && !isEligible)
-                              ? Border.all(color: Colors.grey.shade600, width: 1)
-                              : null,
-                    ),
-                    child: ClipRRect(
-                      borderRadius: BorderRadius.circular(24.0),
-                      child: Dismissible(
-                        key: UniqueKey(),
-                        direction: isSelectionMode || isMerging ? DismissDirection.none : DismissDirection.endToStart,
-                        background: Container(
-                          alignment: Alignment.centerRight,
-                          padding: const EdgeInsets.only(right: 20.0),
-                          color: Colors.red,
-                          child: const Icon(Icons.delete, color: Colors.white),
-                        ),
-                        confirmDismiss: (direction) async {
-                          HapticFeedback.mediumImpact();
-                          bool showDeleteConfirmation = SharedPreferencesUtil().showConversationDeleteConfirmation;
-
-                          if (!showDeleteConfirmation) return Future.value(true);
-
-                          final connectivityProvider = Provider.of<ConnectivityProvider>(context, listen: false);
-
-                          if (connectivityProvider.isConnected) {
-                            bool dontShow = false;
-                            return await showDialog<bool>(
-                              context: context,
-                              builder: (ctx) {
-                                return StatefulBuilder(
-                                  builder: (context, setState) {
-                                    final checkbox = GestureDetector(
-                                      onTap: () => setState(() => dontShow = !dontShow),
-                                      child: Row(
-                                        children: [
-                                          SizedBox(
-                                            width: 24,
-                                            height: 24,
-                                            child: Checkbox(
-                                              value: dontShow,
-                                              onChanged: (v) => setState(() => dontShow = v ?? false),
-                                              activeColor: Colors.deepPurple,
-                                              checkColor: Colors.white,
-                                              side: const BorderSide(color: Colors.white54),
-                                              materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                    opacity: (isSelectionMode && !isEligible) ? 0.6 : 1.0,
+                    child: AnimatedContainer(
+                      duration: const Duration(milliseconds: 200),
+                      width: double.maxFinite,
+                      decoration: BoxDecoration(
+                        color: isSelected
+                            ? Colors.deepPurple.withValues(alpha: 0.3)
+                            : (isSelectionMode && !isEligible)
+                                ? Colors.grey.shade800
+                                : const Color(0xFF1F1F25),
+                        borderRadius: BorderRadius.circular(24.0),
+                        border: isSelected
+                            ? Border.all(color: Colors.deepPurple, width: 2)
+                            : (isSelectionMode && !isEligible)
+                                ? Border.all(color: Colors.grey.shade600, width: 1)
+                                : null,
+                      ),
+                      child: ClipRRect(
+                        borderRadius: BorderRadius.circular(24.0),
+                        child: Dismissible(
+                          // Keep the dismissible state stable when the conversation provider
+                          // refreshes. A UniqueKey here recreated every row during unrelated
+                          // notifications, forcing extra layout/paint work while scrolling.
+                          key: ValueKey('conversation_dismissible_${widget.conversation.id}'),
+                          direction: isSelectionMode || isMerging ? DismissDirection.none : DismissDirection.endToStart,
+                          background: Container(
+                            alignment: Alignment.centerRight,
+                            padding: const EdgeInsets.only(right: 20.0),
+                            color: Colors.red,
+                            child: const Icon(Icons.delete, color: Colors.white),
+                          ),
+                          confirmDismiss: (direction) async {
+                            HapticFeedback.mediumImpact();
+                            bool showDeleteConfirmation = SharedPreferencesUtil().showConversationDeleteConfirmation;
+
+                            if (!showDeleteConfirmation) return Future.value(true);
+
+                            final connectivityProvider = Provider.of<ConnectivityProvider>(context, listen: false);
+
+                            if (connectivityProvider.isConnected) {
+                              bool dontShow = false;
+                              return await showDialog<bool>(
+                                context: context,
+                                builder: (ctx) {
+                                  return StatefulBuilder(
+                                    builder: (context, setState) {
+                                      final checkbox = GestureDetector(
+                                        onTap: () => setState(() => dontShow = !dontShow),
+                                        child: Row(
+                                          children: [
+                                            SizedBox(
+                                              width: 24,
+                                              height: 24,
+                                              child: Checkbox(
+                                                value: dontShow,
+                                                onChanged: (v) => setState(() => dontShow = v ?? false),
+                                                activeColor: Colors.deepPurple,
+                                                checkColor: Colors.white,
+                                                side: const BorderSide(color: Colors.white54),
+                                                materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                                              ),
                                             ),
-                                          ),
-                                          const SizedBox(width: 8),
-                                          Flexible(
-                                            child: Text(
-                                              context.l10n.dontShowAgain,
-                                              style: const TextStyle(fontSize: 14),
+                                            const SizedBox(width: 8),
+                                            Flexible(
+                                              child: Text(
+                                                context.l10n.dontShowAgain,
+                                                style: const TextStyle(fontSize: 14),
+                                              ),
                                             ),
-                                          ),
+                                          ],
+                                        ),
+                                      );
+                                      final content = Column(
+                                        mainAxisSize: MainAxisSize.min,
+                                        crossAxisAlignment: CrossAxisAlignment.start,
+                                        children: [
+                                          Text(context.l10n.deleteConversationMessage),
+                                          const SizedBox(height: 16),
+                                          PlatformService.isApple
+                                              ? Material(color: Colors.transparent, child: checkbox)
+                                              : checkbox,
                                         ],
-                                      ),
-                                    );
-                                    final content = Column(
-                                      mainAxisSize: MainAxisSize.min,
-                                      crossAxisAlignment: CrossAxisAlignment.start,
-                                      children: [
-                                        Text(context.l10n.deleteConversationMessage),
-                                        const SizedBox(height: 16),
-                                        PlatformService.isApple
-                                            ? Material(color: Colors.transparent, child: checkbox)
-                                            : checkbox,
-                                      ],
-                                    );
-                                    final actions = [
-                                      TextButton(
-                                        onPressed: () => Navigator.of(ctx).pop(false),
-                                        child: Text(context.l10n.cancel, style: const TextStyle(color: Colors.white)),
-                                      ),
-                                      TextButton(
-                                        onPressed: () {
-                                          if (dontShow) {
-                                            SharedPreferencesUtil().showConversationDeleteConfirmation = false;
-                                          }
-                                          Navigator.of(ctx).pop(true);
-                                        },
-                                        child: Text(context.l10n.confirm, style: const TextStyle(color: Colors.red)),
-                                      ),
-                                    ];
-                                    if (PlatformService.isApple) {
-                                      return CupertinoAlertDialog(
+                                      );
+                                      final actions = [
+                                        TextButton(
+                                          onPressed: () => Navigator.of(ctx).pop(false),
+                                          child: Text(context.l10n.cancel, style: const TextStyle(color: Colors.white)),
+                                        ),
+                                        TextButton(
+                                          onPressed: () {
+                                            if (dontShow) {
+                                              SharedPreferencesUtil().showConversationDeleteConfirmation = false;
+                                            }
+                                            Navigator.of(ctx).pop(true);
+                                          },
+                                          child: Text(context.l10n.confirm, style: const TextStyle(color: Colors.red)),
+                                        ),
+                                      ];
+                                      if (PlatformService.isApple) {
+                                        return CupertinoAlertDialog(
+                                          title: Text(context.l10n.deleteConversationTitle),
+                                          content: content,
+                                          actions: actions,
+                                        );
+                                      }
+                                      return AlertDialog(
                                         title: Text(context.l10n.deleteConversationTitle),
                                         content: content,
                                         actions: actions,
                                       );
-                                    }
-                                    return AlertDialog(
-                                      title: Text(context.l10n.deleteConversationTitle),
-                                      content: content,
-                                      actions: actions,
-                                    );
-                                  },
-                                );
-                              },
-                            );
-                          } else {
-                            return showDialog(
-                              builder: (c) => getDialog(
-                                context,
-                                () => Navigator.pop(context),
-                                () => Navigator.pop(context),
-                                context.l10n.unableToDeleteConversation,
-                                context.l10n.pleaseCheckInternetConnectionAndTryAgain,
-                                singleButton: true,
-                                okButtonText: context.l10n.ok,
-                              ),
-                              context: context,
-                            );
-                          }
-                        },
-                        onDismissed: (direction) async {
-                          var conversation = widget.conversation;
-                          PlatformManager.instance.analytics.conversationSwipedToDelete(conversation);
-                          provider.deleteConversationLocally(conversation, widget.date);
-                        },
-                        child: Padding(
-                          padding: PlatformService.isMobile
-                              ? const EdgeInsetsDirectional.symmetric(horizontal: 16, vertical: 20)
-                              : const EdgeInsetsDirectional.all(16),
-                          child: PlatformService.isMobile
-                              ? _buildMobileLayout(context)
-                              : Column(
-                                  mainAxisSize: MainAxisSize.max,
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    _getConversationHeader(),
-                                    const SizedBox(height: 16),
-                                    _buildConversationBody(context),
-                                  ],
+                                    },
+                                  );
+                                },
+                              );
+                            } else {
+                              return showDialog(
+                                builder: (c) => getDialog(
+                                  context,
+                                  () => Navigator.pop(context),
+                                  () => Navigator.pop(context),
+                                  context.l10n.unableToDeleteConversation,
+                                  context.l10n.pleaseCheckInternetConnectionAndTryAgain,
+                                  singleButton: true,
+                                  okButtonText: context.l10n.ok,
                                 ),
+                                context: context,
+                              );
+                            }
+                          },
+                          onDismissed: (direction) async {
+                            var conversation = widget.conversation;
+                            PlatformManager.instance.analytics.conversationSwipedToDelete(conversation);
+                            provider.deleteConversationLocally(conversation, widget.date);
+                          },
+                          child: Padding(
+                            padding: PlatformService.isMobile
+                                ? const EdgeInsetsDirectional.symmetric(horizontal: 16, vertical: 20)
+                                : const EdgeInsetsDirectional.all(16),
+                            child: PlatformService.isMobile
+                                ? _buildMobileLayout(context)
+                                : Column(
+                                    mainAxisSize: MainAxisSize.max,
+                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                    children: [
+                                      _getConversationHeader(),
+                                      const SizedBox(height: 16),
+                                      _buildConversationBody(context),
+                                    ],
+                                  ),
+                          ),
                         ),
                       ),
                     ),
                   ),
                 ),
-              ),
-              // Merging overlay covering the full card
-              if (isMerging)
-                Positioned.fill(
-                  child: Padding(
-                    padding: EdgeInsets.only(
-                      top: 12,
-                      left: widget.isFromOnboarding ? 0 : 16,
-                      right: widget.isFromOnboarding ? 0 : 16,
+                // Merging overlay covering the full card
+                if (isMerging)
+                  Positioned.fill(
+                    child: Padding(
+                      padding: EdgeInsets.only(
+                        top: 12,
+                        left: widget.isFromOnboarding ? 0 : 16,
+                        right: widget.isFromOnboarding ? 0 : 16,
+                      ),
+                      child: _buildMergingOverlay(),
                     ),
-                    child: _buildMergingOverlay(),
                   ),
-                ),
-            ],
-          ),
-        );
-      },
+              ],
+            ),
+          );
+        },
+      ),
     );
   }
 
@@ -481,18 +520,18 @@ class _ConversationListItemState extends State<ConversationListItem> {
   Widget _buildLockedOverlay() {
     return Positioned.fill(
       child: ClipRRect(
-        child: BackdropFilter(
-          filter: ImageFilter.blur(sigmaX: 2.0, sigmaY: 2.0),
-          child: Container(
-            alignment: Alignment.center,
-            decoration: BoxDecoration(
-              color: Colors.black.withValues(alpha: 0.01),
-              borderRadius: const BorderRadius.all(Radius.circular(8)),
-            ),
-            child: Text(
-              context.l10n.upgradeToUnlimited,
-              style: const TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),
-            ),
+        child: Container(
+          alignment: Alignment.center,
+          decoration: BoxDecoration(
+            // Avoid a live backdrop blur for every locked card. The opaque overlay
+            // preserves the locked affordance without making the scroll/route paint
+            // path sample and blur the entire card behind it.
+            color: Colors.black.withValues(alpha: 0.62),
+            borderRadius: const BorderRadius.all(Radius.circular(8)),
+          ),
+          child: Text(
+            context.l10n.upgradeToUnlimited,
+            style: const TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),
           ),
         ),
       ),
diff --git a/app/lib/pages/conversations/widgets/goals_widget.dart b/app/lib/pages/conversations/widgets/goals_widget.dart
index 846255a5c7b..d66c157e2f9 100644
--- a/app/lib/pages/conversations/widgets/goals_widget.dart
+++ b/app/lib/pages/conversations/widgets/goals_widget.dart
@@ -11,6 +11,19 @@ import 'package:omi/backend/http/api/goals.dart';
 import 'package:omi/providers/goals_provider.dart';
 import 'package:omi/utils/l10n_extensions.dart';
 
+/// Keep integer stepping for small goals without asking RenderSlider to paint
+/// one division per unit for arbitrarily large targets.
+///
+/// A target of one billion previously produced one billion divisions. Flutter
+/// walks the divisions during every slider paint even when tick marks are
+/// hidden, which can block the UI thread for several seconds.
+@visibleForTesting
+int? goalSliderDivisions(double targetValue) {
+  if (!targetValue.isFinite || targetValue <= 0 || targetValue > 100) return null;
+  final roundedTarget = targetValue.round();
+  return targetValue == roundedTarget ? roundedTarget : null;
+}
+
 /// Multi-goal widget supporting up to 3 goals with minimalistic UI
 class GoalsWidget extends StatefulWidget {
   const GoalsWidget({super.key, this.onRefresh});
@@ -585,8 +598,10 @@ class GoalsWidgetState extends State<GoalsWidget> with WidgetsBindingObserver {
       },
       child: GestureDetector(
         onTap: () {
-          PlatformManager.instance.analytics.goalItemTappedForEdit(goalId: goal.id, source: 'home');
           _editGoal(goal);
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            PlatformManager.instance.analytics.goalItemTappedForEdit(goalId: goal.id, source: 'home');
+          });
         },
         child: Container(
           margin: EdgeInsets.only(bottom: isLast ? 0 : 12),
@@ -638,7 +653,7 @@ class GoalsWidgetState extends State<GoalsWidget> with WidgetsBindingObserver {
                                 value: goal.currentValue.clamp(0.0, goal.targetValue),
                                 min: 0,
                                 max: goal.targetValue,
-                                divisions: goal.targetValue >= 1 ? goal.targetValue.toInt() : null,
+                                divisions: goalSliderDivisions(goal.targetValue),
                                 onChanged: (value) => _updateGoalProgressUI(goal, value),
                                 onChangeEnd: (value) {
                                   PlatformManager.instance.analytics.goalProgressChanged(
diff --git a/app/lib/pages/home/home_content.dart b/app/lib/pages/home/home_content.dart
index b32611ab9bc..0dc06dd737d 100644
--- a/app/lib/pages/home/home_content.dart
+++ b/app/lib/pages/home/home_content.dart
@@ -6,8 +6,10 @@ import 'package:provider/provider.dart';
 
 import 'package:omi/backend/http/api/users.dart';
 import 'package:omi/backend/preferences.dart';
+import 'package:omi/backend/schema/conversation.dart';
 import 'package:omi/backend/schema/daily_summary.dart';
 import 'package:omi/pages/conversation_capturing/page.dart';
+import 'package:omi/pages/conversations/widgets/conversation_list_item.dart';
 import 'package:omi/pages/conversations/widgets/processing_capture.dart';
 import 'package:omi/pages/conversations/widgets/today_tasks_widget.dart';
 import 'package:omi/pages/home/widgets/daily_summary_card.dart';
@@ -113,6 +115,21 @@ class HomeContentPageState extends State<HomeContentPage> with AutomaticKeepAliv
               // big "get started" options so the home page doesn't feel
               // empty for new users.
               if (_nonDiscardedConversationCount(convoProvider) >= 3) ...[
+                SliverToBoxAdapter(
+                  child: _buildSectionHeader(
+                    context,
+                    context.l10n.conversations,
+                    onViewAll: () {
+                      // Reset the daily-summaries flag so the conversations tab
+                      // actually shows conversations (it persists from Daily
+                      // Recaps' View All otherwise).
+                      if (convoProvider.showDailySummaries) convoProvider.toggleDailySummaries();
+                      context.read<HomeProvider>().setIndex(1);
+                    },
+                  ),
+                ),
+                HomeConversationsPreview(conversationProvider: convoProvider),
+
                 // Mind Map section — only shown for users with enough activity.
                 SliverToBoxAdapter(
                   child: _buildSectionHeader(
@@ -425,3 +442,71 @@ class HomeContentPageState extends State<HomeContentPage> with AutomaticKeepAliv
     );
   }
 }
+
+/// The filtered recent-conversation preview shown on Home for established users.
+///
+/// This consumes [ConversationProvider.groupedConversations], which already
+/// carries the conversations page's discarded/short/starred/date filters.
+class HomeConversationsPreview extends StatelessWidget {
+  final ConversationProvider conversationProvider;
+
+  const HomeConversationsPreview({super.key, required this.conversationProvider});
+
+  @override
+  Widget build(BuildContext context) {
+    if (conversationProvider.isLoadingConversations && conversationProvider.conversations.isEmpty) {
+      return SliverToBoxAdapter(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          child: Column(
+            children: List.generate(
+              2,
+              (_) => Padding(
+                padding: const EdgeInsets.only(top: 12),
+                child: ShimmerWithTimeout(
+                  baseColor: AppStyles.backgroundSecondary,
+                  highlightColor: AppStyles.backgroundTertiary,
+                  child: Container(
+                    height: 80,
+                    decoration: BoxDecoration(
+                      color: AppStyles.backgroundSecondary,
+                      borderRadius: BorderRadius.circular(24),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    final sortedDates = conversationProvider.groupedConversations.keys.toList()..sort((a, b) => b.compareTo(a));
+    final recent = <ServerConversation>[];
+    for (final date in sortedDates) {
+      final list = conversationProvider.groupedConversations[date] ?? const [];
+      for (final conversation in list) {
+        recent.add(conversation);
+        if (recent.length >= 3) break;
+      }
+      if (recent.length >= 3) break;
+    }
+    if (recent.isEmpty) return const SliverToBoxAdapter(child: SizedBox.shrink());
+
+    return SliverList(
+      delegate: SliverChildBuilderDelegate(
+        childCount: recent.length,
+        (context, index) {
+          final conversation = recent[index];
+          final date = conversationLocalDayKey(conversation.startedAt ?? conversation.createdAt);
+          return ConversationListItem(
+            key: ValueKey(conversation.id),
+            conversation: conversation,
+            date: date,
+            conversationIdx: index,
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/app/lib/pages/home/page.dart b/app/lib/pages/home/page.dart
index e02f5b5d86b..9ff437ec03f 100644
--- a/app/lib/pages/home/page.dart
+++ b/app/lib/pages/home/page.dart
@@ -71,6 +71,7 @@ import 'package:omi/utils/platform/platform_manager.dart';
 import 'package:omi/utils/responsive/responsive_helper.dart';
 import 'package:omi/widgets/calendar_date_picker_sheet.dart';
 import 'package:omi/widgets/freemium_switch_dialog.dart';
+import 'package:omi/widgets/shimmer_with_timeout.dart';
 import 'package:omi/widgets/upgrade_alert.dart';
 import 'package:omi/widgets/bottom_nav_bar.dart';
 import 'package:omi/pages/onboarding/interactive_device_onboarding/interactive_device_onboarding_wrapper.dart';
@@ -155,6 +156,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
   // tabs until the user visits them. Once created, a tab remains in the stack
   // so its scroll position and other state are preserved.
   final List<Widget?> _pages = List<Widget?>.filled(4, null);
+  final Set<int> _scheduledPageInitializations = <int>{};
 
   // Freemium switch handler for auto-switch dialogs
   final FreemiumSwitchHandler _freemiumHandler = FreemiumSwitchHandler();
@@ -182,9 +184,41 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
     }
   }
 
+  void _schedulePageInitialization(int pageIndex) {
+    if (pageIndex < 0 || pageIndex >= _pages.length || _pages[pageIndex] != null) return;
+    if (!_scheduledPageInitializations.add(pageIndex)) return;
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _scheduledPageInitializations.remove(pageIndex);
+      if (!mounted || _pages[pageIndex] != null) return;
+      setState(() => _ensurePageInitialized(pageIndex));
+    });
+    // addPostFrameCallback does not schedule a frame by itself. Background
+    // prewarming often runs while the UI is idle, so explicitly request one.
+    WidgetsBinding.instance.ensureVisualUpdate();
+  }
+
+  void _prewarmRemainingTabs(int selectedIndex) {
+    var delay = const Duration(milliseconds: 350);
+    for (var index = 0; index < _pages.length; index++) {
+      if (index == selectedIndex) continue;
+      final pageIndex = index;
+      Timer(delay, () {
+        if (!mounted) return;
+        _schedulePageInitialization(pageIndex);
+      });
+      delay += const Duration(milliseconds: 180);
+    }
+  }
+
   List<Widget> _buildPages(int selectedIndex) {
-    _ensurePageInitialized(selectedIndex);
-    return [for (final page in _pages) page ?? const SizedBox.shrink()];
+    return [
+      for (var index = 0; index < _pages.length; index++)
+        TickerMode(
+          enabled: index == selectedIndex,
+          child: RepaintBoundary(child: _pages[index] ?? _TabLoadingSkeleton(tabIndex: index)),
+        ),
+    ];
   }
 
   void _scrollToTop(int pageIndex) {
@@ -336,6 +370,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
     context.read<HomeProvider>().selectedIndex = homePageIdx;
     _ensurePageInitialized(homePageIdx);
     WidgetsBinding.instance.addObserver(this);
+    _prewarmRemainingTabs(homePageIdx);
 
     // Pre-warm agent VM and WebSocket so session is ready by the time the user opens chat
     if (SharedPreferencesUtil().claudeAgentEnabled) {
@@ -727,12 +762,13 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
           }
           return child!;
         },
-        child: Consumer<HomeProvider>(
-          builder: (context, homeProvider, _) {
+        child: Selector<HomeProvider, int>(
+          selector: (_, homeProvider) => homeProvider.selectedIndex,
+          builder: (context, selectedIndex, _) {
             return Scaffold(
               backgroundColor: Theme.of(context).colorScheme.primary,
               resizeToAvoidBottomInset: false,
-              appBar: homeProvider.selectedIndex == 5 ? null : _buildAppBar(context),
+              appBar: selectedIndex == 5 ? null : _buildAppBar(context),
               body: GestureDetector(
                 onTap: () {
                   primaryFocus?.unfocus();
@@ -744,11 +780,11 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
                     Column(
                       children: [
                         // Show slim green call bar on non-home/conversations tabs when a call is active
-                        if (homeProvider.selectedIndex > 1) const ActiveCallTopBar(),
+                        if (selectedIndex > 1) const ActiveCallTopBar(),
                         Expanded(
                           child: IndexedStack(
-                            index: homeProvider.selectedIndex,
-                            children: _buildPages(homeProvider.selectedIndex),
+                            index: selectedIndex,
+                            children: _buildPages(selectedIndex),
                           ),
                         ),
                       ],
@@ -764,6 +800,10 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
                         return Stack(
                           children: [
                             BottomNavBar(
+                              // Queue page construction after the current
+                              // gesture frame. Building a destination directly
+                              // in onTapDown makes the tap itself feel stuck.
+                              onTabWarmup: _schedulePageInitialization,
                               onTabTap: (index, isRepeat) {
                                 if (isRepeat) {
                                   _scrollToTop(index);
@@ -773,8 +813,12 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
                                     final cp = context.read<ConversationProvider>();
                                     if (cp.showDailySummaries) cp.toggleDailySummaries();
                                   }
-                                  _ensurePageInitialized(index);
+                                  // Change tabs immediately. If background
+                                  // prewarming has not completed yet, the
+                                  // destination paints a skeleton for one frame
+                                  // and mounts its real content afterwards.
                                   home.setIndex(index);
+                                  _schedulePageInitialization(index);
                                 }
                               },
                             ),
@@ -785,11 +829,10 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
                       },
                     ),
                     // Merge action bar - floats above bottom nav when in selection mode
-                    if (homeProvider.selectedIndex == 1)
-                      const Positioned(left: 0, right: 0, bottom: 0, child: MergeActionBar()),
+                    if (selectedIndex == 1) const Positioned(left: 0, right: 0, bottom: 0, child: MergeActionBar()),
                     // Task selection action bar - floats above bottom nav on the
                     // tasks tab when selection mode is active in ActionItemsProvider.
-                    if (homeProvider.selectedIndex == 2)
+                    if (selectedIndex == 2)
                       const Positioned(left: 0, right: 0, bottom: 0, child: TaskSelectionActionBar()),
                   ],
                 ),
@@ -1230,3 +1273,33 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
     super.dispose();
   }
 }
+
+class _TabLoadingSkeleton extends StatelessWidget {
+  const _TabLoadingSkeleton({required this.tabIndex});
+
+  final int tabIndex;
+
+  @override
+  Widget build(BuildContext context) {
+    final itemCount = tabIndex == 3 ? 6 : 5;
+    return IgnorePointer(
+      child: ListView.builder(
+        physics: const NeverScrollableScrollPhysics(),
+        padding: const EdgeInsets.fromLTRB(20, 24, 20, 120),
+        itemCount: itemCount,
+        itemBuilder: (context, index) => Padding(
+          padding: const EdgeInsets.only(bottom: 14),
+          child: ShimmerWithTimeout(
+            baseColor: const Color(0xFF1F1F25),
+            highlightColor: const Color(0xFF303038),
+            child: Container(
+              height: index == 0 ? 34 : 76,
+              width: double.infinity,
+              decoration: BoxDecoration(color: const Color(0xFF1F1F25), borderRadius: BorderRadius.circular(18)),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/app/lib/pages/settings/daily_summary_detail_page.dart b/app/lib/pages/settings/daily_summary_detail_page.dart
index 187e4304a6a..2c80e69cd00 100644
--- a/app/lib/pages/settings/daily_summary_detail_page.dart
+++ b/app/lib/pages/settings/daily_summary_detail_page.dart
@@ -20,8 +20,9 @@ import 'package:omi/utils/platform/platform_service.dart';
 class DailySummaryDetailPage extends StatefulWidget {
   final String summaryId;
   final DailySummary? summary; // Can pass directly if already loaded
+  final TileProvider? tileProvider;
 
-  const DailySummaryDetailPage({super.key, required this.summaryId, this.summary});
+  const DailySummaryDetailPage({super.key, required this.summaryId, this.summary, this.tileProvider});
 
   @override
   State<DailySummaryDetailPage> createState() => _DailySummaryDetailPageState();
@@ -640,6 +641,7 @@ class _DailySummaryDetailPageState extends State<DailySummaryDetailPage> with Si
                       subdomains: const ['a', 'b', 'c', 'd'],
                       userAgentPackageName: 'me.omi.app',
                       retinaMode: true,
+                      tileProvider: widget.tileProvider,
                     ),
                     MarkerLayer(markers: markers),
                   ],
@@ -653,10 +655,8 @@ class _DailySummaryDetailPageState extends State<DailySummaryDetailPage> with Si
         ...timelineLocations.asMap().entries.map((entry) {
           final index = entry.key;
           final location = entry.value;
-          final isFirst = index == 0;
-          final isLast = index == timelineLocations.length - 1;
 
-          return _buildTimelineItem(location, isFirst, isLast);
+          return _buildTimelineItem(location, index);
         }),
       ],
     );
@@ -869,7 +869,7 @@ class _DailySummaryDetailPageState extends State<DailySummaryDetailPage> with Si
     );
   }
 
-  Widget _buildTimelineItem(_TimelineLocation location, bool isFirst, bool isLast) {
+  Widget _buildTimelineItem(_TimelineLocation location, int index) {
     final startFormatted = _formatTimeTo12Hour(location.startTime);
     final endFormatted = _formatTimeTo12Hour(location.endTime);
     final timeText = startFormatted.isNotEmpty
@@ -878,90 +878,54 @@ class _DailySummaryDetailPageState extends State<DailySummaryDetailPage> with Si
             : startFormatted)
         : '';
 
-    return GestureDetector(
+    final semanticsLabel = timeText.isEmpty ? location.shortName : '${location.shortName}, $timeText';
+
+    return Semantics(
+      container: true,
+      button: true,
+      excludeSemantics: true,
+      label: semanticsLabel,
       onTap: () => MapsUtil.launchMap(location.latitude, location.longitude),
-      child: IntrinsicHeight(
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            // Timeline line and dot
-            SizedBox(
-              width: 40,
-              child: Column(
-                children: [
-                  // Top line (hidden for first item)
-                  Container(
-                    width: 2,
-                    height: 12,
-                    color: isFirst ? Colors.transparent : Colors.deepPurple.withValues(alpha: 0.4),
-                  ),
-                  // Dot
-                  Container(
-                    width: 14,
-                    height: 14,
-                    decoration: BoxDecoration(
-                      color: Colors.deepPurple,
-                      shape: BoxShape.circle,
-                      border: Border.all(color: const Color(0xFF0A0A0A), width: 2),
-                      boxShadow: [
-                        BoxShadow(color: Colors.deepPurple.withValues(alpha: 0.4), blurRadius: 6, spreadRadius: 1),
-                      ],
-                    ),
-                  ),
-                  // Bottom line (hidden for last item)
-                  Expanded(
-                    child: Container(
-                      width: 2,
-                      color: isLast ? Colors.transparent : Colors.deepPurple.withValues(alpha: 0.4),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            // Content
-            Expanded(
-              child: Container(
-                margin: const EdgeInsets.only(bottom: 12),
-                padding: const EdgeInsets.fromLTRB(18, 14, 18, 14),
-                decoration: BoxDecoration(color: const Color(0xFF1A1A1F), borderRadius: BorderRadius.circular(20)),
-                child: Row(
+      child: GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        onTap: () => MapsUtil.launchMap(location.latitude, location.longitude),
+        child: Container(
+          key: ValueKey('daily_summary_location_row_$index'),
+          margin: const EdgeInsets.only(bottom: 6),
+          padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 4),
+          decoration: BoxDecoration(color: const Color(0xFF1A1A1F), borderRadius: BorderRadius.circular(16)),
+          child: Row(
+            children: [
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisSize: MainAxisSize.min,
                   children: [
-                    Expanded(
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        mainAxisSize: MainAxisSize.min,
+                    Text(
+                      location.shortName,
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 15,
+                        fontWeight: FontWeight.w600,
+                        height: 1.3,
+                      ),
+                    ),
+                    if (timeText.isNotEmpty) ...[
+                      const SizedBox(height: 2),
+                      Row(
                         children: [
-                          Text(
-                            location.shortName,
-                            style: const TextStyle(
-                              color: Colors.white,
-                              fontSize: 15,
-                              fontWeight: FontWeight.w600,
-                              height: 1.4,
-                            ),
-                          ),
-                          if (timeText.isNotEmpty) ...[
-                            const SizedBox(height: 4),
-                            Row(
-                              children: [
-                                FaIcon(FontAwesomeIcons.clock, color: Colors.grey.shade500, size: 12),
-                                const SizedBox(width: 4),
-                                Padding(
-                                  padding: const EdgeInsets.only(top: 2),
-                                  child: Text(timeText, style: TextStyle(color: Colors.grey.shade500, fontSize: 13)),
-                                ),
-                              ],
-                            ),
-                          ],
+                          FaIcon(FontAwesomeIcons.clock, color: Colors.grey.shade500, size: 12),
+                          const SizedBox(width: 4),
+                          Text(timeText, style: TextStyle(color: Colors.grey.shade500, fontSize: 13)),
                         ],
                       ),
-                    ),
-                    Icon(Icons.chevron_right, color: Colors.grey.shade600, size: 20),
+                    ],
                   ],
                 ),
               ),
-            ),
-          ],
+              Icon(Icons.chevron_right, color: Colors.grey.shade600, size: 20),
+            ],
+          ),
         ),
       ),
     );
diff --git a/app/lib/widgets/bottom_nav_bar.dart b/app/lib/widgets/bottom_nav_bar.dart
index b11fee215e8..77c3c10da91 100644
--- a/app/lib/widgets/bottom_nav_bar.dart
+++ b/app/lib/widgets/bottom_nav_bar.dart
@@ -8,9 +8,10 @@ import 'package:provider/provider.dart';
 import 'package:omi/providers/home_provider.dart';
 
 class BottomNavBar extends StatefulWidget {
-  const BottomNavBar({super.key, required this.onTabTap});
+  const BottomNavBar({super.key, required this.onTabTap, this.onTabWarmup});
 
   final void Function(int index, bool isRepeat) onTabTap;
+  final ValueChanged<int>? onTabWarmup;
 
   @override
   State<BottomNavBar> createState() => _BottomNavBarState();
@@ -61,11 +62,17 @@ class _BottomNavBarState extends State<BottomNavBar> {
   Widget _buildTab(BuildContext context, int selectedIndex, int index, FaIconData icon, String label) {
     return Expanded(
       child: InkWell(
+        onTapDown: (_) => widget.onTabWarmup?.call(index),
         onTap: () {
-          HapticFeedback.mediumImpact();
-          PlatformManager.instance.analytics.bottomNavigationTabClicked(label);
-          primaryFocus?.unfocus();
+          // Switch the visible page before crossing the platform channel for
+          // haptics or analytics. Both can be delayed when the device is busy,
+          // but neither should delay visual acknowledgement of the tap.
           widget.onTabTap(index, context.read<HomeProvider>().selectedIndex == index);
+          primaryFocus?.unfocus();
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            HapticFeedback.selectionClick();
+            PlatformManager.instance.analytics.bottomNavigationTabClicked(label);
+          });
         },
         child: SizedBox(
           height: 90,
diff --git a/app/test/widgets/bottom_nav_bar_test.dart b/app/test/widgets/bottom_nav_bar_test.dart
index c3156015117..3dee4d1a0ad 100644
--- a/app/test/widgets/bottom_nav_bar_test.dart
+++ b/app/test/widgets/bottom_nav_bar_test.dart
@@ -29,12 +29,14 @@ void main() {
     addTearDown(provider.dispose);
 
     final taps = <(int, bool)>[];
+    final warmups = <int>[];
     await tester.pumpWidget(
       ChangeNotifierProvider<HomeProvider>.value(
         value: provider,
         child: MaterialApp(
           home: Scaffold(
             body: BottomNavBar(
+              onTabWarmup: warmups.add,
               onTabTap: (index, isRepeat) {
                 taps.add((index, isRepeat));
                 provider.setIndex(index);
@@ -61,6 +63,7 @@ void main() {
     await tester.tap(_findIcon(FontAwesomeIcons.listCheck));
 
     expect(taps, [(2, false), (2, true)]);
+    expect(warmups, [2, 2]);
   });
 }
 
diff --git a/app/test/widgets/conversation_list_item_performance_test.dart b/app/test/widgets/conversation_list_item_performance_test.dart
new file mode 100644
index 00000000000..c798c1d95fe
--- /dev/null
+++ b/app/test/widgets/conversation_list_item_performance_test.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:omi/backend/preferences.dart';
+import 'package:omi/backend/schema/conversation.dart';
+import 'package:omi/backend/schema/structured.dart';
+import 'package:omi/l10n/app_localizations.dart';
+import 'package:omi/pages/conversations/widgets/conversation_list_item.dart';
+import 'package:omi/providers/conversation_provider.dart';
+
+void main() {
+  setUp(() async {
+    SharedPreferences.setMockInitialValues({});
+    await SharedPreferencesUtil.init();
+  });
+
+  testWidgets('conversation rows are isolated behind a repaint boundary', (tester) async {
+    final conversation = ServerConversation(
+      id: 'c1',
+      createdAt: DateTime.utc(2020),
+      structured: Structured('A conversation', 'Overview'),
+    );
+    final provider = ConversationProvider(
+      conversationListFetcher: () async => (items: <ServerConversation>[], ok: true),
+      isSignedIn: () => true,
+    )..conversations = [conversation];
+    addTearDown(provider.dispose);
+
+    await tester.pumpWidget(
+      ChangeNotifierProvider<ConversationProvider>.value(
+        value: provider,
+        child: MaterialApp(
+          localizationsDelegates: const [
+            AppLocalizations.delegate,
+            GlobalMaterialLocalizations.delegate,
+            GlobalWidgetsLocalizations.delegate,
+            GlobalCupertinoLocalizations.delegate,
+          ],
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: ConversationListItem(
+              conversation: conversation,
+              date: DateTime.utc(2020),
+              conversationIdx: 0,
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(
+      find.ancestor(of: find.byType(ConversationListItem), matching: find.byType(RepaintBoundary)),
+      findsAtLeastNWidgets(1),
+    );
+
+    provider.enterSelectionMode();
+    await tester.pump();
+    expect(find.byType(ConversationListItem), findsOneWidget);
+  });
+}
diff --git a/app/test/widgets/conversation_markdown_widget_test.dart b/app/test/widgets/conversation_markdown_widget_test.dart
new file mode 100644
index 00000000000..238ca116808
--- /dev/null
+++ b/app/test/widgets/conversation_markdown_widget_test.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:omi/pages/conversation_detail/widgets/conversation_markdown_widget.dart';
+
+void main() {
+  testWidgets('conversation markdown is lazy inside a sliver viewport', (tester) async {
+    final content = List.generate(200, (index) => 'Block $index').join('\n\n');
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: ThemeData.dark(),
+        home: Scaffold(
+          body: CustomScrollView(
+            slivers: [ConversationMarkdownSliver(content: content)],
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.byType(SingleChildScrollView), findsNothing);
+    expect(find.text('Block 199'), findsNothing);
+
+    await tester.fling(find.byType(CustomScrollView), const Offset(0, -100000), 10000);
+    await tester.pumpAndSettle();
+
+    expect(find.text('Block 199'), findsOneWidget);
+  });
+
+  testWidgets('conversation markdown preserves common block structures', (tester) async {
+    const content = '''# Heading
+
+- first item
+- second item
+
+> quoted text
+
+```dart
+final answer = 42;
+```
+''';
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: ThemeData.dark(),
+        home: const Scaffold(
+          body: CustomScrollView(
+            slivers: [ConversationMarkdownSliver(content: content)],
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('Heading'), findsOneWidget);
+    expect(find.text('first item'), findsOneWidget);
+    expect(find.text('second item'), findsOneWidget);
+    expect(find.text('quoted text'), findsOneWidget);
+    expect(find.text('final answer = 42;'), findsOneWidget);
+  });
+}
diff --git a/app/test/widgets/daily_summary_detail_page_test.dart b/app/test/widgets/daily_summary_detail_page_test.dart
new file mode 100644
index 00000000000..f302909c16e
--- /dev/null
+++ b/app/test/widgets/daily_summary_detail_page_test.dart
@@ -0,0 +1,74 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:flutter_map/flutter_map.dart';
+
+import 'package:omi/backend/schema/daily_summary.dart';
+import 'package:omi/l10n/app_localizations.dart';
+import 'package:omi/pages/settings/daily_summary_detail_page.dart';
+
+void main() {
+  testWidgets('renders journey locations as compact accessible map rows', (tester) async {
+    final semantics = tester.ensureSemantics();
+
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        theme: ThemeData.dark(),
+        home: DailySummaryDetailPage(
+          summaryId: 'summary-1',
+          summary: _summary(),
+          tileProvider: _MemoryTileProvider(),
+        ),
+      ),
+    );
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 900));
+
+    final firstRow = find.byKey(const ValueKey('daily_summary_location_row_0'));
+    final secondRow = find.byKey(const ValueKey('daily_summary_location_row_1'));
+    final contentWidth = tester.getSize(find.byType(Scaffold)).width - 40;
+
+    expect(firstRow, findsOneWidget);
+    expect(secondRow, findsOneWidget);
+    expect(tester.getSize(firstRow).width, contentWidth);
+    expect(tester.getSize(firstRow).height, lessThan(60));
+    expect(find.text('Home'), findsOneWidget);
+    expect(find.text('Office'), findsOneWidget);
+
+    final rowSemantics = tester.widget<Semantics>(
+      find.ancestor(of: firstRow, matching: find.byType(Semantics)).first,
+    );
+    expect(rowSemantics.properties.label, 'Home, 8AM');
+    expect(rowSemantics.properties.button, isTrue);
+    expect(rowSemantics.properties.onTap, isNotNull);
+    semantics.dispose();
+  });
+}
+
+DailySummary _summary() {
+  return DailySummary(
+    id: 'summary-1',
+    date: '2026-07-15',
+    createdAt: DateTime(2026, 7, 16),
+    headline: 'A day around the city',
+    overview: 'A productive day.',
+    stats: DayStats(totalConversations: 1, totalDurationMinutes: 30),
+    locations: [
+      LocationPin(latitude: 37.7749, longitude: -122.4194, address: 'Home, San Francisco', time: '08:00'),
+      LocationPin(latitude: 37.7849, longitude: -122.4094, address: 'Office, San Francisco', time: '10:00'),
+    ],
+  );
+}
+
+class _MemoryTileProvider extends TileProvider {
+  static final _tile = MemoryImage(
+    base64Decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII='),
+  );
+
+  @override
+  ImageProvider getImage(TileCoordinates coordinates, TileLayer options) => _tile;
+}
diff --git a/app/test/widgets/goals_widget_performance_test.dart b/app/test/widgets/goals_widget_performance_test.dart
new file mode 100644
index 00000000000..5af63e51be2
--- /dev/null
+++ b/app/test/widgets/goals_widget_performance_test.dart
@@ -0,0 +1,22 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:omi/pages/conversations/widgets/goals_widget.dart';
+
+void main() {
+  test('large goal targets do not create unbounded slider divisions', () {
+    expect(goalSliderDivisions(1000000000), isNull);
+    expect(goalSliderDivisions(double.infinity), isNull);
+  });
+
+  test('small integral goals retain one-step slider divisions', () {
+    expect(goalSliderDivisions(1), 1);
+    expect(goalSliderDivisions(20), 20);
+    expect(goalSliderDivisions(100), 100);
+  });
+
+  test('fractional and invalid targets use a continuous slider', () {
+    expect(goalSliderDivisions(2.5), isNull);
+    expect(goalSliderDivisions(0), isNull);
+    expect(goalSliderDivisions(-1), isNull);
+  });
+}
diff --git a/app/test/widgets/home_conversations_preview_test.dart b/app/test/widgets/home_conversations_preview_test.dart
new file mode 100644
index 00000000000..90a3b8309d7
--- /dev/null
+++ b/app/test/widgets/home_conversations_preview_test.dart
@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+
+import 'package:omi/backend/schema/conversation.dart';
+import 'package:omi/backend/schema/structured.dart';
+import 'package:omi/l10n/app_localizations.dart';
+import 'package:omi/pages/conversations/widgets/conversation_list_item.dart';
+import 'package:omi/pages/home/home_content.dart';
+import 'package:omi/providers/conversation_provider.dart';
+
+void main() {
+  testWidgets('home conversation preview shows the three newest filtered conversations', (tester) async {
+    final provider = ConversationProvider(isSignedIn: () => false);
+    addTearDown(provider.dispose);
+
+    final today = DateTime.now();
+    final yesterday = today.subtract(const Duration(days: 1));
+    final conversations = [
+      _conversation('newest', 'Newest', today),
+      _conversation('middle', 'Middle', today.subtract(const Duration(hours: 1))),
+      _conversation('yesterday', 'Yesterday', yesterday),
+      _conversation('older', 'Older', yesterday.subtract(const Duration(days: 1))),
+    ];
+    provider.conversations = conversations;
+    provider.groupedConversations = {
+      DateTime(yesterday.year, yesterday.month, yesterday.day): [conversations[2], conversations[3]],
+      DateTime(today.year, today.month, today.day): [conversations[0], conversations[1]],
+    };
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: ThemeData.dark(),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: ChangeNotifierProvider.value(
+          value: provider,
+          child: Scaffold(
+            body: CustomScrollView(
+              slivers: [HomeConversationsPreview(conversationProvider: provider)],
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+
+    expect(find.byType(ConversationListItem), findsNWidgets(3));
+    expect(find.text('Newest'), findsOneWidget);
+    expect(find.text('Middle'), findsOneWidget);
+    expect(find.text('Yesterday'), findsOneWidget);
+    expect(find.text('Older'), findsNothing);
+  });
+}
+
+ServerConversation _conversation(String id, String title, DateTime createdAt) {
+  return ServerConversation(
+    id: id,
+    createdAt: createdAt,
+    structured: Structured(title, 'Overview', emoji: '🧠'),
+  );
+}

From 2bed405453b9258187da897e1e8aa44507af35bb Mon Sep 17 00:00:00 2001
From: David Zhang <david.d.zhang@gmail.com>
Date: Tue, 11 Aug 2026 16:52:22 -0400
Subject: [PATCH 7/8] fix(mobile): restore production OAuth callback

Failure-Class: none
---
 app/ios/Flutter/prodRelease.xcconfig |  2 +-
 app/test/unit/env_test.dart          | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/ios/Flutter/prodRelease.xcconfig b/app/ios/Flutter/prodRelease.xcconfig
index 1d10004d943..3b7160c75c1 100644
--- a/app/ios/Flutter/prodRelease.xcconfig
+++ b/app/ios/Flutter/prodRelease.xcconfig
@@ -4,7 +4,7 @@
 #include "Custom.xcconfig"
 // Keep production Google sign-in deterministic even when Custom.xcconfig is
 // regenerated locally for a beta or developer build.
-GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.1031333818730-dusn243nct6i5rgfpfkj5mchuj1qnmde
+GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.208440318997-ukinsq3sijhcetkhr26ssqp1terbq7as
 
 ASSET_PREFIX=prod
 BUNDLE_NAME=Omi
diff --git a/app/test/unit/env_test.dart b/app/test/unit/env_test.dart
index 3b1d0001f01..179f8b73c63 100644
--- a/app/test/unit/env_test.dart
+++ b/app/test/unit/env_test.dart
@@ -97,6 +97,19 @@ void main() {
         AppEnvironmentProfile.localDev,
       );
     });
+
+    test('production iOS config keeps the production Google redirect client id', () {
+      final prodConfig = File('ios/Flutter/prodRelease.xcconfig').readAsStringSync();
+
+      expect(
+        prodConfig,
+        contains('GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.208440318997-ukinsq3sijhcetkhr26ssqp1terbq7as'),
+      );
+      expect(
+        prodConfig,
+        isNot(contains('GOOGLE_REVERSE_CLIENT_ID=com.googleusercontent.apps.1031333818730-')),
+      );
+    });
   });
 
   group('Env.apiBaseUrl', () {

From e7c2bc940e2f304887faa8e7d25abe111207aa45 Mon Sep 17 00:00:00 2001
From: David Zhang <david.d.zhang@gmail.com>
Date: Tue, 11 Aug 2026 17:23:17 -0400
Subject: [PATCH 8/8] test(desktop): isolate auth token defaults

---
 desktop/macos/Desktop/Tests/AuthTokenStorageTests.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/desktop/macos/Desktop/Tests/AuthTokenStorageTests.swift b/desktop/macos/Desktop/Tests/AuthTokenStorageTests.swift
index 8b1c6204bab..0c930aa7997 100644
--- a/desktop/macos/Desktop/Tests/AuthTokenStorageTests.swift
+++ b/desktop/macos/Desktop/Tests/AuthTokenStorageTests.swift
@@ -400,5 +400,9 @@ final class AuthTokenStorageTests: XCTestCase {
     UserDefaults.standard.removeObject(forKey: .authTokenExpiry)
     UserDefaults.standard.removeObject(forKey: .authTokenUserId)
     UserDefaults.standard.removeObject(forKey: .authUserId)
+    UserDefaults.standard.removeObject(forKey: .automationOwnerOverride)
+    UserDefaults.standard.removeObject(forKey: .automationOwnerABackup)
+    UserDefaults.standard.removeObject(forKey: .authIsSignedIn)
+    UserDefaults.standard.removeObject(forKey: .authUserEmail)
   }
 }