From d6bc43c34d3340e2fe39cf4a0697884bbb2293ea Mon Sep 17 00:00:00 2001
From: Yash094 <67926590+Yash094@users.noreply.github.com>
Date: Fri, 14 Nov 2025 20:55:30 +0000
Subject: [PATCH] support form changes (#8414)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--

## title your PR with this format: "[SDK/Dashboard/Portal] Feature/Fix: Concise title for the changes"

If you did not copy the branch name from Linear, paste the issue tag here (format is TEAM-0000):

## Notes for the reviewer

Anything important to call out? Be sure to also clarify these in your comments.

## How to test

Unit tests, playground, etc.

-->

<!-- start pr-codex -->

---

## PR-Codex overview
This PR focuses on refactoring and enhancing various support forms in the application, including the removal of outdated components and the introduction of new fields to improve user input for support tickets.

### Detailed summary
- Deleted `payments`, `contracts`, and `AffectedAreaInput` components.
- Updated `OtherSupportForm` with a new label.
- Modified `TokensMarketplaceSupportForm` to include a new input for "Support ID in logs".
- Removed dynamic imports for `ContractSupportForm` and `PaymentsSupportForm`.
- Updated `productOptions` labels for clarity.
- Replaced `ENGINE_TYPES` and `ENGINE_PROBLEM_AREAS` with `API_SDK_OPTIONS`.
- Enhanced `EngineSupportForm` with new inputs and logic based on selected SDK.
- Introduced new components for user wallet issues and account abstraction.
- Updated `PROBLEM_AREAS` to include new components for social/email login and user wallet custom auth.

> ✨ Ask PR-Codex anything about this PR by commenting with `/codex {your question}`

<!-- end pr-codex -->

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->
## Summary by CodeRabbit

* **New Features**
  * Added "Agents/x402 and AI" support option and an optional "Support ID in logs" field.

* **Improvements**
  * Reorganized and simplified support forms: Wallets → Working with User Wallets, Transactions → API/SDKs, Tokens/Marketplace → Creating, Bridging and swapping tokens; token input accepts address or symbol.
  * Streamlined Connect and Engine flows with focused issue categories (social/email login, custom auth, account abstraction, third‑party wallets, API/SDK selection).

* **Chores**
  * Removed legacy Contracts, Payments and affected-area form screens.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../support/_components/SupportTicketForm.tsx |  27 +---
 .../connect/AffectedAreaInput.tsx             |  67 --------
 .../contact-forms/connect/index.tsx           | 145 ++++++++----------
 .../contact-forms/contracts/index.tsx         | 138 -----------------
 .../contact-forms/engine/index.tsx            |  76 ++++-----
 .../_components/contact-forms/other/index.tsx |   1 +
 .../contact-forms/payments/index.tsx          |  55 -------
 .../tokens-marketplace/index.tsx              |  13 +-
 8 files changed, 118 insertions(+), 404 deletions(-)
 delete mode 100644 apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/AffectedAreaInput.tsx
 delete mode 100644 apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/contracts/index.tsx
 delete mode 100644 apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/payments/index.tsx

diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/SupportTicketForm.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/SupportTicketForm.tsx
index b623117fcad..967b2826698 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/SupportTicketForm.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/SupportTicketForm.tsx
@@ -26,14 +26,6 @@ const EngineSupportForm = dynamic(
     ssr: false,
   },
 );
