trips beta fixes

Route.tsx

@@ -364,16 +364,7 @@ const Route = () => {
             <ScreenStack.Screen name={NAVIGATION_PAGES.ADD_PHOTO} component={AddPhotoScreen} />
             <ScreenStack.Screen name={NAVIGATION_PAGES.TRIPS} component={TripsScreen} />
             <ScreenStack.Screen name={NAVIGATION_PAGES.ADD_TRIP} component={AddNewTripScreen} />
-            <ScreenStack.Screen name={NAVIGATION_PAGES.TRIPS_2025} component={Trips2025Screen} />
-            <ScreenStack.Screen
-              name={NAVIGATION_PAGES.ADD_TRIP_2025}
-              component={AddNewTrip2025Screen}
-            />
             <ScreenStack.Screen name={NAVIGATION_PAGES.ADD_REGIONS} component={AddRegionsScreen} />
-            <ScreenStack.Screen
-              name={NAVIGATION_PAGES.ADD_REGIONS_NEW}
-              component={AddRegionsNewScreen}
-            />
             <ScreenStack.Screen
               name={NAVIGATION_PAGES.REGIONS_VISITED}
               component={RegionsVisitedScreen}
@@ -494,6 +485,55 @@ const Route = () => {
           </ScreenStack.Navigator>
         )}
       </BottomTab.Screen>
+
+      <BottomTab.Screen
+        name={NAVIGATION_PAGES.IN_APP_TRIPS_TAB}
+        layout={({ children }) => <UnmountOnBlur>{children}</UnmountOnBlur>}
+      >
+        {() => (
+          <ScreenStack.Navigator screenOptions={screenOptions}>
+            <ScreenStack.Screen name={NAVIGATION_PAGES.TRIPS_2025} component={Trips2025Screen} />
+            <ScreenStack.Screen
+              name={NAVIGATION_PAGES.ADD_TRIP_2025}
+              component={AddNewTrip2025Screen}
+            />
+            <ScreenStack.Screen
+              name={NAVIGATION_PAGES.ADD_REGIONS_NEW}
+              component={AddRegionsNewScreen}
+            />
+            <ScreenStack.Screen
+              name={NAVIGATION_PAGES.REGIONS_VISITED}
+              component={RegionsVisitedScreen}
+            />
+            <ScreenStack.Screen
+              name={NAVIGATION_PAGES.EDIT_COUNTRY_DATA}
+              component={EditCountryDataScreen}
+            />
+            <ScreenStack.Screen name={NAVIGATION_PAGES.EDIT_NM_DATA} component={EditNmDataScreen} />
+            <ScreenStack.Screen
+              name={NAVIGATION_PAGES.REGION_PREVIEW}
+              component={RegionViewScreen}
+              options={regionViewScreenOptions}
+            />
+            <ScreenStack.Screen
+              name={NAVIGATION_PAGES.USERS_LIST}
+              component={UsersListScreen}
+              options={regionViewScreenOptions}
+            />
+            <ScreenStack.Screen
+              name={NAVIGATION_PAGES.PUBLIC_PROFILE_VIEW}
+              component={ProfileScreen}
+            />
+            <ScreenStack.Screen name={NAVIGATION_PAGES.USERS_MAP} component={UsersMapScreen} />
+            <ScreenStack.Screen name={NAVIGATION_PAGES.ADD_PHOTO} component={AddPhotoScreen} />
+            <ScreenStack.Screen
+              name={NAVIGATION_PAGES.COUNTRY_PREVIEW}
+              component={CountryViewScreen}
+              options={regionViewScreenOptions}
+            />
+          </ScreenStack.Navigator>
+        )}
+      </BottomTab.Screen>
       <BottomTab.Screen
         name={NAVIGATION_PAGES.IN_APP_EVENTS_TAB}
         layout={({ children }) => <UnmountOnBlur>{children}</UnmountOnBlur>}

assets/icons/travels-section/trip.svg

@@ -1,8 +1,8 @@
 <svg width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_2651_21790)">
