From d3289a078c778b0313f1dc1a9e4deed3f0a9ceb1 Mon Sep 17 00:00:00 2001
From: Neil Enns <neile@live.com>
Date: Fri, 31 May 2024 05:51:54 -0700
Subject: [PATCH 01/10] Add restore button to mini mode Fixes #76

---
 src/app/components/MiniModeToggleButton.tsx | 38 +++++++++++++++++++++
 src/app/components/mini.tsx                 | 23 +++++++++++--
 src/app/components/navbar.tsx               | 13 ++-----
 src/app/style/app.scss                      | 17 +++++++++
 4 files changed, 77 insertions(+), 14 deletions(-)
 create mode 100644 src/app/components/MiniModeToggleButton.tsx

diff --git a/src/app/components/MiniModeToggleButton.tsx b/src/app/components/MiniModeToggleButton.tsx
new file mode 100644
index 0000000..6d478e7
--- /dev/null
+++ b/src/app/components/MiniModeToggleButton.tsx
@@ -0,0 +1,38 @@
+import React, { useCallback } from "react";
+import { Fullscreen, FullscreenExit } from "react-bootstrap-icons";
+
+interface MiniModeToggleButtonProps {
+  showRestoreButton: boolean;
+}
+
+const MiniModeToggleButton: React.FC<MiniModeToggleButtonProps> = ({
+  showRestoreButton,
+}) => {
+  const toggleMiniMode = useCallback(() => {
+    window.api.toggleMiniMode().catch((error: unknown) => {
+      console.error(error);
+    });
+  }, []);
+
+  return (
+    <button
+      className="btn btn-primary m-2"
+      style={{ lineHeight: 0, fontSize: "14px" }}
+      onClick={toggleMiniMode}
+    >
+      {showRestoreButton ? (
+        <Fullscreen
+          title={"Switch to large mode"}
+          style={{ strokeWidth: "0.5px", stroke: "white" }}
+        />
+      ) : (
+        <FullscreenExit
+          title={"Switch to mini mode"}
+          style={{ strokeWidth: "0.5px", stroke: "white" }}
+        />
+      )}
+    </button>
+  );
+};
+
+export default MiniModeToggleButton;
diff --git a/src/app/components/mini.tsx b/src/app/components/mini.tsx
index bf81441..dbaa529 100644
--- a/src/app/components/mini.tsx
+++ b/src/app/components/mini.tsx
@@ -1,11 +1,21 @@
-import React from "react";
+import React, { useState } from "react";
 import useRadioState from "../store/radioStore";
+import MiniModeToggleButton from "./MiniModeToggleButton";
 
 const Mini: React.FC = () => {
   const [radios] = useRadioState((state) => [state.radios]);
+  const [isHovered, setIsHovered] = useState(false);
 
   return (
-    <div className="box-container mini">
+    <div
+      className="box-container mini"
+      onMouseEnter={() => {
+        setIsHovered(true);
+      }}
+      onMouseLeave={() => {
+        setIsHovered(false);
+      }}
+    >
       <div className="container">
         {radios
           .filter((r) => r.rx)
@@ -15,7 +25,9 @@ const Mini: React.FC = () => {
                 <span
                   style={{ color: radio.currentlyTx ? "orange" : "inherit" }}
                 >
-                  {radio.callsign !== "MANUAL" ? radio.callsign : radio.humanFrequency}
+                  {radio.callsign !== "MANUAL"
+                    ? radio.callsign
+                    : radio.humanFrequency}
                 </span>
                 :{" "}
                 <span
@@ -27,6 +39,11 @@ const Mini: React.FC = () => {
             );
           })}
       </div>
+      <div
+        className={`exit-mini-mode-container ${isHovered ? "visible" : "hidden"}`}
+      >
+        <MiniModeToggleButton showRestoreButton={true} />
+      </div>
     </div>
   );
 };
diff --git a/src/app/components/navbar.tsx b/src/app/components/navbar.tsx
index 9ecb866..f5930a6 100644
--- a/src/app/components/navbar.tsx
+++ b/src/app/components/navbar.tsx
@@ -11,7 +11,7 @@ import {
 } from "../helpers/CallsignHelper";
 import useUtilStore from "../store/utilStore";
 import { Configuration } from "../../config";
