Merge pull request #22 from scalefocus/feature/formatQuota

Show proper quota value

Author: borissiljan

src/components/Quota.tsx

@@ -10,14 +10,15 @@ import { styled } from '@mui/material/styles';
 import AuthContext from 'context/authContext';
 import { useContext } from 'react';
 
-import { formatBytes } from '../utils/utils';
+import {  formatUsedQuotaInGB } from '../utils/utils';
 
 export const Quota = () => {
 	const { user } = useContext(AuthContext);
 	const quota = user?.quota || 0;
 	const usedQuota = user?.usedQuota || 0;
 
-	const percentage = ((usedQuota / quota) * 100).toFixed(1);
+	const percentage = (usedQuota / quota) * 100;
+	const displayedUsedQuota = percentage > 0 ? Math.max(0.1, Math.round(percentage * 10) / 10).toFixed(1) : "0.0";
 
 	const BorderLinearProgress = styled(LinearProgress)(() => ({
 		height: 8,
@@ -60,7 +61,7 @@ export const Quota = () => {
 								Quota
 							</Typography>
 							<Typography color="text.primary" fontWeight="600" variant="h4">
-								{percentage}%
+								{displayedUsedQuota}%
 							</Typography>
 						</Stack>
 					</Stack>
@@ -73,7 +74,7 @@ export const Quota = () => {
 						/>
 					</Box>
 					<Typography color="text.secondary" gutterBottom sx={{ mt: 3 }}>
-						{formatBytes(usedQuota, 2)} GB of {formatBytes(quota, 2)} GB used
+						{formatUsedQuotaInGB(usedQuota, 2)} GB of {formatUsedQuotaInGB(quota, 2)} GB used
 					</Typography>
 				</Box>
 			) : (

src/utils/utils.ts

@@ -15,7 +15,7 @@ export const storage = {
 		localStorage.setItem('expiration', expiration.toString());
 	},
 	setRefreshExpiration: () => {
-		//refresh expiration in	3 days
+		// refresh expiration in	3 days
 		const expiration = new Date(Date.now() + 259200000);
 		localStorage.setItem('refresh-expiration', expiration.toString());
 	},
@@ -79,3 +79,12 @@ export const generateImageHash = async (file: File) => {
 	const base64String = hexToBase64(hashValue);
 	return base64String;
 };
+
+export const formatUsedQuotaInGB = (usedQuota: number, decimals = 2) => {
+  if (usedQuota <= 0) return "0.0";
+
+  const rawGB = formatBytes(usedQuota, decimals);
+  const gbValue = parseFloat(rawGB);
+
+  return gbValue < 0.1 ? "0.1" : `${rawGB}`;
+}