From 1c72f469de43f5d2b81f616a816c14758c642400 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Fri, 19 Jun 2026 23:27:09 +0100
Subject: [PATCH] fix(base): mint kanban choice ids as nanoid

---
 apps/client/package.json                                  | 2 +-
 .../src/ee/base/components/kanban/kanban-empty-state.tsx  | 8 ++++----
 apps/server/src/ee                                        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/client/package.json b/apps/client/package.json
index 02ba26af5..430b151b7 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -51,8 +51,8 @@
     "lowlight": "3.3.0",
     "mantine-form-zod-resolver": "1.3.0",
     "mermaid": "11.15.0",
-    "nanoid": "^3.3.8",
     "mitt": "3.0.1",
+    "nanoid": "^3.3.8",
     "posthog-js": "1.372.2",
     "react": "18.3.1",
     "react-clear-modal": "^2.0.18",
diff --git a/apps/client/src/ee/base/components/kanban/kanban-empty-state.tsx b/apps/client/src/ee/base/components/kanban/kanban-empty-state.tsx
index 2b328aa72..e36222ece 100644
--- a/apps/client/src/ee/base/components/kanban/kanban-empty-state.tsx
+++ b/apps/client/src/ee/base/components/kanban/kanban-empty-state.tsx
@@ -1,6 +1,6 @@
 import { useCallback } from "react";
 import { Stack, Text, Select, Button } from "@mantine/core";
-import { v7 as uuid7 } from "uuid";
+import { generateBaseChoiceId } from "@/ee/base/utils/generate-base-id";
 import { useTranslation } from "react-i18next";
 import { IBase, IBaseView } from "@/ee/base/types/base.types";
 import { useUpdateViewMutation } from "@/ee/base/queries/base-view-query";
@@ -36,9 +36,9 @@ export function KanbanEmptyState({ base, view, pageId, editable }: KanbanEmptySt
   );
 
   const handleCreateStatus = useCallback(() => {
-    const todoId = uuid7();
-    const inProgressId = uuid7();
-    const completeId = uuid7();
+    const todoId = generateBaseChoiceId();
+    const inProgressId = generateBaseChoiceId();
+    const completeId = generateBaseChoiceId();
     createProperty.mutate(
       {
         pageId,
diff --git a/apps/server/src/ee b/apps/server/src/ee
index 3911d559f..b3a56017a 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 3911d559f8ff52aebdf9a432bd600db460ed99e4
+Subproject commit b3a56017a2187e2f313112dcf1deda455f968d77