feat(mfi-v2-ui): point improvements

apps/marginfi-v2-ui/package.json

@@ -57,7 +57,7 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",
     "cmdk": "^0.2.0",
-    "firebase": "^9.22.1",
+    "firebase": "^10.6.0",
     "firebase-admin": "^11.9.0",
     "jsbi": "^4.3.0",
     "lodash.debounce": "^4.0.8",

apps/marginfi-v2-ui/src/components/desktop/Points/PointsSignIn.tsx

@@ -10,7 +10,6 @@ import { firebaseApi } from "@mrgnlabs/marginfi-v2-ui-state";
 import { WalletButton } from "~/components/common/Wallet";
 import { useWalletContext } from "~/hooks/useWalletContext";
 import { MrgnTooltip } from "~/components/common/MrgnTooltip";
-
 interface PointsSignInProps {}
 
 export const PointsSignIn: FC<PointsSignInProps> = ({}) => {
@@ -23,10 +22,8 @@ export const PointsSignIn: FC<PointsSignInProps> = ({}) => {
       return;
     }
     toast.info("Logging in...");
-    const blockhashInfo = await connection.getLatestBlockhash();
     try {
-      await firebaseApi.login(wallet, useAuthTx ? "tx" : "memo", blockhashInfo);
-      // localStorage.setItem("authData", JSON.stringify(signedAuthData));
+      await firebaseApi.login(wallet.publicKey.toBase58());
       toast.success("Logged in successfully");
     } catch (loginError: any) {
       toast.error(loginError.message);

apps/marginfi-v2-ui/src/components/desktop/Points/PointsSignUp.tsx

@@ -39,10 +39,8 @@ export const PointsSignUp: FC<PointsSignUpProps> = ({ referralCode }) => {
       return;
     }
     toast.info("Logging in...");
-    const blockhashInfo = await connection.getLatestBlockhash();
     try {
-      await firebaseApi.signup(wallet, useAuthTx ? "tx" : "memo", blockhashInfo, finalReferralCode);
-      // localStorage.setItem("authData", JSON.stringify(signedAuthData));
+      await firebaseApi.signup(wallet.publicKey.toBase58(), finalReferralCode);
       toast.success("Signed up successfully");
     } catch (signupError: any) {
       toast.error(signupError.message);

apps/marginfi-v2-ui/src/hooks/useFirebaseAccount.tsx

@@ -1,22 +1,28 @@
 import { firebaseApi } from "@mrgnlabs/marginfi-v2-ui-state";
 import { onAuthStateChanged } from "firebase/auth";
 import { useEffect } from "react";
+import { useRouter } from "next/router";
+
 import { toast } from "react-toastify";
 import { useUserProfileStore } from "~/store";
 import { useWalletContext } from "./useWalletContext";
+import React from "react";
 
 const useFirebaseAccount = () => {
   const { connected, walletAddress } = useWalletContext();
+  const { query: routerQuery } = useRouter();
+
+  const referralCode = React.useMemo(() => routerQuery.referralCode as string | undefined, [routerQuery.referralCode]);
 
-  const [checkForFirebaseUser, setFirebaseUser, signoutFirebaseUser, fetchPoints, resetPoints] = useUserProfileStore(
-    (state) => [
+  const [checkForFirebaseUser, setFirebaseUser, signoutFirebaseUser, fetchPoints, resetPoints, hasUser] =
+    useUserProfileStore((state) => [
       state.checkForFirebaseUser,
       state.setFirebaseUser,
       state.signoutFirebaseUser,
       state.fetchPoints,
       state.resetPoints,
-    ]
-  );
+      state.hasUser,
+    ]);
 
   useEffect(() => {
     // NOTE: if more point-specific logic is added, move this to a separate hook
@@ -35,8 +41,10 @@ const useFirebaseAccount = () => {
   // Wallet connection side effect (auto-login attempt)
   useEffect(() => {
     if (!walletAddress) return;
+
+    firebaseApi.loginOrSignup(walletAddress.toBase58(), referralCode).catch(console.error);
     checkForFirebaseUser(walletAddress.toBase58());
-  }, [walletAddress, checkForFirebaseUser]);
+  }, [walletAddress, checkForFirebaseUser, referralCode]);
 
   // Wallet disconnection/change side effect (auto-logout)
   useEffect(() => {

apps/marginfi-v2-ui/src/pages/api/user/login.ts

@@ -20,13 +20,13 @@ import {
 initFirebaseIfNeeded();
 
 export interface LoginRequest {
-  method: SigningMethod;
-  signedAuthDataRaw: string;
+  walletAddress: string;
 }
 
 export default async function handler(req: NextApiRequest<LoginRequest>, res: any) {
-  const { method, signedAuthDataRaw } = req.body;
+  const { walletAddress } = req.body;
 
+  /* signing logic
   let signer;
   try {
     const loginData = validateAndUnpackLoginData(signedAuthDataRaw, method);
@@ -46,32 +46,34 @@ export default async function handler(req: NextApiRequest<LoginRequest>, res: an
         status = STATUS_INTERNAL_ERROR;
     }
     return res.status(status).json({ error: error.message });
-  }
+  }*/
 
-  let user;
   try {
-    const userResult = await getFirebaseUserByWallet(signer);
+    const userResult = await getFirebaseUserByWallet(walletAddress);
     if (userResult === undefined) {
-      await logLoginAttempt(signer, null, signedAuthDataRaw, false);
+      await logLoginAttempt(walletAddress, null, "", false);
       Sentry.captureException({ message: "User not found" });
       return res.status(STATUS_NOT_FOUND).json({ error: "User not found" });
+    } else {
+      await logLoginAttempt(walletAddress, userResult.uid, "", true);
     }
-    user = userResult;
   } catch (error: any) {
     Sentry.captureException(error);
     return res.status(STATUS_INTERNAL_ERROR).json({ error: error.message }); // An unexpected error occurred
   }
 
-  await logLoginAttempt(signer, user.uid, signedAuthDataRaw, true);
-
   // Generate a custom token for the client to log in
-  const customToken = await admin.auth().createCustomToken(signer);
+  const customToken = await admin.auth().createCustomToken(walletAddress);
 
-  return res.status(STATUS_OK).json({ status: "success", uid: signer, token: customToken });
+  return res.status(STATUS_OK).json({ status: "success", uid: walletAddress, token: customToken });
 }
 
 // -------- Helpers
 
+/**
+ * @deprecated
+ * Signing functionality
+ */
 export function validateAndUnpackLoginData(
   signedAuthDataRaw: string,
   signingMethod: SigningMethod

apps/marginfi-v2-ui/src/pages/api/user/signup.ts

@@ -19,21 +19,19 @@ import {
 initFirebaseIfNeeded();
 
 export interface SignupRequest {
-  method: SigningMethod;
-  signedAuthDataRaw: string;
+  walletAddress: string;
+  payload: firebaseApi.SignupPayload;
 }
 
 export default async function handler(req: NextApiRequest<SignupRequest>, res: any) {
-  const { method, signedAuthDataRaw } = req.body;
+  const { walletAddress, payload } = req.body;
 
   Sentry.setContext("signup_args", {
-    method,
-    signedAuthDataRaw,
+    walletAddress,
   });
 
-  let signer;
-  let payload;
-  try {
+  /* signing logic
+   try {
     const signupData = validateAndUnpackSignupData(signedAuthDataRaw, method);
     signer = signupData.signer.toBase58();
     payload = signupData.payload;
@@ -52,10 +50,10 @@ export default async function handler(req: NextApiRequest<SignupRequest>, res: a
         status = STATUS_INTERNAL_ERROR;
     }
     return res.status(status).json({ error: error.message });
-  }
+  }*/
 
   try {
-    const user = await getFirebaseUserByWallet(signer);
+    const user = await getFirebaseUserByWallet(walletAddress);
     if (user) {
       Sentry.captureException({ message: "User already exists" });
       return res.status(STATUS_BAD_REQUEST).json({ error: "User already exists" });
@@ -66,23 +64,27 @@ export default async function handler(req: NextApiRequest<SignupRequest>, res: a
   }
 
   try {
-    await createFirebaseUser(signer, payload.referralCode);
+    await createFirebaseUser(walletAddress, payload.referralCode);
     console.log("successfully created new user");
   } catch (createUserError: any) {
     Sentry.captureException(createUserError);
     return res.status(STATUS_INTERNAL_ERROR).json({ error: createUserError.message });
   }
 
-  await logSignupAttempt(signer, payload.uuid, signedAuthDataRaw, true);
+  await logSignupAttempt(walletAddress, payload.uuid, "", true);
 
   // Generate a custom token for the client to sign in
-  const customToken = await admin.auth().createCustomToken(signer);
+  const customToken = await admin.auth().createCustomToken(walletAddress);
 
-  return res.status(STATUS_OK).json({ status: "success", uid: signer, token: customToken });
+  return res.status(STATUS_OK).json({ status: "success", uid: walletAddress, token: customToken });
 }
 
 // -------- Helpers
 
+/**
+ * @deprecated
+ * Signing functionality
+ */
 export function validateAndUnpackSignupData(
   signedAuthDataRaw: string,
   signingMethod: SigningMethod

apps/marginfi-v2-ui/src/pages/points.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 
 import Link from "next/link";
-import { useRouter } from "next/router";
 
 import { Button } from "@mui/material";
 import FileCopyIcon from "@mui/icons-material/FileCopy";
@@ -14,22 +13,19 @@ import { PageHeader } from "~/components/common/PageHeader";
 import {
   PointsLeaderBoard,
   PointsOverview,
-  PointsSignIn,
-  PointsSignUp,
   PointsCheckingUser,
   PointsConnectWallet,
 } from "~/components/desktop/Points";
 
 const Points = () => {
   const { connected } = useWalletContext();
-  const { query: routerQuery } = useRouter();
+
   const [currentFirebaseUser, hasUser, userPointsData] = useUserProfileStore((state) => [
     state.currentFirebaseUser,
     state.hasUser,
     state.userPointsData,
   ]);
 
-  const referralCode = React.useMemo(() => routerQuery.referralCode as string | undefined, [routerQuery.referralCode]);
   const [isReferralCopied, setIsReferralCopied] = React.useState(false);
 
   return (
@@ -40,12 +36,8 @@ const Points = () => {
           <PointsConnectWallet />
         ) : currentFirebaseUser ? (
           <PointsOverview userPointsData={userPointsData} />
-        ) : hasUser === null ? (
-          <PointsCheckingUser />
-        ) : hasUser ? (
-          <PointsSignIn />
         ) : (
-          <PointsSignUp referralCode={referralCode} />
+          <PointsCheckingUser />
         )}
         <div className="w-2/3 flex justify-center items-center gap-5">
           <Button