diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx index ae8c66057f6c..d1a286d234b6 100644 --- a/src/components/Navigation/NavigationTabBar/index.tsx +++ b/src/components/Navigation/NavigationTabBar/index.tsx @@ -3,6 +3,7 @@ import reportsSelector from '@selectors/Attributes'; import React, {memo, useCallback, useEffect, useState} from 'react'; import {View} from 'react-native'; import type {ValueOf} from 'type-fest'; +import FloatingCameraButton from '@components/FloatingCameraButton'; import HeaderGap from '@components/HeaderGap'; import Icon from '@components/Icon'; import ImageSVG from '@components/ImageSVG'; @@ -46,9 +47,10 @@ import NAVIGATION_TABS from './NAVIGATION_TABS'; type NavigationTabBarProps = { selectedTab: ValueOf; isTopLevelBar?: boolean; + shouldShowFloatingCameraButton?: boolean; }; -function NavigationTabBar({selectedTab, isTopLevelBar = false}: NavigationTabBarProps) { +function NavigationTabBar({selectedTab, isTopLevelBar = false, shouldShowFloatingCameraButton = true}: NavigationTabBarProps) { const theme = useTheme(); const styles = useThemeStyles(); @@ -448,6 +450,7 @@ function NavigationTabBar({selectedTab, isTopLevelBar = false}: NavigationTabBar onPress={navigateToSettings} /> + {shouldShowFloatingCameraButton && } ); } diff --git a/src/components/Navigation/TopLevelNavigationTabBar/index.tsx b/src/components/Navigation/TopLevelNavigationTabBar/index.tsx index cd6a12f6b0f9..6712967b36cb 100644 --- a/src/components/Navigation/TopLevelNavigationTabBar/index.tsx +++ b/src/components/Navigation/TopLevelNavigationTabBar/index.tsx @@ -1,7 +1,6 @@ import type {ParamListBase} from '@react-navigation/native'; import React, {useContext, useEffect, useRef, useState} from 'react'; import {InteractionManager, View} from 'react-native'; -import FloatingCameraButton from '@components/FloatingCameraButton'; import {FullScreenBlockingViewContext} from '@components/FullScreenBlockingViewContextProvider'; import NavigationTabBar from '@components/Navigation/NavigationTabBar'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; @@ -75,7 +74,6 @@ function TopLevelNavigationTabBar({state}: TopLevelNavigationTabBarProps) { selectedTab={selectedTab} isTopLevelBar /> - ); } diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx index c59464befb1f..917fa0d934a9 100644 --- a/src/pages/workspace/WorkspaceInitialPage.tsx +++ b/src/pages/workspace/WorkspaceInitialPage.tsx @@ -466,7 +466,15 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac } + bottomContent={ + shouldShowNavigationTabBar && + !shouldDisplayLHB && ( + + ) + } > } + bottomContent={ + shouldUseNarrowLayout && ( + + ) + } enableEdgeToEdgeBottomSafeAreaPadding={false} > @@ -715,7 +722,14 @@ function WorkspacesListPage() { shouldShowOfflineIndicatorInWideScreen testID={WorkspacesListPage.displayName} enableEdgeToEdgeBottomSafeAreaPadding={false} - bottomContent={shouldUseNarrowLayout && } + bottomContent={ + shouldUseNarrowLayout && ( + + ) + } > {!shouldUseNarrowLayout && {getHeaderButton()}}