Merge branch 'main' into Ink-Mainnet-Chain-Page-Update

Author: DustinTurska

apps/dashboard/package.json

@@ -73,6 +73,7 @@
     "next-seo": "^6.5.0",
     "next-themes": "^0.4.4",
     "nextjs-toploader": "^1.6.12",
+    "openapi-types": "^12.1.3",
     "papaparse": "^5.4.1",
     "pluralize": "^8.0.0",
     "posthog-js": "1.67.1",

apps/dashboard/src/@/components/ui/select.tsx

@@ -14,8 +14,10 @@ const SelectValue = SelectPrimitive.Value;
 
 const SelectTrigger = React.forwardRef<
   React.ElementRef<typeof SelectPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
->(({ className, children, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger> & {
+    chevronClassName?: string;
+  }
+>(({ className, children, chevronClassName, ...props }, ref) => (
   <SelectPrimitive.Trigger
     ref={ref}
     className={cn(
@@ -26,7 +28,7 @@ const SelectTrigger = React.forwardRef<
   >
     {children}
     <SelectPrimitive.Icon asChild>
-      <ChevronDown className="h-4 w-4 opacity-50" />
+      <ChevronDown className={cn("h-4 w-4 opacity-50", chevronClassName)} />
     </SelectPrimitive.Icon>
   </SelectPrimitive.Trigger>
 ));

apps/dashboard/src/@/components/ui/tooltip.tsx

@@ -35,6 +35,7 @@ export function ToolTipLabel(props: {
   rightIcon?: React.ReactNode;
   leftIcon?: React.ReactNode;
   hoverable?: boolean;
+  contentClassName?: string;
 }) {
   if (!props.label) {
     return props.children;
@@ -48,7 +49,10 @@ export function ToolTipLabel(props: {
         </TooltipTrigger>
         <TooltipContent
           sideOffset={10}
-          className="max-w-[400px] whitespace-normal leading-relaxed"
+          className={cn(
+            "max-w-[400px] whitespace-normal leading-relaxed",
+            props.contentClassName,
+          )}
         >
           <div className="flex items-center gap-1.5 p-2 text-sm">
             {props.leftIcon}

apps/dashboard/src/app/nebula-app/(app)/api/chat.ts

@@ -1,7 +1,7 @@
 import { NEXT_PUBLIC_NEBULA_URL } from "@/constants/env";
 // TODO - copy the source of this library to dashboard
 import { stream } from "fetch-event-stream";
-import type { SendTransactionOption } from "thirdweb/dist/types/wallets/interfaces/wallet";
+import type { NebulaTxData } from "../components/Chats";
 import type { ExecuteConfig } from "./types";
 
 export type ContextFilters = {
@@ -140,7 +140,7 @@ type ChatStreamedResponse =
   | {
       event: "action";
       type: "sign_transaction" & (string & {});
-      data: SendTransactionOption;
+      data: NebulaTxData;
     };
 
 type ChatStreamedEvent =

apps/dashboard/src/app/nebula-app/(app)/api/types.ts

@@ -35,7 +35,7 @@ export type SessionInfo = {
   created_at: string;
   deleted_at: string | null;
   history: Array<{
-    role: "user" | "assistant"; // role: action is coming up
+    role: "user" | "assistant" | "action";
     content: string;
     timestamp: number;
   }> | null;

apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx

@@ -26,11 +26,44 @@ export function ChatPageContent(props: {
   const [userHasSubmittedMessage, setUserHasSubmittedMessage] = useState(false);
   const [messages, setMessages] = useState<Array<ChatMessage>>(() => {
     if (props.session?.history) {
-      return props.session.history.map((message) => ({
-        text: message.content,
-        type: message.role,
-        request_id: undefined,
-      }));
+      const _messages: ChatMessage[] = [];
+
+      for (const message of props.session.history) {
+        if (message.role === "action") {
+          try {
+            const content = JSON.parse(message.content) as {
+              session_id: string;
+              request_id: string;
+              data: string;
+              type: "sign_transaction" | (string & {});
+            };
+
+            if (content.type === "sign_transaction") {
+              const txData = JSON.parse(content.data);
+              if (
+                typeof txData === "object" &&
+                txData !== null &&
+                txData.chainId
+              ) {
+                _messages.push({
+                  type: "send_transaction",
+                  data: txData,
+                });
+              }
+            }
+          } catch {
+            // ignore
+          }
+        } else {
+          _messages.push({
+            text: message.content,
+            type: message.role,
+            request_id: undefined,
+          });
+        }
+      }
+
+      return _messages;
     }
     return [];
   });

apps/dashboard/src/app/nebula-app/(app)/components/Chats.tsx

@@ -15,16 +15,20 @@ import {
 } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
+import { type ThirdwebClient, prepareTransaction } from "thirdweb";
 import { useSendTransaction } from "thirdweb/react";
-import type { Account } from "thirdweb/wallets";
 import { TransactionButton } from "../../../../components/buttons/TransactionButton";
 import { MarkdownRenderer } from "../../../../components/contract-components/published-contract/markdown-renderer";
 import { useV5DashboardChain } from "../../../../lib/v5-adapter";
 import { submitFeedback } from "../api/feedback";
 import { NebulaIcon } from "../icons/NebulaIcon";
 
-type SendTransactionOption = Parameters<Account["sendTransaction"]>[0];
+export type NebulaTxData = {
+  chainId: number;
+  data: `0x${string}`;
+  to: string;
+  value: string;
+};
 
 export type ChatMessage =
   | {
@@ -39,7 +43,7 @@ export type ChatMessage =
     }
   | {
       type: "send_transaction";
-      data: SendTransactionOption | null;
+      data: NebulaTxData | null;
     };
 
 export function Chats(props: {
@@ -203,7 +207,7 @@ export function Chats(props: {
 }
 
 function ExecuteTransaction(props: {
-  txData: SendTransactionOption | null;
+  txData: NebulaTxData | null;
   twAccount: TWAccount;
   client: ThirdwebClient;
 }) {
@@ -319,7 +323,7 @@ function MessageActions(props: {
 }
 
 function SendTransactionButton(props: {
-  txData: SendTransactionOption;
+  txData: NebulaTxData;
   twAccount: TWAccount;
   client: ThirdwebClient;
 }) {
@@ -333,14 +337,16 @@ function SendTransactionButton(props: {
       transactionCount={1}
       txChainID={txData.chainId}
       onClick={() => {
-        const promise = sendTransaction.mutateAsync({
-          ...props.txData,
-          nonce: Number(txData.nonce),
-          to: txData.to || undefined, // Get rid of the potential null value
+        const tx = prepareTransaction({
           chain: chain,
           client: props.client,
+          data: txData.data,
+          to: txData.to,
+          value: BigInt(txData.value),
         });
 
+        const promise = sendTransaction.mutateAsync(tx);
+
         toast.promise(promise, {
           success: "Transaction sent successfully",
           error: "Failed to send transaction",