Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/pages/inbox/sidebar/NavigationTabBarAvatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
Expand All @@ -32,6 +33,7 @@ function NavigationTabBarAvatar({onPress, isSelected = false, style}: Navigation
const delegateEmail = account?.delegatedAccess?.delegate ?? '';
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const emojiStatus = currentUserPersonalDetails?.status?.emojiCode ?? '';
const {shouldUseNarrowLayout} = useResponsiveLayout();
const {status} = useAccountTabIndicatorStatus();

/**
Expand Down Expand Up @@ -76,12 +78,12 @@ function NavigationTabBarAvatar({onPress, isSelected = false, style}: Navigation
wrapperStyle={styles.flex1}
accessibilityState={accountAccessibilityState}
aria-selected={accountAccessibilityState.selected}
style={({hovered}) => [style, hovered && styles.navigationTabBarItemHovered]}
style={({hovered}) => [style, !shouldUseNarrowLayout && hovered && styles.navigationTabBarItemHovered]}
sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.ACCOUNT}
>
{({hovered}) => (
<>
{renderAvatar(isSelected || hovered)}
{renderAvatar(isSelected || (!shouldUseNarrowLayout && hovered))}
<Text style={[styles.textSmall, styles.textAlignCenter, isSelected ? styles.textBold : styles.textSupporting, styles.mt0Half, styles.navigationTabBarLabel]}>
{translate('initialSettingsPage.account')}
</Text>
Expand Down
Loading