Merge remote-tracking branch 'origin/main' into unreal-engine-docs

Author: joaquim-verges

.changeset/dry-toes-clean.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": minor
+---
+
+New `useLinkProfile()` hook to link profiles to inapp and ecosystem accounts

.changeset/green-books-drop.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": minor
+---
+
+Add name & address resolvers for Unstoppable Domains

.changeset/hot-adults-doubt.md

@@ -9,12 +9,12 @@ export type Team = {
   slug: string;
   createdAt: string;
   updatedAt: string;
-  deletedAt: string | null;
-  bannedAt: string | null;
-  // image: string; // -> TODO
+  deletedAt?: string;
+  bannedAt?: string;
+  image?: string;
   billingPlan: "pro" | "growth" | "free";
   billingStatus: "validPayment" | (string & {}); // what's the other value?
-  // billingEmail: string;
+  billingEmail: string;
   // billingExternalId: string;
   // billingType: "STRIPE" | ??
   // billingCustomerPayload: ?? | null

.changeset/khaki-items-tease.md

@@ -11,9 +11,12 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
+import { cn } from "../../lib/utils";
 
 export function DangerSettingCard(props: {
   title: string;
+  className?: string;
+  footerClassName?: string;
   description: string;
   buttonLabel: string;
   buttonOnClick: () => void;
@@ -22,18 +25,31 @@ export function DangerSettingCard(props: {
     title: string;
     description: string;
   };
+  children?: React.ReactNode;
 }) {
   return (
-    <div className="overflow-hidden rounded-lg border border-red-500/70">
-      <div className="bg-muted/50 px-4 py-6 lg:px-6">
+    <div
+      className={cn(
+        "overflow-hidden rounded-lg border border-red-500/70",
+        props.className,
+      )}
+    >
+      <div className="px-4 py-6 lg:px-6">
         <h3 className="font-semibold text-xl tracking-tight">{props.title}</h3>
 
         <p className="mt-1.5 mb-4 text-foreground text-sm">
           {props.description}
         </p>
+
+        {props.children}
       </div>
 
-      <div className="flex justify-end border-red-500/70 border-t bg-red-100 px-4 py-4 lg:px-6 dark:bg-red-500/20">
+      <div
+        className={cn(
+          "flex justify-end border-red-500/70 border-t bg-red-100 px-4 py-4 lg:px-6 dark:bg-red-500/20",
+          props.footerClassName,
+        )}
+      >
         <Dialog>
           <DialogTrigger asChild>
             <Button
@@ -46,7 +62,10 @@ export function DangerSettingCard(props: {
             </Button>
           </DialogTrigger>
 
-          <DialogContent>
+          <DialogContent
+            className="z-[10001]"
+            dialogOverlayClassName="z-[10000]"
+          >
             <DialogHeader className="pr-10">
               <DialogTitle className="leading-snug">
                 {props.confirmationDialog.title}

.changeset/pink-starfishes-flash.md

@@ -17,6 +17,15 @@ export function SettingsCard(
       disabled: boolean;
       isPending: boolean;
       type?: "submit";
+      variant?:
+        | "ghost"
+        | "default"
+        | "primary"
+        | "destructive"
+        | "outline"
+        | "secondary";
+      className?: string;
+      label?: string;
     };
   }>,
 ) {
@@ -58,14 +67,15 @@ export function SettingsCard(
         {props.saveButton && !props.noPermissionText && (
           <Button
             size="sm"
-            className="gap-2"
+            className={cn("gap-2", props.saveButton.className)}
             onClick={props.saveButton.onClick}
             disabled={props.saveButton.disabled || props.saveButton.isPending}
-            variant="outline"
+            variant={props.saveButton.variant || "outline"}
             type={props.saveButton.type}
           >
             {props.saveButton.isPending && <Spinner className="size-3" />}
-            {props.saveButton.isPending ? "Saving" : "Save"}
+            {props.saveButton.label ||
+              (props.saveButton.isPending ? "Saving" : "Save")}
           </Button>
         )}
       </div>

apps/dashboard/src/@/api/team.ts

@@ -0,0 +1,21 @@
+"use client";
+
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import type { ApiKey } from "@3rdweb-sdk/react/hooks/useApi";
+import { ApiKeysMenu } from "../../../../../components/settings/ApiKeys/Menu";
+
+export function AccountAbstractionAPIKeysMenu(props: {
+  apiKeys: Pick<ApiKey, "name" | "key">[];
+  selectedAPIKey: Pick<ApiKey, "name" | "key">;
+}) {
+  const router = useDashboardRouter();
+  return (
+    <ApiKeysMenu
+      apiKeys={props.apiKeys}
+      selectedKey={props.selectedAPIKey}
+      onSelect={(key) => {
+        router.push(`/dashboard/connect/account-abstraction/${key.key}`);
+      }}
+    />
+  );
+}

apps/dashboard/src/@/components/blocks/DangerSettingCard.tsx

@@ -0,0 +1,27 @@
+"use client";
+
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { CircleAlertIcon } from "lucide-react";
+import { useActiveWalletChain } from "thirdweb/react";
+import { isOpChainId } from "../../../../team/[team_slug]/[project_slug]/connect/account-abstraction/isOpChain";
+
+export function OpChainAlert() {
+  const chain = useActiveWalletChain();
+  const isOpChain = chain?.id ? isOpChainId(chain.id) : false;
+
+  if (!isOpChain) {
+    return null;
+  }
+
+  return (
+    <Alert variant="info">
+      <CircleAlertIcon className="size-4" />
+      <AlertTitle>Using the gas credits for OP chain paymaster</AlertTitle>
+      <AlertDescription>
+        Credits will automatically be applied to cover gas fees for any onchain
+        activity across thirdweb services. <br />
+        Eligible chains: OP Mainnet, Base, Zora, Frax, Mode.
+      </AlertDescription>
+    </Alert>
+  );
+}