From c7300aee76a21032de393fd861eb40940fffcbbf Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomas@ajnart.fr>
Date: Thu, 14 May 2026 18:06:41 +0200
Subject: [PATCH] fix(onboarding): preserve selected integrations when
 navigating back

The multi-select grid initializes its own internal Set on mount, so
returning from the configure phase to the select phase lost all
selections. Accept an initialSelection prop and pass the parent's
selectedKinds to restore state on re-mount.
---
 .../[locale]/init/_steps/integrations/init-integrations.tsx   | 2 +-
 .../components/integration/integration-multi-select-grid.tsx  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx b/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx
index 1f2116b8d..27c42fca6 100644
--- a/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx
+++ b/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx
@@ -102,7 +102,7 @@ export const InitIntegrations = () => {
       <Stack>
         <Text>{t("description")}</Text>
 
-        <IntegrationMultiSelectGrid onSelectionChange={handleSelectionChange} />
+        <IntegrationMultiSelectGrid onSelectionChange={handleSelectionChange} initialSelection={selectedKinds} />
 
         <Group justify="space-between">
           <Button variant="subtle" onClick={() => void finishSetupAsync()}>
diff --git a/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx b/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx
index 74762ae8b..3acc8cccc 100644
--- a/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx
+++ b/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx
@@ -17,15 +17,17 @@ import {
 
 interface IntegrationMultiSelectGridProps {
   onSelectionChange: (kinds: IntegrationKind[]) => void;
+  initialSelection?: IntegrationKind[];
   enableMockIntegration?: boolean;
 }
 
 export const IntegrationMultiSelectGrid = ({
   onSelectionChange,
+  initialSelection = [],
   enableMockIntegration = false,
 }: IntegrationMultiSelectGridProps) => {
   const [search, setSearch] = useState("");
-  const [selectedKinds, setSelectedKinds] = useState<Set<IntegrationKind>>(new Set());
+  const [selectedKinds, setSelectedKinds] = useState<Set<IntegrationKind>>(() => new Set(initialSelection));
   const t = useI18n();
 
   const toggleKind = useCallback(