Skip to content

Commit a67796c

Browse files
mountinymountiny
authored
Merge pull request Expensify#81136 from daledah/fix/81134
fix: reorder bottom navigation tabs: Swap Inbox and Reports positions
2 parents 0aeefd5 + 475440f commit a67796c

1 file changed

Lines changed: 49 additions & 49 deletions

File tree

  • src/components/Navigation/NavigationTabBar

‎src/components/Navigation/NavigationTabBar/index.tsx‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -318,76 +318,76 @@ function NavigationTabBar({selectedTab, isTopLevelBar = false, shouldShowFloatin
318318
)}
319319
</PressableWithFeedback>
320320
<PressableWithFeedback
321-
onPress={navigateToSearch}
321+
onPress={navigateToChats}
322322
role={CONST.ROLE.TAB}
323-
accessibilityLabel={translate('common.reports')}
324-
accessibilityState={searchAccessibilityState}
323+
accessibilityLabel={translate('common.inbox')}
324+
accessibilityState={inboxAccessibilityState}
325325
style={({hovered}) => [styles.leftNavigationTabBarItem, hovered && styles.navigationTabBarItemHovered]}
326-
sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.REPORTS}
326+
sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.INBOX}
327327
>
328328
{({hovered}) => (
329329
<>
330330
<View>
331331
<Icon
332-
src={expensifyIcons.MoneySearch}
333-
fill={getIconFill(selectedTab === NAVIGATION_TABS.SEARCH, hovered)}
332+
src={expensifyIcons.Inbox}
333+
fill={getIconFill(selectedTab === NAVIGATION_TABS.INBOX, hovered)}
334334
width={variables.iconBottomBar}
335335
height={variables.iconBottomBar}
336336
/>
337+
{!!chatTabBrickRoad && (
338+
<View
339+
style={[
340+
styles.navigationTabBarStatusIndicator,
341+
styles.statusIndicatorColor(chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger),
342+
hovered && {borderColor: theme.sidebarHover},
343+
]}
344+
/>
345+
)}
337346
</View>
338347
<Text
339348
numberOfLines={2}
340349
style={[
341350
styles.textSmall,
342351
styles.textAlignCenter,
343352
styles.mt1Half,
344-
selectedTab === NAVIGATION_TABS.SEARCH ? styles.textBold : styles.textSupporting,
353+
selectedTab === NAVIGATION_TABS.INBOX ? styles.textBold : styles.textSupporting,
345354
styles.navigationTabBarLabel,
346355
]}
347356
>
348-
{translate('common.reports')}
357+
{translate('common.inbox')}
349358
</Text>
350359
</>
351360
)}
352361
</PressableWithFeedback>
353362
<PressableWithFeedback
354-
onPress={navigateToChats}
363+
onPress={navigateToSearch}
355364
role={CONST.ROLE.TAB}
356-
accessibilityLabel={translate('common.inbox')}
357-
accessibilityState={inboxAccessibilityState}
365+
accessibilityLabel={translate('common.reports')}
366+
accessibilityState={searchAccessibilityState}
358367
style={({hovered}) => [styles.leftNavigationTabBarItem, hovered && styles.navigationTabBarItemHovered]}
359-
sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.INBOX}
368+
sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.REPORTS}
360369
>
361370
{({hovered}) => (
362371
<>
363372
<View>
364373
<Icon
365-
src={expensifyIcons.Inbox}
366-
fill={getIconFill(selectedTab === NAVIGATION_TABS.INBOX, hovered)}
374+
src={expensifyIcons.MoneySearch}
375+
fill={getIconFill(selectedTab === NAVIGATION_TABS.SEARCH, hovered)}
367376
width={variables.iconBottomBar}
368377
height={variables.iconBottomBar}
369378
/>
370-
{!!chatTabBrickRoad && (
371-
<View
372-
style={[
373-
styles.navigationTabBarStatusIndicator,
374-
styles.statusIndicatorColor(chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger),
375-
hovered && {borderColor: theme.sidebarHover},
376-
]}
377-
/>
378-
)}
379379
</View>
380380
<Text
381381
numberOfLines={2}
382382
style={[
383383
styles.textSmall,
384384
styles.textAlignCenter,
385385
styles.mt1Half,
386-
selectedTab === NAVIGATION_TABS.INBOX ? styles.textBold : styles.textSupporting,
386+
selectedTab === NAVIGATION_TABS.SEARCH ? styles.textBold : styles.textSupporting,
387387
styles.navigationTabBarLabel,
388388
]}
389389
>
390-
{translate('common.inbox')}
390+
{translate('common.reports')}
391391
</Text>
392392
</>
393393
)}
@@ -490,71 +490,71 @@ function NavigationTabBar({selectedTab, isTopLevelBar = false, shouldShowFloatin
490490
</Text>
491491
</PressableWithFeedback>
492492
<PressableWithFeedback
493-
onPress={navigateToSearch}
493+
onPress={navigateToChats}
494494
role={CONST.ROLE.TAB}
495-
accessibilityLabel={translate('common.reports')}
496-
accessibilityState={searchAccessibilityState}
495+
accessibilityLabel={translate('common.inbox')}
496+
accessibilityState={inboxAccessibilityState}
497497
wrapperStyle={styles.flex1}
498498
style={styles.navigationTabBarItem}
499-
sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.REPORTS}
499+
sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.INBOX}
500500
>
501501
<View>
502502
<Icon
503-
src={expensifyIcons.MoneySearch}
504-
fill={selectedTab === NAVIGATION_TABS.SEARCH ? theme.iconMenu : theme.icon}
503+
src={expensifyIcons.Inbox}
504+
fill={selectedTab === NAVIGATION_TABS.INBOX ? theme.iconMenu : theme.icon}
505505
width={variables.iconBottomBar}
506506
height={variables.iconBottomBar}
507507
/>
508+
{!!chatTabBrickRoad && (
509+
<View
510+
style={[
511+
styles.navigationTabBarStatusIndicator,
512+
styles.statusIndicatorColor(chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger),
513+
]}
514+
/>
515+
)}
508516
</View>
509517
<Text
510518
numberOfLines={1}
511519
style={[
512520
styles.textSmall,
513521
styles.textAlignCenter,
514522
styles.mt1Half,
515-
selectedTab === NAVIGATION_TABS.SEARCH ? styles.textBold : styles.textSupporting,
523+
selectedTab === NAVIGATION_TABS.INBOX ? styles.textBold : styles.textSupporting,
516524
styles.navigationTabBarLabel,
517525
]}
518526
>
519-
{translate('common.reports')}
527+
{translate('common.inbox')}
520528
</Text>
521529
</PressableWithFeedback>
522530
<PressableWithFeedback
523-
onPress={navigateToChats}
531+
onPress={navigateToSearch}
524532
role={CONST.ROLE.TAB}
525-
accessibilityLabel={translate('common.inbox')}
526-
accessibilityState={inboxAccessibilityState}
533+
accessibilityLabel={translate('common.reports')}
534+
accessibilityState={searchAccessibilityState}
527535
wrapperStyle={styles.flex1}
528536
style={styles.navigationTabBarItem}
529-
sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.INBOX}
537+
sentryLabel={CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.REPORTS}
530538
>
531539
<View>
532540
<Icon
533-
src={expensifyIcons.Inbox}
534-
fill={selectedTab === NAVIGATION_TABS.INBOX ? theme.iconMenu : theme.icon}
541+
src={expensifyIcons.MoneySearch}
542+
fill={selectedTab === NAVIGATION_TABS.SEARCH ? theme.iconMenu : theme.icon}
535543
width={variables.iconBottomBar}
536544
height={variables.iconBottomBar}
537545
/>
538-
{!!chatTabBrickRoad && (
539-
<View
540-
style={[
541-
styles.navigationTabBarStatusIndicator,
542-
styles.statusIndicatorColor(chatTabBrickRoad === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger),
543-
]}
544-
/>
545-
)}
546546
</View>
547547
<Text
548548
numberOfLines={1}
549549
style={[
550550
styles.textSmall,
551551
styles.textAlignCenter,
552552
styles.mt1Half,
553-
selectedTab === NAVIGATION_TABS.INBOX ? styles.textBold : styles.textSupporting,
553+
selectedTab === NAVIGATION_TABS.SEARCH ? styles.textBold : styles.textSupporting,
554554
styles.navigationTabBarLabel,
555555
]}
556556
>
557-
{translate('common.inbox')}
557+
{translate('common.reports')}
558558
</Text>
559559
</PressableWithFeedback>
560560
<PressableWithFeedback

0 commit comments

Comments
 (0)