diff --git a/native/flow-typed/npm/@react-navigation/bottom-tabs_v5.x.x.js b/native/flow-typed/npm/@react-navigation/bottom-tabs_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/bottom-tabs_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/bottom-tabs_v5.x.x.js
@@ -1541,6 +1541,18 @@
       +hide: TabBarVisibilityAnimationConfig,
     |}>,
     +tabBarButton: BottomTabBarButtonProps => React$Node,
+    +tabBarHideOnKeyboard: boolean,
+    +tabBarActiveTintColor: string,
+    +tabBarInactiveTintColor: string,
+    +tabBarActiveBackgroundColor: string,
+    +tabBarInactiveBackgroundColor: string,
+    +tabBarAllowFontScaling: boolean,
+    +tabBarShowLabel: boolean,
+    +tabBarLabelStyle: TextStyleProp,
+    +tabBarIconStyle: TextStyleProp,
+    +tabBarItemStyle: ViewStyleProp,
+    +tabBarLabelPosition: 'beside-icon' | 'below-icon',
+    +tabBarStyle: ViewStyleProp,
     +unmountOnBlur: boolean,
     +headerShown: boolean,
   |}>;
@@ -1599,39 +1611,18 @@
     BottomTabOptions,
   >;
 
-  declare export type BottomTabBarOptions = $Partial<{|
-    +keyboardHidesTabBar: boolean,
-    +activeTintColor: string,
-    +inactiveTintColor: string,
-    +activeBackgroundColor: string,
-    +inactiveBackgroundColor: string,
-    +allowFontScaling: boolean,
-    +showLabel: boolean,
-    +showIcon: boolean,
-    +labelStyle: TextStyleProp,
-    +iconStyle: TextStyleProp,
-    +tabStyle: ViewStyleProp,
-    +labelPosition: 'beside-icon' | 'below-icon',
-    +adaptive: boolean,
-    +safeAreaInsets: $Partial<EdgeInsets>,
-    +style: ViewStyleProp,
-  |}>;
-
   declare type BottomTabNavigationBuilderResult = {|
     +state: TabNavigationState,
     +navigation: BottomTabNavigationHelpers<>,
     +descriptors: {| +[key: string]: BottomTabDescriptor |},
   |};
 
-  declare export type BottomTabBarProps = {|
-    ...BottomTabBarOptions,
-    ...BottomTabNavigationBuilderResult,
-  |}
+  declare export type BottomTabBarProps = BottomTabNavigationBuilderResult;
 
   declare type BottomTabNavigationConfig = {|
     +lazy?: boolean,
     +tabBar?: BottomTabBarProps => React$Node,
-    +tabBarOptions?: BottomTabBarOptions,
+    +safeAreaInsets?: $Partial<EdgeInsets>,
     +detachInactiveScreens?: boolean,
   |};
 
diff --git a/native/flow-typed/npm/@react-navigation/devtools_v5.x.x.js b/native/flow-typed/npm/@react-navigation/devtools_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/devtools_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/devtools_v5.x.x.js
@@ -1541,6 +1541,18 @@
       +hide: TabBarVisibilityAnimationConfig,
     |}>,
     +tabBarButton: BottomTabBarButtonProps => React$Node,
+    +tabBarHideOnKeyboard: boolean,
+    +tabBarActiveTintColor: string,
+    +tabBarInactiveTintColor: string,
+    +tabBarActiveBackgroundColor: string,
+    +tabBarInactiveBackgroundColor: string,
+    +tabBarAllowFontScaling: boolean,
+    +tabBarShowLabel: boolean,
+    +tabBarLabelStyle: TextStyleProp,
+    +tabBarIconStyle: TextStyleProp,
+    +tabBarItemStyle: ViewStyleProp,
+    +tabBarLabelPosition: 'beside-icon' | 'below-icon',
+    +tabBarStyle: ViewStyleProp,
     +unmountOnBlur: boolean,
     +headerShown: boolean,
   |}>;
@@ -1599,39 +1611,18 @@
     BottomTabOptions,
   >;
 
