From 83e3ad31b097574e88732b0d21a2917463ce6450 Mon Sep 17 00:00:00 2001
From: Benedek Robert George <benedek_robert2001@yahoo.com>
Date: Fri, 5 Apr 2024 10:29:15 +0300
Subject: [PATCH 1/2] fix: countdown displaying hour issue and drop down menu
 overlap

---
 src/components/Layout/Navbar.tsx           | 1 +
 src/pages/AppMarketplace/GetBitz/index.tsx | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/Layout/Navbar.tsx b/src/components/Layout/Navbar.tsx
index 2361bed..2a62b1e 100644
--- a/src/components/Layout/Navbar.tsx
+++ b/src/components/Layout/Navbar.tsx
@@ -75,6 +75,7 @@ export const Navbar = () => {
                 return (
                   <PopoverPrimitive.PopoverClose>
                     <div className="flex  flex-row justify-center items-center">
+                      You can try again in:
                       <Gift className="mx-2 text-sky-300" />
                       <span> Collect your {`<BiTz>`} </span>
                     </div>
diff --git a/src/pages/AppMarketplace/GetBitz/index.tsx b/src/pages/AppMarketplace/GetBitz/index.tsx
index ad47add..c2660ab 100644
--- a/src/pages/AppMarketplace/GetBitz/index.tsx
+++ b/src/pages/AppMarketplace/GetBitz/index.tsx
@@ -423,8 +423,8 @@ export const GetBitz = () => {
         // Render a countdown
         return (
           <span>
-            {props.hours > 0 ? (props.hours + props.hours === 1 ? " Hour " : " Hours ") : ""}
-            {props.minutes > 0 ? props.minutes + " Min : " : ""} {props.seconds} Sec
+            {props.hours > 0 ? <>{`${props.hours} ${props.hours === 1 ? " Hour " : " Hours "}`}</> : ""}
+            {props.minutes > 0 ? props.minutes + " Min " : ""} {props.seconds} Sec
           </span>
         );
       }
@@ -443,9 +443,9 @@ export const GetBitz = () => {
                   return <> </>;
                 } else {
                   return (
-                    <div className="absolute z-10 w-full h-full rounded-[3rem] bg-black/90 ">
+                    <div className="absolute z-5 w-full h-full rounded-[3rem] bg-black/90 ">
                       <div className="flex w-full h-full  items-center justify-center">
-                        <div className="text-3xl md:text-5xl flex flex-col items-center justify-center ">
+                        <div className="text-3xl md:text-5xl flex flex-col items-center justify-center text-white ">
                           <p className="my-4 text-xl md:text-3xl "> You can play again in: </p>{" "}
                           {props.hours > 0 ? <>{`${props.hours} ${props.hours === 1 ? " Hour " : " Hours "}`}</> : ""}
                           {props.minutes > 0 ? props.minutes + " Min " : ""} {props.seconds} Sec

From 2d46b9e3f1dcb26f61bcd67fedde86c4199d299b Mon Sep 17 00:00:00 2001
From: Benedek Robert George <benedek_robert2001@yahoo.com>
Date: Fri, 5 Apr 2024 10:31:05 +0300
Subject: [PATCH 2/2] Update Navbar.tsx

---
 src/components/Layout/Navbar.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Layout/Navbar.tsx b/src/components/Layout/Navbar.tsx
index 2a62b1e..2361bed 100644
--- a/src/components/Layout/Navbar.tsx
+++ b/src/components/Layout/Navbar.tsx
@@ -75,7 +75,6 @@ export const Navbar = () => {
                 return (
                   <PopoverPrimitive.PopoverClose>
                     <div className="flex  flex-row justify-center items-center">
-                      You can try again in:
                       <Gift className="mx-2 text-sky-300" />
                       <span> Collect your {`<BiTz>`} </span>
                     </div>