From 3df8fb85b2eb49551cde3f667af53b4fb0262bb4 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Tue, 9 Jun 2026 15:32:12 -0300
Subject: [PATCH 01/23] feat: install react-native-owl

---
 .github/workflows/visual-regression-ios.yml | 120 +++++++++++
 VISUAL_REGRESSION.md                        |  34 +++
 app/owls/OwlRoot.tsx                        |  76 +++++++
 app/owls/fixtures/SmokeFixture.tsx          | 169 +++++++++++++++
 app/owls/fixtures/index.tsx                 |  55 +++++
 index.js                                    |   8 +-
 ios/Podfile.lock                            | 228 ++++++++++----------
 owl.config.json                             |  15 ++
 package.json                                |   7 +
 pnpm-lock.yaml                              |  76 +++++++
 tests/owl/smoke.owl.tsx                     |  26 +++
 11 files changed, 699 insertions(+), 115 deletions(-)
 create mode 100644 .github/workflows/visual-regression-ios.yml
 create mode 100644 VISUAL_REGRESSION.md
 create mode 100644 app/owls/OwlRoot.tsx
 create mode 100644 app/owls/fixtures/SmokeFixture.tsx
 create mode 100644 app/owls/fixtures/index.tsx
 create mode 100644 owl.config.json
 create mode 100644 tests/owl/smoke.owl.tsx

