chore: merge v3-main, resolve conflicts

next.config.js

@@ -125,11 +125,11 @@ const nextConfig = {
   },
   async redirects() {
     return [
-      // {
-      //   source: "/",
-      //   destination: "/explorer",
-      //   permanent: false,
-      // },
+      {
+        source: "/",
+        destination: "/explorer",
+        permanent: false,
+      },
       {
         source: "/buildonbase/:path*",
         destination: "/base/:path*",

src/components/Header.tsx

@@ -6,9 +6,9 @@ import { Card } from "./ui/Card";
 export const Header = () => (
   <header className="flex h-14 items-center justify-between gap-4 p-2">
     {/* TODO: NavMenu component */}
-    <Card className="h-11 w-24 rounded-xl" />
+    <Card className="h-11 w-24" />
 
-    <Card className="rounded-xl">
+    <Card>
       <AuthBoundary fallback={<SignInButton variant="ghost" />}>
         <SignOutButton />
       </AuthBoundary>

src/components/SignInDialog.tsx

@@ -3,11 +3,12 @@
 import { signIn } from "@/actions/auth";
 import { signInDialogOpenAtom } from "@/config/atoms";
 import { env } from "@/lib/env";
-import { SignIn, User, Wallet } from "@phosphor-icons/react/dist/ssr";
+import { SignIn, User, Wallet, XCircle } from "@phosphor-icons/react/dist/ssr";
 import { DialogDescription } from "@radix-ui/react-dialog";
 import { useMutation } from "@tanstack/react-query";
 import { useAtom, useSetAtom } from "jotai";
 import { shortenHex } from "lib/shortenHex";
+import { toast } from "sonner";
 import { createSiweMessage } from "viem/siwe";
 import { useAccount, useConnect, useSignMessage } from "wagmi";
 import { z } from "zod";
@@ -89,19 +90,13 @@ const SignInWithEthereum = () => {
       const { nonce } = await fetch(`${env.NEXT_PUBLIC_API}/auth/siwe/nonce`)
         .then((res) => res.json())
         .then((data) => z.object({ nonce: z.string() }).parse(data));
-      const urlHostname = [
-        new URL(env.NEXT_PUBLIC_URL).hostname,
-        window.location.port,
-      ]
-        .filter(Boolean)
-        .join(":");
 
       const message = createSiweMessage({
         address: address!,
         chainId: 1,
-        domain: urlHostname,
+        domain: new URL(env.NEXT_PUBLIC_SIWE_URL).hostname,
         nonce,
-        uri: urlHostname,
+        uri: env.NEXT_PUBLIC_SIWE_URL,
         version: "1",
       });
 
@@ -110,6 +105,13 @@ const SignInWithEthereum = () => {
       return signIn({ message, signature });
     },
     onSuccess: () => setSignInDialogOpen(false),
+    onError: (error) => {
+      toast("Sign in error", {
+        description: error.message,
+        icon: <XCircle weight="fill" className="text-icon-error" />,
+      });
+      console.error(error);
+    },
   });
 
   return (

src/config/pinata.server.ts

@@ -4,6 +4,6 @@ import { env } from "@/lib/env";
 import { PinataSDK } from "pinata-web3";
 
 export const pinata = new PinataSDK({
-  pinataJwt: `${env.PINATA_JWT}`,
+  pinataJwt: `${env.PINATA_ADMIN_JWT}`,
   pinataGateway: `${env.NEXT_PUBLIC_PINATA_GATEWAY_URL}`,
 });

src/lib/env.ts

@@ -3,20 +3,20 @@ import { z } from "zod";
 
 export const env = createEnv({
   server: {
-    PINATA_JWT: z.string(),
+    PINATA_ADMIN_JWT: z.string(),
   },
   client: {
     NEXT_PUBLIC_API: z.string(),
-    NEXT_PUBLIC_URL: z.string(),
+    NEXT_PUBLIC_SIWE_URL: z.string(),
     NEXT_PUBLIC_PINATA_GATEWAY_URL: z.string(),
   },
   runtimeEnv: {
-    NEXT_PUBLIC_API: process.env.NEXT_PUBLIC_API,
-    NEXT_PUBLIC_URL:
+    NEXT_PUBLIC_API: process.env.NEXT_PUBLIC_API_V3,
+    NEXT_PUBLIC_SIWE_URL:
       process.env.NODE_ENV === "production"
-        ? process.env.NEXT_PUBLIC_URL
-        : "http://localhost",
-    PINATA_JWT: process.env.PINATA_JWT,
+        ? `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`
+        : "http://localhost:3000",
+    PINATA_ADMIN_JWT: process.env.PINATA_ADMIN_JWT,
     NEXT_PUBLIC_PINATA_GATEWAY_URL: process.env.NEXT_PUBLIC_PINATA_GATEWAY_URL,
   },
 });