From 20c589692ce431f26e62ef0698778bf5e3b632cb Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 28 Mar 2022 11:53:40 +0500
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=81=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D1=82=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx | 4 ++--
 src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx b/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
index 67761e8..31991d9 100644
--- a/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
+++ b/src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx
@@ -66,9 +66,9 @@ export const TelemetryMerger = memo(() => {
         setIsMerging,
         'Не удалось объединить телеметрии',
         'Объединение телеметрий',
-    ), [primary, secondary])
+    ), [updateTelemetry])
 
-    useEffect(() => updateTelemetry(), [])
+    useEffect(() => updateTelemetry(), [updateTelemetry])
 
     useEffect(() => {
         const query = new URLSearchParams(location.search)
diff --git a/src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx b/src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx
index 2441e82..b02c122 100644
--- a/src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx
+++ b/src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx
@@ -42,7 +42,7 @@ export const TelemetryController = memo(() => {
             )}
         >
             <p>Вы собираетесь использовать данную телеметрию для слияния</p>
-            {record.well && (
+            {record.realWell && (
                 <p style={{ color: 'red' }}>Внимание! Телеметрии назначена скважина!</p>
             )}
         </Poprompt>