From 5f66df8ecb621302f2fa9807e150b24b7c06e471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 13:43:22 +0100
Subject: [PATCH 01/10] feat: add report issue button (ui only)

---
 src/features/dashboard/sidebar/footer.tsx | 42 +++++++++++++++++++----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/features/dashboard/sidebar/footer.tsx b/src/features/dashboard/sidebar/footer.tsx
index ba7007b39..6183c9e26 100644
--- a/src/features/dashboard/sidebar/footer.tsx
+++ b/src/features/dashboard/sidebar/footer.tsx
@@ -12,7 +12,7 @@ import {
   SidebarMenuButton,
   SidebarMenuItem,
 } from '@/ui/primitives/sidebar'
-import { Book, Github, MessageSquarePlus } from 'lucide-react'
+import { Book, Bug, Github, MessageSquarePlus } from 'lucide-react'
 import Link from 'next/link'
 import DashboardSurveyPopover from '../navbar/dashboard-survey-popover'
 import TeamBlockageAlert from './blocked-banner'
@@ -60,12 +60,17 @@ export default function DashboardSidebarFooter() {
         </SidebarGroup>
       </SidebarFooter>
 
-      {INCLUDE_DASHBOARD_FEEDBACK_SURVEY && (
-        <SidebarMenu className="p-0 gap-0">
+      <SidebarMenu
+        className={cn(
+          'flex-row gap-0 border-t group-data-[collapsible=icon]:flex-col',
+          SIDEBAR_TRANSITION_CLASSNAMES
+        )}
+      >
+        {INCLUDE_DASHBOARD_FEEDBACK_SURVEY && (
           <SidebarMenuItem
             key="survey"
             className={cn(
-              'transition-all border-t group-data-[collapsible=icon]:pl-2',
+              'flex-1 transition-all group-data-[collapsible=icon]:pl-2',
               SIDEBAR_TRANSITION_CLASSNAMES
             )}
           >
@@ -79,14 +84,37 @@ export default function DashboardSidebarFooter() {
                     SIDEBAR_TRANSITION_CLASSNAMES
                   )}
                 >
-                  <MessageSquarePlus className="group-data-[collapsible=icon]:!size-5" />
+                  <MessageSquarePlus className="hidden group-data-[collapsible=icon]:block group-data-[collapsible=icon]:!size-5" />
                   Feedback
                 </SidebarMenuButton>
               }
             />
           </SidebarMenuItem>
-        </SidebarMenu>
-      )}
+        )}
+        {INCLUDE_DASHBOARD_FEEDBACK_SURVEY && (
+          /* separator */
+          <div className="border-r h-full hidden group-data-[collapsible=icon]:hidden group-data-[state=expanded]:block" />
+        )}
+        <SidebarMenuItem
+          key="report-issue"
+          className={cn(
+            'flex-1 transition-all group-data-[collapsible=icon]:pl-2',
+            SIDEBAR_TRANSITION_CLASSNAMES
+          )}
+        >
+          <SidebarMenuButton
+            tooltip="Report Issue"
+            variant="ghost"
+            className={cn(
+              'hover:bg-bg-hover transition-all w-full min-h-protected-statusbar justify-center group-data-[collapsible=icon]:justify-start',
+              SIDEBAR_TRANSITION_CLASSNAMES
+            )}
+          >
+            <Bug className="hidden group-data-[collapsible=icon]:block group-data-[collapsible=icon]:!size-5" />
+            Report Issue
+          </SidebarMenuButton>
+        </SidebarMenuItem>
+      </SidebarMenu>
     </>
   )
 }

From bd6b388ee20366dfe5f95b4286692930cde8d312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 13:44:03 +0100
Subject: [PATCH 02/10] feat: add provisional reportIssue server action

---
 src/server/support/support-actions.ts | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/server/support/support-actions.ts

diff --git a/src/server/support/support-actions.ts b/src/server/support/support-actions.ts
new file mode 100644
index 000000000..b79c423ad
--- /dev/null
+++ b/src/server/support/support-actions.ts
@@ -0,0 +1,26 @@
+'use server'
+
+import { authActionClient } from '@/lib/clients/action'
+import { z } from 'zod'
+
+const ReportIssueSchema = z.object({
+  sandboxId: z.string().min(1, 'Sandbox ID is required'),
+  description: z.string().min(1, 'Description is required'),
+})
+
+export const reportIssueAction = authActionClient
+  .schema(ReportIssueSchema)
+  .metadata({ actionName: 'reportIssue' })
+  .action(async ({ parsedInput, ctx }) => {
+    const { sandboxId, description } = parsedInput
+    const email = ctx.user.email
+
+    console.log('reportIssueAction', { sandboxId, description, email })
+
+    // TODO: Call Plain API
+    // - email
+    // - sandboxId
+    // - description
+
+    return { success: true }
+  })

From a73206c6175b29ef66c6246422774fefbf464da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 13:45:48 +0100
Subject: [PATCH 03/10] feat: change tooltip copy

---
 src/features/dashboard/sidebar/footer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/dashboard/sidebar/footer.tsx b/src/features/dashboard/sidebar/footer.tsx
