Merge main into prod

Author: alex-grover

src/app/client.tsx

@@ -22,10 +22,11 @@ import {
   TextField,
   Theme,
 } from '@radix-ui/themes'
-import { useIsMounted } from 'connectkit'
+import { useIsMounted, useModal } from 'connectkit'
 import Link from 'next/link'
 import { usePathname, useRouter } from 'next/navigation'
 import { useCallback, useEffect, useState } from 'react'
+import { toast } from 'sonner'
 import useSWR from 'swr'
 import { useEventListener } from 'usehooks-ts'
 import { parseEther } from 'viem'
@@ -43,6 +44,7 @@ export function HomeClientPage({ color: initialColor }: HomeClientPageProps) {
   const pathname = usePathname()
   const isMounted = useIsMounted()
   const { address } = useAccount()
+  const { setOpen } = useModal()
 
   const [color, setColor] = useState(initialColor)
   const [randomMintAmount, setRandomMintAmount] = useState(1)
@@ -108,6 +110,11 @@ export function HomeClientPage({ color: initialColor }: HomeClientPageProps) {
     isPending: allowlistMintPending,
   } = useWriteRgbSignaturesAllowlistMint()
 
+  useEffect(() => {
+    if (!(mintPending || mintRandomPending || allowlistMintPending)) return
+    toast('Please confirm in your wallet', { position: 'bottom-right' })
+  }, [mintPending, mintRandomPending, allowlistMintPending])
+
   useEffect(() => {
     if (!mintHash && !mintRandomHash && !allowlistMintHash) return
 
@@ -206,10 +213,12 @@ export function HomeClientPage({ color: initialColor }: HomeClientPageProps) {
             <Button
               size="4"
               onClick={() =>
-                mint({
-                  args: [color.r, color.g, color.b],
-                  value: parseEther('0.004'),
-                })
+                address
+                  ? mint({
+                      args: [color.r, color.g, color.b],
+                      value: parseEther('0.004'),
+                    })
+                  : setOpen(true)
               }
               loading={mintPending}
               disabled={mintRandomPending || allowlistMintPending}
@@ -244,10 +253,12 @@ export function HomeClientPage({ color: initialColor }: HomeClientPageProps) {
               <Button
                 size="4"
                 onClick={() =>
-                  mintRandom({
-                    args: [randomMintAmount],
-                    value: parseEther(randomMintCost),
-                  })
+                  address
+                    ? mintRandom({
+                        args: [randomMintAmount],
+                        value: parseEther(randomMintCost),
+                      })
+                    : setOpen(true)
                 }
                 loading={mintRandomPending}
                 disabled={mintPending}

src/components/Web3Provider.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { chain, rpcUrl } from '@/lib/chain'
+import { chain } from '@/lib/chain'
 import { env } from '@/lib/env'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { track } from '@vercel/analytics/react'
@@ -12,7 +12,7 @@ const config = createConfig(
   getDefaultConfig({
     chains: [chain],
     transports: {
-      [chain.id]: http(rpcUrl),
+      [chain.id]: http(),
     },
     walletConnectProjectId: env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID,
     appName: 'RGB',

src/lib/chain.ts

@@ -4,9 +4,4 @@ import { env } from './env'
 export const chain =
   env.NEXT_PUBLIC_VERCEL_ENV === 'production' ? base : baseSepolia
 
-export const rpcUrl =
-  chain === base
-    ? `https://base-mainnet.g.alchemy.com/v2/${env.NEXT_PUBLIC_ALCHEMY_ID}`
-    : `https://base-sepolia.g.alchemy.com/v2/${env.NEXT_PUBLIC_ALCHEMY_ID}`
-
 export const fromBlock = chain === base ? 23491824n : 18714943n

src/lib/env.ts

@@ -1,13 +1,11 @@
 import * as v from 'valibot'
 
 const schema = v.object({
-  NEXT_PUBLIC_ALCHEMY_ID: v.pipe(v.string(), v.nonEmpty()),
   NEXT_PUBLIC_VERCEL_ENV: v.picklist(['production', 'preview', 'development']),
   NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID: v.pipe(v.string(), v.nonEmpty()),
 })
 
 const parseResult = v.safeParse(schema, {
-  NEXT_PUBLIC_ALCHEMY_ID: process.env.NEXT_PUBLIC_ALCHEMY_ID,
   NEXT_PUBLIC_VERCEL_ENV: process.env.NEXT_PUBLIC_VERCEL_ENV,
   NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID:
     process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID,

src/lib/viem.ts

@@ -1,5 +1,11 @@
 import { http, createPublicClient } from 'viem'
-import { chain, rpcUrl } from './chain'
+import { base } from 'viem/chains'
+import { chain } from './chain'
+
+const rpcUrl =
+  chain === base
+    ? `https://base-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_ID}`
+    : `https://base-sepolia.g.alchemy.com/v2/${process.env.ALCHEMY_ID}`
 
 export const viemClient = createPublicClient({
   chain,