Merge pull request linkwarden#1642 from linkwarden/dev

Dev

Author: daniel31x13

apps/mobile/app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Linkwarden",
     "slug": "linkwarden",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "linkwarden",

apps/mobile/app/(tabs)/collections/_layout.tsx

@@ -31,8 +31,11 @@ export default function Layout() {
           headerIconColor: colorScheme === "dark" ? "white" : "black",
         },
         headerShadowVisible: false,
-        headerBlurEffect:
-          colorScheme === "dark" ? "systemMaterialDark" : "systemMaterial",
+        headerBlurEffect: isIOS26Plus
+          ? "none"
+          : colorScheme === "dark"
+            ? "systemMaterialDark"
+            : "systemMaterial",
         headerLargeStyle: {
           backgroundColor: isIOS26Plus
             ? "transparent"

apps/mobile/app/(tabs)/dashboard/_layout.tsx

@@ -18,8 +18,11 @@ export default function Layout() {
         headerLargeTitle: true,
         headerTransparent: Platform.OS === "ios",
         headerShadowVisible: false,
-        headerBlurEffect:
-          colorScheme === "dark" ? "systemMaterialDark" : "systemMaterial",
+        headerBlurEffect: isIOS26Plus
+          ? "none"
+          : colorScheme === "dark"
+            ? "systemMaterialDark"
+            : "systemMaterial",
         headerTintColor: colorScheme === "dark" ? "white" : "black",
         headerLargeStyle: {
           backgroundColor: isIOS26Plus

apps/mobile/app/(tabs)/links/_layout.tsx

@@ -31,8 +31,11 @@ export default function Layout() {
           headerIconColor: colorScheme === "dark" ? "white" : "black",
         },
         headerShadowVisible: false,
-        headerBlurEffect:
-          colorScheme === "dark" ? "systemMaterialDark" : "systemMaterial",
+        headerBlurEffect: isIOS26Plus
+          ? "none"
+          : colorScheme === "dark"
+            ? "systemMaterialDark"
+            : "systemMaterial",
         headerLargeStyle: {
           backgroundColor: isIOS26Plus
             ? "transparent"

apps/mobile/app/(tabs)/settings/_layout.tsx

@@ -18,8 +18,11 @@ export default function Layout() {
         headerTintColor: colorScheme === "dark" ? "white" : "black",
         headerShadowVisible: false,
         headerBackTitle: "Back",
-        headerBlurEffect:
-          colorScheme === "dark" ? "systemMaterialDark" : "systemMaterial",
+        headerBlurEffect: isIOS26Plus
+          ? "none"
+          : colorScheme === "dark"
+            ? "systemMaterialDark"
+            : "systemMaterial",
         headerLargeStyle: {
           backgroundColor: isIOS26Plus
             ? "transparent"
@@ -47,14 +50,11 @@ export default function Layout() {
           headerTitle: "Preferred Collection",
           headerLargeTitle: false,
           headerTransparent: Platform.OS === "ios",
-          headerBackground: () => (
-            <View
-              style={{
-                flex: 1,
-                backgroundColor: themeBackgroundColor,
-              }}
-            />
-          ),
+          headerBlurEffect: isIOS26Plus
+            ? "none"
+            : colorScheme === "dark"
+              ? "systemMaterialDark"
+              : "systemMaterial",
           headerSearchBarOptions: {
             placeholder: "Search Collections",
             autoCapitalize: "none",

apps/mobile/app/(tabs)/settings/preferredCollection.tsx

@@ -8,8 +8,6 @@ import { Folder, Check } from "lucide-react-native";
 import { useColorScheme } from "nativewind";
 import { rawTheme, ThemeName } from "@/lib/colors";
 import { useLocalSearchParams } from "expo-router";
-import { useHeaderHeight } from "@react-navigation/elements";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 const PreferredCollectionScreen = () => {
   const { auth } = useAuthStore();
@@ -20,8 +18,6 @@ const PreferredCollectionScreen = () => {
   const [filteredCollections, setFilteredCollections] = useState<
     CollectionIncludingMembersAndLinkCount[]
   >([]);
-  const headerHeight = useHeaderHeight();
-  const insets = useSafeAreaInsets();
 
   useEffect(() => {
     const filter =
@@ -80,11 +76,10 @@ const PreferredCollectionScreen = () => {
         data={filteredCollections}
         keyExtractor={(item) => item.id?.toString() || ""}
         renderItem={renderCollection}
+        contentInsetAdjustmentBehavior="automatic"
         contentContainerStyle={{
           paddingHorizontal: 16,
-          flexGrow: 1,
-          paddingTop: Platform.OS === "ios" ? headerHeight + 10 : 10,
-          paddingBottom: insets.bottom + 60,
+          paddingTop: 10,
         }}
         ListEmptyComponent={
           <View

apps/mobile/app/(tabs)/tags/_layout.tsx

@@ -30,8 +30,11 @@ export default function Layout() {
           headerIconColor: colorScheme === "dark" ? "white" : "black",
         },
         headerShadowVisible: false,
-        headerBlurEffect:
-          colorScheme === "dark" ? "systemMaterialDark" : "systemMaterial",
+        headerBlurEffect: isIOS26Plus
+          ? "none"
+          : colorScheme === "dark"
+            ? "systemMaterialDark"
+            : "systemMaterial",
         headerLargeStyle: {
           backgroundColor: isIOS26Plus
             ? "transparent"

apps/web/lib/api/controllers/tags/getTags.ts

@@ -25,26 +25,39 @@ export default async function getTags({
     orderBy = [{ links: { _count: "asc" } }, { id: "asc" }];
 
   if (userId) {
+    const memberCollections = await prisma.usersAndCollections.findMany({
+      where: {
+        userId,
+      },
+      select: {
+        collectionId: true,
+      },
+    });
+
+    const memberCollectionIds = memberCollections.map(
+      (memberCollection) => memberCollection.collectionId
+    );
+
     const tags = await prisma.tag.findMany({
       take: paginationTakeCount,
       skip: query.cursor ? 1 : undefined,
       cursor: query.cursor ? { id: query.cursor } : undefined,
       where: {
         OR: [
           { ownerId: userId }, // Tags owned by the user
-          {
-            links: {
-              some: {
-                collection: {
-                  members: {
+          ...(memberCollectionIds.length > 0
+            ? [
+                {
+                  links: {
                     some: {
-                      userId, // Tags from collections where the user is a member
+                      collectionId: {
+                        in: memberCollectionIds,
+                      },
                     },
                   },
                 },
-              },
-            },
-          },
+              ]
+            : []),
         ],
       },
       include: {
@@ -70,9 +83,7 @@ export default async function getTags({
       where: {
         links: {
           some: {
-            collection: {
-              id: collectionId,
-            },
+            collectionId,
           },
         },
       },