From 68d0309840965d08dc451c6bd84e487ddb14e0d9 Mon Sep 17 00:00:00 2001
From: lkuchno <luseeku@gmail.com>
Date: Wed, 8 Apr 2026 13:57:45 +0200
Subject: [PATCH 01/20] chore(test): new
 test-tabs-dark-experimental-userInterfaceStyle with scenario

---
 .../tests/single-feature-tests/tabs/index.ts  |   2 +
 .../index.tsx                                 | 171 ++++++++++++++++++
 .../scenario.md                               |  71 ++++++++
 3 files changed, 244 insertions(+)
 create mode 100644 apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/index.tsx
 create mode 100644 apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/scenario.md

diff --git a/apps/src/tests/single-feature-tests/tabs/index.ts b/apps/src/tests/single-feature-tests/tabs/index.ts
index 084e439da9..cb9459c467 100644
--- a/apps/src/tests/single-feature-tests/tabs/index.ts
+++ b/apps/src/tests/single-feature-tests/tabs/index.ts
@@ -11,6 +11,7 @@ import TestTabsIMEInsets from './test-tabs-ime-insets';
 import TestTabsSimpleNav from './test-tabs-simple-nav';
 import TestTabsMoreNavigationController from './test-tabs-more-navigation-controller';
 import TestTabsStaleStateUpdateRejection from './test-tabs-stale-update-rejection';
+import TestTabsTabBarDarkExperimentalUserInterfaceStyle from './test-tabs-dark-experimental-userInterfaceStyle';
 
 const scenarios = {
   BottomAccessoryScenario,
@@ -24,6 +25,7 @@ const scenarios = {
   TestTabsSimpleNav,
   TestTabsMoreNavigationController,
   TestTabsStaleStateUpdateRejection,
+  TestTabsTabBarDarkExperimentalUserInterfaceStyle,
 };
 
 const TabsScenarioGroup: ScenarioGroup<keyof typeof scenarios> = {
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/index.tsx b/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/index.tsx
new file mode 100644
index 0000000000..b5c55bf112
--- /dev/null
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/index.tsx
@@ -0,0 +1,171 @@
+import {
+    TabsContainerWithHostConfigContext,
+    type TabRouteConfig,
+} from '@apps/shared/gamma/containers/tabs';
+import React from 'react';
+import { Button, View, Text, ScrollView, StyleSheet } from 'react-native';
+import { Scenario } from '@apps/tests/shared/helpers';
+
+import {
+    createNativeStackNavigator,
+} from '@react-navigation/native-stack';
+
+import {
+    useNavigation,
+    type NavigationProp,
+    ThemeProvider,
+    DarkTheme,
+} from '@react-navigation/native';
+
+type RootStackParamList = {
+    Screen1: undefined;
+    DarkScreen: undefined;
+};
+
+const Stack = createNativeStackNavigator<RootStackParamList>();
+
+const SCENARIO: Scenario = {
+    name: 'Tab Bar Experimental UIStyle: dark',
+    key: 'test-tabs-dark-experimental-userInterfaceStyle-ios',
+    platforms: ['ios'],
+    AppComponent: App,
+};
+
+export default SCENARIO;
+
+
+function Screen1() {
+    const navigation = useNavigation<NavigationProp<RootStackParamList>>();
+    return (
+        <ScrollView style={{ padding: 40 }}>
+            <View>
+                <Text style={styles.sectionHeader}>
+                    experimental_userInterfaceStyle
+                </Text>
+                <Text style={styles.description}>
+                    Enable system light mode and observe the tab bar and back
+                    button on the pushed screen.
+                </Text>
+                <Button
+                    title="Push screen with style: dark"
+                    onPress={() => navigation.navigate('DarkScreen')}
+                />
+            </View>
+        </ScrollView>
+    );
+}
+
+function DarkStyleTabContent() {
+    return (
+        <View style={styles.centeredDarkScreen}>
+            <Text style={styles.screenLabel}>
+                experimental_userInterfaceStyle: dark</Text>
+            <Text style={styles.screenHint}>
+                This screen forces dark interface style regardless of system setting.
+                Observe the tab bar and navigation bar appearance.
+            </Text>
+        </View>
+    );
+}
+
+const ROUTE_CONFIGS: TabRouteConfig[] = [
+    {
+        name: 'Tab1',
+        Component: DarkStyleTabContent,
+        options: {
+            title: 'Tab1',
+            ios: {
+                icon: {
+                    type: 'sfSymbol',
+                    name: 'house',
+                },
+                experimental_userInterfaceStyle: 'dark'
+            }
+        },
+    },
+    {
+        name: 'Tab2',
+        Component: DarkStyleTabContent,
+        options: {
+            title: 'Tab2',
+            ios: {
+                icon: {
+                    type: 'sfSymbol',
+                    name: 'star',
+                },
+                experimental_userInterfaceStyle: 'dark'
+            },
+        },
+    },
+];
+
+function DarkInterfaceStyleScreen() {
+    return (
+        <TabsContainerWithHostConfigContext
+            routeConfigs={ROUTE_CONFIGS}
+        />
+    );
+}
+
+export function App() {
+    return (
+        <ThemeProvider value={DarkTheme}>
+            <Stack.Navigator>
+                <Stack.Screen
+                    name="Screen1"
+                    component={Screen1}
+                    options={{
+                        headerShown: false,
+                        contentStyle: { backgroundColor: 'black' }
+                    }}
+                />
+                <Stack.Screen
+                    name="DarkScreen"
+                    component={DarkInterfaceStyleScreen}
+                    options={{
+                        title: 'Dark Interface Style',
+                        statusBarStyle: "light",
+                    }}
+                />
+            </Stack.Navigator>
+        </ThemeProvider>
+    );
+}
+
+const styles = {
+    sectionHeader: {
+        fontSize: 13,
+        fontWeight: '600' as const,
+        textTransform: 'uppercase' as const,
+        color: '#888',
+        letterSpacing: 0.5,
+        marginTop: 24,
+        marginBottom: 4,
+    },
+    description: {
+        fontSize: 13,
+        color: '#555',
+        marginBottom: 6,
+        marginTop: 12,
+    },
+    centeredDarkScreen: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+        padding: 40,
+        gap: 12,
+        backgroundColor: 'black'
+    },
+    screenLabel: {
+        fontSize: 17,
+        fontWeight: '600',
+        textAlign: 'center',
+        color: 'white'
+    },
+    screenHint: {
+        fontSize: 14,
+        color: '#555',
+        textAlign: 'center',
+        lineHeight: 20,
+    },
+};
\ No newline at end of file
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/scenario.md b/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/scenario.md
new file mode 100644
index 0000000000..360d15f882
--- /dev/null
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/scenario.md
@@ -0,0 +1,71 @@
+# Test Scenario: experimental_userInterfaceStyle
+
+**E2E test:** No
+
+## Prerequisites
+
+- iOS device/simulator (use Cmd+Shift+A to toggle appearance on simulator)
+
+## Assumptions
+
+- Both tabs (`Tab1`, `Tab2`) have `experimental_userInterfaceStyle: 'dark'` hardcoded.
+- The scenario is reached by pushing **Dark Screen** from the initial stack screen.
+- System color scheme changes are reflected by toggling appearance on the simulator or device.
+
+---
+
+## Steps
+
+### Baseline
+
+1. Launch the app and navigate to the Tab Bar Experimental UIStyle: dark. Ensure system appearance is set to **light**.
+
+- [ ] Expected: First screen is shown with a black background. A single button to push the screen with dark style is visible.
+
+---
+
+### Pushing the dark screen — light system mode
+
+2. With system appearance set to **light**, tap **"Push screen with style: dark"**.
+
+- [ ] Expected: `DarkScreen` is pushed. The tab bar appears **dark** despite the system being in light mode — `experimental_userInterfaceStyle: dark` overrides the system setting.
+
+3. Verify the navigation bar (back button area) on the pushed screen.
+
+- [ ] Expected: The navigation bar also reflects a dark style (light-colored back button / title text).
+
+4. Switch between **Tab1** and **Tab2** on the pushed screen.
+
+- [ ] Expected: Both tabs maintain the dark interface style. No flash, flicker, or reversion to light style on tab switch.
+
+---
+
+### Pushing the dark screen — dark system mode
+
+5. Pop back to `Screen1`. Set system appearance to **dark**. Push **"Push screen with style: dark"** again.
+
+- [ ] Expected: Tab bar and navigation bar appear **dark** — consistent with both the prop value and the system setting. No visual difference compared to step 2.
+
+---
+
+### Popping back — system appearance restored
+
+6. With system appearance set to **light**, push `DarkScreen` so the tab bar is dark. Then tap the back button to return to `Screen1`.
+
+- [ ] Expected: After popping, `Screen1` returns to its normal appearance (black background, no tab bar). No leftover dark styling bleeds into `Screen1`.
+
+7. Push `DarkScreen` and pop back several times in quick succession.
+
+- [ ] Expected: No crash, layout freeze, or persistent dark-style bleed onto `Screen1`.
+
+---
+
+### Status bar
+
+8. While on `DarkScreen` (system set to **light**), observe the status bar.
+
+- [ ] Expected: Status bar displays with **light content** (white text/icons), consistent with `statusBarStyle: "light"` set on the stack screen options.
+
+9. Pop back to `Screen1` and observe the status bar.
+
+- [ ] Expected: Status bar returns to its default appearance for `Screen1` — no leftover light status bar style.
\ No newline at end of file

From b3c8132f130205a26120c5e02282fc2a065bb882 Mon Sep 17 00:00:00 2001
From: lkuchno <luseeku@gmail.com>
Date: Wed, 8 Apr 2026 16:16:35 +0200
Subject: [PATCH 02/20]  scenario cutted to main steps

---
 .../tests/single-feature-tests/tabs/index.ts  |  2 +-
 .../scenario.md                               | 71 -------------------
 .../index.tsx                                 |  2 +-
 .../scenario.md                               | 25 +++++++
 4 files changed, 27 insertions(+), 73 deletions(-)
 delete mode 100644 apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/scenario.md
 rename apps/src/tests/single-feature-tests/tabs/{test-tabs-dark-experimental-userInterfaceStyle => test-tabs-tab-bar-dark-experimental-userInterfaceStyle}/index.tsx (98%)
 create mode 100644 apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md

diff --git a/apps/src/tests/single-feature-tests/tabs/index.ts b/apps/src/tests/single-feature-tests/tabs/index.ts
index a92ecfb95a..a320491319 100644
--- a/apps/src/tests/single-feature-tests/tabs/index.ts
+++ b/apps/src/tests/single-feature-tests/tabs/index.ts
@@ -12,7 +12,7 @@ import TestTabsSimpleNav from './test-tabs-simple-nav';
 import TestTabsMoreNavigationController from './test-tabs-more-navigation-controller';
 import TestTabsStaleStateUpdateRejection from './test-tabs-stale-update-rejection';
 import TestTabsTabBarMinimizeBehavior from './test-tabs-tab-bar-minimize-behavior-ios';
-import TestTabsTabBarDarkExperimentalUserInterfaceStyle from './test-tabs-dark-experimental-userInterfaceStyle';
+import TestTabsTabBarDarkExperimentalUserInterfaceStyle from './test-tabs-tab-bar-dark-experimental-userInterfaceStyle';
 
 const scenarios = {
   BottomAccessoryScenario,
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/scenario.md b/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/scenario.md
deleted file mode 100644
index 360d15f882..0000000000
--- a/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/scenario.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# Test Scenario: experimental_userInterfaceStyle
-
-**E2E test:** No
-
-## Prerequisites
-
-- iOS device/simulator (use Cmd+Shift+A to toggle appearance on simulator)
-
-## Assumptions
-
-- Both tabs (`Tab1`, `Tab2`) have `experimental_userInterfaceStyle: 'dark'` hardcoded.
-- The scenario is reached by pushing **Dark Screen** from the initial stack screen.
-- System color scheme changes are reflected by toggling appearance on the simulator or device.
-
----
-
-## Steps
-
-### Baseline
-
-1. Launch the app and navigate to the Tab Bar Experimental UIStyle: dark. Ensure system appearance is set to **light**.
-
-- [ ] Expected: First screen is shown with a black background. A single button to push the screen with dark style is visible.
-
----
-
-### Pushing the dark screen — light system mode
-
-2. With system appearance set to **light**, tap **"Push screen with style: dark"**.
-
-- [ ] Expected: `DarkScreen` is pushed. The tab bar appears **dark** despite the system being in light mode — `experimental_userInterfaceStyle: dark` overrides the system setting.
-
-3. Verify the navigation bar (back button area) on the pushed screen.
-
-- [ ] Expected: The navigation bar also reflects a dark style (light-colored back button / title text).
-
-4. Switch between **Tab1** and **Tab2** on the pushed screen.
-
-- [ ] Expected: Both tabs maintain the dark interface style. No flash, flicker, or reversion to light style on tab switch.
-
----
-
-### Pushing the dark screen — dark system mode
-
-5. Pop back to `Screen1`. Set system appearance to **dark**. Push **"Push screen with style: dark"** again.
-
-- [ ] Expected: Tab bar and navigation bar appear **dark** — consistent with both the prop value and the system setting. No visual difference compared to step 2.
-
----
-
-### Popping back — system appearance restored
-
-6. With system appearance set to **light**, push `DarkScreen` so the tab bar is dark. Then tap the back button to return to `Screen1`.
-
-- [ ] Expected: After popping, `Screen1` returns to its normal appearance (black background, no tab bar). No leftover dark styling bleeds into `Screen1`.
-
-7. Push `DarkScreen` and pop back several times in quick succession.
-
-- [ ] Expected: No crash, layout freeze, or persistent dark-style bleed onto `Screen1`.
-
----
-
-### Status bar
-
-8. While on `DarkScreen` (system set to **light**), observe the status bar.
-
-- [ ] Expected: Status bar displays with **light content** (white text/icons), consistent with `statusBarStyle: "light"` set on the stack screen options.
-
-9. Pop back to `Screen1` and observe the status bar.
-
-- [ ] Expected: Status bar returns to its default appearance for `Screen1` — no leftover light status bar style.
\ No newline at end of file
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/index.tsx b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx
similarity index 98%
rename from apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/index.tsx
rename to apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx
index b5c55bf112..9c8de0ea5e 100644
--- a/apps/src/tests/single-feature-tests/tabs/test-tabs-dark-experimental-userInterfaceStyle/index.tsx
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx
@@ -26,7 +26,7 @@ const Stack = createNativeStackNavigator<RootStackParamList>();
 
 const SCENARIO: Scenario = {
     name: 'Tab Bar Experimental UIStyle: dark',
-    key: 'test-tabs-dark-experimental-userInterfaceStyle-ios',
+    key: 'test-tabs-tab-bar-dark-experimental-userInterfaceStyle-ios',
     platforms: ['ios'],
     AppComponent: App,
 };
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
new file mode 100644
index 0000000000..370452d556
--- /dev/null
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
@@ -0,0 +1,25 @@
+# Test Scenario: experimental_userInterfaceStyle
+
+**E2E test:** Not autmated - can't check visual behavior in a meaningful way
+
+## Prerequisites
+
+- iOS device/simulator (use Cmd+Shift+A to toggle appearance on simulator)
+
+## Steps
+
+1. Launch the app and navigate to the **Tab Bar Experimental UIStyle: dark** screen. Ensure system appearance is set to **light**.
+
+- [ ] Expected: First screen is shown with a black background. A single button to push the screen with dark style is visible.
+
+2. With system appearance set to **light**, tap **"Push screen with style: dark"** and observe tab bar.
+
+- [ ] Expected: `DarkScreen` is pushed. The tab bar appears **dark** without flash, flicker, or reversion to light style.
+
+3. Pop back to `Screen1`. Set system appearance to **dark**. Push **"Push screen with style: dark"** again and observe back button in navigation bar.
+
+- [ ] Expected: The navigation bar with back button also reflects a dark style and appear without flash, flicker, or reversion to light style.
+
+4. Switch between **Tab1** and **Tab2** on the pushed screen.
+
+- [ ] Expected: Both tabs maintain the dark interface style. No flash, flicker, or reversion to light style on tab switch.
\ No newline at end of file

From bc8b93d9b534990c4c135e11fb96c7981d3c2b55 Mon Sep 17 00:00:00 2001
From: lkuchno <luseeku@gmail.com>
Date: Wed, 8 Apr 2026 16:19:09 +0200
Subject: [PATCH 03/20]  scenario remove wrong text

---
 .../scenario.md                                                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
index 370452d556..a56f214eef 100644
--- a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
@@ -16,7 +16,7 @@
 
 - [ ] Expected: `DarkScreen` is pushed. The tab bar appears **dark** without flash, flicker, or reversion to light style.
 
-3. Pop back to `Screen1`. Set system appearance to **dark**. Push **"Push screen with style: dark"** again and observe back button in navigation bar.
+1. Pop back to `Screen1`. Push **"Push screen with style: dark"** again and observe back button in navigation bar.
 
 - [ ] Expected: The navigation bar with back button also reflects a dark style and appear without flash, flicker, or reversion to light style.
 

From 469b768eb4e7b3291a83bc8d278d2a63751727a4 Mon Sep 17 00:00:00 2001
From: lkuchno <luseeku@gmail.com>
Date: Wed, 8 Apr 2026 16:22:19 +0200
Subject: [PATCH 04/20] scenario update vol3

---
 .../scenario.md                                               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
index a56f214eef..c41860d2a9 100644
--- a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
@@ -14,11 +14,11 @@
 
 2. With system appearance set to **light**, tap **"Push screen with style: dark"** and observe tab bar.
 
-- [ ] Expected: `DarkScreen` is pushed. The tab bar appears **dark** without flash, flicker, or reversion to light style.
+- [ ] Expected: `DarkScreen` is pushed. The tab bar reflects a **dark** style and appear without flash, flicker, or reversion to light style.
 
 1. Pop back to `Screen1`. Push **"Push screen with style: dark"** again and observe back button in navigation bar.
 
-- [ ] Expected: The navigation bar with back button also reflects a dark style and appear without flash, flicker, or reversion to light style.
+- [ ] Expected: The navigation bar with back button also reflects a **dark** style and appear without flash, flicker, or reversion to light style.
 
 4. Switch between **Tab1** and **Tab2** on the pushed screen.
 

From 12a1eb9fa2b1a677b56d1513e03b7e5b482021e9 Mon Sep 17 00:00:00 2001
From: lkuchno <luseeku@gmail.com>
Date: Thu, 9 Apr 2026 09:40:17 +0200
Subject: [PATCH 05/20] scenario update

---
 .../scenario.md                                    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
index c41860d2a9..89445b8bc8 100644
--- a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
@@ -1,4 +1,4 @@
-# Test Scenario: experimental_userInterfaceStyle
+# Test Scenario: experimental_userInterfaceStyle: dark
 
 **E2E test:** Not autmated - can't check visual behavior in a meaningful way
 
@@ -8,18 +8,22 @@
 
 ## Steps
 
-1. Launch the app and navigate to the **Tab Bar Experimental UIStyle: dark** screen. Ensure system appearance is set to **light**.
+1. Launch the app and set system appearance to **light**.
+
+- [ ] Expected: App is displayed in light mode.
+
+2. Navigate to the **Tab Bar Experimental UIStyle: dark** screen.
 
 - [ ] Expected: First screen is shown with a black background. A single button to push the screen with dark style is visible.
 
-2. With system appearance set to **light**, tap **"Push screen with style: dark"** and observe tab bar.
+3. Tap **"Push screen with style: dark"** and observe tab bar.
 
 - [ ] Expected: `DarkScreen` is pushed. The tab bar reflects a **dark** style and appear without flash, flicker, or reversion to light style.
 
-1. Pop back to `Screen1`. Push **"Push screen with style: dark"** again and observe back button in navigation bar.
+4. Pop back to `Screen1`. Push **"Push screen with style: dark"** again and observe navigation bar.
 
 - [ ] Expected: The navigation bar with back button also reflects a **dark** style and appear without flash, flicker, or reversion to light style.
 
-4. Switch between **Tab1** and **Tab2** on the pushed screen.
+5. Switch between **Tab1** and **Tab2** on the pushed screen.
 
 - [ ] Expected: Both tabs maintain the dark interface style. No flash, flicker, or reversion to light style on tab switch.
\ No newline at end of file

From 037d6ef7a0ad5e838a5dfdb21780a6c473c77ffe Mon Sep 17 00:00:00 2001
From: Lucyna K <45803783+LKuchno@users.noreply.github.com>
Date: Thu, 9 Apr 2026 11:02:13 +0200
Subject: [PATCH 06/20] Update
 apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx

Co-authored-by: Kacper Kafara <kacper.kafara@swmansion.com>
---
 .../index.tsx                                                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx
index 9c8de0ea5e..8eb7338a93 100644
--- a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx
@@ -168,4 +168,4 @@ const styles = {
         textAlign: 'center',
         lineHeight: 20,
     },
-};
\ No newline at end of file
+};

