From dcc41e8d8276f1aaff33451fad6569e16faeffc8 Mon Sep 17 00:00:00 2001
From: Sacha Weatherstone <sachaw100@hotmail.com>
Date: Mon, 1 Aug 2022 12:28:17 +1000
Subject: [PATCH] Fix ack + cleanup

---
 src/DeviceWrapper.tsx              | 67 ------------------------------
 src/core/stores/deviceStore.ts     |  1 -
 src/pages/Messages/ChannelChat.tsx | 20 +--------
 3 files changed, 2 insertions(+), 86 deletions(-)

diff --git a/src/DeviceWrapper.tsx b/src/DeviceWrapper.tsx
index 1d59e2e6..dbeaaa60 100644
--- a/src/DeviceWrapper.tsx
+++ b/src/DeviceWrapper.tsx
@@ -7,77 +7,10 @@ export interface DeviceProps {
   device: Device;
 }
 
-// const cleanupListeners = (connection: IConnection): void => {
-//   connection.onMeshPacket.cancelAll();
-//   connection.onDeviceStatus.cancelAll();
-//   connection.onMyNodeInfo.cancelAll();
-//   connection.onUserPacket.cancelAll();
-//   connection.onPositionPacket.cancelAll();
-//   connection.onNodeInfoPacket.cancelAll();
-//   connection.onAdminPacket.cancelAll();
-//   connection.onMeshHeartbeat.cancelAll();
-//   connection.onTextPacket.cancelAll();
-// };
-
 export const DeviceWrapper = ({
   children,
   device,
 }: DeviceProps): JSX.Element => {
-  // const fetchConfig = useCallback(async (): Promise<void> => {
-  //   /**
-  //    * Get Config
-  //    */
-  //   await device.connection?.getConfig(
-  //     Protobuf.AdminMessage_ConfigType.DEVICE_CONFIG
-  //   );
-  //   await device.connection?.getConfig(
-  //     Protobuf.AdminMessage_ConfigType.WIFI_CONFIG
-  //   );
-  //   await device.connection?.getConfig(
-  //     Protobuf.AdminMessage_ConfigType.POSITION_CONFIG
-  //   );
-  //   await device.connection?.getConfig(
-  //     Protobuf.AdminMessage_ConfigType.DISPLAY_CONFIG
-  //   );
-  //   await device.connection?.getConfig(
-  //     Protobuf.AdminMessage_ConfigType.LORA_CONFIG
-  //   );
-  //   await device.connection?.getConfig(
-  //     Protobuf.AdminMessage_ConfigType.POWER_CONFIG
-  //   );
-
-  //   /**
-  //    * Get Module Config
-  //    */
-  //   await device.connection?.getModuleConfig(
-  //     Protobuf.AdminMessage_ModuleConfigType.MQTT_CONFIG
-  //   );
-  //   await device.connection?.getModuleConfig(
-  //     Protobuf.AdminMessage_ModuleConfigType.SERIAL_CONFIG
-  //   );
-  //   await device.connection?.getModuleConfig(
-  //     Protobuf.AdminMessage_ModuleConfigType.EXTNOTIF_CONFIG
-  //   );
-  //   await device.connection?.getModuleConfig(
-  //     Protobuf.AdminMessage_ModuleConfigType.STOREFORWARD_CONFIG
-  //   );
-  //   await device.connection?.getModuleConfig(
-  //     Protobuf.AdminMessage_ModuleConfigType.RANGETEST_CONFIG
-  //   );
-  //   await device.connection?.getModuleConfig(
-  //     Protobuf.AdminMessage_ModuleConfigType.TELEMETRY_CONFIG
-  //   );
-  //   await device.connection?.getModuleConfig(
-  //     Protobuf.AdminMessage_ModuleConfigType.CANNEDMSG_CONFIG
-  //   );
-  // }, [device.connection]);
-
-  // useEffect(() => {
-  //   if (device.ready) {
-  //     void fetchConfig();
-  //   }
-  // }, [device.ready, fetchConfig]);
-
   return (
     <DeviceContext.Provider value={device}>{children}</DeviceContext.Provider>
   );
diff --git a/src/core/stores/deviceStore.ts b/src/core/stores/deviceStore.ts
index 6341cc41..2e82a34c 100644
--- a/src/core/stores/deviceStore.ts
+++ b/src/core/stores/deviceStore.ts
@@ -331,7 +331,6 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
                     //   ).getTime();
                     // }
                   } else {
-                    console.log("PUSH333333333333333333333");
                     device.nodes.push({
                       data: Protobuf.NodeInfo.create({
                         num: position.packet.from,
diff --git a/src/pages/Messages/ChannelChat.tsx b/src/pages/Messages/ChannelChat.tsx
index 03063a03..23a799bf 100644
--- a/src/pages/Messages/ChannelChat.tsx
+++ b/src/pages/Messages/ChannelChat.tsx
@@ -20,33 +20,17 @@ export interface ChannelChatProps {
 }
 
 export const ChannelChat = ({ channel }: ChannelChatProps): JSX.Element => {
-  const { nodes, connection } = useDevice();
+  const { nodes, connection, ackMessage } = useDevice();
   const [currentMessage, setCurrentMessage] = useState("");
 
   const sendMessage = (): void => {
-    console.log("SENDING TEXT");
-
     void connection?.sendText(
       currentMessage,
       undefined,
       true,
       channel.config.index, //maybe channel.config.index--
       (id) => {
-        // console.log(`Chat Index, ${chatIndex}`);
-        // console.log(`Chat Index --, ${chatIndex--}`);
-
-        // console.log(
-        //   `Chat Index computed, ${isChannel ? chatIndex-- : chatIndex}`,
-        // );
-
-        // dispatch(
-        //   ackMessage({
-        //     chatIndex: channel.config.index,
-        //     messageId: id,
-        //   }),
-        // );
-
-        console.log("Message Sent");
+        ackMessage(channel.config.index, id), console.log("Got Ack");
 
         return Promise.resolve();
       }