From 62a0a64554262ea8d8e0011da82c6592ec7043f7 Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Wed, 27 Jul 2022 00:08:06 -0400
Subject: [PATCH] Update zwave_js WS API commands

---
 src/data/zwave_js.ts                                   |  8 ++++----
 .../integration-elements/zwave_js/device-actions.ts    | 10 +++++-----
 .../zwave_js/dialog-zwave_js-update-firmware-node.ts   |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/data/zwave_js.ts b/src/data/zwave_js.ts
index a99244541d..d6898c5f98 100644
--- a/src/data/zwave_js.ts
+++ b/src/data/zwave_js.ts
@@ -665,21 +665,21 @@ export const subscribeZwaveNodeStatistics = (
     }
   );
 
-export const fetchZwaveNodeIsFirmwareUpdateInProgress = (
+export const fetchZwaveIsNodeFirmwareUpdateInProgress = (
   hass: HomeAssistant,
   device_id: string
 ): Promise<boolean> =>
   hass.callWS({
-    type: "zwave_js/get_firmware_update_progress",
+    type: "zwave_js/is_node_firmware_update_in_progress",
     device_id,
   });
 
-export const fetchZwaveIsAnyFirmwareUpdateInProgress = (
+export const fetchZwaveIsAnyOTAFirmwareUpdateInProgress = (
   hass: HomeAssistant,
   entry_id: string
 ): Promise<boolean> =>
   hass.callWS({
-    type: "zwave_js/get_any_firmware_update_progress",
+    type: "zwave_js/is_any_ota_firmware_update_in_progress",
     entry_id,
   });
 
diff --git a/src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts b/src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts
index 2a5de14122..5201a4ae89 100644
--- a/src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts
@@ -1,8 +1,8 @@
 import { getConfigEntries } from "../../../../../../data/config_entries";
 import { DeviceRegistryEntry } from "../../../../../../data/device_registry";
 import {
-  fetchZwaveIsAnyFirmwareUpdateInProgress,
-  fetchZwaveNodeIsFirmwareUpdateInProgress,
+  fetchZwaveIsAnyOTAFirmwareUpdateInProgress,
+  fetchZwaveIsNodeFirmwareUpdateInProgress,
   fetchZwaveNodeStatus,
 } from "../../../../../../data/zwave_js";
 import { showConfirmationDialog } from "../../../../../../dialogs/generic/show-dialog-box";
@@ -88,8 +88,8 @@ export const getZwaveDeviceActions = async (
 
   const [isAnyFirmwareUpdateInProgress, isNodeFirmwareUpdateInProgress] =
     await Promise.all([
-      fetchZwaveIsAnyFirmwareUpdateInProgress(hass, entryId),
-      fetchZwaveNodeIsFirmwareUpdateInProgress(hass, device.id),
+      fetchZwaveIsAnyOTAFirmwareUpdateInProgress(hass, entryId),
+      fetchZwaveIsNodeFirmwareUpdateInProgress(hass, device.id),
     ]);
 
   if (!isAnyFirmwareUpdateInProgress || isNodeFirmwareUpdateInProgress) {
@@ -100,7 +100,7 @@ export const getZwaveDeviceActions = async (
       action: async () => {
         if (
           isNodeFirmwareUpdateInProgress ||
-          (await fetchZwaveNodeIsFirmwareUpdateInProgress(hass, device.id)) ||
+          (await fetchZwaveIsNodeFirmwareUpdateInProgress(hass, device.id)) ||
           (await showConfirmationDialog(el, {
             text: hass.localize(
               "ui.panel.config.zwave_js.update_firmware.warning"
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts
index 00e4bfb437..768d2d5a82 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts
@@ -15,7 +15,7 @@ import {
 } from "../../../../../data/device_registry";
 import {
   abortZwaveNodeFirmwareUpdate,
-  fetchZwaveNodeIsFirmwareUpdateInProgress,
+  fetchZwaveIsNodeFirmwareUpdateInProgress,
   fetchZwaveNodeStatus,
   FirmwareUpdateStatus,
   NodeStatus,
@@ -272,7 +272,7 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
   private async _fetchData(): Promise<void> {
     [this._nodeStatus, this._updateInProgress] = await Promise.all([
       fetchZwaveNodeStatus(this.hass, this.device!.id),
-      fetchZwaveNodeIsFirmwareUpdateInProgress(this.hass, this.device!.id),
+      fetchZwaveIsNodeFirmwareUpdateInProgress(this.hass, this.device!.id),
     ]);
     if (this._updateInProgress) {
       this._subscribeNodeFirmwareUpdate();