From 04725b4a9fe83ea97b6633c5e6d21c46fb9167b7 Mon Sep 17 00:00:00 2001
From: Ram <ramtorgeman@gmail.com>
Date: Mon, 29 May 2023 22:21:59 +0300
Subject: [PATCH 1/3] Implemented a click toggle for megabyte and megabit.

---
 .../components/ProgressHeader/index.tsx       | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx b/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx
index 1ab81b20e0..011daaaccf 100644
--- a/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx
+++ b/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx
@@ -11,11 +11,16 @@ interface Point {
   disk: number
 }
 
-const roundToNearestHundredth = function (val: number | undefined) {
+const roundToNearestHundredthByte = function (val: number | undefined) {
   if (!val) return 0
   return Math.round(val * 100) / 100
 }
 
+const roundToNearestHundredthBit = function (val: number | undefined) {
+  if (!val) return 0
+  return Math.round(val * 100) / 100 * 8
+}
+
 export default function ProgressHeader(props: {
   appName: string
   state: DownloadManagerState
@@ -25,6 +30,7 @@ export default function ProgressHeader(props: {
   const [avgSpeed, setAvgDownloadSpeed] = useState<Point[]>(
     Array<Point>(20).fill({ download: 0, disk: 0 })
   )
+  const [speedType, setSpeedType] = useState<'megabit' | 'megabyte'>('megabyte')
 
   useEffect(() => {
     if (props.state === 'idle') {
@@ -47,6 +53,16 @@ export default function ProgressHeader(props: {
     setAvgDownloadSpeed([...avgSpeed])
   }, [progress, props.state])
 
+  const roundSpeed = function (val: number | undefined) {
+    if (speedType === 'megabyte') return roundToNearestHundredthByte(val)
+    return roundToNearestHundredthBit(val)
+  }
+
+  const toggleSpeedType = function () {    
+    if (speedType === 'megabyte') setSpeedType('megabit')
+    else setSpeedType('megabyte')
+  }
+
   return (
     <>
       <div className="progressHeader">
@@ -83,17 +99,17 @@ export default function ProgressHeader(props: {
               </ResponsiveContainer>
             </div>
           </div>
-          <div className="realtimeDownloadStatContainer">
+          <div className="realtimeDownloadStatContainer" onClick={toggleSpeedType}>
             <h5 className="realtimeDownloadStat">
-              {roundToNearestHundredth(avgSpeed.at(-1)?.download)} MB/s
+              {roundSpeed(avgSpeed.at(-1)?.download)} {speedType === 'megabyte' ? 'MB/s' : 'Mb/s'}
             </h5>
             <div className="realtimeDownloadStatLabel downLabel">
               {t('download-manager.label.speed', 'Download')}{' '}
             </div>
           </div>
-          <div className="realtimeDownloadStatContainer">
+          <div className="realtimeDownloadStatContainer" onClick={toggleSpeedType}>
             <h5 className="realtimeDownloadStat">
-              {roundToNearestHundredth(avgSpeed.at(-1)?.disk)} MB/s
+              {roundSpeed(avgSpeed.at(-1)?.disk)} {speedType === 'megabyte' ? 'MB/s' : 'Mb/s'}
             </h5>
             <div className="realtimeDownloadStatLabel diskLabel">
               {t('download-manager.label.disk', 'Disk')}{' '}
@@ -104,9 +120,8 @@ export default function ProgressHeader(props: {
       {props.state !== 'idle' && props.appName && progress.eta && (
         <div className="downloadBar">
           <div className="downloadProgressStats">
-            <p className="downloadStat" color="var(--text-default)">{`${
-              progress.percent ?? 0
-            }% [${progress.bytes ?? ''}] `}</p>
+            <p className="downloadStat" color="var(--text-default)">{`${progress.percent ?? 0
+              }% [${progress.bytes ?? ''}] `}</p>
           </div>
           <Box sx={{ display: 'flex', alignItems: 'baseline' }}>
             <Box sx={{ width: '100%', mr: 1 }}>

From ab9298587de58430a18cca43b4e7a12410003d71 Mon Sep 17 00:00:00 2001
From: Ram <ramtorgeman@gmail.com>
Date: Tue, 30 May 2023 11:21:53 +0300
Subject: [PATCH 2/3] Revert "Implemented a click toggle for megabyte and
 megabit."

This reverts commit 04725b4a9fe83ea97b6633c5e6d21c46fb9167b7.
---
 .../components/ProgressHeader/index.tsx       | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx b/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx
index 011daaaccf..1ab81b20e0 100644
--- a/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx
+++ b/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx
@@ -11,16 +11,11 @@ interface Point {
   disk: number
 }
 
-const roundToNearestHundredthByte = function (val: number | undefined) {
+const roundToNearestHundredth = function (val: number | undefined) {
   if (!val) return 0
   return Math.round(val * 100) / 100
 }
 
-const roundToNearestHundredthBit = function (val: number | undefined) {
-  if (!val) return 0
-  return Math.round(val * 100) / 100 * 8
-}
-
 export default function ProgressHeader(props: {
   appName: string
   state: DownloadManagerState
@@ -30,7 +25,6 @@ export default function ProgressHeader(props: {
   const [avgSpeed, setAvgDownloadSpeed] = useState<Point[]>(
     Array<Point>(20).fill({ download: 0, disk: 0 })
   )
-  const [speedType, setSpeedType] = useState<'megabit' | 'megabyte'>('megabyte')
 
   useEffect(() => {
     if (props.state === 'idle') {
@@ -53,16 +47,6 @@ export default function ProgressHeader(props: {
     setAvgDownloadSpeed([...avgSpeed])
   }, [progress, props.state])
 
-  const roundSpeed = function (val: number | undefined) {
-    if (speedType === 'megabyte') return roundToNearestHundredthByte(val)
-    return roundToNearestHundredthBit(val)
-  }
-
-  const toggleSpeedType = function () {    
-    if (speedType === 'megabyte') setSpeedType('megabit')
-    else setSpeedType('megabyte')
-  }
-
   return (
     <>
       <div className="progressHeader">
@@ -99,17 +83,17 @@ export default function ProgressHeader(props: {
               </ResponsiveContainer>
             </div>
           </div>
-          <div className="realtimeDownloadStatContainer" onClick={toggleSpeedType}>
+          <div className="realtimeDownloadStatContainer">
             <h5 className="realtimeDownloadStat">
-              {roundSpeed(avgSpeed.at(-1)?.download)} {speedType === 'megabyte' ? 'MB/s' : 'Mb/s'}
+              {roundToNearestHundredth(avgSpeed.at(-1)?.download)} MB/s
             </h5>
             <div className="realtimeDownloadStatLabel downLabel">
               {t('download-manager.label.speed', 'Download')}{' '}
             </div>
           </div>
-          <div className="realtimeDownloadStatContainer" onClick={toggleSpeedType}>
+          <div className="realtimeDownloadStatContainer">
             <h5 className="realtimeDownloadStat">
-              {roundSpeed(avgSpeed.at(-1)?.disk)} {speedType === 'megabyte' ? 'MB/s' : 'Mb/s'}
+              {roundToNearestHundredth(avgSpeed.at(-1)?.disk)} MB/s
             </h5>
             <div className="realtimeDownloadStatLabel diskLabel">
               {t('download-manager.label.disk', 'Disk')}{' '}
@@ -120,8 +104,9 @@ export default function ProgressHeader(props: {
       {props.state !== 'idle' && props.appName && progress.eta && (
         <div className="downloadBar">
           <div className="downloadProgressStats">
-            <p className="downloadStat" color="var(--text-default)">{`${progress.percent ?? 0
-              }% [${progress.bytes ?? ''}] `}</p>
+            <p className="downloadStat" color="var(--text-default)">{`${
+              progress.percent ?? 0
+            }% [${progress.bytes ?? ''}] `}</p>
           </div>
           <Box sx={{ display: 'flex', alignItems: 'baseline' }}>
             <Box sx={{ width: '100%', mr: 1 }}>

From b3391addf7ab1008ae582c6fcf493032152e76f7 Mon Sep 17 00:00:00 2001
From: Ram <ramtorgeman@gmail.com>
Date: Tue, 30 May 2023 12:11:45 +0300
Subject: [PATCH 3/3] Fix for the ignore "flatpak-build" folder

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b99920c0b8..3be158ebd6 100644
--- a/package.json
+++ b/package.json
@@ -212,8 +212,8 @@
     "flatpak:prepare-release": "node ./flatpak/prepareFlatpak.js release",
     "i18n": "i18next --silent",
     "prepare": "husky install",
-    "prettier": "prettier --check . '!flatpak-build'",
-    "prettier-fix": "prettier --write . '!flatpak-build'"
+    "prettier": "prettier --check . !'flatpak-build'",
+    "prettier-fix": "prettier --write . !'flatpak-build'"
   },
   "eslintConfig": {
     "extends": [