From b633650679437554464298ee46dc9b5bae0f629b Mon Sep 17 00:00:00 2001
From: Jas-SinghFSU <jaskiratpal.singh@outlook.com>
Date: Sat, 13 Jul 2024 16:16:53 -0700
Subject: [PATCH] Network wifi section fix

---
 modules/menus/network/wifi/WirelessAPs.js | 14 +++++++-------
 scss/menus/network.scss                   |  6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/menus/network/wifi/WirelessAPs.js b/modules/menus/network/wifi/WirelessAPs.js
index 8310fc0..43ec8c2 100644
--- a/modules/menus/network/wifi/WirelessAPs.js
+++ b/modules/menus/network/wifi/WirelessAPs.js
@@ -27,14 +27,13 @@ const renderWAPs = (self, network, staging, connecting) => {
   };
   self.hook(network, () => {
     Utils.merge(
-      [network.bind("wifi"), staging.bind("value"), connecting.bind("value")],
+      [staging.bind("value"), connecting.bind("value")],
       () => {
         // Sometimes the network service will yield a "this._device is undefined" when
         // trying to access the "access_points" property. So we must validate that
         // it's not 'undefined'
         let WAPs =
-          Object.hasOwnProperty.call(network.wifi, "access_points") &&
-          network.wifi["access_points"] !== undefined
+          network.wifi._device !== undefined
             ? network.wifi["access-points"]
             : [];
 
@@ -154,7 +153,7 @@ const renderWAPs = (self, network, staging, connecting) => {
                                 class_name: "connection-status dim",
                                 label:
                                   WifiStatusMap[
-                                    network.wifi.state.toLowerCase()
+                                  network.wifi.state.toLowerCase()
                                   ],
                               }),
                             }),
@@ -166,7 +165,7 @@ const renderWAPs = (self, network, staging, connecting) => {
                       hpack: "end",
                       vpack: "start",
                       reveal_child:
-                        ap.bssid === connecting.value || isDisconnecting(ap),
+                      ap.bssid === connecting.value || isDisconnecting(ap),
                       child: Widget.Spinner({
                         vpack: "start",
                         class_name: "spinner wap",
@@ -179,7 +178,6 @@ const renderWAPs = (self, network, staging, connecting) => {
                 vpack: "start",
                 reveal_child: ap.bssid !== connecting.value && ap.active,
                 child: Widget.Button({
-                  vpack: "start",
                   tooltip_text: "Delete/Forget Network",
                   class_name: "menu-icon-button network disconnect",
                   on_primary_click: () => {
@@ -205,7 +203,9 @@ const renderWAPs = (self, network, staging, connecting) => {
                       },
                     );
                   },
-                  child: Widget.Label("󰚃"),
+                  child: Widget.Label({
+                    label: "󰚃"
+                  }),
                 }),
               }),
             ],
diff --git a/scss/menus/network.scss b/scss/menus/network.scss
index 237d186..9df6c03 100644
--- a/scss/menus/network.scss
+++ b/scss/menus/network.scss
@@ -77,9 +77,11 @@
     }
 
     .menu-icon-button.network.disconnect {
-        margin-bottom: 0.4em;
+        margin: 0em;
+        margin-top: -0.2em;
+        margin-left: 1em;
         label {
-            font-size: 1.3em;
+            font-size: 1.4em;
         }
         &:hover { 
             color: $mauve;