-<path d="M6.04267 13.4061C7.42034 11.682 10.5624 7.50335 10.5624 5.1562C10.5624 2.30955 8.25285 0 5.4062 0C2.55955 0 0.25 2.30955 0.25 5.1562C0.25 7.50335 3.39206 11.682 4.76973 13.4061C5.10005 13.817 5.71235 13.817 6.04267 13.4061ZM5.4062 3.43747C5.63198 3.43735 5.85557 3.48173 6.06419 3.56805C6.27282 3.65438 6.46239 3.78096 6.62208 3.94057C6.78177 4.10018 6.90845 4.28969 6.99488 4.49827C7.08131 4.70685 7.12579 4.93042 7.12579 5.1562C7.12579 5.38198 7.08131 5.60555 6.99488 5.81413C6.90845 6.02271 6.78177 6.21222 6.62208 6.37183C6.46239 6.53144 6.27282 6.65803 6.06419 6.74435C5.85557 6.83067 5.63198 6.87505 5.4062 6.87493C5.18042 6.87505 4.95683 6.83067 4.74821 6.74435C4.53958 6.65803 4.35001 6.53144 4.19032 6.37183C4.03063 6.21222 3.90395 6.02271 3.81752 5.81413C3.73109 5.60555 3.68661 5.38198 3.68661 5.1562C3.68661 4.93042 3.73109 4.70685 3.81752 4.49827C3.90395 4.28969 4.03063 4.10018 4.19032 3.94057C4.35001 3.78096 4.53958 3.65438 4.74821 3.56805C4.95683 3.48173 5.18042 3.43735 5.4062 3.43747Z" fill="#ED9334"/>
-<path d="M6.23145 31.9211C3.54057 31.4694 1.31694 29.4718 0.494111 26.7667C0.309137 26.1587 0.289431 25.9795 0.283881 24.8548C0.278616 23.7843 0.3013 23.5277 0.44918 22.9868C1.08142 20.6744 2.8329 18.7671 5.02215 18.0071C6.18768 17.6025 5.97638 17.6143 12.9132 17.5664L19.3814 17.5217L19.7044 17.3492C20.2023 17.0834 20.5974 16.6851 20.827 16.2176C21.109 15.6434 21.1216 14.7882 20.8568 14.1963C20.6488 13.7313 20.0863 13.1785 19.5858 12.9473C19.2335 12.7845 19.194 12.7832 13.9837 12.7622L8.73647 12.7409L9.14241 12.2357C9.6121 11.6511 10.4022 10.4626 10.6658 9.94417L10.8475 9.58691H15.1212C19.1593 9.58691 19.4278 9.59527 19.9899 9.73853C21.6197 10.1539 22.8651 11.1357 23.6341 12.6114C24.066 13.4402 24.2477 14.1897 24.2502 15.1525C24.2528 16.1537 24.1039 16.7902 23.6518 17.7097C23.356 18.3114 23.193 18.5316 22.6195 19.1041C21.884 19.8386 21.2324 20.2368 20.2087 20.5776L19.6823 20.7528L13.1389 20.7919C6.6239 20.8308 6.59359 20.8317 6.15683 20.9967C4.90841 21.4683 4.06853 22.3136 3.63897 23.5309C3.39672 24.2174 3.37078 25.2761 3.58075 25.9078C3.80697 26.5883 4.14128 27.1501 4.58809 27.6005C5.0661 28.0823 5.45454 28.3296 6.17284 28.6094L6.67071 28.8034L13.7597 28.8247L20.8487 28.8461L21.1209 29.3865C21.4586 30.0572 21.8856 30.7447 22.4054 31.4546L22.8046 31.9999L14.7 31.991C10.2425 31.9862 6.43168 31.9547 6.23145 31.9211Z" fill="#ED9334"/>
-<path d="M27.7302 31.6923C29.1078 29.9682 32.2499 25.7895 32.2499 23.4423C32.2499 20.5957 29.9404 18.2861 27.0937 18.2861C24.247 18.2861 21.9375 20.5957 21.9375 23.4423C21.9375 25.7895 25.0796 29.9682 26.4572 31.6923C26.7876 32.1031 27.3998 32.1031 27.7302 31.6923ZM27.0937 21.7236C27.3194 21.7235 27.543 21.7679 27.7516 21.8543C27.9602 21.9406 28.1497 22.0672 28.3093 22.2268C28.469 22.3864 28.5956 22.5759 28.682 22.7845C28.7685 22.993 28.8129 23.2166 28.8129 23.4423C28.8129 23.6681 28.7685 23.8916 28.682 24.1002C28.5956 24.3087 28.469 24.4982 28.3093 24.6578C28.1497 24.8174 27.9602 24.944 27.7516 25.0304C27.543 25.1167 27.3194 25.1611 27.0937 25.1611C26.8679 25.1611 26.6444 25.1167 26.4358 25.0304C26.2272 24.944 26.0377 24.8174 25.878 24.6578C25.7184 24.4982 25.5918 24.3087 25.5053 24.1002C25.4189 23.8916 25.3745 23.6681 25.3745 23.4423C25.3745 23.2166 25.4189 22.993 25.5053 22.7845C25.5918 22.5759 25.7184 22.3864 25.878 22.2268C26.0377 22.0672 26.2272 21.9406 26.4358 21.8543C26.6444 21.7679 26.8679 21.7235 27.0937 21.7236Z" fill="#ED9334"/>
+<path d="M6.04267 13.4061C7.42034 11.682 10.5624 7.50335 10.5624 5.1562C10.5624 2.30955 8.25285 0 5.4062 0C2.55955 0 0.25 2.30955 0.25 5.1562C0.25 7.50335 3.39206 11.682 4.76973 13.4061C5.10005 13.817 5.71235 13.817 6.04267 13.4061ZM5.4062 3.43747C5.63198 3.43735 5.85557 3.48173 6.06419 3.56805C6.27282 3.65438 6.46239 3.78096 6.62208 3.94057C6.78177 4.10018 6.90845 4.28969 6.99488 4.49827C7.08131 4.70685 7.12579 4.93042 7.12579 5.1562C7.12579 5.38198 7.08131 5.60555 6.99488 5.81413C6.90845 6.02271 6.78177 6.21222 6.62208 6.37183C6.46239 6.53144 6.27282 6.65803 6.06419 6.74435C5.85557 6.83067 5.63198 6.87505 5.4062 6.87493C5.18042 6.87505 4.95683 6.83067 4.74821 6.74435C4.53958 6.65803 4.35001 6.53144 4.19032 6.37183C4.03063 6.21222 3.90395 6.02271 3.81752 5.81413C3.73109 5.60555 3.68661 5.38198 3.68661 5.1562C3.68661 4.93042 3.73109 4.70685 3.81752 4.49827C3.90395 4.28969 4.03063 4.10018 4.19032 3.94057C4.35001 3.78096 4.53958 3.65438 4.74821 3.56805C4.95683 3.48173 5.18042 3.43735 5.4062 3.43747Z"/>
+<path d="M6.23145 31.9211C3.54057 31.4694 1.31694 29.4718 0.494111 26.7667C0.309137 26.1587 0.289431 25.9795 0.283881 24.8548C0.278616 23.7843 0.3013 23.5277 0.44918 22.9868C1.08142 20.6744 2.8329 18.7671 5.02215 18.0071C6.18768 17.6025 5.97638 17.6143 12.9132 17.5664L19.3814 17.5217L19.7044 17.3492C20.2023 17.0834 20.5974 16.6851 20.827 16.2176C21.109 15.6434 21.1216 14.7882 20.8568 14.1963C20.6488 13.7313 20.0863 13.1785 19.5858 12.9473C19.2335 12.7845 19.194 12.7832 13.9837 12.7622L8.73647 12.7409L9.14241 12.2357C9.6121 11.6511 10.4022 10.4626 10.6658 9.94417L10.8475 9.58691H15.1212C19.1593 9.58691 19.4278 9.59527 19.9899 9.73853C21.6197 10.1539 22.8651 11.1357 23.6341 12.6114C24.066 13.4402 24.2477 14.1897 24.2502 15.1525C24.2528 16.1537 24.1039 16.7902 23.6518 17.7097C23.356 18.3114 23.193 18.5316 22.6195 19.1041C21.884 19.8386 21.2324 20.2368 20.2087 20.5776L19.6823 20.7528L13.1389 20.7919C6.6239 20.8308 6.59359 20.8317 6.15683 20.9967C4.90841 21.4683 4.06853 22.3136 3.63897 23.5309C3.39672 24.2174 3.37078 25.2761 3.58075 25.9078C3.80697 26.5883 4.14128 27.1501 4.58809 27.6005C5.0661 28.0823 5.45454 28.3296 6.17284 28.6094L6.67071 28.8034L13.7597 28.8247L20.8487 28.8461L21.1209 29.3865C21.4586 30.0572 21.8856 30.7447 22.4054 31.4546L22.8046 31.9999L14.7 31.991C10.2425 31.9862 6.43168 31.9547 6.23145 31.9211Z"/>
+<path d="M27.7302 31.6923C29.1078 29.9682 32.2499 25.7895 32.2499 23.4423C32.2499 20.5957 29.9404 18.2861 27.0937 18.2861C24.247 18.2861 21.9375 20.5957 21.9375 23.4423C21.9375 25.7895 25.0796 29.9682 26.4572 31.6923C26.7876 32.1031 27.3998 32.1031 27.7302 31.6923ZM27.0937 21.7236C27.3194 21.7235 27.543 21.7679 27.7516 21.8543C27.9602 21.9406 28.1497 22.0672 28.3093 22.2268C28.469 22.3864 28.5956 22.5759 28.682 22.7845C28.7685 22.993 28.8129 23.2166 28.8129 23.4423C28.8129 23.6681 28.7685 23.8916 28.682 24.1002C28.5956 24.3087 28.469 24.4982 28.3093 24.6578C28.1497 24.8174 27.9602 24.944 27.7516 25.0304C27.543 25.1167 27.3194 25.1611 27.0937 25.1611C26.8679 25.1611 26.6444 25.1167 26.4358 25.0304C26.2272 24.944 26.0377 24.8174 25.878 24.6578C25.7184 24.4982 25.5918 24.3087 25.5053 24.1002C25.4189 23.8916 25.3745 23.6681 25.3745 23.4423C25.3745 23.2166 25.4189 22.993 25.5053 22.7845C25.5918 22.5759 25.7184 22.3864 25.878 22.2268C26.0377 22.0672 26.2272 21.9406 26.4358 21.8543C26.6444 21.7679 26.8679 21.7235 27.0937 21.7236Z"/>
 </g>
 <defs>
 <clipPath id="clip0_2651_21790">

