فهرست منبع

sentry uri/value errors

Viktoriia 7 ماه پیش
والد
کامیت
5039622183
2فایلهای تغییر یافته به همراه10 افزوده شده و 10 حذف شده
  1. 2 2
      src/screens/InAppScreens/MapScreen/MarkerItem/index.tsx
  2. 8 8
      src/screens/InAppScreens/MapScreen/index.tsx

+ 2 - 2
src/screens/InAppScreens/MapScreen/MarkerItem/index.tsx

@@ -34,7 +34,7 @@ const MarkerItem = ({
             <View style={styles.calloutContainer}>
               <View style={styles.calloutImageContainer}>
                 <Image
-                  source={{ uri: marker.icon.uri }}
+                  source={{ uri: marker.icon?.uri || '' }}
                   style={styles.calloutImage}
                   resizeMode="contain"
                 />
@@ -83,7 +83,7 @@ const MarkerItem = ({
             <View style={styles.calloutContainer}>
               <View style={styles.calloutImageContainer}>
                 <Image
-                  source={{ uri: marker.icon.uri }}
+                  source={{ uri: marker.icon?.uri || '' }}
                   style={styles.calloutImage}
                   resizeMode="contain"
                 />

+ 8 - 8
src/screens/InAppScreens/MapScreen/index.tsx

@@ -486,10 +486,10 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
       setType(filterSettings.type);
       setRegionsFilter({
         visitedLabel:
-          filterSettings.selectedVisible.value && filterSettings.selectedVisible.value === 1
+          filterSettings.selectedVisible?.value && filterSettings.selectedVisible.value === 1
             ? 'in'
             : 'by',
-        year: filterSettings.selectedYear.value ?? moment().year()
+        year: filterSettings.selectedYear?.value ?? moment().year()
       });
       setSeriesFilter(filterSettings.seriesFilter);
     }
@@ -762,7 +762,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
                 }
               )
             : setUserData({ type: 'nm', id: +foundRegion });
-          if (regionsList) {
+          if (regionsList && regionsList.data) {
             const region = regionsList.data.find((region) => region.id === +foundRegion);
             if (region) {
               const bounds = turf.bbox(region.bbox);
@@ -785,7 +785,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
                 }
               )
             : setUserData({ type: 'countries', id: +foundRegion });
-          if (countriesList) {
+          if (countriesList && countriesList.data) {
             const region = countriesList.data.find((region) => region.id === +foundRegion);
             if (region) {
               const bounds = turf.bbox(region.bbox);
@@ -808,7 +808,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
                 }
               )
             : setUserData({ type: 'dare', id: +foundRegion });
-          if (dareList) {
+          if (dareList && dareList.data) {
             const region = dareList.data.find((region) => region.id === +foundRegion);
             if (region) {
               const bounds = turf.bbox(region.bbox);
@@ -978,7 +978,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
             )
           : setUserData({ type: 'nm', id });
 
-        if (regionsList) {
+        if (regionsList && regionsList.data) {
           const region = regionsList.data.find((region) => region.id === +id);
           if (region) {
             const bounds = turf.bbox(region.bbox);
@@ -1002,7 +1002,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
             )
           : setUserData({ type: 'countries', id });
 
-        if (countriesList) {
+        if (countriesList && countriesList.data) {
           const region = countriesList.data.find((region) => region.id === +id);
           if (region) {
             const bounds = turf.bbox(region.bbox);
@@ -1026,7 +1026,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
             )
           : setUserData({ type: 'dare', id: +id });
 
-        if (dareList) {
+        if (dareList && dareList.data) {
           const region = dareList.data.find((region) => region.id === +id);
           if (region) {
             const bounds = turf.bbox(region.bbox);