From 5f35a93150925e33b3a9d214c346543d81a734b0 Mon Sep 17 00:00:00 2001
From: lkuchno <luseeku@gmail.com>
Date: Thu, 9 Apr 2026 11:46:24 +0200
Subject: [PATCH 07/20] merge two screens for dark and light into one start
 screen with mode selection option

---
 .../tests/single-feature-tests/tabs/index.ts  |   4 +-
 .../darkScreen.tsx}                           |  15 +-
 .../index.tsx                                 | 120 +++++++++++++
 .../lightScreen.tsx                           | 160 ++++++++++++++++++
 .../scenario.md                               |   0
 5 files changed, 284 insertions(+), 15 deletions(-)
 rename apps/src/tests/single-feature-tests/tabs/{test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx => test-tabs-tab-bar-experimental-userInterfaceStyle/darkScreen.tsx} (92%)
 create mode 100644 apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/index.tsx
 create mode 100644 apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/lightScreen.tsx
 rename apps/src/tests/single-feature-tests/tabs/{test-tabs-tab-bar-dark-experimental-userInterfaceStyle => test-tabs-tab-bar-experimental-userInterfaceStyle}/scenario.md (100%)

diff --git a/apps/src/tests/single-feature-tests/tabs/index.ts b/apps/src/tests/single-feature-tests/tabs/index.ts
index a320491319..b956253b71 100644
--- a/apps/src/tests/single-feature-tests/tabs/index.ts
+++ b/apps/src/tests/single-feature-tests/tabs/index.ts
@@ -12,7 +12,7 @@ import TestTabsSimpleNav from './test-tabs-simple-nav';
 import TestTabsMoreNavigationController from './test-tabs-more-navigation-controller';
 import TestTabsStaleStateUpdateRejection from './test-tabs-stale-update-rejection';
 import TestTabsTabBarMinimizeBehavior from './test-tabs-tab-bar-minimize-behavior-ios';
