Merge branch 'dev' of https://github.com/UnitapApp/unitap-front

UnitapApp · Jan 30, 2024 · aebb06f · aebb06f
2 parents ab046ec + 25d0c00
commit aebb06f
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 15 deletions.
diff --git a/components/containers/modals/brightConnectionModal.tsx b/components/containers/modals/brightConnectionModal.tsx
@@ -141,12 +141,13 @@ export const BrightConnectionModalBody = () => {
       )}
       <span className="flex mb-3">
         <Icon
-          className="mr-2 mb-3"
+          className="mr-2 mb-4"
           iconSrc="/assets/images/modal/gray-danger.svg"
         />
-        <p className="text-xs w-88 text-gray90 font-light">
-          Submit Verification after verifing with brighID app. This might take
-          up to 5 minutes.
+        <p className="text-xs text-center text-gray90 font-light">
+          Submit Verification after verifing with brighID app.
+          <br />
+          This might take up to 5 minutes.
         </p>
       </span>
       {refreshUserProfile && (

diff --git a/components/layout/UserAuthStatus.tsx b/components/layout/UserAuthStatus.tsx
@@ -0,0 +1,44 @@
+"use client";
+import { useRef, useState } from "react";
+import { useOutsideClick } from "@/utils/hooks/dom";
+import { useUserProfileContext } from "@/context/userProfile";
+import { RenderNavbarWalletAddress, ProfileDropdown } from "./auth";
+
+export const UserAuthStatus = () => {
+  const divRef = useRef<HTMLDivElement>(null);
+
+  const [dropDownActive, setDropDownActive] = useState(false);
+
+  useOutsideClick(divRef, () => setDropDownActive(false));
+
+  const { userProfile } = useUserProfileContext();
+
+  return (
+    <div ref={divRef} className="md:relative ml-5">
+      <div className={`ml-5 p-[1px] rounded-lg mr-3`} id="profile-dropdown">
+        <div className="cursor-pointer flex rounded-lg h-9 items-center justify-between bg-gray40">
+          <div
+            onClick={() => {
+              if (!userProfile) return;
+              setDropDownActive(!dropDownActive);
+            }}
+            className="cursor-pointer relative z-20 pr-0.5 pl-2 flex rounded-lg h-9 items-center justify-between bg-gray40"
+          >
+            <span className="ml-2 hidden md:block text-sm">
+              @ {userProfile?.username || `User${userProfile.pk}`}
+            </span>
+
+            <span className="text-gray90 hidden md:block ml-8 mr-5">
+              level: ?{" "}
+            </span>
+            <RenderNavbarWalletAddress />
+          </div>
+
+          {dropDownActive && (
+            <ProfileDropdown setDropDownActive={setDropDownActive} />
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/components/layout/auth.tsx b/components/layout/auth.tsx
@@ -113,7 +113,7 @@ const WalletItem = ({
   );
 };
 
-const ProfileDropdown: FC<{
+export const ProfileDropdown: FC<{
   setDropDownActive: (isActive: boolean) => void;
 }> = ({ setDropDownActive }) => {
   const { userProfile, logout, setHoldUserLogout } = useUserProfileContext();

diff --git a/constants/chains.ts b/constants/chains.ts
@@ -26,6 +26,9 @@ import {
   optimism,
   mainnet,
   sepolia,
+  base,
+  mantle,
+  thunderTestnet,
 } from "viem/chains";
 
 const IDChain = {
@@ -45,7 +48,7 @@ const IDChain = {
 
 export const kccMainnet = {
   id: 321,
-  name: "KuCoin Community Chain",
+  name: "KCC Mainnet",
   network: "KuCoin",
   nativeCurrency: { name: "KuCoin Token", symbol: "KCS", decimals: 18 },
   rpcUrls: {
@@ -88,8 +91,11 @@ export const kccMainnet = {
 export const supportedChains = [
   sepolia,
   mainnet,
-  avalanche,
+  { ...avalanche, name: "Avalanche C-Chain" },
   bsc,
+  base,
+  mantle,
+  thunderTestnet,
   { ...polygon, name: "Polygon Mainnet" },
   {
     ...fantom,
@@ -115,18 +121,26 @@ export const supportedChains = [
   IDChain,
   optimism,
   meter,
-  zetachainAthensTestnet,
+  {
+    ...zetachainAthensTestnet,
+    name: "ZetaChain Athens 3 Testnet",
+    rpcUrls: {
+      ...zetachainAthensTestnet.rpcUrls,
+      default: { http: ["https://rpc.ankr.com/zetachain_evm_athens_testnet"] },
+      public: { http: ["https://rpc.ankr.com/zetachain_evm_athens_testnet"] },
+    },
+  },
   scroll,
   xdc,
   arbitrum,
   telos,
-  harmonyOne,
+  { ...harmonyOne, name: "Harmony Mainnet Shard 0" },
   celo,
   opBNBTestnet,
   linea,
   lineaTestnet,
   arbitrumNova,
-  scrollSepolia,
+  { ...scrollSepolia, name: "Scroll Sepolia Testnet" },
   kccMainnet,
   opBNB,
 ];

diff --git a/context/gasTapProvider.tsx b/context/gasTapProvider.tsx
@@ -179,7 +179,7 @@ export const GasTapProvider: FC<
     );
   }, []);
 
-  const updateOneTimeClaimedList = async () => {
+  const updateOneTimeClaimedList = useCallback(async () => {
     if (!userToken) return;
 
     try {
@@ -188,7 +188,7 @@ export const GasTapProvider: FC<
       console.warn("error fetching users claimed list");
       console.error(e);
     }
-  };
+  }, [userToken]);
 
   const updateActiveClaimHistory = useCallback(async () => {
     if (userToken && userProfile) {
@@ -306,7 +306,7 @@ export const GasTapProvider: FC<
     updateActiveClaimHistory();
     updateOneTimeClaimedList();
     updateFuelChampionList();
-  }, [updateChainList]);
+  }, []);
 
   useEffect(() => {
     if (!userToken || chainList.length) return;

diff --git a/utils/api/auth.ts b/utils/api/auth.ts
@@ -61,6 +61,8 @@ export async function loginOrRegister(
     }
   );
 
+  response.data.username = response.data.username ?? `User${response.data?.pk}`;
+
   return response.data;
 }
 
@@ -73,6 +75,8 @@ export async function getUserProfileWithTokenAPI(token: string) {
       },
     }
   );
+
+  response.data.username = response.data.username ?? `User${response.data?.pk}`;
   return response.data;
 }
 

diff --git a/utils/api/gastap.ts b/utils/api/gastap.ts
@@ -35,8 +35,6 @@ export async function getWeeklyChainClaimLimitAPI() {
     return prev;
   }, {} as Settings);
 
-  console.log(result);
-
   return result;
 }