From 48379e9f7ad56c19c80bcf029d468255266de7f9 Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Sun, 22 Feb 2026 23:08:23 +0100
Subject: [PATCH] When creating a new item when inside a folder in mobile app,
 preselect that folder (#1739)

---
 apps/mobile-app/app/(tabs)/items/add-edit.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/mobile-app/app/(tabs)/items/add-edit.tsx b/apps/mobile-app/app/(tabs)/items/add-edit.tsx
index c91ca2106..e5d99a171 100644
--- a/apps/mobile-app/app/(tabs)/items/add-edit.tsx
+++ b/apps/mobile-app/app/(tabs)/items/add-edit.tsx
@@ -52,11 +52,12 @@ const DEFAULT_ITEM_TYPE: ItemType = ItemTypes.Login;
  * Add or edit an item screen.
  */
 export default function AddEditItemScreen(): React.ReactNode {
-  const { id, itemUrl, itemName, itemType: itemTypeParam } = useLocalSearchParams<{
+  const { id, itemUrl, itemName, itemType: itemTypeParam, folderId: folderIdParam } = useLocalSearchParams<{
     id: string;
     itemUrl?: string;
     itemName?: string;
     itemType?: string;
+    folderId?: string;
   }>();
   const router = useRouter();
   const colors = useColors();
@@ -570,7 +571,7 @@ export default function AddEditItemScreen(): React.ReactNode {
           Id: crypto.randomUUID().toUpperCase(),
           Name: serviceName,
           ItemType: effectiveType,
-          FolderId: null,
+          FolderId: folderIdParam || null,
           Fields: [],
           CreatedAt: new Date().toISOString(),
           UpdatedAt: new Date().toISOString()
@@ -594,7 +595,7 @@ export default function AddEditItemScreen(): React.ReactNode {
     };
 
     initializeComponent();
-  }, [id, isEditMode, itemUrl, itemName, itemTypeParam, loadExistingItem, router, t, dbContext.sqliteClient]);
+  }, [id, isEditMode, itemUrl, itemName, itemTypeParam, folderIdParam, loadExistingItem, router, t, dbContext.sqliteClient]);
 
   /**
    * Auto-generate alias when alias fields are shown by default in create mode.