index 6183c9e26..c25106d9a 100644
--- a/src/features/dashboard/sidebar/footer.tsx
+++ b/src/features/dashboard/sidebar/footer.tsx
@@ -77,7 +77,7 @@ export default function DashboardSidebarFooter() {
             <DashboardSurveyPopover
               trigger={
                 <SidebarMenuButton
-                  tooltip="Survey"
+                  tooltip="Feedback"
                   variant="ghost"
                   className={cn(
                     'hover:bg-bg-hover transition-all w-full min-h-protected-statusbar justify-center group-data-[collapsible=icon]:justify-start',

From 78051447a9bc8e5a54a96e322916fe1fc053abd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 14:20:09 +0100
Subject: [PATCH 04/10] feat: add report issue popover

---
 .../dashboard/navbar/report-issue-popover.tsx | 107 ++++++++++++++++++
 src/features/dashboard/sidebar/footer.tsx     |  27 +++--
 src/ui/primitives/textarea.tsx                |   4 +-
 3 files changed, 125 insertions(+), 13 deletions(-)
 create mode 100644 src/features/dashboard/navbar/report-issue-popover.tsx

diff --git a/src/features/dashboard/navbar/report-issue-popover.tsx b/src/features/dashboard/navbar/report-issue-popover.tsx
new file mode 100644
index 000000000..a701d6c9c
--- /dev/null
+++ b/src/features/dashboard/navbar/report-issue-popover.tsx
@@ -0,0 +1,107 @@
+'use client'
+
+import { reportIssueAction } from '@/server/support/support-actions'
+import { Button } from '@/ui/primitives/button'
+import {
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/ui/primitives/card'
+import { Input } from '@/ui/primitives/input'
+import { Popover, PopoverContent, PopoverTrigger } from '@/ui/primitives/popover'
+import { Textarea } from '@/ui/primitives/textarea'
+import { useState } from 'react'
+import { toast } from 'sonner'
+
+interface ReportIssuePopoverProps {
+  trigger: React.ReactNode
+}
+
+export default function ReportIssuePopover({
+  trigger,
+}: ReportIssuePopoverProps) {
+  const [isOpen, setIsOpen] = useState(false)
+  const [sandboxId, setSandboxId] = useState('')
+  const [description, setDescription] = useState('')
+  const [isSubmitting, setIsSubmitting] = useState(false)
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault()
+
+    if (!sandboxId.trim() || !description.trim()) {
+      toast.error('Please fill in all fields')
+      return
+    }
+
+    setIsSubmitting(true)
+
+    try {
+      const result = await reportIssueAction({
+        sandboxId: sandboxId.trim(),
+        description: description.trim(),
+      })
+
+      if (result?.data?.success) {
+        toast.success('Issue reported successfully. Our team will review it shortly.')
+        setIsOpen(false)
+        setSandboxId('')
+        setDescription('')
+      } else {
+        toast.error('Failed to report issue. Please try again.')
+      }
+    } catch (error) {
+      console.error('Error reporting issue:', error)
+      toast.error('Failed to report issue. Please try again.')
+    } finally {
+      setIsSubmitting(false)
+    }
+  }
+
+  return (
+    <Popover open={isOpen} onOpenChange={setIsOpen}>
+      <PopoverTrigger asChild>{trigger}</PopoverTrigger>
+
+      <PopoverContent
+        className="w-[400px]"
+        collisionPadding={12}
+        sideOffset={12}
+      >
+        <CardHeader>
+          <CardTitle>Report Issue</CardTitle>
+          <CardDescription>
+            Our team will get back to you shortly
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="pt-1">
+          <form onSubmit={handleSubmit} className="flex flex-col gap-1">
+            <Input
+              id="sandboxId"
+              placeholder="Enter sandbox ID"
+              aria-label="Sandbox ID"
+              value={sandboxId}
+              onChange={(e) => setSandboxId(e.target.value)}
+              disabled={isSubmitting}
+            />
+            <Textarea
+              id="description"
+              placeholder="Describe the issue you're experiencing..."
+              aria-label="Issue description"
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              className="min-h-28"
+              disabled={isSubmitting}
+            />
+            <Button
+              type="submit"
+              className="w-full mt-2"
+              disabled={isSubmitting || !sandboxId.trim() || !description.trim()}
+            >
+              {isSubmitting ? 'Submitting...' : 'Submit'}
+            </Button>
+          </form>
+        </CardContent>
+      </PopoverContent>
+    </Popover>
+  )
+}
diff --git a/src/features/dashboard/sidebar/footer.tsx b/src/features/dashboard/sidebar/footer.tsx
index c25106d9a..11f3457ad 100644
--- a/src/features/dashboard/sidebar/footer.tsx
+++ b/src/features/dashboard/sidebar/footer.tsx
@@ -15,6 +15,7 @@ import {
 import { Book, Bug, Github, MessageSquarePlus } from 'lucide-react'
 import Link from 'next/link'
 import DashboardSurveyPopover from '../navbar/dashboard-survey-popover'
+import ReportIssuePopover from '../navbar/report-issue-popover'
 import TeamBlockageAlert from './blocked-banner'
 
 export default function DashboardSidebarFooter() {
@@ -102,17 +103,21 @@ export default function DashboardSidebarFooter() {
             SIDEBAR_TRANSITION_CLASSNAMES
           )}
         >
-          <SidebarMenuButton
-            tooltip="Report Issue"
-            variant="ghost"
-            className={cn(
-              'hover:bg-bg-hover transition-all w-full min-h-protected-statusbar justify-center group-data-[collapsible=icon]:justify-start',
-              SIDEBAR_TRANSITION_CLASSNAMES
-            )}
-          >
-            <Bug className="hidden group-data-[collapsible=icon]:block group-data-[collapsible=icon]:!size-5" />
-            Report Issue
-          </SidebarMenuButton>
+          <ReportIssuePopover
+            trigger={
+              <SidebarMenuButton
+                tooltip="Report Issue"
+                variant="ghost"
+                className={cn(
+                  'hover:bg-bg-hover transition-all w-full min-h-protected-statusbar justify-center group-data-[collapsible=icon]:justify-start',
+                  SIDEBAR_TRANSITION_CLASSNAMES
+                )}
+              >
+                <Bug className="hidden group-data-[collapsible=icon]:block group-data-[collapsible=icon]:!size-5" />
+                Report Issue
+              </SidebarMenuButton>
+            }
+          />
         </SidebarMenuItem>
       </SidebarMenu>
     </>
diff --git a/src/ui/primitives/textarea.tsx b/src/ui/primitives/textarea.tsx
index 4b8ea7570..78286ceb1 100644
--- a/src/ui/primitives/textarea.tsx
+++ b/src/ui/primitives/textarea.tsx
@@ -8,10 +8,10 @@ function Textarea({ className, ...props }: React.ComponentProps<'textarea'>) {
       data-slot="textarea"
       className={cn(
         'bg-bg flex w-full px-3 py-2',
-        'font-mono text-xs tracking-wider',
+        'prose-body',
         'min-h-16 border',
 
-        'placeholder:text-fg-tertiary placeholder:font-mono',
+        'placeholder:text-fg-tertiary',
         'focus:[border-bottom:1px_solid_var(--accent-main-highlight )] focus:outline-none',
         'disabled:cursor-not-allowed disabled:opacity-50',
 

From a134f26ef82470b7b50c868fc0d28cc68e3a68a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 14:39:42 +0100
Subject: [PATCH 05/10] feat: tweak and match feedback popover ui

---
 .../dashboard/navbar/dashboard-survey-popover.tsx     |  4 ++--
 src/ui/survey.tsx                                     | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/features/dashboard/navbar/dashboard-survey-popover.tsx b/src/features/dashboard/navbar/dashboard-survey-popover.tsx
index 9176a5cbd..34255b946 100644
--- a/src/features/dashboard/navbar/dashboard-survey-popover.tsx
+++ b/src/features/dashboard/navbar/dashboard-survey-popover.tsx
@@ -92,8 +92,8 @@ function DashboardSurveyPopover({ trigger }: DashboardSurveyPopoverProps) {
 
       <PopoverContent
         className="w-[400px]"
-        collisionPadding={20}
-        sideOffset={25}
+        collisionPadding={12}
+        sideOffset={12}
       >
         {dashboardFeedbackSurvey && (
           <SurveyContent
diff --git a/src/ui/survey.tsx b/src/ui/survey.tsx
index 8c4bd199e..effebf583 100644
--- a/src/ui/survey.tsx
+++ b/src/ui/survey.tsx
@@ -66,7 +66,7 @@ export function SurveyContent({
       switch (question.type) {
         case 'rating':
           return (
-            <div className="flex justify-between">
+            <div className="flex justify-between py-[5px]">
               {question.display === 'emoji'
                 ? // Emoji ratings
                   (question.scale === 3 ? EMOJIS_3 : EMOJIS_5).map(
@@ -127,6 +127,7 @@ export function SurveyContent({
               placeholder={survey?.appearance?.placeholder}
               value={responses[currentQuestionIndex] || ''}
               className="min-h-28"
+              autoFocus
               onChange={(e) =>
                 setResponses((prev) => ({
                   ...prev,
@@ -162,17 +163,17 @@ export function SurveyContent({
   return (
     <div>
       <CardHeader>
-        <CardTitle className="normal-case">
+        <CardTitle>
           {currentQuestion?.question}
         </CardTitle>
         {currentQuestion?.description && (
-          <CardDescription className="text-md">
+          <CardDescription>
             {currentQuestion?.description}
           </CardDescription>
         )}
       </CardHeader>
-      <CardContent>
-        <form onSubmit={handleSubmit} className="space-y-8">
+      <CardContent className="pt-1">
+        <form onSubmit={handleSubmit} className="space-y-4">
           {currentQuestion && renderQuestion(currentQuestion)}
           <div className="flex justify-between">
             <Button

From a4a36e3248be9a6dd5509d16b3bdc0ac953b00f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 15:40:28 +0100
Subject: [PATCH 06/10] feat: add plain SDK, connect to API

---
 bun.lock                              | 15 +++++++
 package.json                          |  1 +
 src/server/support/support-actions.ts | 59 ++++++++++++++++++++++++---
 3 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/bun.lock b/bun.lock
index 5b3de5f68..bc14c090f 100644
--- a/bun.lock
+++ b/bun.lock
@@ -47,6 +47,7 @@
         "@tanstack/react-query-devtools": "^5.91.1",
         "@tanstack/react-table": "^8.20.6",
         "@tanstack/react-virtual": "^3.13.12",
+        "@team-plain/typescript-sdk": "^5.11.0",
         "@theguild/remark-mermaid": "^0.2.0",
         "@trpc/client": "^11.7.1",
         "@trpc/react-query": "^11.7.1",
@@ -361,6 +362,8 @@
 
     "@google-cloud/storage": ["@google-cloud/storage@7.17.3", "", { "dependencies": { "@google-cloud/paginator": "^5.0.0", "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "<4.1.0", "abort-controller": "^3.0.0", "async-retry": "^1.3.3", "duplexify": "^4.1.3", "fast-xml-parser": "^4.4.1", "gaxios": "^6.0.2", "google-auth-library": "^9.6.3", "html-entities": "^2.5.2", "mime": "^3.0.0", "p-limit": "^3.0.1", "retry-request": "^7.0.0", "teeny-request": "^9.0.0", "uuid": "^8.0.0" } }, "sha512-gOnCAbFgAYKRozywLsxagdevTF7Gm+2Ncz5u5CQAuOv/2VCa0rdGJWvJFDOftPx1tc+q8TXiC2pEJfFKu+yeMQ=="],
 
+    "@graphql-typed-document-node/core": ["@graphql-typed-document-node/core@3.2.0", "", { "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ=="],
+
     "@grpc/grpc-js": ["@grpc/grpc-js@1.14.0", "", { "dependencies": { "@grpc/proto-loader": "^0.8.0", "@js-sdsl/ordered-map": "^4.4.2" } }, "sha512-N8Jx6PaYzcTRNzirReJCtADVoq4z7+1KQ4E70jTg/koQiMoUSN1kbNjPOqpPbhMFhfU1/l7ixspPl8dNY+FoUg=="],
 
     "@grpc/proto-loader": ["@grpc/proto-loader@0.8.0", "", { "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", "protobufjs": "^7.5.3", "yargs": "^17.7.2" }, "bin": { "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" } }, "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ=="],
@@ -955,6 +958,8 @@
 
     "@tanstack/virtual-core": ["@tanstack/virtual-core@3.13.12", "", {}, "sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA=="],
 
+    "@team-plain/typescript-sdk": ["@team-plain/typescript-sdk@5.11.0", "", { "dependencies": { "@graphql-typed-document-node/core": "^3.2.0", "ajv": "^8.12.0", "ajv-formats": "^2.1.1", "graphql": "^16.6.0", "lodash.get": "^4.4.2", "zod": "3.22.4" } }, "sha512-EEyfQjD1d1tFMLFtqV7StWtiwAesFD1B5zdTYvcjpoJLlftr4NMS0BVllSKnr7n7jjWivTsVuuG7yZcZD6ZonA=="],
+
     "@testing-library/dom": ["@testing-library/dom@10.4.1", "", { "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", "@types/aria-query": "^5.0.1", "aria-query": "5.3.0", "dom-accessibility-api": "^0.5.9", "lz-string": "^1.5.0", "picocolors": "1.1.1", "pretty-format": "^27.0.2" } }, "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg=="],
 
     "@testing-library/jest-dom": ["@testing-library/jest-dom@6.9.1", "", { "dependencies": { "@adobe/css-tools": "^4.4.0", "aria-query": "^5.0.0", "css.escape": "^1.5.1", "dom-accessibility-api": "^0.6.3", "picocolors": "^1.1.1", "redent": "^3.0.0" } }, "sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA=="],
@@ -1835,6 +1840,8 @@
 
     "graphemer": ["graphemer@1.4.0", "", {}, "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="],
 
+    "graphql": ["graphql@16.12.0", "", {}, "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ=="],
+
     "gtoken": ["gtoken@7.1.0", "", { "dependencies": { "gaxios": "^6.0.0", "jws": "^4.0.0" } }, "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw=="],
 
     "hachure-fill": ["hachure-fill@0.5.2", "", {}, "sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg=="],
@@ -2099,6 +2106,8 @@
 
     "lodash.debounce": ["lodash.debounce@4.0.8", "", {}, "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="],
 
+    "lodash.get": ["lodash.get@4.4.2", "", {}, "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="],
+
     "lodash.merge": ["lodash.merge@4.6.2", "", {}, "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="],
 
     "long": ["long@5.3.2", "", {}, "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA=="],
@@ -3183,6 +3192,10 @@
 
     "@tanem/svg-injector/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
+    "@team-plain/typescript-sdk/ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="],
+
+    "@team-plain/typescript-sdk/zod": ["zod@3.22.4", "", {}, "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg=="],
+
     "@testing-library/dom/aria-query": ["aria-query@5.3.0", "", { "dependencies": { "dequal": "^2.0.3" } }, "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A=="],
 
     "@testing-library/dom/dom-accessibility-api": ["dom-accessibility-api@0.5.16", "", {}, "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg=="],
@@ -3501,6 +3514,8 @@
 
     "@redocly/openapi-core/minimatch/brace-expansion": ["brace-expansion@2.0.2", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ=="],
 
+    "@team-plain/typescript-sdk/ajv/json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="],
+
     "@types/jest/pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="],
 
     "@typescript-eslint/typescript-estree/fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
diff --git a/package.json b/package.json
index e579091b5..2c888bb1d 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
     "@tanstack/react-query-devtools": "^5.91.1",
     "@tanstack/react-table": "^8.20.6",
     "@tanstack/react-virtual": "^3.13.12",
+    "@team-plain/typescript-sdk": "^5.11.0",
     "@theguild/remark-mermaid": "^0.2.0",
     "@trpc/client": "^11.7.1",
     "@trpc/react-query": "^11.7.1",
diff --git a/src/server/support/support-actions.ts b/src/server/support/support-actions.ts
index b79c423ad..8378937e1 100644
--- a/src/server/support/support-actions.ts
+++ b/src/server/support/support-actions.ts
@@ -1,6 +1,7 @@
 'use server'
 
 import { authActionClient } from '@/lib/clients/action'
+import { PlainClient } from '@team-plain/typescript-sdk'
 import { z } from 'zod'
 
 const ReportIssueSchema = z.object({
@@ -15,12 +16,58 @@ export const reportIssueAction = authActionClient
     const { sandboxId, description } = parsedInput
     const email = ctx.user.email
 
-    console.log('reportIssueAction', { sandboxId, description, email })
+    if (!process.env.PLAIN_API_KEY) {
+      console.error('PLAIN_API_KEY not configured')
+      return { success: false, error: 'Support API not configured' }
+    }
 
-    // TODO: Call Plain API
-    // - email
-    // - sandboxId
-    // - description
+    if (!email) {
+      console.error('Email not found')
+      return { success: false, error: 'Email not found' }
+    }
 
-    return { success: true }
+    const client = new PlainClient({
+      apiKey: process.env.PLAIN_API_KEY,
+    })
+
+    // First, upsert the customer to ensure they exist
+    const customerResult = await client.upsertCustomer({
+      identifier: {
+        emailAddress: email,
+      },
+      onCreate: {
+        email: {
+          email,
+          isVerified: true,
+        },
+        fullName: email
+      },
+      onUpdate: {},
+    })
+
+    if (customerResult.error) {
+      console.error('Failed to upsert customer in Plain:', customerResult.error)
+      return { success: false, error: customerResult.error.message }
+    }
+
+    const result = await client.createThread({
+      title: `Dashboard Issue Report: ${sandboxId}`,
+      customerIdentifier: {
+        customerId: customerResult.data.customer.id,
+      },
+      components: [
+        {
+          componentText: {
+            text: `**Sandbox ID:** ${sandboxId}\n\n**Description:**\n${description}`,
+          },
+        },
+      ],
+    })
+
+    if (result.error) {
+      console.error('Failed to create Plain thread:', result.error)
+      return { success: false, error: result.error.message }
+    }
+
+    return { success: true, threadId: result.data.id }
   })

From da7c98b6e22f070ac794d7431853060e99819eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 15:53:17 +0100
Subject: [PATCH 07/10] feat: add mentions of plain integration in appropriate
 places

---
 .env.example                              |   3 +
 .github/workflows/test.yml                |   1 +
 README.md                                 |   1 +
 src/configs/flags.ts                      |   2 +
 src/features/dashboard/sidebar/footer.tsx | 116 +++++++++++-----------
 src/lib/env.ts                            |   2 +
 src/server/support/support-actions.ts     |   6 +-
 7 files changed, 72 insertions(+), 59 deletions(-)

diff --git a/.env.example b/.env.example
index 0bd9fcbf3..1b4f10a45 100644
--- a/.env.example
+++ b/.env.example
@@ -68,6 +68,9 @@ NEXT_PUBLIC_SUPABASE_ANON_KEY=your_supabase_anon_key
 ### PostHog analytics key
 # NEXT_PUBLIC_POSTHOG_KEY=
 
+### Plain API key for customer support integration
+# NEXT_PUBLIC_PLAIN_API_KEY=
+
 ### Enable billing features: set to 1 to enable
 ### When enabled, both BILLING_API_URL and NEXT_PUBLIC_STRIPE_BILLING_URL must be provided
 # NEXT_PUBLIC_INCLUDE_BILLING=0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4a3d335de..e2be52531 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -44,6 +44,7 @@ jobs:
       BILLING_API_URL: https://billing.e2b-test.dev
       NEXT_PUBLIC_E2B_DOMAIN: e2b-test.dev
       NEXT_PUBLIC_POSTHOG_KEY: test-posthog-key
+      NEXT_PUBLIC_PLAIN_API_KEY: test-plain-api-key
       NEXT_PUBLIC_SUPABASE_URL: https://test-supabase-url.supabase.co
       NEXT_PUBLIC_SUPABASE_ANON_KEY: test-supabase-anon-key
       NEXT_PUBLIC_STRIPE_BILLING_URL: https://test-stripe-billing.example.com
diff --git a/README.md b/README.md
index 3be1b2241..03909eca2 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ Our Dashboard is a modern, feature-rich web application built to manage and moni
 - Vercel account
 - Supabase account
 - PostHog account (optional for analytics)
+- Plain account (optional for customer support)
 
 ### Local Development Setup
 
diff --git a/src/configs/flags.ts b/src/configs/flags.ts
index 863408044..0dbb6c383 100644
--- a/src/configs/flags.ts
+++ b/src/configs/flags.ts
@@ -9,3 +9,5 @@ export const USE_MOCK_DATA =
 export const INCLUDE_DASHBOARD_FEEDBACK_SURVEY =
   process.env.NEXT_PUBLIC_POSTHOG_DASHBOARD_FEEDBACK_SURVEY_ID &&
   process.env.NEXT_PUBLIC_POSTHOG_KEY
+
+export const INCLUDE_REPORT_ISSUE = !!process.env.NEXT_PUBLIC_PLAIN_API_KEY
diff --git a/src/features/dashboard/sidebar/footer.tsx b/src/features/dashboard/sidebar/footer.tsx
index 11f3457ad..3bff3990c 100644
--- a/src/features/dashboard/sidebar/footer.tsx
+++ b/src/features/dashboard/sidebar/footer.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { INCLUDE_DASHBOARD_FEEDBACK_SURVEY } from '@/configs/flags'
+import { INCLUDE_DASHBOARD_FEEDBACK_SURVEY, INCLUDE_REPORT_ISSUE } from '@/configs/flags'
 import { GITHUB_URL } from '@/configs/urls'
 import { cn } from '@/lib/utils'
 import ExternalIcon from '@/ui/external-icon'
@@ -61,65 +61,69 @@ export default function DashboardSidebarFooter() {
         </SidebarGroup>
       </SidebarFooter>
 
-      <SidebarMenu
-        className={cn(
-          'flex-row gap-0 border-t group-data-[collapsible=icon]:flex-col',
-          SIDEBAR_TRANSITION_CLASSNAMES
-        )}
-      >
-        {INCLUDE_DASHBOARD_FEEDBACK_SURVEY && (
-          <SidebarMenuItem
-            key="survey"
-            className={cn(
-              'flex-1 transition-all group-data-[collapsible=icon]:pl-2',
-              SIDEBAR_TRANSITION_CLASSNAMES
-            )}
-          >
-            <DashboardSurveyPopover
-              trigger={
-                <SidebarMenuButton
-                  tooltip="Feedback"
-                  variant="ghost"
-                  className={cn(
-                    'hover:bg-bg-hover transition-all w-full min-h-protected-statusbar justify-center group-data-[collapsible=icon]:justify-start',
-                    SIDEBAR_TRANSITION_CLASSNAMES
-                  )}
-                >
-                  <MessageSquarePlus className="hidden group-data-[collapsible=icon]:block group-data-[collapsible=icon]:!size-5" />
-                  Feedback
-                </SidebarMenuButton>
-              }
-            />
-          </SidebarMenuItem>
-        )}
-        {INCLUDE_DASHBOARD_FEEDBACK_SURVEY && (
-          /* separator */
-          <div className="border-r h-full hidden group-data-[collapsible=icon]:hidden group-data-[state=expanded]:block" />
-        )}
-        <SidebarMenuItem
-          key="report-issue"
+      {(INCLUDE_DASHBOARD_FEEDBACK_SURVEY || INCLUDE_REPORT_ISSUE) && (
+        <SidebarMenu
           className={cn(
-            'flex-1 transition-all group-data-[collapsible=icon]:pl-2',
+            'flex-row gap-0 border-t group-data-[collapsible=icon]:flex-col',
             SIDEBAR_TRANSITION_CLASSNAMES
           )}
         >
-          <ReportIssuePopover
-            trigger={
-              <SidebarMenuButton
-                tooltip="Report Issue"
-                variant="ghost"
-                className={cn(
-                  'hover:bg-bg-hover transition-all w-full min-h-protected-statusbar justify-center group-data-[collapsible=icon]:justify-start',
-                  SIDEBAR_TRANSITION_CLASSNAMES
-                )}
-              >
-                <Bug className="hidden group-data-[collapsible=icon]:block group-data-[collapsible=icon]:!size-5" />
-                Report Issue
-              </SidebarMenuButton>
-            }
-          />
-        </SidebarMenuItem>
-      </SidebarMenu>
+          {INCLUDE_DASHBOARD_FEEDBACK_SURVEY && (
+            <SidebarMenuItem
+              key="survey"
+              className={cn(
+                'flex-1 transition-all group-data-[collapsible=icon]:pl-2',
+                SIDEBAR_TRANSITION_CLASSNAMES
+              )}
+            >
+              <DashboardSurveyPopover
+                trigger={
+                  <SidebarMenuButton
+                    tooltip="Feedback"
+                    variant="ghost"
+                    className={cn(
+                      'hover:bg-bg-hover transition-all w-full min-h-protected-statusbar justify-center group-data-[collapsible=icon]:justify-start',
+                      SIDEBAR_TRANSITION_CLASSNAMES
+                    )}
+                  >
+                    <MessageSquarePlus className="hidden group-data-[collapsible=icon]:block group-data-[collapsible=icon]:!size-5" />
+                    Feedback
+                  </SidebarMenuButton>
+                }
+              />
+            </SidebarMenuItem>
+          )}
+          {INCLUDE_DASHBOARD_FEEDBACK_SURVEY && INCLUDE_REPORT_ISSUE && (
+            /* separator */
+            <div className="border-r h-full hidden group-data-[collapsible=icon]:hidden group-data-[state=expanded]:block" />
+          )}
+          {INCLUDE_REPORT_ISSUE && (
+            <SidebarMenuItem
+              key="report-issue"
+              className={cn(
+                'flex-1 transition-all group-data-[collapsible=icon]:pl-2',
+                SIDEBAR_TRANSITION_CLASSNAMES
+              )}
+            >
+              <ReportIssuePopover
+                trigger={
+                  <SidebarMenuButton
+                    tooltip="Report Issue"
+                    variant="ghost"
+                    className={cn(
+                      'hover:bg-bg-hover transition-all w-full min-h-protected-statusbar justify-center group-data-[collapsible=icon]:justify-start',
+                      SIDEBAR_TRANSITION_CLASSNAMES
+                    )}
+                  >
+                    <Bug className="hidden group-data-[collapsible=icon]:block group-data-[collapsible=icon]:!size-5" />
+                    Report Issue
+                  </SidebarMenuButton>
+                }
+              />
+            </SidebarMenuItem>
+          )}
+        </SidebarMenu>
+      )}
     </>
   )
 }
diff --git a/src/lib/env.ts b/src/lib/env.ts
index 4fa1633c8..28a796351 100644
--- a/src/lib/env.ts
+++ b/src/lib/env.ts
@@ -45,6 +45,8 @@ export const clientSchema = z.object({
     .string()
     .min(1)
     .optional(),
+  
+  NEXT_PUBLIC_PLAIN_API_KEY: z.string().min(1).optional(),
 
   NEXT_PUBLIC_INCLUDE_BILLING: z.string().optional(),
   NEXT_PUBLIC_INCLUDE_ARGUS: z.string().optional(),
diff --git a/src/server/support/support-actions.ts b/src/server/support/support-actions.ts
index 8378937e1..2cfbd8f32 100644
--- a/src/server/support/support-actions.ts
+++ b/src/server/support/support-actions.ts
@@ -16,8 +16,8 @@ export const reportIssueAction = authActionClient
     const { sandboxId, description } = parsedInput
     const email = ctx.user.email
 
-    if (!process.env.PLAIN_API_KEY) {
-      console.error('PLAIN_API_KEY not configured')
+    if (!process.env.NEXT_PUBLIC_PLAIN_API_KEY) {
+      console.error('NEXT_PUBLIC_PLAIN_API_KEY not configured')
       return { success: false, error: 'Support API not configured' }
     }
 
@@ -27,7 +27,7 @@ export const reportIssueAction = authActionClient
     }
 
     const client = new PlainClient({
-      apiKey: process.env.PLAIN_API_KEY,
+      apiKey: process.env.NEXT_PUBLIC_PLAIN_API_KEY,
     })
 
     // First, upsert the customer to ensure they exist

From 13044193ae73986d1c56884c05007dc45339c011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 18:29:23 +0100
Subject: [PATCH 08/10] feat: add analytics to report issue popover

---
 .../dashboard/navbar/report-issue-popover.tsx | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/features/dashboard/navbar/report-issue-popover.tsx b/src/features/dashboard/navbar/report-issue-popover.tsx
index a701d6c9c..9fe2235af 100644
--- a/src/features/dashboard/navbar/report-issue-popover.tsx
+++ b/src/features/dashboard/navbar/report-issue-popover.tsx
@@ -11,6 +11,7 @@ import {
 import { Input } from '@/ui/primitives/input'
 import { Popover, PopoverContent, PopoverTrigger } from '@/ui/primitives/popover'
 import { Textarea } from '@/ui/primitives/textarea'
+import { usePostHog } from 'posthog-js/react'
 import { useState } from 'react'
 import { toast } from 'sonner'
 
@@ -21,10 +22,12 @@ interface ReportIssuePopoverProps {
 export default function ReportIssuePopover({
   trigger,
 }: ReportIssuePopoverProps) {
+  const posthog = usePostHog()
   const [isOpen, setIsOpen] = useState(false)
   const [sandboxId, setSandboxId] = useState('')
   const [description, setDescription] = useState('')
   const [isSubmitting, setIsSubmitting] = useState(false)
+  const [wasSubmitted, setWasSubmitted] = useState(false)
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
@@ -43,6 +46,11 @@ export default function ReportIssuePopover({
       })
 
       if (result?.data?.success) {
+        posthog.capture('issue_reported', {
+          sandbox_id: sandboxId.trim(),
+          thread_id: result.data.threadId,
+        })
+        setWasSubmitted(true)
         toast.success('Issue reported successfully. Our team will review it shortly.')
         setIsOpen(false)
         setSandboxId('')
@@ -59,7 +67,23 @@ export default function ReportIssuePopover({
   }
 
   return (
-    <Popover open={isOpen} onOpenChange={setIsOpen}>
+    <Popover
+      open={isOpen}
+      onOpenChange={(open) => {
+        if (open) {
+          posthog.capture('issue_report_shown')
+        }
+        if (!open && !wasSubmitted) {
+          posthog.capture('issue_report_dismissed')
+        }
+        if (!open) {
+          setTimeout(() => {
+            setWasSubmitted(false)
+          }, 100)
+        }
+        setIsOpen(open)
+      }}
+    >
       <PopoverTrigger asChild>{trigger}</PopoverTrigger>
 
       <PopoverContent

From 10981b8b230de0df812f088be50fbf876fd9bb46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 20:57:40 +0100
Subject: [PATCH 09/10] feat: make plain api key private, expose only UI gate

---
 .env.example                          | 11 ++++++++---
 src/configs/flags.ts                  |  2 +-
 src/lib/env.ts                        |  4 ++--
 src/server/support/support-actions.ts |  6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.env.example b/.env.example
index 1b4f10a45..c875154b4 100644
--- a/.env.example
+++ b/.env.example
@@ -44,6 +44,10 @@ NEXT_PUBLIC_SUPABASE_ANON_KEY=your_supabase_anon_key
 ### ZeroBounce API key for email validation
 # ZEROBOUNCE_API_KEY=
 
+### Plain API key for customer support integration
+# (Required if NEXT_PUBLIC_INCLUDE_REPORT_ISSUE=1)
+# PLAIN_API_KEY=
+
 ### Loki Configuration
 # LOKI_SERVICE_NAME=
 # LOKI_HOST=
@@ -68,13 +72,14 @@ NEXT_PUBLIC_SUPABASE_ANON_KEY=your_supabase_anon_key
 ### PostHog analytics key
 # NEXT_PUBLIC_POSTHOG_KEY=
 
-### Plain API key for customer support integration
-# NEXT_PUBLIC_PLAIN_API_KEY=
-
 ### Enable billing features: set to 1 to enable
 ### When enabled, both BILLING_API_URL and NEXT_PUBLIC_STRIPE_BILLING_URL must be provided
 # NEXT_PUBLIC_INCLUDE_BILLING=0
 
+### Enable report issue feature: set to 1 to enable
+### When enabled, PLAIN_API_KEY must be provided
+# NEXT_PUBLIC_INCLUDE_REPORT_ISSUE=0
+
 ### Set to 1 to use mock data
 # NEXT_PUBLIC_MOCK_DATA=0
 
diff --git a/src/configs/flags.ts b/src/configs/flags.ts
index 0dbb6c383..991ebcd6b 100644
--- a/src/configs/flags.ts
+++ b/src/configs/flags.ts
@@ -10,4 +10,4 @@ export const INCLUDE_DASHBOARD_FEEDBACK_SURVEY =
   process.env.NEXT_PUBLIC_POSTHOG_DASHBOARD_FEEDBACK_SURVEY_ID &&
   process.env.NEXT_PUBLIC_POSTHOG_KEY
 
-export const INCLUDE_REPORT_ISSUE = !!process.env.NEXT_PUBLIC_PLAIN_API_KEY
+export const INCLUDE_REPORT_ISSUE = process.env.NEXT_PUBLIC_INCLUDE_REPORT_ISSUE === '1'
diff --git a/src/lib/env.ts b/src/lib/env.ts
index 28a796351..2a49024c2 100644
--- a/src/lib/env.ts
+++ b/src/lib/env.ts
@@ -8,6 +8,7 @@ export const serverSchema = z.object({
 
   BILLING_API_URL: z.url().optional(),
   ZEROBOUNCE_API_KEY: z.string().optional(),
+  PLAIN_API_KEY: z.string().min(1).optional(),
 
   OTEL_SERVICE_NAME: z.string().optional(),
   OTEL_EXPORTER_OTLP_ENDPOINT: z.url().optional(),
@@ -45,11 +46,10 @@ export const clientSchema = z.object({
     .string()
     .min(1)
     .optional(),
-  
-  NEXT_PUBLIC_PLAIN_API_KEY: z.string().min(1).optional(),
 
   NEXT_PUBLIC_INCLUDE_BILLING: z.string().optional(),
   NEXT_PUBLIC_INCLUDE_ARGUS: z.string().optional(),
+  NEXT_PUBLIC_INCLUDE_REPORT_ISSUE: z.string().optional(),
   NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: z.string().optional(),
   NEXT_PUBLIC_SCAN: z.string().optional(),
   NEXT_PUBLIC_MOCK_DATA: z.string().optional(),
diff --git a/src/server/support/support-actions.ts b/src/server/support/support-actions.ts
index 2cfbd8f32..8378937e1 100644
--- a/src/server/support/support-actions.ts
+++ b/src/server/support/support-actions.ts
@@ -16,8 +16,8 @@ export const reportIssueAction = authActionClient
     const { sandboxId, description } = parsedInput
     const email = ctx.user.email
 
-    if (!process.env.NEXT_PUBLIC_PLAIN_API_KEY) {
-      console.error('NEXT_PUBLIC_PLAIN_API_KEY not configured')
+    if (!process.env.PLAIN_API_KEY) {
+      console.error('PLAIN_API_KEY not configured')
       return { success: false, error: 'Support API not configured' }
     }
 
@@ -27,7 +27,7 @@ export const reportIssueAction = authActionClient
     }
 
     const client = new PlainClient({
-      apiKey: process.env.NEXT_PUBLIC_PLAIN_API_KEY,
+      apiKey: process.env.PLAIN_API_KEY,
     })
 
     // First, upsert the customer to ensure they exist

From bee1f2a93004c53905a27902076c8dd66d727dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojta=20B=C3=B6hm?= <vojta.bohm@gmail.com>
Date: Thu, 15 Jan 2026 21:22:33 +0100
Subject: [PATCH 10/10] fix: bad state management

---
 src/features/dashboard/navbar/report-issue-popover.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/features/dashboard/navbar/report-issue-popover.tsx b/src/features/dashboard/navbar/report-issue-popover.tsx
index 9fe2235af..968a73119 100644
--- a/src/features/dashboard/navbar/report-issue-popover.tsx
+++ b/src/features/dashboard/navbar/report-issue-popover.tsx
@@ -53,8 +53,12 @@ export default function ReportIssuePopover({
         setWasSubmitted(true)
         toast.success('Issue reported successfully. Our team will review it shortly.')
         setIsOpen(false)
+        // reset state
         setSandboxId('')
         setDescription('')
+        setTimeout(() => {
+          setWasSubmitted(false)
+        }, 100)
       } else {
         toast.error('Failed to report issue. Please try again.')
       }
@@ -76,11 +80,6 @@ export default function ReportIssuePopover({
         if (!open && !wasSubmitted) {
           posthog.capture('issue_report_dismissed')
         }
-        if (!open) {
-          setTimeout(() => {
-            setWasSubmitted(false)
-          }, 100)
-        }
         setIsOpen(open)
       }}
     >