Merge branch 'menu-changes' of Viktoriia/nomadmania-app into dev

Route.tsx

@@ -254,135 +254,135 @@ const Route = () => {
                 </ScreenStack.Navigator>
               )}
             </BottomTab.Screen>
-            <BottomTab.Screen name={NAVIGATION_PAGES.IN_APP_TRAVELLERS_TAB}>
+            <BottomTab.Screen name={NAVIGATION_PAGES.IN_APP_TRAVELS_TAB}>
               {() => (
                 <ScreenStack.Navigator screenOptions={screenOptions}>
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.TRAVELLERS_TAB}
-                    component={TravellersScreen}
+                    name={NAVIGATION_PAGES.TRAVELS_TAB}
+                    component={TravelsScreen}
                   />
+                  <ScreenStack.Screen name={NAVIGATION_PAGES.SERIES} component={SeriesScreen} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.MASTER_RANKING}
-                    component={MasterRankingScreen}
+                    name={NAVIGATION_PAGES.SERIES_ITEM}
+                    component={SeriesItemScreen}
                   />
-                  <ScreenStack.Screen name={NAVIGATION_PAGES.LPI_RANKING} component={LPIRanking} />
+                  <ScreenStack.Screen name={NAVIGATION_PAGES.EARTH} component={EarthScreen} />
+                  <ScreenStack.Screen name={NAVIGATION_PAGES.PHOTOS} component={PhotosScreen} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.IN_MEMORIAM}
-                    component={InMemoriamScreen}
+                    name={NAVIGATION_PAGES.MORE_PHOTOS}
+                    component={MorePhotosScreen}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.IN_HISTORY}
-                    component={InHistoryScreen}
+                    name={NAVIGATION_PAGES.ADD_PHOTO}
+                    component={AddPhotoScreen}
                   />
+                  <ScreenStack.Screen name={NAVIGATION_PAGES.TRIPS} component={TripsScreen} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.UN_MASTERS}
-                    component={UNMastersScreen}
+                    name={NAVIGATION_PAGES.ADD_TRIP}
+                    component={AddNewTripScreen}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.STATISTICS}
-                    component={StatisticsScreen}
+                    name={NAVIGATION_PAGES.ADD_REGIONS}
+                    component={AddRegionsScreen}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.PUBLIC_PROFILE_VIEW}
-                    component={ProfileScreen}
+                    name={NAVIGATION_PAGES.COUNTRIES}
+                    component={CountriesScreen}
                   />
+                  <ScreenStack.Screen name={NAVIGATION_PAGES.REGIONS} component={RegionsScreen} />
+                  <ScreenStack.Screen name={NAVIGATION_PAGES.DARE} component={DareScreen} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.STATISTICS_LIST_DATA}
-                    component={StatisticsListScreen}
+                    name={NAVIGATION_PAGES.REGION_PREVIEW}
+                    component={RegionViewScreen}
+                    options={regionViewScreenOptions}
                   />
-                  <ScreenStack.Screen name={NAVIGATION_PAGES.TRIUMPHS} component={TriumphsScreen} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.SERIES_RANKING}
-                    component={SeriesRankingScreen}
+                    name={NAVIGATION_PAGES.USERS_LIST}
+                    component={UsersListScreen}
+                    options={regionViewScreenOptions}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.SERIES_RANKING_LIST}
-                    component={SeriesRankingListScreen}
+                    name={NAVIGATION_PAGES.PUBLIC_PROFILE_VIEW}
+                    component={ProfileScreen}
                   />
                   <ScreenStack.Screen
                     name={NAVIGATION_PAGES.USERS_MAP}
                     component={UsersMapScreen}
                   />
+                  <ScreenStack.Screen
+                    name={NAVIGATION_PAGES.SUGGEST_SERIES}
+                    component={SuggestSeriesScreen}
+                  />
                   <ScreenStack.Screen
                     name={NAVIGATION_PAGES.FRIENDS_LIST}
                     component={UsersListScreen}
                     options={regionViewScreenOptions}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.MY_FRIENDS}
-                    component={MyFriendsScreen}
+                    name={NAVIGATION_PAGES.COUNTRY_PREVIEW}
+                    component={CountryViewScreen}
                     options={regionViewScreenOptions}
                   />
                 </ScreenStack.Navigator>
               )}
             </BottomTab.Screen>