-  declare export type BottomTabBarOptions = $Partial<{|
-    +keyboardHidesTabBar: boolean,
-    +activeTintColor: string,
-    +inactiveTintColor: string,
-    +activeBackgroundColor: string,
-    +inactiveBackgroundColor: string,
-    +allowFontScaling: boolean,
-    +showLabel: boolean,
-    +showIcon: boolean,
-    +labelStyle: TextStyleProp,
-    +iconStyle: TextStyleProp,
-    +tabStyle: ViewStyleProp,
-    +labelPosition: 'beside-icon' | 'below-icon',
-    +adaptive: boolean,
-    +safeAreaInsets: $Partial<EdgeInsets>,
-    +style: ViewStyleProp,
-  |}>;
-
   declare type BottomTabNavigationBuilderResult = {|
     +state: TabNavigationState,
     +navigation: BottomTabNavigationHelpers<>,
     +descriptors: {| +[key: string]: BottomTabDescriptor |},
   |};
 
-  declare export type BottomTabBarProps = {|
-    ...BottomTabBarOptions,
-    ...BottomTabNavigationBuilderResult,
-  |}
+  declare export type BottomTabBarProps = BottomTabNavigationBuilderResult;
 
   declare type BottomTabNavigationConfig = {|
     +lazy?: boolean,
     +tabBar?: BottomTabBarProps => React$Node,
-    +tabBarOptions?: BottomTabBarOptions,
+    +safeAreaInsets?: $Partial<EdgeInsets>,
     +detachInactiveScreens?: boolean,
   |};
 
diff --git a/native/flow-typed/npm/@react-navigation/elements_v1.x.x.js b/native/flow-typed/npm/@react-navigation/elements_v1.x.x.js
--- a/native/flow-typed/npm/@react-navigation/elements_v1.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/elements_v1.x.x.js
@@ -1538,6 +1538,18 @@
       +hide: TabBarVisibilityAnimationConfig,
     |}>,
     +tabBarButton: BottomTabBarButtonProps => React$Node,
+    +tabBarHideOnKeyboard: boolean,
+    +tabBarActiveTintColor: string,
+    +tabBarInactiveTintColor: string,
+    +tabBarActiveBackgroundColor: string,
+    +tabBarInactiveBackgroundColor: string,
+    +tabBarAllowFontScaling: boolean,
+    +tabBarShowLabel: boolean,
+    +tabBarLabelStyle: TextStyleProp,
+    +tabBarIconStyle: TextStyleProp,
+    +tabBarItemStyle: ViewStyleProp,
+    +tabBarLabelPosition: 'beside-icon' | 'below-icon',
+    +tabBarStyle: ViewStyleProp,
     +unmountOnBlur: boolean,
     +headerShown: boolean,
   |}>;
@@ -1596,39 +1608,18 @@
     BottomTabOptions,
   >;
 
-  declare export type BottomTabBarOptions = $Partial<{|
-    +keyboardHidesTabBar: boolean,
-    +activeTintColor: string,
-    +inactiveTintColor: string,
-    +activeBackgroundColor: string,
-    +inactiveBackgroundColor: string,
-    +allowFontScaling: boolean,
-    +showLabel: boolean,
-    +showIcon: boolean,
-    +labelStyle: TextStyleProp,
-    +iconStyle: TextStyleProp,
-    +tabStyle: ViewStyleProp,
-    +labelPosition: 'beside-icon' | 'below-icon',
-    +adaptive: boolean,
-    +safeAreaInsets: $Partial<EdgeInsets>,
-    +style: ViewStyleProp,
-  |}>;
-
   declare type BottomTabNavigationBuilderResult = {|
     +state: TabNavigationState,
     +navigation: BottomTabNavigationHelpers<>,
     +descriptors: {| +[key: string]: BottomTabDescriptor |},
   |};
 
-  declare export type BottomTabBarProps = {|
-    ...BottomTabBarOptions,
-    ...BottomTabNavigationBuilderResult,
-  |}
+  declare export type BottomTabBarProps = BottomTabNavigationBuilderResult;
 
   declare type BottomTabNavigationConfig = {|
     +lazy?: boolean,
     +tabBar?: BottomTabBarProps => React$Node,
-    +tabBarOptions?: BottomTabBarOptions,
+    +safeAreaInsets?: $Partial<EdgeInsets>,
     +detachInactiveScreens?: boolean,
   |};
 
diff --git a/native/flow-typed/npm/@react-navigation/material-top-tabs_v5.x.x.js b/native/flow-typed/npm/@react-navigation/material-top-tabs_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/material-top-tabs_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/material-top-tabs_v5.x.x.js
@@ -1541,6 +1541,18 @@
       +hide: TabBarVisibilityAnimationConfig,
     |}>,
     +tabBarButton: BottomTabBarButtonProps => React$Node,
