Added min stable version check

portapack-mayhem · Jan 27, 2024 · 593f125 · 593f125
1 parent dd3be3d
commit 593f125
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -17,15 +17,17 @@ const Home = () => {
 
   return (
     <>
-      <header>
-        <NavBar />
-      </header>
-      <main className="flex h-full min-h-screen flex-col items-center justify-between p-1">
-        <SerialLoader>
-          <Controller />
-        </SerialLoader>
-      </main>
-      <Footer />
+      <div className="flex min-h-screen flex-col">
+        <header>
+          <NavBar />
+        </header>
+        <main className="flex min-h-0 grow flex-col items-center justify-between p-1">
+          <SerialLoader>
+            <Controller />
+          </SerialLoader>
+        </main>
+        <Footer />
+      </div>
     </>
   );
 };

diff --git a/src/components/Controller/Controller.tsx b/src/components/Controller/Controller.tsx
@@ -21,6 +21,7 @@ import {
   getVersionLink,
   getVersionType,
   nightlyVersionFormat,
+  stableVersionFormat,
 } from "@/utils/versionUtils";
 import { FileBrowser, FileStructure } from "../FileBrowser/FileBrowser";
 import HotkeyButton from "../HotkeyButton/HotkeyButton";
@@ -557,8 +558,10 @@ const Controller = () => {
         closeModal={() => setFirmwarModalOpen(false)}
         className="w-[40%]"
       >
-        {nightlyVersionFormat(deviceVersion) < 240114 &&
-        getVersionType(deviceVersion) == "nightly" ? (
+        {(nightlyVersionFormat(deviceVersion) < 240114 &&
+          getVersionType(deviceVersion) == "nightly") ||
+        (stableVersionFormat(deviceVersion) < 200 &&
+          getVersionType(deviceVersion) == "stable") ? (
           <p>
             Sorry, your firmware version is too old to do this. Please manually
             update to the latest nightly!

diff --git a/src/components/SerialLoader/SerialLoader.tsx b/src/components/SerialLoader/SerialLoader.tsx
@@ -62,13 +62,13 @@ const SerialLoader = ({ children }: PropsWithChildren<SerialLoaderProps>) => {
   };
 
   const errorMessage = () => (
-    <div className="absolute inset-0 flex h-full min-h-screen w-full flex-1 flex-col items-center justify-center text-black">
+    <div className="flex flex-1 flex-col items-center justify-center text-black">
       <div className="flex w-full max-w-lg flex-col rounded-xl bg-white p-6">
         <h1 className="-mt-1 mb-2 text-xl font-medium">😔 Uh oh... </h1>
-        <p className="mb-1">
+        <p className="mb-1 pb-5">
           Looks like your browser doesn&apos;t support the{" "}
           <a
-            className="text-green-800 focus:underline"
+            className="text-green-800 underline"
             href="https://caniuse.com/web-serial"
             target="_blank"
             rel="noopener noreferrer"
@@ -77,8 +77,8 @@ const SerialLoader = ({ children }: PropsWithChildren<SerialLoaderProps>) => {
           </a>
           .
         </p>
-        <p>Please try switching to a supported browser.</p>
-        <p>(e.g.: Chrome, Edge, Opera...)</p>
+        <p>Please try switching to a browser that supports the API.</p>
+        <p className="italic opacity-70">(e.g.: Chrome, Edge, Opera...)</p>
       </div>
     </div>
   );

diff --git a/src/components/SerialProvider/SerialProvider.tsx b/src/components/SerialProvider/SerialProvider.tsx
@@ -268,6 +268,7 @@ const useWebSerial = ({
       portState.current = "closed";
       setIsOpen(false);
       console.error("Could not open port");
+      throw new Error("Could not open port");
     }
   };
 

diff --git a/src/utils/versionUtils.tsx b/src/utils/versionUtils.tsx
@@ -6,6 +6,11 @@ export const nightlyVersionFormat = (input: string): number => {
   return number;
 };
 
+export const stableVersionFormat = (input: string): number => {
+  const number = parseInt(input.replace(/\D/g, ""));
+  return number;
+};
+
 const nightlyToDate = (input: string): string => {
   const prefixRemoved = input.replace("n_", "");