Skip to content

4305: Fix chat button overlap in places #4316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lunars97 merged 3 commits into from
Aug 10, 2026
+13 −3
Merged

4305: Fix chat button overlap in places #4316

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89b9208
4305: Fix chat button overlap in places
lunars97 Aug 6, 2026
aed4272
4305: Use active tab navigation state
lunars97 Aug 7, 2026
99336f1
4305: Add release-note
lunars97 Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions native/src/BottomTabNavigator.tsx
View file
Open in desktop
Comment thread
bahaaTuffaha marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'
import { getFocusedRouteNameFromRoute, useNavigationState } from '@react-navigation/native'
import { createStackNavigator } from '@react-navigation/stack'
import React, { ReactElement, useCallback, useRef } from 'react'
import { useTranslation } from 'react-i18next'
Expand All @@ -25,7 +26,7 @@ import { defaultHeader } from './components/DefaultHeader'
import Icon from './components/base/Icon'
import Text from './components/base/Text'
import { TAB_NAVIGATOR_ID } from './constants'
import { NavigationProps, RoutesParamsType } from './constants/NavigationTypes'
import { NavigationProps, RouteProps, RoutesParamsType } from './constants/NavigationTypes'
import buildConfig from './constants/buildConfig'
import useLoadRegionContent from './hooks/useLoadRegionContent'
import useNavigate from './hooks/useNavigate'
Expand Down Expand Up @@ -93,16 +94,18 @@ const createTabLabel =
)

type BottomTabNavigatorProps = {
route: RouteProps<BottomTabRouteType>
navigation: NavigationProps<BottomTabRouteType>
}

const BottomTabNavigator = ({ navigation }: BottomTabNavigatorProps): ReactElement | null => {
const BottomTabNavigator = ({ route, navigation }: BottomTabNavigatorProps): ReactElement | null => {
const { t } = useTranslation('layout')
const { regionCode, languageCode } = useRegionAppContext()
const { navigateTo } = useNavigate()
const insets = useSafeAreaInsets()
const { data, loading, error, refresh } = useLoadRegionContent({ regionCode, languageCode })
const cachedDataRef = useRef(data)
const activeTab = useNavigationState(() => getFocusedRouteNameFromRoute(route))

// Preserve previous data during language changes to prevent unmounting
if (data) {
Expand All @@ -129,7 +132,7 @@ const BottomTabNavigator = ({ navigation }: BottomTabNavigatorProps): ReactEleme
}

const { eventsEnabled, placesEnabled, localNewsEnabled, tuNewsEnabled, chatEnabled } = cachedData.region
const chatVisible = buildConfig().featureFlags.chat && chatEnabled
const chatVisible = buildConfig().featureFlags.chat && chatEnabled && activeTab !== PLACES_TAB_ROUTE

const Tabs = [
<Tab.Screen
Expand Down
Loading