+    +tabBarHideOnKeyboard: boolean,
+    +tabBarActiveTintColor: string,
+    +tabBarInactiveTintColor: string,
+    +tabBarActiveBackgroundColor: string,
+    +tabBarInactiveBackgroundColor: string,
+    +tabBarAllowFontScaling: boolean,
+    +tabBarShowLabel: boolean,
+    +tabBarLabelStyle: TextStyleProp,
+    +tabBarIconStyle: TextStyleProp,
+    +tabBarItemStyle: ViewStyleProp,
+    +tabBarLabelPosition: 'beside-icon' | 'below-icon',
+    +tabBarStyle: ViewStyleProp,
     +unmountOnBlur: boolean,
     +headerShown: boolean,
   |}>;
@@ -1599,39 +1611,18 @@
     BottomTabOptions,
   >;
 
-  declare export type BottomTabBarOptions = $Partial<{|
-    +keyboardHidesTabBar: boolean,
-    +activeTintColor: string,
-    +inactiveTintColor: string,
-    +activeBackgroundColor: string,
-    +inactiveBackgroundColor: string,
-    +allowFontScaling: boolean,
-    +showLabel: boolean,
-    +showIcon: boolean,
-    +labelStyle: TextStyleProp,
-    +iconStyle: TextStyleProp,
-    +tabStyle: ViewStyleProp,
-    +labelPosition: 'beside-icon' | 'below-icon',
-    +adaptive: boolean,
-    +safeAreaInsets: $Partial<EdgeInsets>,
-    +style: ViewStyleProp,
-  |}>;
-
   declare type BottomTabNavigationBuilderResult = {|
     +state: TabNavigationState,
     +navigation: BottomTabNavigationHelpers<>,
     +descriptors: {| +[key: string]: BottomTabDescriptor |},
   |};
 
-  declare export type BottomTabBarProps = {|
-    ...BottomTabBarOptions,
-    ...BottomTabNavigationBuilderResult,
-  |}
+  declare export type BottomTabBarProps = BottomTabNavigationBuilderResult;
 
   declare type BottomTabNavigationConfig = {|
     +lazy?: boolean,
     +tabBar?: BottomTabBarProps => React$Node,
-    +tabBarOptions?: BottomTabBarOptions,
+    +safeAreaInsets?: $Partial<EdgeInsets>,
     +detachInactiveScreens?: boolean,
   |};
 
diff --git a/native/flow-typed/npm/@react-navigation/native_v5.x.x.js b/native/flow-typed/npm/@react-navigation/native_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/native_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/native_v5.x.x.js
@@ -1541,6 +1541,18 @@
       +hide: TabBarVisibilityAnimationConfig,
     |}>,
     +tabBarButton: BottomTabBarButtonProps => React$Node,
+    +tabBarHideOnKeyboard: boolean,
+    +tabBarActiveTintColor: string,
+    +tabBarInactiveTintColor: string,
+    +tabBarActiveBackgroundColor: string,
+    +tabBarInactiveBackgroundColor: string,
+    +tabBarAllowFontScaling: boolean,
+    +tabBarShowLabel: boolean,
+    +tabBarLabelStyle: TextStyleProp,
+    +tabBarIconStyle: TextStyleProp,
+    +tabBarItemStyle: ViewStyleProp,
+    +tabBarLabelPosition: 'beside-icon' | 'below-icon',
+    +tabBarStyle: ViewStyleProp,
     +unmountOnBlur: boolean,
     +headerShown: boolean,
   |}>;
@@ -1599,39 +1611,18 @@
     BottomTabOptions,
   >;
 
-  declare export type BottomTabBarOptions = $Partial<{|
-    +keyboardHidesTabBar: boolean,
-    +activeTintColor: string,
-    +inactiveTintColor: string,
-    +activeBackgroundColor: string,
-    +inactiveBackgroundColor: string,
-    +allowFontScaling: boolean,
-    +showLabel: boolean,
-    +showIcon: boolean,
-    +labelStyle: TextStyleProp,
-    +iconStyle: TextStyleProp,
-    +tabStyle: ViewStyleProp,
-    +labelPosition: 'beside-icon' | 'below-icon',
-    +adaptive: boolean,
-    +safeAreaInsets: $Partial<EdgeInsets>,
-    +style: ViewStyleProp,
-  |}>;
-
   declare type BottomTabNavigationBuilderResult = {|
     +state: TabNavigationState,
     +navigation: BottomTabNavigationHelpers<>,
     +descriptors: {| +[key: string]: BottomTabDescriptor |},
   |};
 
