From a7dcfb73631bf36e8bc56de68b53a6e4abb74bdf Mon Sep 17 00:00:00 2001
From: Thiago Hernandez <thiago.hernandez@gmail.com>
Date: Thu, 6 Jul 2023 22:27:17 +0200
Subject: [PATCH 1/2] fix: fixed the sidebar menu applying the right size in
 different screen sizes

---
 src/renderer/theme/GlobalStyles.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/theme/GlobalStyles.js b/src/renderer/theme/GlobalStyles.js
index 9b5f8622b..913a0323d 100644
--- a/src/renderer/theme/GlobalStyles.js
+++ b/src/renderer/theme/GlobalStyles.js
@@ -1750,7 +1750,7 @@ div.card.card-preferences .card-body {
   }
 }
 @media screen and (min-width: 1000px) {
-  #app {
+  #root {
     --sidebarWidth: ${({ theme }) => theme.sidebarWidthLarge}px;
   }
   .bs-tooltip-right.tooltipMenu {
@@ -1770,7 +1770,7 @@ div.card.card-preferences .card-body {
 }
 
 @media screen and (max-height: 870px) {
-  #app {
+  #root {
     --sidebarWidth: ${({ theme }) => theme.sidebarWidthMedium}px;
   }
   div.main-container {
@@ -1783,7 +1783,7 @@ div.card.card-preferences .card-body {
 }
 
 @media screen and (max-height: 670px) {
-  #app {
+  #root {
     --sidebarWidth: ${({ theme }) => theme.sidebarWidthSmall}px;
   }
 }

From 5ddbae1d547e967ef9bea8ba4d6c182a0e6f475a Mon Sep 17 00:00:00 2001
From: Thiago Hernandez <thiago.hernandez@gmail.com>
Date: Thu, 6 Jul 2023 22:59:20 +0200
Subject: [PATCH 2/2] fix: fixed the battery status when the battery is already
 fully charged

---
 .../component/Battery/BatteryStatusSide.js      |  2 +-
 .../component/Battery/DefyBatteryIndicator.js   | 17 +++++------------
 .../Battery/DefyBatteryIndicatorLeft.js         |  6 +++---
 .../Battery/DefyBatteryIndicatorRight.js        |  6 +++---
 src/renderer/component/Battery/PileIndicator.js | 11 +++--------
 5 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/renderer/component/Battery/BatteryStatusSide.js b/src/renderer/component/Battery/BatteryStatusSide.js
index 3252cf021..dcb5aae6f 100644
--- a/src/renderer/component/Battery/BatteryStatusSide.js
+++ b/src/renderer/component/Battery/BatteryStatusSide.js
@@ -246,7 +246,7 @@ const BatteryStatusSide = ({ side, batteryLevel, isSavingMode, batteryStatus, si
     if (batteryLevel < 10 && !isSavingMode && batteryStatus === 0) {
       setSideStatus("status--critical");
     }
-    if (batteryStatus === 1 || batteryStatus === 2) {
+    if (batteryStatus === 1) {
       setIsCharging(true);
     }
   }, [size, batteryLevel, batteryStatus, isSavingMode]);
diff --git a/src/renderer/component/Battery/DefyBatteryIndicator.js b/src/renderer/component/Battery/DefyBatteryIndicator.js
index 5693442a9..9194113fb 100644
--- a/src/renderer/component/Battery/DefyBatteryIndicator.js
+++ b/src/renderer/component/Battery/DefyBatteryIndicator.js
@@ -78,17 +78,10 @@ const DefyBatteryIndicator = ({ side, batteryLevel, isCharging, batteryStatus })
     <Style>
       <div className="batterySideWrapper">
         <div className="batterySide">
-          {side === "left" ? (
-            <DefyBatteryIndicatorLeft isCharging={isCharging} batteryStatus={batteryStatus} batteryHeight={batteryHeight} />
-          ) : (
-            ""
-          )}
-          {side === "right" ? (
-            <DefyBatteryIndicatorRight isCharging={isCharging} batteryStatus={batteryStatus} batteryHeight={batteryHeight} />
-          ) : (
-            ""
-          )}
-          {!isCharging && batteryStatus === 0 ? <div className="batterySide--percentage">{batteryLevel}%</div> : ""}
+          {side === "left" ? <DefyBatteryIndicatorLeft batteryStatus={batteryStatus} batteryHeight={batteryHeight} /> : ""}
+          {side === "right" ? <DefyBatteryIndicatorRight batteryStatus={batteryStatus} batteryHeight={batteryHeight} /> : ""}
+          {batteryStatus === 0 ? <div className="batterySide--percentage">{batteryLevel}%</div> : ""}
+          {batteryStatus === 2 ? <div className="batterySide--percentage">100%</div> : ""}
         </div>
         {batteryStatus === 3 ? (
           <div className="alertMessage alert-warning">{i18n.wireless.batteryPreferences.batteryErrorReading}</div>
@@ -100,7 +93,7 @@ const DefyBatteryIndicator = ({ side, batteryLevel, isCharging, batteryStatus })
         ) : (
           ""
         )}
-        {batteryStatus === 0xff ? (
+        {batteryStatus === 255 ? (
           <div className="alertMessage alert-fatal-error">{i18n.wireless.batteryPreferences.batteryFatalError}</div>
         ) : (
           ""
diff --git a/src/renderer/component/Battery/DefyBatteryIndicatorLeft.js b/src/renderer/component/Battery/DefyBatteryIndicatorLeft.js
index 71a884c46..a3ac0a779 100644
--- a/src/renderer/component/Battery/DefyBatteryIndicatorLeft.js
+++ b/src/renderer/component/Battery/DefyBatteryIndicatorLeft.js
@@ -1,6 +1,6 @@
 import React from "react";
 
-const DefyBatteryIndicatorLeft = ({ isCharging, batteryStatus, batteryHeight }) => {
+const DefyBatteryIndicatorLeft = ({ batteryStatus, batteryHeight }) => {
   const maskHash = `${(Math.random() + 1).toString(36).substring(7)}-left`;
   return (
     <svg
@@ -82,7 +82,7 @@ const DefyBatteryIndicatorLeft = ({ isCharging, batteryStatus, batteryHeight })
       ) : (
         ""
       )}
-      {isCharging ? (
+      {batteryStatus === 1 ? (
         <path
           className="lightningbattery"
           d="M40.9893 63.989L51.6559 48.1001V60.3223H56.9893L46.3226 77.4334V63.989H40.9893Z"
@@ -112,7 +112,7 @@ const DefyBatteryIndicatorLeft = ({ isCharging, batteryStatus, batteryHeight })
       ) : (
         ""
       )}
-      {batteryStatus == 0xff ? (
+      {batteryStatus === 255 ? (
         <path
           d="M50.1789 67.6962C50.1789 68.0322 49.9869 68.2002 49.6029 68.2002H47.1549C46.8509 68.2002 46.6989 68.0562 46.6989 67.7682V65.1042C46.6989 64.8482 46.8029 64.7202 47.0109 64.7202H49.8669C50.0749 64.7202 50.1789 64.8322 50.1789 65.0562V67.6962ZM49.4829 62.5842C49.4829 62.7602 49.4349 62.8882 49.3389 62.9682C49.2589 63.0322 49.1229 63.0642 48.9309 63.0642H47.8749C47.6989 63.0642 47.5869 63.0322 47.5389 62.9682C47.4909 62.9042 47.4509 62.7922 47.4189 62.6322L46.6509 50.7762C46.6349 50.6482 46.6589 50.5522 46.7229 50.4882C46.7869 50.4242 46.8669 50.3922 46.9629 50.3922H49.9389C50.1629 50.3922 50.2669 50.5042 50.2509 50.7282L49.4829 62.5842Z"
           fill="#FF6B6B"
diff --git a/src/renderer/component/Battery/DefyBatteryIndicatorRight.js b/src/renderer/component/Battery/DefyBatteryIndicatorRight.js
index cee7e0421..5f118a83c 100644
--- a/src/renderer/component/Battery/DefyBatteryIndicatorRight.js
+++ b/src/renderer/component/Battery/DefyBatteryIndicatorRight.js
@@ -1,6 +1,6 @@
 import React from "react";
 
-const DefyBatteryIndicatorRight = ({ isCharging, batteryStatus, batteryHeight }) => {
+const DefyBatteryIndicatorRight = ({ batteryStatus, batteryHeight }) => {
   const maskHash = `${(Math.random() + 1).toString(36).substring(7)}-right`;
   return (
     <svg
@@ -83,7 +83,7 @@ const DefyBatteryIndicatorRight = ({ isCharging, batteryStatus, batteryHeight })
       ) : (
         ""
       )}
-      {isCharging ? (
+      {batteryStatus == 1 ? (
         <path
           className="lightningbattery"
           d="M40.9893 63.989L51.6559 48.1001V60.3223H56.9893L46.3226 77.4334V63.989H40.9893Z"
@@ -103,7 +103,7 @@ const DefyBatteryIndicatorRight = ({ isCharging, batteryStatus, batteryHeight })
         ""
       )}
       {batteryStatus == 4 ? <path d="M106 130L2 1" stroke="currentColor" className="lineDisconnected" strokeWidth="3" /> : ""}
-      {batteryStatus == 0xff ? (
+      {batteryStatus === 255 ? (
         <path
           d="M50.1789 67.6962C50.1789 68.0322 49.9869 68.2002 49.6029 68.2002H47.1549C46.8509 68.2002 46.6989 68.0562 46.6989 67.7682V65.1042C46.6989 64.8482 46.8029 64.7202 47.0109 64.7202H49.8669C50.0749 64.7202 50.1789 64.8322 50.1789 65.0562V67.6962ZM49.4829 62.5842C49.4829 62.7602 49.4349 62.8882 49.3389 62.9682C49.2589 63.0322 49.1229 63.0642 48.9309 63.0642H47.8749C47.6989 63.0642 47.5869 63.0322 47.5389 62.9682C47.4909 62.9042 47.4509 62.7922 47.4189 62.6322L46.6509 50.7762C46.6349 50.6482 46.6589 50.5522 46.7229 50.4882C46.7869 50.4242 46.8669 50.3922 46.9629 50.3922H49.9389C50.1629 50.3922 50.2669 50.5042 50.2509 50.7282L49.4829 62.5842Z"
           fill="#FF6B6B"
diff --git a/src/renderer/component/Battery/PileIndicator.js b/src/renderer/component/Battery/PileIndicator.js
index 05a8b3ee7..77b285b0f 100644
--- a/src/renderer/component/Battery/PileIndicator.js
+++ b/src/renderer/component/Battery/PileIndicator.js
@@ -98,13 +98,8 @@ const PileIndicator = ({ batteryLevel, isCharging, batteryStatus }) => {
       )}
       {batteryStatus == 2 ? (
         <>
-          <mask id="mask2_2054_10394" style={{ maskType: "alpha" }} maskUnits="userSpaceOnUse" x="2" y="6" width="16" height="4">
-            <rect x="2" y="6" width="16" height="4" fill="#7879F1" />
-          </mask>
-          <g mask="url(#mask2_2054_10394)">
-            <path d="M16.75 6H13.75V3.5H23.75V14H11.75L16.75 6Z" fill="currentColor" />
-            <path d="M2.75 10.5L7.75 3H-2.25V14H5.75V10.5H2.75Z" fill="currentColor" />
-          </g>
+          <rect x="0.5" y="4.5" width="19" height="7" stroke="currentColor" />
+          <rect x="2" y="6" width={16} height="4" fill="currentColor" />
         </>
       ) : (
         ""
@@ -162,7 +157,7 @@ const PileIndicator = ({ batteryLevel, isCharging, batteryStatus }) => {
       ) : (
         ""
       )}
-      {batteryStatus == 0xff ? (
+      {batteryStatus === 255 ? (
         <>
           <mask id="mask0_2054_10114" style={{ maskType: "alpha" }} maskUnits="userSpaceOnUse" x="0" y="4" width="20" height="8">
             <rect x="0.5" y="4.5" width="19" height="7" stroke="black" />