-import { FullscreenExit } from "react-bootstrap-icons";
+import MiniModeToggleButton from "./MiniModeToggleButton";
 
 const Navbar: React.FC = () => {
   const [showModal, setShowModal] = useState(false);
@@ -205,16 +205,7 @@ const Navbar: React.FC = () => {
           onWheel={handleRadioGainMouseWheel}
           value={radioGain}
         ></input>
-        <button
-          className="btn btn-primary m-2 hide-gain-value"
-          style={{ lineHeight: 0, fontSize: "14px" }}
-          onClick={() => void window.api.toggleMiniMode()}
-        >
-          <FullscreenExit
-            title={"Mini mode"}
-            style={{ strokeWidth: "0.5px", stroke: "white" }}
-          />
-        </button>
+        <MiniModeToggleButton showRestoreButton={false} />
         {platform === "linux" && (
           <button
             className="btn btn-danger m-2 hide-gain-value"
diff --git a/src/app/style/app.scss b/src/app/style/app.scss
index 4727f6e..487a89d 100644
--- a/src/app/style/app.scss
+++ b/src/app/style/app.scss
@@ -394,3 +394,20 @@ select:disabled {
     display: none !important;
   }
 }
+
+.exit-mini-mode-container
+{
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  display: inline-block;
+  transition: opacity 0.3s ease-in-out;
+}
+
+.exit-mini-mode-container.visible {
+  opacity: 1;
+}
+
+.exit-mini-mode-container.hidden {
+  opacity: 0;
+}
\ No newline at end of file

From da11f71b584e71dc91ee2a548ac0926e8affd96d Mon Sep 17 00:00:00 2001
From: Neil Enns <neile@live.com>
Date: Fri, 31 May 2024 05:57:25 -0700
Subject: [PATCH 02/10] Add missing newline

---
 src/app/style/app.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/style/app.scss b/src/app/style/app.scss
index 487a89d..89c9827 100644
--- a/src/app/style/app.scss
+++ b/src/app/style/app.scss
@@ -410,4 +410,4 @@ select:disabled {
 
 .exit-mini-mode-container.hidden {
   opacity: 0;
-}
\ No newline at end of file
+}

From 9853358414a2e2d7a815c887d10dc6e86e21c92d Mon Sep 17 00:00:00 2001
From: Neil Enns <neile@live.com>
Date: Fri, 31 May 2024 06:17:22 -0700
Subject: [PATCH 03/10] Restoring from mini mode doesn't work on Windows Fixes
 #79

---
 src/index.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index bb1b13f..dcb7277 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -60,16 +60,22 @@ const setAudioSettings = () => {
 };
 
 const toggleMiniMode = () => {
-  if (
-    mainWindow.getSize()[0] == mainWindow.getMinimumSize()[0] &&
-    mainWindow.getSize()[1] == mainWindow.getMinimumSize()[1]
-  ) {
+  // Issue 79: Use the size of the content and the width breakpoint for mini-mode
+  // to determine whether to restore from mini-mode. This solves an issue where
+  // getSize() was returning a width value off by one from the getMinSize()
+  // call.
+  if (mainWindow.getContentSize()[0] <= 300) {
     mainWindow.setSize(savedLastWindowSize.width, savedLastWindowSize.height);
     return;
   }
   savedLastWindowSize.width = mainWindow.getSize()[0];
   savedLastWindowSize.height = mainWindow.getSize()[1];
-  mainWindow.setSize(1, 1);
+
+  // Issue 79: Use the width breakpoint for the width instead of setting to 1
+  // so the window doesn't go as small as possible when put in mini-mode. This
+  // makes toggling work properly when using 300 as the value for determining when
+  // to switch to big mode.
+  mainWindow.setSize(300, 1);
 };
 
 const restoreWindowBounds = (win: BrowserWindow) => {

From 47250d129208637bd580810ac5993ae8e70b8bcf Mon Sep 17 00:00:00 2001
From: Neil Enns <neile@live.com>
Date: Fri, 31 May 2024 06:20:34 -0700
Subject: [PATCH 04/10] Add code comments

---
 src/app/style/app.scss | 6 ++++++
 src/index.ts           | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/style/app.scss b/src/app/style/app.scss
index 4727f6e..bb3a457 100644
--- a/src/app/style/app.scss
+++ b/src/app/style/app.scss
@@ -238,6 +238,8 @@ button:disabled {
   padding-right: 0;
 }
 
+// When changing the max-width property make sure to update the miniModeWidthBreakpoint constant in
+// the toggleMiniMode method in index.ts as well.
 @media only screen and (max-width: 300px) {
   .freq-box {
     display: none;
@@ -383,12 +385,16 @@ select:disabled {
   font-size: $mini-font-size;
 }
 
+// When changing the max-width property make sure to update the miniModeWidthBreakpoint constant in
+// the toggleMiniMode method in index.ts as well.
 @media only screen and (max-width: 300px) {
   .mini {
     display: block;
   }
 }
 
+// When changing the max-width property make sure to update the miniModeWidthBreakpoint constant in
+// the toggleMiniMode method in index.ts as well.
 @media only screen and (max-width: 300px) {
   .hide-topbar {
     display: none !important;
diff --git a/src/index.ts b/src/index.ts
index dcb7277..2b0521c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -60,11 +60,13 @@ const setAudioSettings = () => {
 };
 
 const toggleMiniMode = () => {
+  const miniModeWidthBreakpoint = 300;
+
   // Issue 79: Use the size of the content and the width breakpoint for mini-mode
   // to determine whether to restore from mini-mode. This solves an issue where
   // getSize() was returning a width value off by one from the getMinSize()
   // call.
-  if (mainWindow.getContentSize()[0] <= 300) {
+  if (mainWindow.getContentSize()[0] <= miniModeWidthBreakpoint) {
     mainWindow.setSize(savedLastWindowSize.width, savedLastWindowSize.height);
     return;
   }
@@ -75,7 +77,7 @@ const toggleMiniMode = () => {
   // so the window doesn't go as small as possible when put in mini-mode. This
   // makes toggling work properly when using 300 as the value for determining when
   // to switch to big mode.
-  mainWindow.setSize(300, 1);
+  mainWindow.setSize(miniModeWidthBreakpoint, 1);
 };
 
 const restoreWindowBounds = (win: BrowserWindow) => {

From e7a1d9979f49522ef55437a7696f86795f03b326 Mon Sep 17 00:00:00 2001
From: Pierre Ferran <pierr3@users.noreply.github.com>
Date: Fri, 31 May 2024 18:35:16 -0400
Subject: [PATCH 05/10] Fix potential concurrency issues with setRadioState in
 the store

---
 src/app/components/radio/radio.tsx |  70 +++++++++---------
 src/app/store/radioStore.ts        | 111 +++++++++++------------------
 2 files changed, 78 insertions(+), 103 deletions(-)

diff --git a/src/app/components/radio/radio.tsx b/src/app/components/radio/radio.tsx
index 1943f22..95b881d 100644
--- a/src/app/components/radio/radio.tsx
+++ b/src/app/components/radio/radio.tsx
@@ -11,20 +11,12 @@ export interface RadioProps {
 const Radio: React.FC<RadioProps> = ({ radio }) => {
   const postError = useErrorStore((state) => state.postError);
   const [
-    setRx,
-    setTx,
-    setXc,
-    setCrossCoupleAcross,
-    setOnSpeaker,
+    setRadioState,
     selectRadio,
     removeRadio,
     setPendingDeletion,
   ] = useRadioState((state) => [
-    state.setRx,
-    state.setTx,
-    state.setXc,
-    state.setCrossCoupleAcross,
-    state.setOnSpeaker,
+    state.setRadioState,
     state.selectRadio,
     state.removeRadio,
     state.setPendingDeletion,
@@ -58,13 +50,13 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
           removeRadio(radio.frequency);
           return;
         }
-        setRx(radio.frequency, newState);
-        setTx(radio.frequency, newState ? radio.tx : false);
-        setXc(radio.frequency, newState ? radio.xc : false);
-        setCrossCoupleAcross(
-          radio.frequency,
-          newState ? radio.crossCoupleAcross : false
-        );
+        setRadioState(radio.frequency, {
+          rx: newState,
+          tx: !newState ? false : radio.tx,
+          xc: !newState ? false : radio.xc,
+          crossCoupleAcross: !newState ? false : radio.crossCoupleAcross,
+          onSpeaker: radio.onSpeaker,
+        });
       })
       .catch((err: unknown) => {
         console.error(err);
@@ -88,13 +80,13 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
           postError("Invalid action on invalid radio: TX.");
           return;
         }
-        setTx(radio.frequency, newState);
-        setRx(radio.frequency, newState ? true : radio.rx);
-        setXc(radio.frequency, !newState ? false : radio.xc);
-        setCrossCoupleAcross(
-          radio.frequency,
-          !newState ? false : radio.crossCoupleAcross
-        );
+        setRadioState(radio.frequency, {
+          rx: !radio.rx && newState ? true : radio.rx,
+          tx: newState,
+          xc: !newState ? false : radio.xc,
+          crossCoupleAcross: !newState ? false : radio.crossCoupleAcross,
+          onSpeaker: radio.onSpeaker,
+        });
       })
       .catch((err: unknown) => {
         console.error(err);
@@ -117,10 +109,13 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
           postError("Invalid action on invalid radio: XC.");
           return;
         }
-        setRx(radio.frequency, newState ? true : radio.rx);
-        setTx(radio.frequency, newState ? true : radio.tx);
-        setXc(radio.frequency, newState);
-        setCrossCoupleAcross(radio.frequency, false);
+        setRadioState(radio.frequency, {
+          rx: !radio.rx && newState ? true : radio.rx,
+          tx: !radio.tx && newState ? true : radio.tx,
+          xc: newState,
+          crossCoupleAcross: false,
+          onSpeaker: radio.onSpeaker,
+        });
       })
       .catch((err: unknown) => {
         console.error(err);
@@ -143,10 +138,13 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
           postError("Invalid action on invalid radio: XC across.");
           return;
         }
-        setRx(radio.frequency, newState ? true : radio.rx);
-        setTx(radio.frequency, newState ? true : radio.tx);
-        setXc(radio.frequency, false);
-        setCrossCoupleAcross(radio.frequency, newState);
+        setRadioState(radio.frequency, {
+          rx: !radio.rx && newState ? true : radio.rx,
+          tx: !radio.tx && newState ? true : radio.tx,
+          xc: false,
+          crossCoupleAcross: newState,
+          onSpeaker: radio.onSpeaker,
+        });
       })
       .catch((err: unknown) => {
         console.error(err);
@@ -170,7 +168,13 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
           removeRadio(radio.frequency);
           return;
         }
-        setOnSpeaker(radio.frequency, newState);
+        setRadioState(radio.frequency, {
+          rx: radio.rx,
+          tx: radio.tx,
+          xc: radio.xc,
+          crossCoupleAcross: radio.crossCoupleAcross,
+          onSpeaker: newState,
+        });
       })
       .catch((err: unknown) => {
         console.error(err);
diff --git a/src/app/store/radioStore.ts b/src/app/store/radioStore.ts
index 6845ae6..acc98ec 100644
--- a/src/app/store/radioStore.ts
+++ b/src/app/store/radioStore.ts
@@ -24,22 +24,26 @@ export interface RadioType {
   isPendingDeleting: boolean;
 }
 
+export interface FrequencyState {
+  rx: boolean;
+  tx: boolean;
+  xc: boolean;
+  crossCoupleAcross: boolean;
+  onSpeaker: boolean;
+}
+
 interface RadioState {
   radios: RadioType[];
   pttIsOn: boolean;
   addRadio: (
     frequency: number,
     callsign: string,
-    stationCallsign: string,
+    stationCallsign: string
   ) => void;
   removeRadio: (frequency: number) => void;
-  setRx: (frequency: number, value: boolean) => void;
-  setTx: (frequency: number, value: boolean) => void;
-  setXc: (frequency: number, value: boolean) => void;
-  setCrossCoupleAcross: (frequency: number, value: boolean) => void;
+  setRadioState: (frequency: number, frequencyState: FrequencyState) => void;
   setCurrentlyTx: (value: boolean) => void;
   setCurrentlyRx: (frequency: number, value: boolean) => void;
-  setOnSpeaker: (frequency: number, value: boolean) => void;
   selectRadio: (frequency: number) => void;
   getSelectedRadio: () => RadioType | undefined;
   isRadioUnique: (frequency: number) => boolean;
@@ -47,7 +51,7 @@ interface RadioState {
   setLastReceivedCallsign(frequency: number, callsign: string): void;
   setTransceiverCountForStationCallsign: (
     callsign: string,
-    count: number,
+    count: number
   ) => void;
   setPendingDeletion: (frequency: number, value: boolean) => void;
   reset: () => void;
@@ -84,7 +88,7 @@ const useRadioState = create<RadioState>((set) => ({
       RadioHelper.doesRadioExist(useRadioState.getState().radios, frequency)
     ) {
       postMessage(
-        "Frequency already exists in local client, but maybe not in AFV, delete it and try again",
+        "Frequency already exists in local client, but maybe not in AFV, delete it and try again"
       );
       return;
     }
@@ -120,65 +124,12 @@ const useRadioState = create<RadioState>((set) => ({
       radios: state.radios.filter((radio) => radio.frequency !== frequency),
     }));
   },
-  setRx: (frequency, value) => {
-    set((state) => ({
-      radios: state.radios.map((radio) =>
-        radio.frequency === frequency
-          ? {
-              ...radio,
-              rx: value,
-              tx: value ? radio.tx : false,
-              xc: value ? radio.xc : false,
-              currentlyRx: value ? radio.currentlyRx : false,
-              currentlyTx: value ? radio.currentlyTx : false,
-            }
-          : radio,
-      ),
-    }));
-  },
-  setTx: (frequency, value) => {
-    set((state) => ({
-      radios: state.radios.map((radio) =>
-        radio.frequency === frequency
-          ? {
-              ...radio,
-              tx: value,
-              rx: value && !radio.rx ? true : radio.rx,
-              currentlyTx: value ? radio.currentlyTx : false,
-            }
-          : radio,
-      ),
-    }));
-  },
-  setXc: (frequency, value) => {
-    set((state) => ({
-      radios: state.radios.map((radio) =>
-        radio.frequency === frequency ? { ...radio, xc: value } : radio,
-      ),
-    }));
-  },
-  setCurrentlyRx: (frequency, value) => {
-    set((state) => ({
-      radios: state.radios.map((radio) =>
-        radio.frequency === frequency
-          ? { ...radio, currentlyRx: value }
-          : radio,
-      ),
-    }));
-  },
-  setOnSpeaker: (frequency, value) => {
-    set((state) => ({
-      radios: state.radios.map((radio) =>
-        radio.frequency === frequency ? { ...radio, onSpeaker: value } : radio,
-      ),
-    }));
-  },
   selectRadio: (frequency) => {
     set((state) => ({
       radios: state.radios.map((radio) =>
         radio.frequency === frequency
           ? { ...radio, selected: true }
-          : { ...radio, selected: false },
+          : { ...radio, selected: false }
       ),
     }));
   },
@@ -191,7 +142,7 @@ const useRadioState = create<RadioState>((set) => ({
   isRadioUnique: (frequency): boolean => {
     return !RadioHelper.doesRadioExist(
       useRadioState.getState().radios,
-      frequency,
+      frequency
     );
   },
   setLastReceivedCallsign: (frequency, callsign) => {
@@ -211,7 +162,7 @@ const useRadioState = create<RadioState>((set) => ({
                   ].slice(-5) // Ensure maximum of 5 values in the array
                 : radio.lastReceivedCallsignHistory,
             }
-          : radio,
+          : radio
       ),
     }));
   },
@@ -225,7 +176,7 @@ const useRadioState = create<RadioState>((set) => ({
       radios: state.radios.map((radio) =>
         radio.callsign === callsign
           ? { ...radio, transceiverCount: count }
-          : radio,
+          : radio
       ),
     }));
   },
@@ -233,7 +184,7 @@ const useRadioState = create<RadioState>((set) => ({
     set((state) => ({
       pttIsOn: value,
       radios: state.radios.map((radio) =>
-        radio.tx ? { ...radio, currentlyTx: value } : radio,
+        radio.tx ? { ...radio, currentlyTx: value } : radio
       ),
     }));
   },
@@ -243,19 +194,39 @@ const useRadioState = create<RadioState>((set) => ({
       .radios.find((radio) => radio.frequency === frequency);
     return radio ? !radio.rx && !radio.tx : true;
   },
-  setCrossCoupleAcross: (frequency, value) => {
+  setPendingDeletion: (frequency, value) => {
     set((state) => ({
       radios: state.radios.map((radio) =>
         radio.frequency === frequency
-          ? { ...radio, crossCoupleAcross: value }
+          ? { ...radio, isPendingDeleting: value }
+          : radio
+      ),
+    }));
+  },
+  setCurrentlyRx: (frequency, value) => {
+    set((state) => ({
+      radios: state.radios.map((radio) =>
+        radio.frequency === frequency
+          ? { ...radio, currentlyRx: value }
           : radio,
       ),
     }));
   },
-  setPendingDeletion: (frequency, value) => {
+  setRadioState: (frequency, frequencyState) => {
     set((state) => ({
       radios: state.radios.map((radio) =>
-        radio.frequency === frequency ? { ...radio, isPendingDeleting: value } : radio,
+        radio.frequency === frequency
+          ? {
+              ...radio,
+              rx: frequencyState.rx,
+              tx: frequencyState.tx,
+              xc: frequencyState.xc,
+              crossCoupleAcross: frequencyState.crossCoupleAcross,
+              onSpeaker: frequencyState.onSpeaker,
+              currentlyRx: frequencyState.rx ? radio.currentlyRx : false,
+              currentlyTx: frequencyState.tx ? radio.currentlyTx : false,
+            }
+          : radio
       ),
     }));
   },

From 00ffcf4ca27bfb99806fd1541d9d66e4c0be57fc Mon Sep 17 00:00:00 2001
From: Pierre Ferran <pierr3@users.noreply.github.com>
Date: Fri, 31 May 2024 18:45:16 -0400
Subject: [PATCH 06/10] Fix Ptt crash on mac #77

---
 backend/include/RemoteData.hpp          |  1 +
 backend/include/sdkWebsocketMessage.hpp |  6 ++---
 backend/package.json                    |  2 +-
 backend/src/main.cpp                    |  1 +
 backend/src/sdk.cpp                     | 36 +++++++++++++------------
 package-lock.json                       |  3 +--
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/backend/include/RemoteData.hpp b/backend/include/RemoteData.hpp
index 3b224da..7482dd8 100644
--- a/backend/include/RemoteData.hpp
+++ b/backend/include/RemoteData.hpp
@@ -1,3 +1,4 @@
+#pragma once
 #include <Poco/Timer.h>
 #include <absl/strings/match.h>
 #include <absl/strings/str_split.h>
diff --git a/backend/include/sdkWebsocketMessage.hpp b/backend/include/sdkWebsocketMessage.hpp
index 0242c50..537c080 100644
--- a/backend/include/sdkWebsocketMessage.hpp
+++ b/backend/include/sdkWebsocketMessage.hpp
@@ -98,10 +98,8 @@ class Station {
 
 // Example of kTxBegin message:
 // @type the type of the message
-// @value the frequencies which are being transmitted on
-// JSON: {"type": "kTxBegin", "value": {"pFrequenciesHz": [123000000, 118000000]}}
+// JSON: {"type": "kTxBegin", "value": {}}
 
 // Example of kTxEnd message:
 // @type the type of the message
-// @value the frequencies which were being transmitted on
-// JSON: {"type": "kTxEnd", "value": {"pFrequenciesHz": [123000000, 118000000]}}
\ No newline at end of file
+// JSON: {"type": "kTxEnd", "value": {}}
\ No newline at end of file
diff --git a/backend/package.json b/backend/package.json
index f6049fa..76d554a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -12,7 +12,7 @@
     },
     "types": "types/index.d.ts",
     "scripts": {
-        "build": "cmake-js compile -B Release && node custom_build.mjs && npm pack",
+        "build": "cmake-js compile -B Release -p 8 && node custom_build.mjs && npm pack",
         "format": "clang-format -i include/**.hpp && clang-format -i include/**.h && clang-format -i src/**.cpp"
     },
     "cmake-js": {
diff --git a/backend/src/main.cpp b/backend/src/main.cpp
index b7e523c..249abf0 100644
--- a/backend/src/main.cpp
+++ b/backend/src/main.cpp
@@ -303,6 +303,7 @@ void SetPtt(const Napi::CallbackInfo& info)
     }
 
     bool state = info[0].As<Napi::Boolean>().Value();
+
     mClient->SetPtt(state);
 }
 
diff --git a/backend/src/sdk.cpp b/backend/src/sdk.cpp
index 87f14de..5f04ed5 100644
--- a/backend/src/sdk.cpp
+++ b/backend/src/sdk.cpp
@@ -73,31 +73,33 @@ void SDK::handleAFVEventForWebsocket(sdk::types::Event event,
     }
 
     if (event == sdk::types::Event::kTxBegin) {
-        auto allRadios = mClient->getRadioState();
-        std::vector<unsigned int> allTxRadioFreqs;
-        for (const auto& [freq, state] : allRadios) {
-            if (state.tx) {
-                allTxRadioFreqs.push_back(freq);
-            }
-        }
+        // auto allRadios = mClient->getRadioState();
+        // std::vector<unsigned int> allTxRadioFreqs;
+        // for (const auto& [freq, state] : allRadios) {
+        //     if (state.tx) {
+        //         allTxRadioFreqs.push_back(freq);
+        //     }
+        // }
 
         nlohmann::json jsonMessage = WebsocketMessage::buildMessage(WebsocketMessageType::kTxBegin);
-        jsonMessage["value"]["pFrequenciesHz"] = allTxRadioFreqs;
+        // jsonMessage["value"]["pFrequenciesHz"] = allTxRadioFreqs;
         this->broadcastOnWebsocket(jsonMessage.dump());
+        return;
     }
 
     if (event == sdk::types::Event::kTxEnd) {
-        auto allRadios = mClient->getRadioState();
-        std::vector<unsigned int> allTxRadioFreqs;
-        for (const auto& [freq, state] : allRadios) {
-            if (state.tx) {
-                allTxRadioFreqs.push_back(freq);
-            }
-        }
+        // auto allRadios = mClient->getRadioState();
+        // std::vector<unsigned int> allTxRadioFreqs;
+        // for (const auto& [freq, state] : allRadios) {
+        //     if (state.tx) {
+        //         allTxRadioFreqs.push_back(freq);
+        //     }
+        // }
 
         nlohmann::json jsonMessage = WebsocketMessage::buildMessage(WebsocketMessageType::kTxEnd);
-        jsonMessage["value"]["pFrequenciesHz"] = allTxRadioFreqs;
+        // jsonMessage["value"]["pFrequenciesHz"] = allTxRadioFreqs;
         this->broadcastOnWebsocket(jsonMessage.dump());
+        return;
     }
 
     if (event == sdk::types::Event::kFrequencyStateUpdate) {
@@ -158,7 +160,7 @@ std::unique_ptr<restinio::router::express_router_t<>> SDK::buildRouter()
             .connection_close()
             .done();
     };
-
+    
     router->add_handler(
         restinio::router::none_of_methods(restinio::http_method_get()), "/", methodNotAllowed);
 
diff --git a/package-lock.json b/package-lock.json
index 28466a5..04852d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5730,7 +5730,6 @@
       "integrity": "sha512-PkhEPFdpYcTzjAO3gMHZ+map7g2+xCrMDedo/L1i0ir2BRXvAB93IkTJX497U6Srb/09r2cFt+k20VPNVCdw3Q==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
         "@electron/get": "^2.0.0",
         "@types/node": "^20.9.0",
@@ -16433,7 +16432,7 @@
     "node_modules/trackaudio-afv": {
       "version": "1.0.0",
       "resolved": "file:backend/trackaudio-afv-1.0.0.tgz",
-      "integrity": "sha512-inW+ZJQ5/GWUMoOMVhUmS5mxUU7lBGtYc07/2rjlGvllKqkpxD8VOeWC4qUzWGVbAQySuR8th46To3r0LEL1rw==",
+      "integrity": "sha512-+XaHcllqGapl6VqtqFjR3XY6qWcFmWgt9bjX9pSfj8ya1Q0uIMcFcc8uK5/tJJZKIp1dsoYTYU1U40F5527log==",
       "dependencies": {
         "bindings": "^1.5.0",
         "node-addon-api": "^1.1.0"

From 1575036c8622eaf59c993818270e74706ac9b102 Mon Sep 17 00:00:00 2001
From: Pierre Ferran <pierr3@users.noreply.github.com>
Date: Fri, 31 May 2024 18:52:51 -0400
Subject: [PATCH 07/10] Bump version

---
 backend/include/Shared.hpp | 2 +-
 package-lock.json          | 4 ++--
 package.json               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/include/Shared.hpp b/backend/include/Shared.hpp
index 49dc346..ee11224 100644
--- a/backend/include/Shared.hpp
+++ b/backend/include/Shared.hpp
@@ -30,7 +30,7 @@
 
 #define API_SERVER_PORT 49080
 
-constexpr semver::version VERSION = semver::version { 1, 0, 2, semver::prerelease::beta, 6 };
+constexpr semver::version VERSION = semver::version { 1, 0, 2, semver::prerelease::beta, 7 };
 // NOLINTNEXTLINE
 const std::string CLIENT_NAME = std::string("TrackAudio-") + VERSION.to_string();
 
diff --git a/package-lock.json b/package-lock.json
index 04852d6..ba77b3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "trackaudio",
-  "version": "1.0.2-beta.6",
+  "version": "1.0.2-beta.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "trackaudio",
-      "version": "1.0.2-beta.6",
+      "version": "1.0.2-beta.7",
       "license": "MIT",
       "dependencies": {
         "@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
diff --git a/package.json b/package.json
index 276581b..01f8e36 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "trackaudio",
   "productName": "TrackAudio",
-  "version": "1.0.2-beta.6",
+  "version": "1.0.2-beta.7",
   "description": "A next generation Audio-For-VATSIM ATC Client for macOS, Linux and Windows",
   "main": ".webpack/main",
   "scripts": {

From 1eb15a50826d5d907ea1805414378a0e798dea7e Mon Sep 17 00:00:00 2001
From: Pierre Ferran <pierr3@users.noreply.github.com>
Date: Fri, 31 May 2024 19:48:12 -0400
Subject: [PATCH 08/10] Tweaks to CI

---
 .github/workflows/release.yml |  7 -------
 .gitignore                    |  2 ++
 backend/src/sdk.cpp           |  2 +-
 forge.config.ts               | 18 ++++++++++++++++--
 scripts/entitlements.plist    | 12 ++++++++++++
 5 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 scripts/entitlements.plist

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 23797cd..ca874c7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -138,13 +138,6 @@ jobs:
           dmg_file=$(find . -name "*.dmg" -type f)
           new_dmg_file=$(echo $dmg_file | sed 's/arm64/apple-silicon/')
           mv $dmg_file $new_dmg_file
-
-      - name: Codesign dmg
-        if: matrix.os == 'macos-latest'
-        run: |
-          cd out/make
-          dmg_file=$(find . -name "*.dmg" -type f)
-          codesign --timestamp --verbose --sign "Developer ID Application" $dmg_file
       
       - id: relinfo
         uses: pozetroninc/github-action-get-latest-release@master
diff --git a/.gitignore b/.gitignore
index 6995ea7..f4c1ed9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,5 @@ build/
 
 # Sentry Config File
 .sentryclirc
+
+.sign-env.sh
diff --git a/backend/src/sdk.cpp b/backend/src/sdk.cpp
index 5f04ed5..4b6c9a4 100644
--- a/backend/src/sdk.cpp
+++ b/backend/src/sdk.cpp
@@ -160,7 +160,7 @@ std::unique_ptr<restinio::router::express_router_t<>> SDK::buildRouter()
             .connection_close()
             .done();
     };
-    
+
     router->add_handler(
         restinio::router::none_of_methods(restinio::http_method_get()), "/", methodNotAllowed);
 
diff --git a/forge.config.ts b/forge.config.ts
index 3197cf7..ad5e6ea 100644
--- a/forge.config.ts
+++ b/forge.config.ts
@@ -17,11 +17,25 @@ const canNotarize =
   process.env.APPLE_NOTARIZATION_PASSWORD &&
   process.env.APPLE_TEAM_ID;
 
+console.log("isMaking", isMaking);
+console.log("canNotarize", canNotarize);
+
 const config: ForgeConfig = {
   packagerConfig: {
     name: "TrackAudio",
     asar: true,
-    osxSign: isMaking ? {} : undefined,
+    osxSign: isMaking
+      ? {
+          optionsForFile: (filePath) => {
+            // Here, we keep it simple and return a single entitlements.plist file.
+            // You can use this callback to map different sets of entitlements
+            // to specific files in your packaged app.
+            return {
+              entitlements: "scripts/entitlements.plist",
+            };
+          },
+        }
+      : undefined,
     osxNotarize: canNotarize
       ? {
           appleId: process.env.APPLE_ID || "",
@@ -57,7 +71,7 @@ const config: ForgeConfig = {
     {
       name: "@electron-forge/maker-dmg",
       config: {
-        icon: "resources/AppIcon/AppIcon.icns"
+        icon: "resources/AppIcon/AppIcon.icns",
       },
     },
     {
diff --git a/scripts/entitlements.plist b/scripts/entitlements.plist
new file mode 100644
index 0000000..a31141a
--- /dev/null
+++ b/scripts/entitlements.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.device.audio-input</key>
+    <true/>
+    <key>com.apple.security.device.bluetooth</key>
+    <true/>
+  </dict>
+</plist>
\ No newline at end of file

From 748fb1517739ad9778968d24243d0a3ca78b11e2 Mon Sep 17 00:00:00 2001
From: Pierre Ferran <pierr3@users.noreply.github.com>
Date: Fri, 31 May 2024 20:00:34 -0400
Subject: [PATCH 09/10] Use bash shell

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ca874c7..09ec78c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -124,6 +124,7 @@ jobs:
           npm install
 
       - name: Package app
+        shell: bash
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           APPLE_ID: ${{ secrets.APPLE_ID }}

From 66398053328b672fd26cf0a6e34a556bf4ec387a Mon Sep 17 00:00:00 2001
From: Pierre Ferran <pierr3@users.noreply.github.com>
Date: Fri, 31 May 2024 20:25:29 -0400
Subject: [PATCH 10/10] Forgot to specify environment for codesigning

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 09ec78c..17598dc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,6 +6,7 @@ on:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
+    environment: Release
 
     strategy:
       matrix:
@@ -49,7 +50,7 @@ jobs:
 
       - name: Installing codesign certificates
         if: matrix.os == 'macos-latest'
-        uses: apple-actions/import-codesign-certs@v2
+        uses: apple-actions/import-codesign-certs@v3
         with:
           p12-file-base64: ${{ secrets.APPLE_CERT_DATA }}
           p12-password: ${{ secrets.APPLE_CERT_PASSWORD }}