From f11ee9135387f0b4e839a7939970b09827e8a050 Mon Sep 17 00:00:00 2001
From: SeniorDev <tech.eng.me@gmail.com>
Date: Tue, 8 Oct 2024 10:55:43 -0400
Subject: [PATCH 1/6] I fix feedback.

---
 src/components/Core/Icon/index.tsx                 |  8 ++++----
 src/components/Core/TextArea.tsx                   |  4 ++--
 src/components/Pages/BonasiContent/index.tsx       |  3 ---
 .../BonsaiContent.tsx}                             |  8 ++++----
 src/components/Pages/BonsaiContent/index.tsx       |  3 +++
 src/components/Pages/LandingPage/LandingPage.tsx   | 12 ++++++------
 src/lib/consts.tsx                                 |  2 +-
 src/styles/globals.css                             | 14 ++++++++++++--
 8 files changed, 32 insertions(+), 22 deletions(-)
 delete mode 100644 src/components/Pages/BonasiContent/index.tsx
 rename src/components/Pages/{BonasiContent/BonasiContent.tsx => BonsaiContent/BonsaiContent.tsx} (87%)
 create mode 100644 src/components/Pages/BonsaiContent/index.tsx

diff --git a/src/components/Core/Icon/index.tsx b/src/components/Core/Icon/index.tsx
index ff860ce9..9eebe509 100644
--- a/src/components/Core/Icon/index.tsx
+++ b/src/components/Core/Icon/index.tsx
@@ -66,10 +66,10 @@ function Icon({
           size <= 20
             ? styles.sizes.mini
             : size < 25
-            ? styles.sizes.small
-            : size < 40
-            ? styles.sizes.medium
-            : styles.sizes.large
+              ? styles.sizes.small
+              : size < 40
+                ? styles.sizes.medium
+                : styles.sizes.large
         } 
         ${!noHighlights && styles?.variants?.[variant]?.highlight} 
         ${className}
diff --git a/src/components/Core/TextArea.tsx b/src/components/Core/TextArea.tsx
index 5dddeea0..8249db25 100644
--- a/src/components/Core/TextArea.tsx
+++ b/src/components/Core/TextArea.tsx
@@ -55,8 +55,8 @@ function TextArea({
         className={`text-gray_1 w-full border-[2px] !border-gray_1 bg-black
           focus:ring-0 focus:border-gray_1 
           ${className || ""} ${
-          hookToForm && fieldError && fieldError?.message ? clasNameError : ""
-        }`}
+            hookToForm && fieldError && fieldError?.message ? clasNameError : ""
+          }`}
         {...(!hookToForm && {
           value,
           onChange,
diff --git a/src/components/Pages/BonasiContent/index.tsx b/src/components/Pages/BonasiContent/index.tsx
deleted file mode 100644
index 0e1c3160..00000000
--- a/src/components/Pages/BonasiContent/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import BonasiContent from "./BonasiContent"
-
-export default BonasiContent
diff --git a/src/components/Pages/BonasiContent/BonasiContent.tsx b/src/components/Pages/BonsaiContent/BonsaiContent.tsx
similarity index 87%
rename from src/components/Pages/BonasiContent/BonasiContent.tsx
rename to src/components/Pages/BonsaiContent/BonsaiContent.tsx
index d1583f6b..56523354 100644
--- a/src/components/Pages/BonasiContent/BonasiContent.tsx
+++ b/src/components/Pages/BonsaiContent/BonsaiContent.tsx
@@ -1,9 +1,9 @@
 import getIpfsLink from "@/lib/getIpfsLink"
-import { BONASI } from "@/lib/consts"
+import { BONSAI } from "@/lib/consts"
 import RecBar from "../../RecBar"
 import useIsMobile from "../../../hooks/useIsMobile"
 
-const BonasiContent = () => {
+const BonsaiContent = () => {
   const isMobile = useIsMobile()
 
   return (
@@ -20,7 +20,7 @@ const BonasiContent = () => {
         >
           {/* eslint-disable-next-line jsx-a11y/media-has-caption */}
           <video
-            src={getIpfsLink(BONASI)}
+            src={getIpfsLink(BONSAI)}
             width={isMobile ? 180 : 200}
             height={isMobile ? 125 : 230}
             controls
@@ -33,4 +33,4 @@ const BonasiContent = () => {
   )
 }
 
-export default BonasiContent
+export default BonsaiContent
diff --git a/src/components/Pages/BonsaiContent/index.tsx b/src/components/Pages/BonsaiContent/index.tsx
new file mode 100644
index 00000000..6fb795dc
--- /dev/null
+++ b/src/components/Pages/BonsaiContent/index.tsx
@@ -0,0 +1,3 @@
+import BonsaiContent from "./BonsaiContent"
+
+export default BonsaiContent
diff --git a/src/components/Pages/LandingPage/LandingPage.tsx b/src/components/Pages/LandingPage/LandingPage.tsx
index f083f936..12b964ae 100644
--- a/src/components/Pages/LandingPage/LandingPage.tsx
+++ b/src/components/Pages/LandingPage/LandingPage.tsx
@@ -8,13 +8,13 @@ import { SCREENS } from "@/lib/screens"
 import { usePopupWidget } from "@/providers/PopupWidgetProvider"
 import LandingCard from "../../LandingCard"
 import Layout from "../../Layout"
-import BonasiContent from "../BonasiContent/BonasiContent"
+import BonsaiContent from "../BonsaiContent"
 
 const LandingPage = () => {
   const { openPopUp } = usePopupWidget() as any
   const { entered } = usePageLoad()
   const isMobile = useIsMobile()
-  const [isBonasiOpen, setIsBonasiOpen] = useState<any>(true)
+  const [isBonsaiOpen, setIsBonsaiOpen] = useState<any>(true)
 
   return (
     <Layout type={isMobile ? "mobile" : "base"}>
@@ -59,13 +59,13 @@ const LandingPage = () => {
           Play Relief
         </a>
       )}
-      {isBonasiOpen && (
+      {isBonsaiOpen && (
         <DraggableModal
           href="/"
-          handleClose={() => setIsBonasiOpen(!isBonasiOpen)}
-          isVisible={isBonasiOpen}
+          handleClose={() => setIsBonsaiOpen(!isBonsaiOpen)}
+          isVisible={isBonsaiOpen}
         >
-          <BonasiContent />
+          <BonsaiContent />
         </DraggableModal>
       )}
     </Layout>
diff --git a/src/lib/consts.tsx b/src/lib/consts.tsx
index 93927ff9..cd061b12 100644
--- a/src/lib/consts.tsx
+++ b/src/lib/consts.tsx
@@ -63,7 +63,7 @@ export const ONE_MILLISEOND = 1000
 
 export const SYSTEM_COMMERCIAL =
   "ipfs://Qmccf1fZeNZc9nWwvq3a5aiQr3bCr5VNCi3PaUbhrUnpRJ/SYSTEM%20COMMERCIAL.mp4"
-export const BONASI = "ipfs://QmeiQuQSv8HWsAmZxzX666V26KbknVi82qQMq5sibGhSHr"
+export const BONSAI = "ipfs://QmeiQuQSv8HWsAmZxzX666V26KbknVi82qQMq5sibGhSHr"
 export const COLLECTIONS = [
   {
     collectionAddress: ZORA_DROP_ADDRESS,
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 43594a45..8ab0df73 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -33,8 +33,18 @@ body {
   background-color: black;
   padding: 0;
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell,
-    Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+  font-family:
+    -apple-system,
+    BlinkMacSystemFont,
+    Segoe UI,
+    Roboto,
+    Oxygen,
+    Ubuntu,
+    Cantarell,
+    Fira Sans,
+    Droid Sans,
+    Helvetica Neue,
+    sans-serif;
 }
 
 body::-webkit-scrollbar {

From 8bb4f49dbee5c27af0ae758e1fdd931b671b3c0f Mon Sep 17 00:00:00 2001
From: techeng322 <techeng322@users.noreply.github.com>
Date: Tue, 8 Oct 2024 14:59:41 +0000
Subject: [PATCH 2/6] Apply formatting changes

---
 src/components/Core/Icon/index.tsx |  8 ++++----
 src/components/Core/TextArea.tsx   |  4 ++--
 src/styles/globals.css             | 14 ++------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/components/Core/Icon/index.tsx b/src/components/Core/Icon/index.tsx
index 9eebe509..ff860ce9 100644
--- a/src/components/Core/Icon/index.tsx
+++ b/src/components/Core/Icon/index.tsx
@@ -66,10 +66,10 @@ function Icon({
           size <= 20
             ? styles.sizes.mini
             : size < 25
-              ? styles.sizes.small
-              : size < 40
-                ? styles.sizes.medium
-                : styles.sizes.large
+            ? styles.sizes.small
+            : size < 40
+            ? styles.sizes.medium
+            : styles.sizes.large
         } 
         ${!noHighlights && styles?.variants?.[variant]?.highlight} 
         ${className}
diff --git a/src/components/Core/TextArea.tsx b/src/components/Core/TextArea.tsx
index 8249db25..5dddeea0 100644
--- a/src/components/Core/TextArea.tsx
+++ b/src/components/Core/TextArea.tsx
@@ -55,8 +55,8 @@ function TextArea({
         className={`text-gray_1 w-full border-[2px] !border-gray_1 bg-black
           focus:ring-0 focus:border-gray_1 
           ${className || ""} ${
-            hookToForm && fieldError && fieldError?.message ? clasNameError : ""
-          }`}
+          hookToForm && fieldError && fieldError?.message ? clasNameError : ""
+        }`}
         {...(!hookToForm && {
           value,
           onChange,
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 8ab0df73..43594a45 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -33,18 +33,8 @@ body {
   background-color: black;
   padding: 0;
   margin: 0;
-  font-family:
-    -apple-system,
-    BlinkMacSystemFont,
-    Segoe UI,
-    Roboto,
-    Oxygen,
-    Ubuntu,
-    Cantarell,
-    Fira Sans,
-    Droid Sans,
-    Helvetica Neue,
-    sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell,
+    Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
 }
 
 body::-webkit-scrollbar {

From 9c21f8c68ab768ec7b635f59b6eef3e68bf52226 Mon Sep 17 00:00:00 2001
From: SeniorDev <tech.eng.me@gmail.com>
Date: Tue, 8 Oct 2024 11:02:02 -0400
Subject: [PATCH 3/6] I fix conflict.

---
 src/components/Core/Icon/index.tsx                 |  8 ++++----
 src/components/Core/TextArea.tsx                   |  4 ++--
 .../{BonasiSection.tsx => BonsaiSection.tsx}       |  4 ++--
 src/components/Pages/Web3Page/Trailer.tsx          |  4 ++--
 src/styles/globals.css                             | 14 ++++++++++++--
 5 files changed, 22 insertions(+), 12 deletions(-)
 rename src/components/Pages/Web3Page/{BonasiSection.tsx => BonsaiSection.tsx} (82%)

diff --git a/src/components/Core/Icon/index.tsx b/src/components/Core/Icon/index.tsx
index ff860ce9..9eebe509 100644
--- a/src/components/Core/Icon/index.tsx
+++ b/src/components/Core/Icon/index.tsx
@@ -66,10 +66,10 @@ function Icon({
           size <= 20
             ? styles.sizes.mini
             : size < 25
-            ? styles.sizes.small
-            : size < 40
-            ? styles.sizes.medium
-            : styles.sizes.large
+              ? styles.sizes.small
+              : size < 40
+                ? styles.sizes.medium
+                : styles.sizes.large
         } 
         ${!noHighlights && styles?.variants?.[variant]?.highlight} 
         ${className}
diff --git a/src/components/Core/TextArea.tsx b/src/components/Core/TextArea.tsx
index 5dddeea0..8249db25 100644
--- a/src/components/Core/TextArea.tsx
+++ b/src/components/Core/TextArea.tsx
@@ -55,8 +55,8 @@ function TextArea({
         className={`text-gray_1 w-full border-[2px] !border-gray_1 bg-black
           focus:ring-0 focus:border-gray_1 
           ${className || ""} ${
-          hookToForm && fieldError && fieldError?.message ? clasNameError : ""
-        }`}
+            hookToForm && fieldError && fieldError?.message ? clasNameError : ""
+          }`}
         {...(!hookToForm && {
           value,
           onChange,
diff --git a/src/components/Pages/Web3Page/BonasiSection.tsx b/src/components/Pages/Web3Page/BonsaiSection.tsx
similarity index 82%
rename from src/components/Pages/Web3Page/BonasiSection.tsx
rename to src/components/Pages/Web3Page/BonsaiSection.tsx
index e443f421..c79bedcb 100644
--- a/src/components/Pages/Web3Page/BonasiSection.tsx
+++ b/src/components/Pages/Web3Page/BonsaiSection.tsx
@@ -2,7 +2,7 @@ import CollectDropButton from "@/components/CollectDropButton"
 import DropCollect from "@/components/DropCollect"
 import data from "@/lib/zora-drops"
 
-const BonasiSection = ({ isPopup }) => (
+const BonsaiSection = ({ isPopup }) => (
   <DropCollect
     title={data[12].title}
     artist={data[12].artist}
@@ -13,4 +13,4 @@ const BonasiSection = ({ isPopup }) => (
   </DropCollect>
 )
 
-export default BonasiSection
+export default BonsaiSection
diff --git a/src/components/Pages/Web3Page/Trailer.tsx b/src/components/Pages/Web3Page/Trailer.tsx
index 96bf824a..2efd83eb 100644
--- a/src/components/Pages/Web3Page/Trailer.tsx
+++ b/src/components/Pages/Web3Page/Trailer.tsx
@@ -1,5 +1,5 @@
 import ArcadeSection from "./ArcadeSection"
-import BonasiSection from "./BonasiSection"
+import BonsaiSection from "./BonsaiSection"
 import DropSection from "./DropSection"
 import HydroplaningSection from "./HydroplaningSection"
 import NeyborsSection from "./NeyborsSection"
@@ -9,7 +9,7 @@ const Trailer = ({ isPopup = false }) => (
   <div className="h-full overflow-y-auto w-full">
     <div className={`flex flex-col items-center gap-y-[10px] ${!isPopup && "md:gap-y-[20px]"}`}>
       <div className="flex flex-col gap-y-[10px] h-full overflow-y-auto pr-2">
-        <BonasiSection isPopup={isPopup} />
+        <BonsaiSection isPopup={isPopup} />
         <HydroplaningSection isPopup={isPopup} />
         <TopArbitrumSection isPopup={isPopup} />
         <DropSection isPopup={isPopup} />
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 43594a45..8ab0df73 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -33,8 +33,18 @@ body {
   background-color: black;
   padding: 0;
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell,
-    Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+  font-family:
+    -apple-system,
+    BlinkMacSystemFont,
+    Segoe UI,
+    Roboto,
+    Oxygen,
+    Ubuntu,
+    Cantarell,
+    Fira Sans,
+    Droid Sans,
+    Helvetica Neue,
+    sans-serif;
 }
 
 body::-webkit-scrollbar {

From c0a0fd1428677bfda036ca6a617b024550bb4cad Mon Sep 17 00:00:00 2001
From: SeniorDev <tech.eng.me@gmail.com>
Date: Tue, 8 Oct 2024 11:09:51 -0400
Subject: [PATCH 4/6] fix: started At.

---
 src/lib/zora-drops.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/zora-drops.ts b/src/lib/zora-drops.ts
index 2297fc46..5c4638d4 100644
--- a/src/lib/zora-drops.ts
+++ b/src/lib/zora-drops.ts
@@ -75,7 +75,7 @@ const data = [
     ipfs: "https://ipfs.decentralized-content.com/ipfs/QmeiQuQSv8HWsAmZxzX666V26KbknVi82qQMq5sibGhSHr",
     artist: "heno",
     title: "Heno., Mad Keys - Lemons Made Better (Snippet)",
-    startedAt: "",
+    startedAt: "11am ET, 9 October, 2024",
   },
 ]
 export default data

From 141bf7ee03438476e0ec566a34bfee2d5d1cfe06 Mon Sep 17 00:00:00 2001
From: techeng322 <techeng322@users.noreply.github.com>
Date: Tue, 8 Oct 2024 15:12:19 +0000
Subject: [PATCH 5/6] Apply formatting changes

---
 src/components/Core/Icon/index.tsx |  8 ++++----
 src/components/Core/TextArea.tsx   |  4 ++--
 src/styles/globals.css             | 14 ++------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/components/Core/Icon/index.tsx b/src/components/Core/Icon/index.tsx
index 9eebe509..ff860ce9 100644
--- a/src/components/Core/Icon/index.tsx
+++ b/src/components/Core/Icon/index.tsx
@@ -66,10 +66,10 @@ function Icon({
           size <= 20
             ? styles.sizes.mini
             : size < 25
-              ? styles.sizes.small
-              : size < 40
-                ? styles.sizes.medium
-                : styles.sizes.large
+            ? styles.sizes.small
+            : size < 40
+            ? styles.sizes.medium
+            : styles.sizes.large
         } 
         ${!noHighlights && styles?.variants?.[variant]?.highlight} 
         ${className}
diff --git a/src/components/Core/TextArea.tsx b/src/components/Core/TextArea.tsx
index 8249db25..5dddeea0 100644
--- a/src/components/Core/TextArea.tsx
+++ b/src/components/Core/TextArea.tsx
@@ -55,8 +55,8 @@ function TextArea({
         className={`text-gray_1 w-full border-[2px] !border-gray_1 bg-black
           focus:ring-0 focus:border-gray_1 
           ${className || ""} ${
-            hookToForm && fieldError && fieldError?.message ? clasNameError : ""
-          }`}
+          hookToForm && fieldError && fieldError?.message ? clasNameError : ""
+        }`}
         {...(!hookToForm && {
           value,
           onChange,
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 8ab0df73..43594a45 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -33,18 +33,8 @@ body {
   background-color: black;
   padding: 0;
   margin: 0;
-  font-family:
-    -apple-system,
-    BlinkMacSystemFont,
-    Segoe UI,
-    Roboto,
-    Oxygen,
-    Ubuntu,
-    Cantarell,
-    Fira Sans,
-    Droid Sans,
-    Helvetica Neue,
-    sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell,
+    Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
 }
 
 body::-webkit-scrollbar {

From 0d1e23c02d1f1ca5c3c39a254a7d582128f40d53 Mon Sep 17 00:00:00 2001
From: SeniorDev <tech.eng.me@gmail.com>
Date: Tue, 8 Oct 2024 11:12:16 -0400
Subject: [PATCH 6/6] fix: started At.

---
 src/lib/zora-drops.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/zora-drops.ts b/src/lib/zora-drops.ts
index 5c4638d4..60a2e045 100644
--- a/src/lib/zora-drops.ts
+++ b/src/lib/zora-drops.ts
@@ -75,7 +75,7 @@ const data = [
     ipfs: "https://ipfs.decentralized-content.com/ipfs/QmeiQuQSv8HWsAmZxzX666V26KbknVi82qQMq5sibGhSHr",
     artist: "heno",
     title: "Heno., Mad Keys - Lemons Made Better (Snippet)",
-    startedAt: "11am ET, 9 October, 2024",
+    startedAt: "October 09, 2024",
   },
 ]
 export default data