@@ -7,21 +7,33 @@ import { SafeAreaView } from "react-native-safe-area-context";
 import { colors, radii, spacing, typography } from "@/theme/tokens";
 
 type Props = { children: ReactNode };
-type State = { failed: boolean; recoveryFailed: boolean };
+type State = { failed: boolean; recoveryFailed: boolean; failureArea: string; errorKind: string };
+
+const SAFE_ERROR_KINDS = new Set(["Error", "TypeError", "ReferenceError", "SyntaxError", "RangeError", "URIError", "EvalError"]);
+const SAFE_COMPONENTS = ["AuthGatewayScreen", "IndexRoute", "AuthProvider", "ScreenCaptureProtection", "DeviceReauthenticationProvider", "AppPrivacyShield", "NotificationResponseProvider", "RootLayout"] as const;
+
+function safeErrorKind(error: Error) {
+  return SAFE_ERROR_KINDS.has(error.name) ? error.name : "UnknownError";
+}
+
+function safeFailureArea(componentStack: string | null | undefined) {
+  return SAFE_COMPONENTS.find((name) => componentStack?.includes(name)) ?? "OtherAppComponent";
+}
 
 export class AppRecoveryBoundary extends Component<Props, State> {
-  state: State = { failed: false, recoveryFailed: false };
+  state: State = { failed: false, recoveryFailed: false, failureArea: "", errorKind: "" };
 
-  static getDerivedStateFromError(): State {
-    return { failed: true, recoveryFailed: false };
+  static getDerivedStateFromError(error: Error): State {
+    return { failed: true, recoveryFailed: false, failureArea: "", errorKind: safeErrorKind(error) };
   }
 
-  componentDidCatch(_error: Error, _info: ErrorInfo) {
-    // Deliberately do not render, persist or transmit raw errors, stack traces,
-    // session material, identity facts or business data from this boundary.
+  componentDidCatch(_error: Error, info: ErrorInfo) {
+    // Show only allowlisted code component names and JavaScript error classes.
+    // Never render, persist or transmit raw errors, stack traces or user data.
+    this.setState({ failureArea: safeFailureArea(info.componentStack) });
   }
 
-  private retry = () => this.setState({ failed: false, recoveryFailed: false });
+  private retry = () => this.setState({ failed: false, recoveryFailed: false, failureArea: "", errorKind: "" });
 
   private reload = async () => {
     try {
@@ -44,7 +56,8 @@ export class AppRecoveryBoundary extends Component<Props, State> {
       <Pressable accessibilityLabel="Try this screen again" accessibilityRole="button" onPress={this.retry} style={styles.primary}><Text style={styles.primaryText}>Try again</Text></Pressable>
       <Pressable accessibilityLabel="Reload the 3Bigha app" accessibilityRole="button" onPress={() => void this.reload()} style={styles.secondary}><Text style={styles.secondaryText}>Reload app</Text></Pressable>
       {this.state.recoveryFailed ? <Text accessibilityLiveRegion="polite" style={styles.warning}>Automatic reload is unavailable. Close and reopen 3Bigha when convenient.</Text> : null}
-      <Text style={styles.meta}>Version {version} · {channel}</Text>
+      <Text style={styles.meta}>Build {Application.nativeBuildVersion || "unknown"} · Version {version} · {channel}</Text>
+      {this.state.failureArea ? <Text accessibilityLabel="Safe diagnostic details" style={styles.note}>Diagnostic: {this.state.failureArea} · {this.state.errorKind}</Text> : null}
       <Text style={styles.note}>No personal details, access tokens, raw error messages or stack traces are shown or stored here.</Text>
     </View></SafeAreaView>;
   }