-import TestTabsTabBarDarkExperimentalUserInterfaceStyle from './test-tabs-tab-bar-dark-experimental-userInterfaceStyle';
+import TestTabsTabBarExperimentalUserInterfaceStyle from './test-tabs-tab-bar-experimental-userInterfaceStyle';
 
 const scenarios = {
   BottomAccessoryScenario,
@@ -27,7 +27,7 @@ const scenarios = {
   TestTabsMoreNavigationController,
   TestTabsStaleStateUpdateRejection,
   TestTabsTabBarMinimizeBehavior,
-  TestTabsTabBarDarkExperimentalUserInterfaceStyle,
+  TestTabsTabBarExperimentalUserInterfaceStyle,
 };
 
 const TabsScenarioGroup: ScenarioGroup<keyof typeof scenarios> = {
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/darkScreen.tsx
similarity index 92%
rename from apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx
rename to apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/darkScreen.tsx
index 9c8de0ea5e..933f539311 100644
--- a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/index.tsx
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/darkScreen.tsx
@@ -3,8 +3,7 @@ import {
     type TabRouteConfig,
 } from '@apps/shared/gamma/containers/tabs';
 import React from 'react';
-import { Button, View, Text, ScrollView, StyleSheet } from 'react-native';
-import { Scenario } from '@apps/tests/shared/helpers';
+import { Button, View, Text, ScrollView } from 'react-native';
 
 import {
     createNativeStackNavigator,
@@ -24,16 +23,6 @@ type RootStackParamList = {
 
 const Stack = createNativeStackNavigator<RootStackParamList>();
 
-const SCENARIO: Scenario = {
-    name: 'Tab Bar Experimental UIStyle: dark',
-    key: 'test-tabs-tab-bar-dark-experimental-userInterfaceStyle-ios',
-    platforms: ['ios'],
-    AppComponent: App,
-};
-
-export default SCENARIO;
-
-
 function Screen1() {
     const navigation = useNavigation<NavigationProp<RootStackParamList>>();
     return (
@@ -168,4 +157,4 @@ const styles = {
         textAlign: 'center',
         lineHeight: 20,
     },
-};
\ No newline at end of file
+};
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/index.tsx b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/index.tsx
new file mode 100644
index 0000000000..5860808398
--- /dev/null
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/index.tsx
@@ -0,0 +1,120 @@
+import React from 'react';
+import { View, Text, TouchableOpacity, StyleSheet } from 'react-native';
+import { Scenario } from '@apps/tests/shared/helpers';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import { useNavigation, type NavigationProp } from '@react-navigation/native';
+
+import { App as DarkApp } from './darkScreen';
+import { App as LightApp } from './lightScreen';
+
+type RootStackParamList = {
+    Home: undefined;
+    Dark: undefined;
+    Light: undefined;
+};
+
+const Stack = createNativeStackNavigator<RootStackParamList>();
+
+const SCENARIO: Scenario = {
+    name: 'Tab Bar Experimental UIStyle',
+    key: 'test-tabs-tab-bar-experimental-userInterfaceStyle-ios',
+    platforms: ['ios'],
+    AppComponent: App,
+};
+
+export default SCENARIO;
+
+function HomeScreen() {
+    const navigation = useNavigation<NavigationProp<RootStackParamList>>();
+    return (
+        <View style={styles.container}>
+            <Text style={styles.title}>experimental_userInterfaceStyle</Text>
+            <Text style={styles.description}>
+                Select an interface style to preview how the tab bar and navigation bar respond.
+            </Text>
+            <TouchableOpacity
+                style={[styles.button, styles.darkButton]}
+                onPress={() => navigation.navigate('Dark')}
+            >
+                <Text style={styles.darkButtonText}>Dark</Text>
+            </TouchableOpacity>
+            <TouchableOpacity
+                style={[styles.button, styles.lightButton]}
+                onPress={() => navigation.navigate('Light')}
+            >
+                <Text style={styles.lightButtonText}>Light</Text>
+            </TouchableOpacity>
+        </View>
+    );
+}
+
+export function App() {
+    return (
+        <Stack.Navigator>
+            <Stack.Screen
+                name="Home"
+                component={HomeScreen}
+                options={{ headerShown: false }}
+            />
+            <Stack.Screen
+                name="Dark"
+                component={DarkApp}
+                options={{ headerShown: false }}
+            />
+            <Stack.Screen
+                name="Light"
+                component={LightApp}
+                options={{ headerShown: false }}
+            />
+        </Stack.Navigator>
+    );
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+        padding: 40,
+        gap: 16,
+        backgroundColor: 'white',
+    },
+    title: {
+        fontSize: 13,
+        fontWeight: '600',
+        textTransform: 'uppercase',
+        color: '#888',
+        letterSpacing: 0.5,
+        marginBottom: 4,
+    },
+    description: {
+        fontSize: 13,
+        color: '#555',
+        textAlign: 'center',
+        marginBottom: 12,
+    },
+    button: {
+        width: '100%',
+        paddingVertical: 14,
+        borderRadius: 10,
+        alignItems: 'center',
+    },
+    darkButton: {
+        backgroundColor: '#1c1c1e',
+    },
+    darkButtonText: {
+        color: 'white',
+        fontSize: 16,
+        fontWeight: '600',
+    },
+    lightButton: {
+        backgroundColor: '#f2f2f7',
+        borderWidth: StyleSheet.hairlineWidth,
+        borderColor: '#c7c7cc',
+    },
+    lightButtonText: {
+        color: '#1c1c1e',
+        fontSize: 16,
+        fontWeight: '600',
+    },
+});
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/lightScreen.tsx b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/lightScreen.tsx
new file mode 100644
index 0000000000..2f9bfa7365
--- /dev/null
+++ b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/lightScreen.tsx
@@ -0,0 +1,160 @@
+import {
+    TabsContainerWithHostConfigContext,
+    type TabRouteConfig,
+} from '@apps/shared/gamma/containers/tabs';
+import React from 'react';
+import { Button, View, Text, ScrollView, StyleSheet } from 'react-native';
+import Colors from '@apps/shared/styling/Colors';
+import {
+    createNativeStackNavigator,
+} from '@react-navigation/native-stack';
+import {
+    useNavigation,
+    type NavigationProp,
+} from '@react-navigation/native';
+
+type RootStackParamList = {
+    Screen1: undefined;
+    LightScreen: undefined;
+};
+
+const Stack = createNativeStackNavigator<RootStackParamList>();
+
+function Screen1() {
+    const navigation = useNavigation<NavigationProp<RootStackParamList>>();
+    return (
+        <ScrollView style={{ padding: 40 }}>
+            <View>
+
+                <Text style={styles.sectionHeader}>
+                    experimental_userInterfaceStyle
+                </Text>
+                <Text style={styles.description}>
+                    Enable system dark mode and observe the tab bar and back
+                    button on the pushed screen.
+                </Text>
+                <Button
+                    title="Push screen with style: light"
+                    onPress={() => navigation.navigate('LightScreen')}
+                />
+            </View>
+        </ScrollView>
+    );
+}
+
+function LightStyleTabScreen() {
+    return (
+        <View style={styles.centeredLightScreen}>
+            <Text style={styles.screenLabel}>experimental_userInterfaceStyle: light</Text>
+            <Text style={styles.screenHint}>
+                This screen forces light interface style regardless of system setting.
+                Observe the tab bar and navigation bar appearance.
+            </Text>
+        </View>
+    );
+}
+
+const ROUTE_CONFIGS: TabRouteConfig[] = [
+    {
+        name: 'Tab1',
+        Component: LightStyleTabScreen,
+        options: {
+            title: 'Tab1',
+            ios: {
+                icon: {
+                    type: 'sfSymbol',
+                    name: 'house',
+                },
+                experimental_userInterfaceStyle: 'light'
+            },
+        },
+    },
+    {
+        name: 'Tab2',
+        Component: LightStyleTabScreen,
+        options: {
+            title: 'Tab2',
+            ios: {
+                icon: {
+                    type: 'sfSymbol',
+                    name: 'star',
+                },
+                experimental_userInterfaceStyle: 'light'
+            },
+        },
+    },
+];
+
+function LightInterfaceStyleScreen() {
+    return (
+        <TabsContainerWithHostConfigContext
+            routeConfigs={ROUTE_CONFIGS}
+        />
+    );
+}
+
+export function App() {
+    return (
+        <Stack.Navigator>
+            <Stack.Screen
+                name="Screen1"
+                component={Screen1}
+                options={{
+                    headerShown: false,
+                    contentStyle: { backgroundColor: 'white' }
+                }}
+            />
+            <Stack.Screen
+                name="LightScreen"
+                component={LightInterfaceStyleScreen}
+                options={{
+                    title: 'Light Interface Style',
+                    statusBarStyle: "dark",
+                }}
+            />
+        </Stack.Navigator>
+    );
+}
+
+const styles = {
+    sectionHeader: {
+        fontSize: 13,
+        fontWeight: '600' as const,
+        textTransform: 'uppercase' as const,
+        color: '#888',
+        letterSpacing: 0.5,
+        marginTop: 24,
+        marginBottom: 4,
+    },
+    description: {
+        fontSize: 13,
+        color: '#555',
+        marginBottom: 6,
+        marginTop: 12,
+    },
+    scrollItem: {
+        padding: 16,
+        borderBottomWidth: StyleSheet.hairlineWidth,
+        borderBottomColor: '#e0e0e0',
+    },
+    centeredLightScreen: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+        padding: 40,
+        gap: 12,
+        backgroundColor: Colors.cardBackground
+    },
+    screenLabel: {
+        fontSize: 17,
+        fontWeight: '600',
+        textAlign: 'center',
+        color: 'gray'
+    },
+    screenHint: {
+        fontSize: 14,
+        color: '#555',
+        textAlign: 'center',
+        lineHeight: 20,
+    },
+};
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md b/apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/scenario.md
similarity index 100%
rename from apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-dark-experimental-userInterfaceStyle/scenario.md
rename to apps/src/tests/single-feature-tests/tabs/test-tabs-tab-bar-experimental-userInterfaceStyle/scenario.md

From ceb8e5a1cd5759cb51edd59495fea77fe72aefe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Thu, 9 Apr 2026 16:13:49 +0200
Subject: [PATCH 08/20] ThemeProvider introduce

Replace direct useTheme (react-navigation) usage in themed components with useThemeColorPallette hook that supports local overrides via new ThemeProvider. Add text color to ColorPallette type and light/dark palettes. Remove old adapter/react-navigation/useColorPallette in favor of new theme-provider module.

Move ScreensLightTheme and ScreensDarkTheme to Colors.ts as whole adapter/react-navigation directory is deleted.
---
 apps/src/shared/Alert.tsx                     |  2 +-
 apps/src/shared/ThemedText.tsx                |  4 +--
 apps/src/shared/ThemedTextInput.tsx           |  6 ++--
 apps/src/shared/ThemedView.tsx                |  2 +-
 apps/src/shared/styling/Colors.ts             | 36 +++++++++++++++----
 .../styling/adapter/react-navigation/index.ts | 25 -------------
 .../react-navigation/useColorPallette.tsx     | 14 --------
 .../styling/theme-provider/ThemeContext.tsx   |  9 +++++
 .../styling/theme-provider/ThemeProvider.tsx  | 15 ++++++++
 .../theme-provider/useColorPallette.tsx       | 27 ++++++++++++++
 apps/src/tests/IssueTestsScreen.tsx           |  2 +-
 11 files changed, 89 insertions(+), 53 deletions(-)
 delete mode 100644 apps/src/shared/styling/adapter/react-navigation/index.ts
 delete mode 100644 apps/src/shared/styling/adapter/react-navigation/useColorPallette.tsx
 create mode 100644 apps/src/shared/styling/theme-provider/ThemeContext.tsx
 create mode 100644 apps/src/shared/styling/theme-provider/ThemeProvider.tsx
 create mode 100644 apps/src/shared/styling/theme-provider/useColorPallette.tsx

diff --git a/apps/src/shared/Alert.tsx b/apps/src/shared/Alert.tsx
index f2dd9e3e24..ac1bd8581d 100644
--- a/apps/src/shared/Alert.tsx
+++ b/apps/src/shared/Alert.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Text, StyleSheet, Dimensions, View, Pressable } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import useThemeColorPallette from './styling/adapter/react-navigation/useColorPallette';
+import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const Alert = (): React.JSX.Element => {
   const navigation = useNavigation();
diff --git a/apps/src/shared/ThemedText.tsx b/apps/src/shared/ThemedText.tsx
index e67f69bb6e..a631337bb5 100644
--- a/apps/src/shared/ThemedText.tsx
+++ b/apps/src/shared/ThemedText.tsx
@@ -1,9 +1,9 @@
-import { useTheme } from '@react-navigation/native';
 import React from 'react';
 import { Text, TextProps } from 'react-native';
+import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const ThemedText = ({ children, style, ...props }: TextProps) => {
-  const { colors } = useTheme();
+  const { colors } = useThemeColorPallette();
 
   return (
     <Text style={[{ color: colors.text }, style]} {...props}>
diff --git a/apps/src/shared/ThemedTextInput.tsx b/apps/src/shared/ThemedTextInput.tsx
index 9a26dcd165..9c807353e9 100644
--- a/apps/src/shared/ThemedTextInput.tsx
+++ b/apps/src/shared/ThemedTextInput.tsx
@@ -1,13 +1,13 @@
-import { useTheme } from '@react-navigation/native';
 import React from 'react';
 import { TextInput, TextInputProps } from 'react-native';
+import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const ThemedTextInput = ({ style, ...props }: TextInputProps) => {
-  const { colors } = useTheme();
+  const { colors } = useThemeColorPallette();
 
   return (
     <TextInput
-      style={[{ borderColor: colors.border, color: colors.text }, style]}
+      style={[{ borderColor: colors.cardBorder, color: colors.text }, style]}
       {...props}
     />
   );
diff --git a/apps/src/shared/ThemedView.tsx b/apps/src/shared/ThemedView.tsx
index 7f9c1a2b03..95c0e95dea 100644
--- a/apps/src/shared/ThemedView.tsx
+++ b/apps/src/shared/ThemedView.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, ViewProps } from 'react-native';
-import useThemeColorPallette from './styling/adapter/react-navigation/useColorPallette';
+import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const ThemedView = ({ children, style, ...props }: ViewProps) => {
   const { colors } = useThemeColorPallette();
diff --git a/apps/src/shared/styling/Colors.ts b/apps/src/shared/styling/Colors.ts
index 86bae246fc..97528b6efb 100644
--- a/apps/src/shared/styling/Colors.ts
+++ b/apps/src/shared/styling/Colors.ts
@@ -1,4 +1,5 @@
 import { ColorValue } from 'react-native';
+import { DarkTheme, DefaultTheme } from '@react-navigation/native';
 
 export const Palette = {
   NavyLight100: '#001a72',
@@ -97,11 +98,12 @@ export const Palette = {
 } as const;
 
 export type ColorPallette = typeof Palette & {
-  background: ColorValue,
-  offBackground: ColorValue,
-  primary: ColorValue,
-  cardBackground: ColorValue,
-  cardBorder: ColorValue,
+  background: ColorValue;
+  offBackground: ColorValue;
+  primary: ColorValue;
+  text: ColorValue;
+  cardBackground: ColorValue;
+  cardBorder: ColorValue;
 };
 
 export const Colors: ColorPallette = {
@@ -109,6 +111,7 @@ export const Colors: ColorPallette = {
   background: Palette.White,
   offBackground: Palette.OffWhite,
   primary: Palette.NavyLight100,
+  text: Palette.NavyLight100,
   cardBackground: Palette.White,
   cardBorder: Palette.NavyLight20,
 };
@@ -120,10 +123,31 @@ export const DarkColors: ColorPallette = {
   background: Palette.Navy,
   offBackground: Palette.OffNavy,
   primary: Palette.NavyLight10,
+  text: Palette.NavyLight10,
   cardBackground: Palette.Navy,
   cardBorder: Palette.NavyDark60,
 };
 
-export default Colors;
+export const ScreensLightTheme = {
+  ...DefaultTheme,
+  colors: {
+    ...DefaultTheme.colors,
+    primary: LightColors.primary as string,
+    background: LightColors.background as string,
+    card: LightColors.cardBackground as string,
+    border: LightColors.cardBorder as string,
+  },
+};
 
+export const ScreensDarkTheme = {
+  ...DarkTheme,
+  colors: {
+    ...DarkTheme.colors,
+    primary: DarkColors.primary as string,
+    background: DarkColors.background as string,
+    card: DarkColors.cardBackground as string,
+    border: DarkColors.cardBorder as string,
+  },
+};
 
+export default Colors;
diff --git a/apps/src/shared/styling/adapter/react-navigation/index.ts b/apps/src/shared/styling/adapter/react-navigation/index.ts
deleted file mode 100644
index e20ea747b7..0000000000
--- a/apps/src/shared/styling/adapter/react-navigation/index.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { DarkTheme, DefaultTheme } from '@react-navigation/native';
-import { DarkColors, LightColors } from '../../Colors';
-
-export const ScreensLightTheme = {
-  ...DefaultTheme,
-  colors: {
-    ...DefaultTheme.colors,
-    primary: LightColors.primary as string,
-    background: LightColors.background as string,
-    card: LightColors.cardBackground as string,
-    border: LightColors.cardBorder as string,
-  },
-};
-
-export const ScreensDarkTheme = {
-  ...DarkTheme,
-  colors: {
-    ...DarkTheme.colors,
-    primary: DarkColors.primary as string,
-    background: DarkColors.background as string,
-    card: DarkColors.cardBackground as string,
-    border: DarkColors.cardBorder as string,
-  },
-};
-
diff --git a/apps/src/shared/styling/adapter/react-navigation/useColorPallette.tsx b/apps/src/shared/styling/adapter/react-navigation/useColorPallette.tsx
deleted file mode 100644
index 99b3cda325..0000000000
--- a/apps/src/shared/styling/adapter/react-navigation/useColorPallette.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Theme, useTheme } from '@react-navigation/native';
-import { ColorPallette, DarkColors, LightColors } from '../../Colors';
-
-/**
- * Requires `ThemeContext` (from react-navigation) presence.
- * Use this to get whole collor pallete current theme is based on.
- */
-export default function useThemeColorPallette(): { theme: Theme, colors: ColorPallette } {
-  const theme = useTheme();
-  return {
-    theme,
-    colors: theme.dark ? DarkColors : LightColors,
-  };
-}
diff --git a/apps/src/shared/styling/theme-provider/ThemeContext.tsx b/apps/src/shared/styling/theme-provider/ThemeContext.tsx
new file mode 100644
index 0000000000..74c35a237d
--- /dev/null
+++ b/apps/src/shared/styling/theme-provider/ThemeContext.tsx
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+export type ThemeName = 'light' | 'dark';
+
+export const ThemeContext = React.createContext<ThemeName | undefined>(
+  undefined,
+);
+
+ThemeContext.displayName = 'ThemeContext';
diff --git a/apps/src/shared/styling/theme-provider/ThemeProvider.tsx b/apps/src/shared/styling/theme-provider/ThemeProvider.tsx
new file mode 100644
index 0000000000..5270513328
--- /dev/null
+++ b/apps/src/shared/styling/theme-provider/ThemeProvider.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react';
+
+import { ThemeContext } from './ThemeContext';
+import type { ThemeName } from './ThemeContext';
+
+type Props = {
+  theme: ThemeName;
+  children: React.ReactNode;
+};
+
+export function ThemeProvider({ theme, children }: Props) {
+  return (
+    <ThemeContext.Provider value={theme}>{children}</ThemeContext.Provider>
+  );
+}
diff --git a/apps/src/shared/styling/theme-provider/useColorPallette.tsx b/apps/src/shared/styling/theme-provider/useColorPallette.tsx
new file mode 100644
index 0000000000..60e27d4299
--- /dev/null
+++ b/apps/src/shared/styling/theme-provider/useColorPallette.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { ThemeContext } from './ThemeContext';
+import type { ThemeName } from './ThemeContext';
+import { ColorPallette, DarkColors, LightColors } from '../Colors';
+import { useTheme } from '@react-navigation/native';
+
+/**
+ * Requires `ThemeContext` (from react-navigation) presence.
+ * However, it is possible to override theme by wrapping part of the app in `ThemeProvider` and passing desired theme as a prop.
+ * Use this to get whole collor pallete current theme is based on.
+ */
+export default function useThemeColorPallette(): {
+  theme: ThemeName;
+  colors: ColorPallette;
+} {
+  const navigationTheme = useTheme();
+  let theme: ThemeName = navigationTheme.dark ? 'dark' : 'light';
+
+  const providedTheme = React.useContext(ThemeContext);
+  if (providedTheme !== undefined) {
+    theme = providedTheme;
+  }
+  return {
+    theme: theme,
+    colors: theme === 'dark' ? DarkColors : LightColors,
+  };
+}
diff --git a/apps/src/tests/IssueTestsScreen.tsx b/apps/src/tests/IssueTestsScreen.tsx
index f645cf651e..551cd85e71 100644
--- a/apps/src/tests/IssueTestsScreen.tsx
+++ b/apps/src/tests/IssueTestsScreen.tsx
@@ -10,7 +10,7 @@ import { ListItem } from '@apps/shared';
 import {
   ScreensDarkTheme,
   ScreensLightTheme,
-} from '@apps/shared/styling/adapter/react-navigation';
+} from '@apps/shared/styling/Colors';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
 const SCREENS: Record<

From 4584591216aa9e37fbe2f5bb392445391eba8a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Thu, 9 Apr 2026 16:20:03 +0200
Subject: [PATCH 09/20] Example.tsx import fix

---
 apps/Example.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/Example.tsx b/apps/Example.tsx
index d4f2dfe8a3..e5b329578a 100644
--- a/apps/Example.tsx
+++ b/apps/Example.tsx
@@ -33,7 +33,7 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import {
   ScreensDarkTheme,
   ScreensLightTheme,
-} from './src/shared/styling/adapter/react-navigation';
+} from './src/shared/styling/Colors';
 
 import IssueTestsScreen from './src/tests/IssueTestsScreen';
 import SingleFeatureTests from './src/tests/single-feature-tests';

From 42fb29f497262e7cd3ac68be5d13d732eafa9546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Thu, 9 Apr 2026 16:49:32 +0200
Subject: [PATCH 10/20] TestThemeProvider.tsx added

---
 .../tests/issue-tests/TestThemeProvider.tsx   | 47 +++++++++++++++++++
 apps/src/tests/issue-tests/index.ts           |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 apps/src/tests/issue-tests/TestThemeProvider.tsx

diff --git a/apps/src/tests/issue-tests/TestThemeProvider.tsx b/apps/src/tests/issue-tests/TestThemeProvider.tsx
new file mode 100644
index 0000000000..73f2618159
--- /dev/null
+++ b/apps/src/tests/issue-tests/TestThemeProvider.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { StyleSheet } from 'react-native';
+import { ThemedText, ThemedView } from '@apps/shared';
+import { ThemeProvider } from '@apps/shared/styling/theme-provider/ThemeProvider';
+import { SafeAreaView } from 'react-native-safe-area-context';
+
+export default function TestThemeProvider() {
+  return (
+    <SafeAreaView style={styles.container}>
+      <ThemedView style={styles.section}>
+        <ThemedText style={styles.heading}>Without ThemeProvider</ThemedText>
+        <ThemedText>This text uses the theme from parent NavigationContainer.</ThemedText>
+      </ThemedView>
+
+      <ThemeProvider theme="dark">
+        <ThemedView style={styles.section}>
+          <ThemedText style={styles.heading}>With ThemeProvider (dark)</ThemedText>
+          <ThemedText>This text should use dark theme colors (light text, dark background).</ThemedText>
+        </ThemedView>
+      </ThemeProvider>
+
+      <ThemeProvider theme="light">
+        <ThemedView style={styles.section}>
+          <ThemedText style={styles.heading}>With ThemeProvider (light)</ThemedText>
+          <ThemedText>This text should use light theme colors explicitly.</ThemedText>
+        </ThemedView>
+      </ThemeProvider>
+    </SafeAreaView>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    padding: 16,
+    gap: 16,
+  },
+  section: {
+    padding: 16,
+    borderRadius: 8,
+  },
+  heading: {
+    fontSize: 16,
+    fontWeight: 'bold',
+    marginBottom: 8,
+  },
+});
diff --git a/apps/src/tests/issue-tests/index.ts b/apps/src/tests/issue-tests/index.ts
index ddb658f60e..fbe2741214 100644
--- a/apps/src/tests/issue-tests/index.ts
+++ b/apps/src/tests/issue-tests/index.ts
@@ -205,3 +205,4 @@ export { default as TestScreenStack } from './TestScreenStack';
 export { default as TestSplit } from './TestSplit';
 export { default as TestSafeAreaViewIOS } from './TestSafeAreaViewIOS';
 export { default as TestStackNesting } from './TestStackNesting';
+export { default as TestThemeProvider } from './TestThemeProvider';

From fdac2a1e6df0eaa07deb4b0d6636273e490172b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Thu, 9 Apr 2026 17:36:08 +0200
Subject: [PATCH 11/20] update extensions

---
 .../styling/theme-provider/{ThemeContext.tsx => ThemeContext.ts}  | 0
 .../theme-provider/{useColorPallette.tsx => useColorPallette.ts}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename apps/src/shared/styling/theme-provider/{ThemeContext.tsx => ThemeContext.ts} (100%)
 rename apps/src/shared/styling/theme-provider/{useColorPallette.tsx => useColorPallette.ts} (100%)

diff --git a/apps/src/shared/styling/theme-provider/ThemeContext.tsx b/apps/src/shared/styling/theme-provider/ThemeContext.ts
similarity index 100%
rename from apps/src/shared/styling/theme-provider/ThemeContext.tsx
rename to apps/src/shared/styling/theme-provider/ThemeContext.ts
diff --git a/apps/src/shared/styling/theme-provider/useColorPallette.tsx b/apps/src/shared/styling/theme-provider/useColorPallette.ts
similarity index 100%
rename from apps/src/shared/styling/theme-provider/useColorPallette.tsx
rename to apps/src/shared/styling/theme-provider/useColorPallette.ts

From 246e8f97a76384e1b505f17a0b1693ab1796d2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Thu, 9 Apr 2026 16:13:49 +0200
Subject: [PATCH 12/20] ThemeProvider introduce

Replace direct useTheme (react-navigation) usage in themed components with useThemeColorPallette hook that supports local overrides via new ThemeProvider. Add text color to ColorPallette type and light/dark palettes. Remove old adapter/react-navigation/useColorPallette in favor of new theme-provider module.
---
 apps/src/shared/Alert.tsx                     |  2 +-
 apps/src/shared/ThemedText.tsx                |  4 +--
 apps/src/shared/ThemedTextInput.tsx           |  6 ++---
 apps/src/shared/ThemedView.tsx                |  2 +-
 apps/src/shared/styling/Colors.ts             | 15 ++++++-----
 .../react-navigation/useColorPallette.tsx     | 14 ----------
 .../styling/theme-provider/ThemeContext.tsx   |  9 +++++++
 .../styling/theme-provider/ThemeProvider.tsx  | 15 +++++++++++
 .../theme-provider/useColorPallette.tsx       | 27 +++++++++++++++++++
 9 files changed, 66 insertions(+), 28 deletions(-)
 delete mode 100644 apps/src/shared/styling/adapter/react-navigation/useColorPallette.tsx
 create mode 100644 apps/src/shared/styling/theme-provider/ThemeContext.tsx
 create mode 100644 apps/src/shared/styling/theme-provider/ThemeProvider.tsx
 create mode 100644 apps/src/shared/styling/theme-provider/useColorPallette.tsx

diff --git a/apps/src/shared/Alert.tsx b/apps/src/shared/Alert.tsx
index f2dd9e3e24..ac1bd8581d 100644
--- a/apps/src/shared/Alert.tsx
+++ b/apps/src/shared/Alert.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Text, StyleSheet, Dimensions, View, Pressable } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import useThemeColorPallette from './styling/adapter/react-navigation/useColorPallette';
+import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const Alert = (): React.JSX.Element => {
   const navigation = useNavigation();
diff --git a/apps/src/shared/ThemedText.tsx b/apps/src/shared/ThemedText.tsx
index e67f69bb6e..a631337bb5 100644
--- a/apps/src/shared/ThemedText.tsx
+++ b/apps/src/shared/ThemedText.tsx
@@ -1,9 +1,9 @@
-import { useTheme } from '@react-navigation/native';
 import React from 'react';
 import { Text, TextProps } from 'react-native';
+import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const ThemedText = ({ children, style, ...props }: TextProps) => {
-  const { colors } = useTheme();
+  const { colors } = useThemeColorPallette();
 
   return (
     <Text style={[{ color: colors.text }, style]} {...props}>
diff --git a/apps/src/shared/ThemedTextInput.tsx b/apps/src/shared/ThemedTextInput.tsx
index 9a26dcd165..9c807353e9 100644
--- a/apps/src/shared/ThemedTextInput.tsx
+++ b/apps/src/shared/ThemedTextInput.tsx
@@ -1,13 +1,13 @@
-import { useTheme } from '@react-navigation/native';
 import React from 'react';
 import { TextInput, TextInputProps } from 'react-native';
+import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const ThemedTextInput = ({ style, ...props }: TextInputProps) => {
-  const { colors } = useTheme();
+  const { colors } = useThemeColorPallette();
 
   return (
     <TextInput
-      style={[{ borderColor: colors.border, color: colors.text }, style]}
+      style={[{ borderColor: colors.cardBorder, color: colors.text }, style]}
       {...props}
     />
   );
diff --git a/apps/src/shared/ThemedView.tsx b/apps/src/shared/ThemedView.tsx
index 7f9c1a2b03..95c0e95dea 100644
--- a/apps/src/shared/ThemedView.tsx
+++ b/apps/src/shared/ThemedView.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, ViewProps } from 'react-native';
-import useThemeColorPallette from './styling/adapter/react-navigation/useColorPallette';
+import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const ThemedView = ({ children, style, ...props }: ViewProps) => {
   const { colors } = useThemeColorPallette();
diff --git a/apps/src/shared/styling/Colors.ts b/apps/src/shared/styling/Colors.ts
index 86bae246fc..b1d75c4a12 100644
--- a/apps/src/shared/styling/Colors.ts
+++ b/apps/src/shared/styling/Colors.ts
@@ -97,11 +97,12 @@ export const Palette = {
 } as const;
 
 export type ColorPallette = typeof Palette & {
-  background: ColorValue,
-  offBackground: ColorValue,
-  primary: ColorValue,
-  cardBackground: ColorValue,
-  cardBorder: ColorValue,
+  background: ColorValue;
+  offBackground: ColorValue;
+  primary: ColorValue;
+  text: ColorValue;
+  cardBackground: ColorValue;
+  cardBorder: ColorValue;
 };
 
 export const Colors: ColorPallette = {
@@ -109,6 +110,7 @@ export const Colors: ColorPallette = {
   background: Palette.White,
   offBackground: Palette.OffWhite,
   primary: Palette.NavyLight100,
+  text: Palette.NavyLight100,
   cardBackground: Palette.White,
   cardBorder: Palette.NavyLight20,
 };
@@ -120,10 +122,9 @@ export const DarkColors: ColorPallette = {
   background: Palette.Navy,
   offBackground: Palette.OffNavy,
   primary: Palette.NavyLight10,
+  text: Palette.NavyLight10,
   cardBackground: Palette.Navy,
   cardBorder: Palette.NavyDark60,
 };
 
 export default Colors;
-
-
diff --git a/apps/src/shared/styling/adapter/react-navigation/useColorPallette.tsx b/apps/src/shared/styling/adapter/react-navigation/useColorPallette.tsx
deleted file mode 100644
index 99b3cda325..0000000000
--- a/apps/src/shared/styling/adapter/react-navigation/useColorPallette.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Theme, useTheme } from '@react-navigation/native';
-import { ColorPallette, DarkColors, LightColors } from '../../Colors';
-
-/**
- * Requires `ThemeContext` (from react-navigation) presence.
- * Use this to get whole collor pallete current theme is based on.
- */
-export default function useThemeColorPallette(): { theme: Theme, colors: ColorPallette } {
-  const theme = useTheme();
-  return {
-    theme,
-    colors: theme.dark ? DarkColors : LightColors,
-  };
-}
diff --git a/apps/src/shared/styling/theme-provider/ThemeContext.tsx b/apps/src/shared/styling/theme-provider/ThemeContext.tsx
new file mode 100644
index 0000000000..74c35a237d
--- /dev/null
+++ b/apps/src/shared/styling/theme-provider/ThemeContext.tsx
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+export type ThemeName = 'light' | 'dark';
+
+export const ThemeContext = React.createContext<ThemeName | undefined>(
+  undefined,
+);
+
+ThemeContext.displayName = 'ThemeContext';
diff --git a/apps/src/shared/styling/theme-provider/ThemeProvider.tsx b/apps/src/shared/styling/theme-provider/ThemeProvider.tsx
new file mode 100644
index 0000000000..5270513328
--- /dev/null
+++ b/apps/src/shared/styling/theme-provider/ThemeProvider.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react';
+
+import { ThemeContext } from './ThemeContext';
+import type { ThemeName } from './ThemeContext';
+
+type Props = {
+  theme: ThemeName;
+  children: React.ReactNode;
+};
+
+export function ThemeProvider({ theme, children }: Props) {
+  return (
+    <ThemeContext.Provider value={theme}>{children}</ThemeContext.Provider>
+  );
+}
diff --git a/apps/src/shared/styling/theme-provider/useColorPallette.tsx b/apps/src/shared/styling/theme-provider/useColorPallette.tsx
new file mode 100644
index 0000000000..60e27d4299
--- /dev/null
+++ b/apps/src/shared/styling/theme-provider/useColorPallette.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { ThemeContext } from './ThemeContext';
+import type { ThemeName } from './ThemeContext';
+import { ColorPallette, DarkColors, LightColors } from '../Colors';
+import { useTheme } from '@react-navigation/native';
+
+/**
+ * Requires `ThemeContext` (from react-navigation) presence.
+ * However, it is possible to override theme by wrapping part of the app in `ThemeProvider` and passing desired theme as a prop.
+ * Use this to get whole collor pallete current theme is based on.
+ */
+export default function useThemeColorPallette(): {
+  theme: ThemeName;
+  colors: ColorPallette;
+} {
+  const navigationTheme = useTheme();
+  let theme: ThemeName = navigationTheme.dark ? 'dark' : 'light';
+
+  const providedTheme = React.useContext(ThemeContext);
+  if (providedTheme !== undefined) {
+    theme = providedTheme;
+  }
+  return {
+    theme: theme,
+    colors: theme === 'dark' ? DarkColors : LightColors,
+  };
+}

From 796fb05714f046fa40dc6c6cfafcc7a749d96546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Thu, 9 Apr 2026 16:49:32 +0200
Subject: [PATCH 13/20] TestThemeProvider.tsx added

---
 .../tests/issue-tests/TestThemeProvider.tsx   | 47 +++++++++++++++++++
 apps/src/tests/issue-tests/index.ts           |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 apps/src/tests/issue-tests/TestThemeProvider.tsx

diff --git a/apps/src/tests/issue-tests/TestThemeProvider.tsx b/apps/src/tests/issue-tests/TestThemeProvider.tsx
new file mode 100644
index 0000000000..73f2618159
--- /dev/null
+++ b/apps/src/tests/issue-tests/TestThemeProvider.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { StyleSheet } from 'react-native';
+import { ThemedText, ThemedView } from '@apps/shared';
+import { ThemeProvider } from '@apps/shared/styling/theme-provider/ThemeProvider';
+import { SafeAreaView } from 'react-native-safe-area-context';
+
+export default function TestThemeProvider() {
+  return (
+    <SafeAreaView style={styles.container}>
+      <ThemedView style={styles.section}>
+        <ThemedText style={styles.heading}>Without ThemeProvider</ThemedText>
+        <ThemedText>This text uses the theme from parent NavigationContainer.</ThemedText>
+      </ThemedView>
+
+      <ThemeProvider theme="dark">
+        <ThemedView style={styles.section}>
+          <ThemedText style={styles.heading}>With ThemeProvider (dark)</ThemedText>
+          <ThemedText>This text should use dark theme colors (light text, dark background).</ThemedText>
+        </ThemedView>
+      </ThemeProvider>
+
+      <ThemeProvider theme="light">
+        <ThemedView style={styles.section}>
+          <ThemedText style={styles.heading}>With ThemeProvider (light)</ThemedText>
+          <ThemedText>This text should use light theme colors explicitly.</ThemedText>
+        </ThemedView>
+      </ThemeProvider>
+    </SafeAreaView>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    padding: 16,
+    gap: 16,
+  },
+  section: {
+    padding: 16,
+    borderRadius: 8,
+  },
+  heading: {
+    fontSize: 16,
+    fontWeight: 'bold',
+    marginBottom: 8,
+  },
+});
diff --git a/apps/src/tests/issue-tests/index.ts b/apps/src/tests/issue-tests/index.ts
index ddb658f60e..fbe2741214 100644
--- a/apps/src/tests/issue-tests/index.ts
+++ b/apps/src/tests/issue-tests/index.ts
@@ -205,3 +205,4 @@ export { default as TestScreenStack } from './TestScreenStack';
 export { default as TestSplit } from './TestSplit';
 export { default as TestSafeAreaViewIOS } from './TestSafeAreaViewIOS';
 export { default as TestStackNesting } from './TestStackNesting';
+export { default as TestThemeProvider } from './TestThemeProvider';

From 082d082c7751a1162e2e96bc9b8b910263dae094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Thu, 9 Apr 2026 17:36:08 +0200
Subject: [PATCH 14/20] update extensions

---
 .../styling/theme-provider/{ThemeContext.tsx => ThemeContext.ts}  | 0
 .../theme-provider/{useColorPallette.tsx => useColorPallette.ts}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename apps/src/shared/styling/theme-provider/{ThemeContext.tsx => ThemeContext.ts} (100%)
 rename apps/src/shared/styling/theme-provider/{useColorPallette.tsx => useColorPallette.ts} (100%)

diff --git a/apps/src/shared/styling/theme-provider/ThemeContext.tsx b/apps/src/shared/styling/theme-provider/ThemeContext.ts
similarity index 100%
rename from apps/src/shared/styling/theme-provider/ThemeContext.tsx
rename to apps/src/shared/styling/theme-provider/ThemeContext.ts
diff --git a/apps/src/shared/styling/theme-provider/useColorPallette.tsx b/apps/src/shared/styling/theme-provider/useColorPallette.ts
similarity index 100%
rename from apps/src/shared/styling/theme-provider/useColorPallette.tsx
rename to apps/src/shared/styling/theme-provider/useColorPallette.ts

From 972d1fcd48a93bc43ae3d97c81f0c6c0d2cf9fec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Fri, 10 Apr 2026 13:07:27 +0200
Subject: [PATCH 15/20] module rename to 'theme', delete
 'TestThemeProvider.tsx'

---
 apps/src/shared/Alert.tsx                     |  2 +-
 apps/src/shared/ThemedText.tsx                |  2 +-
 apps/src/shared/ThemedTextInput.tsx           |  2 +-
 apps/src/shared/ThemedView.tsx                |  2 +-
 .../{theme-provider => theme}/ThemeContext.ts |  0
 .../ThemeProvider.tsx                         |  0
 .../useColorPallette.ts                       |  0
 .../tests/issue-tests/TestThemeProvider.tsx   | 47 -------------------
 apps/src/tests/issue-tests/index.ts           |  1 -
 9 files changed, 4 insertions(+), 52 deletions(-)
 rename apps/src/shared/styling/{theme-provider => theme}/ThemeContext.ts (100%)
 rename apps/src/shared/styling/{theme-provider => theme}/ThemeProvider.tsx (100%)
 rename apps/src/shared/styling/{theme-provider => theme}/useColorPallette.ts (100%)
 delete mode 100644 apps/src/tests/issue-tests/TestThemeProvider.tsx

diff --git a/apps/src/shared/Alert.tsx b/apps/src/shared/Alert.tsx
index ac1bd8581d..15e864dbe3 100644
--- a/apps/src/shared/Alert.tsx
+++ b/apps/src/shared/Alert.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Text, StyleSheet, Dimensions, View, Pressable } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import useThemeColorPallette from './styling/theme-provider/useColorPallette';
+import useThemeColorPallette from './styling/theme/useColorPallette';
 
 export const Alert = (): React.JSX.Element => {
   const navigation = useNavigation();
diff --git a/apps/src/shared/ThemedText.tsx b/apps/src/shared/ThemedText.tsx
index a631337bb5..796af8419d 100644
--- a/apps/src/shared/ThemedText.tsx
+++ b/apps/src/shared/ThemedText.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Text, TextProps } from 'react-native';
-import useThemeColorPallette from './styling/theme-provider/useColorPallette';
+import useThemeColorPallette from './styling/theme/useColorPallette';
 
 export const ThemedText = ({ children, style, ...props }: TextProps) => {
   const { colors } = useThemeColorPallette();
diff --git a/apps/src/shared/ThemedTextInput.tsx b/apps/src/shared/ThemedTextInput.tsx
index 9c807353e9..3c30e4a307 100644
--- a/apps/src/shared/ThemedTextInput.tsx
+++ b/apps/src/shared/ThemedTextInput.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { TextInput, TextInputProps } from 'react-native';
-import useThemeColorPallette from './styling/theme-provider/useColorPallette';
+import useThemeColorPallette from './styling/theme/useColorPallette';
 
 export const ThemedTextInput = ({ style, ...props }: TextInputProps) => {
   const { colors } = useThemeColorPallette();
diff --git a/apps/src/shared/ThemedView.tsx b/apps/src/shared/ThemedView.tsx
index 95c0e95dea..a404abf1d6 100644
--- a/apps/src/shared/ThemedView.tsx
+++ b/apps/src/shared/ThemedView.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, ViewProps } from 'react-native';
-import useThemeColorPallette from './styling/theme-provider/useColorPallette';
+import useThemeColorPallette from './styling/theme/useColorPallette';
 
 export const ThemedView = ({ children, style, ...props }: ViewProps) => {
   const { colors } = useThemeColorPallette();
diff --git a/apps/src/shared/styling/theme-provider/ThemeContext.ts b/apps/src/shared/styling/theme/ThemeContext.ts
similarity index 100%
rename from apps/src/shared/styling/theme-provider/ThemeContext.ts
rename to apps/src/shared/styling/theme/ThemeContext.ts
diff --git a/apps/src/shared/styling/theme-provider/ThemeProvider.tsx b/apps/src/shared/styling/theme/ThemeProvider.tsx
similarity index 100%
rename from apps/src/shared/styling/theme-provider/ThemeProvider.tsx
rename to apps/src/shared/styling/theme/ThemeProvider.tsx
diff --git a/apps/src/shared/styling/theme-provider/useColorPallette.ts b/apps/src/shared/styling/theme/useColorPallette.ts
similarity index 100%
rename from apps/src/shared/styling/theme-provider/useColorPallette.ts
rename to apps/src/shared/styling/theme/useColorPallette.ts
diff --git a/apps/src/tests/issue-tests/TestThemeProvider.tsx b/apps/src/tests/issue-tests/TestThemeProvider.tsx
deleted file mode 100644
index 73f2618159..0000000000
--- a/apps/src/tests/issue-tests/TestThemeProvider.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import { StyleSheet } from 'react-native';
-import { ThemedText, ThemedView } from '@apps/shared';
-import { ThemeProvider } from '@apps/shared/styling/theme-provider/ThemeProvider';
-import { SafeAreaView } from 'react-native-safe-area-context';
-
-export default function TestThemeProvider() {
-  return (
-    <SafeAreaView style={styles.container}>
-      <ThemedView style={styles.section}>
-        <ThemedText style={styles.heading}>Without ThemeProvider</ThemedText>
-        <ThemedText>This text uses the theme from parent NavigationContainer.</ThemedText>
-      </ThemedView>
-
-      <ThemeProvider theme="dark">
-        <ThemedView style={styles.section}>
-          <ThemedText style={styles.heading}>With ThemeProvider (dark)</ThemedText>
-          <ThemedText>This text should use dark theme colors (light text, dark background).</ThemedText>
-        </ThemedView>
-      </ThemeProvider>
-
-      <ThemeProvider theme="light">
-        <ThemedView style={styles.section}>
-          <ThemedText style={styles.heading}>With ThemeProvider (light)</ThemedText>
-          <ThemedText>This text should use light theme colors explicitly.</ThemedText>
-        </ThemedView>
-      </ThemeProvider>
-    </SafeAreaView>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    padding: 16,
-    gap: 16,
-  },
-  section: {
-    padding: 16,
-    borderRadius: 8,
-  },
-  heading: {
-    fontSize: 16,
-    fontWeight: 'bold',
-    marginBottom: 8,
-  },
-});
diff --git a/apps/src/tests/issue-tests/index.ts b/apps/src/tests/issue-tests/index.ts
index fbe2741214..ddb658f60e 100644
--- a/apps/src/tests/issue-tests/index.ts
+++ b/apps/src/tests/issue-tests/index.ts
@@ -205,4 +205,3 @@ export { default as TestScreenStack } from './TestScreenStack';
 export { default as TestSplit } from './TestSplit';
 export { default as TestSafeAreaViewIOS } from './TestSafeAreaViewIOS';
 export { default as TestStackNesting } from './TestStackNesting';
-export { default as TestThemeProvider } from './TestThemeProvider';

From 4646e5902c3106aff911c30faa3dfc9325d771d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Fri, 10 Apr 2026 14:33:01 +0200
Subject: [PATCH 16/20] add useReactNavigationTheme

it returns theme based on useTheme
if useTheme throws an error, it is caught, a proper message is logged and DefaultTheme is returned
---
 .../styling/adapter/react-navigation/index.ts   |  1 +
 .../react-navigation/useReactNavigationTheme.ts | 13 +++++++++++++
 .../shared/styling/theme/useColorPallette.ts    | 17 +++++++++--------
 3 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts

diff --git a/apps/src/shared/styling/adapter/react-navigation/index.ts b/apps/src/shared/styling/adapter/react-navigation/index.ts
index e20ea747b7..812cad931c 100644
--- a/apps/src/shared/styling/adapter/react-navigation/index.ts
+++ b/apps/src/shared/styling/adapter/react-navigation/index.ts
@@ -23,3 +23,4 @@ export const ScreensDarkTheme = {
   },
 };
 
+export { useReactNavigationTheme } from './useReactNavigationTheme';
diff --git a/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts b/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
new file mode 100644
index 0000000000..721b2b96e2
--- /dev/null
+++ b/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
@@ -0,0 +1,13 @@
+import { useTheme, DefaultTheme } from '@react-navigation/native';
+
+export function useReactNavigationTheme() {
+  try {
+    const theme = useTheme();
+    return theme;
+  } catch (error) {
+    console.log(
+      "useReactNavigationTheme: Couldn't find a React Navigation theme. Returning default theme.",
+    );
+  }
+  return DefaultTheme;
+}
diff --git a/apps/src/shared/styling/theme/useColorPallette.ts b/apps/src/shared/styling/theme/useColorPallette.ts
index 60e27d4299..2eb103efe6 100644
--- a/apps/src/shared/styling/theme/useColorPallette.ts
+++ b/apps/src/shared/styling/theme/useColorPallette.ts
@@ -2,26 +2,27 @@ import * as React from 'react';
 import { ThemeContext } from './ThemeContext';
 import type { ThemeName } from './ThemeContext';
 import { ColorPallette, DarkColors, LightColors } from '../Colors';
-import { useTheme } from '@react-navigation/native';
+import { useReactNavigationTheme } from '../adapter/react-navigation';
 
 /**
- * Requires `ThemeContext` (from react-navigation) presence.
- * However, it is possible to override theme by wrapping part of the app in `ThemeProvider` and passing desired theme as a prop.
+ * Get the current theme from the context. If there is no theme provided, get it from React Navigation theme.
  * Use this to get whole collor pallete current theme is based on.
  */
 export default function useThemeColorPallette(): {
   theme: ThemeName;
   colors: ColorPallette;
 } {
-  const navigationTheme = useTheme();
-  let theme: ThemeName = navigationTheme.dark ? 'dark' : 'light';
+  const navigationTheme = useReactNavigationTheme();
 
   const providedTheme = React.useContext(ThemeContext);
   if (providedTheme !== undefined) {
-    theme = providedTheme;
+    return {
+      theme: providedTheme,
+      colors: providedTheme === 'dark' ? DarkColors : LightColors,
+    };
   }
   return {
-    theme: theme,
-    colors: theme === 'dark' ? DarkColors : LightColors,
+    theme: navigationTheme.dark ? 'dark' : 'light',
+    colors: navigationTheme.dark ? DarkColors : LightColors,
   };
 }

From e41bfe92e345e176561fd262e138a595a7d2e76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Fri, 10 Apr 2026 14:37:46 +0200
Subject: [PATCH 17/20] log message in useReactNavigationTheme update

---
 .../adapter/react-navigation/useReactNavigationTheme.ts       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts b/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
index 721b2b96e2..1cedc52487 100644
--- a/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
+++ b/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
@@ -5,9 +5,7 @@ export function useReactNavigationTheme() {
     const theme = useTheme();
     return theme;
   } catch (error) {
-    console.log(
-      "useReactNavigationTheme: Couldn't find a React Navigation theme. Returning default theme.",
-    );
+    console.log('Returning default theme from useReactNavigationTheme');
   }
   return DefaultTheme;
 }

From 4ba07d9049cf2a68a00005e5cbfe66ee5f420dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Fri, 10 Apr 2026 15:22:49 +0200
Subject: [PATCH 18/20] pass full theme objects as context payload instead of
 theme name only, fix misspelling (pallette -> palette)

also added LightTheme and DarkTheme and Theme type to Colors.ts, also moved ThemeName into this file
useReactNavigation theme now returns undefined when useTheme throws an error
if both useTheme and ThemeProvider don't provide us a theme, then  useThemeColorPalette returns LightTheme as a default
---
 apps/src/shared/Alert.tsx                     |  4 +--
 apps/src/shared/ThemedText.tsx                |  4 +--
 apps/src/shared/ThemedTextInput.tsx           |  4 +--
 apps/src/shared/ThemedView.tsx                |  4 +--
 apps/src/shared/styling/Colors.ts             | 25 ++++++++++++++---
 .../useReactNavigationTheme.ts                |  9 +++---
 apps/src/shared/styling/theme/ThemeContext.ts |  6 ++--
 .../shared/styling/theme/ThemeProvider.tsx    |  6 ++--
 .../shared/styling/theme/useColorPalette.ts   | 25 +++++++++++++++++
 .../shared/styling/theme/useColorPallette.ts  | 28 -------------------
 10 files changed, 65 insertions(+), 50 deletions(-)
 create mode 100644 apps/src/shared/styling/theme/useColorPalette.ts
 delete mode 100644 apps/src/shared/styling/theme/useColorPallette.ts

diff --git a/apps/src/shared/Alert.tsx b/apps/src/shared/Alert.tsx
index 15e864dbe3..795d7ca58b 100644
--- a/apps/src/shared/Alert.tsx
+++ b/apps/src/shared/Alert.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { Text, StyleSheet, Dimensions, View, Pressable } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import useThemeColorPallette from './styling/theme/useColorPallette';
+import useThemeColorPalette from './styling/theme/useColorPalette';
 
 export const Alert = (): React.JSX.Element => {
   const navigation = useNavigation();
-  const { colors } = useThemeColorPallette();
+  const { colors } = useThemeColorPalette();
 
   const backgrounds = [
     colors.BlueLight80,
diff --git a/apps/src/shared/ThemedText.tsx b/apps/src/shared/ThemedText.tsx
index 796af8419d..db9ef5f606 100644
--- a/apps/src/shared/ThemedText.tsx
+++ b/apps/src/shared/ThemedText.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { Text, TextProps } from 'react-native';
-import useThemeColorPallette from './styling/theme/useColorPallette';
+import useThemeColorPalette from './styling/theme/useColorPalette';
 
 export const ThemedText = ({ children, style, ...props }: TextProps) => {
-  const { colors } = useThemeColorPallette();
+  const { colors } = useThemeColorPalette();
 
   return (
     <Text style={[{ color: colors.text }, style]} {...props}>
diff --git a/apps/src/shared/ThemedTextInput.tsx b/apps/src/shared/ThemedTextInput.tsx
index 3c30e4a307..77b5ca2a2b 100644
--- a/apps/src/shared/ThemedTextInput.tsx
+++ b/apps/src/shared/ThemedTextInput.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { TextInput, TextInputProps } from 'react-native';
-import useThemeColorPallette from './styling/theme/useColorPallette';
+import useThemeColorPalette from './styling/theme/useColorPalette';
 
 export const ThemedTextInput = ({ style, ...props }: TextInputProps) => {
-  const { colors } = useThemeColorPallette();
+  const { colors } = useThemeColorPalette();
 
   return (
     <TextInput
diff --git a/apps/src/shared/ThemedView.tsx b/apps/src/shared/ThemedView.tsx
index a404abf1d6..e81776966a 100644
--- a/apps/src/shared/ThemedView.tsx
+++ b/apps/src/shared/ThemedView.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { View, ViewProps } from 'react-native';
-import useThemeColorPallette from './styling/theme/useColorPallette';
+import useThemeColorPalette from './styling/theme/useColorPalette';
 
 export const ThemedView = ({ children, style, ...props }: ViewProps) => {
-  const { colors } = useThemeColorPallette();
+  const { colors } = useThemeColorPalette();
   return (
     <View style={[{ backgroundColor: colors.offBackground }, style]} {...props}>
       {children}
diff --git a/apps/src/shared/styling/Colors.ts b/apps/src/shared/styling/Colors.ts
index b1d75c4a12..5dd7531b5c 100644
--- a/apps/src/shared/styling/Colors.ts
+++ b/apps/src/shared/styling/Colors.ts
@@ -96,7 +96,7 @@ export const Palette = {
   Navy: '#232736',
 } as const;
 
-export type ColorPallette = typeof Palette & {
+export type ColorPalette = typeof Palette & {
   background: ColorValue;
   offBackground: ColorValue;
   primary: ColorValue;
@@ -105,7 +105,7 @@ export type ColorPallette = typeof Palette & {
   cardBorder: ColorValue;
 };
 
-export const Colors: ColorPallette = {
+export const Colors: ColorPalette = {
   ...Palette,
   background: Palette.White,
   offBackground: Palette.OffWhite,
@@ -115,9 +115,9 @@ export const Colors: ColorPallette = {
   cardBorder: Palette.NavyLight20,
 };
 
-export const LightColors: ColorPallette = Colors;
+export const LightColors: ColorPalette = Colors;
 
-export const DarkColors: ColorPallette = {
+export const DarkColors: ColorPalette = {
   ...Palette,
   background: Palette.Navy,
   offBackground: Palette.OffNavy,
@@ -127,4 +127,21 @@ export const DarkColors: ColorPallette = {
   cardBorder: Palette.NavyDark60,
 };
 
+export type ThemeName = 'light' | 'dark';
+
+export type Theme = {
+  theme: ThemeName;
+  colors: ColorPalette;
+};
+
+export const LightTheme: Theme = {
+  theme: 'light',
+  colors: LightColors,
+};
+
+export const DarkTheme: Theme = {
+  theme: 'dark',
+  colors: DarkColors,
+};
+
 export default Colors;
diff --git a/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts b/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
index 1cedc52487..fdf5e3a9b2 100644
--- a/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
+++ b/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
@@ -1,11 +1,12 @@
-import { useTheme, DefaultTheme } from '@react-navigation/native';
+import { useTheme } from '@react-navigation/native';
+import { DarkTheme, LightTheme } from '../../Colors';
 
 export function useReactNavigationTheme() {
   try {
     const theme = useTheme();
-    return theme;
+    return theme.dark ? DarkTheme : LightTheme;
   } catch (error) {
-    console.log('Returning default theme from useReactNavigationTheme');
+    console.log('Returning undefined from useReactNavigationTheme');
   }
-  return DefaultTheme;
+  return undefined;
 }
diff --git a/apps/src/shared/styling/theme/ThemeContext.ts b/apps/src/shared/styling/theme/ThemeContext.ts
index 74c35a237d..79f1cf0554 100644
--- a/apps/src/shared/styling/theme/ThemeContext.ts
+++ b/apps/src/shared/styling/theme/ThemeContext.ts
@@ -1,9 +1,7 @@
 import * as React from 'react';
 
-export type ThemeName = 'light' | 'dark';
+import { Theme } from '../Colors';
 
-export const ThemeContext = React.createContext<ThemeName | undefined>(
-  undefined,
-);
+export const ThemeContext = React.createContext<Theme | undefined>(undefined);
 
 ThemeContext.displayName = 'ThemeContext';
diff --git a/apps/src/shared/styling/theme/ThemeProvider.tsx b/apps/src/shared/styling/theme/ThemeProvider.tsx
index 5270513328..a6f83c61b2 100644
--- a/apps/src/shared/styling/theme/ThemeProvider.tsx
+++ b/apps/src/shared/styling/theme/ThemeProvider.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react';
 
 import { ThemeContext } from './ThemeContext';
-import type { ThemeName } from './ThemeContext';
+import { LightTheme, DarkTheme } from '../Colors';
+import type { ThemeName } from '../Colors';
 
 type Props = {
   theme: ThemeName;
@@ -9,7 +10,8 @@ type Props = {
 };
 
 export function ThemeProvider({ theme, children }: Props) {
+  const value = theme === 'light' ? LightTheme : DarkTheme;
   return (
-    <ThemeContext.Provider value={theme}>{children}</ThemeContext.Provider>
+    <ThemeContext.Provider value={value}>{children}</ThemeContext.Provider>
   );
 }
diff --git a/apps/src/shared/styling/theme/useColorPalette.ts b/apps/src/shared/styling/theme/useColorPalette.ts
new file mode 100644
index 0000000000..545e15e18b
--- /dev/null
+++ b/apps/src/shared/styling/theme/useColorPalette.ts
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import { ThemeContext } from './ThemeContext';
+import { ColorPalette, LightTheme, ThemeName } from '../Colors';
+import { useReactNavigationTheme } from '../adapter/react-navigation';
+
+/**
+ * Get the current theme from the context. If there is no theme provided, get it from React Navigation theme.
+ * If there is no theme provided by React Navigation, return the light theme as default.
+ * Use this to get whole color palette current theme is based on.
+ */
+export default function useThemeColorPalette(): {
+  theme: ThemeName;
+  colors: ColorPalette;
+} {
+  const providedTheme = React.useContext(ThemeContext);
+  const navigationTheme = useReactNavigationTheme();
+
+  if (providedTheme !== undefined) {
+    return providedTheme;
+  }
+  if (navigationTheme !== undefined) {
+    return navigationTheme;
+  }
+  return LightTheme;
+}
diff --git a/apps/src/shared/styling/theme/useColorPallette.ts b/apps/src/shared/styling/theme/useColorPallette.ts
deleted file mode 100644
index 2eb103efe6..0000000000
--- a/apps/src/shared/styling/theme/useColorPallette.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import * as React from 'react';
-import { ThemeContext } from './ThemeContext';
-import type { ThemeName } from './ThemeContext';
-import { ColorPallette, DarkColors, LightColors } from '../Colors';
-import { useReactNavigationTheme } from '../adapter/react-navigation';
-
-/**
- * Get the current theme from the context. If there is no theme provided, get it from React Navigation theme.
- * Use this to get whole collor pallete current theme is based on.
- */
-export default function useThemeColorPallette(): {
-  theme: ThemeName;
-  colors: ColorPallette;
-} {
-  const navigationTheme = useReactNavigationTheme();
-
-  const providedTheme = React.useContext(ThemeContext);
-  if (providedTheme !== undefined) {
-    return {
-      theme: providedTheme,
-      colors: providedTheme === 'dark' ? DarkColors : LightColors,
-    };
-  }
-  return {
-    theme: navigationTheme.dark ? 'dark' : 'light',
-    colors: navigationTheme.dark ? DarkColors : LightColors,
-  };
-}

From 5b37ce96b46eaa7017e357187bc76996f95f3b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Gaczo=C5=82?= <szymon.gaczol@swmansion.com>
Date: Fri, 10 Apr 2026 16:43:58 +0200
Subject: [PATCH 19/20] useTheme no longer called in useReactNavigationTheme

useReactNavigationTheme works similar to useTheme though, but instead of throwing error when theme is null, it returns undefined
---
 .../react-navigation/useReactNavigationTheme.ts      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts b/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
index fdf5e3a9b2..3002a90d88 100644
--- a/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
+++ b/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
@@ -1,12 +1,12 @@
-import { useTheme } from '@react-navigation/native';
+import * as React from 'react';
+import { ThemeContext } from '@react-navigation/core';
 import { DarkTheme, LightTheme } from '../../Colors';
 
 export function useReactNavigationTheme() {
-  try {
-    const theme = useTheme();
-    return theme.dark ? DarkTheme : LightTheme;
-  } catch (error) {
+  const theme = React.useContext(ThemeContext);
+  if (theme == null) {
     console.log('Returning undefined from useReactNavigationTheme');
+    return undefined;
   }
-  return undefined;
+  return theme.dark ? DarkTheme : LightTheme;
 }

From f444cb7084a5fd758784c60e00c48ff48357d6de Mon Sep 17 00:00:00 2001
From: lkuchno <luseeku@gmail.com>
Date: Mon, 13 Apr 2026 15:28:42 +0200
Subject: [PATCH 20/20] Revert "Merge branch '@sgaczol/theme-provider' of
 github.com:software-mansion/react-native-screens into
 @lkuchno/test-tabs-dark-experimental-userInterfaceStyle"

This reverts commit cfff0ad26a81f44e1a18611f0dab47aaf1c7c38f, reversing
changes made to da31816c67518dee74d5515cf5288f1747c56d8a.
---
 .../gamma/tabs/container/TabsContainer.kt     |   6 -
 .../tabs/container/TabsContainerDelegate.kt   |  13 -
 .../rnscreens/gamma/tabs/host/TabsHost.kt     |   7 -
 .../gamma/tabs/host/TabsHostEventEmitter.kt   |  19 --
 .../gamma/tabs/host/TabsHostViewManager.kt    |   2 -
 .../TabsHostTabSelectionPreventedEvent.kt     |  47 ---
 .../rnscreens/gamma/tabs/screen/TabsScreen.kt |   2 -
 .../gamma/tabs/screen/TabsScreenFragment.kt   |   1 -
 .../tabs/screen/TabsScreenViewManager.kt      |   7 -
 apps/src/shared/Alert.tsx                     |   4 +-
 apps/src/shared/ThemedText.tsx                |   7 -
 apps/src/shared/ThemedTextInput.tsx           |   7 -
 apps/src/shared/ThemedView.tsx                |   6 +-
 apps/src/shared/styling/Colors.ts             |  28 +-
 .../styling/adapter/react-navigation/index.ts |  26 --
 .../useReactNavigationTheme.ts                |  12 -
 apps/src/shared/styling/theme/ThemeContext.ts |   7 -
 .../shared/styling/theme/ThemeProvider.tsx    |  17 --
 .../shared/styling/theme/useColorPalette.ts   |  25 --
 .../tests/single-feature-tests/tabs/index.ts  |   2 -
 .../test-tabs-prevent-native-selection.tsx    | 124 --------
 ios/tabs/host/RNSTabBarController.mm          | 288 ++----------------
 ios/tabs/host/RNSTabsHostComponentView.h      |   4 -
 ios/tabs/host/RNSTabsHostComponentView.mm     |  16 -
 ios/tabs/host/RNSTabsHostEventEmitter.h       |  11 -
 ios/tabs/host/RNSTabsHostEventEmitter.mm      |  14 -
 ios/tabs/screen/RNSTabsScreenComponentView.h  |   2 -
 ios/tabs/screen/RNSTabsScreenComponentView.mm |   4 -
 ios/tabs/screen/RNSTabsScreenViewController.h |  10 +-
 .../screen/RNSTabsScreenViewController.mm     |  23 +-
 src/components/tabs/host/TabsHost.types.ts    |  24 --
 .../tabs/screen/TabsScreen.types.ts           |   8 -
 .../tabs/TabsHostAndroidNativeComponent.ts    |   7 -
 src/fabric/tabs/TabsHostIOSNativeComponent.ts |   7 -
 .../tabs/TabsScreenAndroidNativeComponent.ts  |   1 -
 .../tabs/TabsScreenIOSNativeComponent.ts      |   1 -
 36 files changed, 41 insertions(+), 748 deletions(-)
 delete mode 100644 android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/event/TabsHostTabSelectionPreventedEvent.kt
 delete mode 100644 apps/src/shared/styling/adapter/react-navigation/index.ts
 delete mode 100644 apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
 delete mode 100644 apps/src/shared/styling/theme/ThemeContext.ts
 delete mode 100644 apps/src/shared/styling/theme/ThemeProvider.tsx
 delete mode 100644 apps/src/shared/styling/theme/useColorPalette.ts
 delete mode 100644 apps/src/tests/single-feature-tests/tabs/test-tabs-prevent-native-selection.tsx

diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
index 3d2913f325..1a96320231 100644
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainer.kt
@@ -361,12 +361,6 @@ internal class TabsContainer(
 
         val isRepeated = nextSelectedFragment === currSelectedFragment
 
-        // If this is user action we test whether it should be prevented before we progress the state.
-        if (!isRepeated && !isInExternalOperationContext && nextSelectedFragment.isPreventNativeSelectionEnabled) {
-            delegate.onNavStateUpdatePrevented(navState, nextSelectedFragment.requireScreenKey)
-            return false
-        }
-
         val stateChanged = updateSelectedFragment(nextSelectedFragment)
 
         val hasTriggeredSpecialEffect =
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainerDelegate.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainerDelegate.kt
index a1974440e1..ef8e617a6b 100644
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainerDelegate.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsContainerDelegate.kt
@@ -32,17 +32,4 @@ internal interface TabsContainerDelegate {
         rejectedNavState: TabsNavState,
         reason: TabsNavStateUpdateRejectionReason,
     )
-
-    /**
-     * Called when a native user action (tap) attempts to select a tab that has
-     * [com.swmansion.rnscreens.gamma.tabs.screen.TabsScreen.preventNativeSelection] enabled.
-     * The navigation state remains unchanged.
-     *
-     * @param currentNavState The currently active navigation state that was kept.
-     * @param preventedScreenKey The screen key of the tab whose selection was prevented.
-     */
-    fun onNavStateUpdatePrevented(
-        currentNavState: TabsNavState,
-        preventedScreenKey: String,
-    )
 }
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHost.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHost.kt
index c7f3dc545f..ad3b6a2f22 100644
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHost.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHost.kt
@@ -182,13 +182,6 @@ class TabsHost(
         )
     }
 
-    override fun onNavStateUpdatePrevented(
-        currentNavState: TabsNavState,
-        preventedScreenKey: String,
-    ) {
-        eventEmitter.emitOnTabSelectionPreventedEvent(currentNavState, preventedScreenKey)
-    }
-
     override fun didMountItems(uiManager: UIManager) {
         container.performContainerUpdateIfNeeded()
     }
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHostEventEmitter.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHostEventEmitter.kt
index e971268e8e..229df14bba 100644
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHostEventEmitter.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHostEventEmitter.kt
@@ -5,7 +5,6 @@ import com.swmansion.rnscreens.gamma.common.event.BaseEventEmitter
 import com.swmansion.rnscreens.gamma.tabs.container.TabsNavState
 import com.swmansion.rnscreens.gamma.tabs.container.TabsNavStateUpdateRejectionReason
 import com.swmansion.rnscreens.gamma.tabs.host.event.TabsHostTabSelectedEvent
-import com.swmansion.rnscreens.gamma.tabs.host.event.TabsHostTabSelectionPreventedEvent
 import com.swmansion.rnscreens.gamma.tabs.host.event.TabsHostTabSelectionRejectedEvent
 
 internal class TabsHostEventEmitter(
@@ -54,22 +53,4 @@ internal class TabsHostEventEmitter(
             ),
         )
     }
-
-    /**
-     * Emits `onTabSelectionPrevented` event to JS when a tab selection is prevented
-     * because the target screen has `preventNativeSelection` enabled.
-     */
-    fun emitOnTabSelectionPreventedEvent(
-        currentNavState: TabsNavState,
-        preventedScreenKey: String,
-    ) {
-        reactEventDispatcher.dispatchEvent(
-            TabsHostTabSelectionPreventedEvent(
-                surfaceId,
-                viewTag,
-                currentNavState,
-                preventedScreenKey,
-            ),
-        )
-    }
 }
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHostViewManager.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHostViewManager.kt
index 5b81f7ee8c..59a5701ddb 100644
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHostViewManager.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/TabsHostViewManager.kt
@@ -13,7 +13,6 @@ import com.swmansion.rnscreens.gamma.common.colorscheme.ColorScheme
 import com.swmansion.rnscreens.gamma.helpers.makeEventRegistrationInfo
 import com.swmansion.rnscreens.gamma.tabs.container.TabsNavState
 import com.swmansion.rnscreens.gamma.tabs.host.event.TabsHostTabSelectedEvent
-import com.swmansion.rnscreens.gamma.tabs.host.event.TabsHostTabSelectionPreventedEvent
 import com.swmansion.rnscreens.gamma.tabs.host.event.TabsHostTabSelectionRejectedEvent
 import com.swmansion.rnscreens.gamma.tabs.screen.TabsScreen
 
@@ -60,7 +59,6 @@ class TabsHostViewManager :
     override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
         mutableMapOf(
             makeEventRegistrationInfo(TabsHostTabSelectedEvent),
-            makeEventRegistrationInfo(TabsHostTabSelectionPreventedEvent),
             makeEventRegistrationInfo(TabsHostTabSelectionRejectedEvent),
         )
 
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/event/TabsHostTabSelectionPreventedEvent.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/event/TabsHostTabSelectionPreventedEvent.kt
deleted file mode 100644
index b65ac57136..0000000000
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/host/event/TabsHostTabSelectionPreventedEvent.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.swmansion.rnscreens.gamma.tabs.host.event
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.uimanager.events.Event
-import com.swmansion.rnscreens.gamma.common.event.NamingAwareEventType
-import com.swmansion.rnscreens.gamma.tabs.container.TabsNavState
-
-/**
- * React Native event dispatched to JS when a tab selection is prevented because the target
- * screen has `preventNativeSelection` enabled.
- *
- * This event is never coalesced — every prevention is delivered individually.
- */
-class TabsHostTabSelectionPreventedEvent(
-    surfaceId: Int,
-    viewId: Int,
-    val currentNavState: TabsNavState,
-    val preventedScreenKey: String,
-) : Event<TabsHostTabSelectionPreventedEvent>(surfaceId, viewId),
-    NamingAwareEventType {
-    override fun getEventName() = EVENT_NAME
-
-    override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
-
-    override fun canCoalesce(): Boolean = false
-
-    override fun getEventData(): WritableMap? =
-        Arguments.createMap().apply {
-            putString(EK_SELECTED_KEY, currentNavState.selectedKey)
-            putInt(EK_PROVENANCE, currentNavState.provenance)
-            putString(EK_PREVENTED_KEY, preventedScreenKey)
-        }
-
-    companion object : NamingAwareEventType {
-        const val EVENT_NAME = "topTabSelectionPrevented"
-        const val EVENT_REGISTRATION_NAME = "onTabSelectionPrevented"
-
-        private const val EK_SELECTED_KEY = "selectedScreenKey"
-        private const val EK_PROVENANCE = "provenance"
-        private const val EK_PREVENTED_KEY = "preventedScreenKey"
-
-        override fun getEventName() = EVENT_NAME
-
-        override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
-    }
-}
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreen.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreen.kt
index 24d107f6fe..646c1fa34d 100644
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreen.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreen.kt
@@ -94,8 +94,6 @@ class TabsScreen(
     var shouldUseRepeatedTabSelectionScrollToTopSpecialEffect: Boolean = true
     var shouldUseRepeatedTabSelectionPopToRootSpecialEffect: Boolean = true
 
-    var preventNativeSelection: Boolean = false
-
     private fun <T> updateMenuItemAttributesIfNeeded(
         oldValue: T,
         newValue: T,
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreenFragment.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreenFragment.kt
index ee0a07ce85..6d70800492 100644
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreenFragment.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreenFragment.kt
@@ -11,7 +11,6 @@ class TabsScreenFragment(
     internal val tabsScreen: TabsScreen,
 ) : Fragment() {
     internal val requireScreenKey: String by tabsScreen::requireScreenKey
-    internal val isPreventNativeSelectionEnabled: Boolean by tabsScreen::preventNativeSelection
 
     override fun onCreateView(
         inflater: LayoutInflater,
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreenViewManager.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreenViewManager.kt
index 73ea07790a..02fd4788e2 100644
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreenViewManager.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/screen/TabsScreenViewManager.kt
@@ -97,13 +97,6 @@ class TabsScreenViewManager :
         view.shouldUseRepeatedTabSelectionScrollToTopSpecialEffect = scrollToTop
     }
 
-    override fun setPreventNativeSelection(
-        view: TabsScreen,
-        value: Boolean,
-    ) {
-        view.preventNativeSelection = value
-    }
-
     override fun setTabBarItemTestID(
         view: TabsScreen,
         value: String?,
diff --git a/apps/src/shared/Alert.tsx b/apps/src/shared/Alert.tsx
index 795d7ca58b..ac1bd8581d 100644
--- a/apps/src/shared/Alert.tsx
+++ b/apps/src/shared/Alert.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { Text, StyleSheet, Dimensions, View, Pressable } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import useThemeColorPalette from './styling/theme/useColorPalette';
+import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const Alert = (): React.JSX.Element => {
   const navigation = useNavigation();
-  const { colors } = useThemeColorPalette();
+  const { colors } = useThemeColorPallette();
 
   const backgrounds = [
     colors.BlueLight80,
diff --git a/apps/src/shared/ThemedText.tsx b/apps/src/shared/ThemedText.tsx
index c2afae8f72..a631337bb5 100644
--- a/apps/src/shared/ThemedText.tsx
+++ b/apps/src/shared/ThemedText.tsx
@@ -1,16 +1,9 @@
 import React from 'react';
 import { Text, TextProps } from 'react-native';
-<<<<<<< HEAD
 import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const ThemedText = ({ children, style, ...props }: TextProps) => {
   const { colors } = useThemeColorPallette();
-=======
-import useThemeColorPalette from './styling/theme/useColorPalette';
-
-export const ThemedText = ({ children, style, ...props }: TextProps) => {
-  const { colors } = useThemeColorPalette();
->>>>>>> 5b37ce96b46eaa7017e357187bc76996f95f3b96
 
   return (
     <Text style={[{ color: colors.text }, style]} {...props}>
diff --git a/apps/src/shared/ThemedTextInput.tsx b/apps/src/shared/ThemedTextInput.tsx
index bd736a8460..9c807353e9 100644
--- a/apps/src/shared/ThemedTextInput.tsx
+++ b/apps/src/shared/ThemedTextInput.tsx
@@ -1,16 +1,9 @@
 import React from 'react';
 import { TextInput, TextInputProps } from 'react-native';
-<<<<<<< HEAD
 import useThemeColorPallette from './styling/theme-provider/useColorPallette';
 
 export const ThemedTextInput = ({ style, ...props }: TextInputProps) => {
   const { colors } = useThemeColorPallette();
-=======
-import useThemeColorPalette from './styling/theme/useColorPalette';
-
-export const ThemedTextInput = ({ style, ...props }: TextInputProps) => {
-  const { colors } = useThemeColorPalette();
->>>>>>> 5b37ce96b46eaa7017e357187bc76996f95f3b96
 
   return (
     <TextInput
diff --git a/apps/src/shared/ThemedView.tsx b/apps/src/shared/ThemedView.tsx
index e0f1508b57..95c0e95dea 100644
--- a/apps/src/shared/ThemedView.tsx
+++ b/apps/src/shared/ThemedView.tsx
@@ -1,13 +1,9 @@
 import React from 'react';
 import { View, ViewProps } from 'react-native';
-<<<<<<< HEAD
 import useThemeColorPallette from './styling/theme-provider/useColorPallette';
-=======
-import useThemeColorPalette from './styling/theme/useColorPalette';
->>>>>>> 5b37ce96b46eaa7017e357187bc76996f95f3b96
 
 export const ThemedView = ({ children, style, ...props }: ViewProps) => {
-  const { colors } = useThemeColorPalette();
+  const { colors } = useThemeColorPallette();
   return (
     <View style={[{ backgroundColor: colors.offBackground }, style]} {...props}>
       {children}
diff --git a/apps/src/shared/styling/Colors.ts b/apps/src/shared/styling/Colors.ts
index 0748be7891..97528b6efb 100644
--- a/apps/src/shared/styling/Colors.ts
+++ b/apps/src/shared/styling/Colors.ts
@@ -97,11 +97,7 @@ export const Palette = {
   Navy: '#232736',
 } as const;
 
-<<<<<<< HEAD
 export type ColorPallette = typeof Palette & {
-=======
-export type ColorPalette = typeof Palette & {
->>>>>>> 5b37ce96b46eaa7017e357187bc76996f95f3b96
   background: ColorValue;
   offBackground: ColorValue;
   primary: ColorValue;
@@ -110,7 +106,7 @@ export type ColorPalette = typeof Palette & {
   cardBorder: ColorValue;
 };
 
-export const Colors: ColorPalette = {
+export const Colors: ColorPallette = {
   ...Palette,
   background: Palette.White,
   offBackground: Palette.OffWhite,
@@ -120,9 +116,9 @@ export const Colors: ColorPalette = {
   cardBorder: Palette.NavyLight20,
 };
 
-export const LightColors: ColorPalette = Colors;
+export const LightColors: ColorPallette = Colors;
 
-export const DarkColors: ColorPalette = {
+export const DarkColors: ColorPallette = {
   ...Palette,
   background: Palette.Navy,
   offBackground: Palette.OffNavy,
@@ -132,7 +128,6 @@ export const DarkColors: ColorPalette = {
   cardBorder: Palette.NavyDark60,
 };
 
-<<<<<<< HEAD
 export const ScreensLightTheme = {
   ...DefaultTheme,
   colors: {
@@ -153,23 +148,6 @@ export const ScreensDarkTheme = {
     card: DarkColors.cardBackground as string,
     border: DarkColors.cardBorder as string,
   },
-=======
-export type ThemeName = 'light' | 'dark';
-
-export type Theme = {
-  theme: ThemeName;
-  colors: ColorPalette;
-};
-
-export const LightTheme: Theme = {
-  theme: 'light',
-  colors: LightColors,
-};
-
-export const DarkTheme: Theme = {
-  theme: 'dark',
-  colors: DarkColors,
->>>>>>> 5b37ce96b46eaa7017e357187bc76996f95f3b96
 };
 
 export default Colors;
diff --git a/apps/src/shared/styling/adapter/react-navigation/index.ts b/apps/src/shared/styling/adapter/react-navigation/index.ts
deleted file mode 100644
index 812cad931c..0000000000
--- a/apps/src/shared/styling/adapter/react-navigation/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { DarkTheme, DefaultTheme } from '@react-navigation/native';
-import { DarkColors, LightColors } from '../../Colors';
-
-export const ScreensLightTheme = {
-  ...DefaultTheme,
-  colors: {
-    ...DefaultTheme.colors,
-    primary: LightColors.primary as string,
-    background: LightColors.background as string,
-    card: LightColors.cardBackground as string,
-    border: LightColors.cardBorder as string,
-  },
-};
-
-export const ScreensDarkTheme = {
-  ...DarkTheme,
-  colors: {
-    ...DarkTheme.colors,
-    primary: DarkColors.primary as string,
-    background: DarkColors.background as string,
-    card: DarkColors.cardBackground as string,
-    border: DarkColors.cardBorder as string,
-  },
-};
-
-export { useReactNavigationTheme } from './useReactNavigationTheme';
diff --git a/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts b/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
deleted file mode 100644
index 3002a90d88..0000000000
--- a/apps/src/shared/styling/adapter/react-navigation/useReactNavigationTheme.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import * as React from 'react';
-import { ThemeContext } from '@react-navigation/core';
-import { DarkTheme, LightTheme } from '../../Colors';
-
-export function useReactNavigationTheme() {
-  const theme = React.useContext(ThemeContext);
-  if (theme == null) {
-    console.log('Returning undefined from useReactNavigationTheme');
-    return undefined;
-  }
-  return theme.dark ? DarkTheme : LightTheme;
-}
diff --git a/apps/src/shared/styling/theme/ThemeContext.ts b/apps/src/shared/styling/theme/ThemeContext.ts
deleted file mode 100644
index 79f1cf0554..0000000000
--- a/apps/src/shared/styling/theme/ThemeContext.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import * as React from 'react';
-
-import { Theme } from '../Colors';
-
-export const ThemeContext = React.createContext<Theme | undefined>(undefined);
-
-ThemeContext.displayName = 'ThemeContext';
diff --git a/apps/src/shared/styling/theme/ThemeProvider.tsx b/apps/src/shared/styling/theme/ThemeProvider.tsx
deleted file mode 100644
index a6f83c61b2..0000000000
--- a/apps/src/shared/styling/theme/ThemeProvider.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import * as React from 'react';
-
-import { ThemeContext } from './ThemeContext';
-import { LightTheme, DarkTheme } from '../Colors';
-import type { ThemeName } from '../Colors';
-
-type Props = {
-  theme: ThemeName;
-  children: React.ReactNode;
-};
-
-export function ThemeProvider({ theme, children }: Props) {
-  const value = theme === 'light' ? LightTheme : DarkTheme;
-  return (
-    <ThemeContext.Provider value={value}>{children}</ThemeContext.Provider>
-  );
-}
diff --git a/apps/src/shared/styling/theme/useColorPalette.ts b/apps/src/shared/styling/theme/useColorPalette.ts
deleted file mode 100644
index 545e15e18b..0000000000
--- a/apps/src/shared/styling/theme/useColorPalette.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import * as React from 'react';
-import { ThemeContext } from './ThemeContext';
-import { ColorPalette, LightTheme, ThemeName } from '../Colors';
-import { useReactNavigationTheme } from '../adapter/react-navigation';
-
-/**
- * Get the current theme from the context. If there is no theme provided, get it from React Navigation theme.
- * If there is no theme provided by React Navigation, return the light theme as default.
- * Use this to get whole color palette current theme is based on.
- */
-export default function useThemeColorPalette(): {
-  theme: ThemeName;
-  colors: ColorPalette;
-} {
-  const providedTheme = React.useContext(ThemeContext);
-  const navigationTheme = useReactNavigationTheme();
-
-  if (providedTheme !== undefined) {
-    return providedTheme;
-  }
-  if (navigationTheme !== undefined) {
-    return navigationTheme;
-  }
-  return LightTheme;
-}
diff --git a/apps/src/tests/single-feature-tests/tabs/index.ts b/apps/src/tests/single-feature-tests/tabs/index.ts
index ab9cc58871..bcac76e01e 100644
--- a/apps/src/tests/single-feature-tests/tabs/index.ts
+++ b/apps/src/tests/single-feature-tests/tabs/index.ts
@@ -10,7 +10,6 @@ import TestTabsTabBarLayoutDirection from './test-tabs-tab-bar-layout-direction'
 import TestTabsIMEInsets from './test-tabs-ime-insets';
 import TestTabsSimpleNav from './test-tabs-simple-nav';
 import TestTabsMoreNavigationController from './test-tabs-more-navigation-controller';
-import TestTabsPreventNativeSelection from './test-tabs-prevent-native-selection';
 import TestTabsStaleStateUpdateRejection from './test-tabs-stale-update-rejection';
 import TestTabsTabBarMinimizeBehavior from './test-tabs-tab-bar-minimize-behavior-ios';
 import TestTabsTabBarControllerMode from './test-tabs-tab-bar-controller-mode-ios';
@@ -27,7 +26,6 @@ const scenarios = {
   TestTabsIMEInsets,
   TestTabsSimpleNav,
   TestTabsMoreNavigationController,
-  TestTabsPreventNativeSelection,
   TestTabsStaleStateUpdateRejection,
   TestTabsTabBarMinimizeBehavior,
   TestTabsTabBarControllerMode,
diff --git a/apps/src/tests/single-feature-tests/tabs/test-tabs-prevent-native-selection.tsx b/apps/src/tests/single-feature-tests/tabs/test-tabs-prevent-native-selection.tsx
deleted file mode 100644
index 846487779d..0000000000
--- a/apps/src/tests/single-feature-tests/tabs/test-tabs-prevent-native-selection.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import React from 'react';
-import type { Scenario } from '../../shared/helpers';
-import { Button, Text, View } from 'react-native';
-import {
-  type TabRouteConfig,
-  DEFAULT_TAB_ROUTE_OPTIONS,
-  useTabsNavigationContext,
-  TabsContainerWithHostConfigContext,
-} from '../../../shared/gamma/containers/tabs';
-import { CenteredLayoutView } from '../../../shared/CenteredLayoutView';
-import { ToastProvider, useToast } from '../../../shared/';
-import Colors from '../../../shared/styling/Colors';
-
-const SCENARIO: Scenario = {
-  name: 'Prevent native selection',
-  key: 'test-tabs-prevent-native-selection',
-  details: 'Test preventNativeSelection prop on TabsScreen',
-  platforms: ['android', 'ios'],
-  AppComponent: App,
-};
-
-export default SCENARIO;
-
-function ContentView() {
-  const nav = useTabsNavigationContext();
-
-  const preventNativeSelection =
-    nav.routeOptions.preventNativeSelection ?? false;
-
-  return (
-    <CenteredLayoutView>
-      <Text style={{ fontWeight: 'bold', textAlign: 'center' }}>
-        {nav.routeKey}
-      </Text>
-      <Text style={{ textAlign: 'center' }}>
-        preventNativeSelection: {JSON.stringify(preventNativeSelection)}
-      </Text>
-      <Button
-        title="Toggle preventNativeSelection"
-        onPress={() =>
-          nav.setRouteOptions(nav.routeKey, {
-            preventNativeSelection: !preventNativeSelection,
-          })
-        }
-      />
-      <TabsNavigationButtons />
-    </CenteredLayoutView>
-  );
-}
-
-function TabsNavigationButtons() {
-  const nav = useTabsNavigationContext();
-
-  return (
-    <View>
-      <Button title="Select First" onPress={() => nav.selectTab('First')} />
-      <Button title="Select Second" onPress={() => nav.selectTab('Second')} />
-      <Button title="Select Third" onPress={() => nav.selectTab('Third')} />
-      <Button title="Select Fourth" onPress={() => nav.selectTab('Fourth')} />
-      <Button title="Select Fifth" onPress={() => nav.selectTab('Fifth')} />
-      <Button title="Select Sixth" onPress={() => nav.selectTab('Sixth')} />
-    </View>
-  );
-}
-
-const ROUTE_CONFIGS: TabRouteConfig[] = [
-  {
-    name: 'First',
-    Component: ContentView,
-    options: { ...DEFAULT_TAB_ROUTE_OPTIONS, title: 'First' },
-  },
-  {
-    name: 'Second',
-    Component: ContentView,
-    options: { ...DEFAULT_TAB_ROUTE_OPTIONS, title: 'Second' },
-  },
-  {
-    name: 'Third',
-    Component: ContentView,
-    options: { ...DEFAULT_TAB_ROUTE_OPTIONS, title: 'Third' },
-  },
-  {
-    name: 'Fourth',
-    Component: ContentView,
-    options: { ...DEFAULT_TAB_ROUTE_OPTIONS, title: 'Fourth' },
-  },
-  {
-    name: 'Fifth',
-    Component: ContentView,
-    options: { ...DEFAULT_TAB_ROUTE_OPTIONS, title: 'Fifth' },
-  },
-  {
-    name: 'Sixth',
-    Component: ContentView,
-    options: { ...DEFAULT_TAB_ROUTE_OPTIONS, title: 'Sixth' },
-  },
-];
-
-export function App() {
-  return (
-    <ToastProvider>
-      <AppContents />
-    </ToastProvider>
-  );
-}
-
-function AppContents() {
-  const toast = useToast();
-
-  return (
-    <TabsContainerWithHostConfigContext
-      routeConfigs={ROUTE_CONFIGS}
-      onTabSelectionPrevented={event => {
-        const message = `onTabSelectionPrevented: ${event.nativeEvent.preventedScreenKey}`;
-        console.warn(message);
-        toast.push({
-          message: message,
-          backgroundColor: Colors.GreenLight60,
-        });
-      }}
-    />
-  );
-}
-
diff --git a/ios/tabs/host/RNSTabBarController.mm b/ios/tabs/host/RNSTabBarController.mm
index b582494fa3..0eb1c5b050 100644
--- a/ios/tabs/host/RNSTabBarController.mm
+++ b/ios/tabs/host/RNSTabBarController.mm
@@ -1,8 +1,6 @@
 #import "RNSTabBarController.h"
 #import <React/RCTAssert.h>
 #import <React/RCTLog.h>
-#import <objc/message.h>
-#import <objc/runtime.h>
 #import "NSString+RNSUtility.h"
 #import "RNSLog.h"
 #import "RNSScreenWindowTraits.h"
@@ -14,52 +12,13 @@
  */
 static NSString *const kMoreNavigationControllerScreenKey = @"rnscreens_moreNavigationController";
 
-// We need UINavigationControllerDelegate to handle navigation within `moreNavigationController`
-@interface RNSTabBarController () <UITabBarControllerDelegate, UINavigationControllerDelegate>
+@interface RNSTabBarController () <UITabBarControllerDelegate>
 @end
 
-@interface RNSTabBarController ()
-
-/// Consulted by the ISA-swizzled `pushViewController:animated:` on `moreNavigationController`
-/// to decide whether a push should proceed.
-- (BOOL)moreNavigationController:(UINavigationController *)navigationController
-        shouldPushViewController:(UIViewController *)viewController;
-
+// We need this to handle navigation within `moreNavigationController`
+@interface RNSTabBarController () <UINavigationControllerDelegate>
 @end
 
-#if RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-/**
- * Replacement implementation for `pushViewController:animated:` injected into
- * a dynamic subclass of `UIMoreNavigationController` via ISA-swizzle.
- *
- * Before allowing the push, this function consults the owning `RNSTabBarController`
- * (reached via UIKit's `tabBarController` property on the parent chain)
- * to check whether the push should be prevented (e.g. due to `preventNativeSelection`).
- */
-static void
-rns_pushViewController(__unsafe_unretained id self, SEL _cmd, UIViewController *viewController, BOOL animated)
-{
-  UITabBarController *rawTabBarController = static_cast<UIViewController *>(self).tabBarController;
-
-  RCTAssert(
-      [rawTabBarController isKindOfClass:RNSTabBarController.class],
-      @"[RNScreens] Expected tabBarController to be of class %@, got: %@",
-      RNSTabBarController.class,
-      rawTabBarController.class);
-  RNSTabBarController *tabBarController = static_cast<RNSTabBarController *>(rawTabBarController);
-
-  if ([tabBarController moreNavigationController:self shouldPushViewController:viewController]) {
-    struct objc_super superInfo = {
-        .receiver = self,
-        .super_class = class_getSuperclass(object_getClass(self)),
-    };
-    const auto msgSendSuperPushViewController =
-        reinterpret_cast<void (*)(struct objc_super *, SEL, UIViewController *, BOOL)>(objc_msgSendSuper);
-    msgSendSuperPushViewController(&superInfo, _cmd, viewController, animated);
-  }
-}
-#endif // RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-
 @implementation RNSTabBarController {
   NSArray<RNSTabsScreenViewController *> *_Nullable _tabScreenControllers;
 
@@ -264,8 +223,7 @@ - (void)userDidSelectViewController:(nonnull UIViewController *)viewController
   [self updateNavigationStateOnModelUpdate];
 
   if ([self isSelectedViewControllerTheMoreNavigationController]) {
-    [self disableNavigationBarInMoreNavigationController];
-    [self prepareForMoreNavigationControllerHandlingIfNeeded];
+    [self setupMoreNavigationControllerDelegateIfNeeded];
   }
 
   auto *updateContext = [[RNSTabsNavigationStateUpdateContext alloc] initWithNavState:_navigationState
@@ -275,22 +233,6 @@ - (void)userDidSelectViewController:(nonnull UIViewController *)viewController
   [self.tabsHostComponentView tabBarController:self didUpdateStateTo:_navigationState withContext:updateContext];
 }
 
-- (void)onDidPreventUserFromSelectingViewControllerWithKey:(nonnull NSString *)screenKey
-{
-  [self.tabsHostComponentView tabBarController:self preventedSelectionOf:screenKey currentState:_navigationState];
-}
-
-- (BOOL)shouldPreventNativeTabSelection:(nonnull UIViewController *)nextViewController
-{
-  if (![nextViewController isKindOfClass:RNSTabsScreenViewController.class]) {
-    // Allow for more view controller selection
-    return NO;
-  }
-
-  auto *screenViewController = static_cast<RNSTabsScreenViewController *>(nextViewController);
-  return screenViewController.isPreventNativeSelectionEnabled;
-}
-
 #pragma mark - UITabBarControllerDelegate
 
 // These methods are not called on programatic selection!
@@ -323,36 +265,7 @@ - (BOOL)tabBarController:(UITabBarController *)tabBarController
     return NO;
   }
 
-  // This handles the tabsHostComponentView nullability
-  // TODO: This if is likely to be removed, since we want to roll back the support
-  // for "controlled mode", at least initially.
-  if ([self.tabsHostComponentView experimental_controlNavigationStateInJS]) {
-    return NO;
-  }
-
-  BOOL shouldPreventTabSelection = [self shouldPreventNativeTabSelection:viewController];
-
-  if (shouldPreventTabSelection) {
-    // Ideally we'd call this AFTER we prevent, but there is no appropriate callback.
-    // As long as we emit the event asynchronously this is rather fine.
-    [self onDidPreventUserFromSelectingViewControllerWithKey:[self screenKeyForViewController:viewController]];
-    return NO;
-  }
-
-  // If we're gonna allow navigation to `moreNavigationController`, then we need to ensure
-  // that on top of its stack there is no controller with preventNativeSelection enabled.
-  // In such case, we want to pop to root.
-  // We do it here, because in `tabBarController:didSelectViewController:` we won't receive
-  // `moreNavigationController` in case there is already a tab pushed on the stack.
-  if ([self isViewControllerTheMoreNavigationController:viewController]) {
-    auto *poppedViewController = [self popToRootInMoreNavigationControllerRespectSelectionPrevention:YES animated:NO];
-    if (poppedViewController != nil) {
-      // We actually popped something -> let's notify JS realm of this fact.
-      [self onDidPreventUserFromSelectingViewControllerWithKey:[self screenKeyForViewController:poppedViewController]];
-    }
-  }
-
-  return YES;
+  return ![self shouldPreventNativeTabSelection];
 }
 
 - (void)tabBarController:(UITabBarController *)tabBarController
@@ -368,6 +281,10 @@ - (void)tabBarController:(UITabBarController *)tabBarController
       @"[RNScreens] Unexpected type of controller: %@",
       viewController.class);
 
+  if (isNextViewControllerMoreNavigationController) {
+    [self disableNavigationBarInMoreNavigationController];
+  }
+
   [self userDidSelectViewController:viewController];
 }
 
@@ -390,6 +307,12 @@ - (void)navigationController:(UINavigationController *)navigationController
 #endif // RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
 }
 
+- (BOOL)shouldPreventNativeTabSelection
+{
+  // This handles the tabsHostComponentView nullability
+  return [self.tabsHostComponentView experimental_controlNavigationStateInJS] ?: NO;
+}
+
 #pragma mark - Signals related
 
 - (void)updateChildViewControllersIfNeeded
@@ -511,13 +434,13 @@ - (void)updateSelectedViewControllerInner
 
     // Animate only if we're currently in context of more view controller.
     BOOL shouldAnimate = [self isMoreNavigationControllerTabBarItemSelected];
-    [self popToRootInMoreNavigationControllerRespectSelectionPrevention:NO animated:shouldAnimate];
+    [self popToRootInMoreNavigationControllerIfNeededAnimated:shouldAnimate];
 
     // Also disable the header - we don't control it, but it impacts the layout
     // in ways Yoga is not aware of. The simplest option here is to disable it.
     [self disableNavigationBarInMoreNavigationController];
 
-    [self prepareForMoreNavigationControllerHandlingIfNeeded];
+    [self setupMoreNavigationControllerDelegateIfNeeded];
   }
 
   RNSLog(@"Change selected view controller to: %@", nextSelectedViewControllerKey);
@@ -617,28 +540,23 @@ - (RNSTabsScreenViewController *)selectedScreenViewController
   return static_cast<RNSTabsScreenViewController *>(self.selectedViewController);
 }
 
-- (nonnull NSString *)screenKeyForViewController:(nonnull UIViewController *)viewController
+- (nonnull NSString *)screenKeyForSelectedViewController
 {
-  if ([self isViewControllerTheMoreNavigationController:viewController]) {
+  if ([self isSelectedViewControllerTheMoreNavigationController]) {
     return kMoreNavigationControllerScreenKey;
   }
 
   RCTAssert(
-      [viewController isKindOfClass:RNSTabsScreenViewController.class],
+      [self.selectedViewController isKindOfClass:RNSTabsScreenViewController.class],
       @"[RNScreens] Expected selected view controller to be of class %@, got: %@",
       RNSTabsScreenViewController.class,
-      viewController.class);
+      self.selectedViewController.class);
 
-  auto *screenKey = static_cast<RNSTabsScreenViewController *>(viewController).getScreenKeyOrNull;
+  auto *screenKey = static_cast<RNSTabsScreenViewController *>(self.selectedViewController).getScreenKeyOrNull;
   RCTAssert(screenKey != nil, @"[RNScreens] screenKey MUST NOT be nil");
   return screenKey;
 }
 
-- (nonnull NSString *)screenKeyForSelectedViewController
-{
-  return [self screenKeyForViewController:self.selectedViewController];
-}
-
 /**
  * This function assumes that the source of the state is NOT user. In current model, user update is never stale.
  */
@@ -675,20 +593,15 @@ - (BOOL)isMoreNavigationControllerScreenKey:(nullable NSString *)screenKey
   return [screenKey isEqualToString:kMoreNavigationControllerScreenKey];
 }
 
-- (BOOL)isViewControllerTheMoreNavigationController:(nonnull UIViewController *)viewController
+- (BOOL)isSelectedViewControllerTheMoreNavigationController
 {
 #if RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-  return [self canHaveMoreNavigationController] && viewController == self.moreNavigationController;
+  return [self canHaveMoreNavigationController] && self.selectedViewController == self.moreNavigationController;
 #else
   return NO;
 #endif // RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
 }
 
-- (BOOL)isSelectedViewControllerTheMoreNavigationController
-{
-  return [self isViewControllerTheMoreNavigationController:self.selectedViewController];
-}
-
 - (BOOL)isMoreNavigationControllerRequestedByOperation:(nullable RNSTabsNavigationState *)navState
 {
   if (navState == nil) {
@@ -720,174 +633,29 @@ - (BOOL)isMoreNavigationControllerTabBarItemSelected
 - (void)disableNavigationBarInMoreNavigationController
 {
 #if RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-  if (!self.moreNavigationController.navigationBar.isHidden) {
-    [self.moreNavigationController setNavigationBarHidden:YES animated:NO];
-  }
+  [self.moreNavigationController setNavigationBarHidden:YES animated:NO];
 #endif // RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
 }
 
-- (nullable UIViewController *)popToRootInMoreNavigationControllerRespectSelectionPrevention:
-                                   (BOOL)shouldRespectSelectionPrevention
-                                                                                    animated:(BOOL)shouldAnimate
+- (void)popToRootInMoreNavigationControllerIfNeededAnimated:(BOOL)isAnimated
 {
 #if RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
   if ([self isMoreNavigationControllerPresentInTabBar] && self.moreNavigationController.viewControllers.count > 1) {
     // We quietly assume here, that the root view controller is the `UIMoreListViewController`.
-    if (shouldRespectSelectionPrevention) {
-      UIViewController *topViewController = self.moreNavigationController.topViewController;
-      RCTAssert(
-          [topViewController isKindOfClass:RNSTabsScreenViewController.class],
-          @"[RNScreens] Unexpected type of view controller on moreNavigationControllerStack: %@",
-          topViewController.class);
-      RNSTabsScreenViewController *screenController = static_cast<RNSTabsScreenViewController *>(topViewController);
-      if (screenController.isPreventNativeSelectionEnabled) {
-        return [self popToRootMoreNavigationController:self.moreNavigationController animated:shouldAnimate];
-      }
-    } else {
-      return [self popToRootMoreNavigationController:self.moreNavigationController animated:shouldAnimate];
-    }
+    [self.moreNavigationController popToRootViewControllerAnimated:isAnimated];
   }
 #endif // RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-  return nil;
 }
 
-/**
- * Pops the top view controller from more navigation controller. We expect at most two controllers on the stack of more
- * navigation controller. If this assumption ever becomes invalid, this method needs to be updated.
- *
- * @returns nil if there was nothing to pop, the topViewController otherwise.
- */
-- (nullable UIViewController *)popToRootMoreNavigationController:
-                                   (nonnull UINavigationController *)moreNavigationController
-                                                        animated:(BOOL)animated
-{
-  if (moreNavigationController.viewControllers.count < 2) {
-    return nil;
-  }
-
-  auto *poppedViewControllers = [moreNavigationController popToRootViewControllerAnimated:animated];
-  RCTAssert(
-      poppedViewControllers != nil && poppedViewControllers.count == 1,
-      @"[RNScreens] Expected exactly one view controller to be popped");
-  return [poppedViewControllers firstObject];
-}
-
-- (void)prepareForMoreNavigationControllerHandlingIfNeeded
+- (void)setupMoreNavigationControllerDelegateIfNeeded
 {
 #if RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-  // This can be called multiple times in lifetime of `RNSTabBarController`.
-  // UIKit reuses the same `UIMoreNavigationController` instance, but resets both
-  // the delegate and the isa pointer when the More controller disappears from the
-  // tab bar (e.g. user resizing the app on iPad). We re-apply both unconditionally.
   if (self.moreNavigationController.delegate == nil) {
     self.moreNavigationController.delegate = self;
   }
-  [self ensurePushInterceptorOnMoreNavigationController];
-#endif // RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-}
-
-/// Creates a dynamic subclass of the runtime class of `moreNavigationController`
-/// (which is the private `UIMoreNavigationController`) and overrides `pushViewController:animated:`
-/// with our gating implementation.
-///
-/// The subclass name is derived from the actual runtime class of `moreNavigationController`
-/// (e.g. `RNS_UIMoreNavigationController`), so if another library ISA-swizzles it first or Apple
-/// changes the private class, each distinct original class gets its own correct dynamic subclass.
-///
-/// This method is idempotent — safe to call multiple times regardless of whether UIKit has
-/// reset the ISA between calls. When the ISA already carries our `RNS_` prefix, we return
-/// early. When UIKit has reset the ISA (e.g. iPad app resize crossing the >5 tab threshold),
-/// the dynamic subclass is looked up (or created) and re-applied.
-- (void)ensurePushInterceptorOnMoreNavigationController
-{
-#if RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-  Class currentClass = object_getClass(self.moreNavigationController);
-  const char *currentClassName = class_getName(currentClass);
-
-  // If the ISA already points to our dynamic subclass, the interceptor is in place.
-  // Without this guard, repeated calls when UIKit has NOT reset the ISA would stack
-  // `RNS_RNS_...` subclasses, causing infinite recursion in rns_pushViewController's
-  // objc_msgSendSuper call.
-  if (strncmp(currentClassName, "RNS_", 4) == 0) {
-    return;
-  }
-
-  // Build a unique subclass name per original runtime class: "RNS_<originalClassName>"
-  char dynamicSubclassName[256];
-  snprintf(dynamicSubclassName, sizeof(dynamicSubclassName), "RNS_%s", currentClassName);
-
-  Class dynamicSubclass = objc_getClass(dynamicSubclassName);
-
-  if (dynamicSubclass == nil) {
-    dynamicSubclass = objc_allocateClassPair(currentClass, dynamicSubclassName, 0);
-    RCTAssert(dynamicSubclass != nil, @"[RNScreens] Failed to allocate dynamic subclass of %s", currentClassName);
-
-    Method pushMethod = class_getInstanceMethod(currentClass, @selector(pushViewController:animated:));
-    class_addMethod(
-        dynamicSubclass,
-        @selector(pushViewController:animated:),
-        (IMP)rns_pushViewController,
-        method_getTypeEncoding(pushMethod));
-
-    objc_registerClassPair(dynamicSubclass);
-  }
-
-  object_setClass(self.moreNavigationController, dynamicSubclass);
 #endif // RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
 }
 
-/// Decides whether `moreNavigationController` should be allowed to push `viewController`.
-/// This mirrors the logic in `shouldPreventNativeTabSelection:` for the More list context.
-- (BOOL)moreNavigationController:(UINavigationController *)navigationController
-        shouldPushViewController:(UIViewController *)viewController
-{
-  BOOL shouldPrevent = [self shouldPreventNativeTabSelection:viewController];
-
-  if (shouldPrevent) {
-    [self onDidPreventUserFromSelectingViewControllerWithKey:[self screenKeyForViewController:viewController]];
-    [self deselectMoreListSelectionInNavigationController:navigationController];
-  }
-
-  return !shouldPrevent;
-}
-
-/// When we prevent a push from the More list, the tapped table view cell stays highlighted
-/// because UIKit expects the push to handle deselection on return. We deselect it manually.
-- (void)deselectMoreListSelectionInNavigationController:(UINavigationController *)navigationController
-{
-#if RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-  UIViewController *topVC = navigationController.topViewController;
-  UITableView *tableView = [self findTableViewInView:topVC.view];
-
-  if (tableView != nil) {
-    NSIndexPath *selectedIndexPath = tableView.indexPathForSelectedRow;
-    if (selectedIndexPath != nil) {
-      [tableView deselectRowAtIndexPath:selectedIndexPath animated:YES];
-    }
-  } else {
-    RCTLogWarn(@"[RNScreens] Failed to find a table view to clear focus!");
-  }
-#endif // RNS_MORE_NAVIGATION_CONTROLLER_AVAILABLE
-}
-
-/**
- * Unbounded DFS looking for ANY `UITableView` in the subtree rooted at view.
- * The `view` parameter is included in the search.
- */
-- (nullable UITableView *)findTableViewInView:(UIView *)view
-{
-  if ([view isKindOfClass:UITableView.class]) {
-    return (UITableView *)view;
-  }
-  for (UIView *subview in view.subviews) {
-    UITableView *result = [self findTableViewInView:subview];
-    if (result != nil) {
-      return result;
-    }
-  }
-  return nil;
-}
-
 /**
  * This method allows getting the `moreNavigationController` instance under a couple of conditions.
  *
diff --git a/ios/tabs/host/RNSTabsHostComponentView.h b/ios/tabs/host/RNSTabsHostComponentView.h
index 624d5895c5..a03adfb0aa 100644
--- a/ios/tabs/host/RNSTabsHostComponentView.h
+++ b/ios/tabs/host/RNSTabsHostComponentView.h
@@ -112,10 +112,6 @@ NS_ASSUME_NONNULL_BEGIN
              currentState:(nonnull RNSTabsNavigationState *)currentNavState
                withReason:(RNSTabsNavigationStateRejectionReason)reasonCode;
 
-- (void)tabBarController:(nonnull RNSTabBarController *)tabBarController
-    preventedSelectionOf:(nonnull NSString *)screenKey
-            currentState:(nonnull RNSTabsNavigationState *)currentNavState;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/ios/tabs/host/RNSTabsHostComponentView.mm b/ios/tabs/host/RNSTabsHostComponentView.mm
index 4efe6baf4e..53e06d1e6e 100644
--- a/ios/tabs/host/RNSTabsHostComponentView.mm
+++ b/ios/tabs/host/RNSTabsHostComponentView.mm
@@ -628,22 +628,6 @@ - (void)tabBarController:(nonnull RNSTabBarController *)tabBarController
                                                       .rejectionReason = reasonCode}];
 }
 
-- (void)tabBarController:(nonnull RNSTabBarController *)tabBarController
-    preventedSelectionOf:(nonnull NSString *)screenKey
-            currentState:(nonnull RNSTabsNavigationState *)currentNavState
-{
-  RCTAssert(tabBarController != nil, @"[RNScreens] Expected NON NIL tabBarController");
-  RCTAssert(screenKey != nil, @"[RNScreens] Expected NON NIL screenKey");
-  RCTAssert(
-      currentNavState != nil && currentNavState.selectedScreenKey != nil,
-      @"[RNScreens] Expected NON NIL nav state & selectedScreenKey");
-
-  [self.reactEventEmitter emitOnTabSelectionPrevented:{
-                                                          .currentNavState = currentNavState,
-                                                          .preventedScreenKey = screenKey,
-  }];
-}
-
 @end
 
 #pragma mark - Modified React Subviews implementation
diff --git a/ios/tabs/host/RNSTabsHostEventEmitter.h b/ios/tabs/host/RNSTabsHostEventEmitter.h
index 76393b0684..69eb4feeff 100644
--- a/ios/tabs/host/RNSTabsHostEventEmitter.h
+++ b/ios/tabs/host/RNSTabsHostEventEmitter.h
@@ -40,14 +40,6 @@ typedef struct {
   RNSTabsNavigationStateRejectionReason rejectionReason;
 } OnTabSelectionRejectedPayload;
 
-/** Payload for the `onTabSelectionPrevented` event emitted when a tab selection is prevented. */
-typedef struct {
-  /** The currently active navigation state that was kept. */
-  RNSTabsNavigationState *_Nonnull currentNavState;
-  /** Screen key of the tab whose selection was prevented. */
-  NSString *_Nonnull preventedScreenKey;
-} OnTabSelectionPreventedPayload;
-
 @interface RNSTabsHostEventEmitter : NSObject
 
 /** Emits `onTabSelected` event to JS. Returns YES if the event was dispatched successfully. */
@@ -56,9 +48,6 @@ typedef struct {
 /** Emits `onTabSelectionRejected` event to JS. Returns YES if the event was dispatched successfully. */
 - (BOOL)emitOnTabSelectionRejected:(OnTabSelectionRejectedPayload)payload;
 
-/** Emits `onTabSelectionPrevented` event to JS. Returns YES if the event was dispatched successfully. */
-- (BOOL)emitOnTabSelectionPrevented:(OnTabSelectionPreventedPayload)payload;
-
 @end
 
 #pragma mark - Hidden from Swift
diff --git a/ios/tabs/host/RNSTabsHostEventEmitter.mm b/ios/tabs/host/RNSTabsHostEventEmitter.mm
index 812f6de161..1c5b2e9a00 100644
--- a/ios/tabs/host/RNSTabsHostEventEmitter.mm
+++ b/ios/tabs/host/RNSTabsHostEventEmitter.mm
@@ -69,18 +69,4 @@ - (BOOL)emitOnTabSelectionRejected:(OnTabSelectionRejectedPayload)payload
   }
 }
 
-- (BOOL)emitOnTabSelectionPrevented:(OnTabSelectionPreventedPayload)payload
-{
-  if (_reactEventEmitter != nullptr) {
-    _reactEventEmitter->onTabSelectionPrevented(
-        {.selectedScreenKey = RCTStringFromNSString(payload.currentNavState.selectedScreenKey),
-         .provenance = payload.currentNavState.provenance,
-         .preventedScreenKey = RCTStringFromNSString(payload.preventedScreenKey)});
-    return YES;
-  } else {
-    RCTLogWarn(@"[RNScreens] Skipped OnTabSelectionPrevented event emission due to nullish emitter");
-    return NO;
-  }
-}
-
 @end
diff --git a/ios/tabs/screen/RNSTabsScreenComponentView.h b/ios/tabs/screen/RNSTabsScreenComponentView.h
index 695d8d368c..04b9d0a345 100644
--- a/ios/tabs/screen/RNSTabsScreenComponentView.h
+++ b/ios/tabs/screen/RNSTabsScreenComponentView.h
@@ -81,8 +81,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) BOOL shouldUseRepeatedTabSelectionPopToRootSpecialEffect;
 @property (nonatomic) BOOL shouldUseRepeatedTabSelectionScrollToTopSpecialEffect;
 
-@property (nonatomic) BOOL preventNativeSelection;
-
 @property (nonatomic, readonly) BOOL overrideScrollViewContentInsetAdjustmentBehavior;
 
 @property (nonatomic, nullable) NSString *tabItemTestID;
diff --git a/ios/tabs/screen/RNSTabsScreenComponentView.mm b/ios/tabs/screen/RNSTabsScreenComponentView.mm
index 7abe5fc8fc..973fe05890 100644
--- a/ios/tabs/screen/RNSTabsScreenComponentView.mm
+++ b/ios/tabs/screen/RNSTabsScreenComponentView.mm
@@ -348,10 +348,6 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
         newComponentProps.specialEffects.repeatedTabSelection.scrollToTop;
   }
 
-  if (newComponentProps.preventNativeSelection != oldComponentProps.preventNativeSelection) {
-    _preventNativeSelection = newComponentProps.preventNativeSelection;
-  }
-
   if (newComponentProps.overrideScrollViewContentInsetAdjustmentBehavior !=
       oldComponentProps.overrideScrollViewContentInsetAdjustmentBehavior) {
     _overrideScrollViewContentInsetAdjustmentBehavior =
diff --git a/ios/tabs/screen/RNSTabsScreenViewController.h b/ios/tabs/screen/RNSTabsScreenViewController.h
index 40d0985960..27bd22b300 100644
--- a/ios/tabs/screen/RNSTabsScreenViewController.h
+++ b/ios/tabs/screen/RNSTabsScreenViewController.h
@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly, nullable) RNSTabsScreenComponentView *tabScreenComponentView;
 @property (nonatomic, weak, readonly, nullable) id<RNSTabsSpecialEffectsSupporting> tabsSpecialEffectsDelegate;
 
+- (nullable NSString *)getScreenKeyOrNull;
+
 /**
  * Tell the controller that the tab screen it owns has got its react-props related to appearance changed.
  */
@@ -48,12 +50,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface RNSTabsScreenViewController (TabsScreenPropsForwarding)
-
-- (nullable NSString *)getScreenKeyOrNull;
-
-- (BOOL)isPreventNativeSelectionEnabled;
-
-@end
-
 NS_ASSUME_NONNULL_END
diff --git a/ios/tabs/screen/RNSTabsScreenViewController.mm b/ios/tabs/screen/RNSTabsScreenViewController.mm
index b2737706a0..0b6ef9282d 100644
--- a/ios/tabs/screen/RNSTabsScreenViewController.mm
+++ b/ios/tabs/screen/RNSTabsScreenViewController.mm
@@ -6,6 +6,11 @@
 
 @implementation RNSTabsScreenViewController
 
+- (nullable NSString *)getScreenKeyOrNull
+{
+  return self.tabScreenComponentView.screenKey;
+}
+
 - (nullable RNSTabBarController *)findTabBarController
 {
   return static_cast<RNSTabBarController *_Nullable>(self.tabBarController);
@@ -28,25 +33,21 @@ - (void)tabScreenOrientationHasChanged
 
 - (void)viewWillAppear:(BOOL)animated
 {
-  [super viewWillAppear:animated];
   [self.tabScreenComponentView.reactEventEmitter emitOnWillAppear];
 }
 
 - (void)viewDidAppear:(BOOL)animated
 {
-  [super viewDidAppear:animated];
   [self.tabScreenComponentView.reactEventEmitter emitOnDidAppear];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
 {
-  [super viewWillDisappear:animated];
   [self.tabScreenComponentView.reactEventEmitter emitOnWillDisappear];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
-  [super viewDidDisappear:animated];
   [self.tabScreenComponentView.reactEventEmitter emitOnDidDisappear];
 }
 
@@ -125,17 +126,3 @@ - (RNSOrientation)evaluateOrientation
 #endif // !TARGET_OS_TV
 
 @end
-
-@implementation RNSTabsScreenViewController (TabsScreenPropsForwarding)
-
-- (nullable NSString *)getScreenKeyOrNull
-{
-  return self.tabScreenComponentView.screenKey;
-}
-
-- (BOOL)isPreventNativeSelectionEnabled
-{
-  return self.tabScreenComponentView.preventNativeSelection;
-}
-
-@end
diff --git a/src/components/tabs/host/TabsHost.types.ts b/src/components/tabs/host/TabsHost.types.ts
index c126263cf6..4cb905f96c 100644
--- a/src/components/tabs/host/TabsHost.types.ts
+++ b/src/components/tabs/host/TabsHost.types.ts
@@ -105,19 +105,6 @@ export type TabSelectionRejectedEvent = {
   rejectionReason: TabSelectionRejectionReason;
 };
 
-/**
- * @summary Payload of the event emitted when the native side prevents a tab selection
- * because the target screen has `preventNativeSelection` enabled.
- */
-export type TabSelectionPreventedEvent = {
-  /** Screen key of the currently selected (active) tab. */
-  selectedScreenKey: string;
-  /** Provenance of the currently active navigation state. */
-  provenance: number;
-  /** Screen key of the tab whose selection was prevented. */
-  preventedScreenKey: string;
-};
-
 export type TabsHostColorScheme = ColorScheme | 'inherit';
 
 export type TabsHostDirection = Direction | 'inherit';
@@ -271,17 +258,6 @@ export interface TabsHostPropsBase {
   onTabSelectionRejected?: (
     event: NativeSyntheticEvent<TabSelectionRejectedEvent>,
   ) => void;
-
-  /**
-   * @summary
-   * A callback that gets invoked when the native side prevents a tab selection
-   * because the target screen has `preventNativeSelection` enabled.
-   *
-   * @see {@link TabSelectionPreventedEvent}
-   */
-  onTabSelectionPrevented?: (
-    event: NativeSyntheticEvent<TabSelectionPreventedEvent>,
-  ) => void;
 }
 
 export interface TabsHostProps extends TabsHostPropsBase {
diff --git a/src/components/tabs/screen/TabsScreen.types.ts b/src/components/tabs/screen/TabsScreen.types.ts
index 87b5eba39d..144b72cacd 100644
--- a/src/components/tabs/screen/TabsScreen.types.ts
+++ b/src/components/tabs/screen/TabsScreen.types.ts
@@ -30,14 +30,6 @@ export interface TabsScreenPropsBase {
    * @platform android, ios
    */
   screenKey: string;
-  /**
-   * @summary When set to `true`, prevents native tab selection for this screen.
-   *
-   * @default false
-   *
-   * @platform android, ios
-   */
-  preventNativeSelection?: boolean;
 
   // General
   children?: ViewProps['children'];
diff --git a/src/fabric/tabs/TabsHostAndroidNativeComponent.ts b/src/fabric/tabs/TabsHostAndroidNativeComponent.ts
index 28c287bced..ca9e08ccfa 100644
--- a/src/fabric/tabs/TabsHostAndroidNativeComponent.ts
+++ b/src/fabric/tabs/TabsHostAndroidNativeComponent.ts
@@ -26,12 +26,6 @@ type TabSelectionRejectedEvent = Readonly<{
   rejectionReason: 'stale' | 'repeated' | 'more-nav-ctrl-not-available';
 }>;
 
-type TabSelectionPreventedEvent = Readonly<{
-  selectedScreenKey: string;
-  provenance: CT.Int32;
-  preventedScreenKey: string;
-}>;
-
 type TabsHostColorScheme = 'inherit' | 'light' | 'dark';
 
 // #endregion General helpers
@@ -48,7 +42,6 @@ export interface NativeProps extends ViewProps {
   // Events
   onTabSelected?: CT.DirectEventHandler<TabSelectedEvent>;
   onTabSelectionRejected?: CT.DirectEventHandler<TabSelectionRejectedEvent>;
-  onTabSelectionPrevented?: CT.DirectEventHandler<TabSelectionPreventedEvent>;
 
   // General
   tabBarHidden?: CT.WithDefault<boolean, false>;
diff --git a/src/fabric/tabs/TabsHostIOSNativeComponent.ts b/src/fabric/tabs/TabsHostIOSNativeComponent.ts
index b5f9ee88bf..b6491102e6 100644
--- a/src/fabric/tabs/TabsHostIOSNativeComponent.ts
+++ b/src/fabric/tabs/TabsHostIOSNativeComponent.ts
@@ -26,12 +26,6 @@ type TabSelectionRejectedEvent = Readonly<{
   rejectionReason: 'stale' | 'repeated' | 'more-nav-ctrl-not-available';
 }>;
 
-type TabSelectionPreventedEvent = Readonly<{
-  selectedScreenKey: string;
-  provenance: CT.Int32;
-  preventedScreenKey: string;
-}>;
-
 type TabsHostColorScheme = 'inherit' | 'light' | 'dark';
 
 type LayoutDirection = 'inherit' | 'ltr' | 'rtl';
@@ -58,7 +52,6 @@ export interface NativeProps extends ViewProps {
   // Events
   onTabSelected?: CT.DirectEventHandler<TabSelectedEvent>;
   onTabSelectionRejected?: CT.DirectEventHandler<TabSelectionRejectedEvent>;
-  onTabSelectionPrevented?: CT.DirectEventHandler<TabSelectionPreventedEvent>;
 
   // General
   tabBarHidden?: CT.WithDefault<boolean, false>;
diff --git a/src/fabric/tabs/TabsScreenAndroidNativeComponent.ts b/src/fabric/tabs/TabsScreenAndroidNativeComponent.ts
index 41393ff2ce..e6daeef7f5 100644
--- a/src/fabric/tabs/TabsScreenAndroidNativeComponent.ts
+++ b/src/fabric/tabs/TabsScreenAndroidNativeComponent.ts
@@ -74,7 +74,6 @@ export interface NativeProps extends ViewProps {
 
   // Control
   screenKey: string;
-  preventNativeSelection?: CT.WithDefault<boolean, false>;
 
   // General
   title?: string | undefined | null;
diff --git a/src/fabric/tabs/TabsScreenIOSNativeComponent.ts b/src/fabric/tabs/TabsScreenIOSNativeComponent.ts
index 724b0c22eb..3132470ec0 100644
--- a/src/fabric/tabs/TabsScreenIOSNativeComponent.ts
+++ b/src/fabric/tabs/TabsScreenIOSNativeComponent.ts
@@ -119,7 +119,6 @@ export interface NativeProps extends ViewProps {
   // Control
   isFocused?: boolean;
   screenKey: string;
-  preventNativeSelection?: CT.WithDefault<boolean, false>;
 
   // General
   title?: string | undefined | null;