-const ContractSupportForm = dynamic(
-  () =>
-    import("./contact-forms/contracts").then((mod) => mod.ContractSupportForm),
-  {
-    loading: () => <Skeleton className="h-12" />,
-    ssr: false,
-  },
-);
 const AccountSupportForm = dynamic(
   () => import("./contact-forms/account").then((mod) => mod.AccountSupportForm),
   {
@@ -48,14 +40,6 @@ const OtherSupportForm = dynamic(
     ssr: false,
   },
 );
-const PaymentsSupportForm = dynamic(
-  () =>
-    import("./contact-forms/payments").then((mod) => mod.PaymentsSupportForm),
-  {
-    loading: () => <Skeleton className="h-12" />,
-    ssr: false,
-  },
-);
 const TokensMarketplaceSupportForm = dynamic(
   () =>
     import("./contact-forms/tokens-marketplace").then(
@@ -68,13 +52,14 @@ const TokensMarketplaceSupportForm = dynamic(
 );
 
 const productOptions = [
-  { component: <ConnectSupportForm />, label: "Wallets" },
-  { component: <EngineSupportForm />, label: "Transactions" },
-  { component: <PaymentsSupportForm />, label: "Payments" },
-  { component: <ContractSupportForm />, label: "Contracts" },
+  { component: <ConnectSupportForm />, label: "Working with User Wallets" },
+  {
+    component: <EngineSupportForm />,
+    label: "Using API/SDK’s, errored transactions",
+  },
   {
     component: <TokensMarketplaceSupportForm />,
-    label: "Tokens / Marketplace",
+    label: "Creating, Bridging and swapping tokens",
   },
   { component: <AccountSupportForm />, label: "Account" },
   { component: <OtherSupportForm />, label: "Other" },
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/AffectedAreaInput.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/AffectedAreaInput.tsx
deleted file mode 100644
index 9f0d8170098..00000000000
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/AffectedAreaInput.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
-import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
-import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
-import { UnitySupportForm } from "../../shared/SupportForm_UnityInput";
-
-const AFFECTED_AREAS = ["Dashboard", "Application"];
-
-export const AffectedAreaInput = () => {
-  const [selectedAffectedArea, setSelectedAffectedArea] = useState<string>("");
-  const [selectedSDK, setSelectedSDK] = useState<string>("");
-  const [description, setDescription] = useState<string>("");
-  const [sdkDescription, setSdkDescription] = useState<string>("");
-
-  return (
-    <>
-      <SupportForm_SelectInput
-        formLabel="Affected area"
-        name="extraInfo_Affected_Area"
-        onValueChange={setSelectedAffectedArea}
-        options={AFFECTED_AREAS}
-        promptText="Select an affected area"
-        required={true}
-        value={selectedAffectedArea}
-      />
-      {selectedAffectedArea &&
-        (selectedAffectedArea === "Application" ? (
-          <>
-            <SupportForm_SelectInput
-              formLabel="SDK"
-              name="extraInfo_SDK"
-              onValueChange={setSelectedSDK}
-              options={["TypeScript", "React", "React Native", "Unity"]}
-              promptText="Select SDK"
-              required={true}
-              value={selectedSDK}
-            />
-            {selectedSDK && (
-              <>
-                {selectedSDK === "Unity" && <UnitySupportForm />}
-                <SupportForm_TextInput
-                  formLabel="SDK Version"
-                  formValue="extraInfo_SDK_Version"
-                  inputType="text"
-                  required={true}
-                />
-                <SupportForm_TextInput
-                  formLabel="Application URL"
-                  formValue="extraInfo_Application_URL"
-                  inputType="url"
-                  required={false}
-                />
-                <DescriptionInput
-                  value={sdkDescription}
-                  onChange={setSdkDescription}
-                />
-              </>
-            )}
-          </>
-        ) : (
-          <DescriptionInput value={description} onChange={setDescription} />
-        ))}
-    </>
-  );
-};
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/index.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/index.tsx
index 5bcd72eea3c..e2c69ba865c 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/index.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/index.tsx
@@ -1,116 +1,91 @@
+"use client";
+
 import { type ReactElement, useState } from "react";
 import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
 import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
 import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
-import { UnitySupportForm } from "../../shared/SupportForm_UnityInput";
-import { AffectedAreaInput } from "./AffectedAreaInput";
 
 type ProblemAreaItem = {
   label: string;
   component: ReactElement;
 };
 
-const SDKVersionInput = () => (
-  <SupportForm_TextInput
-    formLabel="SDK Version"
-    formValue="extraInfo_SDK_Version"
-    inputType="text"
-    required={true}
-  />
-);
+const SocialEmailLoginIssuesComponent = () => {
+  const [description, setDescription] = useState<string>("");
+  return (
+    <>
+      <SupportForm_TextInput
+        formLabel="User ID/Email with issue"
+        formValue="extraInfo_User_ID_Email"
+        inputType="text"
+        placeholder="Enter user ID or email"
+        required={true}
+      />
+      <DescriptionInput value={description} onChange={setDescription} />
+    </>
+  );
+};
 
-const OSSelect = () => {
-  const [selectedOS, setSelectedOS] = useState<string>("");
+const UserWalletCustomAuthComponent = () => {
+  const [description, setDescription] = useState<string>("");
   return (
-    <SupportForm_SelectInput
-      formLabel="OS"
-      name="extraInfo_OS"
-      onValueChange={setSelectedOS}
-      options={["Windows", "MacOS", "Linux", "Other"]}
-      promptText="Select an operating system"
-      required={true}
-      value={selectedOS}
-    />
+    <>
+      <SupportForm_TextInput
+        formLabel="Custom auth endpoint"
+        formValue="extraInfo_Custom_Auth_Endpoint"
+        inputType="text"
+        placeholder="Enter custom auth endpoint"
+        required={true}
+      />
+      <SupportForm_TextInput
+        formLabel="Support ID"
+        formValue="extraInfo_Support_ID"
+        inputType="text"
+        placeholder="Enter support ID (optional)"
+        required={false}
+      />
+      <DescriptionInput value={description} onChange={setDescription} />
+    </>
   );
 };
 
-const DescriptionInputWrapper = () => {
+const AccountAbstractionComponent = () => {
+  const [description, setDescription] = useState<string>("");
+  return (
+    <>
+      <SupportForm_TextInput
+        formLabel="Support ID"
+        formValue="extraInfo_Support_ID"
+        inputType="text"
+        placeholder="Enter support ID (optional)"
+        required={false}
+      />
+      <DescriptionInput value={description} onChange={setDescription} />
+    </>
+  );
+};
+
+const ThirdPartyEOAWalletsComponent = () => {
   const [description, setDescription] = useState<string>("");
   return <DescriptionInput value={description} onChange={setDescription} />;
 };
 
 const PROBLEM_AREAS: ProblemAreaItem[] = [
   {
-    component: <AffectedAreaInput />,
-    label: "In-app wallet login issues",
-  },
-  {
-    component: <AffectedAreaInput />,
-    label: "In-app wallet transaction issues",
+    component: <SocialEmailLoginIssuesComponent />,
+    label: "Social/Email login issues",
   },
   {
-    component: <AffectedAreaInput />,
-    label: "In-app wallet Custom Auth",
+    component: <UserWalletCustomAuthComponent />,
+    label: "User wallet with custom auth",
   },
   {
-    component: <AffectedAreaInput />,
+    component: <AccountAbstractionComponent />,
     label: "Account Abstraction",
   },
   {
-    component: (
-      <>
-        <SDKVersionInput />
-        <SupportForm_TextInput
-          formLabel="Application URL"
-          formValue="extraInfo_Application_URL"
-          inputType="url"
-          required={false}
-        />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "thirdweb SDKs",
-  },
-  {
-    component: (
-      <>
-        <UnitySupportForm />
-        <SDKVersionInput />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Unity SDK",
-  },
-  {
-    component: (
-      <>
-        <SDKVersionInput />
-        <OSSelect />
-        <SupportForm_TextInput
-          formLabel="Framework"
-          formValue="extraInfo_dotNET_Framework"
-          inputType="text"
-          placeholder="MAUI | Blazor | Godot, etc"
-          required={false}
-        />
-        <SupportForm_TextInput
-          formLabel="Target OS"
-          formValue="extraInfo_dotNET_Target_OS"
-          inputType="text"
-          required={false}
-        />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: ".NET SDK",
-  },
-  {
-    component: <AffectedAreaInput />,
-    label: "Pay",
-  },
-  {
-    component: <AffectedAreaInput />,
-    label: "Auth",
+    component: <ThirdPartyEOAWalletsComponent />,
+    label: "Third party/EOA wallets",
   },
 ];
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/contracts/index.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/contracts/index.tsx
deleted file mode 100644
index d9413073ed0..00000000000
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/contracts/index.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { type ReactElement, useState } from "react";
-import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
-import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
-import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
-
-type ProblemAreaItem = {
-  label: string;
-  component: ReactElement;
-};
-
-const NetworkInput = () => (
-  <SupportForm_TextInput
-    formLabel="Network"
-    formValue="extraInfo_Network"
-    inputType="text"
-    placeholder="Network name or chain ID"
-    required={true}
-  />
-);
-
-const ContractAddressInput = () => (
-  <SupportForm_TextInput
-    formLabel="Contract address"
-    formValue="extraInfo_Contract_Address"
-    inputType="text"
-    required={true}
-  />
-);
-
-const ContractFunctionInput = () => (
-  <SupportForm_TextInput
-    formLabel="Contract function"
-    formValue="extraInfo_Contract_Function"
-    inputType="text"
-    required={true}
-  />
-);
-
-const ContractTypeInput = () => (
-  <SupportForm_TextInput
-    formLabel="Contract type"
-    formValue="extraInfo_Contract_Type"
-    inputType="text"
-    placeholder={`"MarketplaceV3 | "NFTDrop" | ...`}
-    required={false}
-  />
-);
-
-const ContractAffectedAreaInput = () => {
-  const [selectedAffectedArea, setSelectedAffectedArea] = useState<string>("");
-  return (
-    <SupportForm_SelectInput
-      formLabel="Contract affected area"
-      name="extraInfo_Affected_Area"
-      onValueChange={setSelectedAffectedArea}
-      options={["Dashboard", "SDK"]}
-      promptText="Select an affected area"
-      required={true}
-      value={selectedAffectedArea}
-    />
-  );
-};
-
-const DescriptionInputWrapper = () => {
-  const [description, setDescription] = useState<string>("");
-  return <DescriptionInput value={description} onChange={setDescription} />;
-};
-
-const CONTRACT_PROBLEM_AREAS: ProblemAreaItem[] = [
-  {
-    component: (
-      <>
-        <NetworkInput />
-        <ContractTypeInput />
-        <ContractAffectedAreaInput />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Deploying a contract",
-  },
-  {
-    component: (
-      <>
-        <NetworkInput />
-        <ContractAddressInput />
-        <ContractTypeInput />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Contract verification",
-  },
-  {
-    component: (
-      <>
-        <NetworkInput />
-        <ContractAddressInput />
-        <ContractFunctionInput />
-        <ContractAffectedAreaInput />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Calling a function in my contract",
-  },
-  {
-    component: (
-      <>
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Developing a custom contract",
-  },
-  {
-    component: (
-      <>
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Other",
-  },
-];
-
-export function ContractSupportForm() {
-  const [problemArea, setProblemArea] = useState<string>("");
-  return (
-    <>
-      <SupportForm_SelectInput
-        formLabel="Problem area"
-        name="extraInfo_Problem_Area"
-        onValueChange={setProblemArea}
-        options={CONTRACT_PROBLEM_AREAS.map((o) => o.label)}
-        promptText="Select a problem area"
-        required={true}
-        value={problemArea}
-      />
-      {CONTRACT_PROBLEM_AREAS.find((o) => o.label === problemArea)?.component}
-    </>
-  );
-}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/engine/index.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/engine/index.tsx
index 4ba340c4614..beb718e0ef0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/engine/index.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/engine/index.tsx
@@ -2,56 +2,62 @@ import { useState } from "react";
 import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
 import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
 import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
+import { UnitySupportForm } from "../../shared/SupportForm_UnityInput";
 
-const ENGINE_TYPES = ["Cloud (V3)", "Dedicated (V2)"];
-const ENGINE_PROBLEM_AREAS = [
-  "SSL Issues",
-  "Transaction queueing issues",
-  "401 - Unauthorized",
-  "404 - Endpoint Not Found",
-  "Other",
+const API_SDK_OPTIONS = [
+  "API endpoint",
+  "React/TypeScript",
+  "Unity/.NET",
+  "React Native",
 ];
 
 export function EngineSupportForm() {
-  const [selectedEngineType, setSelectedEngineType] = useState<string>("");
-  const [problemArea, setProblemArea] = useState<string>("");
+  const [selectedSDK, setSelectedSDK] = useState<string>("");
   const [description, setDescription] = useState<string>("");
 
   return (
     <>
       <SupportForm_SelectInput
-        formLabel="Type"
-        name="extraInfo_Engine_Type"
-        onValueChange={setSelectedEngineType}
-        options={ENGINE_TYPES}
-        promptText="Select Engine type"
+        formLabel="Which API/SDK are you using?"
+        name="extraInfo_API_SDK"
+        onValueChange={setSelectedSDK}
+        options={API_SDK_OPTIONS}
+        promptText="Select a problem area"
         required={true}
-        value={selectedEngineType}
-      />{" "}
-      {selectedEngineType && (
+        value={selectedSDK}
+      />
+      {selectedSDK && (
         <>
-          <SupportForm_SelectInput
-            formLabel="Problem area"
-            name="extraInfo_Problem_Area"
-            onValueChange={setProblemArea}
-            options={ENGINE_PROBLEM_AREAS}
-            promptText="Select a problem area"
-            required={true}
-            value={problemArea}
-          />
-
-          {problemArea && (
-            <>
+          {selectedSDK === "Unity/.NET" ? (
+            <UnitySupportForm />
+          ) : (
+            selectedSDK !== "API endpoint" && (
               <SupportForm_TextInput
-                formLabel="Engine URL"
-                formValue="extraInfo_Engine_URL"
-                inputType="url"
-                placeholder="https://your-engine-url.com"
+                formLabel="Version of SDK"
+                formValue="extraInfo_SDK_Version"
+                inputType="text"
+                placeholder="e.g. 3.12.0"
                 required={true}
               />
-              <DescriptionInput value={description} onChange={setDescription} />
-            </>
+            )
+          )}
+          <SupportForm_TextInput
+            formLabel="Queue/Support ID in logs"
+            formValue="extraInfo_Queue_Support_ID"
+            inputType="text"
+            placeholder="Enter support ID from logs"
+            required={false}
+          />
+          {selectedSDK === "API endpoint" && (
+            <SupportForm_TextInput
+              formLabel="API endpoint URL with parameters"
+              formValue="extraInfo_API_Endpoint_URL"
+              inputType="url"
+              placeholder="https://api.example.com/endpoint?param=value"
+              required={false}
+            />
           )}
+          <DescriptionInput value={description} onChange={setDescription} />
         </>
       )}
     </>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/other/index.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/other/index.tsx
index 075b94f55a1..e0a4b474ea7 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/other/index.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/other/index.tsx
@@ -14,6 +14,7 @@ const OTHER_PROBLEM_AREAS = [
   "Bug report",
   "Documentation",
   "Integration help",
+  "Agents/x402 and AI",
   "Other",
 ];
 export function OtherSupportForm() {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/payments/index.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/payments/index.tsx
deleted file mode 100644
index 052245261b1..00000000000
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/payments/index.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
-import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
-import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
-
-const PAYMENT_AREAS = ["Dashboard", "Application"];
-
-export function PaymentsSupportForm() {
-  const [area, setArea] = useState<string>("");
-  const [description, setDescription] = useState<string>("");
-
-  return (
-    <>
-      <SupportForm_SelectInput
-        formLabel="Affected Area"
-        name="extraInfo_Payments_Area"
-        onValueChange={setArea}
-        options={PAYMENT_AREAS}
-        promptText="Select affected area"
-        required={true}
-        value={area}
-      />
-      {area === "Application" && (
-        <>
-          <SupportForm_TextInput
-            formLabel="SDK"
-            formValue="extraInfo_Payments_SDK"
-            inputType="text"
-            placeholder="e.g. React, Unity, iOS, etc."
-            required={true}
-          />
-          <SupportForm_TextInput
-            formLabel="SDK Version"
-            formValue="extraInfo_Payments_SDK_Version"
-            inputType="text"
-            placeholder="e.g. 3.12.0"
-            required={true}
-          />
-          <SupportForm_TextInput
-            formLabel="Application URL"
-            formValue="extraInfo_Payments_App_URL"
-            inputType="url"
-            placeholder="https://your-app-url.com"
-            required={true}
-          />
-        </>
-      )}
-      {(area === "Application" || area === "Dashboard") && (
-        <DescriptionInput value={description} onChange={setDescription} />
-      )}
-    </>
-  );
-}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/tokens-marketplace/index.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/tokens-marketplace/index.tsx
index 89d80267649..911b886bdfd 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/tokens-marketplace/index.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/tokens-marketplace/index.tsx
@@ -8,10 +8,10 @@ export function TokensMarketplaceSupportForm() {
   return (
     <>
       <SupportForm_TextInput
-        formLabel="Address"
-        formValue="extraInfo_TokensMarketplace_Address"
+        formLabel="Token address or symbol"
+        formValue="extraInfo_Token_Address_Symbol"
         inputType="text"
-        placeholder="Enter the relevant address"
+        placeholder="Enter token address or symbol (e.g. 0x... or ETH)"
         required={true}
       />
       <SupportForm_TextInput
@@ -21,6 +21,13 @@ export function TokensMarketplaceSupportForm() {
         placeholder="e.g. Ethereum, Polygon, etc."
         required={true}
       />
+      <SupportForm_TextInput
+        formLabel="Support ID in logs"
+        formValue="extraInfo_Support_ID_Logs"
+        inputType="text"
+        placeholder="Enter support ID from logs"
+        required={false}
+      />
       <DescriptionInput value={description} onChange={setDescription} />
     </>
   );