diff --git a/.github/workflows/visual-regression-ios.yml b/.github/workflows/visual-regression-ios.yml
new file mode 100644
index 00000000000..bdb4aa0d3ee
--- /dev/null
+++ b/.github/workflows/visual-regression-ios.yml
@@ -0,0 +1,120 @@
+name: Visual Regression iOS
+
+on:
+  workflow_dispatch:
+    inputs:
+      update_baseline:
+        description: 'Generate fresh baseline images instead of comparing against committed ones'
+        required: false
+        type: boolean
+        default: false
+      test_path_pattern:
+        description: 'Optional Owl testPathPattern'
+        required: false
+        type: string
+      test_name_pattern:
+        description: 'Optional Owl testNamePattern'
+        required: false
+        type: string
+  pull_request:
+    paths:
+      - '.github/workflows/visual-regression-ios.yml'
+      - 'app/owls/**'
+      - 'tests/owl/**'
+      - '.owl/baseline/**'
+      - 'owl.config.json'
+      - 'index.js'
+      - 'package.json'
+      - 'pnpm-lock.yaml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  visual-regression-ios:
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    runs-on: macos-26
+    timeout-minutes: 60
+    env:
+      USE_OWL: true
+      RUNNING_E2E_TESTS: true
+      OWL_DEVICE: iPhone 16 Pro
+      UPDATE_BASELINE: ${{ github.event_name == 'workflow_dispatch' && inputs.update_baseline || 'false' }}
+      TEST_PATH_PATTERN: ${{ github.event_name == 'workflow_dispatch' && inputs.test_path_pattern || '' }}
+      TEST_NAME_PATTERN: ${{ github.event_name == 'workflow_dispatch' && inputs.test_name_pattern || '' }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      - name: Checkout and Setup Node
+        uses: ./.github/actions/setup-node
+
+      - name: Set up Xcode
+        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
+        with:
+          xcode-version: '26.2.0'
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
+        with:
+          ruby-version: 2.7.7
+          bundler-cache: true
+
+      - name: Cache CocoaPods and derived data
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        with:
+          path: |
+            ios/Pods
+            ~/Library/Caches/CocoaPods
+            ~/.cocoapods/repos
+            ~/Library/Developer/Xcode/DerivedData
+          key: visual-regression-ios-${{ runner.os }}-${{ hashFiles('ios/Podfile.lock', 'ios/Podfile') }}
+          restore-keys: |
+            visual-regression-ios-${{ runner.os }}-
+
+      - name: Install CocoaPods
+        run: pnpm pod-install
+
+      - name: Boot simulator
+        run: |
+          xcrun simctl boot "$OWL_DEVICE" || true
+          xcrun simctl bootstatus "$OWL_DEVICE" -b
+          xcrun simctl spawn booted defaults write -g UIAnimationDragCoefficient -float 10
+
+      - name: Require committed baselines for compare mode
+        if: env.UPDATE_BASELINE != 'true'
+        run: |
+          test -d .owl/baseline/ios
+          find .owl/baseline/ios -name '*.png' -print -quit | grep -q .
+
+      - name: Build Owl app
+        run: pnpm owl:build:ios
+
+      - name: Run Owl tests
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          args=()
+          if [[ -n "$TEST_PATH_PATTERN" ]]; then
+            args+=(--testPathPattern "$TEST_PATH_PATTERN")
+          fi
+          if [[ -n "$TEST_NAME_PATTERN" ]]; then
+            args+=(--testNamePattern "$TEST_NAME_PATTERN")
+          fi
+
+          if [[ "$UPDATE_BASELINE" == "true" ]]; then
+            pnpm owl:test:update:ios -- "${args[@]}"
+          else
+            pnpm owl:test:ios -- "${args[@]}"
+          fi
+
+      - name: Upload Owl artifacts
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: owl-ios-results
+          path: .owl
+          retention-days: 7
diff --git a/VISUAL_REGRESSION.md b/VISUAL_REGRESSION.md
new file mode 100644
index 00000000000..df9c340170f
--- /dev/null
+++ b/VISUAL_REGRESSION.md
@@ -0,0 +1,34 @@
+# Visual Regression Testing
+
+This repo now has an isolated `react-native-owl` harness behind `USE_OWL=true`.
+
+## Local iOS flow
+
+1. Build the fixture app:
+   `pnpm owl:build:ios`
+2. Generate or refresh baselines:
+   `pnpm owl:test:update:ios`
+3. Compare against committed baselines:
+   `pnpm owl:test:ios`
+
+Optional Jest filters can be forwarded to Owl:
+
+- `pnpm owl:test:ios -- --testPathPattern='tests/owl/smoke.owl.tsx'`
+- `pnpm owl:test:ios -- --testNamePattern='expanded fixture state'`
+
+## Layout
+
+- `app/owls/` contains the isolated render harness and reusable fixtures.
+- `tests/owl/` contains Owl test files.
+- `.owl/baseline/ios/` is expected to be committed once baselines are approved.
+
+## GitHub Actions
+
+Use `.github/workflows/visual-regression-ios.yml`.
+
+- `workflow_dispatch` supports `update_baseline=true` to generate fresh baselines and upload them as an artifact.
+- Pull requests touching Owl files will run compare mode and require committed iOS baseline images.
+
+## Current constraint
+
+Formidable's published Owl docs still state support only up to React Native `0.70.x`. This repo is on React Native `0.81.5`, so treat the integration as experimental until the first end-to-end run is validated in CI and on a local simulator.
diff --git a/app/owls/OwlRoot.tsx b/app/owls/OwlRoot.tsx
new file mode 100644
index 00000000000..bb6d74dfdff
--- /dev/null
+++ b/app/owls/OwlRoot.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import { StatusBar, StyleSheet } from 'react-native';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import RNBootSplash from 'react-native-bootsplash';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
+import { Provider } from 'react-redux';
+
+import { setUser } from '../actions/login';
+import { selectServerRequest } from '../actions/server';
+import MessageContext from '../containers/message/Context';
+import { colors } from '../lib/constants/colors';
+import { initStore } from '../lib/store/auxStore';
+import { createMockedStore } from '../reducers/mockedStore';
+import { ThemeContext } from '../theme';
+import { renderOwlFixture } from './fixtures';
+
+const styles = StyleSheet.create({
+	fill: {
+		flex: 1
+	}
+});
+
+const baseUrl = 'https://open.rocket.chat';
+const store = createMockedStore();
+
+initStore(store);
+store.dispatch(selectServerRequest(baseUrl, '8.0.0'));
+store.dispatch(setUser({ id: 'abc', username: 'rocket.cat', name: 'Rocket Cat', roles: ['user'] }));
+
+type Props = {
+	fixture?: string;
+};
+
+const OwlRoot = ({ fixture }: Props) => {
+	React.useEffect(() => {
+		RNBootSplash.hide({ fade: false });
+	}, []);
+
+	return (
+		<SafeAreaProvider style={styles.fill}>
+			<Provider store={store}>
+				<ThemeContext.Provider
+					value={{
+						theme: 'light',
+						colors: colors.light
+					}}>
+					<MessageContext.Provider
+						value={{
+							user: {
+								id: 'abc',
+								username: 'rocket.cat',
+								token: 'owl-token'
+							},
+							baseUrl,
+							onPress: () => {},
+							onLongPress: () => {},
+							reactionInit: () => {},
+							onErrorPress: () => {},
+							replyBroadcast: () => {},
+							onReactionPress: () => {},
+							onDiscussionPress: () => {},
+							onReactionLongPress: () => {},
+							threadBadgeColor: colors.light.badgeBackgroundLevel1
+						}}>
+						<GestureHandlerRootView style={styles.fill}>
+							<StatusBar backgroundColor={colors.light.surfaceTint} barStyle='dark-content' />
+							{renderOwlFixture(fixture)}
+						</GestureHandlerRootView>
+					</MessageContext.Provider>
+				</ThemeContext.Provider>
+			</Provider>
+		</SafeAreaProvider>
+	);
+};
+
+export default OwlRoot;
diff --git a/app/owls/fixtures/SmokeFixture.tsx b/app/owls/fixtures/SmokeFixture.tsx
new file mode 100644
index 00000000000..5b6652bf098
--- /dev/null
+++ b/app/owls/fixtures/SmokeFixture.tsx
@@ -0,0 +1,169 @@
+import React from 'react';
+import { Pressable, ScrollView, StyleSheet, Text, View } from 'react-native';
+
+import { colors } from '../../lib/constants/colors';
+
+const styles = StyleSheet.create({
+	scrollView: {
+		flex: 1,
+		backgroundColor: colors.light.surfaceTint
+	},
+	content: {
+		padding: 24,
+		gap: 16
+	},
+	header: {
+		gap: 6
+	},
+	eyebrow: {
+		color: colors.light.fontInfo,
+		fontSize: 13,
+		fontWeight: '700',
+		letterSpacing: 1,
+		textTransform: 'uppercase'
+	},
+	title: {
+		color: colors.light.fontTitlesLabels,
+		fontSize: 28,
+		fontWeight: '700'
+	},
+	subtitle: {
+		color: colors.light.fontSecondaryInfo,
+		fontSize: 16,
+		lineHeight: 24
+	},
+	card: {
+		backgroundColor: colors.light.surfaceRoom,
+		borderColor: colors.light.strokeExtraLight,
+		borderRadius: 20,
+		borderWidth: 1,
+		padding: 20,
+		gap: 16
+	},
+	cardHeader: {
+		gap: 8
+	},
+	cardTitle: {
+		color: colors.light.fontTitlesLabels,
+		fontSize: 20,
+		fontWeight: '700'
+	},
+	cardBody: {
+		color: colors.light.fontDefault,
+		fontSize: 15,
+		lineHeight: 22
+	},
+	statsRow: {
+		flexDirection: 'row',
+		gap: 12
+	},
+	stat: {
+		flex: 1,
+		backgroundColor: colors.light.surfaceHover,
+		borderRadius: 14,
+		padding: 12
+	},
+	statLabel: {
+		color: colors.light.fontHint,
+		fontSize: 12,
+		fontWeight: '600',
+		textTransform: 'uppercase'
+	},
+	statValue: {
+		color: colors.light.fontTitlesLabels,
+		fontSize: 20,
+		fontWeight: '700',
+		marginTop: 6
+	},
+	cta: {
+		alignItems: 'center',
+		backgroundColor: colors.light.buttonBackgroundPrimaryDefault,
+		borderRadius: 14,
+		paddingHorizontal: 16,
+		paddingVertical: 14
+	},
+	ctaPressed: {
+		backgroundColor: colors.light.buttonBackgroundPrimaryPress
+	},
+	ctaLabel: {
+		color: colors.light.buttonFontPrimary,
+		fontSize: 16,
+		fontWeight: '700'
+	},
+	expandedPanel: {
+		backgroundColor: colors.light.statusBackgroundInfo,
+		borderRadius: 14,
+		padding: 16,
+		gap: 8
+	},
+	expandedTitle: {
+		color: colors.light.statusFontInfo,
+		fontSize: 16,
+		fontWeight: '700'
+	},
+	expandedBody: {
+		color: colors.light.fontDefault,
+		fontSize: 14,
+		lineHeight: 20
+	}
+});
+
+const stats = [
+	{ label: 'Alerts', value: '03' },
+	{ label: 'Unread', value: '12' },
+	{ label: 'Rooms', value: '128' }
+];
+
+const SmokeFixture = () => {
+	const [expanded, setExpanded] = React.useState(false);
+
+	return (
+		<ScrollView style={styles.scrollView} contentContainerStyle={styles.content} testID='owl-smoke-scroll'>
+			<View style={styles.header}>
+				<Text style={styles.eyebrow}>Visual Regression Harness</Text>
+				<Text style={styles.title}>Rocket.Chat mobile fixture</Text>
+				<Text style={styles.subtitle}>
+					This isolated surface is intentionally deterministic so new Owl regressions can land without depending on login, sync or
+					live server data.
+				</Text>
+			</View>
+
+			<View style={styles.card} testID='owl-smoke-root'>
+				<View style={styles.cardHeader}>
+					<Text style={styles.cardTitle}>Smoke fixture</Text>
+					<Text style={styles.cardBody}>
+						Use this as the first committed baseline, then add focused fixtures beside it for each regression under test.
+					</Text>
+				</View>
+
+				<View style={styles.statsRow}>
+					{stats.map(stat => (
+						<View key={stat.label} style={styles.stat}>
+							<Text style={styles.statLabel}>{stat.label}</Text>
+							<Text style={styles.statValue}>{stat.value}</Text>
+						</View>
+					))}
+				</View>
+
+				<Pressable
+					accessibilityRole='button'
+					onPress={() => setExpanded(value => !value)}
+					style={({ pressed }) => [styles.cta, (pressed || expanded) && styles.ctaPressed]}
+					testID='owl-smoke-toggle'>
+					<Text style={styles.ctaLabel}>{expanded ? 'Hide regression details' : 'Show regression details'}</Text>
+				</Pressable>
+
+				{expanded ? (
+					<View style={styles.expandedPanel} testID='owl-smoke-expanded'>
+						<Text style={styles.expandedTitle}>Expanded state</Text>
+						<Text style={styles.expandedBody}>
+							This second state exists to prove Owl can drive the fixture and compare more than one screenshot in CI.
+						</Text>
+					</View>
+				) : null}
+			</View>
+		</ScrollView>
+	);
+};
+
+export default SmokeFixture;
diff --git a/app/owls/fixtures/index.tsx b/app/owls/fixtures/index.tsx
new file mode 100644
index 00000000000..4113b214a68
--- /dev/null
+++ b/app/owls/fixtures/index.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+
+import { colors } from '../../lib/constants/colors';
+import SmokeFixture from './SmokeFixture';
+
+const styles = StyleSheet.create({
+	container: {
+		flex: 1,
+		alignItems: 'center',
+		justifyContent: 'center',
+		backgroundColor: colors.light.surfaceTint,
+		padding: 24
+	},
+	title: {
+		color: colors.light.fontDanger,
+		fontSize: 20,
+		fontWeight: '700',
+		textAlign: 'center'
+	},
+	body: {
+		color: colors.light.fontSecondaryInfo,
+		fontSize: 15,
+		lineHeight: 22,
+		marginTop: 8,
+		textAlign: 'center'
+	}
+});
+
+const fixtures = {
+	smoke: SmokeFixture
+};
+
+const UnknownFixture = ({ fixture }: { fixture: string }) => (
+	<View style={styles.container} testID='owl-unknown-fixture'>
+		<Text style={styles.title}>Unknown Owl fixture</Text>
+		<Text style={styles.body}>{`No visual regression fixture is registered for "${fixture}".`}</Text>
+	</View>
+);
+
+type FixtureName = keyof typeof fixtures;
+
+export const renderOwlFixture = (fixture?: string): React.ReactNode => {
+	if (!fixture) {
+		return <SmokeFixture />;
+	}
+
+	const resolvedFixture = fixtures[fixture as FixtureName];
+	if (resolvedFixture) {
+		const ResolvedFixture = resolvedFixture;
+		return <ResolvedFixture />;
+	}
+
+	return <UnknownFixture fixture={fixture} />;
+};
diff --git a/index.js b/index.js
index 9c3fd8555b5..d6f49afdd35 100644
--- a/index.js
+++ b/index.js
@@ -6,7 +6,13 @@ import DeviceInfo from 'react-native-device-info';
 
 import { name as appName } from './app.json';
 
-if (process.env.USE_STORYBOOK) {
+if (process.env.USE_OWL) {
+	AppRegistry.registerComponent(appName, () => {
+		const OwlRoot = require('./app/owls/OwlRoot').default;
+
+		return () => <OwlRoot fixture={process.env.OWL_FIXTURE} />;
+	});
+} else if (process.env.USE_STORYBOOK) {
 	AppRegistry.registerComponent(appName, () => require('./.rnstorybook/index').default);
 } else {
 	if (!__DEV__) {
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 651983a6475..d251bccdaf4 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -3982,29 +3982,29 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
-  BugsnagReactNative: 2078dec76e54db9f6e687743af45dc3673cb32ab
-  BVLinearGradient: 7815a70ab485b7b155186dd0cc836363e0288cad
+  BugsnagReactNative: f3c40a61779de6de394e472407b4d14f27d30c1b
+  BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
-  EXApplication: 1e98d4b1dccdf30627f92917f4b2c5a53c330e5f
-  EXAV: b60fcf142fae6684d295bc28cd7cfcb3335570ea
-  EXConstants: 805f35b1b295c542ca6acce836f21a1f9ee104d5
-  EXNotifications: 983f04ad4ad879b181179e326bf220541e478386
-  Expo: 6118272de314ed3d4bc74de3b1229b8f5b324ef1
-  ExpoAppleAuthentication: 9413ae9a5e631a424cc04c1b13b0694dbab7d594
-  ExpoAsset: f867e55ceb428aab99e1e8c082b5aee7c159ea18
-  ExpoCamera: 6a326deb45ba840749652e4c15198317aa78497e
-  ExpoDevice: 6327c3c200816795708885adf540d26ecab83d1a
-  ExpoDocumentPicker: 7cd9e71a0f66fb19eb0a586d6f26eee1284692e0
-  ExpoFileSystem: 858a44267a3e6e9057e0888ad7c7cfbf55d52063
-  ExpoFont: 35ac6191ed86bbf56b3ebd2d9154eda9fad5b509
-  ExpoHaptics: d3a6375d8dcc3a1083d003bc2298ff654fafb536
-  ExpoImage: 686f972bff29525733aa13357f6691dc90aa03d8
-  ExpoKeepAwake: 55f75eca6499bb9e4231ebad6f3e9cb8f99c0296
-  ExpoLocalAuthentication: 8a31808565da7af926dd9b595e98594d8b1553b6
-  ExpoModulesCore: 91a57f1d109cf53fe58d44fcf6b68a777561549a
-  ExpoSystemUI: 2ad325f361a2fcd96a464e8574e19935c461c9cc
-  ExpoVideoThumbnails: 503a79271416c8723f04b55ea4737282513ebe4f
-  ExpoWebBrowser: 17b064c621789e41d4816c95c93f429b84971f52
+  EXApplication: 13420f8139864183f8a04fd6099077bdf8cfb186
+  EXAV: c2de1057f4d9b0bcbdd908c6f2dcff48ece36f2b
+  EXConstants: 6c818a84354d194cb4d5d78990108a7c0f590e30
+  EXNotifications: 66e91bc2cde4123b371773fd479bacd3cd699e79
+  Expo: 595a1f6bf379ffadd2c19cfcdd1f62a4f130428e
+  ExpoAppleAuthentication: 31bb6cdc57d7169e5d994fff7ec4b97c62423534
+  ExpoAsset: d999f3bbd998a750f3b74cb913229848901b926b
+  ExpoCamera: 44705f35b32741582d00c69187c8ee59669ed46e
+  ExpoDevice: 0773c782b055558ca9b40b74aa4a8133a66cd0d2
+  ExpoDocumentPicker: 774b0d1f41468f79148e8201afd094ca852e9e42
+  ExpoFileSystem: aefcd337b94b874f88752ebefc52813b84992fad
+  ExpoFont: 26bbea90749b8dd0b69effc9fab54248e684f290
+  ExpoHaptics: 7240781406f4563c3f4eb1e72864302a8c643fd0
+  ExpoImage: f6bcd30bb98d4c484869668fbc32834bb3ee5bfb
+  ExpoKeepAwake: 44bf6715bc1d2ddb17afe19d927cd039cda123f0
+  ExpoLocalAuthentication: a5d1c60718a852faa1852ef76298d8a167dc99f5
+  ExpoModulesCore: e80c5fef91bcdfcbe3acba33ddc53666be4a7fcc
+  ExpoSystemUI: 4611247a411f231229f7e04449856035bd18ba21
+  ExpoVideoThumbnails: 9fccaa03acb8991317d1c26909003ea2bc064d73
+  ExpoWebBrowser: 88b116cd378d9609c776c0903fe4070fca461588
   fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6
   FBLazyVector: 5beb8028d5a2e75dd9634917f23e23d3a061d2aa
   Firebase: 6a8f201c61eda24e98f1ce2b44b1b9c2caf525cc
@@ -4028,109 +4028,109 @@ SPEC CHECKSUMS:
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
   MMKV: 1a8e7dbce7f9cad02c52e1b1091d07bd843aefaf
   MMKVCore: f2dd4c9befea04277a55e84e7812f930537993df
-  MobileCrypto: 41cd66d5588e979cf95d1ff6ae2eec88eb284ef1
+  MobileCrypto: 4065a6dbb9f17ee844a16a47992105ee9485af43
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  NitroMmkv: 4a2d747ce97a4ae740b3cb3a3853366813faf831
-  NitroModules: 18e41c298d86fc753fc754969fa9f84044e70711
+  NitroMmkv: c4126230c8e2f1aa47bf03f79aaacd8efcd38427
+  NitroModules: 48aec2edf6b27107348200ba5d0cb12c831fe02c
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
-  RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
+  RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f
   RCTDeprecation: 5eb1d2eeff5fb91151e8a8eef45b6c7658b6c897
   RCTRequired: cebcf9442fc296c9b89ac791dfd463021d9f6f23
   RCTTypeSafety: b99aa872829ee18f6e777e0ef55852521c5a6788
   React: 914f8695f9bf38e6418228c2ffb70021e559f92f
   React-callinvoker: 23cd4e33928608bd0cc35357597568b8b9a5f068
-  React-Core: 6a0a97598e9455348113bfe4c573fe8edac34469
-  React-CoreModules: a88a6ca48b668401b9780e272e2a607e70f9f955
-  React-cxxreact: 06265fd7e8d5c3b6b49e00d328ef76e5f1ae9c8b
+  React-Core: 895a479e2e0331f48af3ad919bece917926a0b7d
+  React-CoreModules: dfa38212cf3a91f2eb84ccd43d747d006d33449e
+  React-cxxreact: 7a4e2c77e564792252131e63270f6184d93343b3
   React-debug: 29aed758c756956a51b4560223edbd15191ca4c5
-  React-defaultsnativemodule: c406bf7cd78036efffb7dec9df469257a1bca58c
-  React-domnativemodule: 925ea5ff8cb05c68e910057e6349e5898cce00f3
-  React-Fabric: 13130d0a70f17e913865b04673ee64603d6c42fe
-  React-FabricComponents: 1f01ea24a1314bf9abcac4743bb7ad8791336be6
-  React-FabricImage: f364dc54fcf8b0ef77192674a009aa4f65b34d75
-  React-featureflags: 32217ac18a8c216fc571044186fb04164af72772
-  React-featureflagsnativemodule: 9c552bb908a7434baa846002ee1752a77b1a5520
-  React-graphics: 3034a698e46e947f74a443e761f1feef742e9d71
-  React-hermes: a852be3ab9e1f515e46ba3ea9f48c31d4a9df437
-  React-idlecallbacksnativemodule: c43fe1f2221b0548cc366bf15f88efb3b3221bbf
-  React-ImageManager: 7efd7b19cdfaa3a82482e9e6ac0b56606a3ec271
-  React-jserrorhandler: 597057d0b9d158c03e02aa376a4a95f64f46a910
-  React-jsi: 7b53959aea60909ac6bbe4dd0bdec6c10d7dc597
-  React-jsiexecutor: 19938072af05ade148474bac41e0324a2d733f44
-  React-jsinspector: eb6bb244a75cbd56f32767daf2efdb344e2ff10c
-  React-jsinspectorcdp: 727f37537e9c7ab22b6b86c802d879efae5e2757
-  React-jsinspectornetwork: 11d47e644701c58038ef8d7f54a405ddd62b3b16
-  React-jsinspectortracing: 8875637e6c65b3b9a3852b006856562e874e7a78
-  React-jsitooling: b6e6a2551459a6ef9e1529df2ea981fa27ed3a91
-  React-jsitracing: 879e2b2f80dd33d84175989de0a8db5d662505db
-  React-logger: a913317214a26565cd4c045347edf1bcacb80a3f
-  React-Mapbuffer: 017336879e2e0fb7537bbc08c24f34e2384c9260
-  React-microtasksnativemodule: 63ee6730cec233feab9cdcc0c100dc28a12e4165
-  react-native-a11y-order: 20b33ff538af60d8b8a7f7284115a7febc9034d4
-  react-native-background-timer: 4638ae3bee00320753647900b21260b10587b6f7
-  react-native-cameraroll: ae31ba7ee17d31c5ee05d7bb248742e3af482783
-  react-native-cookies: d648ab7025833b977c0b19e142503034f5f29411
-  react-native-external-keyboard: db51d3a78d68c1f87fef41c67353a7c0ddbe51dd
-  react-native-keyboard-controller: c4ca61f44d66c2f8987a7e67e9b78e80dc965c45
-  react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
-  react-native-restart: f6f591aeb40194c41b9b5013901f00e6cf7d0f29
-  react-native-safe-area-context: 0a3b034bb63a5b684dd2f5fffd3c90ef6ed41ee8
-  react-native-slider: 6201419b3e3f7c6b7cf2068e0c01274fa86a1da5
-  react-native-webrtc: e8f0ce746353adc2744a2b933645e1aeb41eaa74
-  react-native-webview: 83c663c5bdf1357d3e7c00986260cb888ea0e328
-  React-NativeModulesApple: cbceb3c4cb726838c461b13802a76cefa6f3476f
+  React-defaultsnativemodule: ee4e3ca63b29c8b91448a6760d72063196ed0796
+  React-domnativemodule: 4d29aad12ebb2b5aa34043e5bdd191a92821f3aa
+  React-Fabric: 21f78a4856240d39a663a52c452e223c5e412098
+  React-FabricComponents: 13fc0ac39a488cea00c83ffa7b16113f024d66e6
+  React-FabricImage: 8961abe0372d20679ee093d144aaf5fb1227bf41
+  React-featureflags: 018934f958e6b83907e71631599b02144e6b17f4
+  React-featureflagsnativemodule: 89fef5751203b7d3cdde43e1e10407983735a4b4
+  React-graphics: 1c62dd11f47071482ca90238981f0147cce4089d
+  React-hermes: 36704d7354fff9c9e3fbb2490e8eeb2ac027f6f0
+  React-idlecallbacksnativemodule: 5f7cbecc1479b53e665f2cd6c2af2c21a80d2ffd
+  React-ImageManager: 4cb6318bb2bcc947106e29f9297a1c24c85a9233
+  React-jserrorhandler: 4b9344f5794cfe8946f8752d38094649f53dd3f3
+  React-jsi: 3a8c6f94a52033b0cca53c38d9bb568306aa9dc1
+  React-jsiexecutor: d7cf79b1c2771c6b21c46691a96dd2e32d4454c7
+  React-jsinspector: 651483ea1d79859e0ed21b86e9042b2a3f4d2b40
+  React-jsinspectorcdp: c800035023789b8bf32b4f5a4c9003c2dc28ee49
+  React-jsinspectornetwork: 249ee46e9de930d773ff6e4726aa8eeb5854b589
+  React-jsinspectortracing: 80e251e13a6071607f06f0e39e03d3f2ce2645cb
+  React-jsitooling: 6ce395671d0139ec1c4721953a4d3d92172fc06f
+  React-jsitracing: 4a4d89334b14d96de0387876751528433d1d2fbd
+  React-logger: 8bcfaf06f8c536fb9e9760526cf3d17ccd53e4ce
+  React-Mapbuffer: 4649384414066eb77e30a3124dbb48732a3aa173
+  React-microtasksnativemodule: e39f94cc96d61b8174a5cfb2d5862a73fa8c0d35
+  react-native-a11y-order: b8de113a5775cc77e0c60574a6779d9aa6f3110c
+  react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
+  react-native-cameraroll: aa5f6fe38b5574f1066a37ceaad5ece494a157a5
+  react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c
+  react-native-external-keyboard: 70a377298bf484a159a76de4debd951a82d0ff87
+  react-native-keyboard-controller: ef239acc614d5d520b07853be6bfa6e87b7770db
+  react-native-netinfo: f0a9899081c185db1de5bb2fdc1c88c202a059ac
+  react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979
+  react-native-safe-area-context: fea29ae0275beaa22f72d0a8be1eb0ab09c3feae
+  react-native-slider: 99493fd3e7254ea482be59fbd94467e737d2b849
+  react-native-webrtc: b5062b745a26c99835efdf0d6c027c9b2ee7ddbc
+  react-native-webview: 21fdd62caca650645e429b4a84941626612616ef
+  React-NativeModulesApple: 8ce162c145e6b9767bb37a090c77d3d28f7d32b5
   React-oscompat: eb0626e8ba1a2c61673c991bf9dc21834898475d
-  React-perflogger: 509e1f9a3ee28df71b0a66de806ac515ce951246
-  React-performancetimeline: 9ce28cce1cded27410c293283f99fe62bebdb920
+  React-perflogger: d0d0d1b884120fa0a13bd38ac5e9c3c8e8bfe82a
+  React-performancetimeline: ae60fb7a7447c44d4d3227fc4eeba606403aaee3
   React-RCTActionSheet: 30fe8f9f8d86db4a25ff34595a658ecd837485fc
-  React-RCTAnimation: 3126eb1cb8e7a6ca33a52fd833d8018aa9311af1
-  React-RCTAppDelegate: b03981c790aa40cf26e0f78cc0f1f2df8287ead4
-  React-RCTBlob: 53c35e85c85d6bdaa55dc81a0b290d4e78431095
-  React-RCTFabric: 59ad9008775f123019c508efff260594a8509791
-  React-RCTFBReactNativeSpec: 82b605ab4f6f8da0a7ad88641161df5a0bafb1fb
-  React-RCTImage: 074b2faa71a152a456c974e118b60c9eeda94a64
-  React-RCTLinking: e5ca17a4f7ae2ad7b0c0483be77e1b383ecd0a8a
-  React-RCTNetwork: c508d7548c9eceac30a8100a846ea00033a03366
-  React-RCTRuntime: 6979568c0bc276fe785e085894f954fa15e0ec7e
-  React-RCTSettings: dd84c857a4fce42c1e08c1dabcda894e25af4a6e
-  React-RCTText: 6e4b177d047f98bccb90d6fb1ebdd3391cf8b299
-  React-RCTVibration: 9572d4a06a0c92650bcc62913e50eb2a89f19fb6
+  React-RCTAnimation: e86dacf8a982f42341a44ec87ea8a30964a15f9f
+  React-RCTAppDelegate: d7214067e796732b5d22960270593945f1ab8a14
+  React-RCTBlob: af1fc227a5aa55564afbe84530a8bd28834fda15
+  React-RCTFabric: 8d92e851cc6cdf9771c52a18b144424c92b72082
+  React-RCTFBReactNativeSpec: c9ec2130e3c9366d30a85886e1776210054763f5
+  React-RCTImage: 70a10a5b957ca124b8d0b0fdeec369f11194782c
+  React-RCTLinking: 67f8a024192b4844c40ace955c54bb34f40d47f0
+  React-RCTNetwork: a7679ee67e7d34797a00cefaa879a3f9ea8cee9c
+  React-RCTRuntime: 3d25c69970924b597c339aead60168026d7cbc2c
+  React-RCTSettings: 18d8674195383c4fd51b9fc98ee815b329fba7e4
+  React-RCTText: 125574af8e29d0ceb430cbe2a03381d62ba45a47
+  React-RCTVibration: e96d43017757197d46834c50a0acfb78429c9b30
   React-rendererconsistency: a7b47f8b186af64ff8509c8caec4114a2f1ae63f
-  React-renderercss: 9845c5063b3a2d0462ed4e4c7fc34219a5d608ed
-  React-rendererdebug: 3905e346c06347b86c6e49d427062cdd638a3044
-  React-RuntimeApple: 97233caf2b635c40819bf5be38d818777f8229ab
-  React-RuntimeCore: dc41f86fcdf1fbb42a5b8388a29bf59dfa56b2f8
-  React-runtimeexecutor: d16d045faaf6cd7de8d1aa8e31a51c13d8db84a4
-  React-RuntimeHermes: 5a9d132554c8d6b416d794cd4ac7d927b2f88f7b
-  React-runtimescheduler: 689d805d43c28b8fb1ab390914e042d10e2ea2ab
-  React-timing: c39eeb992274aeaeb9f4666dc97a36a31d33fe94
-  React-utils: 2f9ba0088251788ad66aa1855ff99ed2424024d2
-  ReactAppDependencyProvider: 1bcd3527ac0390a1c898c114f81ff954be35ed79
-  ReactCodegen: 7fadc30654a54b3a0d62df08f55e2211e25486ee
-  ReactCommon: 6d0fa86a4510730da7c72560e0ced14258292ab9
-  ReactNativeIncallManager: dccd3e7499caa3bb73d3acfedf4fb0360f1a87d5
-  RNBootSplash: 7fcc9a58ae343aeb1a1dd49f9030832fe432c544
-  RNCallKeep: 1930a01d8caf48f018be4f2db0c9f03405c2f977
-  RNCAsyncStorage: fd44f4b03e007e642e98df6726737bc66e9ba609
-  RNCClipboard: e560338bf6cc4656a09ff90610b62ddc0dbdad65
-  RNCMaskedView: d707a83784c67099b54b37d056ababb2767ce15e
-  RNConfigReader: 27bab37cca5e6b87766ffd73b8b8818ee46e3416
-  RNCPicker: 35fc66f352403cdfe99d53b541f5180482ca2bc5
-  RNDateTimePicker: ca1dc7e24d0b4839877f0ab619e7bca5db715289
-  RNDeviceInfo: 900bd20e1fd3bfd894e7384cc4a83880c0341bd3
-  RNFBAnalytics: 2e8b8ffcd2bb3d59a43ecbe09571c73c56edef7a
-  RNFBApp: a448037d2df74af9d374a0b765be12ff1e844dc0
-  RNFBCrashlytics: c3bb5533f9957eddc88f3ea383583309a4ce9f89
-  RNFileViewer: f9424017fa643c115c1444e11292e84fb16ddd68
-  RNGestureHandler: b8d2e75c2e88fc2a1f6be3b3beeeed80b88fa37d
-  RNImageCropPicker: 0a63af4b79e514c1edd6c3152f19300c5ed85312
-  RNLocalize: ca86348d88b9a89da0e700af58d428ab3f343c4e
-  RNReanimated: e1690cdd7f215cfb96a3b7986b81889867dfdb4f
-  RNScreens: 2e9c41cd099b1ca50136af8d57c3594214d0086a
-  RNSVG: 94a1be05fab4043354bcf7104f0f9b0e2231ef05
-  RNTrueSheet: 53f29088da313dabff8b81d7c4d52afd8e609cfa
-  RNWorklets: ab618bf7d1c7fd2cb793b9f0f39c3e29274b3ebf
+  React-renderercss: 0a5b6b7aefc3f5e46a61b0e41b1179a0750cf077
+  React-rendererdebug: 7da01af21ab31661c3040ef647e6e2bc55575771
+  React-RuntimeApple: 788ca3b8e5485a46654e8a316d4c1e40bf82c5d4
+  React-RuntimeCore: 1730e6e5cba6f0af4e0319f891da6426b491e39f
+  React-runtimeexecutor: 79894322e55268854dc04ff1bee083f24725f6c8
+  React-RuntimeHermes: 86bf03cbf11ef05803a2e32087667c8a3cc45f72
+  React-runtimescheduler: 70601d598a8a71582fa69a9ba488a27c5d12790d
+  React-timing: 5717558f0bea206d7557df53015ee9efe1eb57b2
+  React-utils: 55e54e497e3d3f373ebfcf844eb77e24ed013356
+  ReactAppDependencyProvider: c277c5b231881ad4f00cd59e3aa0671b99d7ebee
+  ReactCodegen: d4cfdf9ed5667b032f0805c241892dac25d0e438
+  ReactCommon: 5cfd842fcd893bb40fc835f98fadc60c42906a20
+  ReactNativeIncallManager: 65a85aed033c1d9ec66f98a943cca51c61a210e9
+  RNBootSplash: d8407c268d5159ea026dc741ec867ebbe4708f25
+  RNCallKeep: 94bbe46b807ccf58e9f6ec11bc4d6087323a1954
+  RNCAsyncStorage: 8857fb173af29664cb90897903902dc8533e36cc
+  RNCClipboard: 4eea71d801c880175c12f6ab14332ca86fed935f
+  RNCMaskedView: 8bfc13a356455b15d56114738f4d2a804769c1bf
+  RNConfigReader: d800c517ac6da93d94df342580584fe029f3cbc2
+  RNCPicker: 5ecdf273a7a933dea82838515cc17c402fcf3ff7
+  RNDateTimePicker: 05e53e54b95e4e4b7dc1b7141b7749a1daa5e622
+  RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e
+  RNFBAnalytics: 9e013537d8aa83f9b46971bb15d43c0ed9eabec2
+  RNFBApp: fda4a8b08fe31bea8492808106aa638d1bb595b7
+  RNFBCrashlytics: 02234987b4cffb39119af52253bf3d70acec0818
+  RNFileViewer: 83cc066ad795b1f986791d03b56fe0ee14b6a69f
+  RNGestureHandler: 9339994ea5d1ff6ad2679b7d0cc3d49053111369
+  RNImageCropPicker: 6fd841bab847a912a03c3c464b44cd19692ca513
+  RNLocalize: 82a569022724d35461e2dc5b5d015a13c3ca995b
+  RNReanimated: 2635ec9d061c5eba3987bcc604443d78f363d3f7
+  RNScreens: 871305075ddf1291411b051d86da9e0d9289de02
+  RNSVG: 9be2bc57df95a874e8c4b0f7dd71866139f321d2
+  RNTrueSheet: 559ba620896714b7518da840f2ae3aa6c8983680
+  RNWorklets: daa0a3e7946a9c4042f3a962c87a12dc5bc0badd
   SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
   SDWebImageAVIFCoder: afe194a084e851f70228e4be35ef651df0fc5c57
   SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
@@ -4138,7 +4138,7 @@ SPEC CHECKSUMS:
   simdjson: 7bb9e33d87737cec966e7b427773c67baa4458fe
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
-  WatermelonDB: 4c846c8cb94eef3cba90fa034d15310163226703
+  WatermelonDB: b34772e634f59bb1170214901a5c8841e7334813
   Yoga: 1e91d83a5286cfd3b725eade59274c92270540d4
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
diff --git a/owl.config.json b/owl.config.json
new file mode 100644
index 00000000000..9ddf3b827af
--- /dev/null
+++ b/owl.config.json
@@ -0,0 +1,15 @@
+{
+	"ios": {
+		"workspace": "ios/RocketChatRN.xcworkspace",
+		"scheme": "RocketChat",
+		"configuration": "Release",
+		"device": "iPhone 16 Pro",
+		"quiet": true
+	},
+	"android": {
+		"packageName": "chat.rocket.reactnative",
+		"buildType": "Release",
+		"quiet": true
+	},
+	"report": true
+}
diff --git a/package.json b/package.json
index 568a7b80ccf..b806fb7e3bd 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,12 @@
 		"start": "react-native start",
 		"test": "TZ=UTC jest",
 		"test-update": "TZ=UTC jest --updateSnapshot",
+		"owl:build:ios": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl build --platform ios",
+		"owl:test:ios": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform ios",
+		"owl:test:update:ios": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform ios --update",
+		"owl:build:android": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl build --platform android",
+		"owl:test:android": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform android",
+		"owl:test:update:android": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform android --update",
 		"lint": "eslint . && tsc",
 		"prettier-lint": "prettier --write . && pnpm lint",
 		"ios": "npx react-native run-ios",
@@ -217,6 +223,7 @@
 		"prettier": "2.8.8",
 		"react-dom": "19.1.0",
 		"react-native-dotenv": "3.4.8",
+		"react-native-owl": "1.5.0",
 		"storybook": "~9.0.9",
 		"typescript": "~5.9.3"
 	},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 862110b7d22..1f302d88050 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -538,6 +538,9 @@ importers:
       react-native-dotenv:
         specifier: 3.4.8
         version: 3.4.8(@babel/runtime@7.25.9)
+      react-native-owl:
+        specifier: 1.5.0
+        version: 1.5.0(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
       storybook:
         specifier: ~9.0.9
         version: 9.0.18(@testing-library/dom@10.4.1)(prettier@2.8.8)
@@ -3138,6 +3141,9 @@ packages:
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
+  ajv@7.2.4:
+    resolution: {integrity: sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==}
+
   ajv@8.18.0:
     resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
 
@@ -4821,6 +4827,11 @@ packages:
   graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
+  handlebars@4.7.9:
+    resolution: {integrity: sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==}
+    engines: {node: '>=0.4.7'}
+    hasBin: true
+
   harmony-reflect@1.6.2:
     resolution: {integrity: sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==}
 
@@ -6163,6 +6174,10 @@ packages:
     resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
     engines: {node: '>= 6'}
 
+  pixelmatch@5.3.0:
+    resolution: {integrity: sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q==}
+    hasBin: true
+
   pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
@@ -6179,6 +6194,10 @@ packages:
     resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==}
     engines: {node: '>=4.0.0'}
 
+  pngjs@6.0.0:
+    resolution: {integrity: sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==}
+    engines: {node: '>=12.13.0'}
+
   polished@4.3.1:
     resolution: {integrity: sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==}
     engines: {node: '>=10'}
@@ -6513,6 +6532,13 @@ packages:
       react-native: '*'
       react-native-gesture-handler: '*'
 
+  react-native-owl@1.5.0:
+    resolution: {integrity: sha512-hk5/TeLp3+DMgzgYsQ4tWFXQfpMCFLcf/9q935oz7KcC9/uMj9y/ktXaCgCXIZ2Mt7mW3b6RXHAq/jfokyx+FA==}
+    hasBin: true
+    peerDependencies:
+      react: ^17 || ^18
+      react-native: ^0
+
   react-native-picker-select@9.0.1:
     resolution: {integrity: sha512-iIhb82OSH1vqB/HoipvbuX3RCzmeaQmIASlaRbv6X8imNjzh1DH/LaKoF4+DAZJLT0iX7QG79vpwZu8wjWap3Q==}
     peerDependencies:
@@ -7461,6 +7487,11 @@ packages:
     resolution: {integrity: sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==}
     deprecated: You are using an outdated version of ua-parser-js. Please update to ua-parser-js v0.7.33 / v1.0.33 / v2.0.0 (or later) to avoid ReDoS vulnerability [CVE-2022-25927](https://github.com/advisories/GHSA-fhg7-m89q-25r3)
 
+  uglify-js@3.19.3:
+    resolution: {integrity: sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==}
+    engines: {node: '>=0.8.0'}
+    hasBin: true
+
   unbox-primitive@1.1.0:
     resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
     engines: {node: '>= 0.4'}
@@ -7685,6 +7716,9 @@ packages:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
 
+  wordwrap@1.0.0:
+    resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
+
   wordwrapjs@4.0.1:
     resolution: {integrity: sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==}
     engines: {node: '>=8.0.0'}
@@ -11232,6 +11266,13 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
+  ajv@7.2.4:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
+
   ajv@8.18.0:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -13157,6 +13198,15 @@ snapshots:
 
   graphemer@1.4.0: {}
 
+  handlebars@4.7.9:
+    dependencies:
+      minimist: 1.2.8
+      neo-async: 2.6.2
+      source-map: 0.6.1
+      wordwrap: 1.0.0
+    optionalDependencies:
+      uglify-js: 3.19.3
+
   harmony-reflect@1.6.2: {}
 
   has-bigints@1.1.0: {}
@@ -14814,6 +14864,10 @@ snapshots:
 
   pirates@4.0.7: {}
 
+  pixelmatch@5.3.0:
+    dependencies:
+      pngjs: 6.0.0
+
   pkg-dir@4.2.0:
     dependencies:
       find-up: 4.1.0
@@ -14830,6 +14884,8 @@ snapshots:
 
   pngjs@3.4.0: {}
 
+  pngjs@6.0.0: {}
+
   polished@4.3.1:
     dependencies:
       '@babel/runtime': 7.25.9
@@ -15183,6 +15239,21 @@ snapshots:
       react-native: 0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0)
       react-native-gesture-handler: 2.28.0(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
 
+  react-native-owl@1.5.0(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
+    dependencies:
+      ajv: 7.2.4
+      execa: 5.1.1
+      handlebars: 4.7.9
+      pixelmatch: 5.3.0
+      pngjs: 6.0.0
+      react: 19.1.0
+      react-native: 0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0)
+      ws: 8.18.3
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
   react-native-picker-select@9.0.1(@react-native-picker/picker@2.11.4(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
     dependencies:
       '@react-native-picker/picker': 2.11.4(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
@@ -16264,6 +16335,9 @@ snapshots:
 
   ua-parser-js@1.0.2: {}
 
+  uglify-js@3.19.3:
+    optional: true
+
   unbox-primitive@1.1.0:
     dependencies:
       call-bound: 1.0.4
@@ -16532,6 +16606,8 @@ snapshots:
 
   word-wrap@1.2.5: {}
 
+  wordwrap@1.0.0: {}
+
   wordwrapjs@4.0.1:
     dependencies:
       reduce-flatten: 2.0.0
diff --git a/tests/owl/smoke.owl.tsx b/tests/owl/smoke.owl.tsx
new file mode 100644
index 00000000000..05107219a7d
--- /dev/null
+++ b/tests/owl/smoke.owl.tsx
@@ -0,0 +1,26 @@
+/* eslint-env jest */
+
+import { press, reload, takeScreenshot, toExist } from 'react-native-owl';
+
+jest.setTimeout(60000);
+
+describe('Owl smoke fixture', () => {
+	beforeEach(async () => {
+		await reload();
+	});
+
+	it('matches the default fixture state', async () => {
+		const screen = await takeScreenshot('smoke-initial');
+
+		expect(screen).toMatchBaseline();
+	});
+
+	it('matches the expanded fixture state', async () => {
+		await press('owl-smoke-toggle');
+		await toExist('owl-smoke-expanded');
+
+		const screen = await takeScreenshot('smoke-expanded');
+
+		expect(screen).toMatchBaseline();
+	});
+});

From 855d8c1d36e5394f120ff523ef9d3a9f8456e2ce Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Tue, 9 Jun 2026 18:13:45 -0300
Subject: [PATCH 02/23] fix: blank space on actionSheet

---
 app/owls/fixtures/ActionSheetsFixture.tsx     | 110 ++++++++++++++++++
 app/owls/fixtures/index.tsx                   |   4 +-
 app/views/DirectoryView/Options.tsx           |   4 +-
 .../MediaAutoDownloadView/ListPicker.tsx      |   7 +-
 .../RoomsListView/components/ServersList.tsx  |   5 +-
 .../ListPicker.tsx                            |   2 +-
 tests/owl/actionSheets.owl.tsx                |  50 ++++++++
 7 files changed, 170 insertions(+), 12 deletions(-)
 create mode 100644 app/owls/fixtures/ActionSheetsFixture.tsx
 create mode 100644 tests/owl/actionSheets.owl.tsx

diff --git a/app/owls/fixtures/ActionSheetsFixture.tsx b/app/owls/fixtures/ActionSheetsFixture.tsx
new file mode 100644
index 00000000000..bc567628782
--- /dev/null
+++ b/app/owls/fixtures/ActionSheetsFixture.tsx
@@ -0,0 +1,110 @@
+import React from 'react';
+import { ScrollView, StyleSheet, Text, View } from 'react-native';
+
+import { ActionSheetProvider, useActionSheet } from '../../containers/ActionSheet';
+import Button from '../../containers/Button';
+import { colors } from '../../lib/constants/colors';
+import DirectoryOptions from '../../views/DirectoryView/Options';
+import MediaAutoDownloadListPicker from '../../views/MediaAutoDownloadView/ListPicker';
+import ServersList from '../../views/RoomsListView/components/ServersList';
+import UserNotificationPreferencesListPicker from '../../views/UserNotificationPreferencesView/ListPicker';
+
+const styles = StyleSheet.create({
+	scrollView: {
+		flex: 1,
+		backgroundColor: colors.light.surfaceTint
+	},
+	content: {
+		padding: 24,
+		gap: 16
+	},
+	title: {
+		color: colors.light.fontTitlesLabels,
+		fontSize: 22,
+		fontWeight: '700'
+	},
+	subtitle: {
+		color: colors.light.fontSecondaryInfo,
+		fontSize: 15,
+		lineHeight: 22
+	},
+	pickerCard: {
+		backgroundColor: colors.light.surfaceRoom,
+		borderColor: colors.light.strokeExtraLight,
+		borderRadius: 12,
+		borderWidth: 1,
+		overflow: 'hidden'
+	}
+});
+
+/**
+ * Renders the four action sheets that share the bottom safe-area spacing fix
+ * (ServersList, DirectoryView options, and the Media-auto-download &
+ * User-notification-preferences list pickers). Each trigger lives on the same
+ * screen so a single Owl build can drive every sheet; the test opens them one
+ * at a time and screenshots the presented native sheet.
+ */
+const Triggers = () => {
+	const { showActionSheet } = useActionSheet();
+
+	return (
+		<ScrollView style={styles.scrollView} contentContainerStyle={styles.content} testID='owl-action-sheets-root'>
+			<Text style={styles.title}>Action sheet safe-area fixtures</Text>
+			<Text style={styles.subtitle}>
+				Each control below opens one of the action sheets affected by the bottom safe-area spacing change.
+			</Text>
+
+			<Button
+				title='Open servers list'
+				testID='owl-trigger-servers-list'
+				onPress={() => showActionSheet({ children: <ServersList />, enableContentPanningGesture: false })}
+			/>
+
+			<Button
+				title='Open directory options'
+				testID='owl-trigger-directory-options'
+				onPress={() =>
+					showActionSheet({
+						children: (
+							<DirectoryOptions
+								type='channels'
+								globalUsers={false}
+								isFederationEnabled
+								changeType={() => {}}
+								toggleWorkspace={() => {}}
+							/>
+						),
+						enableContentPanningGesture: false
+					})
+				}
+			/>
+
+			<View style={styles.pickerCard}>
+				<MediaAutoDownloadListPicker
+					testID='owl-trigger-media-auto-download'
+					title='Images'
+					value='wifi'
+					onChangeValue={() => {}}
+				/>
+			</View>
+
+			<View style={styles.pickerCard}>
+				<UserNotificationPreferencesListPicker
+					testID='owl-trigger-user-notification-prefs'
+					preference='desktopNotifications'
+					value='all'
+					title='Desktop'
+					onChangeValue={() => {}}
+				/>
+			</View>
+		</ScrollView>
+	);
+};
+
+const ActionSheetsFixture = () => (
+	<ActionSheetProvider>
+		<Triggers />
+	</ActionSheetProvider>
+);
+
+export default ActionSheetsFixture;
diff --git a/app/owls/fixtures/index.tsx b/app/owls/fixtures/index.tsx
index 4113b214a68..d2e277bcc7c 100644
--- a/app/owls/fixtures/index.tsx
+++ b/app/owls/fixtures/index.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
 import { colors } from '../../lib/constants/colors';
+import ActionSheetsFixture from './ActionSheetsFixture';
 import SmokeFixture from './SmokeFixture';
 
 const styles = StyleSheet.create({
@@ -28,7 +29,8 @@ const styles = StyleSheet.create({
 });
 
 const fixtures = {
-	smoke: SmokeFixture
+	smoke: SmokeFixture,
+	'action-sheets': ActionSheetsFixture
 };
 
 const UnknownFixture = ({ fixture }: { fixture: string }) => (
diff --git a/app/views/DirectoryView/Options.tsx b/app/views/DirectoryView/Options.tsx
index fe046502f08..a65776a38bc 100644
--- a/app/views/DirectoryView/Options.tsx
+++ b/app/views/DirectoryView/Options.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { Text, View } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { CustomIcon, type TIconsName } from '../../containers/CustomIcon';
 import * as List from '../../containers/List';
@@ -25,7 +24,6 @@ const DirectoryOptions = ({
 	toggleWorkspace
 }: IDirectoryOptionsProps) => {
 	const { colors } = useTheme();
-	const insets = useSafeAreaInsets();
 
 	const renderItem = (itemType: string) => {
 		let text = 'Users';
@@ -53,7 +51,7 @@ const DirectoryOptions = ({
 	};
 
 	return (
-		<List.Container contentContainerStyle={{ backgroundColor: colors.surfaceRoom, marginBottom: insets.bottom }}>
+		<List.Container contentContainerStyle={{ backgroundColor: colors.surfaceRoom }}>
 			<List.Separator />
 			{renderItem('channels')}
 			<List.Separator />
diff --git a/app/views/MediaAutoDownloadView/ListPicker.tsx b/app/views/MediaAutoDownloadView/ListPicker.tsx
index b1980731f6d..e2b3379d67f 100644
--- a/app/views/MediaAutoDownloadView/ListPicker.tsx
+++ b/app/views/MediaAutoDownloadView/ListPicker.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { useActionSheet } from '../../containers/ActionSheet';
 import * as List from '../../containers/List';
@@ -60,17 +59,18 @@ interface IBaseParams {
 const ListPicker = ({
 	value,
 	title,
+	testID,
 	onChangeValue
 }: {
 	title: string;
+	testID?: string;
 } & IBaseParams) => {
 	const { showActionSheet, hideActionSheet } = useActionSheet();
 	const { colors } = useTheme();
-	const insets = useSafeAreaInsets();
 	const option = OPTIONS.find(option => option.value === value) || OPTIONS[2];
 
 	const getOptions = () => (
-		<View style={{ backgroundColor: colors.surfaceRoom, marginBottom: insets.bottom }}>
+		<View style={{ backgroundColor: colors.surfaceRoom }}>
 			{OPTIONS.map(i => (
 				<List.Radio
 					onPress={() => {
@@ -90,6 +90,7 @@ const ListPicker = ({
 
 	return (
 		<List.Item
+			testID={testID}
 			onPress={() => showActionSheet({ children: getOptions() })}
 			title={() => (
 				<View style={styles.leftTitleContainer}>
diff --git a/app/views/RoomsListView/components/ServersList.tsx b/app/views/RoomsListView/components/ServersList.tsx
index a1a052ae451..3797ff2212c 100644
--- a/app/views/RoomsListView/components/ServersList.tsx
+++ b/app/views/RoomsListView/components/ServersList.tsx
@@ -1,6 +1,5 @@
 import React, { memo, useLayoutEffect, useRef, useState } from 'react';
 import { FlatList, Text, View } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { batch, useDispatch } from 'react-redux';
 import { type Subscription } from 'rxjs';
 
@@ -37,7 +36,6 @@ const ServersList = () => {
 	const server = useAppSelector(state => state.server.server);
 	const isMasterDetail = useAppSelector(state => state.app.isMasterDetail);
 	const { colors } = useTheme();
-	const insets = useSafeAreaInsets();
 
 	useLayoutEffect(() => {
 		const init = () => {
@@ -124,8 +122,7 @@ const ServersList = () => {
 		<View
 			style={{
 				backgroundColor: colors.surfaceLight,
-				borderColor: colors.strokeLight,
-				marginBottom: insets.bottom
+				borderColor: colors.strokeLight
 			}}
 			testID='rooms-list-header-servers-list'>
 			<View style={[styles.serversListContainerHeader, styles.serverHeader, { borderColor: colors.strokeLight }]}>
diff --git a/app/views/UserNotificationPreferencesView/ListPicker.tsx b/app/views/UserNotificationPreferencesView/ListPicker.tsx
index 707764e8aeb..9c95f87f3b4 100644
--- a/app/views/UserNotificationPreferencesView/ListPicker.tsx
+++ b/app/views/UserNotificationPreferencesView/ListPicker.tsx
@@ -43,7 +43,7 @@ const ListPicker = ({
 	const insets = useSafeAreaInsets();
 
 	const getOptions = (): React.ReactElement => (
-		<View style={{ backgroundColor: colors.surfaceRoom, marginBottom: insets.bottom }}>
+		<View style={{ backgroundColor: colors.surfaceRoom, paddingBottom: insets.bottom }}>
 			<List.Separator />
 			{OPTIONS[preference].map(i => (
 				<React.Fragment key={i.value}>
diff --git a/tests/owl/actionSheets.owl.tsx b/tests/owl/actionSheets.owl.tsx
new file mode 100644
index 00000000000..5ea0dc2b66b
--- /dev/null
+++ b/tests/owl/actionSheets.owl.tsx
@@ -0,0 +1,50 @@
+/* eslint-env jest */
+
+import { press, reload, takeScreenshot } from 'react-native-owl';
+
+jest.setTimeout(120000);
+
+// Owl runs one build per fixture (OWL_FIXTURE is inlined at build time), but a
+// single build serves every device/orientation. The simulator/emulator and the
+// orientation are driven by CI, which exposes the leg via OWL_VARIANT so each
+// baseline filename is unique (e.g. iphone16pro-landscape-action-sheet-...).
+// All iOS baselines live under .owl/baseline/ios and Android under
+// .owl/baseline/android, so the variant prefix is what keeps them from clashing.
+const variant = process.env.OWL_VARIANT || 'local';
+const screenshotName = (name: string) => `${variant}-${name}`;
+
+const wait = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms));
+
+// The action sheet present animation is intentionally slowed on CI
+// (UIAnimationDragCoefficient), so wait generously for it to settle before
+// capturing the screenshot.
+const SHEET_PRESENT_DELAY = 6000;
+const APP_READY_DELAY = 2000;
+
+const SHEETS = [
+	{ name: 'servers-list', trigger: 'owl-trigger-servers-list' },
+	{ name: 'directory-options', trigger: 'owl-trigger-directory-options' },
+	{ name: 'media-auto-download', trigger: 'owl-trigger-media-auto-download' },
+	{ name: 'user-notification-preferences', trigger: 'owl-trigger-user-notification-prefs' }
+];
+
+describe('Action sheet safe-area spacing', () => {
+	beforeEach(async () => {
+		// Reload between sheets so the previous sheet is dismissed and the screen
+		// is back to the trigger list. Device orientation is OS-level and persists
+		// across reloads.
+		await reload();
+		await wait(APP_READY_DELAY);
+	});
+
+	SHEETS.forEach(({ name, trigger }) => {
+		it(`matches the ${name} action sheet`, async () => {
+			await press(trigger);
+			await wait(SHEET_PRESENT_DELAY);
+
+			const screen = await takeScreenshot(screenshotName(`action-sheet-${name}`));
+
+			expect(screen).toMatchBaseline();
+		});
+	});
+});

From f55ea6c5bc863c405f5f5e0a472d727c550318db Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Tue, 9 Jun 2026 18:29:19 -0300
Subject: [PATCH 03/23] feat: visual regression test start

---
 .owl/.gitignore                           |   4 +
 app/owls/OwlRoot.tsx                      |  94 ++++++++----
 app/owls/OwlScreensNavigator.tsx          |  68 +++++++++
 app/owls/fixtures/ActionSheetsFixture.tsx | 110 --------------
 app/owls/fixtures/SmokeFixture.tsx        | 169 ----------------------
 app/owls/fixtures/index.tsx               |  57 --------
 app/views/MediaAutoDownloadView/index.tsx |   7 +-
 index.js                                  |   2 +-
 ios/owl-build.sh                          |  32 ++++
 owl.config.json                           |   1 +
 tests/owl/actionSheets.owl.tsx            |  43 +++---
 tests/owl/smoke.owl.tsx                   |  26 ----
 12 files changed, 202 insertions(+), 411 deletions(-)
 create mode 100644 .owl/.gitignore
 create mode 100644 app/owls/OwlScreensNavigator.tsx
 delete mode 100644 app/owls/fixtures/ActionSheetsFixture.tsx
 delete mode 100644 app/owls/fixtures/SmokeFixture.tsx
 delete mode 100644 app/owls/fixtures/index.tsx
 create mode 100755 ios/owl-build.sh
 delete mode 100644 tests/owl/smoke.owl.tsx

diff --git a/.owl/.gitignore b/.owl/.gitignore
new file mode 100644
index 00000000000..6228912f870
--- /dev/null
+++ b/.owl/.gitignore
@@ -0,0 +1,4 @@
+# generated by react-native-owl
+diff/
+latest/
+report/
diff --git a/app/owls/OwlRoot.tsx b/app/owls/OwlRoot.tsx
index bb6d74dfdff..f8b6bbd981e 100644
--- a/app/owls/OwlRoot.tsx
+++ b/app/owls/OwlRoot.tsx
@@ -1,18 +1,23 @@
 import React from 'react';
-import { StatusBar, StyleSheet } from 'react-native';
+import { Dimensions, StatusBar, StyleSheet } from 'react-native';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { KeyboardProvider } from 'react-native-keyboard-controller';
 import RNBootSplash from 'react-native-bootsplash';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
+import { NavigationContainer } from '@react-navigation/native';
 import { Provider } from 'react-redux';
 
 import { setUser } from '../actions/login';
 import { selectServerRequest } from '../actions/server';
-import MessageContext from '../containers/message/Context';
+import { ActionSheetProvider } from '../containers/ActionSheet';
+import { DimensionsContext } from '../dimensions';
 import { colors } from '../lib/constants/colors';
+import database from '../lib/database';
+import ResponsiveLayoutProvider from '../lib/hooks/useResponsiveLayout/useResponsiveLayout';
 import { initStore } from '../lib/store/auxStore';
 import { createMockedStore } from '../reducers/mockedStore';
 import { ThemeContext } from '../theme';
-import { renderOwlFixture } from './fixtures';
+import OwlScreensNavigator from './OwlScreensNavigator';
 
 const styles = StyleSheet.create({
 	fill: {
@@ -26,16 +31,56 @@ const store = createMockedStore();
 initStore(store);
 store.dispatch(selectServerRequest(baseUrl, '8.0.0'));
 store.dispatch(setUser({ id: 'abc', username: 'rocket.cat', name: 'Rocket Cat', roles: ['user'] }));
+// Real screens (RoomsListView) read from the active WatermelonDB. Set it up so
+// subscription queries resolve to an empty, deterministic state instead of
+// crashing on an undefined database.
+database.setActiveDB(baseUrl);
 
-type Props = {
-	fixture?: string;
+// Seed the servers DB so the ServersList action sheet shows real workspace rows.
+// The first one matches the active server, so it renders with the selected check.
+// Empty iconURL makes ServerItem fall back to the bundled logo (no network).
+const MOCK_SERVERS = [
+	{ id: baseUrl, name: 'Rocket.Chat' },
+	{ id: 'https://team.rocket.chat', name: 'Rocket.Chat Team' },
+	{ id: 'https://community.rocket.chat', name: 'Community' }
+];
+
+const seedMockServers = async () => {
+	const serversCollection = database.servers.get('servers');
+	const count = await serversCollection.query().fetchCount();
+	if (count > 0) {
+		return;
+	}
+	await database.servers.write(async () => {
+		await Promise.all(
+			MOCK_SERVERS.map(server =>
+				serversCollection.create((record: any) => {
+					record._raw.id = server.id;
+					record.name = server.name;
+					record.iconURL = '';
+					record.version = '8.0.0';
+				})
+			)
+		);
+	});
 };
 
-const OwlRoot = ({ fixture }: Props) => {
+seedMockServers();
+
+/**
+ * Owl host that renders the real application screens inside the same provider
+ * tree as `app/index.tsx` (store, theme, responsive layout, dimensions, gesture
+ * handler, keyboard, action sheet) plus a NavigationContainer + native stack so
+ * each screen mounts with its real header/triggers. The Owl test navigates to a
+ * screen and opens its real action sheet, so baselines are real screens.
+ */
+const OwlRoot = () => {
 	React.useEffect(() => {
 		RNBootSplash.hide({ fade: false });
 	}, []);
 
+	const { width, height, scale, fontScale } = Dimensions.get('window');
+
 	return (
 		<SafeAreaProvider style={styles.fill}>
 			<Provider store={store}>
@@ -44,29 +89,20 @@ const OwlRoot = ({ fixture }: Props) => {
 						theme: 'light',
 						colors: colors.light
 					}}>
-					<MessageContext.Provider
-						value={{
-							user: {
-								id: 'abc',
-								username: 'rocket.cat',
-								token: 'owl-token'
-							},
-							baseUrl,
-							onPress: () => {},
-							onLongPress: () => {},
-							reactionInit: () => {},
-							onErrorPress: () => {},
-							replyBroadcast: () => {},
-							onReactionPress: () => {},
-							onDiscussionPress: () => {},
-							onReactionLongPress: () => {},
-							threadBadgeColor: colors.light.badgeBackgroundLevel1
-						}}>
-						<GestureHandlerRootView style={styles.fill}>
-							<StatusBar backgroundColor={colors.light.surfaceTint} barStyle='dark-content' />
-							{renderOwlFixture(fixture)}
-						</GestureHandlerRootView>
-					</MessageContext.Provider>
+					<ResponsiveLayoutProvider>
+						<DimensionsContext.Provider value={{ width, height, scale, fontScale, setDimensions: () => {} }}>
+							<GestureHandlerRootView style={styles.fill}>
+								<KeyboardProvider>
+									<ActionSheetProvider>
+										<StatusBar backgroundColor={colors.light.surfaceTint} barStyle='dark-content' />
+										<NavigationContainer>
+											<OwlScreensNavigator />
+										</NavigationContainer>
+									</ActionSheetProvider>
+								</KeyboardProvider>
+							</GestureHandlerRootView>
+						</DimensionsContext.Provider>
+					</ResponsiveLayoutProvider>
 				</ThemeContext.Provider>
 			</Provider>
 		</SafeAreaProvider>
diff --git a/app/owls/OwlScreensNavigator.tsx b/app/owls/OwlScreensNavigator.tsx
new file mode 100644
index 00000000000..f17c6f0029b
--- /dev/null
+++ b/app/owls/OwlScreensNavigator.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import { Pressable, ScrollView, StyleSheet, Text } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+
+import { colors } from '../lib/constants/colors';
+import DirectoryView from '../views/DirectoryView';
+import MediaAutoDownloadView from '../views/MediaAutoDownloadView';
+import RoomsListView from '../views/RoomsListView';
+import UserNotificationPreferencesView from '../views/UserNotificationPreferencesView';
+
+const Stack = createNativeStackNavigator();
+
+// Thin launcher used only to navigate to a real screen. It is never captured in
+// a baseline — the test always navigates away before taking a screenshot, so
+// every baseline is a real application screen with its real action sheet.
+const LINKS = [
+	{ route: 'RoomsListView', label: 'Rooms list', testID: 'owl-nav-rooms-list' },
+	{ route: 'DirectoryView', label: 'Directory', testID: 'owl-nav-directory' },
+	{ route: 'MediaAutoDownloadView', label: 'Media auto-download', testID: 'owl-nav-media-auto-download' },
+	{ route: 'UserNotificationPrefView', label: 'Notification preferences', testID: 'owl-nav-user-notification-prefs' }
+] as const;
+
+const styles = StyleSheet.create({
+	launcher: {
+		flexGrow: 1,
+		justifyContent: 'center',
+		gap: 16,
+		padding: 24,
+		backgroundColor: colors.light.surfaceRoom
+	},
+	button: {
+		backgroundColor: colors.light.buttonBackgroundPrimaryDefault,
+		borderRadius: 12,
+		paddingVertical: 16,
+		alignItems: 'center'
+	},
+	buttonText: {
+		color: colors.light.buttonFontPrimary,
+		fontSize: 16,
+		fontWeight: '700'
+	}
+});
+
+const Launcher = () => {
+	const navigation = useNavigation<any>();
+	return (
+		<ScrollView contentContainerStyle={styles.launcher} testID='owl-launcher'>
+			{LINKS.map(link => (
+				<Pressable key={link.route} testID={link.testID} style={styles.button} onPress={() => navigation.navigate(link.route)}>
+					<Text style={styles.buttonText}>{link.label}</Text>
+				</Pressable>
+			))}
+		</ScrollView>
+	);
+};
+
+const OwlScreensNavigator = () => (
+	<Stack.Navigator initialRouteName='Launcher' screenOptions={{ headerBackButtonDisplayMode: 'minimal' }}>
+		<Stack.Screen name='Launcher' component={Launcher} options={{ headerShown: false }} />
+		<Stack.Screen name='RoomsListView' component={RoomsListView} />
+		<Stack.Screen name='DirectoryView' component={DirectoryView} />
+		<Stack.Screen name='MediaAutoDownloadView' component={MediaAutoDownloadView} />
+		<Stack.Screen name='UserNotificationPrefView' component={UserNotificationPreferencesView} />
+	</Stack.Navigator>
+);
+
+export default OwlScreensNavigator;
diff --git a/app/owls/fixtures/ActionSheetsFixture.tsx b/app/owls/fixtures/ActionSheetsFixture.tsx
deleted file mode 100644
index bc567628782..00000000000
--- a/app/owls/fixtures/ActionSheetsFixture.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import React from 'react';
-import { ScrollView, StyleSheet, Text, View } from 'react-native';
-
-import { ActionSheetProvider, useActionSheet } from '../../containers/ActionSheet';
-import Button from '../../containers/Button';
-import { colors } from '../../lib/constants/colors';
-import DirectoryOptions from '../../views/DirectoryView/Options';
-import MediaAutoDownloadListPicker from '../../views/MediaAutoDownloadView/ListPicker';
-import ServersList from '../../views/RoomsListView/components/ServersList';
-import UserNotificationPreferencesListPicker from '../../views/UserNotificationPreferencesView/ListPicker';
-
-const styles = StyleSheet.create({
-	scrollView: {
-		flex: 1,
-		backgroundColor: colors.light.surfaceTint
-	},
-	content: {
-		padding: 24,
-		gap: 16
-	},
-	title: {
-		color: colors.light.fontTitlesLabels,
-		fontSize: 22,
-		fontWeight: '700'
-	},
-	subtitle: {
-		color: colors.light.fontSecondaryInfo,
-		fontSize: 15,
-		lineHeight: 22
-	},
-	pickerCard: {
-		backgroundColor: colors.light.surfaceRoom,
-		borderColor: colors.light.strokeExtraLight,
-		borderRadius: 12,
-		borderWidth: 1,
-		overflow: 'hidden'
-	}
-});
-
-/**
- * Renders the four action sheets that share the bottom safe-area spacing fix
- * (ServersList, DirectoryView options, and the Media-auto-download &
- * User-notification-preferences list pickers). Each trigger lives on the same
- * screen so a single Owl build can drive every sheet; the test opens them one
- * at a time and screenshots the presented native sheet.
- */
-const Triggers = () => {
-	const { showActionSheet } = useActionSheet();
-
-	return (
-		<ScrollView style={styles.scrollView} contentContainerStyle={styles.content} testID='owl-action-sheets-root'>
-			<Text style={styles.title}>Action sheet safe-area fixtures</Text>
-			<Text style={styles.subtitle}>
-				Each control below opens one of the action sheets affected by the bottom safe-area spacing change.
-			</Text>
-
-			<Button
-				title='Open servers list'
-				testID='owl-trigger-servers-list'
-				onPress={() => showActionSheet({ children: <ServersList />, enableContentPanningGesture: false })}
-			/>
-
-			<Button
-				title='Open directory options'
-				testID='owl-trigger-directory-options'
-				onPress={() =>
-					showActionSheet({
-						children: (
-							<DirectoryOptions
-								type='channels'
-								globalUsers={false}
-								isFederationEnabled
-								changeType={() => {}}
-								toggleWorkspace={() => {}}
-							/>
-						),
-						enableContentPanningGesture: false
-					})
-				}
-			/>
-
-			<View style={styles.pickerCard}>
-				<MediaAutoDownloadListPicker
-					testID='owl-trigger-media-auto-download'
-					title='Images'
-					value='wifi'
-					onChangeValue={() => {}}
-				/>
-			</View>
-
-			<View style={styles.pickerCard}>
-				<UserNotificationPreferencesListPicker
-					testID='owl-trigger-user-notification-prefs'
-					preference='desktopNotifications'
-					value='all'
-					title='Desktop'
-					onChangeValue={() => {}}
-				/>
-			</View>
-		</ScrollView>
-	);
-};
-
-const ActionSheetsFixture = () => (
-	<ActionSheetProvider>
-		<Triggers />
-	</ActionSheetProvider>
-);
-
-export default ActionSheetsFixture;
diff --git a/app/owls/fixtures/SmokeFixture.tsx b/app/owls/fixtures/SmokeFixture.tsx
deleted file mode 100644
index 5b6652bf098..00000000000
--- a/app/owls/fixtures/SmokeFixture.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-import React from 'react';
-import { Pressable, ScrollView, StyleSheet, Text, View } from 'react-native';
-
-import { colors } from '../../lib/constants/colors';
-
-const styles = StyleSheet.create({
-	scrollView: {
-		flex: 1,
-		backgroundColor: colors.light.surfaceTint
-	},
-	content: {
-		padding: 24,
-		gap: 16
-	},
-	header: {
-		gap: 6
-	},
-	eyebrow: {
-		color: colors.light.fontInfo,
-		fontSize: 13,
-		fontWeight: '700',
-		letterSpacing: 1,
-		textTransform: 'uppercase'
-	},
-	title: {
-		color: colors.light.fontTitlesLabels,
-		fontSize: 28,
-		fontWeight: '700'
-	},
-	subtitle: {
-		color: colors.light.fontSecondaryInfo,
-		fontSize: 16,
-		lineHeight: 24
-	},
-	card: {
-		backgroundColor: colors.light.surfaceRoom,
-		borderColor: colors.light.strokeExtraLight,
-		borderRadius: 20,
-		borderWidth: 1,
-		padding: 20,
-		gap: 16
-	},
-	cardHeader: {
-		gap: 8
-	},
-	cardTitle: {
-		color: colors.light.fontTitlesLabels,
-		fontSize: 20,
-		fontWeight: '700'
-	},
-	cardBody: {
-		color: colors.light.fontDefault,
-		fontSize: 15,
-		lineHeight: 22
-	},
-	statsRow: {
-		flexDirection: 'row',
-		gap: 12
-	},
-	stat: {
-		flex: 1,
-		backgroundColor: colors.light.surfaceHover,
-		borderRadius: 14,
-		padding: 12
-	},
-	statLabel: {
-		color: colors.light.fontHint,
-		fontSize: 12,
-		fontWeight: '600',
-		textTransform: 'uppercase'
-	},
-	statValue: {
-		color: colors.light.fontTitlesLabels,
-		fontSize: 20,
-		fontWeight: '700',
-		marginTop: 6
-	},
-	cta: {
-		alignItems: 'center',
-		backgroundColor: colors.light.buttonBackgroundPrimaryDefault,
-		borderRadius: 14,
-		paddingHorizontal: 16,
-		paddingVertical: 14
-	},
-	ctaPressed: {
-		backgroundColor: colors.light.buttonBackgroundPrimaryPress
-	},
-	ctaLabel: {
-		color: colors.light.buttonFontPrimary,
-		fontSize: 16,
-		fontWeight: '700'
-	},
-	expandedPanel: {
-		backgroundColor: colors.light.statusBackgroundInfo,
-		borderRadius: 14,
-		padding: 16,
-		gap: 8
-	},
-	expandedTitle: {
-		color: colors.light.statusFontInfo,
-		fontSize: 16,
-		fontWeight: '700'
-	},
-	expandedBody: {
-		color: colors.light.fontDefault,
-		fontSize: 14,
-		lineHeight: 20
-	}
-});
-
-const stats = [
-	{ label: 'Alerts', value: '03' },
-	{ label: 'Unread', value: '12' },
-	{ label: 'Rooms', value: '128' }
-];
-
-const SmokeFixture = () => {
-	const [expanded, setExpanded] = React.useState(false);
-
-	return (
-		<ScrollView style={styles.scrollView} contentContainerStyle={styles.content} testID='owl-smoke-scroll'>
-			<View style={styles.header}>
-				<Text style={styles.eyebrow}>Visual Regression Harness</Text>
-				<Text style={styles.title}>Rocket.Chat mobile fixture</Text>
-				<Text style={styles.subtitle}>
-					This isolated surface is intentionally deterministic so new Owl regressions can land without depending on login, sync or
-					live server data.
-				</Text>
-			</View>
-
-			<View style={styles.card} testID='owl-smoke-root'>
-				<View style={styles.cardHeader}>
-					<Text style={styles.cardTitle}>Smoke fixture</Text>
-					<Text style={styles.cardBody}>
-						Use this as the first committed baseline, then add focused fixtures beside it for each regression under test.
-					</Text>
-				</View>
-
-				<View style={styles.statsRow}>
-					{stats.map(stat => (
-						<View key={stat.label} style={styles.stat}>
-							<Text style={styles.statLabel}>{stat.label}</Text>
-							<Text style={styles.statValue}>{stat.value}</Text>
-						</View>
-					))}
-				</View>
-
-				<Pressable
-					accessibilityRole='button'
-					onPress={() => setExpanded(value => !value)}
-					style={({ pressed }) => [styles.cta, (pressed || expanded) && styles.ctaPressed]}
-					testID='owl-smoke-toggle'>
-					<Text style={styles.ctaLabel}>{expanded ? 'Hide regression details' : 'Show regression details'}</Text>
-				</Pressable>
-
-				{expanded ? (
-					<View style={styles.expandedPanel} testID='owl-smoke-expanded'>
-						<Text style={styles.expandedTitle}>Expanded state</Text>
-						<Text style={styles.expandedBody}>
-							This second state exists to prove Owl can drive the fixture and compare more than one screenshot in CI.
-						</Text>
-					</View>
-				) : null}
-			</View>
-		</ScrollView>
-	);
-};
-
-export default SmokeFixture;
diff --git a/app/owls/fixtures/index.tsx b/app/owls/fixtures/index.tsx
deleted file mode 100644
index d2e277bcc7c..00000000000
--- a/app/owls/fixtures/index.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import { StyleSheet, Text, View } from 'react-native';
-
-import { colors } from '../../lib/constants/colors';
-import ActionSheetsFixture from './ActionSheetsFixture';
-import SmokeFixture from './SmokeFixture';
-
-const styles = StyleSheet.create({
-	container: {
-		flex: 1,
-		alignItems: 'center',
-		justifyContent: 'center',
-		backgroundColor: colors.light.surfaceTint,
-		padding: 24
-	},
-	title: {
-		color: colors.light.fontDanger,
-		fontSize: 20,
-		fontWeight: '700',
-		textAlign: 'center'
-	},
-	body: {
-		color: colors.light.fontSecondaryInfo,
-		fontSize: 15,
-		lineHeight: 22,
-		marginTop: 8,
-		textAlign: 'center'
-	}
-});
-
-const fixtures = {
-	smoke: SmokeFixture,
-	'action-sheets': ActionSheetsFixture
-};
-
-const UnknownFixture = ({ fixture }: { fixture: string }) => (
-	<View style={styles.container} testID='owl-unknown-fixture'>
-		<Text style={styles.title}>Unknown Owl fixture</Text>
-		<Text style={styles.body}>{`No visual regression fixture is registered for "${fixture}".`}</Text>
-	</View>
-);
-
-type FixtureName = keyof typeof fixtures;
-
-export const renderOwlFixture = (fixture?: string): React.ReactNode => {
-	if (!fixture) {
-		return <SmokeFixture />;
-	}
-
-	const resolvedFixture = fixtures[fixture as FixtureName];
-	if (resolvedFixture) {
-		const ResolvedFixture = resolvedFixture;
-		return <ResolvedFixture />;
-	}
-
-	return <UnknownFixture fixture={fixture} />;
-};
diff --git a/app/views/MediaAutoDownloadView/index.tsx b/app/views/MediaAutoDownloadView/index.tsx
index 59b1269ce52..3ea4642a435 100644
--- a/app/views/MediaAutoDownloadView/index.tsx
+++ b/app/views/MediaAutoDownloadView/index.tsx
@@ -35,7 +35,12 @@ const MediaAutoDownload = () => {
 			<List.Container>
 				<List.Section>
 					<List.Separator />
-					<ListPicker onChangeValue={setImagesPreference} value={imagesPreference as MediaDownloadOption} title='Image' />
+					<ListPicker
+						onChangeValue={setImagesPreference}
+						value={imagesPreference as MediaDownloadOption}
+						title='Image'
+						testID='media-auto-download-image'
+					/>
 					<List.Separator />
 					<ListPicker onChangeValue={setVideoPreference} value={videoPreference as MediaDownloadOption} title='Video' />
 					<List.Separator />
diff --git a/index.js b/index.js
index d6f49afdd35..5f1df6c1ae4 100644
--- a/index.js
+++ b/index.js
@@ -10,7 +10,7 @@ if (process.env.USE_OWL) {
 	AppRegistry.registerComponent(appName, () => {
 		const OwlRoot = require('./app/owls/OwlRoot').default;
 
-		return () => <OwlRoot fixture={process.env.OWL_FIXTURE} />;
+		return () => <OwlRoot />;
 	});
 } else if (process.env.USE_STORYBOOK) {
 	AppRegistry.registerComponent(appName, () => require('./.rnstorybook/index').default);
diff --git a/ios/owl-build.sh b/ios/owl-build.sh
new file mode 100755
index 00000000000..50d623ed4b3
--- /dev/null
+++ b/ios/owl-build.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+set -e
+
+# Owl iOS build helper.
+#
+# Two reasons this exists instead of letting react-native-owl run its default
+# `xcodebuild ... -sdk iphonesimulator`:
+#
+# 1. The RocketChat scheme embeds the "Rocket.Chat.Watch" Watch App. Forcing
+#    every target onto the iphonesimulator SDK breaks the watch target (WatchKit
+#    is unavailable there). Building for a *destination* lets each target pick its
+#    correct SDK, exactly like `pnpm ios` does.
+# 2. The product is "Rocket.Chat.app", but Owl derives the app name from the
+#    scheme ("RocketChat.app") for install/launch. We expose a copy under that
+#    name so Owl's default (absolute) path resolution works — a custom binaryPath
+#    would be resolved relative to /usr/libexec by Owl's PlistBuddy call and fail.
+
+# NOTE: do NOT pass CODE_SIGNING_ALLOWED=NO. The app reads its WatermelonDB path
+# from the App Group shared container, which requires the app-group entitlement.
+# Disabling signing strips entitlements and the app crashes on launch with
+# "Could not resolve database path". Simulator builds ad-hoc sign (and apply
+# entitlements) with no developer team, exactly like `pnpm ios`.
+xcodebuild \
+	-workspace ios/RocketChatRN.xcworkspace \
+	-scheme RocketChat \
+	-configuration Release \
+	-destination 'generic/platform=iOS Simulator' \
+	-derivedDataPath ios/build
+
+PRODUCTS="ios/build/Build/Products/Release-iphonesimulator"
+rm -rf "$PRODUCTS/RocketChat.app"
+cp -R "$PRODUCTS/Rocket.Chat.app" "$PRODUCTS/RocketChat.app"
diff --git a/owl.config.json b/owl.config.json
index 9ddf3b827af..b0b6c6933ad 100644
--- a/owl.config.json
+++ b/owl.config.json
@@ -4,6 +4,7 @@
 		"scheme": "RocketChat",
 		"configuration": "Release",
 		"device": "iPhone 16 Pro",
+		"buildCommand": "ios/owl-build.sh",
 		"quiet": true
 	},
 	"android": {
diff --git a/tests/owl/actionSheets.owl.tsx b/tests/owl/actionSheets.owl.tsx
index 5ea0dc2b66b..5ac6fb3c981 100644
--- a/tests/owl/actionSheets.owl.tsx
+++ b/tests/owl/actionSheets.owl.tsx
@@ -2,43 +2,50 @@
 
 import { press, reload, takeScreenshot } from 'react-native-owl';
 
-jest.setTimeout(120000);
+jest.setTimeout(180000);
 
-// Owl runs one build per fixture (OWL_FIXTURE is inlined at build time), but a
-// single build serves every device/orientation. The simulator/emulator and the
+// A single Owl build serves every device/orientation; the simulator/emulator and
 // orientation are driven by CI, which exposes the leg via OWL_VARIANT so each
-// baseline filename is unique (e.g. iphone16pro-landscape-action-sheet-...).
-// All iOS baselines live under .owl/baseline/ios and Android under
-// .owl/baseline/android, so the variant prefix is what keeps them from clashing.
+// baseline filename is unique (all iOS baselines share .owl/baseline/ios).
 const variant = process.env.OWL_VARIANT || 'local';
 const screenshotName = (name: string) => `${variant}-${name}`;
 
 const wait = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms));
 
-// The action sheet present animation is intentionally slowed on CI
-// (UIAnimationDragCoefficient), so wait generously for it to settle before
-// capturing the screenshot.
+// Real screens settle after mount (navigation push animation, DB/REST loading);
+// the action sheet present animation also needs time. Be generous so the capture
+// is of the fully settled state.
+const SCREEN_SETTLE_DELAY = 6000;
 const SHEET_PRESENT_DELAY = 6000;
 const APP_READY_DELAY = 2000;
 
-const SHEETS = [
-	{ name: 'servers-list', trigger: 'owl-trigger-servers-list' },
-	{ name: 'directory-options', trigger: 'owl-trigger-directory-options' },
-	{ name: 'media-auto-download', trigger: 'owl-trigger-media-auto-download' },
-	{ name: 'user-notification-preferences', trigger: 'owl-trigger-user-notification-prefs' }
+// Each case opens the real screen, then its real action sheet. The trigger lives
+// either in the navigation header (rooms list, directory) or the screen body
+// (the list-picker rows).
+const CASES = [
+	{ name: 'servers-list', nav: 'owl-nav-rooms-list', trigger: 'rooms-list-header-servers-list-button' },
+	{ name: 'directory-options', nav: 'owl-nav-directory', trigger: 'directory-view-filter' },
+	{ name: 'media-auto-download', nav: 'owl-nav-media-auto-download', trigger: 'media-auto-download-image' },
+	{
+		name: 'user-notification-preferences',
+		nav: 'owl-nav-user-notification-prefs',
+		trigger: 'user-notification-preference-view-alert'
+	}
 ];
 
 describe('Action sheet safe-area spacing', () => {
 	beforeEach(async () => {
-		// Reload between sheets so the previous sheet is dismissed and the screen
-		// is back to the trigger list. Device orientation is OS-level and persists
-		// across reloads.
+		// Reload returns to the launcher with the previous sheet dismissed. Device
+		// orientation is OS-level and persists across reloads.
 		await reload();
 		await wait(APP_READY_DELAY);
 	});
 
-	SHEETS.forEach(({ name, trigger }) => {
+	CASES.forEach(({ name, nav, trigger }) => {
 		it(`matches the ${name} action sheet`, async () => {
+			await press(nav);
+			await wait(SCREEN_SETTLE_DELAY);
+
 			await press(trigger);
 			await wait(SHEET_PRESENT_DELAY);
 
diff --git a/tests/owl/smoke.owl.tsx b/tests/owl/smoke.owl.tsx
deleted file mode 100644
index 05107219a7d..00000000000
--- a/tests/owl/smoke.owl.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-/* eslint-env jest */
-
-import { press, reload, takeScreenshot, toExist } from 'react-native-owl';
-
-jest.setTimeout(60000);
-
-describe('Owl smoke fixture', () => {
-	beforeEach(async () => {
-		await reload();
-	});
-
-	it('matches the default fixture state', async () => {
-		const screen = await takeScreenshot('smoke-initial');
-
-		expect(screen).toMatchBaseline();
-	});
-
-	it('matches the expanded fixture state', async () => {
-		await press('owl-smoke-toggle');
-		await toExist('owl-smoke-expanded');
-
-		const screen = await takeScreenshot('smoke-expanded');
-
-		expect(screen).toMatchBaseline();
-	});
-});

From 28c992d2a546252289636489b7ce6e89bf77d825 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Thu, 11 Jun 2026 16:36:21 -0300
Subject: [PATCH 04/23] feat: visual regression run/compare + e2e-style CI flow

Add a local "run & compare" command and a GitHub Actions flow for the
action-sheet visual regression, both sourcing baselines from the reference
repo (OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest).

- scripts/owl-compare.sh + pnpm owl:compare:{ios,android}: pull the prints
  for the current OWL_VARIANT into .owl/baseline/<platform>/ (the only path
  owl reads), run owl test, open the report.
- CI: orchestrator visual-regression.yml fans out build->run reusable
  workflows over 4 legs (iPhone 16 Pro, iPhone SE 3rd gen, Android portrait,
  Android landscape). Build once per platform, run downloads the app artifact
  to the path owl installs from.
- owl.config.json: android packageName chat.rocket.android.
- .owl/.gitignore: baselines/reference are pulled, never committed here.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../visual-regression-build-android.yml       |  90 ++++++
 .../workflows/visual-regression-build-ios.yml |  67 +++++
 .github/workflows/visual-regression-ios.yml   | 120 --------
 .../visual-regression-run-android.yml         | 114 ++++++++
 .../workflows/visual-regression-run-ios.yml   |  93 +++++++
 .github/workflows/visual-regression.yml       |  74 +++++
 .owl/.gitignore                               |  10 +
 android/app/build.gradle                      |  11 +
 app/owls/OwlScreensNavigator.tsx              |  14 +
 ios/Podfile.lock                              | 259 ++++++++++--------
 ios/RocketChatRN.xcodeproj/project.pbxproj    |   2 +-
 owl.config.json                               |   2 +-
 package.json                                  |   3 +
 patches/react-native-owl+1.5.0.patch          |  12 +
 pnpm-lock.yaml                                |  14 +
 scripts/owl-compare.sh                        | 113 ++++++++
 tests/owl/README.md                           |  87 ++++++
 tests/owl/actionSheets.owl.tsx                |  12 +-
 18 files changed, 860 insertions(+), 237 deletions(-)
 create mode 100644 .github/workflows/visual-regression-build-android.yml
 create mode 100644 .github/workflows/visual-regression-build-ios.yml
 delete mode 100644 .github/workflows/visual-regression-ios.yml
 create mode 100644 .github/workflows/visual-regression-run-android.yml
 create mode 100644 .github/workflows/visual-regression-run-ios.yml
 create mode 100644 .github/workflows/visual-regression.yml
 create mode 100644 patches/react-native-owl+1.5.0.patch
 create mode 100755 scripts/owl-compare.sh
 create mode 100644 tests/owl/README.md

diff --git a/.github/workflows/visual-regression-build-android.yml b/.github/workflows/visual-regression-build-android.yml
new file mode 100644
index 00000000000..9874c1035ba
--- /dev/null
+++ b/.github/workflows/visual-regression-build-android.yml
@@ -0,0 +1,90 @@
+name: Visual Regression Build Android
+
+# Reusable: builds the Owl Android APK ONCE and uploads it as an artifact. The
+# Android run leg downloads and reuses it. Owl builds Release (so USE_OWL is
+# inlined) and signs with the local debug key via the `isOwlBuild` fallback in
+# android/app/build.gradle — no production signing secrets are needed.
+
+on:
+  workflow_call:
+    outputs:
+      artifact:
+        description: Name of the uploaded Owl Android APK artifact
+        value: owl-app-android
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    env:
+      USE_OWL: true
+      RUNNING_E2E_TESTS: true
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      - name: Checkout and Setup Node
+        uses: ./.github/actions/setup-node
+
+      - name: Set up JDK
+        uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
+        with:
+          gradle-version: wrapper
+
+      - name: Cache Gradle dependencies
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        with:
+          path: |
+            ~/.gradle
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            gradle-${{ runner.os }}-
+
+      # build.gradle's isOwlBuild fallback signs the Release APK with the local
+      # Android debug key; create it if the runner doesn't have one yet.
+      - name: Ensure Android debug keystore
+        run: |
+          set -eux
+          mkdir -p "$HOME/.android"
+          if [ ! -f "$HOME/.android/debug.keystore" ]; then
+            keytool -genkeypair -v \
+              -keystore "$HOME/.android/debug.keystore" \
+              -storepass android -keypass android \
+              -alias androiddebugkey \
+              -keyalg RSA -keysize 2048 -validity 10000 \
+              -dname "CN=Android Debug,O=Android,C=US"
+          fi
+
+      - name: Set gradle.properties
+        working-directory: android
+        run: |
+          echo "" > ./gradle.properties
+          echo -e "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" >> ./gradle.properties
+          echo -e "android.useAndroidX=true" >> ./gradle.properties
+          echo -e "android.enableJetifier=true" >> ./gradle.properties
+          echo -e "reactNativeArchitectures=x86_64" >> ./gradle.properties
+          echo -e "APPLICATION_ID=chat.rocket.android" >> ./gradle.properties
+          echo -e "newArchEnabled=true" >> ./gradle.properties
+          echo -e "hermesEnabled=true" >> ./gradle.properties
+          echo -e "VERSIONCODE=999999" >> ./gradle.properties
+
+      - name: Build Owl APK
+        run: pnpm owl:build:android
+
+      - name: Upload Owl Android APK
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: owl-app-android
+          path: android/app/build/outputs/apk/release/app-release.apk
+          retention-days: 1
+          if-no-files-found: error
diff --git a/.github/workflows/visual-regression-build-ios.yml b/.github/workflows/visual-regression-build-ios.yml
new file mode 100644
index 00000000000..e295c5b6906
--- /dev/null
+++ b/.github/workflows/visual-regression-build-ios.yml
@@ -0,0 +1,67 @@
+name: Visual Regression Build iOS
+
+# Reusable: builds the Owl iOS app ONCE and uploads it as an artifact. Every
+# iOS run leg (iPhone 16 Pro, iPhone SE) downloads and reuses this single build
+# — the .app is device-agnostic, so there is no need to rebuild per device.
+
+on:
+  workflow_call:
+    outputs:
+      artifact:
+        description: Name of the uploaded Owl iOS app artifact
+        value: owl-app-ios
+
+jobs:
+  build:
+    runs-on: macos-26
+    timeout-minutes: 60
+    env:
+      USE_OWL: true
+      RUNNING_E2E_TESTS: true
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      - name: Checkout and Setup Node
+        uses: ./.github/actions/setup-node
+
+      - name: Set up Xcode
+        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
+        with:
+          xcode-version: '26.2.0'
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
+        with:
+          ruby-version: 2.7.7
+          bundler-cache: true
+
+      - name: Cache CocoaPods and derived data
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        with:
+          path: |
+            ios/Pods
+            ~/Library/Caches/CocoaPods
+            ~/.cocoapods/repos
+            ~/Library/Developer/Xcode/DerivedData
+          key: visual-regression-ios-${{ runner.os }}-${{ hashFiles('ios/Podfile.lock', 'ios/Podfile') }}
+          restore-keys: |
+            visual-regression-ios-${{ runner.os }}-
+
+      - name: Install CocoaPods
+        run: pnpm pod-install
+
+      - name: Build Owl app
+        run: pnpm owl:build:ios
+
+      # owl-build.sh derives data to ios/build and copies the product to
+      # RocketChat.app — the exact name+path `owl test` installs from on the run
+      # leg (scheme "RocketChat", Release-iphonesimulator).
+      - name: Upload Owl iOS app
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: owl-app-ios
+          path: ios/build/Build/Products/Release-iphonesimulator/RocketChat.app
+          retention-days: 1
+          if-no-files-found: error
diff --git a/.github/workflows/visual-regression-ios.yml b/.github/workflows/visual-regression-ios.yml
deleted file mode 100644
index bdb4aa0d3ee..00000000000
--- a/.github/workflows/visual-regression-ios.yml
+++ /dev/null
@@ -1,120 +0,0 @@
-name: Visual Regression iOS
-
-on:
-  workflow_dispatch:
-    inputs:
-      update_baseline:
-        description: 'Generate fresh baseline images instead of comparing against committed ones'
-        required: false
-        type: boolean
-        default: false
-      test_path_pattern:
-        description: 'Optional Owl testPathPattern'
-        required: false
-        type: string
-      test_name_pattern:
-        description: 'Optional Owl testNamePattern'
-        required: false
-        type: string
-  pull_request:
-    paths:
-      - '.github/workflows/visual-regression-ios.yml'
-      - 'app/owls/**'
-      - 'tests/owl/**'
-      - '.owl/baseline/**'
-      - 'owl.config.json'
-      - 'index.js'
-      - 'package.json'
-      - 'pnpm-lock.yaml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  visual-regression-ios:
-    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
-    runs-on: macos-26
-    timeout-minutes: 60
-    env:
-      USE_OWL: true
-      RUNNING_E2E_TESTS: true
-      OWL_DEVICE: iPhone 16 Pro
-      UPDATE_BASELINE: ${{ github.event_name == 'workflow_dispatch' && inputs.update_baseline || 'false' }}
-      TEST_PATH_PATTERN: ${{ github.event_name == 'workflow_dispatch' && inputs.test_path_pattern || '' }}
-      TEST_NAME_PATTERN: ${{ github.event_name == 'workflow_dispatch' && inputs.test_name_pattern || '' }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-
-      - name: Checkout and Setup Node
-        uses: ./.github/actions/setup-node
-
-      - name: Set up Xcode
-        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
-        with:
-          xcode-version: '26.2.0'
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
-        with:
-          ruby-version: 2.7.7
-          bundler-cache: true
-
-      - name: Cache CocoaPods and derived data
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: |
-            ios/Pods
-            ~/Library/Caches/CocoaPods
-            ~/.cocoapods/repos
-            ~/Library/Developer/Xcode/DerivedData
-          key: visual-regression-ios-${{ runner.os }}-${{ hashFiles('ios/Podfile.lock', 'ios/Podfile') }}
-          restore-keys: |
-            visual-regression-ios-${{ runner.os }}-
-
-      - name: Install CocoaPods
-        run: pnpm pod-install
-
-      - name: Boot simulator
-        run: |
-          xcrun simctl boot "$OWL_DEVICE" || true
-          xcrun simctl bootstatus "$OWL_DEVICE" -b
-          xcrun simctl spawn booted defaults write -g UIAnimationDragCoefficient -float 10
-
-      - name: Require committed baselines for compare mode
-        if: env.UPDATE_BASELINE != 'true'
-        run: |
-          test -d .owl/baseline/ios
-          find .owl/baseline/ios -name '*.png' -print -quit | grep -q .
-
-      - name: Build Owl app
-        run: pnpm owl:build:ios
-
-      - name: Run Owl tests
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          args=()
-          if [[ -n "$TEST_PATH_PATTERN" ]]; then
-            args+=(--testPathPattern "$TEST_PATH_PATTERN")
-          fi
-          if [[ -n "$TEST_NAME_PATTERN" ]]; then
-            args+=(--testNamePattern "$TEST_NAME_PATTERN")
-          fi
-
-          if [[ "$UPDATE_BASELINE" == "true" ]]; then
-            pnpm owl:test:update:ios -- "${args[@]}"
-          else
-            pnpm owl:test:ios -- "${args[@]}"
-          fi
-
-      - name: Upload Owl artifacts
-        if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: owl-ios-results
-          path: .owl
-          retention-days: 7
diff --git a/.github/workflows/visual-regression-run-android.yml b/.github/workflows/visual-regression-run-android.yml
new file mode 100644
index 00000000000..17a3dbf2ae3
--- /dev/null
+++ b/.github/workflows/visual-regression-run-android.yml
@@ -0,0 +1,114 @@
+name: Visual Regression Run Android
+
+# Reusable: runs one Android visual-regression leg against a pre-built Owl APK.
+# Downloads the APK, syncs the matching baseline prints from the reference repo,
+# then boots a Pixel 7 Pro emulator and compares. owl test installs the APK and
+# launches it itself inside the emulator-runner step.
+
+on:
+  workflow_call:
+    inputs:
+      variant:
+        description: 'OWL_VARIANT, e.g. android-portrait'
+        required: true
+        type: string
+      update_baseline:
+        description: 'Capture fresh baselines instead of comparing'
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    env:
+      USE_OWL: true
+      RUNNING_E2E_TESTS: true
+      OWL_VARIANT: ${{ inputs.variant }}
+      UPDATE_BASELINE: ${{ inputs.update_baseline }}
+      ANDROID_AVD_HOME: /home/runner/.android/avd
+      BASELINE_REPO: https://github.com/OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      - name: Checkout and Setup Node
+        uses: ./.github/actions/setup-node
+
+      - name: Setup Java
+        uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Cache Android AVD
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ runner.os }}-api34
+
+      # owl test installs <cwd>/android/app/build/outputs/apk/release/app-release.apk
+      - name: Download Owl APK
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: owl-app-android
+          path: android/app/build/outputs/apk/release
+
+      - name: Sync baseline prints from reference repo (compare mode)
+        if: ${{ !inputs.update_baseline }}
+        run: |
+          set -euo pipefail
+          git clone --depth=1 --quiet "$BASELINE_REPO" .owl/reference
+          rm -rf .owl/baseline/android
+          mkdir -p .owl/baseline/android
+          cp .owl/reference/app/containers/ActionSheet/"$OWL_VARIANT"-*.png .owl/baseline/android/
+          echo "Staged $(ls .owl/baseline/android | wc -l) baseline print(s) for $OWL_VARIANT"
+
+      - name: Enable KVM group permissions
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Disable unnecessary services (improves emulator stability)
+        run: |
+          sudo systemctl stop docker || true
+          sudo systemctl stop snapd || true
+
+      - name: Boot emulator and run Owl
+        uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0
+        timeout-minutes: 45
+        with:
+          api-level: 34
+          disk-size: 4096M
+          arch: x86_64
+          target: google_apis
+          profile: pixel_7_pro
+          cores: 4
+          ram-size: 4096M
+          force-avd-creation: false
+          disable-animations: true
+          emulator-boot-timeout: 900
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -accel on
+          script: |
+            if [ "$UPDATE_BASELINE" = "true" ]; then
+              pnpm owl:test:update:android
+            else
+              pnpm owl:test:android
+            fi
+
+      - name: Upload Owl results
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: owl-android-${{ inputs.variant }}
+          path: |
+            .owl/report
+            .owl/diff
+            .owl/latest
+            .owl/baseline/android
+          retention-days: 7
diff --git a/.github/workflows/visual-regression-run-ios.yml b/.github/workflows/visual-regression-run-ios.yml
new file mode 100644
index 00000000000..f5cba29a71b
--- /dev/null
+++ b/.github/workflows/visual-regression-run-ios.yml
@@ -0,0 +1,93 @@
+name: Visual Regression Run iOS
+
+# Reusable: runs one iOS visual-regression leg against a pre-built Owl app.
+# Downloads the app artifact, points owl at the requested simulator, syncs the
+# matching baseline prints from the reference repo, then compares.
+
+on:
+  workflow_call:
+    inputs:
+      variant:
+        description: 'OWL_VARIANT, e.g. iphone16pro-portrait'
+        required: true
+        type: string
+      device:
+        description: 'Simulator name, e.g. iPhone 16 Pro'
+        required: true
+        type: string
+      update_baseline:
+        description: 'Capture fresh baselines instead of comparing'
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  run:
+    runs-on: macos-26
+    timeout-minutes: 60
+    env:
+      USE_OWL: true
+      RUNNING_E2E_TESTS: true
+      OWL_VARIANT: ${{ inputs.variant }}
+      OWL_DEVICE: ${{ inputs.device }}
+      BASELINE_REPO: https://github.com/OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      - name: Checkout and Setup Node
+        uses: ./.github/actions/setup-node
+
+      - name: Set up Xcode
+        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
+        with:
+          xcode-version: '26.2.0'
+
+      # owl test installs <cwd>/ios/build/Build/Products/Release-iphonesimulator/RocketChat.app
+      - name: Download Owl iOS app
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: owl-app-ios
+          path: ios/build/Build/Products/Release-iphonesimulator/RocketChat.app
+
+      - name: Point Owl at the target simulator
+        run: |
+          node -e "const fs=require('fs');const f='owl.config.json';const c=JSON.parse(fs.readFileSync(f,'utf8'));c.ios.device=process.env.OWL_DEVICE;fs.writeFileSync(f,JSON.stringify(c,null,'\t')+'\n')"
+          echo "owl.config.json ios.device -> $OWL_DEVICE"
+
+      - name: Boot simulator
+        run: |
+          xcrun simctl boot "$OWL_DEVICE" || true
+          xcrun simctl bootstatus "$OWL_DEVICE" -b
+          xcrun simctl spawn booted defaults write -g UIAnimationDragCoefficient -float 10
+
+      - name: Sync baseline prints from reference repo (compare mode)
+        if: ${{ !inputs.update_baseline }}
+        run: |
+          set -euo pipefail
+          git clone --depth=1 --quiet "$BASELINE_REPO" .owl/reference
+          rm -rf .owl/baseline/ios
+          mkdir -p .owl/baseline/ios
+          cp .owl/reference/app/containers/ActionSheet/"$OWL_VARIANT"-*.png .owl/baseline/ios/
+          echo "Staged $(ls .owl/baseline/ios | wc -l) baseline print(s) for $OWL_VARIANT"
+
+      - name: Compare against baselines
+        if: ${{ !inputs.update_baseline }}
+        run: pnpm owl:test:ios
+
+      - name: Capture fresh baselines
+        if: ${{ inputs.update_baseline }}
+        run: pnpm owl:test:update:ios
+
+      - name: Upload Owl results
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: owl-ios-${{ inputs.variant }}
+          path: |
+            .owl/report
+            .owl/diff
+            .owl/latest
+            .owl/baseline/ios
+          retention-days: 7
diff --git a/.github/workflows/visual-regression.yml b/.github/workflows/visual-regression.yml
new file mode 100644
index 00000000000..4d94359c534
--- /dev/null
+++ b/.github/workflows/visual-regression.yml
@@ -0,0 +1,74 @@
+name: Visual Regression
+
+# Orchestrates the action-sheet visual-regression flow across all device legs,
+# mirroring the e2e build->run shape: build each platform's Owl app once, then
+# fan out the comparison over devices/orientations. Baselines are pulled from the
+# reference repo (OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest) at
+# run time — nothing baseline-related is committed in this repo.
+#
+# Legs: iPhone 16 Pro, iPhone SE (3rd gen, low-height), Android portrait + landscape.
+
+on:
+  workflow_dispatch:
+    inputs:
+      update_baseline:
+        description: 'Capture fresh baselines instead of comparing against the reference repo'
+        required: false
+        type: boolean
+        default: false
+  pull_request:
+    paths:
+      - '.github/workflows/visual-regression*.yml'
+      - 'app/owls/**'
+      - 'tests/owl/**'
+      - 'scripts/owl-compare.sh'
+      - 'owl.config.json'
+      - 'index.js'
+      - 'package.json'
+      - 'pnpm-lock.yaml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-ios:
+    name: Build iOS
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    uses: ./.github/workflows/visual-regression-build-ios.yml
+
+  run-ios:
+    name: Run iOS (${{ matrix.variant }})
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    needs: [build-ios]
+    uses: ./.github/workflows/visual-regression-run-ios.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - variant: iphone16pro-portrait
+            device: iPhone 16 Pro
+          - variant: iphonese-portrait
+            device: iPhone SE (3rd generation)
+    with:
+      variant: ${{ matrix.variant }}
+      device: ${{ matrix.device }}
+      update_baseline: ${{ github.event_name == 'workflow_dispatch' && inputs.update_baseline || false }}
+
+  build-android:
+    name: Build Android
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    uses: ./.github/workflows/visual-regression-build-android.yml
+
+  run-android:
+    name: Run Android (${{ matrix.variant }})
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    needs: [build-android]
+    uses: ./.github/workflows/visual-regression-run-android.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        variant: [android-portrait, android-landscape]
+    with:
+      variant: ${{ matrix.variant }}
+      update_baseline: ${{ github.event_name == 'workflow_dispatch' && inputs.update_baseline || false }}
diff --git a/.owl/.gitignore b/.owl/.gitignore
index 6228912f870..a197d82492c 100644
--- a/.owl/.gitignore
+++ b/.owl/.gitignore
@@ -2,3 +2,13 @@
 diff/
 latest/
 report/
+
+# cloned baseline reference repo (source of the action-sheet prints)
+reference/
+
+# Baselines are NOT committed here — the reference repo
+# (OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest) is the source of
+# truth. `scripts/owl-compare.sh` pulls the prints and stages them into
+# baseline/<platform>/ at compare time. `baseline/ActionSheet/` is a local
+# offline-fallback cache.
+baseline/
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8e23aa667ae..651f28d14d7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -104,6 +104,17 @@ android {
                 storePassword KEYSTORE_PASSWORD
                 keyAlias KEY_ALIAS
                 keyPassword KEY_PASSWORD
+            } else if (project.hasProperty('isOwlBuild')) {
+                // Visual-regression (Owl) builds must be Release so `USE_OWL` is
+                // inlined into the JS bundle, but they are never shipped. Without a
+                // release keystore the APK would be unsigned and impossible to
+                // install on an emulator, so sign it with the local Android debug
+                // key. Gated on `isOwlBuild` (passed by react-native-owl) so real
+                // release builds are unaffected.
+                storeFile file("${System.properties['user.home']}/.android/debug.keystore")
+                storePassword 'android'
+                keyAlias 'androiddebugkey'
+                keyPassword 'android'
             }
         }
     }
diff --git a/app/owls/OwlScreensNavigator.tsx b/app/owls/OwlScreensNavigator.tsx
index f17c6f0029b..69a3a1fda3e 100644
--- a/app/owls/OwlScreensNavigator.tsx
+++ b/app/owls/OwlScreensNavigator.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { Pressable, ScrollView, StyleSheet, Text } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import * as ScreenOrientation from 'expo-screen-orientation';
 
 import { colors } from '../lib/constants/colors';
 import DirectoryView from '../views/DirectoryView';
@@ -42,10 +43,23 @@ const styles = StyleSheet.create({
 	}
 });
 
+// Orientation is driven from JS (not by rotating the device) so it works in CI
+// and locally without Accessibility/synthetic input. LANDSCAPE_LEFT is fixed for
+// determinism. iOS Info.plist already allows landscape and the Android
+// MainActivity handles orientation changes, so no orientation boundaries change.
+const setLandscape = () => ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.LANDSCAPE_LEFT);
+const setPortrait = () => ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.PORTRAIT_UP);
+
 const Launcher = () => {
 	const navigation = useNavigation<any>();
 	return (
 		<ScrollView contentContainerStyle={styles.launcher} testID='owl-launcher'>
+			<Pressable testID='owl-set-portrait' style={styles.button} onPress={setPortrait}>
+				<Text style={styles.buttonText}>Portrait</Text>
+			</Pressable>
+			<Pressable testID='owl-set-landscape' style={styles.button} onPress={setLandscape}>
+				<Text style={styles.buttonText}>Landscape</Text>
+			</Pressable>
 			{LINKS.map(link => (
 				<Pressable key={link.route} testID={link.testID} style={styles.button} onPress={() => navigation.navigate(link.route)}>
 					<Text style={styles.buttonText}>{link.label}</Text>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d251bccdaf4..72bd04dc18b 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -129,6 +129,35 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
+  - ExpoScreenOrientation (9.0.9):
+    - boost
+    - DoubleConversion
+    - ExpoModulesCore
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - SocketRocket
+    - Yoga
   - ExpoSystemUI (6.0.9):
     - ExpoModulesCore
   - ExpoVideoThumbnails (10.0.8):
@@ -3566,6 +3595,7 @@ DEPENDENCIES:
   - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - ExpoLocalAuthentication (from `../node_modules/expo-local-authentication/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
+  - ExpoScreenOrientation (from `../node_modules/expo-screen-orientation/ios`)
   - ExpoSystemUI (from `../node_modules/expo-system-ui/ios`)
   - ExpoVideoThumbnails (from `../node_modules/expo-video-thumbnails/ios`)
   - ExpoWebBrowser (from `../node_modules/expo-web-browser/ios`)
@@ -3756,6 +3786,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-local-authentication/ios"
   ExpoModulesCore:
     :path: "../node_modules/expo-modules-core"
+  ExpoScreenOrientation:
+    :path: "../node_modules/expo-screen-orientation/ios"
   ExpoSystemUI:
     :path: "../node_modules/expo-system-ui/ios"
   ExpoVideoThumbnails:
@@ -3982,29 +4014,30 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
-  BugsnagReactNative: f3c40a61779de6de394e472407b4d14f27d30c1b
-  BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
+  BugsnagReactNative: 2078dec76e54db9f6e687743af45dc3673cb32ab
+  BVLinearGradient: 7815a70ab485b7b155186dd0cc836363e0288cad
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
-  EXApplication: 13420f8139864183f8a04fd6099077bdf8cfb186
-  EXAV: c2de1057f4d9b0bcbdd908c6f2dcff48ece36f2b
-  EXConstants: 6c818a84354d194cb4d5d78990108a7c0f590e30
-  EXNotifications: 66e91bc2cde4123b371773fd479bacd3cd699e79
-  Expo: 595a1f6bf379ffadd2c19cfcdd1f62a4f130428e
-  ExpoAppleAuthentication: 31bb6cdc57d7169e5d994fff7ec4b97c62423534
-  ExpoAsset: d999f3bbd998a750f3b74cb913229848901b926b
-  ExpoCamera: 44705f35b32741582d00c69187c8ee59669ed46e
-  ExpoDevice: 0773c782b055558ca9b40b74aa4a8133a66cd0d2
-  ExpoDocumentPicker: 774b0d1f41468f79148e8201afd094ca852e9e42
-  ExpoFileSystem: aefcd337b94b874f88752ebefc52813b84992fad
-  ExpoFont: 26bbea90749b8dd0b69effc9fab54248e684f290
-  ExpoHaptics: 7240781406f4563c3f4eb1e72864302a8c643fd0
-  ExpoImage: f6bcd30bb98d4c484869668fbc32834bb3ee5bfb
-  ExpoKeepAwake: 44bf6715bc1d2ddb17afe19d927cd039cda123f0
-  ExpoLocalAuthentication: a5d1c60718a852faa1852ef76298d8a167dc99f5
-  ExpoModulesCore: e80c5fef91bcdfcbe3acba33ddc53666be4a7fcc
-  ExpoSystemUI: 4611247a411f231229f7e04449856035bd18ba21
-  ExpoVideoThumbnails: 9fccaa03acb8991317d1c26909003ea2bc064d73
-  ExpoWebBrowser: 88b116cd378d9609c776c0903fe4070fca461588
+  EXApplication: 1e98d4b1dccdf30627f92917f4b2c5a53c330e5f
+  EXAV: b60fcf142fae6684d295bc28cd7cfcb3335570ea
+  EXConstants: 805f35b1b295c542ca6acce836f21a1f9ee104d5
+  EXNotifications: 983f04ad4ad879b181179e326bf220541e478386
+  Expo: 6118272de314ed3d4bc74de3b1229b8f5b324ef1
+  ExpoAppleAuthentication: 9413ae9a5e631a424cc04c1b13b0694dbab7d594
+  ExpoAsset: f867e55ceb428aab99e1e8c082b5aee7c159ea18
+  ExpoCamera: 6a326deb45ba840749652e4c15198317aa78497e
+  ExpoDevice: 6327c3c200816795708885adf540d26ecab83d1a
+  ExpoDocumentPicker: 7cd9e71a0f66fb19eb0a586d6f26eee1284692e0
+  ExpoFileSystem: 858a44267a3e6e9057e0888ad7c7cfbf55d52063
+  ExpoFont: 35ac6191ed86bbf56b3ebd2d9154eda9fad5b509
+  ExpoHaptics: d3a6375d8dcc3a1083d003bc2298ff654fafb536
+  ExpoImage: 686f972bff29525733aa13357f6691dc90aa03d8
+  ExpoKeepAwake: 55f75eca6499bb9e4231ebad6f3e9cb8f99c0296
+  ExpoLocalAuthentication: 8a31808565da7af926dd9b595e98594d8b1553b6
+  ExpoModulesCore: 91a57f1d109cf53fe58d44fcf6b68a777561549a
+  ExpoScreenOrientation: 6a6bfbeef1fbb10ed767dfa169784c3938e54dc7
+  ExpoSystemUI: 2ad325f361a2fcd96a464e8574e19935c461c9cc
+  ExpoVideoThumbnails: 503a79271416c8723f04b55ea4737282513ebe4f
+  ExpoWebBrowser: 17b064c621789e41d4816c95c93f429b84971f52
   fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6
   FBLazyVector: 5beb8028d5a2e75dd9634917f23e23d3a061d2aa
   Firebase: 6a8f201c61eda24e98f1ce2b44b1b9c2caf525cc
@@ -4028,10 +4061,10 @@ SPEC CHECKSUMS:
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
   MMKV: 1a8e7dbce7f9cad02c52e1b1091d07bd843aefaf
   MMKVCore: f2dd4c9befea04277a55e84e7812f930537993df
-  MobileCrypto: 4065a6dbb9f17ee844a16a47992105ee9485af43
+  MobileCrypto: 41cd66d5588e979cf95d1ff6ae2eec88eb284ef1
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  NitroMmkv: c4126230c8e2f1aa47bf03f79aaacd8efcd38427
-  NitroModules: 48aec2edf6b27107348200ba5d0cb12c831fe02c
+  NitroMmkv: 4a2d747ce97a4ae740b3cb3a3853366813faf831
+  NitroModules: 18e41c298d86fc753fc754969fa9f84044e70711
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f
@@ -4040,97 +4073,97 @@ SPEC CHECKSUMS:
   RCTTypeSafety: b99aa872829ee18f6e777e0ef55852521c5a6788
   React: 914f8695f9bf38e6418228c2ffb70021e559f92f
   React-callinvoker: 23cd4e33928608bd0cc35357597568b8b9a5f068
-  React-Core: 895a479e2e0331f48af3ad919bece917926a0b7d
-  React-CoreModules: dfa38212cf3a91f2eb84ccd43d747d006d33449e
-  React-cxxreact: 7a4e2c77e564792252131e63270f6184d93343b3
+  React-Core: 6a0a97598e9455348113bfe4c573fe8edac34469
+  React-CoreModules: a88a6ca48b668401b9780e272e2a607e70f9f955
+  React-cxxreact: 06265fd7e8d5c3b6b49e00d328ef76e5f1ae9c8b
   React-debug: 29aed758c756956a51b4560223edbd15191ca4c5
-  React-defaultsnativemodule: ee4e3ca63b29c8b91448a6760d72063196ed0796
-  React-domnativemodule: 4d29aad12ebb2b5aa34043e5bdd191a92821f3aa
-  React-Fabric: 21f78a4856240d39a663a52c452e223c5e412098
-  React-FabricComponents: 13fc0ac39a488cea00c83ffa7b16113f024d66e6
-  React-FabricImage: 8961abe0372d20679ee093d144aaf5fb1227bf41
-  React-featureflags: 018934f958e6b83907e71631599b02144e6b17f4
-  React-featureflagsnativemodule: 89fef5751203b7d3cdde43e1e10407983735a4b4
-  React-graphics: 1c62dd11f47071482ca90238981f0147cce4089d
-  React-hermes: 36704d7354fff9c9e3fbb2490e8eeb2ac027f6f0
-  React-idlecallbacksnativemodule: 5f7cbecc1479b53e665f2cd6c2af2c21a80d2ffd
-  React-ImageManager: 4cb6318bb2bcc947106e29f9297a1c24c85a9233
-  React-jserrorhandler: 4b9344f5794cfe8946f8752d38094649f53dd3f3
-  React-jsi: 3a8c6f94a52033b0cca53c38d9bb568306aa9dc1
-  React-jsiexecutor: d7cf79b1c2771c6b21c46691a96dd2e32d4454c7
-  React-jsinspector: 651483ea1d79859e0ed21b86e9042b2a3f4d2b40
-  React-jsinspectorcdp: c800035023789b8bf32b4f5a4c9003c2dc28ee49
-  React-jsinspectornetwork: 249ee46e9de930d773ff6e4726aa8eeb5854b589
-  React-jsinspectortracing: 80e251e13a6071607f06f0e39e03d3f2ce2645cb
-  React-jsitooling: 6ce395671d0139ec1c4721953a4d3d92172fc06f
-  React-jsitracing: 4a4d89334b14d96de0387876751528433d1d2fbd
-  React-logger: 8bcfaf06f8c536fb9e9760526cf3d17ccd53e4ce
-  React-Mapbuffer: 4649384414066eb77e30a3124dbb48732a3aa173
-  React-microtasksnativemodule: e39f94cc96d61b8174a5cfb2d5862a73fa8c0d35
-  react-native-a11y-order: b8de113a5775cc77e0c60574a6779d9aa6f3110c
-  react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
-  react-native-cameraroll: aa5f6fe38b5574f1066a37ceaad5ece494a157a5
-  react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c
-  react-native-external-keyboard: 70a377298bf484a159a76de4debd951a82d0ff87
-  react-native-keyboard-controller: ef239acc614d5d520b07853be6bfa6e87b7770db
-  react-native-netinfo: f0a9899081c185db1de5bb2fdc1c88c202a059ac
-  react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979
-  react-native-safe-area-context: fea29ae0275beaa22f72d0a8be1eb0ab09c3feae
-  react-native-slider: 99493fd3e7254ea482be59fbd94467e737d2b849
-  react-native-webrtc: b5062b745a26c99835efdf0d6c027c9b2ee7ddbc
-  react-native-webview: 21fdd62caca650645e429b4a84941626612616ef
-  React-NativeModulesApple: 8ce162c145e6b9767bb37a090c77d3d28f7d32b5
+  React-defaultsnativemodule: c406bf7cd78036efffb7dec9df469257a1bca58c
+  React-domnativemodule: 925ea5ff8cb05c68e910057e6349e5898cce00f3
+  React-Fabric: 13130d0a70f17e913865b04673ee64603d6c42fe
+  React-FabricComponents: 1f01ea24a1314bf9abcac4743bb7ad8791336be6
+  React-FabricImage: f364dc54fcf8b0ef77192674a009aa4f65b34d75
+  React-featureflags: 32217ac18a8c216fc571044186fb04164af72772
+  React-featureflagsnativemodule: 9c552bb908a7434baa846002ee1752a77b1a5520
+  React-graphics: 3034a698e46e947f74a443e761f1feef742e9d71
+  React-hermes: a852be3ab9e1f515e46ba3ea9f48c31d4a9df437
+  React-idlecallbacksnativemodule: c43fe1f2221b0548cc366bf15f88efb3b3221bbf
+  React-ImageManager: 7efd7b19cdfaa3a82482e9e6ac0b56606a3ec271
+  React-jserrorhandler: 597057d0b9d158c03e02aa376a4a95f64f46a910
+  React-jsi: 7b53959aea60909ac6bbe4dd0bdec6c10d7dc597
+  React-jsiexecutor: 19938072af05ade148474bac41e0324a2d733f44
+  React-jsinspector: eb6bb244a75cbd56f32767daf2efdb344e2ff10c
+  React-jsinspectorcdp: 727f37537e9c7ab22b6b86c802d879efae5e2757
+  React-jsinspectornetwork: 11d47e644701c58038ef8d7f54a405ddd62b3b16
+  React-jsinspectortracing: 8875637e6c65b3b9a3852b006856562e874e7a78
+  React-jsitooling: b6e6a2551459a6ef9e1529df2ea981fa27ed3a91
+  React-jsitracing: 879e2b2f80dd33d84175989de0a8db5d662505db
+  React-logger: a913317214a26565cd4c045347edf1bcacb80a3f
+  React-Mapbuffer: 017336879e2e0fb7537bbc08c24f34e2384c9260
+  React-microtasksnativemodule: 63ee6730cec233feab9cdcc0c100dc28a12e4165
+  react-native-a11y-order: 20b33ff538af60d8b8a7f7284115a7febc9034d4
+  react-native-background-timer: 4638ae3bee00320753647900b21260b10587b6f7
+  react-native-cameraroll: ae31ba7ee17d31c5ee05d7bb248742e3af482783
+  react-native-cookies: d648ab7025833b977c0b19e142503034f5f29411
+  react-native-external-keyboard: db51d3a78d68c1f87fef41c67353a7c0ddbe51dd
+  react-native-keyboard-controller: c4ca61f44d66c2f8987a7e67e9b78e80dc965c45
+  react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
+  react-native-restart: f6f591aeb40194c41b9b5013901f00e6cf7d0f29
+  react-native-safe-area-context: 0a3b034bb63a5b684dd2f5fffd3c90ef6ed41ee8
+  react-native-slider: 6201419b3e3f7c6b7cf2068e0c01274fa86a1da5
+  react-native-webrtc: e8f0ce746353adc2744a2b933645e1aeb41eaa74
+  react-native-webview: 83c663c5bdf1357d3e7c00986260cb888ea0e328
+  React-NativeModulesApple: cbceb3c4cb726838c461b13802a76cefa6f3476f
   React-oscompat: eb0626e8ba1a2c61673c991bf9dc21834898475d
-  React-perflogger: d0d0d1b884120fa0a13bd38ac5e9c3c8e8bfe82a
-  React-performancetimeline: ae60fb7a7447c44d4d3227fc4eeba606403aaee3
+  React-perflogger: 509e1f9a3ee28df71b0a66de806ac515ce951246
+  React-performancetimeline: 9ce28cce1cded27410c293283f99fe62bebdb920
   React-RCTActionSheet: 30fe8f9f8d86db4a25ff34595a658ecd837485fc
-  React-RCTAnimation: e86dacf8a982f42341a44ec87ea8a30964a15f9f
-  React-RCTAppDelegate: d7214067e796732b5d22960270593945f1ab8a14
-  React-RCTBlob: af1fc227a5aa55564afbe84530a8bd28834fda15
-  React-RCTFabric: 8d92e851cc6cdf9771c52a18b144424c92b72082
-  React-RCTFBReactNativeSpec: c9ec2130e3c9366d30a85886e1776210054763f5
-  React-RCTImage: 70a10a5b957ca124b8d0b0fdeec369f11194782c
-  React-RCTLinking: 67f8a024192b4844c40ace955c54bb34f40d47f0
-  React-RCTNetwork: a7679ee67e7d34797a00cefaa879a3f9ea8cee9c
-  React-RCTRuntime: 3d25c69970924b597c339aead60168026d7cbc2c
-  React-RCTSettings: 18d8674195383c4fd51b9fc98ee815b329fba7e4
-  React-RCTText: 125574af8e29d0ceb430cbe2a03381d62ba45a47
-  React-RCTVibration: e96d43017757197d46834c50a0acfb78429c9b30
+  React-RCTAnimation: 3126eb1cb8e7a6ca33a52fd833d8018aa9311af1
+  React-RCTAppDelegate: b03981c790aa40cf26e0f78cc0f1f2df8287ead4
+  React-RCTBlob: 53c35e85c85d6bdaa55dc81a0b290d4e78431095
+  React-RCTFabric: 59ad9008775f123019c508efff260594a8509791
+  React-RCTFBReactNativeSpec: 82b605ab4f6f8da0a7ad88641161df5a0bafb1fb
+  React-RCTImage: 074b2faa71a152a456c974e118b60c9eeda94a64
+  React-RCTLinking: e5ca17a4f7ae2ad7b0c0483be77e1b383ecd0a8a
+  React-RCTNetwork: c508d7548c9eceac30a8100a846ea00033a03366
+  React-RCTRuntime: 6979568c0bc276fe785e085894f954fa15e0ec7e
+  React-RCTSettings: dd84c857a4fce42c1e08c1dabcda894e25af4a6e
+  React-RCTText: 6e4b177d047f98bccb90d6fb1ebdd3391cf8b299
+  React-RCTVibration: 9572d4a06a0c92650bcc62913e50eb2a89f19fb6
   React-rendererconsistency: a7b47f8b186af64ff8509c8caec4114a2f1ae63f
-  React-renderercss: 0a5b6b7aefc3f5e46a61b0e41b1179a0750cf077
-  React-rendererdebug: 7da01af21ab31661c3040ef647e6e2bc55575771
-  React-RuntimeApple: 788ca3b8e5485a46654e8a316d4c1e40bf82c5d4
-  React-RuntimeCore: 1730e6e5cba6f0af4e0319f891da6426b491e39f
-  React-runtimeexecutor: 79894322e55268854dc04ff1bee083f24725f6c8
-  React-RuntimeHermes: 86bf03cbf11ef05803a2e32087667c8a3cc45f72
-  React-runtimescheduler: 70601d598a8a71582fa69a9ba488a27c5d12790d
-  React-timing: 5717558f0bea206d7557df53015ee9efe1eb57b2
-  React-utils: 55e54e497e3d3f373ebfcf844eb77e24ed013356
-  ReactAppDependencyProvider: c277c5b231881ad4f00cd59e3aa0671b99d7ebee
-  ReactCodegen: d4cfdf9ed5667b032f0805c241892dac25d0e438
-  ReactCommon: 5cfd842fcd893bb40fc835f98fadc60c42906a20
-  ReactNativeIncallManager: 65a85aed033c1d9ec66f98a943cca51c61a210e9
-  RNBootSplash: d8407c268d5159ea026dc741ec867ebbe4708f25
-  RNCallKeep: 94bbe46b807ccf58e9f6ec11bc4d6087323a1954
-  RNCAsyncStorage: 8857fb173af29664cb90897903902dc8533e36cc
-  RNCClipboard: 4eea71d801c880175c12f6ab14332ca86fed935f
-  RNCMaskedView: 8bfc13a356455b15d56114738f4d2a804769c1bf
-  RNConfigReader: d800c517ac6da93d94df342580584fe029f3cbc2
-  RNCPicker: 5ecdf273a7a933dea82838515cc17c402fcf3ff7
-  RNDateTimePicker: 05e53e54b95e4e4b7dc1b7141b7749a1daa5e622
-  RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e
-  RNFBAnalytics: 9e013537d8aa83f9b46971bb15d43c0ed9eabec2
-  RNFBApp: fda4a8b08fe31bea8492808106aa638d1bb595b7
-  RNFBCrashlytics: 02234987b4cffb39119af52253bf3d70acec0818
-  RNFileViewer: 83cc066ad795b1f986791d03b56fe0ee14b6a69f
-  RNGestureHandler: 9339994ea5d1ff6ad2679b7d0cc3d49053111369
-  RNImageCropPicker: 6fd841bab847a912a03c3c464b44cd19692ca513
-  RNLocalize: 82a569022724d35461e2dc5b5d015a13c3ca995b
-  RNReanimated: 2635ec9d061c5eba3987bcc604443d78f363d3f7
-  RNScreens: 871305075ddf1291411b051d86da9e0d9289de02
-  RNSVG: 9be2bc57df95a874e8c4b0f7dd71866139f321d2
-  RNTrueSheet: 559ba620896714b7518da840f2ae3aa6c8983680
-  RNWorklets: daa0a3e7946a9c4042f3a962c87a12dc5bc0badd
+  React-renderercss: 9845c5063b3a2d0462ed4e4c7fc34219a5d608ed
+  React-rendererdebug: 3905e346c06347b86c6e49d427062cdd638a3044
+  React-RuntimeApple: 97233caf2b635c40819bf5be38d818777f8229ab
+  React-RuntimeCore: dc41f86fcdf1fbb42a5b8388a29bf59dfa56b2f8
+  React-runtimeexecutor: d16d045faaf6cd7de8d1aa8e31a51c13d8db84a4
+  React-RuntimeHermes: 5a9d132554c8d6b416d794cd4ac7d927b2f88f7b
+  React-runtimescheduler: 689d805d43c28b8fb1ab390914e042d10e2ea2ab
+  React-timing: c39eeb992274aeaeb9f4666dc97a36a31d33fe94
+  React-utils: 2f9ba0088251788ad66aa1855ff99ed2424024d2
+  ReactAppDependencyProvider: 1bcd3527ac0390a1c898c114f81ff954be35ed79
+  ReactCodegen: 7fadc30654a54b3a0d62df08f55e2211e25486ee
+  ReactCommon: 6d0fa86a4510730da7c72560e0ced14258292ab9
+  ReactNativeIncallManager: dccd3e7499caa3bb73d3acfedf4fb0360f1a87d5
+  RNBootSplash: 7fcc9a58ae343aeb1a1dd49f9030832fe432c544
+  RNCallKeep: 1930a01d8caf48f018be4f2db0c9f03405c2f977
+  RNCAsyncStorage: fd44f4b03e007e642e98df6726737bc66e9ba609
+  RNCClipboard: e560338bf6cc4656a09ff90610b62ddc0dbdad65
+  RNCMaskedView: d707a83784c67099b54b37d056ababb2767ce15e
+  RNConfigReader: 27bab37cca5e6b87766ffd73b8b8818ee46e3416
+  RNCPicker: 35fc66f352403cdfe99d53b541f5180482ca2bc5
+  RNDateTimePicker: ca1dc7e24d0b4839877f0ab619e7bca5db715289
+  RNDeviceInfo: 900bd20e1fd3bfd894e7384cc4a83880c0341bd3
+  RNFBAnalytics: 2e8b8ffcd2bb3d59a43ecbe09571c73c56edef7a
+  RNFBApp: a448037d2df74af9d374a0b765be12ff1e844dc0
+  RNFBCrashlytics: c3bb5533f9957eddc88f3ea383583309a4ce9f89
+  RNFileViewer: f9424017fa643c115c1444e11292e84fb16ddd68
+  RNGestureHandler: b8d2e75c2e88fc2a1f6be3b3beeeed80b88fa37d
+  RNImageCropPicker: 0a63af4b79e514c1edd6c3152f19300c5ed85312
+  RNLocalize: ca86348d88b9a89da0e700af58d428ab3f343c4e
+  RNReanimated: e1690cdd7f215cfb96a3b7986b81889867dfdb4f
+  RNScreens: 2e9c41cd099b1ca50136af8d57c3594214d0086a
+  RNSVG: 94a1be05fab4043354bcf7104f0f9b0e2231ef05
+  RNTrueSheet: 53f29088da313dabff8b81d7c4d52afd8e609cfa
+  RNWorklets: ab618bf7d1c7fd2cb793b9f0f39c3e29274b3ebf
   SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
   SDWebImageAVIFCoder: afe194a084e851f70228e4be35ef651df0fc5c57
   SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
@@ -4138,7 +4171,7 @@ SPEC CHECKSUMS:
   simdjson: 7bb9e33d87737cec966e7b427773c67baa4458fe
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
-  WatermelonDB: b34772e634f59bb1170214901a5c8841e7334813
+  WatermelonDB: 4c846c8cb94eef3cba90fa034d15310163226703
   Yoga: 1e91d83a5286cfd3b725eade59274c92270540d4
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj
index 543f9a4aadc..9568762fbcb 100644
--- a/ios/RocketChatRN.xcodeproj/project.pbxproj
+++ b/ios/RocketChatRN.xcodeproj/project.pbxproj
@@ -1393,7 +1393,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "SOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh\n";
+			shellScript = "if [ \"$USE_OWL\" = \"true\" ]; then echo \"Skipping Bugsnag source map upload for Owl build\"; exit 0; fi\nSOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh\n";
 			showEnvVarsInLog = 0;
 		};
 		86A998705576AFA7CE938617 /* [Expo] Configure project */ = {
diff --git a/owl.config.json b/owl.config.json
index b0b6c6933ad..ef28d240b5b 100644
--- a/owl.config.json
+++ b/owl.config.json
@@ -8,7 +8,7 @@
 		"quiet": true
 	},
 	"android": {
-		"packageName": "chat.rocket.reactnative",
+		"packageName": "chat.rocket.android",
 		"buildType": "Release",
 		"quiet": true
 	},
diff --git a/package.json b/package.json
index b806fb7e3bd..9e6c18cfae5 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,8 @@
 		"owl:build:android": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl build --platform android",
 		"owl:test:android": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform android",
 		"owl:test:update:android": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform android --update",
+		"owl:compare:ios": "sh scripts/owl-compare.sh ios",
+		"owl:compare:android": "sh scripts/owl-compare.sh android",
 		"lint": "eslint . && tsc",
 		"prettier-lint": "prettier --write . && pnpm lint",
 		"ios": "npx react-native run-ios",
@@ -78,6 +80,7 @@
 		"expo-local-authentication": "~17.0.8",
 		"expo-navigation-bar": "~5.0.10",
 		"expo-notifications": "~0.32.15",
+		"expo-screen-orientation": "~9.0.9",
 		"expo-status-bar": "~3.0.9",
 		"expo-system-ui": "~6.0.9",
 		"expo-video-thumbnails": "~10.0.8",
diff --git a/patches/react-native-owl+1.5.0.patch b/patches/react-native-owl+1.5.0.patch
new file mode 100644
index 00000000000..8759cf32581
--- /dev/null
+++ b/patches/react-native-owl+1.5.0.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/react-native-owl/dist/utils/adb.js b/node_modules/react-native-owl/dist/utils/adb.js
+--- a/node_modules/react-native-owl/dist/utils/adb.js
++++ b/node_modules/react-native-owl/dist/utils/adb.js
+@@ -94,7 +94,7 @@
+             switch (_b.label) {
+                 case 0:
+                     stdio = debug ? 'inherit' : 'ignore';
+-                    command = "adb shell monkey -p \"" + packageName + "\" -c android.intent.category.LAUNCHER 1";
++                    command = "adb shell monkey -p \"" + packageName + "\" --pct-syskeys 0 -c android.intent.category.LAUNCHER 1";
+                     return [4 /*yield*/, execa_1.default.command(command, { stdio: stdio })];
+                 case 1:
+                     _b.sent();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1f302d88050..8e563436648 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -156,6 +156,9 @@ importers:
       expo-notifications:
         specifier: ~0.32.15
         version: 0.32.15(expo@54.0.30(@babel/core@7.25.9)(react-native-webview@13.16.1(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      expo-screen-orientation:
+        specifier: ~9.0.9
+        version: 9.0.9(expo@54.0.30(@babel/core@7.25.9)(react-native-webview@13.16.1(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))
       expo-status-bar:
         specifier: ~3.0.9
         version: 3.0.9(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
@@ -4510,6 +4513,12 @@ packages:
       react: '*'
       react-native: '*'
 
+  expo-screen-orientation@9.0.9:
+    resolution: {integrity: sha512-UTU745XoqBvQJkZ820GTfMuOxlkppYqaeQ+x0wdu44cyrZiZugqe+egFF2+zC+SaxgAltU5EuO8GIj9xSF+YMw==}
+    peerDependencies:
+      expo: '*'
+      react-native: '*'
+
   expo-server@1.0.5:
     resolution: {integrity: sha512-IGR++flYH70rhLyeXF0Phle56/k4cee87WeQ4mamS+MkVAVP+dDlOHf2nN06Z9Y2KhU0Gp1k+y61KkghF7HdhA==}
     engines: {node: '>=20.16.0'}
@@ -12821,6 +12830,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  expo-screen-orientation@9.0.9(expo@54.0.30(@babel/core@7.25.9)(react-native-webview@13.16.1(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0)):
+    dependencies:
+      expo: 54.0.30(@babel/core@7.25.9)(react-native-webview@13.16.1(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
+      react-native: 0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0)
+
   expo-server@1.0.5: {}
 
   expo-status-bar@3.0.9(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
diff --git a/scripts/owl-compare.sh b/scripts/owl-compare.sh
new file mode 100755
index 00000000000..09b8dd4aaac
--- /dev/null
+++ b/scripts/owl-compare.sh
@@ -0,0 +1,113 @@
+#!/bin/sh
+set -e
+
+# Owl visual-regression "run & compare" helper.
+#
+# What it does, in one shot:
+#   1. Pulls the canonical action-sheet "prints" from the baseline reference repo
+#      (OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest), where they live
+#      under `app/containers/ActionSheet/<variant>-action-sheet-<case>.png`.
+#   2. Routes the prints for the requested variant into the folder react-native-owl
+#      actually reads from — `.owl/baseline/<platform>/` — since owl hardcodes that
+#      path and will NOT look inside `app/containers/ActionSheet/` or any subfolder.
+#   3. Runs `owl test` (compare mode) against the already-built app.
+#   4. Opens the generated HTML report so you can SEE the diff.
+#
+# Usage:
+#   scripts/owl-compare.sh ios          # default variant iphone16pro-portrait
+#   scripts/owl-compare.sh android      # default variant android-portrait
+#   OWL_VARIANT=iphonese-portrait scripts/owl-compare.sh ios
+#
+# The app must already be built for the platform (pnpm owl:build:ios / :android).
+
+PLATFORM="${1:-}"
+case "$PLATFORM" in
+	ios | android) ;;
+	*)
+		echo "usage: scripts/owl-compare.sh ios|android" >&2
+		exit 2
+		;;
+esac
+
+# Variant decides both which prints to compare against and the screenshot filenames
+# the test produces (it is babel-inlined into the test as process.env.OWL_VARIANT).
+if [ -z "${OWL_VARIANT:-}" ]; then
+	if [ "$PLATFORM" = "ios" ]; then
+		OWL_VARIANT="iphone16pro-portrait"
+	else
+		OWL_VARIANT="android-portrait"
+	fi
+fi
+export OWL_VARIANT
+
+REF_REPO="${OWL_BASELINE_REPO:-https://github.com/OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest}"
+REF_DIR=".owl/reference"
+PRINTS_SUBDIR="app/containers/ActionSheet"
+BASELINE_DIR=".owl/baseline/$PLATFORM"
+
+echo "[owl-compare] platform=$PLATFORM variant=$OWL_VARIANT"
+
+# --- 1. Fetch / refresh the reference prints --------------------------------------
+PRINTS_SRC=""
+if git -C "$REF_DIR" rev-parse --git-dir >/dev/null 2>&1; then
+	echo "[owl-compare] refreshing reference repo at $REF_DIR"
+	git -C "$REF_DIR" pull --ff-only --quiet || echo "[owl-compare] pull failed, using cached prints"
+	PRINTS_SRC="$REF_DIR/$PRINTS_SUBDIR"
+elif git clone --depth=1 --quiet "$REF_REPO" "$REF_DIR" 2>/dev/null; then
+	echo "[owl-compare] cloned reference repo into $REF_DIR"
+	PRINTS_SRC="$REF_DIR/$PRINTS_SUBDIR"
+elif [ -d ".owl/baseline/ActionSheet" ]; then
+	echo "[owl-compare] reference repo unreachable, falling back to local .owl/baseline/ActionSheet"
+	PRINTS_SRC=".owl/baseline/ActionSheet"
+else
+	echo "[owl-compare] could not obtain reference prints (clone failed, no local fallback)" >&2
+	exit 1
+fi
+
+# --- 2. Route this variant's prints into owl's baseline dir -----------------------
+# owl reads `.owl/baseline/<platform>/<name>.png`; the prints already carry the
+# variant prefix, so we copy only the files for the variant we're about to run.
+rm -rf "$BASELINE_DIR"
+mkdir -p "$BASELINE_DIR"
+count=0
+for f in "$PRINTS_SRC/$OWL_VARIANT"-*.png; do
+	[ -e "$f" ] || continue
+	cp "$f" "$BASELINE_DIR/"
+	count=$((count + 1))
+done
+
+if [ "$count" -eq 0 ]; then
+	echo "[owl-compare] no prints found for variant '$OWL_VARIANT' in $PRINTS_SRC" >&2
+	echo "[owl-compare] available variants:" >&2
+	ls "$PRINTS_SRC" 2>/dev/null | sed -E 's/-action-sheet-.*//' | sort -u | sed 's/^/  - /' >&2
+	exit 1
+fi
+echo "[owl-compare] staged $count baseline print(s) into $BASELINE_DIR"
+
+# --- 3. Run owl in compare mode ---------------------------------------------------
+# OWL_VARIANT is babel-inlined AND jest-cached, so the transformed test freezes to
+# the first run's value; clear the cache so this variant actually takes effect.
+rm -rf .jest-cache
+
+set +e
+USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform "$PLATFORM"
+status=$?
+set -e
+
+# --- 4. Show the report -----------------------------------------------------------
+REPORT=".owl/report/index.html"
+if [ -f "$REPORT" ]; then
+	echo "[owl-compare] report: $REPORT"
+	if command -v open >/dev/null 2>&1; then
+		open "$REPORT"
+	fi
+else
+	echo "[owl-compare] no report generated at $REPORT" >&2
+fi
+
+if [ "$status" -eq 0 ]; then
+	echo "[owl-compare] ✅ no visual differences"
+else
+	echo "[owl-compare] ❌ differences found (or test error) — see report above"
+fi
+exit "$status"
diff --git a/tests/owl/README.md b/tests/owl/README.md
new file mode 100644
index 00000000000..6d85f37ada3
--- /dev/null
+++ b/tests/owl/README.md
@@ -0,0 +1,87 @@
+# Owl visual regression — action sheets
+
+Visual regression for the action-sheet bottom safe-area work, using
+[react-native-owl](https://github.com/FormidableLabs/react-native-owl).
+
+## Source of truth: the reference repo
+
+Baseline "prints" are **not committed here**. They live in a separate repo —
+[`OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest`](https://github.com/OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest)
+— under `app/containers/ActionSheet/`, one PNG per `variant + case`:
+
+```
+<variant>-action-sheet-<case>.png
+e.g. iphone16pro-portrait-action-sheet-servers-list.png
+```
+
+`variant` is `{device}-{orientation}` (`iphone16pro-portrait`, `iphonese-portrait`,
+`android-portrait`, `android-landscape`); `case` is one of `servers-list`,
+`directory-options`, `media-auto-download`, `user-notification-preferences`.
+
+The test (`actionSheets.owl.tsx`) emits screenshot names in exactly that shape, so the
+captured image lines up 1:1 with the reference print.
+
+## Run & compare
+
+```bash
+# 1. Build the Owl app once (Release — required for USE_OWL inlining)
+pnpm owl:build:ios          # or owl:build:android
+
+# 2. Boot the matching simulator/emulator (CI does this for you)
+xcrun simctl boot "iPhone 16 Pro"
+
+# 3. Run the comparison and open the diff report
+pnpm owl:compare:ios        # or owl:compare:android
+```
+
+`owl:compare:*` (→ `scripts/owl-compare.sh`):
+
+1. clones/refreshes the reference repo into `.owl/reference/` (gitignored),
+2. stages the prints for the current `OWL_VARIANT` into `.owl/baseline/<platform>/`
+   (the only path owl reads from),
+3. runs `owl test` in compare mode,
+4. opens the HTML report at `.owl/report/index.html`.
+
+Exit code is `0` when nothing changed, non-zero when a diff is found (the report still
+opens so you can see it).
+
+### Other devices / orientations
+
+Default variant is `iphone16pro-portrait` (iOS) / `android-portrait` (Android). To
+compare another, set `OWL_VARIANT` and point owl at the matching device:
+
+```bash
+# Boot the iPhone SE and set ios.device in owl.config.json to "iPhone SE (3rd generation)"
+OWL_VARIANT=iphonese-portrait pnpm owl:compare:ios
+```
+
+`OWL_VARIANT` is babel-inlined and Jest-caches the transformed test; the script
+`rm -rf .jest-cache` before each run so the variant actually takes effect.
+
+## CI (GitHub Actions)
+
+The flow mirrors e2e: build the Owl app once per platform, then fan the comparison
+out over every device leg.
+
+| Workflow | Role |
+| --- | --- |
+| `visual-regression.yml` | Orchestrator. `workflow_dispatch` (with an `update_baseline` toggle) + `pull_request` on owl paths. |
+| `visual-regression-build-ios.yml` | Reusable — builds the Owl iOS `.app` once, uploads it. |
+| `visual-regression-build-android.yml` | Reusable — builds the Owl APK once (debug-signed via the `isOwlBuild` fallback), uploads it. |
+| `visual-regression-run-ios.yml` | Reusable — downloads the app, points owl at the leg's simulator, syncs baselines, compares. |
+| `visual-regression-run-android.yml` | Reusable — downloads the APK, boots a Pixel 7 Pro emulator, syncs baselines, compares. |
+
+Legs (matrix): **iPhone 16 Pro**, **iPhone SE (3rd gen)** (low-height), **Android
+portrait**, **Android landscape**. Each run job downloads the prebuilt app, pulls the
+matching prints from the reference repo into `.owl/baseline/<platform>/`, runs `owl
+test`, and uploads `.owl/{report,diff,latest,baseline}` as an artifact per leg.
+
+Run it from the Actions tab → **Visual Regression** → *Run workflow*. Tick
+`update_baseline` to capture fresh prints instead of comparing; download the resulting
+artifact and commit the PNGs to the reference repo (below).
+
+## Updating a baseline
+
+Capture fresh prints — locally (`pnpm owl:test:update:ios`) or via the
+`update_baseline` toggle in the **Visual Regression** workflow — review them, and commit
+the new PNGs to the **reference repo** under `app/containers/ActionSheet/` — never here.
diff --git a/tests/owl/actionSheets.owl.tsx b/tests/owl/actionSheets.owl.tsx
index 5ac6fb3c981..08b03874ce3 100644
--- a/tests/owl/actionSheets.owl.tsx
+++ b/tests/owl/actionSheets.owl.tsx
@@ -9,6 +9,7 @@ jest.setTimeout(180000);
 // baseline filename is unique (all iOS baselines share .owl/baseline/ios).
 const variant = process.env.OWL_VARIANT || 'local';
 const screenshotName = (name: string) => `${variant}-${name}`;
+const isLandscape = variant.includes('landscape');
 
 const wait = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms));
 
@@ -18,6 +19,7 @@ const wait = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms
 const SCREEN_SETTLE_DELAY = 6000;
 const SHEET_PRESENT_DELAY = 6000;
 const APP_READY_DELAY = 2000;
+const ORIENTATION_DELAY = 3000;
 
 // Each case opens the real screen, then its real action sheet. The trigger lives
 // either in the navigation header (rooms list, directory) or the screen body
@@ -35,10 +37,16 @@ const CASES = [
 
 describe('Action sheet safe-area spacing', () => {
 	beforeEach(async () => {
-		// Reload returns to the launcher with the previous sheet dismissed. Device
-		// orientation is OS-level and persists across reloads.
+		// Reload returns to the launcher with the previous sheet dismissed and the
+		// app back in its default portrait orientation.
 		await reload();
 		await wait(APP_READY_DELAY);
+
+		// Orientation is requested from JS on the launcher (works in CI/local with
+		// no device rotation). Landscape variants rotate before navigating so the
+		// pushed screen + native action sheet render in true landscape.
+		await press(isLandscape ? 'owl-set-landscape' : 'owl-set-portrait');
+		await wait(ORIENTATION_DELAY);
 	});
 
 	CASES.forEach(({ name, nav, trigger }) => {

From c2deb72078ce4ad40fe81d1de439ab69c4bda0d0 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Thu, 11 Jun 2026 16:51:07 -0300
Subject: [PATCH 05/23] ci: gate visual regression behind manual approval hold

Mirror e2e's e2e-hold: a `hold` job on the protected `approve_e2e_testing`
environment that build-ios and build-android depend on, so the macOS + emulator
legs only run after a reviewer approves.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .github/workflows/visual-regression.yml | 13 +++++++++++++
 tests/owl/README.md                     |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/visual-regression.yml b/.github/workflows/visual-regression.yml
index 4d94359c534..8cb301c9bc6 100644
--- a/.github/workflows/visual-regression.yml
+++ b/.github/workflows/visual-regression.yml
@@ -32,9 +32,21 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # Manual approval gate, mirroring e2e's e2e-hold: nothing builds or runs until
+  # a reviewer approves the protected environment. Keeps the expensive macOS +
+  # emulator legs off every push.
+  hold:
+    name: Visual Regression Hold
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    environment: approve_e2e_testing
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "Waiting for manual approval..."
+
   build-ios:
     name: Build iOS
     if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    needs: [hold]
     uses: ./.github/workflows/visual-regression-build-ios.yml
 
   run-ios:
@@ -58,6 +70,7 @@ jobs:
   build-android:
     name: Build Android
     if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    needs: [hold]
     uses: ./.github/workflows/visual-regression-build-android.yml
 
   run-android:
diff --git a/tests/owl/README.md b/tests/owl/README.md
index 6d85f37ada3..cfbc3cba93f 100644
--- a/tests/owl/README.md
+++ b/tests/owl/README.md
@@ -65,7 +65,7 @@ out over every device leg.
 
 | Workflow | Role |
 | --- | --- |
-| `visual-regression.yml` | Orchestrator. `workflow_dispatch` (with an `update_baseline` toggle) + `pull_request` on owl paths. |
+| `visual-regression.yml` | Orchestrator. `workflow_dispatch` (with an `update_baseline` toggle) + `pull_request` on owl paths. Gated behind a manual approval `hold` job (protected `approve_e2e_testing` environment, like e2e) so nothing builds until a reviewer approves. |
 | `visual-regression-build-ios.yml` | Reusable — builds the Owl iOS `.app` once, uploads it. |
 | `visual-regression-build-android.yml` | Reusable — builds the Owl APK once (debug-signed via the `isOwlBuild` fallback), uploads it. |
 | `visual-regression-run-ios.yml` | Reusable — downloads the app, points owl at the leg's simulator, syncs baselines, compares. |

From ebab06a5e7c48d90808e8ef3f3f8047067cd855c Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Thu, 11 Jun 2026 18:04:20 -0300
Subject: [PATCH 06/23] ci: fix visual regression android build + ios simulator
 boot

- Android: build.gradle reads a BugsnagAPIKey gradle property into a manifest
  placeholder; provide a dummy value (Owl builds are throwaway, never uploaded)
  so config evaluation doesn't fail with "unknown property 'BugsnagAPIKey'".
- iOS: the runner doesn't pre-create named simulators for the selected Xcode, so
  "iPhone 16 Pro"/"iPhone SE (3rd generation)" were Invalid device. Resolve by
  name and create on the latest available iOS runtime if missing, boot by UDID.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../visual-regression-build-android.yml       |  4 +++
 .../workflows/visual-regression-run-ios.yml   | 35 ++++++++++++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/visual-regression-build-android.yml b/.github/workflows/visual-regression-build-android.yml
index 9874c1035ba..ae5694bf02e 100644
--- a/.github/workflows/visual-regression-build-android.yml
+++ b/.github/workflows/visual-regression-build-android.yml
@@ -77,6 +77,10 @@ jobs:
           echo -e "newArchEnabled=true" >> ./gradle.properties
           echo -e "hermesEnabled=true" >> ./gradle.properties
           echo -e "VERSIONCODE=999999" >> ./gradle.properties
+          # build.gradle reads BugsnagAPIKey into a manifest placeholder. Owl
+          # builds are throwaway and never upload to Bugsnag, so a dummy value is
+          # enough to satisfy the property (no secret needed).
+          echo -e "BugsnagAPIKey=0000000000000000000000000000000000" >> ./gradle.properties
 
       - name: Build Owl APK
         run: pnpm owl:build:android
diff --git a/.github/workflows/visual-regression-run-ios.yml b/.github/workflows/visual-regression-run-ios.yml
index f5cba29a71b..b6bf44e9c44 100644
--- a/.github/workflows/visual-regression-run-ios.yml
+++ b/.github/workflows/visual-regression-run-ios.yml
@@ -56,11 +56,38 @@ jobs:
           node -e "const fs=require('fs');const f='owl.config.json';const c=JSON.parse(fs.readFileSync(f,'utf8'));c.ios.device=process.env.OWL_DEVICE;fs.writeFileSync(f,JSON.stringify(c,null,'\t')+'\n')"
           echo "owl.config.json ios.device -> $OWL_DEVICE"
 
-      - name: Boot simulator
+      # The runner doesn't pre-create named simulators for the freshly selected
+      # Xcode, so "iPhone 16 Pro" / "iPhone SE (3rd generation)" may not exist
+      # yet (simctl: "Invalid device"). Resolve the device by name, creating it
+      # on the latest available iOS runtime if missing, then boot by UDID. owl
+      # then installs by name onto the one booted device.
+      - name: Ensure & boot simulator
         run: |
-          xcrun simctl boot "$OWL_DEVICE" || true
-          xcrun simctl bootstatus "$OWL_DEVICE" -b
-          xcrun simctl spawn booted defaults write -g UIAnimationDragCoefficient -float 10
+          set -euo pipefail
+          UDID="$(node <<'NODE'
+          const { execSync } = require('child_process');
+          const name = process.env.OWL_DEVICE;
+          const j = c => JSON.parse(execSync(c).toString());
+          const devices = j('xcrun simctl list devices available -j').devices;
+          let udid;
+          for (const rt of Object.keys(devices))
+            for (const d of devices[rt]) if (d.name === name) udid = d.udid;
+          if (!udid) {
+            const dt = j('xcrun simctl list devicetypes -j').devicetypes.find(t => t.name === name);
+            if (!dt) { console.error('No simulator device type named: ' + name); process.exit(1); }
+            const rts = j('xcrun simctl list runtimes -j').runtimes.filter(r => r.platform === 'iOS' && r.isAvailable);
+            if (!rts.length) { console.error('No available iOS runtime'); process.exit(1); }
+            const rt = rts[rts.length - 1];
+            console.error(`Creating "${name}" on ${rt.name}`);
+            udid = execSync(`xcrun simctl create ${JSON.stringify(name)} ${dt.identifier} ${rt.identifier}`).toString().trim();
+          }
+          process.stdout.write(udid);
+          NODE
+          )"
+          echo "Using simulator $OWL_DEVICE ($UDID)"
+          xcrun simctl boot "$UDID" || true
+          xcrun simctl bootstatus "$UDID" -b
+          xcrun simctl spawn "$UDID" defaults write -g UIAnimationDragCoefficient -float 10
 
       - name: Sync baseline prints from reference repo (compare mode)
         if: ${{ !inputs.update_baseline }}

From f66caab15062a95270022ec051089343e07c6649 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Fri, 12 Jun 2026 16:41:39 -0300
Subject: [PATCH 07/23] ci: emit clean baseline-only artifact for owl update
 runs

The reference-repo prints were captured locally and can never match a CI
render (owl is pixel-exact; cross-machine font hinting, a 1px sheet offset and
the status-bar clock format all differ). Goldens must be captured by CI.

In update_baseline mode each run leg now uploads owl-baseline-<variant> with
just the correctly-named PNGs, so seeding the reference repo is a drag-and-drop.
Documented the CI-golden flow in tests/owl/README.md.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../visual-regression-run-android.yml         | 11 ++++++++
 .../workflows/visual-regression-run-ios.yml   | 11 ++++++++
 tests/owl/README.md                           | 28 +++++++++++++++----
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/visual-regression-run-android.yml b/.github/workflows/visual-regression-run-android.yml
index 17a3dbf2ae3..36d6fb0665d 100644
--- a/.github/workflows/visual-regression-run-android.yml
+++ b/.github/workflows/visual-regression-run-android.yml
@@ -101,6 +101,17 @@ jobs:
               pnpm owl:test:android
             fi
 
+      # Clean, commit-ready prints: just the PNGs, correctly named. Download all
+      # legs' owl-baseline-* artifacts and drop them into the reference repo's
+      # app/containers/ActionSheet/ to seed the CI goldens.
+      - name: Upload fresh baselines (update mode)
+        if: ${{ inputs.update_baseline }}
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: owl-baseline-${{ inputs.variant }}
+          path: .owl/baseline/android/*.png
+          if-no-files-found: error
+
       - name: Upload Owl results
         if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
diff --git a/.github/workflows/visual-regression-run-ios.yml b/.github/workflows/visual-regression-run-ios.yml
index b6bf44e9c44..71c1e635dcf 100644
--- a/.github/workflows/visual-regression-run-ios.yml
+++ b/.github/workflows/visual-regression-run-ios.yml
@@ -107,6 +107,17 @@ jobs:
         if: ${{ inputs.update_baseline }}
         run: pnpm owl:test:update:ios
 
+      # Clean, commit-ready prints: just the PNGs, correctly named. Download all
+      # legs' owl-baseline-* artifacts and drop them into the reference repo's
+      # app/containers/ActionSheet/ to seed the CI goldens.
+      - name: Upload fresh baselines (update mode)
+        if: ${{ inputs.update_baseline }}
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: owl-baseline-${{ inputs.variant }}
+          path: .owl/baseline/ios/*.png
+          if-no-files-found: error
+
       - name: Upload Owl results
         if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
diff --git a/tests/owl/README.md b/tests/owl/README.md
index cfbc3cba93f..2050bcaf720 100644
--- a/tests/owl/README.md
+++ b/tests/owl/README.md
@@ -80,8 +80,26 @@ Run it from the Actions tab → **Visual Regression** → *Run workflow*. Tick
 `update_baseline` to capture fresh prints instead of comparing; download the resulting
 artifact and commit the PNGs to the reference repo (below).
 
-## Updating a baseline
-
-Capture fresh prints — locally (`pnpm owl:test:update:ios`) or via the
-`update_baseline` toggle in the **Visual Regression** workflow — review them, and commit
-the new PNGs to the **reference repo** under `app/containers/ActionSheet/` — never here.
+## Baselines must be captured in CI
+
+owl compares **pixel-exact** (it passes only when zero pixels differ; the `threshold`
+option is per-pixel colour sensitivity, not a diff budget). iOS/Android simulators do
+**not** render identically across machines — font hinting, sub-pixel antialiasing, a
+1-px sheet offset, and even the status-bar clock format (`09:41` vs `9:41 AM`, a region
+setting) all differ between a local Mac and the CI runner. So a baseline captured
+locally will never match a CI render, and vice-versa.
+
+**The golden baselines therefore have to be captured by the same CI environment that
+runs the comparison.** A local `pnpm owl:compare:*` run is still useful for authoring
+and quick checks against your own machine, but the prints committed to the reference
+repo must come from CI.
+
+## Updating / seeding baselines (manual)
+
+1. Actions → **Visual Regression** → *Run workflow*, tick **`update_baseline`**.
+2. When it finishes, download the **`owl-baseline-<variant>`** artifact from each leg
+   (`iphone16pro-portrait`, `iphonese-portrait`, `android-portrait`,
+   `android-landscape`). Each holds just the correctly-named PNGs.
+3. Drop all of them into the **reference repo** under `app/containers/ActionSheet/`,
+   review, and commit. They are now the source of truth — never commit baselines here.
+4. Re-run **Visual Regression** in compare mode; it should be green (CI vs CI).

From 3298251c58b4cffe0ca3db677cf85563bc254c78 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Fri, 12 Jun 2026 16:45:38 -0300
Subject: [PATCH 08/23] ci: harden owl renders for deterministic baselines

- iOS: pin the simulator runtime (OWL_IOS_RUNTIME); create the device on exactly
  that runtime and fail loudly if absent, so baselines can't silently drift on a
  runner image bump. Force 24-hour time so owl's "9:41" status-bar stamp renders
  identically regardless of region (09:41 vs 9:41 AM).
- Android: owl doesn't manage the status bar, so enter SystemUI demo mode to
  freeze the clock/battery/network and set 24-hour time before running.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../visual-regression-run-android.yml         | 12 +++++++++
 .../workflows/visual-regression-run-ios.yml   | 27 ++++++++++++-------
 tests/owl/README.md                           |  9 +++++++
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/visual-regression-run-android.yml b/.github/workflows/visual-regression-run-android.yml
index 36d6fb0665d..2b2ef3670c0 100644
--- a/.github/workflows/visual-regression-run-android.yml
+++ b/.github/workflows/visual-regression-run-android.yml
@@ -95,6 +95,18 @@ jobs:
           emulator-boot-timeout: 900
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -accel on
           script: |
+            set -eu
+            # owl doesn't manage the Android status bar, so the live clock/icons
+            # would leak into screenshots and differ every run. SystemUI demo mode
+            # freezes them; 24-hour time keeps the clock format stable.
+            adb shell settings put system time_12_24 24
+            adb shell settings put global sysui_demo_allowed 1
+            adb shell am broadcast -a com.android.systemui.demo -e command enter
+            adb shell am broadcast -a com.android.systemui.demo -e command clock -e hhmm 0941
+            adb shell am broadcast -a com.android.systemui.demo -e command battery -e level 100 -e plugged false
+            adb shell am broadcast -a com.android.systemui.demo -e command network -e wifi show -e level 4 -e fully true
+            adb shell am broadcast -a com.android.systemui.demo -e command network -e mobile hide
+            adb shell am broadcast -a com.android.systemui.demo -e command notifications -e visible false
             if [ "$UPDATE_BASELINE" = "true" ]; then
               pnpm owl:test:update:android
             else
diff --git a/.github/workflows/visual-regression-run-ios.yml b/.github/workflows/visual-regression-run-ios.yml
index 71c1e635dcf..19736afd861 100644
--- a/.github/workflows/visual-regression-run-ios.yml
+++ b/.github/workflows/visual-regression-run-ios.yml
@@ -30,6 +30,9 @@ jobs:
       RUNNING_E2E_TESTS: true
       OWL_VARIANT: ${{ inputs.variant }}
       OWL_DEVICE: ${{ inputs.device }}
+      # Pin the simulator runtime so baselines can't silently drift when a runner
+      # image bumps Xcode/iOS. Bump this (and re-seed baselines) on purpose only.
+      OWL_IOS_RUNTIME: com.apple.CoreSimulator.SimRuntime.iOS-26-0
       BASELINE_REPO: https://github.com/OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest
 
     steps:
@@ -58,36 +61,42 @@ jobs:
 
       # The runner doesn't pre-create named simulators for the freshly selected
       # Xcode, so "iPhone 16 Pro" / "iPhone SE (3rd generation)" may not exist
-      # yet (simctl: "Invalid device"). Resolve the device by name, creating it
-      # on the latest available iOS runtime if missing, then boot by UDID. owl
-      # then installs by name onto the one booted device.
+      # yet (simctl: "Invalid device"). Resolve a device of the requested name ON
+      # THE PINNED RUNTIME, creating it if missing, then boot by UDID. Pinning the
+      # runtime keeps renders byte-stable across runner image updates.
       - name: Ensure & boot simulator
         run: |
           set -euo pipefail
           UDID="$(node <<'NODE'
           const { execSync } = require('child_process');
           const name = process.env.OWL_DEVICE;
+          const wantRt = process.env.OWL_IOS_RUNTIME;
           const j = c => JSON.parse(execSync(c).toString());
+          const runtimes = j('xcrun simctl list runtimes -j').runtimes.filter(r => r.platform === 'iOS' && r.isAvailable);
+          const rt = runtimes.find(r => r.identifier === wantRt);
+          if (!rt) {
+            console.error(`Pinned iOS runtime ${wantRt} not available. Present: ` + runtimes.map(r => r.identifier).join(', '));
+            process.exit(1);
+          }
           const devices = j('xcrun simctl list devices available -j').devices;
           let udid;
-          for (const rt of Object.keys(devices))
-            for (const d of devices[rt]) if (d.name === name) udid = d.udid;
+          for (const d of (devices[rt.identifier] || [])) if (d.name === name) udid = d.udid;
           if (!udid) {
             const dt = j('xcrun simctl list devicetypes -j').devicetypes.find(t => t.name === name);
             if (!dt) { console.error('No simulator device type named: ' + name); process.exit(1); }
-            const rts = j('xcrun simctl list runtimes -j').runtimes.filter(r => r.platform === 'iOS' && r.isAvailable);
-            if (!rts.length) { console.error('No available iOS runtime'); process.exit(1); }
-            const rt = rts[rts.length - 1];
             console.error(`Creating "${name}" on ${rt.name}`);
             udid = execSync(`xcrun simctl create ${JSON.stringify(name)} ${dt.identifier} ${rt.identifier}`).toString().trim();
           }
           process.stdout.write(udid);
           NODE
           )"
-          echo "Using simulator $OWL_DEVICE ($UDID)"
+          echo "Using simulator $OWL_DEVICE ($UDID) on $OWL_IOS_RUNTIME"
           xcrun simctl boot "$UDID" || true
           xcrun simctl bootstatus "$UDID" -b
           xcrun simctl spawn "$UDID" defaults write -g UIAnimationDragCoefficient -float 10
+          # Force 24-hour time so the status-bar clock owl stamps ("9:41") renders
+          # identically regardless of the runner's region (avoids 09:41 vs 9:41 AM).
+          xcrun simctl spawn "$UDID" defaults write -g AppleICUForce24HourTime -bool true
 
       - name: Sync baseline prints from reference repo (compare mode)
         if: ${{ !inputs.update_baseline }}
diff --git a/tests/owl/README.md b/tests/owl/README.md
index 2050bcaf720..3418085dcde 100644
--- a/tests/owl/README.md
+++ b/tests/owl/README.md
@@ -94,6 +94,15 @@ runs the comparison.** A local `pnpm owl:compare:*` run is still useful for auth
 and quick checks against your own machine, but the prints committed to the reference
 repo must come from CI.
 
+To keep CI renders byte-stable, the environment is pinned and the obvious sources of
+noise are neutralised:
+
+- **iOS runtime** is pinned via `OWL_IOS_RUNTIME` in `visual-regression-run-ios.yml`
+  (the simulator is created on exactly that runtime; the job fails loudly if it's
+  missing). Bumping it changes rendering — do it deliberately and re-seed baselines.
+- **Status-bar clock**: iOS forces 24-hour time; Android uses SystemUI demo mode to
+  freeze the clock/battery/network icons. Otherwise the live clock differs every run.
+
 ## Updating / seeding baselines (manual)
 
 1. Actions → **Visual Regression** → *Run workflow*, tick **`update_baseline`**.

From 039c25f24da7b1ebe46d479be04313b018b4bc27 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 15 Jun 2026 14:28:15 -0300
Subject: [PATCH 09/23] ci: mask OS status bar in owl diffs so baselines verify
 the app

Owl captures the full device screen and its matcher passes only at zero
pixel diff, so the live status-bar clock/battery/signal made every
baseline fail. Patch the matcher to zero the top OWL_MASK_TOP px of both
images before pixelmatch (default 0 = no-op) and set a per-variant mask
height from the owl test, so the top bar is excluded while the app below
is still verified. Source-agnostic for future Maestro screenshots.

Also drop default React imports in the owl host files to satisfy lint.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 app/owls/OwlRoot.tsx                 |  4 ++--
 app/owls/OwlScreensNavigator.tsx     |  1 -
 patches/react-native-owl+1.5.0.patch | 23 +++++++++++++++++++++++
 tests/owl/actionSheets.owl.tsx       | 17 +++++++++++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/app/owls/OwlRoot.tsx b/app/owls/OwlRoot.tsx
index f8b6bbd981e..73e15e56aba 100644
--- a/app/owls/OwlRoot.tsx
+++ b/app/owls/OwlRoot.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect } from 'react';
 import { Dimensions, StatusBar, StyleSheet } from 'react-native';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { KeyboardProvider } from 'react-native-keyboard-controller';
@@ -75,7 +75,7 @@ seedMockServers();
  * screen and opens its real action sheet, so baselines are real screens.
  */
 const OwlRoot = () => {
-	React.useEffect(() => {
+	useEffect(() => {
 		RNBootSplash.hide({ fade: false });
 	}, []);
 
diff --git a/app/owls/OwlScreensNavigator.tsx b/app/owls/OwlScreensNavigator.tsx
index 69a3a1fda3e..d79afee9e52 100644
--- a/app/owls/OwlScreensNavigator.tsx
+++ b/app/owls/OwlScreensNavigator.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Pressable, ScrollView, StyleSheet, Text } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
diff --git a/patches/react-native-owl+1.5.0.patch b/patches/react-native-owl+1.5.0.patch
index 8759cf32581..f9bff85a4bf 100644
--- a/patches/react-native-owl+1.5.0.patch
+++ b/patches/react-native-owl+1.5.0.patch
@@ -10,3 +10,26 @@ diff --git a/node_modules/react-native-owl/dist/utils/adb.js b/node_modules/reac
                      return [4 /*yield*/, execa_1.default.command(command, { stdio: stdio })];
                  case 1:
                      _b.sent();
+diff --git a/node_modules/react-native-owl/dist/matchers.js b/node_modules/react-native-owl/dist/matchers.js
+--- a/node_modules/react-native-owl/dist/matchers.js
++++ b/node_modules/react-native-owl/dist/matchers.js
+@@ -26,6 +26,19 @@ var toMatchBaseline = function (latestPath, options) {
+         var baselineImage = pngjs_1.PNG.sync.read(baselineData);
+         var latestData = fs_1.default.readFileSync(latestPath);
+         var latestImage = pngjs_1.PNG.sync.read(latestData);
++        // Mask the top status-bar strip (OWL_MASK_TOP px) on both images before
++        // diffing. The OS top bar (live clock, battery, signal) never matches
++        // across capture/compare runs and the matcher passes only at 0 diff, so
++        // it must be excluded. The strip is zeroed identically on both images, so
++        // pixelmatch sees no diff there while the rest of the app is still
++        // verified pixel-for-pixel. Default 0 = no masking (unchanged behaviour).
++        var maskTop = parseInt(process.env.OWL_MASK_TOP || '0', 10) || 0;
++        maskTop = Math.max(0, Math.min(maskTop, baselineImage.height));
++        if (maskTop > 0) {
++            var maskBytes = baselineImage.width * maskTop * 4;
++            baselineImage.data.fill(0, 0, maskBytes);
++            latestImage.data.fill(0, 0, maskBytes);
++        }
+         var diffImage = new pngjs_1.PNG({
+             width: baselineImage.width,
+             height: baselineImage.height,
diff --git a/tests/owl/actionSheets.owl.tsx b/tests/owl/actionSheets.owl.tsx
index 08b03874ce3..aa5c7e6a95a 100644
--- a/tests/owl/actionSheets.owl.tsx
+++ b/tests/owl/actionSheets.owl.tsx
@@ -11,6 +11,23 @@ const variant = process.env.OWL_VARIANT || 'local';
 const screenshotName = (name: string) => `${variant}-${name}`;
 const isLandscape = variant.includes('landscape');
 
+// Owl screenshots the whole device and its matcher passes only at zero pixel
+// diff, so the OS status bar (live clock, battery, signal) would make every
+// baseline fail — it changes on every run. The patched matcher zeroes the top
+// OWL_MASK_TOP px of both images before diffing, so we mask each device's
+// status-bar height (device px, measured from the captured PNG) while the app
+// below it is still verified pixel-for-pixel. Source-agnostic: works for Owl's
+// own captures and for any screenshot fed through the matcher (e.g. Maestro).
+// Tune a value if the first baseline shows the clock leaking in (raise it) or
+// the header being clipped (lower it).
+const MASK_TOP_BY_VARIANT: Record<string, number> = {
+	'iphone16pro-portrait': 150,
+	'iphonese-portrait': 40,
+	'android-portrait': 88,
+	'android-landscape': 88
+};
+process.env.OWL_MASK_TOP = String(MASK_TOP_BY_VARIANT[variant] ?? 0);
+
 const wait = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms));
 
 // Real screens settle after mount (navigation push animation, DB/REST loading);

From f5d45907d4b432326260b696376b58bdfc1dac8f Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 15 Jun 2026 19:01:32 -0300
Subject: [PATCH 10/23] fix: blank space on actionSheet

Removes the bottom blank space in action-sheet content by dropping the
`marginBottom: insets.bottom` (the sheet already applies its own bottom
safe-area inset) in DirectoryView/Options, MediaAutoDownloadView and
RoomsListView/ServersList, and switching UserNotificationPreferences to
`paddingBottom`.

The react-native-owl visual-regression spike that had been added on this
branch to cover the change is dropped: owl's matcher only passes at zero
pixel diff (no total-diff budget) and screenshots the full device, so
cross-machine sub-pixel/layout noise (~1% on 16 Pro, 20-40% on SE) far
exceeds the <0.5% region under test. Unmaintained, not worth forking.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../visual-regression-build-android.yml       |  94 ------------
 .../workflows/visual-regression-build-ios.yml |  67 ---------
 .../visual-regression-run-android.yml         | 137 -----------------
 .../workflows/visual-regression-run-ios.yml   | 140 ------------------
 .github/workflows/visual-regression.yml       |  87 -----------
 .owl/.gitignore                               |  14 --
 VISUAL_REGRESSION.md                          |  34 -----
 android/app/build.gradle                      |  11 --
 app/owls/OwlRoot.tsx                          | 112 --------------
 app/owls/OwlScreensNavigator.tsx              |  81 ----------
 index.js                                      |   8 +-
 ios/Podfile.lock                              |  35 +----
 ios/RocketChatRN.xcodeproj/project.pbxproj    |   2 +-
 ios/owl-build.sh                              |  32 ----
 owl.config.json                               |  16 --
 package.json                                  |  10 --
 patches/react-native-owl+1.5.0.patch          |  35 -----
 pnpm-lock.yaml                                |  90 -----------
 scripts/owl-compare.sh                        | 113 --------------
 tests/owl/README.md                           | 114 --------------
 tests/owl/actionSheets.owl.tsx                |  82 ----------
 21 files changed, 3 insertions(+), 1311 deletions(-)
 delete mode 100644 .github/workflows/visual-regression-build-android.yml
 delete mode 100644 .github/workflows/visual-regression-build-ios.yml
 delete mode 100644 .github/workflows/visual-regression-run-android.yml
 delete mode 100644 .github/workflows/visual-regression-run-ios.yml
 delete mode 100644 .github/workflows/visual-regression.yml
 delete mode 100644 .owl/.gitignore
 delete mode 100644 VISUAL_REGRESSION.md
 delete mode 100644 app/owls/OwlRoot.tsx
 delete mode 100644 app/owls/OwlScreensNavigator.tsx
 delete mode 100755 ios/owl-build.sh
 delete mode 100644 owl.config.json
 delete mode 100644 patches/react-native-owl+1.5.0.patch
 delete mode 100755 scripts/owl-compare.sh
 delete mode 100644 tests/owl/README.md
 delete mode 100644 tests/owl/actionSheets.owl.tsx

diff --git a/.github/workflows/visual-regression-build-android.yml b/.github/workflows/visual-regression-build-android.yml
deleted file mode 100644
index ae5694bf02e..00000000000
--- a/.github/workflows/visual-regression-build-android.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-name: Visual Regression Build Android
-
-# Reusable: builds the Owl Android APK ONCE and uploads it as an artifact. The
-# Android run leg downloads and reuses it. Owl builds Release (so USE_OWL is
-# inlined) and signs with the local debug key via the `isOwlBuild` fallback in
-# android/app/build.gradle — no production signing secrets are needed.
-
-on:
-  workflow_call:
-    outputs:
-      artifact:
-        description: Name of the uploaded Owl Android APK artifact
-        value: owl-app-android
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    env:
-      USE_OWL: true
-      RUNNING_E2E_TESTS: true
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-
-      - name: Checkout and Setup Node
-        uses: ./.github/actions/setup-node
-
-      - name: Set up JDK
-        uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
-        with:
-          gradle-version: wrapper
-
-      - name: Cache Gradle dependencies
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: |
-            ~/.gradle
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            gradle-${{ runner.os }}-
-
-      # build.gradle's isOwlBuild fallback signs the Release APK with the local
-      # Android debug key; create it if the runner doesn't have one yet.
-      - name: Ensure Android debug keystore
-        run: |
-          set -eux
-          mkdir -p "$HOME/.android"
-          if [ ! -f "$HOME/.android/debug.keystore" ]; then
-            keytool -genkeypair -v \
-              -keystore "$HOME/.android/debug.keystore" \
-              -storepass android -keypass android \
-              -alias androiddebugkey \
-              -keyalg RSA -keysize 2048 -validity 10000 \
-              -dname "CN=Android Debug,O=Android,C=US"
-          fi
-
-      - name: Set gradle.properties
-        working-directory: android
-        run: |
-          echo "" > ./gradle.properties
-          echo -e "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" >> ./gradle.properties
-          echo -e "android.useAndroidX=true" >> ./gradle.properties
-          echo -e "android.enableJetifier=true" >> ./gradle.properties
-          echo -e "reactNativeArchitectures=x86_64" >> ./gradle.properties
-          echo -e "APPLICATION_ID=chat.rocket.android" >> ./gradle.properties
-          echo -e "newArchEnabled=true" >> ./gradle.properties
-          echo -e "hermesEnabled=true" >> ./gradle.properties
-          echo -e "VERSIONCODE=999999" >> ./gradle.properties
-          # build.gradle reads BugsnagAPIKey into a manifest placeholder. Owl
-          # builds are throwaway and never upload to Bugsnag, so a dummy value is
-          # enough to satisfy the property (no secret needed).
-          echo -e "BugsnagAPIKey=0000000000000000000000000000000000" >> ./gradle.properties
-
-      - name: Build Owl APK
-        run: pnpm owl:build:android
-
-      - name: Upload Owl Android APK
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: owl-app-android
-          path: android/app/build/outputs/apk/release/app-release.apk
-          retention-days: 1
-          if-no-files-found: error
diff --git a/.github/workflows/visual-regression-build-ios.yml b/.github/workflows/visual-regression-build-ios.yml
deleted file mode 100644
index e295c5b6906..00000000000
--- a/.github/workflows/visual-regression-build-ios.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-name: Visual Regression Build iOS
-
-# Reusable: builds the Owl iOS app ONCE and uploads it as an artifact. Every
-# iOS run leg (iPhone 16 Pro, iPhone SE) downloads and reuses this single build
-# — the .app is device-agnostic, so there is no need to rebuild per device.
-
-on:
-  workflow_call:
-    outputs:
-      artifact:
-        description: Name of the uploaded Owl iOS app artifact
-        value: owl-app-ios
-
-jobs:
-  build:
-    runs-on: macos-26
-    timeout-minutes: 60
-    env:
-      USE_OWL: true
-      RUNNING_E2E_TESTS: true
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-
-      - name: Checkout and Setup Node
-        uses: ./.github/actions/setup-node
-
-      - name: Set up Xcode
-        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
-        with:
-          xcode-version: '26.2.0'
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
-        with:
-          ruby-version: 2.7.7
-          bundler-cache: true
-
-      - name: Cache CocoaPods and derived data
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: |
-            ios/Pods
-            ~/Library/Caches/CocoaPods
-            ~/.cocoapods/repos
-            ~/Library/Developer/Xcode/DerivedData
-          key: visual-regression-ios-${{ runner.os }}-${{ hashFiles('ios/Podfile.lock', 'ios/Podfile') }}
-          restore-keys: |
-            visual-regression-ios-${{ runner.os }}-
-
-      - name: Install CocoaPods
-        run: pnpm pod-install
-
-      - name: Build Owl app
-        run: pnpm owl:build:ios
-
-      # owl-build.sh derives data to ios/build and copies the product to
-      # RocketChat.app — the exact name+path `owl test` installs from on the run
-      # leg (scheme "RocketChat", Release-iphonesimulator).
-      - name: Upload Owl iOS app
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: owl-app-ios
-          path: ios/build/Build/Products/Release-iphonesimulator/RocketChat.app
-          retention-days: 1
-          if-no-files-found: error
diff --git a/.github/workflows/visual-regression-run-android.yml b/.github/workflows/visual-regression-run-android.yml
deleted file mode 100644
index 2b2ef3670c0..00000000000
--- a/.github/workflows/visual-regression-run-android.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-name: Visual Regression Run Android
-
-# Reusable: runs one Android visual-regression leg against a pre-built Owl APK.
-# Downloads the APK, syncs the matching baseline prints from the reference repo,
-# then boots a Pixel 7 Pro emulator and compares. owl test installs the APK and
-# launches it itself inside the emulator-runner step.
-
-on:
-  workflow_call:
-    inputs:
-      variant:
-        description: 'OWL_VARIANT, e.g. android-portrait'
-        required: true
-        type: string
-      update_baseline:
-        description: 'Capture fresh baselines instead of comparing'
-        required: false
-        type: boolean
-        default: false
-
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    env:
-      USE_OWL: true
-      RUNNING_E2E_TESTS: true
-      OWL_VARIANT: ${{ inputs.variant }}
-      UPDATE_BASELINE: ${{ inputs.update_baseline }}
-      ANDROID_AVD_HOME: /home/runner/.android/avd
-      BASELINE_REPO: https://github.com/OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-
-      - name: Checkout and Setup Node
-        uses: ./.github/actions/setup-node
-
-      - name: Setup Java
-        uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Cache Android AVD
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: avd-${{ runner.os }}-api34
-
-      # owl test installs <cwd>/android/app/build/outputs/apk/release/app-release.apk
-      - name: Download Owl APK
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: owl-app-android
-          path: android/app/build/outputs/apk/release
-
-      - name: Sync baseline prints from reference repo (compare mode)
-        if: ${{ !inputs.update_baseline }}
-        run: |
-          set -euo pipefail
-          git clone --depth=1 --quiet "$BASELINE_REPO" .owl/reference
-          rm -rf .owl/baseline/android
-          mkdir -p .owl/baseline/android
-          cp .owl/reference/app/containers/ActionSheet/"$OWL_VARIANT"-*.png .owl/baseline/android/
-          echo "Staged $(ls .owl/baseline/android | wc -l) baseline print(s) for $OWL_VARIANT"
-
-      - name: Enable KVM group permissions
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Disable unnecessary services (improves emulator stability)
-        run: |
-          sudo systemctl stop docker || true
-          sudo systemctl stop snapd || true
-
-      - name: Boot emulator and run Owl
-        uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0
-        timeout-minutes: 45
-        with:
-          api-level: 34
-          disk-size: 4096M
-          arch: x86_64
-          target: google_apis
-          profile: pixel_7_pro
-          cores: 4
-          ram-size: 4096M
-          force-avd-creation: false
-          disable-animations: true
-          emulator-boot-timeout: 900
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -accel on
-          script: |
-            set -eu
-            # owl doesn't manage the Android status bar, so the live clock/icons
-            # would leak into screenshots and differ every run. SystemUI demo mode
-            # freezes them; 24-hour time keeps the clock format stable.
-            adb shell settings put system time_12_24 24
-            adb shell settings put global sysui_demo_allowed 1
-            adb shell am broadcast -a com.android.systemui.demo -e command enter
-            adb shell am broadcast -a com.android.systemui.demo -e command clock -e hhmm 0941
-            adb shell am broadcast -a com.android.systemui.demo -e command battery -e level 100 -e plugged false
-            adb shell am broadcast -a com.android.systemui.demo -e command network -e wifi show -e level 4 -e fully true
-            adb shell am broadcast -a com.android.systemui.demo -e command network -e mobile hide
-            adb shell am broadcast -a com.android.systemui.demo -e command notifications -e visible false
-            if [ "$UPDATE_BASELINE" = "true" ]; then
-              pnpm owl:test:update:android
-            else
-              pnpm owl:test:android
-            fi
-
-      # Clean, commit-ready prints: just the PNGs, correctly named. Download all
-      # legs' owl-baseline-* artifacts and drop them into the reference repo's
-      # app/containers/ActionSheet/ to seed the CI goldens.
-      - name: Upload fresh baselines (update mode)
-        if: ${{ inputs.update_baseline }}
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: owl-baseline-${{ inputs.variant }}
-          path: .owl/baseline/android/*.png
-          if-no-files-found: error
-
-      - name: Upload Owl results
-        if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: owl-android-${{ inputs.variant }}
-          path: |
-            .owl/report
-            .owl/diff
-            .owl/latest
-            .owl/baseline/android
-          retention-days: 7
diff --git a/.github/workflows/visual-regression-run-ios.yml b/.github/workflows/visual-regression-run-ios.yml
deleted file mode 100644
index 19736afd861..00000000000
--- a/.github/workflows/visual-regression-run-ios.yml
+++ /dev/null
@@ -1,140 +0,0 @@
-name: Visual Regression Run iOS
-
-# Reusable: runs one iOS visual-regression leg against a pre-built Owl app.
-# Downloads the app artifact, points owl at the requested simulator, syncs the
-# matching baseline prints from the reference repo, then compares.
-
-on:
-  workflow_call:
-    inputs:
-      variant:
-        description: 'OWL_VARIANT, e.g. iphone16pro-portrait'
-        required: true
-        type: string
-      device:
-        description: 'Simulator name, e.g. iPhone 16 Pro'
-        required: true
-        type: string
-      update_baseline:
-        description: 'Capture fresh baselines instead of comparing'
-        required: false
-        type: boolean
-        default: false
-
-jobs:
-  run:
-    runs-on: macos-26
-    timeout-minutes: 60
-    env:
-      USE_OWL: true
-      RUNNING_E2E_TESTS: true
-      OWL_VARIANT: ${{ inputs.variant }}
-      OWL_DEVICE: ${{ inputs.device }}
-      # Pin the simulator runtime so baselines can't silently drift when a runner
-      # image bumps Xcode/iOS. Bump this (and re-seed baselines) on purpose only.
-      OWL_IOS_RUNTIME: com.apple.CoreSimulator.SimRuntime.iOS-26-0
-      BASELINE_REPO: https://github.com/OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-
-      - name: Checkout and Setup Node
-        uses: ./.github/actions/setup-node
-
-      - name: Set up Xcode
-        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
-        with:
-          xcode-version: '26.2.0'
-
-      # owl test installs <cwd>/ios/build/Build/Products/Release-iphonesimulator/RocketChat.app
-      - name: Download Owl iOS app
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: owl-app-ios
-          path: ios/build/Build/Products/Release-iphonesimulator/RocketChat.app
-
-      - name: Point Owl at the target simulator
-        run: |
-          node -e "const fs=require('fs');const f='owl.config.json';const c=JSON.parse(fs.readFileSync(f,'utf8'));c.ios.device=process.env.OWL_DEVICE;fs.writeFileSync(f,JSON.stringify(c,null,'\t')+'\n')"
-          echo "owl.config.json ios.device -> $OWL_DEVICE"
-
-      # The runner doesn't pre-create named simulators for the freshly selected
-      # Xcode, so "iPhone 16 Pro" / "iPhone SE (3rd generation)" may not exist
-      # yet (simctl: "Invalid device"). Resolve a device of the requested name ON
-      # THE PINNED RUNTIME, creating it if missing, then boot by UDID. Pinning the
-      # runtime keeps renders byte-stable across runner image updates.
-      - name: Ensure & boot simulator
-        run: |
-          set -euo pipefail
-          UDID="$(node <<'NODE'
-          const { execSync } = require('child_process');
-          const name = process.env.OWL_DEVICE;
-          const wantRt = process.env.OWL_IOS_RUNTIME;
-          const j = c => JSON.parse(execSync(c).toString());
-          const runtimes = j('xcrun simctl list runtimes -j').runtimes.filter(r => r.platform === 'iOS' && r.isAvailable);
-          const rt = runtimes.find(r => r.identifier === wantRt);
-          if (!rt) {
-            console.error(`Pinned iOS runtime ${wantRt} not available. Present: ` + runtimes.map(r => r.identifier).join(', '));
-            process.exit(1);
-          }
-          const devices = j('xcrun simctl list devices available -j').devices;
-          let udid;
-          for (const d of (devices[rt.identifier] || [])) if (d.name === name) udid = d.udid;
-          if (!udid) {
-            const dt = j('xcrun simctl list devicetypes -j').devicetypes.find(t => t.name === name);
-            if (!dt) { console.error('No simulator device type named: ' + name); process.exit(1); }
-            console.error(`Creating "${name}" on ${rt.name}`);
-            udid = execSync(`xcrun simctl create ${JSON.stringify(name)} ${dt.identifier} ${rt.identifier}`).toString().trim();
-          }
-          process.stdout.write(udid);
-          NODE
-          )"
-          echo "Using simulator $OWL_DEVICE ($UDID) on $OWL_IOS_RUNTIME"
-          xcrun simctl boot "$UDID" || true
-          xcrun simctl bootstatus "$UDID" -b
-          xcrun simctl spawn "$UDID" defaults write -g UIAnimationDragCoefficient -float 10
-          # Force 24-hour time so the status-bar clock owl stamps ("9:41") renders
-          # identically regardless of the runner's region (avoids 09:41 vs 9:41 AM).
-          xcrun simctl spawn "$UDID" defaults write -g AppleICUForce24HourTime -bool true
-
-      - name: Sync baseline prints from reference repo (compare mode)
-        if: ${{ !inputs.update_baseline }}
-        run: |
-          set -euo pipefail
-          git clone --depth=1 --quiet "$BASELINE_REPO" .owl/reference
-          rm -rf .owl/baseline/ios
-          mkdir -p .owl/baseline/ios
-          cp .owl/reference/app/containers/ActionSheet/"$OWL_VARIANT"-*.png .owl/baseline/ios/
-          echo "Staged $(ls .owl/baseline/ios | wc -l) baseline print(s) for $OWL_VARIANT"
-
-      - name: Compare against baselines
-        if: ${{ !inputs.update_baseline }}
-        run: pnpm owl:test:ios
-
-      - name: Capture fresh baselines
-        if: ${{ inputs.update_baseline }}
-        run: pnpm owl:test:update:ios
-
-      # Clean, commit-ready prints: just the PNGs, correctly named. Download all
-      # legs' owl-baseline-* artifacts and drop them into the reference repo's
-      # app/containers/ActionSheet/ to seed the CI goldens.
-      - name: Upload fresh baselines (update mode)
-        if: ${{ inputs.update_baseline }}
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: owl-baseline-${{ inputs.variant }}
-          path: .owl/baseline/ios/*.png
-          if-no-files-found: error
-
-      - name: Upload Owl results
-        if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: owl-ios-${{ inputs.variant }}
-          path: |
-            .owl/report
-            .owl/diff
-            .owl/latest
-            .owl/baseline/ios
-          retention-days: 7
diff --git a/.github/workflows/visual-regression.yml b/.github/workflows/visual-regression.yml
deleted file mode 100644
index 8cb301c9bc6..00000000000
--- a/.github/workflows/visual-regression.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-name: Visual Regression
-
-# Orchestrates the action-sheet visual-regression flow across all device legs,
-# mirroring the e2e build->run shape: build each platform's Owl app once, then
-# fan out the comparison over devices/orientations. Baselines are pulled from the
-# reference repo (OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest) at
-# run time — nothing baseline-related is committed in this repo.
-#
-# Legs: iPhone 16 Pro, iPhone SE (3rd gen, low-height), Android portrait + landscape.
-
-on:
-  workflow_dispatch:
-    inputs:
-      update_baseline:
-        description: 'Capture fresh baselines instead of comparing against the reference repo'
-        required: false
-        type: boolean
-        default: false
-  pull_request:
-    paths:
-      - '.github/workflows/visual-regression*.yml'
-      - 'app/owls/**'
-      - 'tests/owl/**'
-      - 'scripts/owl-compare.sh'
-      - 'owl.config.json'
-      - 'index.js'
-      - 'package.json'
-      - 'pnpm-lock.yaml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  # Manual approval gate, mirroring e2e's e2e-hold: nothing builds or runs until
-  # a reviewer approves the protected environment. Keeps the expensive macOS +
-  # emulator legs off every push.
-  hold:
-    name: Visual Regression Hold
-    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
-    environment: approve_e2e_testing
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "Waiting for manual approval..."
-
-  build-ios:
-    name: Build iOS
-    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
-    needs: [hold]
-    uses: ./.github/workflows/visual-regression-build-ios.yml
-
-  run-ios:
-    name: Run iOS (${{ matrix.variant }})
-    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
-    needs: [build-ios]
-    uses: ./.github/workflows/visual-regression-run-ios.yml
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - variant: iphone16pro-portrait
-            device: iPhone 16 Pro
-          - variant: iphonese-portrait
-            device: iPhone SE (3rd generation)
-    with:
-      variant: ${{ matrix.variant }}
-      device: ${{ matrix.device }}
-      update_baseline: ${{ github.event_name == 'workflow_dispatch' && inputs.update_baseline || false }}
-
-  build-android:
-    name: Build Android
-    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
-    needs: [hold]
-    uses: ./.github/workflows/visual-regression-build-android.yml
-
-  run-android:
-    name: Run Android (${{ matrix.variant }})
-    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
-    needs: [build-android]
-    uses: ./.github/workflows/visual-regression-run-android.yml
-    strategy:
-      fail-fast: false
-      matrix:
-        variant: [android-portrait, android-landscape]
-    with:
-      variant: ${{ matrix.variant }}
-      update_baseline: ${{ github.event_name == 'workflow_dispatch' && inputs.update_baseline || false }}
diff --git a/.owl/.gitignore b/.owl/.gitignore
deleted file mode 100644
index a197d82492c..00000000000
--- a/.owl/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-# generated by react-native-owl
-diff/
-latest/
-report/
-
-# cloned baseline reference repo (source of the action-sheet prints)
-reference/
-
-# Baselines are NOT committed here — the reference repo
-# (OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest) is the source of
-# truth. `scripts/owl-compare.sh` pulls the prints and stages them into
-# baseline/<platform>/ at compare time. `baseline/ActionSheet/` is a local
-# offline-fallback cache.
-baseline/
diff --git a/VISUAL_REGRESSION.md b/VISUAL_REGRESSION.md
deleted file mode 100644
index df9c340170f..00000000000
--- a/VISUAL_REGRESSION.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Visual Regression Testing
-
-This repo now has an isolated `react-native-owl` harness behind `USE_OWL=true`.
-
-## Local iOS flow
-
-1. Build the fixture app:
-   `pnpm owl:build:ios`
-2. Generate or refresh baselines:
-   `pnpm owl:test:update:ios`
-3. Compare against committed baselines:
-   `pnpm owl:test:ios`
-
-Optional Jest filters can be forwarded to Owl:
-
-- `pnpm owl:test:ios -- --testPathPattern='tests/owl/smoke.owl.tsx'`
-- `pnpm owl:test:ios -- --testNamePattern='expanded fixture state'`
-
-## Layout
-
-- `app/owls/` contains the isolated render harness and reusable fixtures.
-- `tests/owl/` contains Owl test files.
-- `.owl/baseline/ios/` is expected to be committed once baselines are approved.
-
-## GitHub Actions
-
-Use `.github/workflows/visual-regression-ios.yml`.
-
-- `workflow_dispatch` supports `update_baseline=true` to generate fresh baselines and upload them as an artifact.
-- Pull requests touching Owl files will run compare mode and require committed iOS baseline images.
-
-## Current constraint
-
-Formidable's published Owl docs still state support only up to React Native `0.70.x`. This repo is on React Native `0.81.5`, so treat the integration as experimental until the first end-to-end run is validated in CI and on a local simulator.
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2202e6603a1..f183eb60e8a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -103,17 +103,6 @@ android {
                 storePassword KEYSTORE_PASSWORD
                 keyAlias KEY_ALIAS
                 keyPassword KEY_PASSWORD
-            } else if (project.hasProperty('isOwlBuild')) {
-                // Visual-regression (Owl) builds must be Release so `USE_OWL` is
-                // inlined into the JS bundle, but they are never shipped. Without a
-                // release keystore the APK would be unsigned and impossible to
-                // install on an emulator, so sign it with the local Android debug
-                // key. Gated on `isOwlBuild` (passed by react-native-owl) so real
-                // release builds are unaffected.
-                storeFile file("${System.properties['user.home']}/.android/debug.keystore")
-                storePassword 'android'
-                keyAlias 'androiddebugkey'
-                keyPassword 'android'
             }
         }
     }
diff --git a/app/owls/OwlRoot.tsx b/app/owls/OwlRoot.tsx
deleted file mode 100644
index 73e15e56aba..00000000000
--- a/app/owls/OwlRoot.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import { useEffect } from 'react';
-import { Dimensions, StatusBar, StyleSheet } from 'react-native';
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
-import { KeyboardProvider } from 'react-native-keyboard-controller';
-import RNBootSplash from 'react-native-bootsplash';
-import { SafeAreaProvider } from 'react-native-safe-area-context';
-import { NavigationContainer } from '@react-navigation/native';
-import { Provider } from 'react-redux';
-
-import { setUser } from '../actions/login';
-import { selectServerRequest } from '../actions/server';
-import { ActionSheetProvider } from '../containers/ActionSheet';
-import { DimensionsContext } from '../dimensions';
-import { colors } from '../lib/constants/colors';
-import database from '../lib/database';
-import ResponsiveLayoutProvider from '../lib/hooks/useResponsiveLayout/useResponsiveLayout';
-import { initStore } from '../lib/store/auxStore';
-import { createMockedStore } from '../reducers/mockedStore';
-import { ThemeContext } from '../theme';
-import OwlScreensNavigator from './OwlScreensNavigator';
-
-const styles = StyleSheet.create({
-	fill: {
-		flex: 1
-	}
-});
-
-const baseUrl = 'https://open.rocket.chat';
-const store = createMockedStore();
-
-initStore(store);
-store.dispatch(selectServerRequest(baseUrl, '8.0.0'));
-store.dispatch(setUser({ id: 'abc', username: 'rocket.cat', name: 'Rocket Cat', roles: ['user'] }));
-// Real screens (RoomsListView) read from the active WatermelonDB. Set it up so
-// subscription queries resolve to an empty, deterministic state instead of
-// crashing on an undefined database.
-database.setActiveDB(baseUrl);
-
-// Seed the servers DB so the ServersList action sheet shows real workspace rows.
-// The first one matches the active server, so it renders with the selected check.
-// Empty iconURL makes ServerItem fall back to the bundled logo (no network).
-const MOCK_SERVERS = [
-	{ id: baseUrl, name: 'Rocket.Chat' },
-	{ id: 'https://team.rocket.chat', name: 'Rocket.Chat Team' },
-	{ id: 'https://community.rocket.chat', name: 'Community' }
-];
-
-const seedMockServers = async () => {
-	const serversCollection = database.servers.get('servers');
-	const count = await serversCollection.query().fetchCount();
-	if (count > 0) {
-		return;
-	}
-	await database.servers.write(async () => {
-		await Promise.all(
-			MOCK_SERVERS.map(server =>
-				serversCollection.create((record: any) => {
-					record._raw.id = server.id;
-					record.name = server.name;
-					record.iconURL = '';
-					record.version = '8.0.0';
-				})
-			)
-		);
-	});
-};
-
-seedMockServers();
-
-/**
- * Owl host that renders the real application screens inside the same provider
- * tree as `app/index.tsx` (store, theme, responsive layout, dimensions, gesture
- * handler, keyboard, action sheet) plus a NavigationContainer + native stack so
- * each screen mounts with its real header/triggers. The Owl test navigates to a
- * screen and opens its real action sheet, so baselines are real screens.
- */
-const OwlRoot = () => {
-	useEffect(() => {
-		RNBootSplash.hide({ fade: false });
-	}, []);
-
-	const { width, height, scale, fontScale } = Dimensions.get('window');
-
-	return (
-		<SafeAreaProvider style={styles.fill}>
-			<Provider store={store}>
-				<ThemeContext.Provider
-					value={{
-						theme: 'light',
-						colors: colors.light
-					}}>
-					<ResponsiveLayoutProvider>
-						<DimensionsContext.Provider value={{ width, height, scale, fontScale, setDimensions: () => {} }}>
-							<GestureHandlerRootView style={styles.fill}>
-								<KeyboardProvider>
-									<ActionSheetProvider>
-										<StatusBar backgroundColor={colors.light.surfaceTint} barStyle='dark-content' />
-										<NavigationContainer>
-											<OwlScreensNavigator />
-										</NavigationContainer>
-									</ActionSheetProvider>
-								</KeyboardProvider>
-							</GestureHandlerRootView>
-						</DimensionsContext.Provider>
-					</ResponsiveLayoutProvider>
-				</ThemeContext.Provider>
-			</Provider>
-		</SafeAreaProvider>
-	);
-};
-
-export default OwlRoot;
diff --git a/app/owls/OwlScreensNavigator.tsx b/app/owls/OwlScreensNavigator.tsx
deleted file mode 100644
index d79afee9e52..00000000000
--- a/app/owls/OwlScreensNavigator.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Pressable, ScrollView, StyleSheet, Text } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import * as ScreenOrientation from 'expo-screen-orientation';
-
-import { colors } from '../lib/constants/colors';
-import DirectoryView from '../views/DirectoryView';
-import MediaAutoDownloadView from '../views/MediaAutoDownloadView';
-import RoomsListView from '../views/RoomsListView';
-import UserNotificationPreferencesView from '../views/UserNotificationPreferencesView';
-
-const Stack = createNativeStackNavigator();
-
-// Thin launcher used only to navigate to a real screen. It is never captured in
-// a baseline — the test always navigates away before taking a screenshot, so
-// every baseline is a real application screen with its real action sheet.
-const LINKS = [
-	{ route: 'RoomsListView', label: 'Rooms list', testID: 'owl-nav-rooms-list' },
-	{ route: 'DirectoryView', label: 'Directory', testID: 'owl-nav-directory' },
-	{ route: 'MediaAutoDownloadView', label: 'Media auto-download', testID: 'owl-nav-media-auto-download' },
-	{ route: 'UserNotificationPrefView', label: 'Notification preferences', testID: 'owl-nav-user-notification-prefs' }
-] as const;
-
-const styles = StyleSheet.create({
-	launcher: {
-		flexGrow: 1,
-		justifyContent: 'center',
-		gap: 16,
-		padding: 24,
-		backgroundColor: colors.light.surfaceRoom
-	},
-	button: {
-		backgroundColor: colors.light.buttonBackgroundPrimaryDefault,
-		borderRadius: 12,
-		paddingVertical: 16,
-		alignItems: 'center'
-	},
-	buttonText: {
-		color: colors.light.buttonFontPrimary,
-		fontSize: 16,
-		fontWeight: '700'
-	}
-});
-
-// Orientation is driven from JS (not by rotating the device) so it works in CI
-// and locally without Accessibility/synthetic input. LANDSCAPE_LEFT is fixed for
-// determinism. iOS Info.plist already allows landscape and the Android
-// MainActivity handles orientation changes, so no orientation boundaries change.
-const setLandscape = () => ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.LANDSCAPE_LEFT);
-const setPortrait = () => ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.PORTRAIT_UP);
-
-const Launcher = () => {
-	const navigation = useNavigation<any>();
-	return (
-		<ScrollView contentContainerStyle={styles.launcher} testID='owl-launcher'>
-			<Pressable testID='owl-set-portrait' style={styles.button} onPress={setPortrait}>
-				<Text style={styles.buttonText}>Portrait</Text>
-			</Pressable>
-			<Pressable testID='owl-set-landscape' style={styles.button} onPress={setLandscape}>
-				<Text style={styles.buttonText}>Landscape</Text>
-			</Pressable>
-			{LINKS.map(link => (
-				<Pressable key={link.route} testID={link.testID} style={styles.button} onPress={() => navigation.navigate(link.route)}>
-					<Text style={styles.buttonText}>{link.label}</Text>
-				</Pressable>
-			))}
-		</ScrollView>
-	);
-};
-
-const OwlScreensNavigator = () => (
-	<Stack.Navigator initialRouteName='Launcher' screenOptions={{ headerBackButtonDisplayMode: 'minimal' }}>
-		<Stack.Screen name='Launcher' component={Launcher} options={{ headerShown: false }} />
-		<Stack.Screen name='RoomsListView' component={RoomsListView} />
-		<Stack.Screen name='DirectoryView' component={DirectoryView} />
-		<Stack.Screen name='MediaAutoDownloadView' component={MediaAutoDownloadView} />
-		<Stack.Screen name='UserNotificationPrefView' component={UserNotificationPreferencesView} />
-	</Stack.Navigator>
-);
-
-export default OwlScreensNavigator;
diff --git a/index.js b/index.js
index 5f1df6c1ae4..9c3fd8555b5 100644
--- a/index.js
+++ b/index.js
@@ -6,13 +6,7 @@ import DeviceInfo from 'react-native-device-info';
 
 import { name as appName } from './app.json';
 
-if (process.env.USE_OWL) {
-	AppRegistry.registerComponent(appName, () => {
-		const OwlRoot = require('./app/owls/OwlRoot').default;
-
-		return () => <OwlRoot />;
-	});
-} else if (process.env.USE_STORYBOOK) {
+if (process.env.USE_STORYBOOK) {
 	AppRegistry.registerComponent(appName, () => require('./.rnstorybook/index').default);
 } else {
 	if (!__DEV__) {
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 34c8141359b..0586d5be0bf 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -129,35 +129,6 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - ExpoScreenOrientation (9.0.9):
-    - boost
-    - DoubleConversion
-    - ExpoModulesCore
-    - fast_float
-    - fmt
-    - glog
-    - hermes-engine
-    - RCT-Folly
-    - RCT-Folly/Fabric
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-jsi
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-renderercss
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - SocketRocket
-    - Yoga
   - ExpoSystemUI (6.0.9):
     - ExpoModulesCore
   - ExpoVideoThumbnails (10.0.8):
@@ -3593,7 +3564,6 @@ DEPENDENCIES:
   - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - ExpoLocalAuthentication (from `../node_modules/expo-local-authentication/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
-  - ExpoScreenOrientation (from `../node_modules/expo-screen-orientation/ios`)
   - ExpoSystemUI (from `../node_modules/expo-system-ui/ios`)
   - ExpoVideoThumbnails (from `../node_modules/expo-video-thumbnails/ios`)
   - ExpoWebBrowser (from `../node_modules/expo-web-browser/ios`)
@@ -3783,8 +3753,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-local-authentication/ios"
   ExpoModulesCore:
     :path: "../node_modules/expo-modules-core"
-  ExpoScreenOrientation:
-    :path: "../node_modules/expo-screen-orientation/ios"
   ExpoSystemUI:
     :path: "../node_modules/expo-system-ui/ios"
   ExpoVideoThumbnails:
@@ -4029,7 +3997,6 @@ SPEC CHECKSUMS:
   ExpoKeepAwake: 55f75eca6499bb9e4231ebad6f3e9cb8f99c0296
   ExpoLocalAuthentication: 8a31808565da7af926dd9b595e98594d8b1553b6
   ExpoModulesCore: 91a57f1d109cf53fe58d44fcf6b68a777561549a
-  ExpoScreenOrientation: 6a6bfbeef1fbb10ed767dfa169784c3938e54dc7
   ExpoSystemUI: 2ad325f361a2fcd96a464e8574e19935c461c9cc
   ExpoVideoThumbnails: 503a79271416c8723f04b55ea4737282513ebe4f
   ExpoWebBrowser: 17b064c621789e41d4816c95c93f429b84971f52
@@ -4062,7 +4029,7 @@ SPEC CHECKSUMS:
   NitroModules: 18e41c298d86fc753fc754969fa9f84044e70711
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
-  RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f
+  RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
   RCTDeprecation: 5eb1d2eeff5fb91151e8a8eef45b6c7658b6c897
   RCTRequired: cebcf9442fc296c9b89ac791dfd463021d9f6f23
   RCTTypeSafety: b99aa872829ee18f6e777e0ef55852521c5a6788
diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj
index 9568762fbcb..543f9a4aadc 100644
--- a/ios/RocketChatRN.xcodeproj/project.pbxproj
+++ b/ios/RocketChatRN.xcodeproj/project.pbxproj
@@ -1393,7 +1393,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"$USE_OWL\" = \"true\" ]; then echo \"Skipping Bugsnag source map upload for Owl build\"; exit 0; fi\nSOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh\n";
+			shellScript = "SOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh\n";
 			showEnvVarsInLog = 0;
 		};
 		86A998705576AFA7CE938617 /* [Expo] Configure project */ = {
diff --git a/ios/owl-build.sh b/ios/owl-build.sh
deleted file mode 100755
index 50d623ed4b3..00000000000
--- a/ios/owl-build.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-set -e
-
-# Owl iOS build helper.
-#
-# Two reasons this exists instead of letting react-native-owl run its default
-# `xcodebuild ... -sdk iphonesimulator`:
-#
-# 1. The RocketChat scheme embeds the "Rocket.Chat.Watch" Watch App. Forcing
-#    every target onto the iphonesimulator SDK breaks the watch target (WatchKit
-#    is unavailable there). Building for a *destination* lets each target pick its
-#    correct SDK, exactly like `pnpm ios` does.
-# 2. The product is "Rocket.Chat.app", but Owl derives the app name from the
-#    scheme ("RocketChat.app") for install/launch. We expose a copy under that
-#    name so Owl's default (absolute) path resolution works — a custom binaryPath
-#    would be resolved relative to /usr/libexec by Owl's PlistBuddy call and fail.
-
-# NOTE: do NOT pass CODE_SIGNING_ALLOWED=NO. The app reads its WatermelonDB path
-# from the App Group shared container, which requires the app-group entitlement.
-# Disabling signing strips entitlements and the app crashes on launch with
-# "Could not resolve database path". Simulator builds ad-hoc sign (and apply
-# entitlements) with no developer team, exactly like `pnpm ios`.
-xcodebuild \
-	-workspace ios/RocketChatRN.xcworkspace \
-	-scheme RocketChat \
-	-configuration Release \
-	-destination 'generic/platform=iOS Simulator' \
-	-derivedDataPath ios/build
-
-PRODUCTS="ios/build/Build/Products/Release-iphonesimulator"
-rm -rf "$PRODUCTS/RocketChat.app"
-cp -R "$PRODUCTS/Rocket.Chat.app" "$PRODUCTS/RocketChat.app"
diff --git a/owl.config.json b/owl.config.json
deleted file mode 100644
index ef28d240b5b..00000000000
--- a/owl.config.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"ios": {
-		"workspace": "ios/RocketChatRN.xcworkspace",
-		"scheme": "RocketChat",
-		"configuration": "Release",
-		"device": "iPhone 16 Pro",
-		"buildCommand": "ios/owl-build.sh",
-		"quiet": true
-	},
-	"android": {
-		"packageName": "chat.rocket.android",
-		"buildType": "Release",
-		"quiet": true
-	},
-	"report": true
-}
diff --git a/package.json b/package.json
index 07a2a7f64f0..52aeaa67025 100644
--- a/package.json
+++ b/package.json
@@ -7,14 +7,6 @@
 		"start": "react-native start",
 		"test": "TZ=UTC jest",
 		"test-update": "TZ=UTC jest --updateSnapshot",
-		"owl:build:ios": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl build --platform ios",
-		"owl:test:ios": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform ios",
-		"owl:test:update:ios": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform ios --update",
-		"owl:build:android": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl build --platform android",
-		"owl:test:android": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform android",
-		"owl:test:update:android": "USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform android --update",
-		"owl:compare:ios": "sh scripts/owl-compare.sh ios",
-		"owl:compare:android": "sh scripts/owl-compare.sh android",
 		"lint": "eslint . && tsc",
 		"prettier-lint": "prettier --write . && pnpm lint",
 		"ios": "react-native run-ios",
@@ -80,7 +72,6 @@
 		"expo-local-authentication": "~17.0.8",
 		"expo-navigation-bar": "~5.0.10",
 		"expo-notifications": "~0.32.15",
-		"expo-screen-orientation": "~9.0.9",
 		"expo-status-bar": "~3.0.9",
 		"expo-system-ui": "~6.0.9",
 		"expo-video-thumbnails": "~10.0.8",
@@ -224,7 +215,6 @@
 		"prettier": "2.8.8",
 		"react-dom": "19.1.0",
 		"react-native-dotenv": "3.4.8",
-		"react-native-owl": "1.5.0",
 		"storybook": "~9.0.9",
 		"typescript": "~5.9.3"
 	},
diff --git a/patches/react-native-owl+1.5.0.patch b/patches/react-native-owl+1.5.0.patch
deleted file mode 100644
index f9bff85a4bf..00000000000
--- a/patches/react-native-owl+1.5.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/node_modules/react-native-owl/dist/utils/adb.js b/node_modules/react-native-owl/dist/utils/adb.js
---- a/node_modules/react-native-owl/dist/utils/adb.js
-+++ b/node_modules/react-native-owl/dist/utils/adb.js
-@@ -94,7 +94,7 @@
-             switch (_b.label) {
-                 case 0:
-                     stdio = debug ? 'inherit' : 'ignore';
--                    command = "adb shell monkey -p \"" + packageName + "\" -c android.intent.category.LAUNCHER 1";
-+                    command = "adb shell monkey -p \"" + packageName + "\" --pct-syskeys 0 -c android.intent.category.LAUNCHER 1";
-                     return [4 /*yield*/, execa_1.default.command(command, { stdio: stdio })];
-                 case 1:
-                     _b.sent();
-diff --git a/node_modules/react-native-owl/dist/matchers.js b/node_modules/react-native-owl/dist/matchers.js
---- a/node_modules/react-native-owl/dist/matchers.js
-+++ b/node_modules/react-native-owl/dist/matchers.js
-@@ -26,6 +26,19 @@ var toMatchBaseline = function (latestPath, options) {
-         var baselineImage = pngjs_1.PNG.sync.read(baselineData);
-         var latestData = fs_1.default.readFileSync(latestPath);
-         var latestImage = pngjs_1.PNG.sync.read(latestData);
-+        // Mask the top status-bar strip (OWL_MASK_TOP px) on both images before
-+        // diffing. The OS top bar (live clock, battery, signal) never matches
-+        // across capture/compare runs and the matcher passes only at 0 diff, so
-+        // it must be excluded. The strip is zeroed identically on both images, so
-+        // pixelmatch sees no diff there while the rest of the app is still
-+        // verified pixel-for-pixel. Default 0 = no masking (unchanged behaviour).
-+        var maskTop = parseInt(process.env.OWL_MASK_TOP || '0', 10) || 0;
-+        maskTop = Math.max(0, Math.min(maskTop, baselineImage.height));
-+        if (maskTop > 0) {
-+            var maskBytes = baselineImage.width * maskTop * 4;
-+            baselineImage.data.fill(0, 0, maskBytes);
-+            latestImage.data.fill(0, 0, maskBytes);
-+        }
-         var diffImage = new pngjs_1.PNG({
-             width: baselineImage.width,
-             height: baselineImage.height,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 87e9affd2e0..318d3503c1d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -156,9 +156,6 @@ importers:
       expo-notifications:
         specifier: ~0.32.15
         version: 0.32.15(expo@54.0.30(@babel/core@7.25.9)(react-native-webview@13.16.1(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      expo-screen-orientation:
-        specifier: ~9.0.9
-        version: 9.0.9(expo@54.0.30(@babel/core@7.25.9)(react-native-webview@13.16.1(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))
       expo-status-bar:
         specifier: ~3.0.9
         version: 3.0.9(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
@@ -535,9 +532,6 @@ importers:
       react-native-dotenv:
         specifier: 3.4.8
         version: 3.4.8(@babel/runtime@7.25.9)
-      react-native-owl:
-        specifier: 1.5.0
-        version: 1.5.0(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
       storybook:
         specifier: ~9.0.9
         version: 9.0.18(@testing-library/dom@10.4.1)(prettier@2.8.8)
@@ -3135,9 +3129,6 @@ packages:
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
-  ajv@7.2.4:
-    resolution: {integrity: sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==}
-
   ajv@8.18.0:
     resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
 
@@ -4504,12 +4495,6 @@ packages:
       react: '*'
       react-native: '*'
 
-  expo-screen-orientation@9.0.9:
-    resolution: {integrity: sha512-UTU745XoqBvQJkZ820GTfMuOxlkppYqaeQ+x0wdu44cyrZiZugqe+egFF2+zC+SaxgAltU5EuO8GIj9xSF+YMw==}
-    peerDependencies:
-      expo: '*'
-      react-native: '*'
-
   expo-server@1.0.5:
     resolution: {integrity: sha512-IGR++flYH70rhLyeXF0Phle56/k4cee87WeQ4mamS+MkVAVP+dDlOHf2nN06Z9Y2KhU0Gp1k+y61KkghF7HdhA==}
     engines: {node: '>=20.16.0'}
@@ -4827,11 +4812,6 @@ packages:
   graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
-  handlebars@4.7.9:
-    resolution: {integrity: sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==}
-    engines: {node: '>=0.4.7'}
-    hasBin: true
-
   harmony-reflect@1.6.2:
     resolution: {integrity: sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==}
 
@@ -6174,10 +6154,6 @@ packages:
     resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
     engines: {node: '>= 6'}
 
-  pixelmatch@5.3.0:
-    resolution: {integrity: sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q==}
-    hasBin: true
-
   pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
@@ -6194,10 +6170,6 @@ packages:
     resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==}
     engines: {node: '>=4.0.0'}
 
-  pngjs@6.0.0:
-    resolution: {integrity: sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==}
-    engines: {node: '>=12.13.0'}
-
   polished@4.3.1:
     resolution: {integrity: sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==}
     engines: {node: '>=10'}
@@ -6526,13 +6498,6 @@ packages:
       react-native: '*'
       react-native-gesture-handler: '*'
 
-  react-native-owl@1.5.0:
-    resolution: {integrity: sha512-hk5/TeLp3+DMgzgYsQ4tWFXQfpMCFLcf/9q935oz7KcC9/uMj9y/ktXaCgCXIZ2Mt7mW3b6RXHAq/jfokyx+FA==}
-    hasBin: true
-    peerDependencies:
-      react: ^17 || ^18
-      react-native: ^0
-
   react-native-picker-select@9.0.1:
     resolution: {integrity: sha512-iIhb82OSH1vqB/HoipvbuX3RCzmeaQmIASlaRbv6X8imNjzh1DH/LaKoF4+DAZJLT0iX7QG79vpwZu8wjWap3Q==}
     peerDependencies:
@@ -7481,11 +7446,6 @@ packages:
     resolution: {integrity: sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==}
     deprecated: You are using an outdated version of ua-parser-js. Please update to ua-parser-js v0.7.33 / v1.0.33 / v2.0.0 (or later) to avoid ReDoS vulnerability [CVE-2022-25927](https://github.com/advisories/GHSA-fhg7-m89q-25r3)
 
-  uglify-js@3.19.3:
-    resolution: {integrity: sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==}
-    engines: {node: '>=0.8.0'}
-    hasBin: true
-
   unbox-primitive@1.1.0:
     resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
     engines: {node: '>= 0.4'}
@@ -7710,9 +7670,6 @@ packages:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
 
-  wordwrap@1.0.0:
-    resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
-
   wordwrapjs@4.0.1:
     resolution: {integrity: sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==}
     engines: {node: '>=8.0.0'}
@@ -11258,13 +11215,6 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  ajv@7.2.4:
-    dependencies:
-      fast-deep-equal: 3.1.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-      uri-js: 4.4.1
-
   ajv@8.18.0:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -12813,11 +12763,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  expo-screen-orientation@9.0.9(expo@54.0.30(@babel/core@7.25.9)(react-native-webview@13.16.1(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0)):
-    dependencies:
-      expo: 54.0.30(@babel/core@7.25.9)(react-native-webview@13.16.1(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0))(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
-      react-native: 0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0)
-
   expo-server@1.0.5: {}
 
   expo-status-bar@3.0.9(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
@@ -13195,15 +13140,6 @@ snapshots:
 
   graphemer@1.4.0: {}
 
-  handlebars@4.7.9:
-    dependencies:
-      minimist: 1.2.8
-      neo-async: 2.6.2
-      source-map: 0.6.1
-      wordwrap: 1.0.0
-    optionalDependencies:
-      uglify-js: 3.19.3
-
   harmony-reflect@1.6.2: {}
 
   has-bigints@1.1.0: {}
@@ -14861,10 +14797,6 @@ snapshots:
 
   pirates@4.0.7: {}
 
-  pixelmatch@5.3.0:
-    dependencies:
-      pngjs: 6.0.0
-
   pkg-dir@4.2.0:
     dependencies:
       find-up: 4.1.0
@@ -14881,8 +14813,6 @@ snapshots:
 
   pngjs@3.4.0: {}
 
-  pngjs@6.0.0: {}
-
   polished@4.3.1:
     dependencies:
       '@babel/runtime': 7.25.9
@@ -15232,21 +15162,6 @@ snapshots:
       react-native: 0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0)
       react-native-gesture-handler: 2.28.0(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
 
-  react-native-owl@1.5.0(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0):
-    dependencies:
-      ajv: 7.2.4
-      execa: 5.1.1
-      handlebars: 4.7.9
-      pixelmatch: 5.3.0
-      pngjs: 6.0.0
-      react: 19.1.0
-      react-native: 0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0)
-      ws: 8.18.3
-      yargs: 17.7.2
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-
   react-native-picker-select@9.0.1(@react-native-picker/picker@2.11.4(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)):
     dependencies:
       '@react-native-picker/picker': 2.11.4(react-native@0.81.5(@babel/core@7.25.9)(@react-native-community/cli@20.0.0(typescript@5.9.3))(@react-native/metro-config@0.81.5(@babel/core@7.25.9))(@types/react@19.1.17)(react@19.1.0))(react@19.1.0)
@@ -16327,9 +16242,6 @@ snapshots:
 
   ua-parser-js@1.0.2: {}
 
-  uglify-js@3.19.3:
-    optional: true
-
   unbox-primitive@1.1.0:
     dependencies:
       call-bound: 1.0.4
@@ -16598,8 +16510,6 @@ snapshots:
 
   word-wrap@1.2.5: {}
 
-  wordwrap@1.0.0: {}
-
   wordwrapjs@4.0.1:
     dependencies:
       reduce-flatten: 2.0.0
diff --git a/scripts/owl-compare.sh b/scripts/owl-compare.sh
deleted file mode 100755
index 09b8dd4aaac..00000000000
--- a/scripts/owl-compare.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-set -e
-
-# Owl visual-regression "run & compare" helper.
-#
-# What it does, in one shot:
-#   1. Pulls the canonical action-sheet "prints" from the baseline reference repo
-#      (OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest), where they live
-#      under `app/containers/ActionSheet/<variant>-action-sheet-<case>.png`.
-#   2. Routes the prints for the requested variant into the folder react-native-owl
-#      actually reads from — `.owl/baseline/<platform>/` — since owl hardcodes that
-#      path and will NOT look inside `app/containers/ActionSheet/` or any subfolder.
-#   3. Runs `owl test` (compare mode) against the already-built app.
-#   4. Opens the generated HTML report so you can SEE the diff.
-#
-# Usage:
-#   scripts/owl-compare.sh ios          # default variant iphone16pro-portrait
-#   scripts/owl-compare.sh android      # default variant android-portrait
-#   OWL_VARIANT=iphonese-portrait scripts/owl-compare.sh ios
-#
-# The app must already be built for the platform (pnpm owl:build:ios / :android).
-
-PLATFORM="${1:-}"
-case "$PLATFORM" in
-	ios | android) ;;
-	*)
-		echo "usage: scripts/owl-compare.sh ios|android" >&2
-		exit 2
-		;;
-esac
-
-# Variant decides both which prints to compare against and the screenshot filenames
-# the test produces (it is babel-inlined into the test as process.env.OWL_VARIANT).
-if [ -z "${OWL_VARIANT:-}" ]; then
-	if [ "$PLATFORM" = "ios" ]; then
-		OWL_VARIANT="iphone16pro-portrait"
-	else
-		OWL_VARIANT="android-portrait"
-	fi
-fi
-export OWL_VARIANT
-
-REF_REPO="${OWL_BASELINE_REPO:-https://github.com/OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest}"
-REF_DIR=".owl/reference"
-PRINTS_SUBDIR="app/containers/ActionSheet"
-BASELINE_DIR=".owl/baseline/$PLATFORM"
-
-echo "[owl-compare] platform=$PLATFORM variant=$OWL_VARIANT"
-
-# --- 1. Fetch / refresh the reference prints --------------------------------------
-PRINTS_SRC=""
-if git -C "$REF_DIR" rev-parse --git-dir >/dev/null 2>&1; then
-	echo "[owl-compare] refreshing reference repo at $REF_DIR"
-	git -C "$REF_DIR" pull --ff-only --quiet || echo "[owl-compare] pull failed, using cached prints"
-	PRINTS_SRC="$REF_DIR/$PRINTS_SUBDIR"
-elif git clone --depth=1 --quiet "$REF_REPO" "$REF_DIR" 2>/dev/null; then
-	echo "[owl-compare] cloned reference repo into $REF_DIR"
-	PRINTS_SRC="$REF_DIR/$PRINTS_SUBDIR"
-elif [ -d ".owl/baseline/ActionSheet" ]; then
-	echo "[owl-compare] reference repo unreachable, falling back to local .owl/baseline/ActionSheet"
-	PRINTS_SRC=".owl/baseline/ActionSheet"
-else
-	echo "[owl-compare] could not obtain reference prints (clone failed, no local fallback)" >&2
-	exit 1
-fi
-
-# --- 2. Route this variant's prints into owl's baseline dir -----------------------
-# owl reads `.owl/baseline/<platform>/<name>.png`; the prints already carry the
-# variant prefix, so we copy only the files for the variant we're about to run.
-rm -rf "$BASELINE_DIR"
-mkdir -p "$BASELINE_DIR"
-count=0
-for f in "$PRINTS_SRC/$OWL_VARIANT"-*.png; do
-	[ -e "$f" ] || continue
-	cp "$f" "$BASELINE_DIR/"
-	count=$((count + 1))
-done
-
-if [ "$count" -eq 0 ]; then
-	echo "[owl-compare] no prints found for variant '$OWL_VARIANT' in $PRINTS_SRC" >&2
-	echo "[owl-compare] available variants:" >&2
-	ls "$PRINTS_SRC" 2>/dev/null | sed -E 's/-action-sheet-.*//' | sort -u | sed 's/^/  - /' >&2
-	exit 1
-fi
-echo "[owl-compare] staged $count baseline print(s) into $BASELINE_DIR"
-
-# --- 3. Run owl in compare mode ---------------------------------------------------
-# OWL_VARIANT is babel-inlined AND jest-cached, so the transformed test freezes to
-# the first run's value; clear the cache so this variant actually takes effect.
-rm -rf .jest-cache
-
-set +e
-USE_OWL=true RUNNING_E2E_TESTS=true pnpm exec owl test --platform "$PLATFORM"
-status=$?
-set -e
-
-# --- 4. Show the report -----------------------------------------------------------
-REPORT=".owl/report/index.html"
-if [ -f "$REPORT" ]; then
-	echo "[owl-compare] report: $REPORT"
-	if command -v open >/dev/null 2>&1; then
-		open "$REPORT"
-	fi
-else
-	echo "[owl-compare] no report generated at $REPORT" >&2
-fi
-
-if [ "$status" -eq 0 ]; then
-	echo "[owl-compare] ✅ no visual differences"
-else
-	echo "[owl-compare] ❌ differences found (or test error) — see report above"
-fi
-exit "$status"
diff --git a/tests/owl/README.md b/tests/owl/README.md
deleted file mode 100644
index 3418085dcde..00000000000
--- a/tests/owl/README.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# Owl visual regression — action sheets
-
-Visual regression for the action-sheet bottom safe-area work, using
-[react-native-owl](https://github.com/FormidableLabs/react-native-owl).
-
-## Source of truth: the reference repo
-
-Baseline "prints" are **not committed here**. They live in a separate repo —
-[`OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest`](https://github.com/OtavioStasiak/Rocket.Chat.ReactNative.VisualRegressionTest)
-— under `app/containers/ActionSheet/`, one PNG per `variant + case`:
-
-```
-<variant>-action-sheet-<case>.png
-e.g. iphone16pro-portrait-action-sheet-servers-list.png
-```
-
-`variant` is `{device}-{orientation}` (`iphone16pro-portrait`, `iphonese-portrait`,
-`android-portrait`, `android-landscape`); `case` is one of `servers-list`,
-`directory-options`, `media-auto-download`, `user-notification-preferences`.
-
-The test (`actionSheets.owl.tsx`) emits screenshot names in exactly that shape, so the
-captured image lines up 1:1 with the reference print.
-
-## Run & compare
-
-```bash
-# 1. Build the Owl app once (Release — required for USE_OWL inlining)
-pnpm owl:build:ios          # or owl:build:android
-
-# 2. Boot the matching simulator/emulator (CI does this for you)
-xcrun simctl boot "iPhone 16 Pro"
-
-# 3. Run the comparison and open the diff report
-pnpm owl:compare:ios        # or owl:compare:android
-```
-
-`owl:compare:*` (→ `scripts/owl-compare.sh`):
-
-1. clones/refreshes the reference repo into `.owl/reference/` (gitignored),
-2. stages the prints for the current `OWL_VARIANT` into `.owl/baseline/<platform>/`
-   (the only path owl reads from),
-3. runs `owl test` in compare mode,
-4. opens the HTML report at `.owl/report/index.html`.
-
-Exit code is `0` when nothing changed, non-zero when a diff is found (the report still
-opens so you can see it).
-
-### Other devices / orientations
-
-Default variant is `iphone16pro-portrait` (iOS) / `android-portrait` (Android). To
-compare another, set `OWL_VARIANT` and point owl at the matching device:
-
-```bash
-# Boot the iPhone SE and set ios.device in owl.config.json to "iPhone SE (3rd generation)"
-OWL_VARIANT=iphonese-portrait pnpm owl:compare:ios
-```
-
-`OWL_VARIANT` is babel-inlined and Jest-caches the transformed test; the script
-`rm -rf .jest-cache` before each run so the variant actually takes effect.
-
-## CI (GitHub Actions)
-
-The flow mirrors e2e: build the Owl app once per platform, then fan the comparison
-out over every device leg.
-
-| Workflow | Role |
-| --- | --- |
-| `visual-regression.yml` | Orchestrator. `workflow_dispatch` (with an `update_baseline` toggle) + `pull_request` on owl paths. Gated behind a manual approval `hold` job (protected `approve_e2e_testing` environment, like e2e) so nothing builds until a reviewer approves. |
-| `visual-regression-build-ios.yml` | Reusable — builds the Owl iOS `.app` once, uploads it. |
-| `visual-regression-build-android.yml` | Reusable — builds the Owl APK once (debug-signed via the `isOwlBuild` fallback), uploads it. |
-| `visual-regression-run-ios.yml` | Reusable — downloads the app, points owl at the leg's simulator, syncs baselines, compares. |
-| `visual-regression-run-android.yml` | Reusable — downloads the APK, boots a Pixel 7 Pro emulator, syncs baselines, compares. |
-
-Legs (matrix): **iPhone 16 Pro**, **iPhone SE (3rd gen)** (low-height), **Android
-portrait**, **Android landscape**. Each run job downloads the prebuilt app, pulls the
-matching prints from the reference repo into `.owl/baseline/<platform>/`, runs `owl
-test`, and uploads `.owl/{report,diff,latest,baseline}` as an artifact per leg.
-
-Run it from the Actions tab → **Visual Regression** → *Run workflow*. Tick
-`update_baseline` to capture fresh prints instead of comparing; download the resulting
-artifact and commit the PNGs to the reference repo (below).
-
-## Baselines must be captured in CI
-
-owl compares **pixel-exact** (it passes only when zero pixels differ; the `threshold`
-option is per-pixel colour sensitivity, not a diff budget). iOS/Android simulators do
-**not** render identically across machines — font hinting, sub-pixel antialiasing, a
-1-px sheet offset, and even the status-bar clock format (`09:41` vs `9:41 AM`, a region
-setting) all differ between a local Mac and the CI runner. So a baseline captured
-locally will never match a CI render, and vice-versa.
-
-**The golden baselines therefore have to be captured by the same CI environment that
-runs the comparison.** A local `pnpm owl:compare:*` run is still useful for authoring
-and quick checks against your own machine, but the prints committed to the reference
-repo must come from CI.
-
-To keep CI renders byte-stable, the environment is pinned and the obvious sources of
-noise are neutralised:
-
-- **iOS runtime** is pinned via `OWL_IOS_RUNTIME` in `visual-regression-run-ios.yml`
-  (the simulator is created on exactly that runtime; the job fails loudly if it's
-  missing). Bumping it changes rendering — do it deliberately and re-seed baselines.
-- **Status-bar clock**: iOS forces 24-hour time; Android uses SystemUI demo mode to
-  freeze the clock/battery/network icons. Otherwise the live clock differs every run.
-
-## Updating / seeding baselines (manual)
-
-1. Actions → **Visual Regression** → *Run workflow*, tick **`update_baseline`**.
-2. When it finishes, download the **`owl-baseline-<variant>`** artifact from each leg
-   (`iphone16pro-portrait`, `iphonese-portrait`, `android-portrait`,
-   `android-landscape`). Each holds just the correctly-named PNGs.
-3. Drop all of them into the **reference repo** under `app/containers/ActionSheet/`,
-   review, and commit. They are now the source of truth — never commit baselines here.
-4. Re-run **Visual Regression** in compare mode; it should be green (CI vs CI).
diff --git a/tests/owl/actionSheets.owl.tsx b/tests/owl/actionSheets.owl.tsx
deleted file mode 100644
index aa5c7e6a95a..00000000000
--- a/tests/owl/actionSheets.owl.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-/* eslint-env jest */
-
-import { press, reload, takeScreenshot } from 'react-native-owl';
-
-jest.setTimeout(180000);
-
-// A single Owl build serves every device/orientation; the simulator/emulator and
-// orientation are driven by CI, which exposes the leg via OWL_VARIANT so each
-// baseline filename is unique (all iOS baselines share .owl/baseline/ios).
-const variant = process.env.OWL_VARIANT || 'local';
-const screenshotName = (name: string) => `${variant}-${name}`;
-const isLandscape = variant.includes('landscape');
-
-// Owl screenshots the whole device and its matcher passes only at zero pixel
-// diff, so the OS status bar (live clock, battery, signal) would make every
-// baseline fail — it changes on every run. The patched matcher zeroes the top
-// OWL_MASK_TOP px of both images before diffing, so we mask each device's
-// status-bar height (device px, measured from the captured PNG) while the app
-// below it is still verified pixel-for-pixel. Source-agnostic: works for Owl's
-// own captures and for any screenshot fed through the matcher (e.g. Maestro).
-// Tune a value if the first baseline shows the clock leaking in (raise it) or
-// the header being clipped (lower it).
-const MASK_TOP_BY_VARIANT: Record<string, number> = {
-	'iphone16pro-portrait': 150,
-	'iphonese-portrait': 40,
-	'android-portrait': 88,
-	'android-landscape': 88
-};
-process.env.OWL_MASK_TOP = String(MASK_TOP_BY_VARIANT[variant] ?? 0);
-
-const wait = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms));
-
-// Real screens settle after mount (navigation push animation, DB/REST loading);
-// the action sheet present animation also needs time. Be generous so the capture
-// is of the fully settled state.
-const SCREEN_SETTLE_DELAY = 6000;
-const SHEET_PRESENT_DELAY = 6000;
-const APP_READY_DELAY = 2000;
-const ORIENTATION_DELAY = 3000;
-
-// Each case opens the real screen, then its real action sheet. The trigger lives
-// either in the navigation header (rooms list, directory) or the screen body
-// (the list-picker rows).
-const CASES = [
-	{ name: 'servers-list', nav: 'owl-nav-rooms-list', trigger: 'rooms-list-header-servers-list-button' },
-	{ name: 'directory-options', nav: 'owl-nav-directory', trigger: 'directory-view-filter' },
-	{ name: 'media-auto-download', nav: 'owl-nav-media-auto-download', trigger: 'media-auto-download-image' },
-	{
-		name: 'user-notification-preferences',
-		nav: 'owl-nav-user-notification-prefs',
-		trigger: 'user-notification-preference-view-alert'
-	}
-];
-
-describe('Action sheet safe-area spacing', () => {
-	beforeEach(async () => {
-		// Reload returns to the launcher with the previous sheet dismissed and the
-		// app back in its default portrait orientation.
-		await reload();
-		await wait(APP_READY_DELAY);
-
-		// Orientation is requested from JS on the launcher (works in CI/local with
-		// no device rotation). Landscape variants rotate before navigating so the
-		// pushed screen + native action sheet render in true landscape.
-		await press(isLandscape ? 'owl-set-landscape' : 'owl-set-portrait');
-		await wait(ORIENTATION_DELAY);
-	});
-
-	CASES.forEach(({ name, nav, trigger }) => {
-		it(`matches the ${name} action sheet`, async () => {
-			await press(nav);
-			await wait(SCREEN_SETTLE_DELAY);
-
-			await press(trigger);
-			await wait(SHEET_PRESENT_DELAY);
-
-			const screen = await takeScreenshot(screenshotName(`action-sheet-${name}`));
-
-			expect(screen).toMatchBaseline();
-		});
-	});
-});

From 6e99aa24d25aa078645713ecd1d4c24e7c5d2929 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 15 Jun 2026 19:37:44 -0300
Subject: [PATCH 11/23] test: guard action-sheet bottom safe-area spacing

Unit tests assert that action-sheet content does not bake the bottom
safe-area inset into its own marginBottom (the sheet already applies it;
doubling it caused the blank-space bug). Covers DirectoryView Options and
the MediaAutoDownload / UserNotificationPreferences list pickers, with the
inset mocked non-zero so a regression surfaces. Verified the guard fails
when the margin is reintroduced.

Adds a Maestro e2e flow opening the workspaces and directory-filter action
sheets and asserting their bottom-most rows stay visible (device-level
guard against content being pushed off by bad spacing).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../assorted/action-sheet-safe-area.yaml      | 83 +++++++++++++++++++
 app/views/DirectoryView/Options.test.tsx      | 30 +++++++
 .../MediaAutoDownloadView/ListPicker.test.tsx | 36 ++++++++
 .../ListPicker.test.tsx                       | 38 +++++++++
 4 files changed, 187 insertions(+)
 create mode 100644 .maestro/tests/assorted/action-sheet-safe-area.yaml
 create mode 100644 app/views/DirectoryView/Options.test.tsx
 create mode 100644 app/views/MediaAutoDownloadView/ListPicker.test.tsx
 create mode 100644 app/views/UserNotificationPreferencesView/ListPicker.test.tsx

diff --git a/.maestro/tests/assorted/action-sheet-safe-area.yaml b/.maestro/tests/assorted/action-sheet-safe-area.yaml
new file mode 100644
index 00000000000..6a1953c032d
--- /dev/null
+++ b/.maestro/tests/assorted/action-sheet-safe-area.yaml
@@ -0,0 +1,83 @@
+appId: ${APP_ID}
+name: Action Sheet Safe Area
+onFlowStart:
+  - runFlow: '../../helpers/setup.yaml'
+onFlowComplete:
+  - evalScript: ${output.utils.deleteCreatedUsers()}
+tags:
+  - test-7
+
+# Regression for the action-sheet bottom safe-area spacing fix. The sheet
+# (TrueSheet / BottomSheetContent) owns the bottom safe-area inset; content must
+# not add its own bottom margin, which would either leave a blank band or push
+# the bottom-most row off-screen. Maestro can't measure a pixel gap, so the guard
+# is that each sheet opens and its bottom-most content stays fully visible.
+
+---
+- evalScript: ${output.user = output.utils.createUser()}
+
+- runFlow:
+    file: '../../helpers/login-with-deeplink.yaml'
+    env:
+      USERNAME: ${output.user.username}
+      PASSWORD: ${output.user.password}
+
+- extendedWaitUntil:
+    visible:
+      id: 'rooms-list-view'
+    timeout: 60000
+
+# Workspaces (servers list) action sheet — the bottom "Add server" row must be visible.
+- extendedWaitUntil:
+    visible:
+      id: 'rooms-list-header-servers-list-button'
+    timeout: 60000
+- tapOn:
+    id: 'rooms-list-header-servers-list-button'
+- waitForAnimationToEnd:
+    timeout: 10000
+- extendedWaitUntil:
+    visible:
+      id: 'action-sheet'
+    timeout: 60000
+- extendedWaitUntil:
+    visible:
+      id: 'rooms-list-header-servers-list'
+    timeout: 60000
+- assertVisible:
+    id: 'rooms-list-header-server-add'
+
+# Dismiss the sheet before moving on.
+- swipe:
+    direction: DOWN
+    duration: 500
+- waitForAnimationToEnd:
+    timeout: 10000
+
+# Directory filter action sheet — the bottom radio row must be visible.
+- extendedWaitUntil:
+    visible:
+      id: 'rooms-list-view-directory'
+    timeout: 60000
+- tapOn:
+    id: 'rooms-list-view-directory'
+- extendedWaitUntil:
+    visible:
+      id: 'directory-view'
+    timeout: 60000
+- extendedWaitUntil:
+    visible:
+      id: 'directory-view-filter'
+    timeout: 60000
+- tapOn:
+    id: 'directory-view-filter'
+- waitForAnimationToEnd:
+    timeout: 10000
+- extendedWaitUntil:
+    visible:
+      id: 'action-sheet'
+    timeout: 60000
+- assertVisible:
+    id: 'directory-switch-channels'
+- assertVisible:
+    id: 'directory-switch-teams'
diff --git a/app/views/DirectoryView/Options.test.tsx b/app/views/DirectoryView/Options.test.tsx
new file mode 100644
index 00000000000..cb1b3c62595
--- /dev/null
+++ b/app/views/DirectoryView/Options.test.tsx
@@ -0,0 +1,30 @@
+import { render, screen } from '@testing-library/react-native';
+import { ScrollView, StyleSheet } from 'react-native';
+
+import DirectoryOptions from './Options';
+
+// The directory filter is shown as action-sheet content. The sheet already applies the
+// bottom safe-area inset, so the List.Container must not add `marginBottom: insets.bottom`
+// (double-counting leaves a blank band — the bug this guards against). Inset mocked to a
+// non-zero value so a regression re-adding the margin would surface as marginBottom: 34.
+jest.mock('react-native-safe-area-context', () => ({
+	useSafeAreaInsets: () => ({ top: 0, bottom: 34, left: 0, right: 0 })
+}));
+
+describe('DirectoryView Options — action sheet bottom spacing', () => {
+	it('does not bake the bottom safe-area inset into the list container', () => {
+		render(
+			<DirectoryOptions
+				type='channels'
+				globalUsers={false}
+				isFederationEnabled={false}
+				changeType={jest.fn()}
+				toggleWorkspace={jest.fn()}
+			/>
+		);
+
+		const container = screen.UNSAFE_getByType(ScrollView);
+		const style = StyleSheet.flatten(container.props.contentContainerStyle);
+		expect(style.marginBottom).toBeUndefined();
+	});
+});
diff --git a/app/views/MediaAutoDownloadView/ListPicker.test.tsx b/app/views/MediaAutoDownloadView/ListPicker.test.tsx
new file mode 100644
index 00000000000..1cfab4d9826
--- /dev/null
+++ b/app/views/MediaAutoDownloadView/ListPicker.test.tsx
@@ -0,0 +1,36 @@
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import { StyleSheet } from 'react-native';
+
+import ListPicker from './ListPicker';
+
+// Non-zero bottom inset: the action sheet (TrueSheet / BottomSheetContent) already
+// applies the bottom safe-area inset to its content, so the picker content must NOT
+// add its own `marginBottom: insets.bottom` — doing so double-counts and leaves a
+// blank band at the bottom of the sheet (the bug this guards against). With the inset
+// mocked to 34, a regression that re-adds the margin would surface as marginBottom: 34.
+jest.mock('react-native-safe-area-context', () => ({
+	useSafeAreaInsets: () => ({ top: 0, bottom: 34, left: 0, right: 0 })
+}));
+
+jest.mock('../../containers/ActionSheet', () => ({ useActionSheet: jest.fn() }));
+const mockUseActionSheet = require('../../containers/ActionSheet').useActionSheet as jest.Mock;
+
+describe('MediaAutoDownloadView ListPicker — action sheet bottom spacing', () => {
+	const showActionSheet = jest.fn();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockUseActionSheet.mockReturnValue({ showActionSheet, hideActionSheet: jest.fn() });
+	});
+
+	it('does not bake the bottom safe-area inset into the sheet content', () => {
+		render(<ListPicker value='wifi' title='Images' testID='media-picker' onChangeValue={jest.fn()} />);
+
+		fireEvent.press(screen.getByTestId('media-picker'));
+
+		expect(showActionSheet).toHaveBeenCalledTimes(1);
+		const { children } = showActionSheet.mock.calls[0][0];
+		const style = StyleSheet.flatten(children.props.style);
+		expect(style.marginBottom).toBeUndefined();
+	});
+});
diff --git a/app/views/UserNotificationPreferencesView/ListPicker.test.tsx b/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
new file mode 100644
index 00000000000..1d9202515f4
--- /dev/null
+++ b/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
@@ -0,0 +1,38 @@
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import { StyleSheet } from 'react-native';
+
+import ListPicker from './ListPicker';
+
+// The sheet already applies the bottom safe-area inset to its content, so the picker
+// content must not add a `marginBottom: insets.bottom` (that double-counts and leaves
+// a blank band — the bug this guards against). This view intentionally keeps a
+// `paddingBottom` for now, so the guard is specifically on marginBottom. Inset mocked
+// to 34 so a regression re-adding the margin would surface as marginBottom: 34.
+jest.mock('react-native-safe-area-context', () => ({
+	useSafeAreaInsets: () => ({ top: 0, bottom: 34, left: 0, right: 0 })
+}));
+
+jest.mock('../../containers/ActionSheet', () => ({ useActionSheet: jest.fn() }));
+const mockUseActionSheet = require('../../containers/ActionSheet').useActionSheet as jest.Mock;
+
+describe('UserNotificationPreferencesView ListPicker — action sheet bottom spacing', () => {
+	const showActionSheet = jest.fn();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockUseActionSheet.mockReturnValue({ showActionSheet, hideActionSheet: jest.fn() });
+	});
+
+	it('does not bake the bottom safe-area inset as a margin into the sheet content', () => {
+		render(
+			<ListPicker preference='desktopNotifications' value='all' title='Alert' testID='notif-picker' onChangeValue={jest.fn()} />
+		);
+
+		fireEvent.press(screen.getByTestId('notif-picker'));
+
+		expect(showActionSheet).toHaveBeenCalledTimes(1);
+		const { children } = showActionSheet.mock.calls[0][0];
+		const style = StyleSheet.flatten(children.props.style);
+		expect(style.marginBottom).toBeUndefined();
+	});
+});

From c1399c5fa728859c65623f24f4b4677e846be7c4 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Tue, 16 Jun 2026 16:19:50 -0300
Subject: [PATCH 12/23] test: also guard paddingBottom in action-sheet spacing
 tests

A marginBottom->paddingBottom swap would still inflate the bottom spacing
but pass the margin-only assertion. Assert paddingBottom is undefined too
for the two views that drop the inset entirely (DirectoryView Options and
MediaAutoDownload ListPicker). UserNotificationPreferences intentionally
keeps paddingBottom, so it is left guarding marginBottom only.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 app/views/DirectoryView/Options.test.tsx            | 3 +++
 app/views/MediaAutoDownloadView/ListPicker.test.tsx | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/views/DirectoryView/Options.test.tsx b/app/views/DirectoryView/Options.test.tsx
index cb1b3c62595..34859599ec3 100644
--- a/app/views/DirectoryView/Options.test.tsx
+++ b/app/views/DirectoryView/Options.test.tsx
@@ -25,6 +25,9 @@ describe('DirectoryView Options — action sheet bottom spacing', () => {
 
 		const container = screen.UNSAFE_getByType(ScrollView);
 		const style = StyleSheet.flatten(container.props.contentContainerStyle);
+		// Neither margin nor padding: this view drops the inset entirely, so a
+		// margin->padding swap would still inflate the bottom spacing and must fail.
 		expect(style.marginBottom).toBeUndefined();
+		expect(style.paddingBottom).toBeUndefined();
 	});
 });
diff --git a/app/views/MediaAutoDownloadView/ListPicker.test.tsx b/app/views/MediaAutoDownloadView/ListPicker.test.tsx
index 1cfab4d9826..8483ae25c41 100644
--- a/app/views/MediaAutoDownloadView/ListPicker.test.tsx
+++ b/app/views/MediaAutoDownloadView/ListPicker.test.tsx
@@ -31,6 +31,9 @@ describe('MediaAutoDownloadView ListPicker — action sheet bottom spacing', ()
 		expect(showActionSheet).toHaveBeenCalledTimes(1);
 		const { children } = showActionSheet.mock.calls[0][0];
 		const style = StyleSheet.flatten(children.props.style);
+		// Neither margin nor padding: this view drops the inset entirely, so a
+		// margin->padding swap would still inflate the bottom spacing and must fail.
 		expect(style.marginBottom).toBeUndefined();
+		expect(style.paddingBottom).toBeUndefined();
 	});
 });

From d7adf6715b7413ff6fecec7cc407193aaadbad77 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Tue, 16 Jun 2026 16:46:05 -0300
Subject: [PATCH 13/23] fix: ServersList Add Server button clipped in landscape
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The servers FlatList used a fixed maxHeight (4.5 rows = 306px). In a short
window (landscape, split-view) the header + list + Add Server button exceed
the sheet's max height (0.75 * window height), clipping the button — e.g.
landscape with 3+ workspaces connected.

Make the list maxHeight responsive via getServersListMaxHeight: full row cap
in portrait (unchanged), shrunk in short windows so the chrome always fits and
the list scrolls instead, never below one row. Extracted as a pure helper with
unit tests covering the portrait, landscape, 3-workspace and floor cases.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../RoomsListView/components/ServersList.tsx  |  9 ++--
 .../components/serversListLayout.test.ts      | 44 +++++++++++++++++++
 .../components/serversListLayout.ts           | 27 ++++++++++++
 3 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 app/views/RoomsListView/components/serversListLayout.test.ts
 create mode 100644 app/views/RoomsListView/components/serversListLayout.ts

diff --git a/app/views/RoomsListView/components/ServersList.tsx b/app/views/RoomsListView/components/ServersList.tsx
index 4d574cae30e..d8a6a9106a8 100644
--- a/app/views/RoomsListView/components/ServersList.tsx
+++ b/app/views/RoomsListView/components/ServersList.tsx
@@ -1,5 +1,5 @@
 import { memo, useLayoutEffect, useRef, useState } from 'react';
-import { FlatList, Text, View } from 'react-native';
+import { FlatList, Text, useWindowDimensions, View } from 'react-native';
 import { batch, useDispatch } from 'react-redux';
 import { type Subscription } from 'rxjs';
 
@@ -23,9 +23,7 @@ import { events, logEvent } from '../../../lib/methods/helpers/log';
 import UserPreferences from '../../../lib/methods/userPreferences';
 import { useTheme } from '../../../theme';
 import styles from '../styles';
-
-const ROW_HEIGHT = 68;
-const MAX_ROWS = 4.5;
+import { getServersListMaxHeight } from './serversListLayout';
 
 const ServersList = () => {
 	'use memo';
@@ -36,6 +34,7 @@ const ServersList = () => {
 	const server = useAppSelector(state => state.server.server);
 	const isMasterDetail = useAppSelector(state => state.app.isMasterDetail);
 	const { colors } = useTheme();
+	const { height: windowHeight } = useWindowDimensions();
 
 	useLayoutEffect(() => {
 		const init = () => {
@@ -129,7 +128,7 @@ const ServersList = () => {
 				<Text style={[styles.serverHeaderText, { color: colors.fontSecondaryInfo }]}>{I18n.t('Workspaces')}</Text>
 			</View>
 			<FlatList
-				style={{ maxHeight: MAX_ROWS * ROW_HEIGHT }}
+				style={{ maxHeight: getServersListMaxHeight(windowHeight) }}
 				data={servers}
 				keyExtractor={item => item.id}
 				renderItem={renderItem}
diff --git a/app/views/RoomsListView/components/serversListLayout.test.ts b/app/views/RoomsListView/components/serversListLayout.test.ts
new file mode 100644
index 00000000000..ed9b698f398
--- /dev/null
+++ b/app/views/RoomsListView/components/serversListLayout.test.ts
@@ -0,0 +1,44 @@
+import { getServersListMaxHeight, SERVERS_LIST_MAX_ROWS, SERVERS_LIST_ROW_HEIGHT } from './serversListLayout';
+
+const FULL_HEIGHT = SERVERS_LIST_MAX_ROWS * SERVERS_LIST_ROW_HEIGHT;
+
+// Reserve for the Workspaces header + separator + Add Server button + sheet handle.
+// Must match SERVERS_LIST_CHROME_HEIGHT in serversListLayout.ts.
+const CHROME = 150;
+const SHEET_MAX_FRACTION = 0.75;
+
+describe('getServersListMaxHeight', () => {
+	it('keeps the full MAX_ROWS height in portrait (plenty of room)', () => {
+		// iPhone-ish portrait height
+		expect(getServersListMaxHeight(844)).toBe(FULL_HEIGHT);
+		// Tall window is still capped at the row max, not the window
+		expect(getServersListMaxHeight(2000)).toBe(FULL_HEIGHT);
+	});
+
+	it('shrinks the list in a short (landscape) window so the Add Server button still fits', () => {
+		const landscapeHeight = 390; // phone landscape
+		const maxHeight = getServersListMaxHeight(landscapeHeight);
+
+		// Constrained below the full height...
+		expect(maxHeight).toBeLessThan(FULL_HEIGHT);
+		// ...so that list + chrome fits within the sheet's max height (button not clipped).
+		expect(maxHeight + CHROME).toBeLessThanOrEqual(landscapeHeight * SHEET_MAX_FRACTION);
+	});
+
+	it('regression: 3 workspaces in landscape leave the Add Server button visible', () => {
+		const landscapeHeight = 390;
+		const threeRows = 3 * SERVERS_LIST_ROW_HEIGHT; // 204, what the old fixed 306 cap would have shown
+		const maxHeight = getServersListMaxHeight(landscapeHeight);
+
+		// The list is capped shorter than 3 full rows, so it scrolls instead of pushing
+		// the button off-screen — the bug being fixed.
+		expect(maxHeight).toBeLessThan(threeRows);
+		expect(maxHeight + CHROME).toBeLessThanOrEqual(landscapeHeight * SHEET_MAX_FRACTION);
+	});
+
+	it('never collapses below a single row', () => {
+		// Even an extremely short window keeps at least one row visible.
+		expect(getServersListMaxHeight(100)).toBe(SERVERS_LIST_ROW_HEIGHT);
+		expect(getServersListMaxHeight(0)).toBe(SERVERS_LIST_ROW_HEIGHT);
+	});
+});
diff --git a/app/views/RoomsListView/components/serversListLayout.ts b/app/views/RoomsListView/components/serversListLayout.ts
new file mode 100644
index 00000000000..303d47aca47
--- /dev/null
+++ b/app/views/RoomsListView/components/serversListLayout.ts
@@ -0,0 +1,27 @@
+// Layout math for the Workspaces (servers list) action sheet, kept dependency-free
+// so it can be unit-tested without the redux/database tree the component needs.
+
+export const SERVERS_LIST_ROW_HEIGHT = 68;
+export const SERVERS_LIST_MAX_ROWS = 4.5;
+
+// Vertical space the sheet needs for everything that is NOT the scrollable server
+// list: the "Workspaces" header, the separator, the Add Server button block, and
+// the sheet handle. Reserved so the button is never pushed off-screen.
+const SERVERS_LIST_CHROME_HEIGHT = 150;
+
+// Mirrors ACTION_SHEET_MAX_HEIGHT_FRACTION in useActionSheetDetents: a children
+// action sheet can grow to at most this fraction of the window height.
+const ACTION_SHEET_MAX_HEIGHT_FRACTION = 0.75;
+
+/**
+ * Max height for the servers FlatList. In portrait there is plenty of room, so it
+ * stays at the full MAX_ROWS cap (unchanged behaviour). In a short window
+ * (landscape, split-view) it shrinks so the header + Add Server button still fit
+ * inside the sheet's max height and the list scrolls instead of clipping the
+ * button — e.g. landscape with 3+ workspaces connected. Never smaller than one row.
+ */
+export const getServersListMaxHeight = (windowHeight: number): number => {
+	const fullHeight = SERVERS_LIST_MAX_ROWS * SERVERS_LIST_ROW_HEIGHT;
+	const availableForList = windowHeight * ACTION_SHEET_MAX_HEIGHT_FRACTION - SERVERS_LIST_CHROME_HEIGHT;
+	return Math.max(SERVERS_LIST_ROW_HEIGHT, Math.min(fullHeight, availableForList));
+};

From cbd23fa6e2f7b54154f7688dc197ca2960988413 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Tue, 16 Jun 2026 16:46:59 -0300
Subject: [PATCH 14/23] test: lock UserNotificationPreferences sheet
 paddingBottom contract

This view intentionally keeps the bottom safe-area inset as paddingBottom,
so assert it equals the inset to pin the intended behaviour.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 app/views/UserNotificationPreferencesView/ListPicker.test.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/UserNotificationPreferencesView/ListPicker.test.tsx b/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
index 1d9202515f4..9543a1d5cca 100644
--- a/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
+++ b/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
@@ -34,5 +34,7 @@ describe('UserNotificationPreferencesView ListPicker — action sheet bottom spa
 		const { children } = showActionSheet.mock.calls[0][0];
 		const style = StyleSheet.flatten(children.props.style);
 		expect(style.marginBottom).toBeUndefined();
+		// This view intentionally keeps the bottom safe-area inset as padding, so lock that contract.
+		expect(style.paddingBottom).toBe(34);
 	});
 });

From e6c40e227ca0d23e3d245f9beb4d257b08ce587f Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Tue, 16 Jun 2026 20:11:43 -0300
Subject: [PATCH 15/23] fix: listPicker

---
 app/views/UserNotificationPreferencesView/ListPicker.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/UserNotificationPreferencesView/ListPicker.tsx b/app/views/UserNotificationPreferencesView/ListPicker.tsx
index d6dbe779380..ec766ce7a99 100644
--- a/app/views/UserNotificationPreferencesView/ListPicker.tsx
+++ b/app/views/UserNotificationPreferencesView/ListPicker.tsx
@@ -1,5 +1,4 @@
 import { StyleSheet, Text, View } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Fragment, type ReactElement } from 'react';
 
 import * as List from '../../containers/List';
@@ -37,10 +36,9 @@ const ListPicker = ({
 	const { showActionSheet, hideActionSheet } = useActionSheet();
 	const { colors } = useTheme();
 	const option = value ? OPTIONS[preference].find(option => option.value === value) : OPTIONS[preference][0];
-	const insets = useSafeAreaInsets();
 
 	const getOptions = (): ReactElement => (
-		<View style={{ backgroundColor: colors.surfaceRoom, paddingBottom: insets.bottom }}>
+		<View style={{ backgroundColor: colors.surfaceRoom }}>
 			<List.Separator />
 			{OPTIONS[preference].map(i => (
 				<Fragment key={i.value}>

From b63cdf28ba153d31b5d3567a9c992ee9afa1c41c Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Tue, 16 Jun 2026 20:20:47 -0300
Subject: [PATCH 16/23] fix: tests

---
 app/views/UserNotificationPreferencesView/ListPicker.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/UserNotificationPreferencesView/ListPicker.test.tsx b/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
index 9543a1d5cca..d48c1083ebc 100644
--- a/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
+++ b/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
@@ -35,6 +35,6 @@ describe('UserNotificationPreferencesView ListPicker — action sheet bottom spa
 		const style = StyleSheet.flatten(children.props.style);
 		expect(style.marginBottom).toBeUndefined();
 		// This view intentionally keeps the bottom safe-area inset as padding, so lock that contract.
-		expect(style.paddingBottom).toBe(34);
+		expect(style.paddingBottom).toBe(undefined);
 	});
 });

From bebcbc737002f222f2b4f95769a0687c30c4faa9 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Thu, 18 Jun 2026 19:23:17 -0300
Subject: [PATCH 17/23] fix: android specific padding issues

---
 app/containers/ActionSheet/ActionSheet.tsx    | 11 ++++---
 .../ActionSheet/BottomSheetContent.test.tsx   | 32 +++++++++++++++++++
 .../ActionSheet/BottomSheetContent.tsx        |  6 ++--
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 app/containers/ActionSheet/BottomSheetContent.test.tsx

diff --git a/app/containers/ActionSheet/ActionSheet.tsx b/app/containers/ActionSheet/ActionSheet.tsx
index 37138905170..06a1a668c05 100644
--- a/app/containers/ActionSheet/ActionSheet.tsx
+++ b/app/containers/ActionSheet/ActionSheet.tsx
@@ -12,6 +12,7 @@ import {
 } from 'react-native';
 import { TrueSheet } from '@lodev09/react-native-true-sheet';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { useTheme } from '../../theme';
 import { isAndroid, isIOS } from '../../lib/methods/helpers';
@@ -34,11 +35,10 @@ const ActionSheet = memo(
 		const [contentHeight, setContentHeight] = useState(0);
 		const onCloseSnapshotRef = useRef<TActionSheetOptions['onClose']>(undefined);
 
-		// TrueSheet detects the bottom inset for Android 16 and iOS
-		// To avoid content hiding behind navigation bar on older Android versions
-		const isNewAndroid = isAndroid && Number(Platform.Version) >= 36;
-		const bottom = isIOS || isNewAndroid ? 0 : windowHeight * 0.03;
+		const insets = useSafeAreaInsets();
 		const itemHeight = 48 * fontScale;
+		const isNewAndroid = isAndroid && Number(Platform.Version) >= 36;
+		const bottomInset = isIOS || isNewAndroid ? 0 : insets.bottom + itemHeight;
 
 		const handleContentLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => {
 			setContentHeight(layout.height);
@@ -107,7 +107,7 @@ const ActionSheet = memo(
 
 		const { detents, maxHeight, scrollEnabled } = useActionSheetDetents({
 			windowHeight,
-			bottomInset: bottom,
+			bottomInset,
 			itemHeight,
 			optionsLength: data?.options?.length || 0,
 			snaps: effectiveSnaps,
@@ -156,6 +156,7 @@ const ActionSheet = memo(
 							fullContainer={data.fullContainer}
 							hugContent={data.hugContent}
 							contentMinHeight={isIOS ? contentMinHeight : undefined}
+							contentPaddingBottom={bottomInset}
 							scrollEnabled={scrollEnabled}>
 							{data?.children}
 						</BottomSheetContent>
diff --git a/app/containers/ActionSheet/BottomSheetContent.test.tsx b/app/containers/ActionSheet/BottomSheetContent.test.tsx
new file mode 100644
index 00000000000..831e3fbcc48
--- /dev/null
+++ b/app/containers/ActionSheet/BottomSheetContent.test.tsx
@@ -0,0 +1,32 @@
+import { render, screen } from '@testing-library/react-native';
+import { StyleSheet } from 'react-native';
+
+import BottomSheetContent from './BottomSheetContent';
+import { type TActionSheetOptionsItem } from './Provider';
+
+// The sheet is sized (its detent) with a reserved bottom inset and the scrollable
+// content must be padded with the SAME value, otherwise the last option overflows
+// the too-short sheet and gets clipped behind the navigation bar — the Samsung bug
+// this guards against. Lock that the FlatList padding equals contentPaddingBottom.
+const options: TActionSheetOptionsItem[] = [
+	{ title: 'Forward', onPress: jest.fn() },
+	{ title: 'Copy', onPress: jest.fn() }
+];
+
+describe('BottomSheetContent — options bottom spacing', () => {
+	it('pads the option list with exactly the reserved bottom inset', () => {
+		render(
+			<BottomSheetContent options={options} hide={jest.fn()} onLayout={jest.fn()} contentPaddingBottom={96} scrollEnabled />
+		);
+
+		const style = StyleSheet.flatten(screen.getByTestId('action-sheet').props.contentContainerStyle);
+		expect(style.paddingBottom).toBe(96);
+	});
+
+	it('defaults to no extra padding when no inset is reserved', () => {
+		render(<BottomSheetContent options={options} hide={jest.fn()} onLayout={jest.fn()} scrollEnabled />);
+
+		const style = StyleSheet.flatten(screen.getByTestId('action-sheet').props.contentContainerStyle);
+		expect(style.paddingBottom).toBe(0);
+	});
+});
diff --git a/app/containers/ActionSheet/BottomSheetContent.tsx b/app/containers/ActionSheet/BottomSheetContent.tsx
index 3d9164bca87..eee330a2b99 100644
--- a/app/containers/ActionSheet/BottomSheetContent.tsx
+++ b/app/containers/ActionSheet/BottomSheetContent.tsx
@@ -1,6 +1,5 @@
 import { FlatList, Text, useWindowDimensions, View, type ViewProps } from 'react-native';
 import { memo, type ReactElement } from 'react';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import I18n from '../../i18n';
 import { useTheme } from '../../theme';
@@ -20,6 +19,7 @@ interface IBottomSheetContentProps {
 	fullContainer?: boolean;
 	hugContent?: boolean;
 	contentMinHeight?: number;
+	contentPaddingBottom?: number;
 	scrollEnabled?: boolean;
 }
 
@@ -33,15 +33,15 @@ const BottomSheetContent = memo(
 		fullContainer,
 		hugContent,
 		contentMinHeight,
+		contentPaddingBottom,
 		scrollEnabled
 	}: IBottomSheetContentProps) => {
 		'use memo';
 
 		const { colors } = useTheme();
-		const { bottom } = useSafeAreaInsets();
 		const { fontScale } = useWindowDimensions();
 		const height = 48 * fontScale;
-		const paddingBottom = isAndroid ? bottom + height : bottom;
+		const paddingBottom = contentPaddingBottom || 0;
 		const minHeightStyle = isAndroid || !contentMinHeight ? undefined : { minHeight: contentMinHeight };
 
 		const renderFooter = () =>

From 1c4c53139ef87eb766d6f521b1f7c0637bb1552b Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Fri, 19 Jun 2026 14:38:07 -0300
Subject: [PATCH 18/23] fix: action sheet last row clipped behind Android nav
 bar

---
 app/containers/ActionSheet/ActionSheet.tsx    |  5 +-
 .../getActionSheetBottomInset.test.ts         | 63 +++++++++++++++++++
 .../ActionSheet/getActionSheetBottomInset.ts  | 16 +++++
 3 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 app/containers/ActionSheet/getActionSheetBottomInset.test.ts
 create mode 100644 app/containers/ActionSheet/getActionSheetBottomInset.ts

diff --git a/app/containers/ActionSheet/ActionSheet.tsx b/app/containers/ActionSheet/ActionSheet.tsx
index 06a1a668c05..9f922585695 100644
--- a/app/containers/ActionSheet/ActionSheet.tsx
+++ b/app/containers/ActionSheet/ActionSheet.tsx
@@ -6,7 +6,6 @@ import {
 	findNodeHandle,
 	Keyboard,
 	type LayoutChangeEvent,
-	Platform,
 	useWindowDimensions,
 	type View
 } from 'react-native';
@@ -20,6 +19,7 @@ import { Handle } from './Handle';
 import { type TActionSheetOptions } from './Provider';
 import BottomSheetContent from './BottomSheetContent';
 import { HANDLE_HEIGHT, useActionSheetDetents } from './useActionSheetDetents';
+import { getActionSheetBottomInset } from './getActionSheetBottomInset';
 import styles from './styles';
 
 export const ACTION_SHEET_ANIMATION_DURATION = 250;
@@ -37,8 +37,7 @@ const ActionSheet = memo(
 
 		const insets = useSafeAreaInsets();
 		const itemHeight = 48 * fontScale;
-		const isNewAndroid = isAndroid && Number(Platform.Version) >= 36;
-		const bottomInset = isIOS || isNewAndroid ? 0 : insets.bottom + itemHeight;
+		const bottomInset = getActionSheetBottomInset(insets);
 
 		const handleContentLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => {
 			setContentHeight(layout.height);
diff --git a/app/containers/ActionSheet/getActionSheetBottomInset.test.ts b/app/containers/ActionSheet/getActionSheetBottomInset.test.ts
new file mode 100644
index 00000000000..0c065008e28
--- /dev/null
+++ b/app/containers/ActionSheet/getActionSheetBottomInset.test.ts
@@ -0,0 +1,63 @@
+import { Platform } from 'react-native';
+import { type EdgeInsets } from 'react-native-safe-area-context';
+
+import { getActionSheetBottomInset } from './getActionSheetBottomInset';
+
+// isAndroid/isIOS are derived from Platform.OS at import time, so drive them via a mutable mock.
+jest.mock('../../lib/methods/helpers', () => ({ isAndroid: true, isIOS: false }));
+
+// initialWindowMetrics holds the window insets captured natively at launch.
+jest.mock('react-native-safe-area-context', () => ({ initialWindowMetrics: { insets: { bottom: 48 } } }));
+
+const helpers = jest.requireMock('../../lib/methods/helpers') as { isAndroid: boolean; isIOS: boolean };
+const safeArea = jest.requireMock('react-native-safe-area-context') as {
+	initialWindowMetrics: { insets: { bottom: number } } | null;
+};
+
+const insets = (bottom: number): EdgeInsets => ({ top: 0, bottom, left: 0, right: 0 });
+
+// Platform.Version is not writable in the RN jest preset, so drive it through a getter.
+let mockVersion: number = 34;
+Object.defineProperty(Platform, 'Version', { configurable: true, get: () => mockVersion });
+
+describe('getActionSheetBottomInset', () => {
+	afterEach(() => {
+		mockVersion = 34;
+		helpers.isAndroid = true;
+		helpers.isIOS = false;
+		safeArea.initialWindowMetrics = { insets: { bottom: 48 } };
+	});
+
+	it('reserves the captured nav bar height on older Android when live insets are 0 (the Samsung S24 Ultra bug)', () => {
+		safeArea.initialWindowMetrics = { insets: { bottom: 48 } };
+
+		// live insets are 0 because the app is not edge-to-edge; fall back to the captured nav bar (48)
+		expect(getActionSheetBottomInset(insets(0))).toBe(48);
+	});
+
+	it('prefers the larger of live and captured insets', () => {
+		safeArea.initialWindowMetrics = { insets: { bottom: 24 } };
+
+		// max(live 48, captured 24)
+		expect(getActionSheetBottomInset(insets(48))).toBe(48);
+	});
+
+	it('returns 0 when no captured metrics are available and live insets are 0', () => {
+		safeArea.initialWindowMetrics = null;
+
+		expect(getActionSheetBottomInset(insets(0))).toBe(0);
+	});
+
+	it('returns 0 on edge-to-edge Android (SDK >= 36) where the native sheet reserves the inset', () => {
+		mockVersion = 36;
+
+		expect(getActionSheetBottomInset(insets(0))).toBe(0);
+	});
+
+	it('returns 0 on iOS', () => {
+		helpers.isAndroid = false;
+		helpers.isIOS = true;
+
+		expect(getActionSheetBottomInset(insets(34))).toBe(0);
+	});
+});
diff --git a/app/containers/ActionSheet/getActionSheetBottomInset.ts b/app/containers/ActionSheet/getActionSheetBottomInset.ts
new file mode 100644
index 00000000000..9fd90f8b6ca
--- /dev/null
+++ b/app/containers/ActionSheet/getActionSheetBottomInset.ts
@@ -0,0 +1,16 @@
+import { Platform } from 'react-native';
+import { initialWindowMetrics, type EdgeInsets } from 'react-native-safe-area-context';
+
+import { isAndroid, isIOS } from '../../lib/methods/helpers';
+
+export function getActionSheetBottomInset(liveInsets: EdgeInsets): number {
+	const isNewAndroid = isAndroid && Number(Platform.Version) >= 36;
+	if (isIOS || isNewAndroid) {
+		return 0;
+	}
+
+	const capturedNavBarInset = initialWindowMetrics?.insets.bottom ?? 0;
+	const navBarInset = Math.max(liveInsets.bottom, capturedNavBarInset);
+
+	return navBarInset;
+}

From df87d03e2f8c42d04e081de1f1cb07fbec9c3579 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Fri, 19 Jun 2026 15:04:09 -0300
Subject: [PATCH 19/23] feat: improve e2e tests

---
 .../assorted/action-sheet-safe-area.yaml      | 44 +++++++++++++
 .../ActionSheet/BottomSheetContent.test.tsx   | 32 ----------
 .../getActionSheetBottomInset.test.ts         | 63 -------------------
 app/views/DirectoryView/Options.test.tsx      | 33 ----------
 .../MediaAutoDownloadView/ListPicker.test.tsx | 39 ------------
 .../components/serversListLayout.test.ts      | 44 -------------
 .../ListPicker.test.tsx                       | 40 ------------
 7 files changed, 44 insertions(+), 251 deletions(-)
 delete mode 100644 app/containers/ActionSheet/BottomSheetContent.test.tsx
 delete mode 100644 app/containers/ActionSheet/getActionSheetBottomInset.test.ts
 delete mode 100644 app/views/DirectoryView/Options.test.tsx
 delete mode 100644 app/views/MediaAutoDownloadView/ListPicker.test.tsx
 delete mode 100644 app/views/RoomsListView/components/serversListLayout.test.ts
 delete mode 100644 app/views/UserNotificationPreferencesView/ListPicker.test.tsx

diff --git a/.maestro/tests/assorted/action-sheet-safe-area.yaml b/.maestro/tests/assorted/action-sheet-safe-area.yaml
index 6a1953c032d..d6712325bd5 100644
--- a/.maestro/tests/assorted/action-sheet-safe-area.yaml
+++ b/.maestro/tests/assorted/action-sheet-safe-area.yaml
@@ -15,6 +15,9 @@ tags:
 
 ---
 - evalScript: ${output.user = output.utils.createUser()}
+- evalScript: ${output.actionSheetMessage = 'message-action-sheet'}
+- evalScript: ${output.room = output.utils.createRandomRoom(output.user.username, output.user.password)}
+- evalScript: ${output.utils.sendMessage(output.user.username, output.user.password, output.room.name, output.actionSheetMessage)}
 
 - runFlow:
     file: '../../helpers/login-with-deeplink.yaml'
@@ -27,6 +30,47 @@ tags:
       id: 'rooms-list-view'
     timeout: 60000
 
+# Message actions action sheet — bottom-most row (Delete) must stay reachable and visible.
+- runFlow:
+    file: '../../helpers/navigate-to-room.yaml'
+    env:
+      ROOM: ${output.room.name}
+- extendedWaitUntil:
+    visible:
+      id: 'message-content-${output.actionSheetMessage}'
+    timeout: 60000
+- longPressOn:
+    id: 'message-content-${output.actionSheetMessage}'
+- extendedWaitUntil:
+    visible:
+      id: 'action-sheet'
+    timeout: 60000
+- swipe:
+    from:
+      id: 'action-sheet-handle'
+    direction: UP
+- waitForAnimationToEnd:
+    timeout: 10000
+- scrollUntilVisible:
+    element:
+      id: 'message-actions-delete'
+    direction: DOWN
+    timeout: 20000
+- assertVisible:
+    id: 'message-actions-delete'
+
+# Dismiss the sheet and return to the rooms list for the remaining cases.
+- swipe:
+    direction: DOWN
+    duration: 500
+- waitForAnimationToEnd:
+    timeout: 10000
+- runFlow: '../../helpers/go-back.yaml'
+- extendedWaitUntil:
+    visible:
+      id: 'rooms-list-view'
+    timeout: 60000
+
 # Workspaces (servers list) action sheet — the bottom "Add server" row must be visible.
 - extendedWaitUntil:
     visible:
diff --git a/app/containers/ActionSheet/BottomSheetContent.test.tsx b/app/containers/ActionSheet/BottomSheetContent.test.tsx
deleted file mode 100644
index 831e3fbcc48..00000000000
--- a/app/containers/ActionSheet/BottomSheetContent.test.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { render, screen } from '@testing-library/react-native';
-import { StyleSheet } from 'react-native';
-
-import BottomSheetContent from './BottomSheetContent';
-import { type TActionSheetOptionsItem } from './Provider';
-
-// The sheet is sized (its detent) with a reserved bottom inset and the scrollable
-// content must be padded with the SAME value, otherwise the last option overflows
-// the too-short sheet and gets clipped behind the navigation bar — the Samsung bug
-// this guards against. Lock that the FlatList padding equals contentPaddingBottom.
-const options: TActionSheetOptionsItem[] = [
-	{ title: 'Forward', onPress: jest.fn() },
-	{ title: 'Copy', onPress: jest.fn() }
-];
-
-describe('BottomSheetContent — options bottom spacing', () => {
-	it('pads the option list with exactly the reserved bottom inset', () => {
-		render(
-			<BottomSheetContent options={options} hide={jest.fn()} onLayout={jest.fn()} contentPaddingBottom={96} scrollEnabled />
-		);
-
-		const style = StyleSheet.flatten(screen.getByTestId('action-sheet').props.contentContainerStyle);
-		expect(style.paddingBottom).toBe(96);
-	});
-
-	it('defaults to no extra padding when no inset is reserved', () => {
-		render(<BottomSheetContent options={options} hide={jest.fn()} onLayout={jest.fn()} scrollEnabled />);
-
-		const style = StyleSheet.flatten(screen.getByTestId('action-sheet').props.contentContainerStyle);
-		expect(style.paddingBottom).toBe(0);
-	});
-});
diff --git a/app/containers/ActionSheet/getActionSheetBottomInset.test.ts b/app/containers/ActionSheet/getActionSheetBottomInset.test.ts
deleted file mode 100644
index 0c065008e28..00000000000
--- a/app/containers/ActionSheet/getActionSheetBottomInset.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Platform } from 'react-native';
-import { type EdgeInsets } from 'react-native-safe-area-context';
-
-import { getActionSheetBottomInset } from './getActionSheetBottomInset';
-
-// isAndroid/isIOS are derived from Platform.OS at import time, so drive them via a mutable mock.
-jest.mock('../../lib/methods/helpers', () => ({ isAndroid: true, isIOS: false }));
-
-// initialWindowMetrics holds the window insets captured natively at launch.
-jest.mock('react-native-safe-area-context', () => ({ initialWindowMetrics: { insets: { bottom: 48 } } }));
-
-const helpers = jest.requireMock('../../lib/methods/helpers') as { isAndroid: boolean; isIOS: boolean };
-const safeArea = jest.requireMock('react-native-safe-area-context') as {
-	initialWindowMetrics: { insets: { bottom: number } } | null;
-};
-
-const insets = (bottom: number): EdgeInsets => ({ top: 0, bottom, left: 0, right: 0 });
-
-// Platform.Version is not writable in the RN jest preset, so drive it through a getter.
-let mockVersion: number = 34;
-Object.defineProperty(Platform, 'Version', { configurable: true, get: () => mockVersion });
-
-describe('getActionSheetBottomInset', () => {
-	afterEach(() => {
-		mockVersion = 34;
-		helpers.isAndroid = true;
-		helpers.isIOS = false;
-		safeArea.initialWindowMetrics = { insets: { bottom: 48 } };
-	});
-
-	it('reserves the captured nav bar height on older Android when live insets are 0 (the Samsung S24 Ultra bug)', () => {
-		safeArea.initialWindowMetrics = { insets: { bottom: 48 } };
-
-		// live insets are 0 because the app is not edge-to-edge; fall back to the captured nav bar (48)
-		expect(getActionSheetBottomInset(insets(0))).toBe(48);
-	});
-
-	it('prefers the larger of live and captured insets', () => {
-		safeArea.initialWindowMetrics = { insets: { bottom: 24 } };
-
-		// max(live 48, captured 24)
-		expect(getActionSheetBottomInset(insets(48))).toBe(48);
-	});
-
-	it('returns 0 when no captured metrics are available and live insets are 0', () => {
-		safeArea.initialWindowMetrics = null;
-
-		expect(getActionSheetBottomInset(insets(0))).toBe(0);
-	});
-
-	it('returns 0 on edge-to-edge Android (SDK >= 36) where the native sheet reserves the inset', () => {
-		mockVersion = 36;
-
-		expect(getActionSheetBottomInset(insets(0))).toBe(0);
-	});
-
-	it('returns 0 on iOS', () => {
-		helpers.isAndroid = false;
-		helpers.isIOS = true;
-
-		expect(getActionSheetBottomInset(insets(34))).toBe(0);
-	});
-});
diff --git a/app/views/DirectoryView/Options.test.tsx b/app/views/DirectoryView/Options.test.tsx
deleted file mode 100644
index 34859599ec3..00000000000
--- a/app/views/DirectoryView/Options.test.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { render, screen } from '@testing-library/react-native';
-import { ScrollView, StyleSheet } from 'react-native';
-
-import DirectoryOptions from './Options';
-
-// The directory filter is shown as action-sheet content. The sheet already applies the
-// bottom safe-area inset, so the List.Container must not add `marginBottom: insets.bottom`
-// (double-counting leaves a blank band — the bug this guards against). Inset mocked to a
-// non-zero value so a regression re-adding the margin would surface as marginBottom: 34.
-jest.mock('react-native-safe-area-context', () => ({
-	useSafeAreaInsets: () => ({ top: 0, bottom: 34, left: 0, right: 0 })
-}));
-
-describe('DirectoryView Options — action sheet bottom spacing', () => {
-	it('does not bake the bottom safe-area inset into the list container', () => {
-		render(
-			<DirectoryOptions
-				type='channels'
-				globalUsers={false}
-				isFederationEnabled={false}
-				changeType={jest.fn()}
-				toggleWorkspace={jest.fn()}
-			/>
-		);
-
-		const container = screen.UNSAFE_getByType(ScrollView);
-		const style = StyleSheet.flatten(container.props.contentContainerStyle);
-		// Neither margin nor padding: this view drops the inset entirely, so a
-		// margin->padding swap would still inflate the bottom spacing and must fail.
-		expect(style.marginBottom).toBeUndefined();
-		expect(style.paddingBottom).toBeUndefined();
-	});
-});
diff --git a/app/views/MediaAutoDownloadView/ListPicker.test.tsx b/app/views/MediaAutoDownloadView/ListPicker.test.tsx
deleted file mode 100644
index 8483ae25c41..00000000000
--- a/app/views/MediaAutoDownloadView/ListPicker.test.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react-native';
-import { StyleSheet } from 'react-native';
-
-import ListPicker from './ListPicker';
-
-// Non-zero bottom inset: the action sheet (TrueSheet / BottomSheetContent) already
-// applies the bottom safe-area inset to its content, so the picker content must NOT
-// add its own `marginBottom: insets.bottom` — doing so double-counts and leaves a
-// blank band at the bottom of the sheet (the bug this guards against). With the inset
-// mocked to 34, a regression that re-adds the margin would surface as marginBottom: 34.
-jest.mock('react-native-safe-area-context', () => ({
-	useSafeAreaInsets: () => ({ top: 0, bottom: 34, left: 0, right: 0 })
-}));
-
-jest.mock('../../containers/ActionSheet', () => ({ useActionSheet: jest.fn() }));
-const mockUseActionSheet = require('../../containers/ActionSheet').useActionSheet as jest.Mock;
-
-describe('MediaAutoDownloadView ListPicker — action sheet bottom spacing', () => {
-	const showActionSheet = jest.fn();
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockUseActionSheet.mockReturnValue({ showActionSheet, hideActionSheet: jest.fn() });
-	});
-
-	it('does not bake the bottom safe-area inset into the sheet content', () => {
-		render(<ListPicker value='wifi' title='Images' testID='media-picker' onChangeValue={jest.fn()} />);
-
-		fireEvent.press(screen.getByTestId('media-picker'));
-
-		expect(showActionSheet).toHaveBeenCalledTimes(1);
-		const { children } = showActionSheet.mock.calls[0][0];
-		const style = StyleSheet.flatten(children.props.style);
-		// Neither margin nor padding: this view drops the inset entirely, so a
-		// margin->padding swap would still inflate the bottom spacing and must fail.
-		expect(style.marginBottom).toBeUndefined();
-		expect(style.paddingBottom).toBeUndefined();
-	});
-});
diff --git a/app/views/RoomsListView/components/serversListLayout.test.ts b/app/views/RoomsListView/components/serversListLayout.test.ts
deleted file mode 100644
index ed9b698f398..00000000000
--- a/app/views/RoomsListView/components/serversListLayout.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { getServersListMaxHeight, SERVERS_LIST_MAX_ROWS, SERVERS_LIST_ROW_HEIGHT } from './serversListLayout';
-
-const FULL_HEIGHT = SERVERS_LIST_MAX_ROWS * SERVERS_LIST_ROW_HEIGHT;
-
-// Reserve for the Workspaces header + separator + Add Server button + sheet handle.
-// Must match SERVERS_LIST_CHROME_HEIGHT in serversListLayout.ts.
-const CHROME = 150;
-const SHEET_MAX_FRACTION = 0.75;
-
-describe('getServersListMaxHeight', () => {
-	it('keeps the full MAX_ROWS height in portrait (plenty of room)', () => {
-		// iPhone-ish portrait height
-		expect(getServersListMaxHeight(844)).toBe(FULL_HEIGHT);
-		// Tall window is still capped at the row max, not the window
-		expect(getServersListMaxHeight(2000)).toBe(FULL_HEIGHT);
-	});
-
-	it('shrinks the list in a short (landscape) window so the Add Server button still fits', () => {
-		const landscapeHeight = 390; // phone landscape
-		const maxHeight = getServersListMaxHeight(landscapeHeight);
-
-		// Constrained below the full height...
-		expect(maxHeight).toBeLessThan(FULL_HEIGHT);
-		// ...so that list + chrome fits within the sheet's max height (button not clipped).
-		expect(maxHeight + CHROME).toBeLessThanOrEqual(landscapeHeight * SHEET_MAX_FRACTION);
-	});
-
-	it('regression: 3 workspaces in landscape leave the Add Server button visible', () => {
-		const landscapeHeight = 390;
-		const threeRows = 3 * SERVERS_LIST_ROW_HEIGHT; // 204, what the old fixed 306 cap would have shown
-		const maxHeight = getServersListMaxHeight(landscapeHeight);
-
-		// The list is capped shorter than 3 full rows, so it scrolls instead of pushing
-		// the button off-screen — the bug being fixed.
-		expect(maxHeight).toBeLessThan(threeRows);
-		expect(maxHeight + CHROME).toBeLessThanOrEqual(landscapeHeight * SHEET_MAX_FRACTION);
-	});
-
-	it('never collapses below a single row', () => {
-		// Even an extremely short window keeps at least one row visible.
-		expect(getServersListMaxHeight(100)).toBe(SERVERS_LIST_ROW_HEIGHT);
-		expect(getServersListMaxHeight(0)).toBe(SERVERS_LIST_ROW_HEIGHT);
-	});
-});
diff --git a/app/views/UserNotificationPreferencesView/ListPicker.test.tsx b/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
deleted file mode 100644
index d48c1083ebc..00000000000
--- a/app/views/UserNotificationPreferencesView/ListPicker.test.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react-native';
-import { StyleSheet } from 'react-native';
-
-import ListPicker from './ListPicker';
-
-// The sheet already applies the bottom safe-area inset to its content, so the picker
-// content must not add a `marginBottom: insets.bottom` (that double-counts and leaves
-// a blank band — the bug this guards against). This view intentionally keeps a
-// `paddingBottom` for now, so the guard is specifically on marginBottom. Inset mocked
-// to 34 so a regression re-adding the margin would surface as marginBottom: 34.
-jest.mock('react-native-safe-area-context', () => ({
-	useSafeAreaInsets: () => ({ top: 0, bottom: 34, left: 0, right: 0 })
-}));
-
-jest.mock('../../containers/ActionSheet', () => ({ useActionSheet: jest.fn() }));
-const mockUseActionSheet = require('../../containers/ActionSheet').useActionSheet as jest.Mock;
-
-describe('UserNotificationPreferencesView ListPicker — action sheet bottom spacing', () => {
-	const showActionSheet = jest.fn();
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockUseActionSheet.mockReturnValue({ showActionSheet, hideActionSheet: jest.fn() });
-	});
-
-	it('does not bake the bottom safe-area inset as a margin into the sheet content', () => {
-		render(
-			<ListPicker preference='desktopNotifications' value='all' title='Alert' testID='notif-picker' onChangeValue={jest.fn()} />
-		);
-
-		fireEvent.press(screen.getByTestId('notif-picker'));
-
-		expect(showActionSheet).toHaveBeenCalledTimes(1);
-		const { children } = showActionSheet.mock.calls[0][0];
-		const style = StyleSheet.flatten(children.props.style);
-		expect(style.marginBottom).toBeUndefined();
-		// This view intentionally keeps the bottom safe-area inset as padding, so lock that contract.
-		expect(style.paddingBottom).toBe(undefined);
-	});
-});

From e77c60f353ee44e8fce6fa4af063f927b99b6254 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 22 Jun 2026 20:53:31 -0300
Subject: [PATCH 20/23] refactor: dedupe action sheet max-height fraction in
 servers list

---
 .../ActionSheet/useActionSheetDetents.ts      |  2 +-
 .../components/serversListLayout.test.ts      | 32 +++++++++++++++++++
 .../components/serversListLayout.ts           | 28 ++++++++++------
 3 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 app/views/RoomsListView/components/serversListLayout.test.ts

diff --git a/app/containers/ActionSheet/useActionSheetDetents.ts b/app/containers/ActionSheet/useActionSheetDetents.ts
index e5c9eb543a3..d1eb8e50235 100644
--- a/app/containers/ActionSheet/useActionSheetDetents.ts
+++ b/app/containers/ActionSheet/useActionSheetDetents.ts
@@ -3,7 +3,7 @@ import { useMemo } from 'react';
 import { useWindowDimensions } from 'react-native';
 
 const ACTION_SHEET_MIN_HEIGHT_FRACTION = 0.15;
-const ACTION_SHEET_MAX_HEIGHT_FRACTION = 0.75;
+export const ACTION_SHEET_MAX_HEIGHT_FRACTION = 0.75;
 const SCROLL_ENABLED_THRESHOLD = 0.6;
 export const HANDLE_HEIGHT = 28;
 
diff --git a/app/views/RoomsListView/components/serversListLayout.test.ts b/app/views/RoomsListView/components/serversListLayout.test.ts
new file mode 100644
index 00000000000..93eb863eafb
--- /dev/null
+++ b/app/views/RoomsListView/components/serversListLayout.test.ts
@@ -0,0 +1,32 @@
+import { getServersListMaxHeight, SERVERS_LIST_MAX_ROWS, SERVERS_LIST_ROW_HEIGHT } from './serversListLayout';
+
+const fullHeight = SERVERS_LIST_MAX_ROWS * SERVERS_LIST_ROW_HEIGHT;
+
+describe('getServersListMaxHeight', () => {
+	test('caps at the full MAX_ROWS height in a tall portrait window', () => {
+		// iPhone-ish portrait: plenty of room, behaviour stays unchanged
+		expect(getServersListMaxHeight(844)).toBe(fullHeight);
+	});
+
+	test('returns the full height exactly at the boundary where the list fits', () => {
+		// windowHeight * 0.75 - 150 === 306  =>  windowHeight === 608
+		expect(getServersListMaxHeight(608)).toBe(fullHeight);
+	});
+
+	test('shrinks below the full height in a short window so the button still fits', () => {
+		// landscape-ish height: 390 * 0.75 - 150 = 142.5
+		const result = getServersListMaxHeight(390);
+		expect(result).toBe(142.5);
+		expect(result).toBeLessThan(fullHeight);
+		expect(result).toBeGreaterThan(SERVERS_LIST_ROW_HEIGHT);
+	});
+
+	test('never shrinks below a single row height in a very short window', () => {
+		// 200 * 0.75 - 150 = 0, clamped up to one row
+		expect(getServersListMaxHeight(200)).toBe(SERVERS_LIST_ROW_HEIGHT);
+	});
+
+	test('floors at a single row height for a zero/degenerate window height', () => {
+		expect(getServersListMaxHeight(0)).toBe(SERVERS_LIST_ROW_HEIGHT);
+	});
+});
diff --git a/app/views/RoomsListView/components/serversListLayout.ts b/app/views/RoomsListView/components/serversListLayout.ts
index 303d47aca47..839385a263a 100644
--- a/app/views/RoomsListView/components/serversListLayout.ts
+++ b/app/views/RoomsListView/components/serversListLayout.ts
@@ -1,17 +1,27 @@
 // Layout math for the Workspaces (servers list) action sheet, kept dependency-free
 // so it can be unit-tested without the redux/database tree the component needs.
 
+import { ACTION_SHEET_MAX_HEIGHT_FRACTION, HANDLE_HEIGHT } from '../../../containers/ActionSheet/useActionSheetDetents';
+
 export const SERVERS_LIST_ROW_HEIGHT = 68;
 export const SERVERS_LIST_MAX_ROWS = 4.5;
 
-// Vertical space the sheet needs for everything that is NOT the scrollable server
-// list: the "Workspaces" header, the separator, the Add Server button block, and
-// the sheet handle. Reserved so the button is never pushed off-screen.
-const SERVERS_LIST_CHROME_HEIGHT = 150;
-
-// Mirrors ACTION_SHEET_MAX_HEIGHT_FRACTION in useActionSheetDetents: a children
-// action sheet can grow to at most this fraction of the window height.
-const ACTION_SHEET_MAX_HEIGHT_FRACTION = 0.75;
+// Vertical space the sheet reserves for everything that is NOT the scrollable
+// server list, so the Add Server button is never pushed off-screen. Built up from
+// the real pieces (see ServersList.tsx + RoomsListView/styles.ts) rather than a
+// bare guess, so that resizing any of them keeps this in sync. Approximate by
+// design — glyph line-height isn't pinned in styles — but a unit test guards the
+// total. The two hairline List.Separators are rounded into the text allowance.
+const WORKSPACES_HEADER_HEIGHT = 41; // styles.serversListContainerHeader.height
+const ADD_SERVER_CONTAINER_PADDING = 16 * 2; // styles.addServerButtonContainer.padding (top + bottom)
+const ADD_SERVER_BUTTON_PADDING = 14 * 2; // styles.buttonCreateWorkspace.paddingVertical (top + bottom)
+const ADD_SERVER_BUTTON_TEXT_HEIGHT = 21; // ~line-height of the 16px button label
+const SERVERS_LIST_RESERVED_HEIGHT =
+	WORKSPACES_HEADER_HEIGHT +
+	HANDLE_HEIGHT +
+	ADD_SERVER_CONTAINER_PADDING +
+	ADD_SERVER_BUTTON_PADDING +
+	ADD_SERVER_BUTTON_TEXT_HEIGHT;
 
 /**
  * Max height for the servers FlatList. In portrait there is plenty of room, so it
@@ -22,6 +32,6 @@ const ACTION_SHEET_MAX_HEIGHT_FRACTION = 0.75;
  */
 export const getServersListMaxHeight = (windowHeight: number): number => {
 	const fullHeight = SERVERS_LIST_MAX_ROWS * SERVERS_LIST_ROW_HEIGHT;
-	const availableForList = windowHeight * ACTION_SHEET_MAX_HEIGHT_FRACTION - SERVERS_LIST_CHROME_HEIGHT;
+	const availableForList = windowHeight * ACTION_SHEET_MAX_HEIGHT_FRACTION - SERVERS_LIST_RESERVED_HEIGHT;
 	return Math.max(SERVERS_LIST_ROW_HEIGHT, Math.min(fullHeight, availableForList));
 };

From 153eac9c6be043d1a8a5f19d9fac2d5f56ddf3e9 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 22 Jun 2026 20:53:52 -0300
Subject: [PATCH 21/23] refactor: simplify getActionSheetBottomInset to take
 bottom inset directly

---
 app/containers/ActionSheet/ActionSheet.tsx     |  2 +-
 .../ActionSheet/getActionSheetBottomInset.ts   | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/containers/ActionSheet/ActionSheet.tsx b/app/containers/ActionSheet/ActionSheet.tsx
index 9f922585695..ba415e78d14 100644
--- a/app/containers/ActionSheet/ActionSheet.tsx
+++ b/app/containers/ActionSheet/ActionSheet.tsx
@@ -37,7 +37,7 @@ const ActionSheet = memo(
 
 		const insets = useSafeAreaInsets();
 		const itemHeight = 48 * fontScale;
-		const bottomInset = getActionSheetBottomInset(insets);
+		const bottomInset = getActionSheetBottomInset(insets.bottom);
 
 		const handleContentLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => {
 			setContentHeight(layout.height);
diff --git a/app/containers/ActionSheet/getActionSheetBottomInset.ts b/app/containers/ActionSheet/getActionSheetBottomInset.ts
index 9fd90f8b6ca..02c5c718f25 100644
--- a/app/containers/ActionSheet/getActionSheetBottomInset.ts
+++ b/app/containers/ActionSheet/getActionSheetBottomInset.ts
@@ -1,16 +1,24 @@
 import { Platform } from 'react-native';
-import { initialWindowMetrics, type EdgeInsets } from 'react-native-safe-area-context';
+import { initialWindowMetrics } from 'react-native-safe-area-context';
 
 import { isAndroid, isIOS } from '../../lib/methods/helpers';
 
-export function getActionSheetBottomInset(liveInsets: EdgeInsets): number {
-	const isNewAndroid = isAndroid && Number(Platform.Version) >= 36;
-	if (isIOS || isNewAndroid) {
+// Android API level (SDK_INT) at which edge-to-edge is enforced and TrueSheet
+// auto-reserves the navigation-bar inset itself. At or above this level we let
+// native handle it and return 0; below it we reserve the nav bar ourselves.
+const TRUE_SHEET_EDGE_TO_EDGE_SDK_INT = 36;
+
+export function getActionSheetBottomInset(liveBottom: number): number {
+	const nativeReservesInset = isAndroid && Number(Platform.Version) >= TRUE_SHEET_EDGE_TO_EDGE_SDK_INT;
+	if (isIOS || nativeReservesInset) {
 		return 0;
 	}
 
+	// Live insets read 0 inside the sheet's separate window on old Android, so fall
+	// back to the boot-time nav-bar height. max() also keeps us correct when live >
+	// captured (e.g. rotation / nav-mode change grows the inset).
 	const capturedNavBarInset = initialWindowMetrics?.insets.bottom ?? 0;
-	const navBarInset = Math.max(liveInsets.bottom, capturedNavBarInset);
+	const navBarInset = Math.max(liveBottom, capturedNavBarInset);
 
 	return navBarInset;
 }

From 8481335737f4e22f46efb5ff5ab8179801aefc51 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 22 Jun 2026 20:54:06 -0300
Subject: [PATCH 22/23] fix: use nullish coalescing for action sheet content
 padding

---
 app/containers/ActionSheet/BottomSheetContent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/containers/ActionSheet/BottomSheetContent.tsx b/app/containers/ActionSheet/BottomSheetContent.tsx
index eee330a2b99..ad00c2dd282 100644
--- a/app/containers/ActionSheet/BottomSheetContent.tsx
+++ b/app/containers/ActionSheet/BottomSheetContent.tsx
@@ -41,7 +41,7 @@ const BottomSheetContent = memo(
 		const { colors } = useTheme();
 		const { fontScale } = useWindowDimensions();
 		const height = 48 * fontScale;
-		const paddingBottom = contentPaddingBottom || 0;
+		const paddingBottom = contentPaddingBottom ?? 0;
 		const minHeightStyle = isAndroid || !contentMinHeight ? undefined : { minHeight: contentMinHeight };
 
 		const renderFooter = () =>

From c879f00fcdd12f2af3e4333fb0749a5ca4430f64 Mon Sep 17 00:00:00 2001
From: OtavioStasiak <otaviostasiakmusic@outlook.com>
Date: Mon, 22 Jun 2026 21:36:49 -0300
Subject: [PATCH 23/23] refactor: drop initialWindowMetrics workaround from
 action sheet bottom inset

---
 .../ActionSheet/getActionSheetBottomInset.ts       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/containers/ActionSheet/getActionSheetBottomInset.ts b/app/containers/ActionSheet/getActionSheetBottomInset.ts
index 02c5c718f25..6cca420c48e 100644
--- a/app/containers/ActionSheet/getActionSheetBottomInset.ts
+++ b/app/containers/ActionSheet/getActionSheetBottomInset.ts
@@ -1,11 +1,10 @@
 import { Platform } from 'react-native';
-import { initialWindowMetrics } from 'react-native-safe-area-context';
 
 import { isAndroid, isIOS } from '../../lib/methods/helpers';
 
 // Android API level (SDK_INT) at which edge-to-edge is enforced and TrueSheet
 // auto-reserves the navigation-bar inset itself. At or above this level we let
-// native handle it and return 0; below it we reserve the nav bar ourselves.
+// native handle it and return 0; below it we rely on the live safe-area inset.
 const TRUE_SHEET_EDGE_TO_EDGE_SDK_INT = 36;
 
 export function getActionSheetBottomInset(liveBottom: number): number {
@@ -14,11 +13,8 @@ export function getActionSheetBottomInset(liveBottom: number): number {
 		return 0;
 	}
 
-	// Live insets read 0 inside the sheet's separate window on old Android, so fall
-	// back to the boot-time nav-bar height. max() also keeps us correct when live >
-	// captured (e.g. rotation / nav-mode change grows the inset).
-	const capturedNavBarInset = initialWindowMetrics?.insets.bottom ?? 0;
-	const navBarInset = Math.max(liveBottom, capturedNavBarInset);
-
-	return navBarInset;
+	// On older Android the app is not yet edge-to-edge, so this reads 0 today.
+	// Proper nav-bar inset handling is deferred to the dedicated edge-to-edge PR,
+	// after which this live inset becomes correct and the sheet reserves it.
+	return liveBottom;
 }