src/components/TabBarButton/index.tsx

@@ -9,6 +9,7 @@ import GlobeIcon from '../../../assets/icons/bottom-navigation/globe-solid.svg';
 import MenuIcon from '../../../assets/icons/menu.svg';
 import MessagesIcon from '../../../assets/icons/bottom-navigation/messages.svg';
 import CalendarIcon from 'assets/icons/events/calendar-solid.svg';
+import TripIcon from 'assets/icons/travels-section/trip.svg';
 
 import { Colors } from '../../theme';
 import { styles } from './style';
@@ -28,6 +29,8 @@ const getTabIcon = (routeName: string) => {
       return TravellersIcon;
     case NAVIGATION_PAGES.IN_APP_TRAVELS_TAB:
       return GlobeIcon;
+    case NAVIGATION_PAGES.IN_APP_TRIPS_TAB:
+      return TripIcon;
     case NAVIGATION_PAGES.IN_APP_EVENTS_TAB:
       return CalendarIcon;
     case NAVIGATION_PAGES.IN_APP_MESSAGES_TAB:
@@ -84,6 +87,29 @@ const TabBarButton = ({
           {label === NAVIGATION_PAGES.IN_APP_MESSAGES_TAB && unreadMessagesCount > 0 && (
             <MessagesDot messagesCount={unreadMessagesCount} />
           )}
+          {label === NAVIGATION_PAGES.IN_APP_TRIPS_TAB && (
+            <View
+              style={{
+                backgroundColor: '#0f9113',
+                paddingHorizontal: 4,
+                paddingVertical: 1,
+                position: 'absolute',
+                top: -2,
+                right: 0,
+                borderRadius: 8
+              }}
+            >
+              <Text
+                style={{
+                  color: Colors.WHITE,
+                  fontSize: 7,
+                  fontFamily: 'montserrat-700'
+                }}
+              >
+                BETA
+              </Text>
+            </View>
+          )}
           <Text style={[styles.labelStyle, { color: currentColor }]}>{label}</Text>
         </View>
         <WarningModal

src/screens/InAppScreens/MapScreen/RegionViewScreen/index.tsx

@@ -128,7 +128,7 @@ const RegionViewScreen: FC<Props> = ({ navigation, route }) => {
         setSeries(data?.data?.series || []);
         setRoutes(staticGroups);
         if (regionData?.id !== regionId) {
-          setRegionData(data?.data || {});
+          setRegionData({ ...(data?.data || {}), type });
         }
         setIsLoading(false);
       };

src/screens/InAppScreens/TravelsScreen/AddNewTrip2025Screen/index.tsx

@@ -20,6 +20,8 @@ import {
 import { styles } from './styles';
 
 import { ActivityIndicator } from 'react-native-paper';
+import ActionSheet, { ActionSheetRef } from 'react-native-actions-sheet';
+import SummarySheet from '../Components/SummarySheet';
 
 interface DateValue {
   year: number | null;
@@ -55,6 +57,17 @@ const AddNewTripScreen = ({ route }: { route: any }) => {
   const [calendarVisibleForIndex, setCalendarVisibleForIndex] = useState<number | null>(null);
 
   const [regionErrors, setRegionErrors] = useState<{ [instanceId: string]: string }>({});
+  const [shouldScrollToEmpty, setShouldScrollToEmpty] = useState(false);
+
+  const summarySheetRef = React.useRef<ActionSheetRef>(null);
+
+  const [summaryData, setSummaryData] = useState({
+    totalDays: 0,
+    perRegion: []
+  });
+
+  const [pendingAction, setPendingAction] = useState<'save' | 'update' | null>(null);
+  const isClosingRef = React.useRef<boolean>(null);
 
   const { mutate: saveNewTrip } = usePostSetNewTripMutation();
   const { mutate: updateTrip } = usePostUpdateTripMutation();
@@ -72,6 +85,64 @@ const AddNewTripScreen = ({ route }: { route: any }) => {
     scrollRef.current?.scrollTo({ y: idx * itemHeight, animated: true });
   };
 
+  const scrollToEmpty = () => {
+    if (!regions?.length) return;
+
+    const idx = regions.findIndex((r) => {
+      const startOK = isFullDate(r.visitStartDate);
+      const endOK = isFullDate(r.visitEndDate);
+      return !(startOK && endOK);
+    });
+
+    if (idx === -1) return;
+
+    const itemHeight = 160;
+    scrollRef.current?.scrollTo({
+      y: idx * itemHeight,
+      animated: true
+    });
+  };
+
+  const computeTripSummary = (list: RegionWithDates[]) => {
+    const daySet = new Set<string>();
+    const perRegionMap: Record<number, any> = {};
+
+    for (const r of list) {
+      if (!isFullDate(r.visitStartDate) || !isFullDate(r.visitEndDate)) continue;
+
+      const startISO = dateValueToISO(r.visitStartDate)!;
+      const endISO = dateValueToISO(r.visitEndDate)!;
+
+      let cursor = moment(startISO);
+      const end = moment(endISO);
+
+      let regionDays = 0;
+
+      while (cursor.isSameOrBefore(end)) {
+        daySet.add(cursor.format('YYYY-MM-DD'));
+        regionDays++;
+        cursor = cursor.add(1, 'day');
+      }
+
+      if (!perRegionMap[r.id]) {
+        perRegionMap[r.id] = {
+          id: r.id,
+          name: r.region_name,
+          days: 0,
+          flag1: r.flag1,
+          flag2: r?.flag2
+        };
+      }
+
+      perRegionMap[r.id].days += regionDays;
+    }
+
+    return {
+      totalDays: daySet.size,
+      perRegion: Object.values(perRegionMap)
+    };
+  };
+
   const autoFillAfterAppend = (list: RegionWithDates[]) => {
     if (!list || list.length === 0) return list;
 
@@ -121,11 +192,21 @@ const AddNewTripScreen = ({ route }: { route: any }) => {
     return updated;
   };
 
+  useEffect(() => {
+    if (!shouldScrollToEmpty || !regions) return;
+
+    requestAnimationFrame(() => {
+      scrollToEmpty();
+      setShouldScrollToEmpty(false);
+    });
+  }, [shouldScrollToEmpty, regions]);
+
   useEffect(() => {
     if (route.params?.regionsToSave) {
       const filled = autoFillAfterAppend(route.params.regionsToSave);
 
       setRegions(filled);
+      setShouldScrollToEmpty(true);
     }
   }, [route.params?.regionsToSave]);
 
@@ -348,13 +429,10 @@ const AddNewTripScreen = ({ route }: { route: any }) => {
     return { date_from: minStart, date_to: maxEnd };
   };
 
-  const handleSaveNewTrip = () => {
-    if (regions) {
-      if (!validateRegionsDates(regions)) {
-        scrollToError(regionErrors);
-        return;
-      }
+  const performSaveNewTrip = async () => {
+    if (!regions) return;
 
+    try {
       setIsLoading('save');
       const regionsData = regions.map((region) => {
         return {
@@ -398,16 +476,15 @@ const AddNewTripScreen = ({ route }: { route: any }) => {
           }
         }
       );
+    } catch (err) {
+      console.log('Save trip failed', err);
     }
   };
 
-  const handleUpdateTrip = () => {
-    if (regions) {
-      if (!validateRegionsDates(regions)) {
-        scrollToError(regionErrors);
-        return;
-      }
+  const performUpdateTrip = async () => {
+    if (!regions) return;
 
+    try {
       setIsLoading('update');
       const regionsData = regions.map((region) => {
         return {
@@ -452,6 +529,52 @@ const AddNewTripScreen = ({ route }: { route: any }) => {
           }
         }
       );
+    } catch (err) {
+      console.log('Update trip failed', err);
+    }
+  };
+
+  const handleSaveNewTrip = () => {
+    if (regions) {
+      if (!validateRegionsDates(regions)) {
+        scrollToError(regionErrors);
+        return;
+      }
+
+      const summary = computeTripSummary(regions);
+      if (summary) {
+        setSummaryData({
+          ...summary,
+          perRegion: summary.perRegion?.sort((a: any, b: any) => b.days - a.days) || []
+        });
+      } else {
+        setSummaryData({ totalDays: 0, perRegion: [] });
+      }
+      setPendingAction('save');
+
+      summarySheetRef.current?.show();
+    }
+  };
+
+  const handleUpdateTrip = () => {
+    if (regions) {
+      if (!validateRegionsDates(regions)) {
+        scrollToError(regionErrors);
+        return;
+      }
+
+      const summary = computeTripSummary(regions);
+      if (summary) {
+        setSummaryData({
+          ...summary,
+          perRegion: summary.perRegion?.sort((a: any, b: any) => b.days - a.days) || []
+        });
+      } else {
+        setSummaryData({ totalDays: 0, perRegion: [] });
+      }
+      setPendingAction('update');
+
+      summarySheetRef.current?.show();
     }
   };
 
@@ -464,12 +587,12 @@ const AddNewTripScreen = ({ route }: { route: any }) => {
         showsVerticalScrollIndicator={false}
       >
         <Input
-          placeholder="Add description and all interesting moments of your trip"
+          // placeholder="Add description and all interesting moments of your trip"
           inputMode={'text'}
           onChange={(text) => setDescription(text)}
           value={description}
           header="Description"
-          height={54}
+          height={36}
           multiline={true}
         />
 
@@ -632,6 +755,21 @@ const AddNewTripScreen = ({ route }: { route: any }) => {
           }
         }}
       />
+
+      <SummarySheet
+        ref={summarySheetRef}
+        summary={summaryData}
+        onConfirm={async () => {
+          summarySheetRef.current?.hide();
+          isClosingRef.current = true;
+        }}
+        onClose={async () => {
+          if (!isClosingRef.current) return;
+          if (pendingAction === 'save') performSaveNewTrip();
+          if (pendingAction === 'update') performUpdateTrip();
+          isClosingRef.current = false;
+        }}
+      />
     </PageWrapper>
   );
 };

src/screens/InAppScreens/TravelsScreen/Components/SummarySheet.tsx

@@ -0,0 +1,192 @@
+import React from 'react';
+import { View, Text, ScrollView, TouchableOpacity, Image } from 'react-native';
+import ActionSheet, { ActionSheetRef } from 'react-native-actions-sheet';
+import { API_HOST } from 'src/constants';
+import { Colors } from 'src/theme';
+import { getFontSize } from 'src/utils';
+
+type SummaryItem = {
+  id: number;
+  name: string;
+  days: number;
+  flag1: string;
+  flag2: string | null;
+};
+
+type Props = {
+  summary: {
+    totalDays: number;
+    perRegion: SummaryItem[];
+  };
+  onConfirm: () => void;
+  onClose: () => void;
+};
+
+const SummarySheet = React.forwardRef<ActionSheetRef, Props>(
+  ({ summary, onConfirm, onClose }, ref) => {
+    return (
+      <ActionSheet
+        ref={ref}
+        onClose={onClose}
+        containerStyle={{
+          paddingHorizontal: '5%',
+          paddingTop: 20,
+          borderTopLeftRadius: 15,
+          borderTopRightRadius: 15,
+          maxHeight: '90%'
+        }}
+      >
+        <ScrollView
+          showsVerticalScrollIndicator={false}
+          contentContainerStyle={{ paddingBottom: 12 }}
+        >
+          <Text
+            style={{
+              fontSize: 16,
+              fontWeight: '700',
+              marginBottom: 12,
+              textAlign: 'center',
+              color: Colors.DARK_BLUE
+            }}
+          >
+            Trip Summary
+          </Text>
+
+          <Text
+            style={{
+              fontSize: 14,
+              marginBottom: 16,
+              textAlign: 'center',
+              fontFamily: 'montserrat-700',
+              color: Colors.DARK_BLUE
+            }}
+          >
+            {summary.totalDays} days travelled
+          </Text>
+
+          <Text
+            style={{
+              fontSize: 13,
+              fontWeight: '600',
+              marginBottom: 10,
+              color: Colors.DARK_BLUE
+            }}
+          >
+            Per region:
+          </Text>
+
+          {summary.perRegion.map((r) => (
+            <View
+              key={r.id}
+              style={{
+                flexDirection: 'row',
+                alignItems: 'center',
+                marginBottom: 12,
+                justifyContent: 'space-between',
+                gap: 6
+              }}
+            >
+              <View style={{ flexDirection: 'row', gap: 8, alignItems: 'center', flex: 1 }}>
+                <Image
+                  source={{
+                    uri: API_HOST + '/img/flags_new/' + r?.flag1
+                  }}
+                  style={{
+                    width: 32,
+                    height: 32,
+                    borderRadius: 32 / 2,
+                    borderWidth: 1,
+                    borderColor: Colors.FILL_LIGHT
+                  }}
+                />
+                {r?.flag2 ? (
+                  <Image
+                    source={{ uri: API_HOST + '/img/flags_new/' + r.flag2 }}
+                    style={[
+                      {
+                        width: 32,
+                        height: 32,
+                        borderRadius: 32 / 2,
+                        borderWidth: 1,
+                        borderColor: Colors.FILL_LIGHT,
+                        marginLeft: -18
+                      }
+                    ]}
+                  />
+                ) : null}
+                <View style={{ flexShrink: 1 }}>
+                  <Text style={{ fontSize: 12, fontWeight: '600', color: Colors.DARK_BLUE }}>
+                    {r.name}
+                  </Text>
+                </View>
+              </View>
+              <Text style={{ fontSize: 13, fontWeight: '600', color: Colors.DARK_BLUE }}>
+                {r.days} {r.days === 1 ? 'day' : 'days'}
+              </Text>
+            </View>
+          ))}
+        </ScrollView>
+
+        <View
+          style={{
+            paddingBottom: 24,
+            justifyContent: 'flex-end',
+            gap: 6
+          }}
+        >
+          <TouchableOpacity
+            style={{
+              backgroundColor: Colors.ORANGE,
+              borderWidth: 1,
+              borderColor: Colors.ORANGE,
+              borderRadius: 4,
+              alignItems: 'center',
+              justifyContent: 'center',
+              paddingHorizontal: 16,
+              paddingVertical: 12
+            }}
+            onPress={onConfirm}
+          >
+            <Text
+              style={{
+                fontSize: getFontSize(14),
+                fontWeight: 'bold',
+                fontFamily: 'redhat-700',
+                color: Colors.WHITE
+              }}
+            >
+              Confirm
+            </Text>
+          </TouchableOpacity>
+
+          <TouchableOpacity
+            style={{
+              backgroundColor: Colors.WHITE,
+              borderWidth: 1,
+              borderColor: Colors.DARK_BLUE,
+              borderRadius: 4,
+              alignItems: 'center',
+              justifyContent: 'center',
+              paddingHorizontal: 16,
+              paddingVertical: 12
+            }}
+            onPress={() => (ref as React.RefObject<ActionSheetRef>).current?.hide()}
+          >
+            <Text
+              style={{
+                color: Colors.DARK_BLUE,
+                fontSize: getFontSize(14),
+                fontWeight: 'bold',
+                fontFamily: 'redhat-700'
+              }}
+            >
+              Cancel
+            </Text>
+          </TouchableOpacity>
+        </View>
+      </ActionSheet>
+    );
+  }
+);
+
+export default SummarySheet;

src/screens/InAppScreens/TravelsScreen/RegionsVisitedScreen/index.tsx

@@ -46,6 +46,9 @@ const RegionsVisitedScreen = ({ route }: { route: any }) => {
           keyExtractor={(item, index) => index.toString()}
           initialNumToRender={20}
           renderItem={({ item, index }) => {
+            const [name, ...rest] = isRegion ? item.region?.split(/ – | - /) : ['', ''];
+            const subname = rest?.join(' - ');
+
             return (
               <TouchableOpacity
                 onPress={() =>
@@ -75,13 +78,55 @@ const RegionsVisitedScreen = ({ route }: { route: any }) => {
                 }
                 style={[ItemStyles.wrapper, { paddingHorizontal: 8 }]}
               >
-                <Image style={ItemStyles.bigFlag} source={{ uri: API_HOST + item.flag }} />
+                {isRegion ? (
+                  <>
+                    <Image
+                      source={{
+                        uri: API_HOST + item.flag1
+                      }}
+                      style={{
+                        width: 32,
+                        height: 32,
+                        borderRadius: 32 / 2,
+                        borderWidth: 1,
+                        borderColor: Colors.FILL_LIGHT
+                      }}
+                    />
+                    {item?.flag2 ? (
+                      <Image
+                        source={{ uri: API_HOST + item.flag2 }}
+                        style={[
+                          {
+                            width: 32,
+                            height: 32,
+                            borderRadius: 32 / 2,
+                            borderWidth: 1,
+                            borderColor: Colors.FILL_LIGHT,
+                            marginLeft: -18
+                          }
+                        ]}
+                      />
+                    ) : null}
+                  </>
+                ) : (
+                  <Image style={ItemStyles.bigFlag} source={{ uri: API_HOST + item.flag }} />
+                )}
+
                 <View style={[ItemStyles.contentWrapper, { gap: 4 }]}>
-                  <Text style={[{ flex: 1, color: Colors.DARK_BLUE, fontWeight: '600' }]}>
-                    {isRegion ? item.region : item.country}
-                  </Text>
+                  <View style={{ flex: 1 }}>
+                    <Text style={[{ color: Colors.DARK_BLUE, fontWeight: '600', fontSize: 15 }]}>
+                      {isRegion ? name : item.country}
+                    </Text>
+                    {isRegion && subname ? (
+                      <Text style={[{ color: Colors.TEXT_GRAY, fontSize: 13 }]}>{subname}</Text>
+                    ) : null}
+                  </View>
+
                   <Text
-                    style={[ItemStyles.nameAndCnt, { fontFamily: 'montserrat-700', fontSize: 15 }]}
+                    style={[
+                      ItemStyles.nameAndCnt,
+                      { fontFamily: 'montserrat-700', fontSize: 15, paddingHorizontal: 4 }
+                    ]}
                   >
                     {item.days_spent}
                   </Text>

src/screens/InAppScreens/TravelsScreen/Trips2025Screen/index.tsx

@@ -17,13 +17,14 @@ import TripSvg from '../../../../../assets/icons/travels-screens/trip.svg';
 import InfoIcon from 'assets/icons/info-solid.svg';
 import { Colors } from 'src/theme';
 import ChevronLeftIcon from 'assets/icons/chevron-left.svg';
+import { getFontSize } from 'src/utils';
 
 const TripsScreen = ({ route }: { route: any }) => {
   const token = storage.get('token', StoreType.STRING) as string;
   const navigation = useNavigation();
   const [isDatePickerVisible, setDatePickerVisible] = useState(false);
   const { data: years, refetch } = useGetTripsYearsQuery(token, true);
-  const [selectedYear, setSelectedYear] = useState<string | null>(null);
+  const [selectedYear, setSelectedYear] = useState<string | null>('2025');
   const { data: tripsData, refetch: refetchTrips } = useGetTripsForYearQuery(
     token,
     selectedYear as string,
@@ -87,7 +88,7 @@ const TripsScreen = ({ route }: { route: any }) => {
 
   useEffect(() => {
     if (years && years.data && !selectedYear) {
-      setSelectedYear(years.data[0]);
+      // setSelectedYear(years.data[0]);
     }
   }, [years]);
 
@@ -123,11 +124,28 @@ const TripsScreen = ({ route }: { route: any }) => {
 
   return (
     <PageWrapper>
-      <Header label="Trips" />
+      <View
+        style={{
+          alignItems: 'center',
+          paddingVertical: 16,
+          flexDirection: 'row',
+          justifyContent: 'center'
+        }}
+      >
+        <Text
+          style={{ color: Colors.DARK_BLUE, fontFamily: 'redhat-700', fontSize: getFontSize(14) }}
+        >
+          Trips 2025 BETA
+        </Text>
+      </View>
       <View style={styles.tabContainer}>
-        <TouchableOpacity style={styles.regionSelector} onPress={() => setDatePickerVisible(true)}>
+        <TouchableOpacity
+          style={styles.regionSelector}
+          onPress={() => setDatePickerVisible(true)}
+          disabled
+        >
           <Text style={[styles.regionText]}>{selectedYear}</Text>
-          <ChevronIcon />
+          {/* <ChevronIcon /> */}
         </TouchableOpacity>
         <TouchableOpacity style={styles.addNewTab} onPress={onAddNewTripPress}>
           <AddIcon />
@@ -157,98 +175,54 @@ const TripsScreen = ({ route }: { route: any }) => {
                 marginBottom: 8,
                 backgroundColor: Colors.FILL_LIGHT,
                 borderRadius: 8,
-                paddingHorizontal: 8
+                paddingHorizontal: 16,
+                paddingVertical: 12,
+                gap: 6
               }}
             >
+              <Text style={{ fontSize: 14, fontWeight: '600', color: Colors.DARK_BLUE }}>
+                {statistics?.general}
+              </Text>
+
               <TouchableOpacity
-                onPress={() => setIsExpanded(!isExpanded)}
-                style={{
-                  flexDirection: 'row',
-                  alignItems: 'center',
-                  paddingVertical: 12,
-                  paddingHorizontal: 4,
-                  justifyContent: 'space-between',
-                  flex: 1
-                }}
+                onPress={() =>
+                  navigation.navigate(
+                    ...([
+                      NAVIGATION_PAGES.REGIONS_VISITED,
+                      {
+                        title: statistics?.countries?.description,
+                        isRegion: false,
+                        data: statistics?.countries?.list
+                      }
+                    ] as never)
+                  )
+                }
+                hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
               >
-                <View style={{ flexDirection: 'row', alignItems: 'center', flex: 1 }}>
-                  <Text
-                    style={{
-                      fontSize: 14,
-                      fontWeight: 'bold',
-                      color: Colors.DARK_BLUE,
-                      flexShrink: 1
-                    }}
-                  >
-                    Your travel statistics for {selectedYear}
-                  </Text>
-                </View>
-
-                <View style={{ width: 18, height: 18, alignItems: 'center' }}>
-                  <ChevronLeftIcon
-                    fill={Colors.DARK_BLUE}
-                    style={[
-                      { transform: [{ rotate: '-90deg' }] },
-                      isExpanded ? { transform: [{ rotate: '90deg' }] } : null
-                    ]}
-                  />
-                </View>
+                <Text style={{ fontSize: 14, fontWeight: '600', color: Colors.ORANGE }}>
+                  {statistics?.countries?.description}
+                </Text>
               </TouchableOpacity>
 
-              {isExpanded ? (
-                <View
-                  style={{
-                    paddingHorizontal: 16,
-                    paddingBottom: 16,
-                    borderRadius: 8,
-                    gap: 4
-                  }}
-                >
-                  <Text style={{ fontSize: 14, fontWeight: '600', color: Colors.DARK_BLUE }}>
-                    {statistics?.general}
-                  </Text>
-
-                  <TouchableOpacity
-                    onPress={() =>
-                      navigation.navigate(
-                        ...([
-                          NAVIGATION_PAGES.REGIONS_VISITED,
-                          {
-                            title: statistics?.countries?.description,
-                            isRegion: false,
-                            data: statistics?.countries?.list
-                          }
-                        ] as never)
-                      )
-                    }
-                    hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
-                  >
-                    <Text style={{ fontSize: 14, fontWeight: '600', color: Colors.ORANGE }}>
-                      {statistics?.countries?.description}
-                    </Text>
-                  </TouchableOpacity>
-
-                  <TouchableOpacity
-                    onPress={() =>
-                      navigation.navigate(
-                        ...([
-                          NAVIGATION_PAGES.REGIONS_VISITED,
-                          {
-                            title: statistics?.regions?.description,
-                            isRegion: true,
-                            data: statistics?.regions?.list
-                          }
-                        ] as never)
-                      )
-                    }
-                    hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
-                  >
-                    <Text style={{ fontSize: 14, fontWeight: '600', color: Colors.ORANGE }}>
-                      {statistics?.regions?.description}
-                    </Text>
-                  </TouchableOpacity>
-                </View>
-              ) : null}
+              <TouchableOpacity
+                onPress={() =>
+                  navigation.navigate(
+                    ...([
+                      NAVIGATION_PAGES.REGIONS_VISITED,
+                      {
+                        title: statistics?.regions?.description,
+                        isRegion: true,
+                        data: statistics?.regions?.list
+                      }
+                    ] as never)
+                  )
+                }
+                hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
+              >
+                <Text style={{ fontSize: 14, fontWeight: '600', color: Colors.ORANGE }}>
+                  {statistics?.regions?.description}
+                </Text>
+              </TouchableOpacity>
             </View>
           }
         />

src/screens/InAppScreens/TravelsScreen/index.tsx

@@ -32,7 +32,7 @@ const TravelsScreen = () => {
     { label: 'Series', icon: SeriesIcon, page: NAVIGATION_PAGES.SERIES },
     { label: 'Earth', icon: EarthIcon, page: NAVIGATION_PAGES.EARTH },
     { label: 'Trips', icon: TripIcon, page: NAVIGATION_PAGES.TRIPS },
-    { label: 'Trips 2025', icon: TripIcon, page: NAVIGATION_PAGES.TRIPS_2025 },
+    // { label: 'Trips 2025', icon: TripIcon, page: NAVIGATION_PAGES.TRIPS_2025 },
     { label: 'Photos', icon: ImagesIcon, page: NAVIGATION_PAGES.PHOTOS },
     { label: 'Fixers', icon: FixersIcon, page: NAVIGATION_PAGES.FIXERS }
   ];

src/types/navigation.ts

@@ -43,6 +43,7 @@ export enum NAVIGATION_PAGES {
   ADD_PHOTO = 'inAppAddPhoto',
   TRIPS = 'inAppTrips',
   TRIPS_2025 = 'inAppTrips2025',
+  IN_APP_TRIPS_TAB = 'Trips 2025',
   ADD_TRIP = 'inAppAddTrip',
   ADD_TRIP_2025 = 'inAppAddTrip2025',
   ADD_REGIONS = 'inAppAddRegions',