瀏覽代碼

add regions on trips screen fix

Viktoriia 1 天之前
父節點
當前提交
4e68d4d492

+ 2 - 2
src/screens/InAppScreens/TravelsScreen/AddRegionsScreen/index.tsx

@@ -126,14 +126,14 @@ const AddRegionsScreen = ({ route }: { route: any }) => {
 
   const handleSavePress = () => {
     if (route.params?.isSharedTrip) {
-      navigation.navigate(
+      navigation.popTo(
         ...([
           NAVIGATION_PAGES.CREATE_SHARED_TRIP,
           { regionsToSave: regionsToSave, eventId: route.params?.editId }
         ] as never)
       );
     } else {
-      navigation.navigate(
+      navigation.popTo(
         ...([
           NAVIGATION_PAGES.ADD_TRIP,
           { regionsToSave: regionsToSave, editTripId: route.params?.editId }

+ 3 - 1
src/screens/InAppScreens/TravelsScreen/Components/TripItem/index.tsx

@@ -28,6 +28,7 @@ const TripItem = ({ item }: { item: TripsData }) => {
       </Text>
     );
   };
+
   return (
     <View style={styles.tripItemContainer}>
       <View style={styles.tripHeaderContainer}>
@@ -64,7 +65,8 @@ const TripItem = ({ item }: { item: TripsData }) => {
         horizontal={false}
         nestedScrollEnabled={true}
       >
-        {item.regions.map((region) => {
+        {item.regions?.map((region) => {
+          if (!region.id || !region.region_name) return null;
           const [name, ...rest] = region.region_name?.split(/ – | - /);
           const subname = rest?.join(' - ');