From fb375ddf2439208ab88e9ceb37edd72b87f2a994 Mon Sep 17 00:00:00 2001
From: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr
 <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Date: Sat, 18 Jul 2026 19:50:09 -0700
Subject: [PATCH 1/6] feat(mobile): add consent-gated crash reporting

Co-authored-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Signed-off-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
---
 .../android/app/src/main/AndroidManifest.xml  |  14 +-
 mobile/ios/Podfile.lock                       |  20 ++
 .../lib/features/settings/settings_page.dart  |  41 +++
 mobile/lib/main.dart                          |  17 +-
 .../lib/shared/diagnostics/diagnostics.dart   |   3 +
 .../diagnostics/diagnostics_controller.dart   | 135 ++++++++++
 .../diagnostics/diagnostics_provider.dart     |   9 +
 .../lib/shared/diagnostics/sentry_config.dart |  85 ++++++
 mobile/pubspec.lock                           |  88 ++++++-
 mobile/pubspec.yaml                           |   9 +
 .../features/settings/settings_page_test.dart | 170 ++++++++++++
 .../diagnostics_controller_test.dart          | 245 ++++++++++++++++++
 .../diagnostics/sentry_config_test.dart       |  91 +++++++
 13 files changed, 912 insertions(+), 15 deletions(-)
 create mode 100644 mobile/lib/shared/diagnostics/diagnostics.dart
 create mode 100644 mobile/lib/shared/diagnostics/diagnostics_controller.dart
 create mode 100644 mobile/lib/shared/diagnostics/diagnostics_provider.dart
 create mode 100644 mobile/lib/shared/diagnostics/sentry_config.dart
 create mode 100644 mobile/test/features/settings/settings_page_test.dart
 create mode 100644 mobile/test/shared/diagnostics/diagnostics_controller_test.dart
 create mode 100644 mobile/test/shared/diagnostics/sentry_config_test.dart

diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index 93c3f12831..b81bf7f375 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <application
@@ -44,6 +45,17 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+        <!-- Sentry must not execute before Dart loads persisted diagnostics
+             consent and explicitly initializes the SDK. -->
+        <provider
+            android:name="io.sentry.android.core.SentryInitProvider"
+            tools:node="remove" />
+        <provider
+            android:name="io.sentry.android.core.SentryPerformanceProvider"
+            tools:node="remove" />
+        <provider
+            android:name="io.sentry.ndk.SentryNdkPreloadProvider"
+            tools:node="remove" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 22c2eb9ec7..28ed0a2366 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -1,6 +1,8 @@
 PODS:
   - app_badge_plus (1.2.10):
     - Flutter
+  - app_links (6.4.1):
+    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -14,6 +16,11 @@ PODS:
     - FlutterMacOS
   - package_info_plus (0.4.5):
     - Flutter
+  - Sentry/HybridSDK (8.58.3)
+  - sentry_flutter (9.24.0):
+    - Flutter
+    - FlutterMacOS
+    - Sentry/HybridSDK (= 8.58.3)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -25,19 +32,27 @@ PODS:
 
 DEPENDENCIES:
   - app_badge_plus (from `.symlinks/plugins/app_badge_plus/ios`)