-            <BottomTab.Screen name={NAVIGATION_PAGES.IN_APP_TRAVELS_TAB}>
+            <BottomTab.Screen name={NAVIGATION_PAGES.IN_APP_TRAVELLERS_TAB}>
               {() => (
                 <ScreenStack.Navigator screenOptions={screenOptions}>
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.TRAVELS_TAB}
-                    component={TravelsScreen}
+                    name={NAVIGATION_PAGES.TRAVELLERS_TAB}
+                    component={TravellersScreen}
                   />
-                  <ScreenStack.Screen name={NAVIGATION_PAGES.SERIES} component={SeriesScreen} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.SERIES_ITEM}
-                    component={SeriesItemScreen}
+                    name={NAVIGATION_PAGES.MASTER_RANKING}
+                    component={MasterRankingScreen}
                   />
-                  <ScreenStack.Screen name={NAVIGATION_PAGES.EARTH} component={EarthScreen} />
-                  <ScreenStack.Screen name={NAVIGATION_PAGES.PHOTOS} component={PhotosScreen} />
+                  <ScreenStack.Screen name={NAVIGATION_PAGES.LPI_RANKING} component={LPIRanking} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.MORE_PHOTOS}
-                    component={MorePhotosScreen}
+                    name={NAVIGATION_PAGES.IN_MEMORIAM}
+                    component={InMemoriamScreen}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.ADD_PHOTO}
-                    component={AddPhotoScreen}
+                    name={NAVIGATION_PAGES.IN_HISTORY}
+                    component={InHistoryScreen}
                   />
-                  <ScreenStack.Screen name={NAVIGATION_PAGES.TRIPS} component={TripsScreen} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.ADD_TRIP}
-                    component={AddNewTripScreen}
+                    name={NAVIGATION_PAGES.UN_MASTERS}
+                    component={UNMastersScreen}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.ADD_REGIONS}
-                    component={AddRegionsScreen}
+                    name={NAVIGATION_PAGES.STATISTICS}
+                    component={StatisticsScreen}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.COUNTRIES}
-                    component={CountriesScreen}
+                    name={NAVIGATION_PAGES.PUBLIC_PROFILE_VIEW}
+                    component={ProfileScreen}
                   />
-                  <ScreenStack.Screen name={NAVIGATION_PAGES.REGIONS} component={RegionsScreen} />
-                  <ScreenStack.Screen name={NAVIGATION_PAGES.DARE} component={DareScreen} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.REGION_PREVIEW}
-                    component={RegionViewScreen}
-                    options={regionViewScreenOptions}
+                    name={NAVIGATION_PAGES.STATISTICS_LIST_DATA}
+                    component={StatisticsListScreen}
                   />
+                  <ScreenStack.Screen name={NAVIGATION_PAGES.TRIUMPHS} component={TriumphsScreen} />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.USERS_LIST}
-                    component={UsersListScreen}
-                    options={regionViewScreenOptions}
+                    name={NAVIGATION_PAGES.SERIES_RANKING}
+                    component={SeriesRankingScreen}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.PUBLIC_PROFILE_VIEW}
-                    component={ProfileScreen}
+                    name={NAVIGATION_PAGES.SERIES_RANKING_LIST}
+                    component={SeriesRankingListScreen}
                   />
                   <ScreenStack.Screen
                     name={NAVIGATION_PAGES.USERS_MAP}
                     component={UsersMapScreen}
                   />
-                  <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.SUGGEST_SERIES}
-                    component={SuggestSeriesScreen}
-                  />
                   <ScreenStack.Screen
                     name={NAVIGATION_PAGES.FRIENDS_LIST}
                     component={UsersListScreen}
                     options={regionViewScreenOptions}
                   />
                   <ScreenStack.Screen
-                    name={NAVIGATION_PAGES.COUNTRY_PREVIEW}
-                    component={CountryViewScreen}
+                    name={NAVIGATION_PAGES.MY_FRIENDS}
+                    component={MyFriendsScreen}
                     options={regionViewScreenOptions}
                   />
                 </ScreenStack.Navigator>

src/screens/InAppScreens/TravellersScreen/index.tsx

@@ -63,7 +63,7 @@ const TravellersScreen = () => {
     <PageWrapper>
       <View style={styles.header}>
         <View style={{ width: 30 }} />
-        <Text style={styles.title}>Travellers</Text>
+        <Text style={styles.title}>Nomads</Text>
         <TouchableOpacity
           onPress={() => navigation.navigate(NAVIGATION_PAGES.JOIN_INFO as never)}
           style={{ width: 30 }}

src/types/navigation.ts

@@ -18,7 +18,7 @@ export enum NAVIGATION_PAGES {
   IN_APP = 'inAppStack',
   IN_APP_MAP_TAB = 'Map',
   MAP_TAB = 'inAppMapTab',
-  IN_APP_TRAVELLERS_TAB = 'Travellers',
+  IN_APP_TRAVELLERS_TAB = 'Nomads',
   TRAVELLERS_TAB = 'inAppTravellers',
   MASTER_RANKING = 'inAppMasterRanking',
   LPI_RANKING = 'inAppLpiRanking',