From 5f6f21e08a7c9081c7897d9c620ac5f06ee50774 Mon Sep 17 00:00:00 2001
From: RekHoto <rek.hoto@gmail.com>
Date: Tue, 21 Nov 2023 00:22:44 +0400
Subject: [PATCH] fixes

---
 src/Map/LastMLRun.jsx                                     | 2 +-
 src/Map/Popup/Popup.jsx                                   | 8 ++++----
 .../Sidebar/PendingPointsFilters/PendingPointsFilters.jsx | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Map/LastMLRun.jsx b/src/Map/LastMLRun.jsx
index 136abb3..86c1df2 100644
--- a/src/Map/LastMLRun.jsx
+++ b/src/Map/LastMLRun.jsx
@@ -30,7 +30,7 @@ export function LastMLRun() {
           Последнее обновление системы
         </div>
         <div className="text-xs text-grey z-10 bg-white-background rounded-xl px-2 py-0.5 space-y-3">
-          {new Date(data?.last_time).toLocaleString('ru-RU')}
+          {data?.last_time && new Date(data?.last_time).toLocaleString('ru-RU')}
         </div>
         <Button type="text" className="flex items-center p-2 text-[#C50000] hover:text-[#C50000] text-xs" onClick={() => startUpdating()}>
           Обновить систему
diff --git a/src/Map/Popup/Popup.jsx b/src/Map/Popup/Popup.jsx
index aece2c2..a16b494 100644
--- a/src/Map/Popup/Popup.jsx
+++ b/src/Map/Popup/Popup.jsx
@@ -83,15 +83,15 @@ const MultipleFeaturesPopup = ({ features, points }) => {
               {feature.properties.category === CATEGORIES.residential || feature.layer.id === LAYER_IDS.working ? (
                 <div className="space-x-2 flex items-center w-full">
                   <span className="flex-1 truncate inline-block">
-                    {point.address}
+                    {point?.address}
                   </span>
-                  <span>{point.name}</span>
+                  <span>{point?.name}</span>
                 </div>
               ) : (
                 <div className="flex w-full">
                   <span className="truncate">
-                    {point.name ?? point.category}
-                    {point.category_id && getRivalsName(feature).name}
+                    {point?.name ?? point?.category}
+                    {point?.category_id && getRivalsName(feature).name}
                   </span>
                 </div>
               )}
diff --git a/src/modules/Sidebar/PendingPointsFilters/PendingPointsFilters.jsx b/src/modules/Sidebar/PendingPointsFilters/PendingPointsFilters.jsx
index 4150c80..080e0f0 100644
--- a/src/modules/Sidebar/PendingPointsFilters/PendingPointsFilters.jsx
+++ b/src/modules/Sidebar/PendingPointsFilters/PendingPointsFilters.jsx
@@ -28,7 +28,7 @@ export const PendingPointsFilters = () => {
     const newRanges = data?.fullRange;
     if (!newRanges) return;
     RANGE_FILTERS_KEYS.map((key) => {
-      if (!ranges[key]) {
+      if (!ranges[key] && !!newRanges[key]) {
         setFilterWithKey(newRanges[key], key);
         return;
       }