-  declare export type BottomTabBarProps = {|
-    ...BottomTabBarOptions,
-    ...BottomTabNavigationBuilderResult,
-  |}
+  declare export type BottomTabBarProps = BottomTabNavigationBuilderResult;
 
   declare type BottomTabNavigationConfig = {|
     +lazy?: boolean,
     +tabBar?: BottomTabBarProps => React$Node,
-    +tabBarOptions?: BottomTabBarOptions,
+    +safeAreaInsets?: $Partial<EdgeInsets>,
     +detachInactiveScreens?: boolean,
   |};
 
diff --git a/native/flow-typed/npm/@react-navigation/stack_v5.x.x.js b/native/flow-typed/npm/@react-navigation/stack_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/stack_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/stack_v5.x.x.js
@@ -1541,6 +1541,18 @@
       +hide: TabBarVisibilityAnimationConfig,
     |}>,
     +tabBarButton: BottomTabBarButtonProps => React$Node,
+    +tabBarHideOnKeyboard: boolean,
+    +tabBarActiveTintColor: string,
+    +tabBarInactiveTintColor: string,
+    +tabBarActiveBackgroundColor: string,
+    +tabBarInactiveBackgroundColor: string,
+    +tabBarAllowFontScaling: boolean,
+    +tabBarShowLabel: boolean,
+    +tabBarLabelStyle: TextStyleProp,
+    +tabBarIconStyle: TextStyleProp,
+    +tabBarItemStyle: ViewStyleProp,
+    +tabBarLabelPosition: 'beside-icon' | 'below-icon',
+    +tabBarStyle: ViewStyleProp,
     +unmountOnBlur: boolean,
     +headerShown: boolean,
   |}>;
@@ -1599,39 +1611,18 @@
     BottomTabOptions,
   >;
 
-  declare export type BottomTabBarOptions = $Partial<{|
-    +keyboardHidesTabBar: boolean,
-    +activeTintColor: string,
-    +inactiveTintColor: string,
-    +activeBackgroundColor: string,
-    +inactiveBackgroundColor: string,
-    +allowFontScaling: boolean,
-    +showLabel: boolean,
-    +showIcon: boolean,
-    +labelStyle: TextStyleProp,
-    +iconStyle: TextStyleProp,
-    +tabStyle: ViewStyleProp,
-    +labelPosition: 'beside-icon' | 'below-icon',
-    +adaptive: boolean,
-    +safeAreaInsets: $Partial<EdgeInsets>,
-    +style: ViewStyleProp,
-  |}>;
-
   declare type BottomTabNavigationBuilderResult = {|
     +state: TabNavigationState,
     +navigation: BottomTabNavigationHelpers<>,
     +descriptors: {| +[key: string]: BottomTabDescriptor |},
   |};
 
-  declare export type BottomTabBarProps = {|
-    ...BottomTabBarOptions,
-    ...BottomTabNavigationBuilderResult,
-  |}
+  declare export type BottomTabBarProps = BottomTabNavigationBuilderResult;
 
   declare type BottomTabNavigationConfig = {|
     +lazy?: boolean,
     +tabBar?: BottomTabBarProps => React$Node,
-    +tabBarOptions?: BottomTabBarOptions,
+    +safeAreaInsets?: $Partial<EdgeInsets>,
     +detachInactiveScreens?: boolean,
   |};
 
diff --git a/native/navigation/app-navigator.react.js b/native/navigation/app-navigator.react.js
--- a/native/navigation/app-navigator.react.js
+++ b/native/navigation/app-navigator.react.js
@@ -100,17 +100,15 @@
   TabParamList,
   BottomTabNavigationHelpers<ScreenParamList>,
 >();
-const tabBarOptions = {
-  keyboardHidesTabBar: false,
-  activeTintColor: '#AE94DB',
-  style: {
+const tabBarScreenOptions = {
+  headerShown: false,
+  tabBarHideOnKeyboard: false,
+  tabBarActiveTintColor: '#AE94DB',
+  tabBarStyle: {
     backgroundColor: '#0A0A0A',
     borderTopWidth: 1,
   },
 };
-const tabBarScreenOptions = {
-  headerShown: false,
-};
 function TabNavigator() {
   const chatBadge = useSelector(unreadCount);
   const isCalendarEnabled = useSelector(state => state.enabledApps.calendar);
@@ -132,7 +130,6 @@
       lazy={false}
       tabBar={tabBar}
       backBehavior="none"
-      tabBarOptions={tabBarOptions}
       screenOptions={tabBarScreenOptions}
     >
       {calendarTab}