Refactor: Update getTabIconFill function to accept an object for parameters and simplify last route retrieval logic

Author: BartekObudzinski

src/components/Navigation/NavigationTabBar/SearchTabButton.tsx

@@ -105,7 +105,7 @@ function SearchTabButton({selectedTab, isWideLayout}: SearchTabButtonProps) {
                         <View>
                             <Icon
                                 src={expensifyIcons.MoneySearch}
-                                fill={getTabIconFill(theme, selectedTab === NAVIGATION_TABS.SEARCH, hovered)}
+                                fill={getTabIconFill(theme, {isSelected: selectedTab === NAVIGATION_TABS.SEARCH, isHovered: hovered})}
                                 width={variables.iconBottomBar}
                                 height={variables.iconBottomBar}
                             />

src/components/Navigation/NavigationTabBar/WorkspacesTabButton.tsx

@@ -109,7 +109,7 @@ function WorkspacesTabButton({selectedTab, isWideLayout}: WorkspacesTabButtonPro
                         <View>
                             <Icon
                                 src={expensifyIcons.Buildings}
-                                fill={getTabIconFill(theme, selectedTab === NAVIGATION_TABS.WORKSPACES, hovered)}
+                                fill={getTabIconFill(theme, {isSelected: selectedTab === NAVIGATION_TABS.WORKSPACES, isHovered: hovered})}
                                 width={variables.iconBottomBar}
                                 height={variables.iconBottomBar}
                             />

src/components/Navigation/NavigationTabBar/getLastRoute.ts

@@ -6,7 +6,7 @@ import type {Screen} from '@src/SCREENS';
 
 function getLastRoute(rootState: NavigationState, navigator: ValueOf<typeof NAVIGATORS>, screen: Screen) {
     const lastNavigator = rootState.routes.findLast((route) => route.name === navigator);
-    const lastNavigatorState = lastNavigator && lastNavigator.key ? getPreservedNavigatorState(lastNavigator?.key) : undefined;
+    const lastNavigatorState = lastNavigator?.key ? getPreservedNavigatorState(lastNavigator.key) : undefined;
     const lastRoute = lastNavigatorState?.routes.findLast((route) => route.name === screen);
     return lastRoute;
 }

src/components/Navigation/NavigationTabBar/getTabIconFill.ts

@@ -1,6 +1,11 @@
 import type {ThemeColors} from '@styles/theme/types';
 
-function getTabIconFill(theme: ThemeColors, isSelected: boolean, isHovered: boolean): string {
+type GetTabIconFillConfig = {
+    isSelected: boolean;
+    isHovered: boolean;
+};
+
+function getTabIconFill(theme: ThemeColors, {isSelected, isHovered}: GetTabIconFillConfig): string {
     if (isSelected) {
         return theme.iconMenu;
     }

src/components/Navigation/NavigationTabBar/index.tsx

@@ -178,7 +178,7 @@ function NavigationTabBar({selectedTab, isTopLevelBar = false, shouldShowFloatin
                                     <View>
                                         <Icon
                                             src={expensifyIcons.Home}
-                                            fill={getTabIconFill(theme, selectedTab === NAVIGATION_TABS.HOME, hovered)}
+                                            fill={getTabIconFill(theme, {isSelected: selectedTab === NAVIGATION_TABS.HOME, isHovered: hovered})}
                                             width={variables.iconBottomBar}
                                             height={variables.iconBottomBar}
                                         />
@@ -211,7 +211,7 @@ function NavigationTabBar({selectedTab, isTopLevelBar = false, shouldShowFloatin
                                     <View>
                                         <Icon
                                             src={expensifyIcons.Inbox}
-                                            fill={getTabIconFill(theme, selectedTab === NAVIGATION_TABS.INBOX, hovered)}
+                                            fill={getTabIconFill(theme, {isSelected: selectedTab === NAVIGATION_TABS.INBOX, isHovered: hovered})}
                                             width={variables.iconBottomBar}
                                             height={variables.iconBottomBar}
                                         />