fix: progress bar not sticky issue

GeneralMagicio · Oct 28, 2024 · 5e19777 · 5e19777
1 parent 6960af3
commit 5e19777
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/app/allocation/components/EOA/ConnectEOAModal.tsx b/app/allocation/components/EOA/ConnectEOAModal.tsx
@@ -24,24 +24,30 @@ const ConnectEOAModal: FC<TConnectEOAModalProps> = ({ email, setStep }) => {
       return;
     }
 
-    const msg = 'Sign in with Thirdweb wallet';
-    const account = wallet?.getAccount();
+    try {
+      const msg = 'Sign in with Thirdweb wallet';
+      const account = wallet?.getAccount();
 
-    if (!account) {
-      setError('Unable to connect to your wallet');
-      setLoading(false);
-      return;
-    }
+      if (!account) {
+        setError('Unable to connect to your wallet');
+        setLoading(false);
+        return;
+      }
 
-    const signature = await account.signMessage({ message: msg });
+      const signature = await account.signMessage({ message: msg });
 
-    await axiosInstance.post('auth/thirdweb/login', {
-      message: msg,
-      signature,
-      address: account.address,
-    });
-    setLoading(false);
-    setStep(Step.SUCCESS);
+      await axiosInstance.post('auth/thirdweb/login', {
+        message: msg,
+        signature,
+        address: account.address,
+      });
+      setLoading(false);
+      setStep(Step.SUCCESS);
+    }
+    catch (err) {
+      setError('An error occurred while connecting to your wallet');
+      setLoading(false);
+    }
   };
 
   return (

diff --git a/app/comparison/card/Header-RF6.tsx b/app/comparison/card/Header-RF6.tsx
@@ -73,8 +73,10 @@ const HeaderRF6: FC<HeaderProps> = ({
   }, [badges]);
 
   useEffect(() => {
+    const HEADER_HEIGHT = 80;
+
     const handleScroll = () => {
-      if (window.scrollY > 100) {
+      if (window.scrollY > HEADER_HEIGHT) {
         setIsBarFixed(true);
       }
       else {
@@ -151,9 +153,7 @@ const HeaderRF6: FC<HeaderProps> = ({
                 {category}
               </span>
             )}
-            <div
-              className="hidden items-center gap-4 2xl:flex"
-            >
+            <div className="hidden items-center gap-4 2xl:flex">
               {activeBadges.length > 0 && (
                 <button
                   onClick={() => setIsBadgesModalOpen(true)}