From 963bdcc53c77cf0fd61bfd1305c01695dede6eda Mon Sep 17 00:00:00 2001
From: "David F. Mulcahey" <david.mulcahey@icloud.com>
Date: Sat, 12 Jan 2019 17:38:26 -0500
Subject: [PATCH] address outstanding items (#2454)

---
 src/data/zha.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/data/zha.ts b/src/data/zha.ts
index 5752b620b1..f5a67dbb12 100644
--- a/src/data/zha.ts
+++ b/src/data/zha.ts
@@ -64,11 +64,10 @@ export const readAttributeValue = (
   hass: HomeAssistant,
   data: ReadAttributeServiceData
 ): Promise<string> => {
-  const serviceData = {
+  return hass.callWS({
+    ...data,
     type: "zha/entities/clusters/attributes/value",
-  };
-  Object.assign(serviceData, data);
-  return hass.callWS(serviceData);
+  });
 };
 
 export const fetchCommandsForCluster = (
@@ -78,7 +77,7 @@ export const fetchCommandsForCluster = (
   clusterId: number,
   clusterType: string
 ): Promise<Command[]> =>
-  hass!.callWS({
+  hass.callWS({
     type: "zha/entities/clusters/commands",
     entity_id: entityId,
     ieee: ieeeAddress,