+  - app_links (from `.symlinks/plugins/app_links/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
 
+SPEC REPOS:
+  trunk:
+    - Sentry
+
 EXTERNAL SOURCES:
   app_badge_plus:
     :path: ".symlinks/plugins/app_badge_plus/ios"
+  app_links:
+    :path: ".symlinks/plugins/app_links/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   Flutter:
@@ -50,6 +65,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/mobile_scanner/darwin"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
+  sentry_flutter:
+    :path: ".symlinks/plugins/sentry_flutter/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   url_launcher_ios:
@@ -59,12 +76,15 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   app_badge_plus: 09939f19a075cc742cc155d8ed85e6d8601f0104
+  app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
   image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
   mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  Sentry: 108fdbb76299c4189af12246bf0308c09c278922
+  sentry_flutter: 8528594bf73819ef3f40c2e218e93554fc2719e6
   shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
   video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
diff --git a/mobile/lib/features/settings/settings_page.dart b/mobile/lib/features/settings/settings_page.dart
index 214360f9eb..c3738d332b 100644
--- a/mobile/lib/features/settings/settings_page.dart
+++ b/mobile/lib/features/settings/settings_page.dart
@@ -7,6 +7,7 @@ import 'package:package_info_plus/package_info_plus.dart';
 
 import '../../shared/auth/auth.dart';
 import '../../shared/clipboard_utils.dart';
+import '../../shared/diagnostics/diagnostics.dart';
 import '../../shared/relay/relay.dart';
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/app_list.dart';
@@ -27,6 +28,7 @@ class SettingsPage extends HookConsumerWidget {
     final selectedAccent = ref.watch(accentProvider);
     final selectedScheme = ref.watch(schemeProvider);
     final colorScheme = context.colors;
+    final diagnostics = ref.watch(diagnosticsControllerProvider);
     final packageInfoFuture = useMemoized(() => PackageInfo.fromPlatform());
     final packageInfo = useFuture(packageInfoFuture);
 
@@ -106,6 +108,45 @@ class SettingsPage extends HookConsumerWidget {
                   ],
                 ),
 
+                // Diagnostics
+                AppListSection(
+                  label: 'Diagnostics',
+                  children: [
+                    AppListRow(
+                      icon: LucideIcons.activity,
+                      title: 'Share Crash Reports',
+                      subtitle: diagnostics.isConfigured
+                          ? 'Send crash details to help improve Buzz. Reports '
+                                'exclude message text, screenshots, and personal '
+                                'information.'
+                          : 'Crash reporting is unavailable in this build.',
+                      subtitleMaxLines: 4,
+                      trailing: Switch.adaptive(
+                        value: diagnostics.consentGranted,
+                        onChanged:
+                            diagnostics.isConfigured ||
+                                diagnostics.consentGranted
+                            ? (value) async {
+                                final messenger = ScaffoldMessenger.of(context);
+                                try {
+                                  await diagnostics.setConsent(value);
+                                } on Object catch (error) {
+                                  messenger.showSnackBar(
+                                    SnackBar(
+                                      content: Text(
+                                        'Could not update crash reporting: '
+                                        '$error',
+                                      ),
+                                    ),
+                                  );
+                                }
+                              }
+                            : null,
+                      ),
+                    ),
+                  ],
+                ),
+
                 // Connection
                 AppListSection(
                   label: 'Connection',
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 833d48b207..25bfc3e8c6 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -3,17 +3,30 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'app.dart';
+import 'shared/diagnostics/diagnostics.dart';
 import 'shared/theme/theme_provider.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  // Pre-load preferences so the first frame uses the saved theme/accent.
+  // Pre-load preferences so startup can apply saved diagnostics consent and
+  // the first frame uses the saved theme/accent.
   final prefs = await SharedPreferences.getInstance();
+  final diagnosticsController = DiagnosticsController(
+    preferences: prefs,
+    config: const SentryConfig.fromEnvironment(),
+    crashReporter: const SentryCrashReporter(),
+  );
+  await diagnosticsController.applyStartupConsent();
 
   runApp(
     ProviderScope(
-      overrides: [savedPrefsProvider.overrideWithValue(prefs)],
+      overrides: [
+        savedPrefsProvider.overrideWithValue(prefs),
+        diagnosticsControllerProvider.overrideWith(
+          (_) => diagnosticsController,
+        ),
+      ],
       child: const App(),
     ),
   );
diff --git a/mobile/lib/shared/diagnostics/diagnostics.dart b/mobile/lib/shared/diagnostics/diagnostics.dart
new file mode 100644
index 0000000000..f1bee61c12
--- /dev/null
+++ b/mobile/lib/shared/diagnostics/diagnostics.dart
@@ -0,0 +1,3 @@
+export 'diagnostics_controller.dart';
+export 'diagnostics_provider.dart';
+export 'sentry_config.dart';
diff --git a/mobile/lib/shared/diagnostics/diagnostics_controller.dart b/mobile/lib/shared/diagnostics/diagnostics_controller.dart
new file mode 100644
index 0000000000..7ec5614853
--- /dev/null
+++ b/mobile/lib/shared/diagnostics/diagnostics_controller.dart
@@ -0,0 +1,135 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'sentry_config.dart';
+
+const diagnosticsConsentPreferenceKey = 'buzz_crash_reporting_consent';
+
+typedef DiagnosticsLog = void Function(String message);
+
+abstract interface class CrashReporter {
+  Future<void> initialize(SentryConfig config);
+  Future<void> close();
+}
+
+class SentryCrashReporter implements CrashReporter {
+  const SentryCrashReporter();
+
+  @override
+  Future<void> initialize(SentryConfig config) {
+    return SentryFlutter.init(config.applyTo);
+  }
+
+  @override
+  Future<void> close() => Sentry.close();
+}
+
+class DiagnosticsController extends ChangeNotifier {
+  DiagnosticsController({
+    required SharedPreferences preferences,
+    required SentryConfig config,
+    required CrashReporter crashReporter,
+    DiagnosticsLog? log,
+  }) : _preferences = preferences,
+       _config = config,
+       _crashReporter = crashReporter,
+       _log = log ?? debugPrint,
+       _consentGranted =
+           preferences.getBool(diagnosticsConsentPreferenceKey) ?? false;
+
+  final SharedPreferences _preferences;
+  final SentryConfig _config;
+  final CrashReporter _crashReporter;
+  final DiagnosticsLog _log;
+
+  bool _consentGranted;
+  bool _initialized = false;
+  Future<void> _pendingOperation = Future.value();
+
+  bool get consentGranted => _consentGranted;
+  bool get isConfigured => _config.isConfigured;
+
+  /// Applies persisted consent before the app starts rendering.
+  Future<void> applyStartupConsent() => _serialize(_applyCurrentConsent);
+
+  /// Persists consent and applies it immediately.
+  Future<void> setConsent(bool granted) {
+    return _serialize(() async {
+      if (_consentGranted == granted) {
+        return;
+      }
+
+      if (granted && !_config.isConfigured) {
+        _log(
+          'Diagnostics unchanged: SENTRY_DSN is empty; consent not enabled.',
+        );
+        throw StateError('Crash reporting is unavailable in this build');
+      }
+
+      final previousConsent = _consentGranted;
+      _consentGranted = granted;
+      notifyListeners();
+      try {
+        final persisted = await _preferences.setBool(
+          diagnosticsConsentPreferenceKey,
+          granted,
+        );
+        if (!persisted) {
+          throw StateError('Failed to persist diagnostics consent');
+        }
+        await _applyCurrentConsent();
+      } on Object {
+        _consentGranted = previousConsent;
+        final rolledBack = await _preferences.setBool(
+          diagnosticsConsentPreferenceKey,
+          previousConsent,
+        );
+        notifyListeners();
+        if (!rolledBack) {
+          throw StateError('Failed to roll back diagnostics consent');
+        }
+        rethrow;
+      }
+    });
+  }
+
+  Future<void> _applyCurrentConsent() async {
+    if (!_consentGranted) {
+      if (_initialized) {
+        await _crashReporter.close();
+        _initialized = false;
+        _log('Diagnostics disabled: user consent is off; Sentry closed.');
+      } else {
+        _log(
+          'Diagnostics disabled: user consent is off; Sentry not initialized.',
+        );
+      }
+      return;
+    }
+
+    if (!_config.isConfigured) {
+      _log(
+        'Diagnostics disabled: SENTRY_DSN is empty; Sentry not initialized.',
+      );
+      return;
+    }
+
+    if (_initialized) {
+      _log('Diagnostics already enabled: Sentry initialization skipped.');
+      return;
+    }
+
+    await _crashReporter.initialize(_config);
+    _initialized = true;
+    _log('Diagnostics enabled: Sentry initialized after user consent.');
+  }
+
+  Future<void> _serialize(Future<void> Function() operation) {
+    final result = _pendingOperation.then((_) => operation());
+    _pendingOperation = result.catchError((Object _) {});
+    return result;
+  }
+}
diff --git a/mobile/lib/shared/diagnostics/diagnostics_provider.dart b/mobile/lib/shared/diagnostics/diagnostics_provider.dart
new file mode 100644
index 0000000000..757389cbda
--- /dev/null
+++ b/mobile/lib/shared/diagnostics/diagnostics_provider.dart
@@ -0,0 +1,9 @@
+import 'package:hooks_riverpod/legacy.dart';
+
+import 'diagnostics_controller.dart';
+
+/// Created during startup and overridden in main.dart.
+final diagnosticsControllerProvider =
+    ChangeNotifierProvider<DiagnosticsController>(
+      (_) => throw UnimplementedError('Must be overridden'),
+    );
diff --git a/mobile/lib/shared/diagnostics/sentry_config.dart b/mobile/lib/shared/diagnostics/sentry_config.dart
new file mode 100644
index 0000000000..e030ddabc6
--- /dev/null
+++ b/mobile/lib/shared/diagnostics/sentry_config.dart
@@ -0,0 +1,85 @@
+// Sentry marks these stable configuration fields as experimental.
+// ignore_for_file: experimental_member_use
+
+import 'package:sentry_flutter/sentry_flutter.dart';
+
+/// Compile-time Sentry settings injected only by official release builds.
+class SentryConfig {
+  const SentryConfig({
+    required this.dsn,
+    required this.release,
+    required this.dist,
+    required this.environment,
+  });
+
+  const SentryConfig.fromEnvironment()
+    : dsn = const String.fromEnvironment('SENTRY_DSN'),
+      release = const String.fromEnvironment('SENTRY_RELEASE'),
+      dist = const String.fromEnvironment('SENTRY_DIST'),
+      environment = const String.fromEnvironment('SENTRY_ENVIRONMENT');
+
+  final String dsn;
+  final String release;
+  final String dist;
+  final String environment;
+
+  bool get isConfigured => dsn.trim().isNotEmpty;
+
+  void applyTo(SentryFlutterOptions options) {
+    final trimmedDsn = dsn.trim();
+    final trimmedRelease = release.trim();
+    final trimmedDist = dist.trim();
+    final trimmedEnvironment = environment.trim();
+
+    options
+      ..dsn = trimmedDsn
+      ..sendDefaultPii = false
+      ..attachScreenshot = false
+      ..attachViewHierarchy = false
+      ..reportViewHierarchyIdentifiers = false
+      ..enableAutoSessionTracking = false
+      ..enableWatchdogTerminationTracking = false
+      ..enableAppHangTracking = false
+      ..anrEnabled = false
+      ..enableTombstone = false
+      ..enableNdkScopeSync = false
+      ..enableLogs = false
+      ..enableMetrics = false
+      ..reportPackages = false
+      ..sendClientReports = false
+      ..maxBreadcrumbs = 0
+      ..tracesSampleRate = 0
+      ..profilesSampleRate = 0
+      ..enableAutoPerformanceTracing = false
+      ..enableUserInteractionTracing = false
+      ..enableUserInteractionBreadcrumbs = false
+      ..enableTimeToFullDisplayTracing = false
+      ..enableFramesTracking = false
+      ..enableNativeTraceSync = false
+      ..enablePrintBreadcrumbs = false
+      ..enableAutoNativeBreadcrumbs = false
+      ..enableAppLifecycleBreadcrumbs = false
+      ..enableWindowMetricBreadcrumbs = false
+      ..enableBrightnessChangeBreadcrumbs = false
+      ..enableTextScaleChangeBreadcrumbs = false
+      ..enableMemoryPressureBreadcrumbs = false
+      ..recordHttpBreadcrumbs = false
+      ..captureFailedRequests = false
+      ..captureNativeFailedRequests = false
+      ..maxRequestBodySize = MaxRequestBodySize.never
+      ..replay.sessionSampleRate = 0
+      ..replay.onErrorSampleRate = 0
+      ..privacy.maskAllText = true
+      ..privacy.maskAllImages = true;
+
+    if (trimmedRelease.isNotEmpty) {
+      options.release = trimmedRelease;
+    }
+    if (trimmedDist.isNotEmpty) {
+      options.dist = trimmedDist;
+    }
+    if (trimmedEnvironment.isNotEmpty) {
+      options.environment = trimmedEnvironment;
+    }
+  }
+}
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index dc062b8628..de2f67013c 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -41,6 +41,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.13.10"
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   app_badge_plus:
     dependency: "direct main"
     description:
@@ -504,6 +512,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
+  globbing:
+    dependency: transitive
+    description:
+      name: globbing
+      sha256: "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   gpt_markdown:
     dependency: "direct main"
     description:
@@ -640,6 +656,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.2"
+  injector:
+    dependency: transitive
+    description:
+      name: injector
+      sha256: ed389bed5b48a699d5b9561c985023d0d5cc88dd5ff2237aadcce5a5ab433e4e
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   intl:
     dependency: "direct main"
     description:
@@ -660,18 +684,10 @@ packages:
     dependency: transitive
     description:
       name: jni
-      sha256: c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f
+      sha256: d2c361082d554d4593c3012e26f6b188f902acd291330f13d6427641a92b3da1
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
-  jni_flutter:
-    dependency: transitive
-    description:
-      name: jni_flutter
-      sha256: "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
+    version: "0.14.2"
   json_annotation:
     dependency: transitive
     description:
@@ -876,10 +892,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd"
+      sha256: "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.2.23"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -952,6 +968,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.2"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      sha256: c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.5"
+  properties:
+    dependency: transitive
+    description:
+      name: properties
+      sha256: "333f427dd4ed07bdbe8c75b9ff864a1e70b5d7a8426a2e8bdd457b65ae5ac598"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
   provider:
     dependency: transitive
     description:
@@ -1016,6 +1048,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.8"
+  sentry:
+    dependency: transitive
+    description:
+      name: sentry
+      sha256: "09c573f98ff6c5e98d527f351f037eb8ea9ff684a6e9e84b2e91357144016254"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.24.0"
+  sentry_dart_plugin:
+    dependency: "direct dev"
+    description:
+      name: sentry_dart_plugin
+      sha256: da9c1d0b3c87a251bfc36301f16af090a88c2d59128fe9a6f908f5ac20340c97
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.0"
+  sentry_flutter:
+    dependency: "direct main"
+    description:
+      name: sentry_flutter
+      sha256: "4a04b7e1901b8128df783b6d36d48706b07b0cd055e621517c998de87f5dafb9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.24.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1173,6 +1229,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
+  system_info2:
+    dependency: transitive
+    description:
+      name: system_info2
+      sha256: b937736ecfa63c45b10dde1ceb6bb30e5c0c340e14c441df024150679d65ac43
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   term_glyph:
     dependency: transitive
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 99b63a3eaa..3ab2623b50 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -32,6 +32,7 @@ dependencies:
   app_badge_plus: ^1.2.10
   app_links: ^6.4.0
   scrollable_positioned_list: ^0.3.8
+  sentry_flutter: 9.24.0
 
 dev_dependencies:
   flutter_test:
@@ -40,6 +41,14 @@ dev_dependencies:
   custom_lint: ^0.8.0
   riverpod_lint: ^3.1.0
   mocktail: ^1.0.4
+  sentry_dart_plugin: 3.4.0
+
+# Symbol uploads are invoked explicitly by official release CI. Keep credentials
+# and project identifiers out of this file; the pipeline passes them at runtime.
+sentry:
+  upload_debug_symbols: true
+  upload_sources: false
+  commits: false
 
 flutter:
   uses-material-design: true
diff --git a/mobile/test/features/settings/settings_page_test.dart b/mobile/test/features/settings/settings_page_test.dart
new file mode 100644
index 0000000000..aeceebb138
--- /dev/null
+++ b/mobile/test/features/settings/settings_page_test.dart
@@ -0,0 +1,170 @@
+import 'package:buzz/features/settings/settings_page.dart';
+import 'package:buzz/shared/diagnostics/diagnostics.dart';
+import 'package:buzz/shared/relay/relay.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+void main() {
+  late SharedPreferences preferences;
+  late _RecordingCrashReporter reporter;
+
+  Future<DiagnosticsController> createController({
+    bool consent = false,
+    String dsn = 'https://public@example.invalid/1',
+  }) async {
+    SharedPreferences.setMockInitialValues({
+      diagnosticsConsentPreferenceKey: consent,
+    });
+    preferences = await SharedPreferences.getInstance();
+    reporter = _RecordingCrashReporter();
+    return DiagnosticsController(
+      preferences: preferences,
+      config: SentryConfig(
+        dsn: dsn,
+        release: 'buzz@1.2.3',
+        dist: '42',
+        environment: 'production',
+      ),
+      crashReporter: reporter,
+      log: (_) {},
+    );
+  }
+
+  Future<void> pumpSettings(
+    WidgetTester tester,
+    DiagnosticsController controller,
+  ) async {
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          diagnosticsControllerProvider.overrideWith((_) => controller),
+          savedPrefsProvider.overrideWithValue(preferences),
+          relayConfigProvider.overrideWith(() => _TestRelayConfigNotifier()),
+        ],
+        child: MaterialApp(theme: AppTheme.light(), home: const SettingsPage()),
+      ),
+    );
+    await tester.pump();
+  }
+
+  testWidgets('diagnostics switch enables crash reporting', (tester) async {
+    final controller = await createController();
+    await pumpSettings(tester, controller);
+
+    expect(find.text('DIAGNOSTICS'), findsOneWidget);
+    expect(find.text('Share Crash Reports'), findsOneWidget);
+    final toggle = tester.widget<Switch>(find.byType(Switch));
+    expect(toggle.value, isFalse);
+
+    await tester.tap(find.byType(Switch));
+    await tester.pumpAndSettle();
+
+    expect(tester.widget<Switch>(find.byType(Switch)).value, isTrue);
+    expect(controller.consentGranted, isTrue);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isTrue);
+    expect(reporter.initializeCalls, 1);
+  });
+
+  testWidgets('diagnostics switch disables and closes crash reporting', (
+    tester,
+  ) async {
+    final controller = await createController(consent: true);
+    await controller.applyStartupConsent();
+    await pumpSettings(tester, controller);
+
+    expect(tester.widget<Switch>(find.byType(Switch)).value, isTrue);
+
+    await tester.tap(find.byType(Switch));
+    await tester.pumpAndSettle();
+
+    expect(tester.widget<Switch>(find.byType(Switch)).value, isFalse);
+    expect(controller.consentGranted, isFalse);
+    expect(reporter.closeCalls, 1);
+  });
+
+  testWidgets('reports and rolls back an initialization failure', (
+    tester,
+  ) async {
+    final controller = await createController();
+    reporter.initializeError = StateError('init failed');
+    await pumpSettings(tester, controller);
+
+    await tester.tap(find.byType(Switch));
+    await tester.pumpAndSettle();
+
+    expect(
+      find.textContaining('Could not update crash reporting:'),
+      findsOneWidget,
+    );
+    expect(tester.widget<Switch>(find.byType(Switch)).value, isFalse);
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
+  });
+
+  testWidgets('existing consent remains visible in an unconfigured build', (
+    tester,
+  ) async {
+    final controller = await createController(consent: true, dsn: '');
+    await controller.applyStartupConsent();
+    await pumpSettings(tester, controller);
+
+    final toggle = tester.widget<Switch>(find.byType(Switch));
+    expect(toggle.value, isTrue);
+    expect(toggle.onChanged, isNotNull);
+
+    await tester.tap(find.byType(Switch));
+    await tester.pumpAndSettle();
+
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
+    expect(reporter.initializeCalls, 0);
+  });
+
+  testWidgets('diagnostics switch is disabled without a release DSN', (
+    tester,
+  ) async {
+    final controller = await createController(dsn: '');
+    await pumpSettings(tester, controller);
+
+    expect(
+      find.text('Crash reporting is unavailable in this build.'),
+      findsOneWidget,
+    );
+    expect(tester.widget<Switch>(find.byType(Switch)).onChanged, isNull);
+
+    await tester.tap(find.byType(Switch), warnIfMissed: false);
+    await tester.pumpAndSettle();
+
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
+    expect(reporter.initializeCalls, 0);
+  });
+}
+
+class _TestRelayConfigNotifier extends RelayConfigNotifier {
+  @override
+  RelayConfig build() =>
+      const RelayConfig(baseUrl: 'https://relay.example.invalid');
+}
+
+class _RecordingCrashReporter implements CrashReporter {
+  int initializeCalls = 0;
+  int closeCalls = 0;
+  Object? initializeError;
+
+  @override
+  Future<void> initialize(SentryConfig config) async {
+    initializeCalls += 1;
+    if (initializeError case final error?) {
+      throw error;
+    }
+  }
+
+  @override
+  Future<void> close() async {
+    closeCalls += 1;
+  }
+}
diff --git a/mobile/test/shared/diagnostics/diagnostics_controller_test.dart b/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
new file mode 100644
index 0000000000..e9c7d227d6
--- /dev/null
+++ b/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
@@ -0,0 +1,245 @@
+import 'dart:async';
+
+import 'package:buzz/shared/diagnostics/diagnostics.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+void main() {
+  late SharedPreferences preferences;
+  late _RecordingCrashReporter reporter;
+  late List<String> logs;
+
+  Future<DiagnosticsController> createController({
+    Map<String, Object> storedValues = const {},
+    String dsn = 'https://public@example.invalid/1',
+  }) async {
+    SharedPreferences.setMockInitialValues(storedValues);
+    preferences = await SharedPreferences.getInstance();
+    reporter = _RecordingCrashReporter();
+    logs = [];
+    return DiagnosticsController(
+      preferences: preferences,
+      config: SentryConfig(
+        dsn: dsn,
+        release: 'buzz@1.2.3',
+        dist: '42',
+        environment: 'production',
+      ),
+      crashReporter: reporter,
+      log: logs.add,
+    );
+  }
+
+  test(
+    'defaults consent to false and does not initialize at startup',
+    () async {
+      final controller = await createController();
+
+      await controller.applyStartupConsent();
+
+      expect(controller.consentGranted, isFalse);
+      expect(reporter.initializeCalls, 0);
+      expect(reporter.closeCalls, 0);
+      expect(
+        logs,
+        contains(
+          'Diagnostics disabled: user consent is off; Sentry not initialized.',
+        ),
+      );
+    },
+  );
+
+  test('empty DSN prevents initialization even with stored consent', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: true},
+      dsn: '   ',
+    );
+
+    await controller.applyStartupConsent();
+
+    expect(controller.consentGranted, isTrue);
+    expect(controller.isConfigured, isFalse);
+    expect(reporter.initializeCalls, 0);
+    expect(
+      logs,
+      contains(
+        'Diagnostics disabled: SENTRY_DSN is empty; Sentry not initialized.',
+      ),
+    );
+  });
+
+  test('cannot enable consent in an unconfigured build', () async {
+    final controller = await createController(dsn: '   ');
+
+    await expectLater(controller.setConsent(true), throwsA(isA<StateError>()));
+
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isNull);
+    expect(reporter.initializeCalls, 0);
+    expect(
+      logs,
+      contains(
+        'Diagnostics unchanged: SENTRY_DSN is empty; consent not enabled.',
+      ),
+    );
+  });
+
+  test('stored consent initializes once at startup', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: true},
+    );
+
+    await controller.applyStartupConsent();
+    await controller.applyStartupConsent();
+
+    expect(reporter.initializeCalls, 1);
+    expect(reporter.config?.release, 'buzz@1.2.3');
+    expect(reporter.config?.dist, '42');
+    expect(
+      logs,
+      contains('Diagnostics already enabled: Sentry initialization skipped.'),
+    );
+  });
+
+  test('enabling persists consent and initializes immediately', () async {
+    final controller = await createController();
+
+    await controller.setConsent(true);
+
+    expect(controller.consentGranted, isTrue);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isTrue);
+    expect(reporter.initializeCalls, 1);
+    expect(
+      logs,
+      contains('Diagnostics enabled: Sentry initialized after user consent.'),
+    );
+  });
+
+  test('disabling persists consent and closes immediately', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: true},
+    );
+    await controller.applyStartupConsent();
+
+    await controller.setConsent(false);
+
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
+    expect(reporter.closeCalls, 1);
+    expect(
+      logs,
+      contains('Diagnostics disabled: user consent is off; Sentry closed.'),
+    );
+  });
+
+  test('can reinitialize after disabling', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: true},
+    );
+    await controller.applyStartupConsent();
+
+    await controller.setConsent(false);
+    await controller.setConsent(true);
+
+    expect(reporter.initializeCalls, 2);
+    expect(reporter.closeCalls, 1);
+  });
+
+  test('serializes concurrent consent changes', () async {
+    final controller = await createController();
+    reporter.initializeGate = Completer<void>();
+
+    final enable = controller.setConsent(true);
+    await reporter.initializeStarted.future;
+    final disable = controller.setConsent(false);
+
+    expect(reporter.closeCalls, 0);
+    reporter.initializeGate!.complete();
+    await Future.wait([enable, disable]);
+
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
+    expect(reporter.initializeCalls, 1);
+    expect(reporter.closeCalls, 1);
+  });
+
+  test('initialization failure rolls back consent', () async {
+    final controller = await createController();
+    reporter.initializeError = StateError('init failed');
+
+    await expectLater(controller.setConsent(true), throwsA(isA<StateError>()));
+
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
+    expect(reporter.initializeCalls, 1);
+  });
+
+  test('close failure rolls back revocation', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: true},
+    );
+    await controller.applyStartupConsent();
+    reporter.closeError = StateError('close failed');
+
+    await expectLater(controller.setConsent(false), throwsA(isA<StateError>()));
+
+    expect(controller.consentGranted, isTrue);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isTrue);
+    expect(reporter.closeCalls, 1);
+  });
+
+  test('continues accepting changes after a failed operation', () async {
+    final controller = await createController();
+    reporter.initializeError = StateError('init failed');
+
+    await expectLater(controller.setConsent(true), throwsA(isA<StateError>()));
+    reporter.initializeError = null;
+    await controller.setConsent(true);
+
+    expect(controller.consentGranted, isTrue);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isTrue);
+    expect(reporter.initializeCalls, 2);
+  });
+
+  test('repeating the current value is idempotent', () async {
+    final controller = await createController();
+
+    await controller.setConsent(false);
+    await controller.setConsent(true);
+    await controller.setConsent(true);
+
+    expect(reporter.initializeCalls, 1);
+    expect(reporter.closeCalls, 0);
+  });
+}
+
+class _RecordingCrashReporter implements CrashReporter {
+  int initializeCalls = 0;
+  int closeCalls = 0;
+  Object? initializeError;
+  Object? closeError;
+  Completer<void>? initializeGate;
+  final initializeStarted = Completer<void>();
+  SentryConfig? config;
+
+  @override
+  Future<void> initialize(SentryConfig config) async {
+    initializeCalls += 1;
+    this.config = config;
+    if (!initializeStarted.isCompleted) {
+      initializeStarted.complete();
+    }
+    await initializeGate?.future;
+    if (initializeError case final error?) {
+      throw error;
+    }
+  }
+
+  @override
+  Future<void> close() async {
+    closeCalls += 1;
+    if (closeError case final error?) {
+      throw error;
+    }
+  }
+}
diff --git a/mobile/test/shared/diagnostics/sentry_config_test.dart b/mobile/test/shared/diagnostics/sentry_config_test.dart
new file mode 100644
index 0000000000..5ada69fcd3
--- /dev/null
+++ b/mobile/test/shared/diagnostics/sentry_config_test.dart
@@ -0,0 +1,91 @@
+// Sentry marks these stable configuration fields as experimental.
+// ignore_for_file: experimental_member_use
+
+import 'package:buzz/shared/diagnostics/diagnostics.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
+void main() {
+  test('empty DSN is not configured', () {
+    const config = SentryConfig(
+      dsn: '  ',
+      release: '',
+      dist: '',
+      environment: '',
+    );
+
+    expect(config.isConfigured, isFalse);
+  });
+
+  test('omits blank optional release metadata', () {
+    const config = SentryConfig(
+      dsn: 'https://public@example.invalid/1',
+      release: '  ',
+      dist: '',
+      environment: '\n',
+    );
+    final options = SentryFlutterOptions();
+
+    config.applyTo(options);
+
+    expect(options.release, isNull);
+    expect(options.dist, isNull);
+    expect(options.environment, isNull);
+  });
+
+  test('applies crash-only privacy configuration', () {
+    const config = SentryConfig(
+      dsn: ' https://public@example.invalid/1 ',
+      release: ' buzz@1.2.3 ',
+      dist: ' 42 ',
+      environment: ' production ',
+    );
+    final options = SentryFlutterOptions();
+
+    config.applyTo(options);
+
+    expect(options.dsn, 'https://public@example.invalid/1');
+    expect(options.release, 'buzz@1.2.3');
+    expect(options.dist, '42');
+    expect(options.environment, 'production');
+    expect(options.sendDefaultPii, isFalse);
+    expect(options.markAutomaticallyCollectedErrorsAsFatal, isTrue);
+    expect(options.attachScreenshot, isFalse);
+    expect(options.attachViewHierarchy, isFalse);
+    expect(options.reportViewHierarchyIdentifiers, isFalse);
+    expect(options.enableAutoSessionTracking, isFalse);
+    expect(options.enableWatchdogTerminationTracking, isFalse);
+    expect(options.enableAppHangTracking, isFalse);
+    expect(options.anrEnabled, isFalse);
+    expect(options.enableTombstone, isFalse);
+    expect(options.enableNdkScopeSync, isFalse);
+    expect(options.enableLogs, isFalse);
+    expect(options.enableMetrics, isFalse);
+    expect(options.reportPackages, isFalse);
+    expect(options.sendClientReports, isFalse);
+    expect(options.maxBreadcrumbs, 0);
+    expect(options.tracesSampleRate, 0);
+    expect(options.profilesSampleRate, 0);
+    expect(options.enableAutoPerformanceTracing, isFalse);
+    expect(options.enableUserInteractionTracing, isFalse);
+    expect(options.enableUserInteractionBreadcrumbs, isFalse);
+    expect(options.enableTimeToFullDisplayTracing, isFalse);
+    expect(options.enableFramesTracking, isFalse);
+    expect(options.enableNativeTraceSync, isFalse);
+    expect(options.enablePrintBreadcrumbs, isFalse);
+    expect(options.enableAutoNativeBreadcrumbs, isFalse);
+    expect(options.enableAppLifecycleBreadcrumbs, isFalse);
+    expect(options.enableWindowMetricBreadcrumbs, isFalse);
+    expect(options.enableBrightnessChangeBreadcrumbs, isFalse);
+    expect(options.enableTextScaleChangeBreadcrumbs, isFalse);
+    expect(options.enableMemoryPressureBreadcrumbs, isFalse);
+    expect(options.recordHttpBreadcrumbs, isFalse);
+    expect(options.captureFailedRequests, isFalse);
+    expect(options.captureNativeFailedRequests, isFalse);
+    expect(options.maxRequestBodySize, MaxRequestBodySize.never);
+    expect(options.replay.sessionSampleRate, 0);
+    expect(options.replay.onErrorSampleRate, 0);
+    expect(options.privacy.maskAllText, isTrue);
+    expect(options.privacy.maskAllImages, isTrue);
+  });
+}

From bdfc94b2178688d747b71659022a0508461040f2 Mon Sep 17 00:00:00 2001
From: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr
 <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Date: Sun, 19 Jul 2026 13:51:52 -0700
Subject: [PATCH 2/6] fix(mobile): keep startup independent of crash reporting

Co-authored-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Signed-off-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
---
 mobile/lib/main.dart       | 21 +++++++++++++++--
 mobile/pubspec.yaml        |  3 +++
 mobile/test/main_test.dart | 47 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 mobile/test/main_test.dart

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 25bfc3e8c6..014d7fcd05 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -6,7 +6,7 @@ import 'app.dart';
 import 'shared/diagnostics/diagnostics.dart';
 import 'shared/theme/theme_provider.dart';
 
-void main() async {
+Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
   // Pre-load preferences so startup can apply saved diagnostics consent and
@@ -17,7 +17,7 @@ void main() async {
     config: const SentryConfig.fromEnvironment(),
     crashReporter: const SentryCrashReporter(),
   );
-  await diagnosticsController.applyStartupConsent();
+  await applyStartupDiagnosticsConsent(diagnosticsController);
 
   runApp(
     ProviderScope(
@@ -31,3 +31,20 @@ void main() async {
     ),
   );
 }
+
+/// Applies diagnostics consent without allowing optional crash reporting to
+/// prevent the app from starting.
+@visibleForTesting
+Future<void> applyStartupDiagnosticsConsent(
+  DiagnosticsController diagnosticsController, {
+  DiagnosticsLog? log,
+}) async {
+  try {
+    await diagnosticsController.applyStartupConsent();
+  } on Object catch (error, stackTrace) {
+    (log ?? debugPrint)(
+      'Diagnostics startup failed; continuing without crash reporting: '
+      '$error\n$stackTrace',
+    );
+  }
+}
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 3ab2623b50..4d3bc9e4fa 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -32,6 +32,9 @@ dependencies:
   app_badge_plus: ^1.2.10
   app_links: ^6.4.0
   scrollable_positioned_list: ^0.3.8
+  # 9.24.0 still pins jni 0.14.2, so the resolver also selects the
+  # compatible path_provider_android 2.2.23 instead of the prior jni 1.0.0
+  # graph. Keep this exact pin until Sentry publishes a compatible release.
   sentry_flutter: 9.24.0
 
 dev_dependencies:
diff --git a/mobile/test/main_test.dart b/mobile/test/main_test.dart
new file mode 100644
index 0000000000..7ee5d8199f
--- /dev/null
+++ b/mobile/test/main_test.dart
@@ -0,0 +1,47 @@
+import 'package:buzz/main.dart' as app;
+import 'package:buzz/shared/diagnostics/diagnostics.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+void main() {
+  test('startup continues when crash reporting initialization fails', () async {
+    SharedPreferences.setMockInitialValues({
+      diagnosticsConsentPreferenceKey: true,
+    });
+    final preferences = await SharedPreferences.getInstance();
+    final logs = <String>[];
+    final controller = DiagnosticsController(
+      preferences: preferences,
+      config: const SentryConfig(
+        dsn: 'https://public@example.invalid/1',
+        release: 'buzz@1.2.3',
+        dist: '42',
+        environment: 'production',
+      ),
+      crashReporter: _FailingCrashReporter(),
+    );
+
+    await expectLater(
+      app.applyStartupDiagnosticsConsent(controller, log: logs.add),
+      completes,
+    );
+
+    expect(
+      logs.single,
+      contains(
+        'Diagnostics startup failed; continuing without crash reporting: '
+        'Bad state: init failed',
+      ),
+    );
+  });
+}
+
+class _FailingCrashReporter implements CrashReporter {
+  @override
+  Future<void> initialize(SentryConfig config) async {
+    throw StateError('init failed');
+  }
+
+  @override
+  Future<void> close() async {}
+}

From 63a93486292fbe5e9361ccf5d93cba791c1e08c2 Mon Sep 17 00:00:00 2001
From: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr
 <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Date: Sun, 19 Jul 2026 14:17:34 -0700
Subject: [PATCH 3/6] fix(mobile): preserve diagnostics revocation

Co-authored-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Signed-off-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
---
 mobile/lib/features/settings/settings_page.dart          | 4 ++--
 .../lib/shared/diagnostics/diagnostics_controller.dart   | 8 ++++++++
 mobile/test/features/settings/settings_page_test.dart    | 9 +++++++++
 .../shared/diagnostics/diagnostics_controller_test.dart  | 6 +++---
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/mobile/lib/features/settings/settings_page.dart b/mobile/lib/features/settings/settings_page.dart
index c3738d332b..8975633db7 100644
--- a/mobile/lib/features/settings/settings_page.dart
+++ b/mobile/lib/features/settings/settings_page.dart
@@ -117,8 +117,8 @@ class SettingsPage extends HookConsumerWidget {
                       title: 'Share Crash Reports',
                       subtitle: diagnostics.isConfigured
                           ? 'Send crash details to help improve Buzz. Reports '
-                                'exclude message text, screenshots, and personal '
-                                'information.'
+                                'do not include screenshots, view hierarchy, '
+                                'breadcrumbs, or performance traces.'
                           : 'Crash reporting is unavailable in this build.',
                       subtitleMaxLines: 4,
                       trailing: Switch.adaptive(
diff --git a/mobile/lib/shared/diagnostics/diagnostics_controller.dart b/mobile/lib/shared/diagnostics/diagnostics_controller.dart
index 7ec5614853..522a3d3dad 100644
--- a/mobile/lib/shared/diagnostics/diagnostics_controller.dart
+++ b/mobile/lib/shared/diagnostics/diagnostics_controller.dart
@@ -70,6 +70,7 @@ class DiagnosticsController extends ChangeNotifier {
       }
 
       final previousConsent = _consentGranted;
+      var consentPersisted = false;
       _consentGranted = granted;
       notifyListeners();
       try {
@@ -80,8 +81,15 @@ class DiagnosticsController extends ChangeNotifier {
         if (!persisted) {
           throw StateError('Failed to persist diagnostics consent');
         }
+        consentPersisted = true;
         await _applyCurrentConsent();
       } on Object {
+        // A persisted revocation must survive teardown failure. Otherwise the
+        // next launch could initialize crash reporting against the user's
+        // explicit choice.
+        if (!granted && consentPersisted) {
+          rethrow;
+        }
         _consentGranted = previousConsent;
         final rolledBack = await _preferences.setBool(
           diagnosticsConsentPreferenceKey,
diff --git a/mobile/test/features/settings/settings_page_test.dart b/mobile/test/features/settings/settings_page_test.dart
index aeceebb138..3d04a9d95d 100644
--- a/mobile/test/features/settings/settings_page_test.dart
+++ b/mobile/test/features/settings/settings_page_test.dart
@@ -56,6 +56,15 @@ void main() {
 
     expect(find.text('DIAGNOSTICS'), findsOneWidget);
     expect(find.text('Share Crash Reports'), findsOneWidget);
+    expect(
+      find.text(
+        'Send crash details to help improve Buzz. Reports do not include '
+        'screenshots, view hierarchy, breadcrumbs, or performance traces.',
+      ),
+      findsOneWidget,
+    );
+    expect(find.textContaining('personal information'), findsNothing);
+    expect(find.textContaining('message text'), findsNothing);
     final toggle = tester.widget<Switch>(find.byType(Switch));
     expect(toggle.value, isFalse);
 
diff --git a/mobile/test/shared/diagnostics/diagnostics_controller_test.dart b/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
index e9c7d227d6..09712430c3 100644
--- a/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
+++ b/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
@@ -174,7 +174,7 @@ void main() {
     expect(reporter.initializeCalls, 1);
   });
 
-  test('close failure rolls back revocation', () async {
+  test('close failure preserves persisted revocation', () async {
     final controller = await createController(
       storedValues: {diagnosticsConsentPreferenceKey: true},
     );
@@ -183,8 +183,8 @@ void main() {
 
     await expectLater(controller.setConsent(false), throwsA(isA<StateError>()));
 
-    expect(controller.consentGranted, isTrue);
-    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isTrue);
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
     expect(reporter.closeCalls, 1);
   });
 

From a072957adb6ffb4d3d55eebcd5ce646bd4bdd20b Mon Sep 17 00:00:00 2001
From: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr
 <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Date: Sun, 19 Jul 2026 16:50:28 -0700
Subject: [PATCH 4/6] feat(mobile): default crash reporting on

Co-authored-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Signed-off-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
---
 .../lib/features/settings/settings_page.dart  |  11 +-
 .../diagnostics/diagnostics_controller.dart   |   4 +-
 .../features/settings/settings_page_test.dart |  66 ++++++++---
 .../diagnostics_controller_test.dart          | 103 ++++++++++++------
 4 files changed, 126 insertions(+), 58 deletions(-)

diff --git a/mobile/lib/features/settings/settings_page.dart b/mobile/lib/features/settings/settings_page.dart
index 8975633db7..b70bf3142a 100644
--- a/mobile/lib/features/settings/settings_page.dart
+++ b/mobile/lib/features/settings/settings_page.dart
@@ -108,19 +108,16 @@ class SettingsPage extends HookConsumerWidget {
                   ],
                 ),
 
-                // Diagnostics
+                // Crash reporting
                 AppListSection(
-                  label: 'Diagnostics',
                   children: [
                     AppListRow(
                       icon: LucideIcons.activity,
-                      title: 'Share Crash Reports',
+                      title: 'Share crash reports',
                       subtitle: diagnostics.isConfigured
-                          ? 'Send crash details to help improve Buzz. Reports '
-                                'do not include screenshots, view hierarchy, '
-                                'breadcrumbs, or performance traces.'
+                          ? 'Sent anonymously to help fix problems.'
                           : 'Crash reporting is unavailable in this build.',
-                      subtitleMaxLines: 4,
+                      subtitleMaxLines: 2,
                       trailing: Switch.adaptive(
                         value: diagnostics.consentGranted,
                         onChanged:
diff --git a/mobile/lib/shared/diagnostics/diagnostics_controller.dart b/mobile/lib/shared/diagnostics/diagnostics_controller.dart
index 522a3d3dad..c7cddefdec 100644
--- a/mobile/lib/shared/diagnostics/diagnostics_controller.dart
+++ b/mobile/lib/shared/diagnostics/diagnostics_controller.dart
@@ -7,6 +7,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'sentry_config.dart';
 
 const diagnosticsConsentPreferenceKey = 'buzz_crash_reporting_consent';
+const _diagnosticsEnabledByDefault = true;
 
 typedef DiagnosticsLog = void Function(String message);
 
@@ -38,7 +39,8 @@ class DiagnosticsController extends ChangeNotifier {
        _crashReporter = crashReporter,
        _log = log ?? debugPrint,
        _consentGranted =
-           preferences.getBool(diagnosticsConsentPreferenceKey) ?? false;
+           preferences.getBool(diagnosticsConsentPreferenceKey) ??
+           _diagnosticsEnabledByDefault;
 
   final SharedPreferences _preferences;
   final SentryConfig _config;
diff --git a/mobile/test/features/settings/settings_page_test.dart b/mobile/test/features/settings/settings_page_test.dart
index 3d04a9d95d..89896ecc24 100644
--- a/mobile/test/features/settings/settings_page_test.dart
+++ b/mobile/test/features/settings/settings_page_test.dart
@@ -12,11 +12,11 @@ void main() {
   late _RecordingCrashReporter reporter;
 
   Future<DiagnosticsController> createController({
-    bool consent = false,
+    bool? consent,
     String dsn = 'https://public@example.invalid/1',
   }) async {
     SharedPreferences.setMockInitialValues({
-      diagnosticsConsentPreferenceKey: consent,
+      diagnosticsConsentPreferenceKey: ?consent,
     });
     preferences = await SharedPreferences.getInstance();
     reporter = _RecordingCrashReporter();
@@ -50,23 +50,30 @@ void main() {
     await tester.pump();
   }
 
-  testWidgets('diagnostics switch enables crash reporting', (tester) async {
+  testWidgets('diagnostics switch defaults on with approved copy', (
+    tester,
+  ) async {
     final controller = await createController();
+    await controller.applyStartupConsent();
     await pumpSettings(tester, controller);
 
-    expect(find.text('DIAGNOSTICS'), findsOneWidget);
-    expect(find.text('Share Crash Reports'), findsOneWidget);
-    expect(
-      find.text(
-        'Send crash details to help improve Buzz. Reports do not include '
-        'screenshots, view hierarchy, breadcrumbs, or performance traces.',
-      ),
-      findsOneWidget,
-    );
-    expect(find.textContaining('personal information'), findsNothing);
-    expect(find.textContaining('message text'), findsNothing);
+    expect(find.text('DIAGNOSTICS'), findsNothing);
+    expect(find.text('Share crash reports'), findsOneWidget);
+    expect(find.text('Sent anonymously to help fix problems.'), findsOneWidget);
+    expect(find.text('Share Crash Reports'), findsNothing);
     final toggle = tester.widget<Switch>(find.byType(Switch));
-    expect(toggle.value, isFalse);
+    expect(toggle.value, isTrue);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isNull);
+    expect(reporter.initializeCalls, 1);
+  });
+
+  testWidgets('explicit opt-in persists and initializes immediately', (
+    tester,
+  ) async {
+    final controller = await createController(consent: false);
+    await pumpSettings(tester, controller);
+
+    expect(tester.widget<Switch>(find.byType(Switch)).value, isFalse);
 
     await tester.tap(find.byType(Switch));
     await tester.pumpAndSettle();
@@ -91,13 +98,14 @@ void main() {
 
     expect(tester.widget<Switch>(find.byType(Switch)).value, isFalse);
     expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
     expect(reporter.closeCalls, 1);
   });
 
   testWidgets('reports and rolls back an initialization failure', (
     tester,
   ) async {
-    final controller = await createController();
+    final controller = await createController(consent: false);
     reporter.initializeError = StateError('init failed');
     await pumpSettings(tester, controller);
 
@@ -132,10 +140,34 @@ void main() {
     expect(reporter.initializeCalls, 0);
   });
 
-  testWidgets('diagnostics switch is disabled without a release DSN', (
+  testWidgets('default-on preference is visible without a release DSN', (
     tester,
   ) async {
     final controller = await createController(dsn: '');
+    await controller.applyStartupConsent();
+    await pumpSettings(tester, controller);
+
+    expect(
+      find.text('Crash reporting is unavailable in this build.'),
+      findsOneWidget,
+    );
+    final toggle = tester.widget<Switch>(find.byType(Switch));
+    expect(toggle.value, isTrue);
+    expect(toggle.onChanged, isNotNull);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isNull);
+    expect(reporter.initializeCalls, 0);
+
+    await tester.tap(find.byType(Switch));
+    await tester.pumpAndSettle();
+
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
+  });
+
+  testWidgets('explicit opt-out is disabled without a release DSN', (
+    tester,
+  ) async {
+    final controller = await createController(consent: false, dsn: '');
     await pumpSettings(tester, controller);
 
     expect(
diff --git a/mobile/test/shared/diagnostics/diagnostics_controller_test.dart b/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
index 09712430c3..ce8db62a08 100644
--- a/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
+++ b/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
@@ -30,30 +30,54 @@ void main() {
     );
   }
 
-  test(
-    'defaults consent to false and does not initialize at startup',
-    () async {
-      final controller = await createController();
-
-      await controller.applyStartupConsent();
-
-      expect(controller.consentGranted, isFalse);
-      expect(reporter.initializeCalls, 0);
-      expect(reporter.closeCalls, 0);
-      expect(
-        logs,
-        contains(
-          'Diagnostics disabled: user consent is off; Sentry not initialized.',
-        ),
-      );
-    },
-  );
-
-  test('empty DSN prevents initialization even with stored consent', () async {
+  test('missing preference defaults reporting on for first installs', () async {
+    final controller = await createController();
+
+    await controller.applyStartupConsent();
+
+    expect(controller.consentGranted, isTrue);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isNull);
+    expect(reporter.initializeCalls, 1);
+    expect(reporter.closeCalls, 0);
+    expect(
+      logs,
+      contains('Diagnostics enabled: Sentry initialized after user consent.'),
+    );
+  });
+
+  test('missing preference defaults reporting on after an upgrade', () async {
     final controller = await createController(
-      storedValues: {diagnosticsConsentPreferenceKey: true},
-      dsn: '   ',
+      storedValues: {'existing_preference_from_older_version': true},
+    );
+
+    await controller.applyStartupConsent();
+
+    expect(controller.consentGranted, isTrue);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isNull);
+    expect(reporter.initializeCalls, 1);
+  });
+
+  test('explicitly stored revocation remains off at startup', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: false},
+    );
+
+    await controller.applyStartupConsent();
+
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
+    expect(reporter.initializeCalls, 0);
+    expect(reporter.closeCalls, 0);
+    expect(
+      logs,
+      contains(
+        'Diagnostics disabled: user consent is off; Sentry not initialized.',
+      ),
     );
+  });
+
+  test('empty DSN prevents initialization with default-on reporting', () async {
+    final controller = await createController(dsn: '   ');
 
     await controller.applyStartupConsent();
 
@@ -68,13 +92,16 @@ void main() {
     );
   });
 
-  test('cannot enable consent in an unconfigured build', () async {
-    final controller = await createController(dsn: '   ');
+  test('cannot opt in to an unconfigured build after revocation', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: false},
+      dsn: '   ',
+    );
 
     await expectLater(controller.setConsent(true), throwsA(isA<StateError>()));
 
     expect(controller.consentGranted, isFalse);
-    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isNull);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
     expect(reporter.initializeCalls, 0);
     expect(
       logs,
@@ -101,8 +128,10 @@ void main() {
     );
   });
 
-  test('enabling persists consent and initializes immediately', () async {
-    final controller = await createController();
+  test('explicit opt-in persists and initializes immediately', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: false},
+    );
 
     await controller.setConsent(true);
 
@@ -146,7 +175,9 @@ void main() {
   });
 
   test('serializes concurrent consent changes', () async {
-    final controller = await createController();
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: false},
+    );
     reporter.initializeGate = Completer<void>();
 
     final enable = controller.setConsent(true);
@@ -163,8 +194,10 @@ void main() {
     expect(reporter.closeCalls, 1);
   });
 
-  test('initialization failure rolls back consent', () async {
-    final controller = await createController();
+  test('initialization failure preserves explicit revocation', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: false},
+    );
     reporter.initializeError = StateError('init failed');
 
     await expectLater(controller.setConsent(true), throwsA(isA<StateError>()));
@@ -189,7 +222,9 @@ void main() {
   });
 
   test('continues accepting changes after a failed operation', () async {
-    final controller = await createController();
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: false},
+    );
     reporter.initializeError = StateError('init failed');
 
     await expectLater(controller.setConsent(true), throwsA(isA<StateError>()));
@@ -201,8 +236,10 @@ void main() {
     expect(reporter.initializeCalls, 2);
   });
 
-  test('repeating the current value is idempotent', () async {
-    final controller = await createController();
+  test('repeating explicit values is idempotent', () async {
+    final controller = await createController(
+      storedValues: {diagnosticsConsentPreferenceKey: false},
+    );
 
     await controller.setConsent(false);
     await controller.setConsent(true);

From e73f3c2288cc958812e36a201dca0efbe9d2dcce Mon Sep 17 00:00:00 2001
From: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr
 <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Date: Sun, 19 Jul 2026 17:11:52 -0700
Subject: [PATCH 5/6] fix(mobile): retry diagnostics teardown

Co-authored-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Signed-off-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
---
 .../shared/diagnostics/diagnostics_controller.dart  |  6 ++++++
 .../diagnostics/diagnostics_controller_test.dart    | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/shared/diagnostics/diagnostics_controller.dart b/mobile/lib/shared/diagnostics/diagnostics_controller.dart
index c7cddefdec..5ac17e256a 100644
--- a/mobile/lib/shared/diagnostics/diagnostics_controller.dart
+++ b/mobile/lib/shared/diagnostics/diagnostics_controller.dart
@@ -61,6 +61,12 @@ class DiagnosticsController extends ChangeNotifier {
   Future<void> setConsent(bool granted) {
     return _serialize(() async {
       if (_consentGranted == granted) {
+        // A failed close keeps the runtime initialized even though the
+        // persisted preference and visible control are already off. Allow the
+        // same revocation to retry teardown until it succeeds.
+        if (!granted && _initialized) {
+          await _applyCurrentConsent();
+        }
         return;
       }
 
diff --git a/mobile/test/shared/diagnostics/diagnostics_controller_test.dart b/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
index ce8db62a08..a3f3540fae 100644
--- a/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
+++ b/mobile/test/shared/diagnostics/diagnostics_controller_test.dart
@@ -207,7 +207,7 @@ void main() {
     expect(reporter.initializeCalls, 1);
   });
 
-  test('close failure preserves persisted revocation', () async {
+  test('close failure preserves revocation and retries teardown', () async {
     final controller = await createController(
       storedValues: {diagnosticsConsentPreferenceKey: true},
     );
@@ -219,6 +219,17 @@ void main() {
     expect(controller.consentGranted, isFalse);
     expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
     expect(reporter.closeCalls, 1);
+
+    reporter.closeError = null;
+    await controller.setConsent(false);
+
+    expect(controller.consentGranted, isFalse);
+    expect(preferences.getBool(diagnosticsConsentPreferenceKey), isFalse);
+    expect(reporter.closeCalls, 2);
+    expect(
+      logs,
+      contains('Diagnostics disabled: user consent is off; Sentry closed.'),
+    );
   });
 
   test('continues accepting changes after a failed operation', () async {

From 60877ddc9abbc35b9e60e8adb7272c0168d205c4 Mon Sep 17 00:00:00 2001
From: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr
 <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Date: Sun, 19 Jul 2026 17:54:46 -0700
Subject: [PATCH 6/6] fix(mobile): restore diagnostics heading

Co-authored-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
Signed-off-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
---
 mobile/lib/features/settings/settings_page.dart       | 3 ++-
 mobile/test/features/settings/settings_page_test.dart | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/features/settings/settings_page.dart b/mobile/lib/features/settings/settings_page.dart
index b70bf3142a..260286f6df 100644
--- a/mobile/lib/features/settings/settings_page.dart
+++ b/mobile/lib/features/settings/settings_page.dart
@@ -108,8 +108,9 @@ class SettingsPage extends HookConsumerWidget {
                   ],
                 ),
 
-                // Crash reporting
+                // Diagnostics
                 AppListSection(
+                  label: 'Diagnostics',
                   children: [
                     AppListRow(
                       icon: LucideIcons.activity,
diff --git a/mobile/test/features/settings/settings_page_test.dart b/mobile/test/features/settings/settings_page_test.dart
index 89896ecc24..639956158e 100644
--- a/mobile/test/features/settings/settings_page_test.dart
+++ b/mobile/test/features/settings/settings_page_test.dart
@@ -57,7 +57,7 @@ void main() {
     await controller.applyStartupConsent();
     await pumpSettings(tester, controller);
 
-    expect(find.text('DIAGNOSTICS'), findsNothing);
+    expect(find.text('DIAGNOSTICS'), findsOneWidget);
     expect(find.text('Share crash reports'), findsOneWidget);
     expect(find.text('Sent anonymously to help fix problems.'), findsOneWidget);
     expect(find.text('Share Crash Reports'), findsNothing);