diff --git a/apps/admin/package.json b/apps/admin/package.json
index 8a5e7a5c1d..7f55e37531 100644
--- a/apps/admin/package.json
+++ b/apps/admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "packrat-admin-app",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "scripts": {
     "build": "next build",
diff --git a/apps/expo/app.config.ts b/apps/expo/app.config.ts
index 9ed48acde2..ea6c39bc6d 100644
--- a/apps/expo/app.config.ts
+++ b/apps/expo/app.config.ts
@@ -37,7 +37,7 @@ export default (): ExpoConfig =>
     {
       name: getAppName(),
       slug: 'packrat',
-      version: '2.0.22',
+      version: '2.0.23',
       scheme: 'packrat',
       web: {
         bundler: 'metro',
diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx
index 8413733bcd..7488eaf9bc 100644
--- a/apps/expo/app/(app)/ai-chat.tsx
+++ b/apps/expo/app/(app)/ai-chat.tsx
@@ -6,6 +6,7 @@ import * as Burnt from 'burnt';
 import { fetch as expoFetch } from 'expo/fetch';
 import { AiChatHeader } from 'expo-app/components/ai-chatHeader';
 import { Icon } from 'expo-app/components/Icon';
+import { TextInput } from 'expo-app/components/TextInput';
 import { featureFlags } from 'expo-app/config';
 import { aiModeAtom, localModelStatusAtom } from 'expo-app/features/ai/atoms/aiModeAtoms';
 import {
@@ -34,7 +35,6 @@ import {
   type NativeSyntheticEvent,
   Platform,
   ScrollView,
-  TextInput,
   type TextInputContentSizeChangeEventData,
   type TextStyle,
   TouchableOpacity,
diff --git a/apps/expo/app/(app)/messages/chat.android.tsx b/apps/expo/app/(app)/messages/chat.android.tsx
index 91f48a2540..6d6e9a12af 100644
--- a/apps/expo/app/(app)/messages/chat.android.tsx
+++ b/apps/expo/app/(app)/messages/chat.android.tsx
@@ -10,6 +10,7 @@ import {
 import { Portal } from '@rn-primitives/portal';
 import { FlashList } from '@shopify/flash-list';
 import { Icon } from 'expo-app/components/Icon';
+import { TextInput } from 'expo-app/components/TextInput';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { router, Stack } from 'expo-router';
@@ -19,7 +20,6 @@ import {
   type NativeSyntheticEvent,
   Platform,
   Pressable,
-  TextInput,
   type TextInputContentSizeChangeEventData,
   type TextStyle,
   View,
diff --git a/apps/expo/app/(app)/messages/chat.tsx b/apps/expo/app/(app)/messages/chat.tsx
index 506a6b373c..76cff39098 100644
--- a/apps/expo/app/(app)/messages/chat.tsx
+++ b/apps/expo/app/(app)/messages/chat.tsx
@@ -10,6 +10,7 @@ import {
 } from '@packrat/ui/nativewindui';
 import { FlashList } from '@shopify/flash-list';
 import { Icon } from 'expo-app/components/Icon';
+import { TextInput } from 'expo-app/components/TextInput';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { BlurView } from 'expo-blur';
@@ -21,7 +22,6 @@ import {
   type NativeSyntheticEvent,
   Platform,
   Pressable,
-  TextInput,
   type TextInputContentSizeChangeEventData,
   type TextStyle,
   View,
@@ -354,6 +354,7 @@ function ChatBubble({
 }) {
   const contextMenuRef = React.useRef<ContextMenuMethods>(null);
   const contextMenuRef2 = React.useRef<ContextMenuMethods>(null);
+
   const { colors } = useColorScheme();
   const rootStyle = useAnimatedStyle(() => {
     return {
diff --git a/apps/expo/app/(app)/textinputdebug.tsx b/apps/expo/app/(app)/textinputdebug.tsx
deleted file mode 100644
index c9aaaf2036..0000000000
--- a/apps/expo/app/(app)/textinputdebug.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Text, TextInput, View } from 'react-native';
-
-export default function TextInputDebug() {
-  return (
-    <View className="flex-1 items-center justify-center gap-4">
-      <Text className="text-2xl font-bold">TextInput Debug</Text>
-      <TextInput
-        className="w-64 rounded border border-gray-300 px-4 py-2"
-        placeholder="Type something..."
-      />
-    </View>
-  );
-}
diff --git a/apps/expo/app/(app)/trip/location-search.tsx b/apps/expo/app/(app)/trip/location-search.tsx
index 60e3bf69e7..f094d8a71d 100644
--- a/apps/expo/app/(app)/trip/location-search.tsx
+++ b/apps/expo/app/(app)/trip/location-search.tsx
@@ -1,5 +1,6 @@
 import { clientEnvs } from '@packrat/env/expo-client';
-import { ActivityIndicator, Button, SearchInput } from '@packrat/ui/nativewindui';
+import { ActivityIndicator, Button } from '@packrat/ui/nativewindui';
+import { SearchInput } from 'expo-app/components/SearchInput';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import Constants from 'expo-constants';
 import { useRouter } from 'expo-router';
diff --git a/apps/expo/app/auth/one-time-password.tsx b/apps/expo/app/auth/one-time-password.tsx
index 5da501732f..7702a0cedc 100644
--- a/apps/expo/app/auth/one-time-password.tsx
+++ b/apps/expo/app/auth/one-time-password.tsx
@@ -3,7 +3,9 @@ import { ActivityIndicator, AlertAnchor, Button, Text, TextField } from '@packra
 import { useHeaderHeight } from '@react-navigation/elements';
 import { useAuthActions } from 'expo-app/features/auth/hooks/useAuthActions';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
+import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { router, Stack, useLocalSearchParams } from 'expo-router';
 import * as React from 'react';
 import {
@@ -252,6 +254,9 @@ function OTPField({
   const { colors } = useColorScheme();
   const inputRef = React.useRef<TextInput>(null);
 
+  // Apply keyboard hide blur fix
+  useKeyboardHideBlur(asNonNullableRef(inputRef));
+
   function onKeyPress({ nativeEvent }: NativeSyntheticEvent<TextInputKeyPressEventData>) {
     if (nativeEvent.key === 'Backspace' && value === '') {
       KeyboardController.setFocusTo('prev');
diff --git a/apps/expo/components/SearchInput.tsx b/apps/expo/components/SearchInput.tsx
new file mode 100644
index 0000000000..a0eda25565
--- /dev/null
+++ b/apps/expo/components/SearchInput.tsx
@@ -0,0 +1,29 @@
+import { assertPresent } from '@packrat/guards';
+import { SearchInput as NativeWindUISearchInput } from '@packrat/ui/nativewindui';
+import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
+import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
+
+/**
+ * Enhanced SearchInput component that automatically handles keyboard hide blur fix.
+ * Drop-in replacement for NativeWindUI's SearchInput with built-in Android keyboard behavior fix.
+ */
+export const SearchInput = forwardRef<
+  React.ComponentRef<typeof NativeWindUISearchInput>,
+  React.ComponentProps<typeof NativeWindUISearchInput>
+>((props, ref) => {
+  const searchInputRef = useRef<React.ComponentRef<typeof NativeWindUISearchInput>>(null);
+
+  // Apply keyboard hide blur fix
+  useKeyboardHideBlur(asNonNullableRef(searchInputRef));
+
+  // Forward ref methods to the internal ref
+  useImperativeHandle(ref, () => {
+    assertPresent(searchInputRef.current);
+    return searchInputRef.current;
+  }, []);
+
+  return <NativeWindUISearchInput ref={searchInputRef} {...props} />;
+});
+
+SearchInput.displayName = 'SearchInput';
diff --git a/apps/expo/components/TextInput.tsx b/apps/expo/components/TextInput.tsx
new file mode 100644
index 0000000000..8dd0219ed2
--- /dev/null
+++ b/apps/expo/components/TextInput.tsx
@@ -0,0 +1,26 @@
+import { assertPresent } from '@packrat/guards';
+import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
+import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
+import { TextInput as RNTextInput, type TextInputProps } from 'react-native';
+
+/**
+ * Enhanced TextInput component that automatically handles keyboard hide blur fix.
+ * Drop-in replacement for React Native's TextInput with built-in Android keyboard behavior fix.
+ */
+export const TextInput = forwardRef<RNTextInput, TextInputProps>((props, ref) => {
+  const textInputRef = useRef<RNTextInput>(null);
+
+  // Apply keyboard hide blur fix
+  useKeyboardHideBlur(asNonNullableRef(textInputRef));
+
+  // Forward ref methods to the internal ref
+  useImperativeHandle(ref, () => {
+    assertPresent(textInputRef.current);
+    return textInputRef.current;
+  }, []);
+
+  return <RNTextInput ref={textInputRef} {...props} />;
+});
+
+TextInput.displayName = 'TextInput';
diff --git a/apps/expo/features/ai-packs/screens/AIPacksScreen.tsx b/apps/expo/features/ai-packs/screens/AIPacksScreen.tsx
index fd6230291e..e07cc33606 100644
--- a/apps/expo/features/ai-packs/screens/AIPacksScreen.tsx
+++ b/apps/expo/features/ai-packs/screens/AIPacksScreen.tsx
@@ -8,12 +8,13 @@ import {
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
 import { Icon } from 'expo-app/components/Icon';
+import { TextInput } from 'expo-app/components/TextInput';
 import { PackCard } from 'expo-app/features/packs/components/PackCard';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useRef, useState } from 'react';
-import { Modal, Platform, ScrollView, TextInput, TouchableOpacity, View } from 'react-native';
+import { Modal, Platform, ScrollView, TouchableOpacity, View } from 'react-native';
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useGeneratePacks } from '../hooks/useGeneratedPacks';
 
@@ -21,6 +22,7 @@ export function AIPacksScreen() {
   const { colors } = useColorScheme();
   const { t } = useTranslation();
   const alertRef = useRef<AlertMethods>(null);
+
   const { mutateAsync: generatePacks, isPending, generatedPacksFromStore } = useGeneratePacks();
   const [packsModalVisible, setPacksModalVisible] = useState(false);
   const router = useRouter();
@@ -61,7 +63,9 @@ export function AIPacksScreen() {
   const handleGeneratePacks = () => {
     alertRef.current?.alert({
       title: t('ai.generatePacksButton'),
-      message: t('ai.generatePacksConfirm', { count: form.getFieldValue('count') }),
+      message: t('ai.generatePacksConfirm', {
+        count: form.getFieldValue('count'),
+      }),
       materialIcon: { name: 'information-outline', color: colors.primary },
       buttons: [
         { text: t('common.cancel'), style: 'cancel' },
diff --git a/apps/expo/features/ai/components/ReportModal.tsx b/apps/expo/features/ai/components/ReportModal.tsx
index 580a8d7b95..02a4ca1fbf 100644
--- a/apps/expo/features/ai/components/ReportModal.tsx
+++ b/apps/expo/features/ai/components/ReportModal.tsx
@@ -1,10 +1,11 @@
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
+import { TextInput } from 'expo-app/components/TextInput';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
-import { Modal, ScrollView, TextInput, TouchableOpacity, View } from 'react-native';
+import { Modal, ScrollView, TouchableOpacity, View } from 'react-native';
 import { KeyboardStickyView } from 'react-native-keyboard-controller';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useReportContent } from '../hooks/useReportContent';
@@ -35,6 +36,7 @@ export function ReportModal({
   const { t } = useTranslation();
   const [selectedReason, setSelectedReason] = useState<ReportReason | null>(null);
   const [comment, setComment] = useState('');
+
   const reportContentMutation = useReportContent();
   const insets = useSafeAreaInsets();
 
diff --git a/apps/expo/features/catalog/components/CatalogBrowserModal.tsx b/apps/expo/features/catalog/components/CatalogBrowserModal.tsx
index a4ab13839e..78b36465a0 100644
--- a/apps/expo/features/catalog/components/CatalogBrowserModal.tsx
+++ b/apps/expo/features/catalog/components/CatalogBrowserModal.tsx
@@ -1,7 +1,8 @@
-import { Button, SearchInput, Text } from '@packrat/ui/nativewindui';
+import { Button, Text } from '@packrat/ui/nativewindui';
 import { searchValueAtom } from 'expo-app/atoms/itemListAtoms';
 import { CategoriesFilter } from 'expo-app/components/CategoriesFilter';
 import { Icon } from 'expo-app/components/Icon';
+import { SearchInput } from 'expo-app/components/SearchInput';
 import { HorizontalCatalogItemCard } from 'expo-app/features/packs/components/HorizontalCatalogItemCard';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
diff --git a/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx b/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx
index 096e159022..1e1b701100 100644
--- a/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx
+++ b/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx
@@ -3,6 +3,7 @@ import { Button, Text } from '@packrat/ui/nativewindui';
 import { useQueryClient } from '@tanstack/react-query';
 import * as Burnt from 'burnt';
 import { Icon } from 'expo-app/components/Icon';
+import { TextInput } from 'expo-app/components/TextInput';
 import { useCreatePackItem, usePackDetailsFromStore } from 'expo-app/features/packs';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
@@ -17,7 +18,6 @@ import {
   Platform,
   ScrollView,
   Switch,
-  TextInput,
   TouchableOpacity,
   View,
 } from 'react-native';
diff --git a/apps/expo/features/catalog/screens/PackSelectionScreen.tsx b/apps/expo/features/catalog/screens/PackSelectionScreen.tsx
index 550fb6e49c..3ed7205a48 100644
--- a/apps/expo/features/catalog/screens/PackSelectionScreen.tsx
+++ b/apps/expo/features/catalog/screens/PackSelectionScreen.tsx
@@ -1,5 +1,6 @@
-import { Button, SearchInput, Text } from '@packrat/ui/nativewindui';
+import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
+import { SearchInput } from 'expo-app/components/SearchInput';
 import { useDetailedPacks } from 'expo-app/features/packs';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
diff --git a/apps/expo/features/feed/screens/CreatePostScreen.tsx b/apps/expo/features/feed/screens/CreatePostScreen.tsx
index e696029a72..68fa39c5e1 100644
--- a/apps/expo/features/feed/screens/CreatePostScreen.tsx
+++ b/apps/expo/features/feed/screens/CreatePostScreen.tsx
@@ -1,20 +1,13 @@
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
+import { TextInput } from 'expo-app/components/TextInput';
 import { uploadImage } from 'expo-app/features/packs/utils/uploadImage';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import * as ImagePicker from 'expo-image-picker';
 import { nanoid } from 'nanoid';
 import { useCallback, useState } from 'react';
-import {
-  Alert,
-  Image,
-  Pressable,
-  ScrollView,
-  TextInput,
-  TouchableOpacity,
-  View,
-} from 'react-native';
+import { Alert, Image, Pressable, ScrollView, TouchableOpacity, View } from 'react-native';
 import { useCreatePost } from '../hooks';
 
 interface SelectedPhoto {
diff --git a/apps/expo/features/feed/screens/PostDetailScreen.tsx b/apps/expo/features/feed/screens/PostDetailScreen.tsx
index 38f668810f..890aa55f62 100644
--- a/apps/expo/features/feed/screens/PostDetailScreen.tsx
+++ b/apps/expo/features/feed/screens/PostDetailScreen.tsx
@@ -1,5 +1,6 @@
 import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
+import { TextInput } from 'expo-app/components/TextInput';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useCallback, useRef, useState } from 'react';
@@ -9,9 +10,9 @@ import {
   Image,
   KeyboardAvoidingView,
   Platform,
+  type TextInput as RNTextInput,
   ScrollView,
   StyleSheet,
-  TextInput,
   TouchableOpacity,
   View,
 } from 'react-native';
@@ -35,7 +36,7 @@ export const PostDetailScreen = ({ post, currentUserId }: PostDetailScreenProps)
   const { t } = useTranslation();
   const { colors } = useColorScheme();
   const [commentText, setCommentText] = useState('');
-  const inputRef = useRef<TextInput>(null);
+  const inputRef = useRef<RNTextInput>(null);
 
   const {
     data: commentsData,
diff --git a/apps/expo/features/guides/screens/GuidesListScreen.tsx b/apps/expo/features/guides/screens/GuidesListScreen.tsx
index e457a0e2a9..355c82ff03 100644
--- a/apps/expo/features/guides/screens/GuidesListScreen.tsx
+++ b/apps/expo/features/guides/screens/GuidesListScreen.tsx
@@ -1,10 +1,12 @@
-import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
+import { LargeTitleHeader, type LargeTitleSearchBarMethods, Text } from '@packrat/ui/nativewindui';
 import { CategoriesFilter } from 'expo-app/components/CategoriesFilter';
+import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
 import TabScreen from 'expo-app/components/TabScreen';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { useRouter } from 'expo-router';
-import { useCallback, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import { ActivityIndicator, FlatList, RefreshControl, View } from 'react-native';
 import { GuideCard } from '../components/GuideCard';
 import { useGuideCategories, useGuides, useSearchGuides } from '../hooks';
@@ -16,6 +18,7 @@ export const GuidesListScreen = () => {
   const { t } = useTranslation();
   const [searchQuery, setSearchQuery] = useState('');
   const [selectedCategory, setSelectedCategory] = useState(() => t('guides.all'));
+  const searchBarRef = useRef<LargeTitleSearchBarMethods>(null);
 
   const {
     data: categories,
@@ -112,7 +115,69 @@ export const GuidesListScreen = () => {
     );
   };
 
+  const renderSearchContent = () => {
+    if (!isSearchMode) {
+      return (
+        <View className="flex-1 items-center justify-center p-4">
+          <Text className="text-muted-foreground">{t('guides.searchGuides')}</Text>
+        </View>
+      );
+    }
+
+    if (isLoading) {
+      return (
+        <View className="flex-1 items-center justify-center p-6">
+          <ActivityIndicator className="text-primary" size="large" />
+        </View>
+      );
+    }
+
+    return (
+      <FlatList
+        data={guides}
+        keyExtractor={(item) => item.id}
+        renderItem={({ item }) => (
+          <View className="px-4 pt-4">
+            <GuideCard guide={item} onPress={() => handleGuidePress(item)} />
+          </View>
+        )}
+        ListHeaderComponent={
+          guides.length > 0 ? (
+            <View className="px-4 pt-2">
+              <Text className="text-xs text-muted-foreground">
+                {guides.length} {guides.length === 1 ? t('guides.result') : t('guides.results')}
+              </Text>
+            </View>
+          ) : null
+        }
+        ListEmptyComponent={
+          <View className="flex-1 items-center justify-center p-8">
+            <Text className="text-center text-gray-500 dark:text-gray-400">
+              {t('guides.noGuidesFound', { query: searchQuery })}
+            </Text>
+          </View>
+        }
+        ListFooterComponent={
+          isFetchingNextPageSearch ? (
+            <View className="py-4">
+              <ActivityIndicator size="small" color={colors.primary} />
+            </View>
+          ) : null
+        }
+        onEndReached={() => {
+          if (hasNextPageSearch && !isFetchingNextPageSearch) {
+            fetchNextPageSearch();
+          }
+        }}
+        onEndReachedThreshold={0.5}
+        contentContainerStyle={{ paddingBottom: 40, flexGrow: 1 }}
+      />
+    );
+  };
+
   const listHeader = () => {
+    if (isSearchMode) return null;
+
     return (
       <TabScreen useLegacySafeAreaView>
         <CategoriesFilter
@@ -132,9 +197,15 @@ export const GuidesListScreen = () => {
       <LargeTitleHeader
         title={t('guides.guides')}
         searchBar={{
-          iosHideWhenScrolling: true,
+          iosHideWhenScrolling: false,
+          ref: asNonNullableRef(searchBarRef),
           onChangeText: handleSearch,
           placeholder: t('guides.searchPlaceholder'),
+          content: (
+            <LargeTitleHeaderSearchContentContainer>
+              {renderSearchContent()}
+            </LargeTitleHeaderSearchContentContainer>
+          ),
         }}
       />
 
diff --git a/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx b/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx
index 30ac427bfd..0802d0f957 100644
--- a/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx
+++ b/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx
@@ -2,6 +2,7 @@ import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import type { LargeTitleSearchBarMethods } from '@packrat/ui/nativewindui';
 import { LargeTitleHeader, SegmentedControl } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
+import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
 import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
 import { useUser } from 'expo-app/features/auth/hooks/useUser';
 import type { PackCategory } from 'expo-app/features/packs/types';
@@ -117,16 +118,88 @@ export function PackTemplateListScreen() {
     </TouchableOpacity>
   );
 
+  const renderSearchContent = () => {
+    const isSearching = searchValue.trim().length > 0;
+
+    if (!isSearching) {
+      return (
+        <View className="flex-1 items-center justify-center p-4">
+          <Text className="text-muted-foreground">{t('packTemplates.searchTemplates')}</Text>
+        </View>
+      );
+    }
+
+    return (
+      <ScrollView contentContainerStyle={{ paddingBottom: 40 }}>
+        <View className="px-4 pt-2">
+          {filteredTemplates.length > 0 && (
+            <Text className="text-xs text-muted-foreground">
+              {filteredTemplates.length}{' '}
+              {filteredTemplates.length === 1
+                ? t('packTemplates.result')
+                : t('packTemplates.results')}
+            </Text>
+          )}
+        </View>
+
+        {filteredTemplates.map((template: PackTemplate) => (
+          <View className="px-4 pt-4" key={template.id}>
+            <PackTemplateCard templateId={template.id} onPress={handleTemplatePress} />
+          </View>
+        ))}
+
+        {filteredTemplates.length === 0 && (
+          <View className="flex-1 items-center justify-center p-8">
+            <View className="mb-4 rounded-full bg-muted p-4">
+              <Icon name="magnify" size={32} color="text-muted-foreground" />
+            </View>
+            <Text className="mb-1 text-lg font-medium text-foreground">
+              {t('packTemplates.noTemplatesFound')}
+            </Text>
+            <Text className="text-center text-muted-foreground">
+              {t('packTemplates.tryDifferentSearch')}
+            </Text>
+          </View>
+        )}
+      </ScrollView>
+    );
+  };
+
+  const listHeader = () => {
+    const isSearching = searchValue.trim().length > 0;
+    if (isSearching) return null;
+
+    return selectedTemplateTypeIndex === 0 ? (
+      <View className="bg-background">
+        <FeaturedPacksSection onTemplatePress={handleTemplatePress} />
+        <View className="px-4 pb-2">
+          <Text className="text-muted-foreground">
+            {filteredTemplates.length}{' '}
+            {filteredTemplates.length === 1
+              ? t('packTemplates.template')
+              : t('packTemplates.templates')}
+          </Text>
+        </View>
+      </View>
+    ) : undefined;
+  };
+
   return (
     <SafeAreaView className="flex-1">
       <LargeTitleHeader
         title={t('packTemplates.packTemplates')}
         searchBar={{
-          iosHideWhenScrolling: true,
+          iosHideWhenScrolling: false,
           ref: asNonNullableRef(searchBarRef),
           onChangeText(text) {
             setSearchValue(text);
           },
+          placeholder: t('packTemplates.searchPlaceholder'),
+          content: (
+            <LargeTitleHeaderSearchContentContainer>
+              {renderSearchContent()}
+            </LargeTitleHeaderSearchContentContainer>
+          ),
         }}
         rightView={() => (
           <View className="flex-row items-center">
@@ -156,23 +229,9 @@ export function PackTemplateListScreen() {
             <PackTemplateCard templateId={item.id} onPress={handleTemplatePress} />
           </View>
         )}
-        stickyHeaderIndices={[0]}
+        stickyHeaderIndices={listHeader() ? [0] : undefined}
         stickyHeaderHiddenOnScroll
-        ListHeaderComponent={
-          selectedTemplateTypeIndex === 0 ? (
-            <View className="bg-background">
-              <FeaturedPacksSection onTemplatePress={handleTemplatePress} />
-              <View className="px-4 pb-2">
-                <Text className="text-muted-foreground">
-                  {filteredTemplates.length}{' '}
-                  {filteredTemplates.length === 1
-                    ? t('packTemplates.template')
-                    : t('packTemplates.templates')}
-                </Text>
-              </View>
-            </View>
-          ) : undefined
-        }
+        ListHeaderComponent={listHeader()}
         ListEmptyComponent={
           <View className="flex-1 items-center justify-center p-8">
             <View className="mb-4 rounded-full bg-muted p-4">
diff --git a/apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx b/apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx
index 9c3a63127e..6ee4f06fe7 100644
--- a/apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx
+++ b/apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx
@@ -1,15 +1,8 @@
 import { Text } from '@packrat/ui/nativewindui';
+import { TextInput } from 'expo-app/components/TextInput';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
-import {
-  Alert,
-  KeyboardAvoidingView,
-  Platform,
-  Pressable,
-  ScrollView,
-  TextInput,
-  View,
-} from 'react-native';
+import { Alert, KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from 'react-native';
 import { useSubmitTrailConditionReport } from '../hooks/useSubmitTrailConditionReport';
 import type { OverallCondition, TrailSurface, WaterCrossingDifficulty } from '../types';
 
diff --git a/apps/expo/features/trips/components/TripForm.tsx b/apps/expo/features/trips/components/TripForm.tsx
index b35da777df..74f59f0595 100644
--- a/apps/expo/features/trips/components/TripForm.tsx
+++ b/apps/expo/features/trips/components/TripForm.tsx
@@ -112,7 +112,11 @@ export const TripForm = ({ trip }: { trip?: Trip }) => {
     } as TripFormValues,
     validators: { onChange: tripFormSchema },
     onSubmit: async ({ value }) => {
-      const submitData = { ...value, location: location ?? value.location };
+      const submitData = {
+        ...value,
+        location: location ?? value.location,
+        packId: value.packId === '' ? undefined : (value.packId ?? undefined),
+      };
       try {
         if (isEditingExistingTrip) {
           await updateTrip({ ...trip, ...submitData });
diff --git a/apps/expo/features/trips/screens/TripListScreen.tsx b/apps/expo/features/trips/screens/TripListScreen.tsx
index 0dbb1e1b36..0bf747b231 100644
--- a/apps/expo/features/trips/screens/TripListScreen.tsx
+++ b/apps/expo/features/trips/screens/TripListScreen.tsx
@@ -8,7 +8,7 @@ import { TestIds } from 'expo-app/lib/testIds';
 import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { Link, useRouter } from 'expo-router';
 import { useCallback, useMemo, useRef, useState } from 'react';
-import { FlatList, Pressable, Text, TouchableOpacity, View } from 'react-native';
+import { FlatList, Pressable, ScrollView, Text, TouchableOpacity, View } from 'react-native';
 import { TripCard } from '../components/TripCard';
 import { useTrips } from '../hooks';
 import type { Trip } from '../types';
@@ -100,19 +100,62 @@ export function TripsListScreen() {
     );
   };
 
+  const renderSearchContent = () => {
+    const isSearching = searchValue.trim().length > 0;
+
+    if (!isSearching) {
+      return (
+        <View className="flex-1 items-center justify-center p-4">
+          <Text className="text-muted-foreground">{t('trips.searchTrips')}</Text>
+        </View>
+      );
+    }
+
+    return (
+      <ScrollView contentContainerStyle={{ paddingBottom: 40 }}>
+        <View className="px-4 pt-2">
+          {filteredTrips.length > 0 && (
+            <Text className="text-xs text-muted-foreground">
+              {filteredTrips.length}{' '}
+              {filteredTrips.length === 1 ? t('trips.result') : t('trips.results')}
+            </Text>
+          )}
+        </View>
+
+        {filteredTrips.map((trip: Trip) => (
+          <View className="px-4 pt-4" key={trip.id}>
+            <TripCard trip={trip} onPress={handleTripPress} />
+          </View>
+        ))}
+
+        {filteredTrips.length === 0 && (
+          <View className="flex-1 items-center justify-center p-8">
+            <View className="mb-4 rounded-full bg-muted p-4">
+              <Icon name="magnify" size={32} color="text-muted-foreground" />
+            </View>
+            <Text className="mb-1 text-lg font-medium text-foreground">
+              {t('trips.noTripsFound')}
+            </Text>
+            <Text className="text-center text-muted-foreground">{t('trips.noSearchResults')}</Text>
+          </View>
+        )}
+      </ScrollView>
+    );
+  };
+
   return (
     <TabScreen>
       <LargeTitleHeader
         title={t('trips.trips')}
         backVisible={false}
         searchBar={{
+          iosHideWhenScrolling: false,
           ref: asNonNullableRef(searchBarRef),
           onChangeText: setSearchValue,
+          placeholder: t('trips.searchPlaceholder'),
           content: (
             <LargeTitleHeaderSearchContentContainer>
-              <View className="flex-1 items-center justify-center">
-                <Text>{t('trips.searchTrips')}</Text>
-              </View>
+              {renderSearchContent()}
             </LargeTitleHeaderSearchContentContainer>
           ),
         }}
diff --git a/apps/expo/features/weather/screens/LocationSearchScreen.tsx b/apps/expo/features/weather/screens/LocationSearchScreen.tsx
index b7da848de2..908a80c208 100644
--- a/apps/expo/features/weather/screens/LocationSearchScreen.tsx
+++ b/apps/expo/features/weather/screens/LocationSearchScreen.tsx
@@ -1,6 +1,7 @@
-import { SearchInput, Text } from '@packrat/ui/nativewindui';
+import { Text } from '@packrat/ui/nativewindui';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { Icon } from 'expo-app/components/Icon';
+import { SearchInput } from 'expo-app/components/SearchInput';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
diff --git a/apps/expo/features/weather/screens/LocationsScreen.tsx b/apps/expo/features/weather/screens/LocationsScreen.tsx
index 64dbcb8bd5..2c41b3a8ff 100644
--- a/apps/expo/features/weather/screens/LocationsScreen.tsx
+++ b/apps/expo/features/weather/screens/LocationsScreen.tsx
@@ -1,5 +1,6 @@
-import { Button, LargeTitleHeader, SearchInput, Text } from '@packrat/ui/nativewindui';
+import { Button, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
+import { SearchInput } from 'expo-app/components/SearchInput';
 import { withAuthWall } from 'expo-app/features/auth/hocs';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
diff --git a/apps/expo/features/wildlife/screens/IdentificationScreen.tsx b/apps/expo/features/wildlife/screens/IdentificationScreen.tsx
index d4d87594f5..d7359b7229 100644
--- a/apps/expo/features/wildlife/screens/IdentificationScreen.tsx
+++ b/apps/expo/features/wildlife/screens/IdentificationScreen.tsx
@@ -2,12 +2,13 @@ import { useActionSheet } from '@expo/react-native-action-sheet';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import { appAlert } from 'expo-app/app/_layout';
 import { Icon } from 'expo-app/components/Icon';
+import { TextInput } from 'expo-app/components/TextInput';
 import { useImagePicker } from 'expo-app/features/packs/hooks/useImagePicker';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, useRouter } from 'expo-router';
 import { useEffect, useRef, useState } from 'react';
-import { Image, ScrollView, TextInput, View } from 'react-native';
+import { Image, ScrollView, View } from 'react-native';
 import { SpeciesCard } from '../components/SpeciesCard';
 import { useWildlifeHistory } from '../hooks/useWildlifeHistory';
 import { useWildlifeIdentification } from '../hooks/useWildlifeIdentification';
diff --git a/apps/expo/lib/hooks/useKeyboardHideBlur.tsx b/apps/expo/lib/hooks/useKeyboardHideBlur.tsx
new file mode 100644
index 0000000000..2f0ef2bf00
--- /dev/null
+++ b/apps/expo/lib/hooks/useKeyboardHideBlur.tsx
@@ -0,0 +1,38 @@
+import { useEffect } from 'react';
+import { Keyboard } from 'react-native';
+
+/**
+ * Hook that automatically blurs a text input when the keyboard is hidden.
+ * Useful for fixing keyboard behavior issues on Android.
+ *
+ * @param textInputRef - Ref to the TextInput or SearchInput component
+ * @param options - Optional configuration
+ * @param options.enabled - Whether the hook should be active (default: true)
+ */
+export function useKeyboardHideBlur(
+  textInputRef: React.RefObject<{ blur?: () => void } | null>,
+  options?: { enabled?: boolean },
+) {
+  const { enabled = true } = options ?? {};
+
+  useEffect(() => {
+    if (!enabled) {
+      return;
+    }
+
+    const keyboardDidHideCallback = () => {
+      if (textInputRef.current?.blur) {
+        textInputRef.current.blur();
+      }
+    };
+
+    const keyboardDidHideSubscription = Keyboard.addListener(
+      'keyboardDidHide',
+      keyboardDidHideCallback,
+    );
+
+    return () => {
+      keyboardDidHideSubscription?.remove();
+    };
+  }, [textInputRef, enabled]);
+}
diff --git a/apps/expo/lib/i18n/locales/en.json b/apps/expo/lib/i18n/locales/en.json
index ae4205a0fa..17ca95a867 100644
--- a/apps/expo/lib/i18n/locales/en.json
+++ b/apps/expo/lib/i18n/locales/en.json
@@ -407,6 +407,9 @@
     "days_one": "{{count}} day",
     "days_other": "{{count}} days",
     "searchTrips": "Search trips",
+    "searchPlaceholder": "Search trips...",
+    "result": "result",
+    "results": "results",
     "dates": "Dates",
     "startDate": "Start Date",
     "endDate": "End Date",
@@ -929,6 +932,11 @@
     "useTemplate": "Use Template",
     "addItem": "Add Item",
     "allItems": "All Items",
+    "searchPlaceholder": "Search templates...",
+    "searchTemplates": "Search for templates",
+    "tryDifferentSearch": "Try a different search term",
+    "result": "result",
+    "results": "results",
     "worn": "Worn",
     "consumable": "Consumable",
     "noItemsFound": "No items found",
@@ -975,6 +983,7 @@
   "guides": {
     "guides": "Guides",
     "searchPlaceholder": "Search guides...",
+    "searchGuides": "Search for guides",
     "noGuidesFound": "No guides found for \"{{query}}\"",
     "noGuidesAvailable": "No guides available",
     "failedToLoad": "Failed to load guide",
@@ -982,7 +991,9 @@
     "browseGuides": "Browse helpful guides and tutorials",
     "by": "By",
     "updated": "Updated",
-    "all": "All"
+    "all": "All",
+    "result": "result",
+    "results": "results"
   },
   "permissions": {
     "photoLibraryTitle": "Photo Library Access Required",
diff --git a/apps/expo/package.json b/apps/expo/package.json
index 9c2655ee02..f6cf4023a7 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "packrat-expo-app",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "main": "expo-router/entry",
   "scripts": {
diff --git a/apps/guides/package.json b/apps/guides/package.json
index 064d02cb51..ff88d1fbb8 100644
--- a/apps/guides/package.json
+++ b/apps/guides/package.json
@@ -1,6 +1,6 @@
 {
   "name": "packrat-guides-app",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "scripts": {
     "build": "bun run build-content && next build",
diff --git a/apps/landing/package.json b/apps/landing/package.json
index 7819a6e559..a83bb1fc33 100644
--- a/apps/landing/package.json
+++ b/apps/landing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "packrat-landing-app",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "scripts": {
     "build": "next build",
diff --git a/bun.lock b/bun.lock
index 63be0cdbea..7103e09422 100644
--- a/bun.lock
+++ b/bun.lock
@@ -19,7 +19,7 @@
     },
     "apps/admin": {
       "name": "packrat-admin-app",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "@packrat/web-ui": "workspace:*",
         "@radix-ui/react-alert-dialog": "catalog:",
@@ -59,7 +59,7 @@
     },
     "apps/expo": {
       "name": "packrat-expo-app",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "@ai-sdk/react": "^2.0.11",
         "@expo/react-native-action-sheet": "^4.1.1",
@@ -182,7 +182,7 @@
     },
     "apps/guides": {
       "name": "packrat-guides-app",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "@ai-sdk/openai": "^2.0.11",
         "@hookform/resolvers": "^3.10.0",
@@ -265,7 +265,7 @@
     },
     "apps/landing": {
       "name": "packrat-landing-app",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "@emotion/is-prop-valid": "^1.3.1",
         "@hookform/resolvers": "^3.10.0",
@@ -330,7 +330,7 @@
     },
     "packages/analytics": {
       "name": "@packrat/analytics",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "@duckdb/node-api": "1.5.0-r.1",
         "@packrat/env": "workspace:*",
@@ -346,7 +346,7 @@
     },
     "packages/api": {
       "name": "@packrat/api",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "@ai-sdk/google": "^2.0.62",
         "@ai-sdk/openai": "^2.0.11",
@@ -400,18 +400,18 @@
     },
     "packages/api-client": {
       "name": "@packrat/api-client",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "devDependencies": {
         "typescript": "catalog:",
       },
     },
     "packages/checks": {
       "name": "@packrat/checks",
-      "version": "2.0.22",
+      "version": "2.0.23",
     },
     "packages/cli": {
       "name": "@packrat/cli",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "bin": {
         "packrat": "./src/index.ts",
       },
@@ -431,25 +431,25 @@
     },
     "packages/config": {
       "name": "@packrat/config",
-      "version": "2.0.22",
+      "version": "2.0.23",
     },
     "packages/env": {
       "name": "@packrat/env",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "zod": "catalog:",
       },
     },
     "packages/guards": {
       "name": "@packrat/guards",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "radash": "catalog:",
       },
     },
     "packages/mcp": {
       "name": "@packrat/mcp",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.11.0",
         "@packrat/api-client": "workspace:*",
@@ -467,14 +467,14 @@
     },
     "packages/ui": {
       "name": "@packrat/ui",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "@packrat-ai/nativewindui": "^2.0.2",
       },
     },
     "packages/web-ui": {
       "name": "@packrat/web-ui",
-      "version": "2.0.22",
+      "version": "2.0.23",
       "dependencies": {
         "@packrat/guards": "workspace:*",
         "@radix-ui/react-accordion": "catalog:",
@@ -4406,11 +4406,11 @@
 
     "@modelcontextprotocol/sdk/zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="],
 
-    "@packrat/analytics/@types/bun": ["@types/bun@1.3.12", "", { "dependencies": { "bun-types": "1.3.12" } }, "sha512-DBv81elK+/VSwXHDlnH3Qduw+KxkTIWi7TXkAeh24zpi5l0B2kUg9Ga3tb4nJaPcOFswflgi/yAvMVBPrxMB+A=="],
+    "@packrat/analytics/@types/bun": ["@types/bun@1.3.13", "", { "dependencies": { "bun-types": "1.3.13" } }, "sha512-9fqXWk5YIHGGnUau9TEi+qdlTYDAnOj+xLCmSTwXfAIqXr2x4tytJb43E9uCvt09zJURKXwAtkoH4nLQfzeTXw=="],
 
-    "@packrat/api/@types/bun": ["@types/bun@1.3.12", "", { "dependencies": { "bun-types": "1.3.12" } }, "sha512-DBv81elK+/VSwXHDlnH3Qduw+KxkTIWi7TXkAeh24zpi5l0B2kUg9Ga3tb4nJaPcOFswflgi/yAvMVBPrxMB+A=="],
+    "@packrat/api/@types/bun": ["@types/bun@1.3.13", "", { "dependencies": { "bun-types": "1.3.13" } }, "sha512-9fqXWk5YIHGGnUau9TEi+qdlTYDAnOj+xLCmSTwXfAIqXr2x4tytJb43E9uCvt09zJURKXwAtkoH4nLQfzeTXw=="],
 
-    "@packrat/cli/@types/bun": ["@types/bun@1.3.12", "", { "dependencies": { "bun-types": "1.3.12" } }, "sha512-DBv81elK+/VSwXHDlnH3Qduw+KxkTIWi7TXkAeh24zpi5l0B2kUg9Ga3tb4nJaPcOFswflgi/yAvMVBPrxMB+A=="],
+    "@packrat/cli/@types/bun": ["@types/bun@1.3.13", "", { "dependencies": { "bun-types": "1.3.13" } }, "sha512-9fqXWk5YIHGGnUau9TEi+qdlTYDAnOj+xLCmSTwXfAIqXr2x4tytJb43E9uCvt09zJURKXwAtkoH4nLQfzeTXw=="],
 
     "@pnpm/network.ca-file/graceful-fs": ["graceful-fs@4.2.10", "", {}, "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="],
 
@@ -5124,11 +5124,11 @@
 
     "@manypkg/tools/tinyglobby/picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="],
 
-    "@packrat/analytics/@types/bun/bun-types": ["bun-types@1.3.12", "", { "dependencies": { "@types/node": "*" } }, "sha512-HqOLj5PoFajAQciOMRiIZGNoKxDJSr6qigAttOX40vJuSp6DN/CxWp9s3C1Xwm4oH7ybueITwiaOcWXoYVoRkA=="],
+    "@packrat/analytics/@types/bun/bun-types": ["bun-types@1.3.13", "", { "dependencies": { "@types/node": "*" } }, "sha512-QXKeHLlOLqQX9LgYaHJfzdBaV21T63HhFJnvuRCcjZiaUDpbs5ED1MgxbMra71CsryN/1dAoXuJJJwIv/2drVA=="],
 
-    "@packrat/api/@types/bun/bun-types": ["bun-types@1.3.12", "", { "dependencies": { "@types/node": "*" } }, "sha512-HqOLj5PoFajAQciOMRiIZGNoKxDJSr6qigAttOX40vJuSp6DN/CxWp9s3C1Xwm4oH7ybueITwiaOcWXoYVoRkA=="],
+    "@packrat/api/@types/bun/bun-types": ["bun-types@1.3.13", "", { "dependencies": { "@types/node": "*" } }, "sha512-QXKeHLlOLqQX9LgYaHJfzdBaV21T63HhFJnvuRCcjZiaUDpbs5ED1MgxbMra71CsryN/1dAoXuJJJwIv/2drVA=="],
 
-    "@packrat/cli/@types/bun/bun-types": ["bun-types@1.3.12", "", { "dependencies": { "@types/node": "*" } }, "sha512-HqOLj5PoFajAQciOMRiIZGNoKxDJSr6qigAttOX40vJuSp6DN/CxWp9s3C1Xwm4oH7ybueITwiaOcWXoYVoRkA=="],
+    "@packrat/cli/@types/bun/bun-types": ["bun-types@1.3.13", "", { "dependencies": { "@types/node": "*" } }, "sha512-QXKeHLlOLqQX9LgYaHJfzdBaV21T63HhFJnvuRCcjZiaUDpbs5ED1MgxbMra71CsryN/1dAoXuJJJwIv/2drVA=="],
 
     "@react-native/babel-preset/@babel/plugin-transform-classes/@babel/helper-plugin-utils": ["@babel/helper-plugin-utils@7.27.1", "", {}, "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw=="],
 
diff --git a/docs/android-keyboard-focus-prevention-strategies.md b/docs/android-keyboard-focus-prevention-strategies.md
new file mode 100644
index 0000000000..db114e532f
--- /dev/null
+++ b/docs/android-keyboard-focus-prevention-strategies.md
@@ -0,0 +1,340 @@
+# Android Keyboard Focus Prevention Strategies
+
+## Overview
+This document outlines comprehensive prevention strategies to avoid Android keyboard focus persistence issues in React Native applications, particularly the issue where TextInput doesn't lose focus after dismissing the keyboard.
+
+## Current Solution Analysis 
+✅ **Already Implemented:**
+- `useKeyboardHideBlur` hook that listens for `keyboardDidHide` events
+- Enhanced `TextInput` and `SearchInput` components with automatic focus management
+- Proper component abstraction patterns
+- Consistent import patterns (no direct React Native TextInput imports)
+
+## Prevention Strategies
+
+### 1. Architectural Prevention
+
+#### 1.1 Component-Level Standards
+```typescript
+// ✅ ALWAYS use enhanced components
+import { TextInput } from 'expo-app/components/TextInput';
+import { SearchInput } from 'expo-app/components/SearchInput';
+
+// ❌ NEVER import directly from React Native
+import { TextInput } from 'react-native'; // FORBIDDEN
+```
+
+#### 1.2 Custom Hook Integration Pattern
+```typescript
+// For any new input-related components, always include the hook
+import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
+import { TextInput } from 'react-native';
+
+export const CustomInput = forwardRef<InputRef, InputProps>((props, ref) => {
+  const inputRef = useRef<TextInput | null>(null);
+
+  // REQUIRED: Apply keyboard hide blur fix
+  useKeyboardHideBlur(inputRef);
+
+  useImperativeHandle(ref, () => inputRef.current);
+  return <SomeInputComponent ref={inputRef} {...props} />;
+});
+```
+
+#### 1.3 Third-Party Component Wrapping
+```typescript
+// When integrating third-party input components, auto-wrap them
+import { SomeThirdPartyInput } from 'some-library';
+
+export const WrappedThirdPartyInput = forwardRef((props, ref) => {
+  const inputRef = useRef(null);
+  useKeyboardHideBlur(inputRef); // Always add this
+  useImperativeHandle(ref, () => inputRef.current);
+  return <SomeThirdPartyInput ref={inputRef} {...props} />;
+});
+```
+
+### 2. Process-Based Prevention
+
+#### 2.1 Code Review Checklist
+**Mandatory checks for any PR containing input elements:**
+
+- [ ] Does the component use the enhanced `TextInput`/`SearchInput` from `expo-app/components/`?
+- [ ] Is there any direct import from `react-native` for TextInput?
+- [ ] If creating a new input component, does it use `useKeyboardHideBlur`?
+- [ ] Are there any third-party input components that need wrapping?
+- [ ] Has the component been tested on Android with keyboard dismiss scenarios?
+- [ ] Does the component handle ref forwarding correctly?
+
+#### 2.2 ESLint Custom Rules
+Add to ESLint config:
+```json
+{
+  "rules": {
+    "no-direct-textinput-import": "error"
+  }
+}
+```
+
+### 3. Best Practices for TextInput Implementation
+
+#### 3.1 Component Design Patterns
+```typescript
+// ✅ PREFERRED: Enhanced component pattern
+export const FormInput = forwardRef<TextInputRef, FormInputProps>((props, ref) => {
+  const inputRef = useRef<TextInputRef>(null);
+  
+  // Auto-apply Android keyboard fix
+  useKeyboardHideBlur(inputRef);
+  
+  // Handle validation, formatting, etc.
+  const { error, ...inputProps } = processProps(props);
+  
+  useImperativeHandle(ref, () => inputRef.current!);
+  
+  return (
+    <View>
+      <TextInput ref={inputRef} {...inputProps} />
+      {error && <ErrorText>{error}</ErrorText>}
+    </View>
+  );
+});
+
+// ✅ ACCEPTABLE: Hook usage in existing components  
+export const LegacyForm = () => {
+  const inputRef = useRef(null);
+  useKeyboardHideBlur(inputRef); // Retrofit existing components
+  
+  return <TextInput ref={inputRef} />;
+};
+```
+
+#### 3.2 Ref Management Best Practices
+```typescript
+// ✅ CORRECT: Proper ref typing
+const inputRef = useRef<TextInput>(null);
+
+// ✅ CORRECT: Forward refs properly
+useImperativeHandle(ref, () => inputRef.current!);
+
+// ❌ AVOID: Any typing that loses ref methods
+const inputRef = useRef<any>(null);
+```
+
+#### 3.3 Props Extension Pattern
+```typescript
+// When creating component library extensions
+interface EnhancedTextInputProps extends TextInputProps {
+  autoKeyboardDismiss?: boolean; // Allow opting out if needed
+}
+
+export const EnhancedTextInput = forwardRef<TextInput, EnhancedTextInputProps>(
+  ({ autoKeyboardDismiss = true, ...props }, ref) => {
+    const inputRef = useRef<TextInput>(null);
+
+    // Always call hook unconditionally, use enabled flag to control behavior
+    useKeyboardHideBlur(inputRef, { enabled: autoKeyboardDismiss });
+
+    useImperativeHandle(ref, () => inputRef.current!);
+    return <RNTextInput ref={inputRef} {...props} />;
+  }
+);
+```
+
+### 4. Testing Strategies
+
+#### 4.1 Unit Tests for Hook Behavior
+```typescript
+// __tests__/useKeyboardHideBlur.test.ts
+import { renderHook } from '@testing-library/react-native';
+import { Keyboard } from 'react-native';
+import { useKeyboardHideBlur } from '../useKeyboardHideBlur';
+
+describe('useKeyboardHideBlur', () => {
+  it('should blur input when keyboard hides', () => {
+    const mockBlur = jest.fn();
+    const mockRef = { current: { blur: mockBlur } };
+    let capturedCallback: (() => void) | undefined;
+
+    jest.spyOn(Keyboard, 'addListener').mockImplementation((event, callback) => {
+      expect(event).toBe('keyboardDidHide');
+      capturedCallback = callback;
+      return { remove: jest.fn() };
+    });
+
+    renderHook(() => useKeyboardHideBlur(mockRef));
+
+    // Invoke the captured callback to simulate keyboard hide
+    capturedCallback?.();
+
+    expect(mockBlur).toHaveBeenCalled();
+  });
+  
+  it('should clean up listener on unmount', () => {
+    const mockRef = { current: { blur: jest.fn() } };
+    const mockRemove = jest.fn();
+
+    jest.spyOn(Keyboard, 'addListener').mockImplementation(() => ({
+      remove: mockRemove,
+    }));
+
+    const { unmount } = renderHook(() => useKeyboardHideBlur(mockRef));
+    unmount();
+
+    expect(mockRemove).toHaveBeenCalled();
+  });
+});
+```
+
+#### 4.2 Integration Tests for Components
+```typescript
+// __tests__/TextInput.integration.test.tsx
+import { render, fireEvent } from '@testing-library/react-native';
+import { Keyboard } from 'react-native';
+import { TextInput } from '../components/TextInput';
+
+describe('Enhanced TextInput', () => {
+  it('should automatically blur on keyboard dismiss', async () => {
+    let capturedCallback: (() => void) | undefined;
+    jest.spyOn(Keyboard, 'addListener').mockImplementation((event, callback) => {
+      expect(event).toBe('keyboardDidHide');
+      capturedCallback = callback;
+      return { remove: jest.fn() };
+    });
+
+    const { getByTestId } = render(
+      <TextInput testID="input" placeholder="Test input" />
+    );
+    
+    const input = getByTestId('input');
+    
+    // Focus the input
+    fireEvent(input, 'focus');
+    
+    // Simulate keyboard dismissal by invoking the captured listener callback
+    capturedCallback?.();
+    
+    // Verify blur was called (you may need to mock the blur method)
+    expect(input.props.onBlur).toHaveBeenCalled();
+  });
+});
+```
+
+#### 4.3 E2E Test Scenarios
+```typescript
+// e2e/keyboard-behavior.e2e.ts
+describe('Android Keyboard Behavior', () => {
+  it('should properly dismiss keyboard on Android', async () => {
+    await device.launchApp({ newInstance: true });
+    
+    // Find and tap input
+    await element(by.id('search-input')).tap();
+    await expect(element(by.id('search-input'))).toBeFocused();
+    
+    // Type text
+    await element(by.id('search-input')).typeText('test query');
+    
+    // Dismiss keyboard via back button (Android specific)
+    await device.pressBack();
+    
+    // Verify input loses focus and keyboard can reopen
+    await element(by.id('search-input')).tap();
+    await expect(element(by.id('search-input'))).toBeFocused();
+    
+    // Type more text to verify keyboard reopened properly
+    await element(by.id('search-input')).typeText('more text');
+  });
+});
+```
+
+### 5. Developer Guidelines
+
+#### 5.1 Onboarding Checklist
+**For new developers:**
+- [ ] Understand the Android keyboard focus persistence issue
+- [ ] Know where to find enhanced TextInput components
+- [ ] Understand when and how to use `useKeyboardHideBlur`
+- [ ] Review existing component patterns in the codebase
+- [ ] Test any input-related changes on Android emulator/device
+
+#### 5.2 Component Creation Workflow
+1. **Planning Phase**: Identify if component involves text input
+2. **Implementation**: Use enhanced components or add `useKeyboardHideBlur`
+3. **Testing**: Test keyboard behavior on Android specifically
+4. **Code Review**: Follow checklist above
+5. **Documentation**: Update component docs with keyboard behavior notes
+
+#### 5.3 Documentation Standards
+```typescript
+/**
+ * Enhanced SearchInput with automatic Android keyboard fix.
+ * 
+ * @example
+ * ```tsx
+ * <SearchInput 
+ *   placeholder="Search items..."
+ *   onChangeText={handleSearch}
+ *   // Keyboard will auto-dismiss properly on Android
+ * />
+ * ```
+ * 
+ * @note Automatically handles Android keyboard focus persistence via useKeyboardHideBlur
+ */
+```
+
+### 6. Code Review Guidelines
+
+#### 6.1 High-Risk Areas to Review
+- Any new component containing "Input", "Field", or "Text" in the name
+- Third-party library integrations with text input capabilities
+- Form components and validation libraries
+- Search and filter implementations
+- Chat/messaging input components
+
+#### 6.2 Review Questions
+1. "Does this component handle Android keyboard dismiss correctly?"
+2. "Would a user need to restart the app to use keyboard again?"
+3. "Is this component tested on Android devices/emulators?"
+4. "Does this follow our established input component patterns?"
+
+### 7. Monitoring and Maintenance
+
+#### 7.1 Telemetry Considerations
+```typescript
+// Optional: Track keyboard behavior issues
+export function trackKeyboardIssue(component: string, action: string) {
+  Analytics.track('keyboard_behavior', {
+    component,
+    action,
+    platform: Platform.OS,
+  });
+}
+```
+
+#### 7.2 Regular Audits
+- Monthly review of new input components
+- Quarterly Android-specific testing sessions  
+- Annual review of prevention strategies effectiveness
+
+## Implementation Roadmap
+
+### Phase 1: Immediate (Next Sprint)
+- [ ] Create ESLint rule for direct react-native TextInput imports
+- [ ] Update team documentation with these guidelines
+- [ ] Add code review checklist to PR template
+
+### Phase 2: Short-term (Next Month)
+- [ ] Implement unit tests for existing hook
+- [ ] Create integration tests for enhanced components
+- [ ] Add E2E tests for keyboard behavior
+- [ ] Audit existing components for compliance
+
+### Phase 3: Long-term (Next Quarter)
+- [ ] Create developer onboarding materials
+- [ ] Implement telemetry tracking (if desired)
+- [ ] Review and update strategies based on real-world usage
+- [ ] Consider contributing solution back to React Native community
+
+## Conclusion
+
+These prevention strategies build on your existing solid foundation to create a comprehensive system that should prevent Android keyboard focus persistence issues from occurring in future development. The key is making the correct patterns easy to use and the incorrect patterns hard to implement accidentally.
\ No newline at end of file
diff --git a/docs/android-keyboard-prevention-implementation-summary.md b/docs/android-keyboard-prevention-implementation-summary.md
new file mode 100644
index 0000000000..a87d6e8520
--- /dev/null
+++ b/docs/android-keyboard-prevention-implementation-summary.md
@@ -0,0 +1,153 @@
+# Android Keyboard Focus Prevention - Implementation Summary
+
+## What Was Implemented
+
+This package provides comprehensive prevention strategies for Android keyboard focus persistence issues in React Native applications. The solution builds on your existing `useKeyboardHideBlur` hook and enhanced components.
+
+## 🚀 Quick Start
+
+### For Developers
+1. **Always use enhanced components:**
+   ```typescript
+   import { TextInput } from 'expo-app/components/TextInput';
+   import { SearchInput } from 'expo-app/components/SearchInput';
+   ```
+
+2. **For new input components, add the fix:**
+   ```typescript
+   import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
+   
+   export const MyInput = forwardRef((props, ref) => {
+     const inputRef = useRef(null);
+     useKeyboardHideBlur(inputRef); // ← Always add this
+     useImperativeHandle(ref, () => inputRef.current);
+     return <SomeInput ref={inputRef} {...props} />;
+   });
+   ```
+
+### For Code Reviewers
+Use the [Android TextInput Checklist](./android-textinput-checklist.md) for any PR with input components.
+
+## 📁 Files Added
+
+### Documentation
+- `docs/android-keyboard-focus-prevention-strategies.md` - Comprehensive prevention strategies
+- `docs/android-textinput-checklist.md` - Developer and reviewer checklist
+
+### Automation
+- `lefthook.yml` - Pre-commit linting via Biome
+
+## 🔧 Setup Instructions
+
+### 1. Pre-commit Checks
+The lefthook configuration runs Biome linting automatically on commit. No additional setup is required.
+
+## ⚠️ Migration Notes
+
+### Existing Code is Already Compliant
+Your codebase already follows good patterns:
+- ✅ Enhanced `TextInput` and `SearchInput` components exist
+- ✅ `useKeyboardHideBlur` hook is properly implemented
+- ✅ Migration complete as of 2026-04-21 - all TextInput imports updated to use enhanced components
+- ✅ Consistent component patterns in use
+
+### No Breaking Changes
+All new files are additions - no existing code needs to change.
+
+## 🎯 Prevention Strategy Summary
+
+### Architectural Prevention
+- Enhanced component pattern (already implemented)
+- Automatic hook integration in wrapper components
+- Third-party component wrapping guidelines
+
+### Process Prevention
+- Code review checklist for input-related PRs
+
+### Testing Prevention
+- Add unit tests for new hook behavior following patterns in `docs/android-keyboard-focus-prevention-strategies.md`
+- Add integration tests for new component behavior
+- Verify keyboard behavior manually on Android device/emulator
+
+## 📊 Impact Assessment
+
+### Low Risk
+- All changes are additive
+- Builds on existing working solution
+- No existing functionality modified
+
+### High Value
+- Prevents entire class of Android keyboard issues
+- Catches problems before they reach production
+- Provides clear guidance for developers
+
+## 🛠️ Maintenance
+
+### Regular Tasks
+- Review new input components monthly
+- Update prevention strategies based on lessons learned
+
+### When Adding New Input Libraries
+1. Create wrapper component with `useKeyboardHideBlur`
+2. Add tests for the wrapper
+3. Update documentation with library-specific notes
+4. Test thoroughly on Android
+
+## 🚨 Troubleshooting
+
+### If Linting Fails on Commit
+1. Check the error message for specific issues
+2. Run `bun lint` to auto-fix where possible
+3. Commit with `--no-verify` to bypass for emergencies
+
+### If New Keyboard Issues Appear
+1. Verify the component uses enhanced TextInput or has `useKeyboardHideBlur`
+2. Check if it's a third-party component that needs wrapping
+3. Test the fix on Android device/emulator
+4. Update prevention strategies if needed
+
+## 🎉 Success Metrics
+
+Track these to measure prevention success:
+- Zero Android keyboard focus issues in new releases
+- Reduced keyboard-related bug reports
+- Faster development cycles for input-heavy features
+- High team adoption of enhanced components
+
+## 📚 Educational Resources
+
+### For New Team Members
+1. Read: `docs/android-keyboard-focus-prevention-strategies.md`
+2. Review: Existing enhanced components
+3. Practice: Create a simple input component following patterns
+4. Test: Run the component on Android
+
+### For Code Reviews
+Use the checklist in `docs/android-textinput-checklist.md` for efficient reviews.
+
+## 🔄 Next Steps
+
+### Immediate (This Sprint)
+- [ ] Share this summary with the team
+- [ ] Review the documentation together
+- [ ] Start using checklist for input-related PRs
+
+### Short-term (Next Month)
+- [ ] Create team training session on Android keyboard behavior
+- [ ] Add prevention strategies to team documentation
+- [ ] Monitor for any issues with new implementation
+
+### Long-term (Next Quarter)
+- [ ] Evaluate effectiveness of prevention strategies
+- [ ] Consider contributing solution to React Native community
+- [ ] Update strategies based on real-world usage
+
+---
+
+## Questions?
+
+For questions about this implementation:
+1. Check the comprehensive docs in `docs/android-keyboard-focus-prevention-strategies.md`
+2. Review the checklist in `docs/android-textinput-checklist.md`
+3. Look at existing enhanced components for patterns
+4. Test changes thoroughly on Android devices/emulators
\ No newline at end of file
diff --git a/docs/android-textinput-checklist.md b/docs/android-textinput-checklist.md
new file mode 100644
index 0000000000..5928d8e19b
--- /dev/null
+++ b/docs/android-textinput-checklist.md
@@ -0,0 +1,168 @@
+# Android TextInput Development Checklist
+
+Use this checklist for any PR that involves text input components to prevent Android keyboard focus persistence issues.
+
+## Pre-Development Checklist
+
+- [ ] I understand the Android keyboard focus persistence issue
+- [ ] I know to use enhanced components from `expo-app/components/`
+- [ ] I have reviewed existing patterns in the codebase
+- [ ] I have access to an Android device or emulator for testing
+
+## Implementation Checklist
+
+### For New Input Components
+- [ ] Used `import { TextInput } from 'expo-app/components/TextInput'` instead of React Native
+- [ ] Used `import { SearchInput } from 'expo-app/components/SearchInput'` for search functionality
+- [ ] If creating custom input component, included `useKeyboardHideBlur(inputRef)`
+- [ ] Added proper ref forwarding with `useImperativeHandle`
+- [ ] Component follows forwardRef pattern: `forwardRef<RefType, PropsType>`
+
+### For Third-Party Components
+- [ ] Third-party input component is wrapped with enhanced functionality
+- [ ] Applied `useKeyboardHideBlur` hook to third-party component refs
+- [ ] Tested keyboard behavior with third-party component on Android
+- [ ] Documented any special handling required
+
+### For Form Components
+- [ ] All text inputs use enhanced components
+- [ ] Form validation doesn't interfere with keyboard management
+- [ ] Multiple inputs handle focus transitions properly
+- [ ] Submit/done actions work after keyboard dismissal
+
+## Code Review Checklist
+
+### Imports Review
+- [ ] No direct `import { TextInput } from 'react-native'` found
+- [ ] All input components use enhanced versions
+- [ ] Third-party input libraries properly wrapped
+
+### Component Structure Review
+- [ ] New input components use `useKeyboardHideBlur` hook
+- [ ] Refs are properly typed and forwarded
+- [ ] Component follows established patterns
+- [ ] Props are properly typed and passed through
+
+### Android-Specific Review
+- [ ] Component handles keyboard dismiss events
+- [ ] Focus state is properly managed
+- [ ] No infinite focus loops possible
+- [ ] Works with Android hardware back button
+
+## Testing Checklist
+
+### Unit Tests
+- [ ] Component renders correctly
+- [ ] Ref forwarding works properly
+- [ ] `useKeyboardHideBlur` hook is applied
+- [ ] Props are passed through correctly
+- [ ] Event handlers work as expected
+
+### Integration Tests
+- [ ] Component integrates with form libraries
+- [ ] Keyboard events trigger expected behaviors
+- [ ] Focus state changes are handled
+- [ ] Multiple inputs work together
+
+### Manual Testing (Android Required)
+- [ ] **Initial focus works**: Tap input → keyboard appears → can type
+- [ ] **Keyboard dismiss works**: Press back button → keyboard disappears
+- [ ] **Refocus works**: Tap input again → keyboard reappears → can type
+- [ ] **Multiple dismissals work**: Repeat dismiss/refocus 3+ times
+- [ ] **Text persistence**: Text remains after keyboard dismissal
+- [ ] **Form flows work**: Tab between inputs, submit forms
+- [ ] **Navigation works**: Navigate away/back with focused input
+
+### Edge Case Testing
+- [ ] Rapid focus changes don't break behavior
+- [ ] Screen rotation maintains proper behavior
+- [ ] App backgrounding/foregrounding works
+- [ ] Memory pressure doesn't affect keyboard behavior
+
+## Performance Checklist
+- [ ] No memory leaks from keyboard listeners
+- [ ] Smooth keyboard animations
+- [ ] No performance degradation after multiple uses
+- [ ] Proper cleanup in useEffect hooks
+
+## Documentation Checklist
+- [ ] Component documentation mentions Android keyboard behavior
+- [ ] Props and ref usage clearly documented
+- [ ] Examples show proper implementation
+- [ ] Breaking changes (if any) are documented
+
+## Deployment Checklist
+- [ ] Changes tested on Android device/emulator
+- [ ] No regressions on iOS
+- [ ] Edge cases tested in production-like environment
+- [ ] Analytics/monitoring set up (if applicable)
+
+## Post-Deployment Checklist
+- [ ] Monitor for any keyboard-related bug reports
+- [ ] Verify analytics show expected keyboard usage patterns
+- [ ] Team feedback collected on new patterns
+- [ ] Documentation updated based on lessons learned
+
+## Emergency Rollback Checklist
+If keyboard issues are discovered in production:
+
+- [ ] Identify affected components
+- [ ] Apply `useKeyboardHideBlur` as hotfix
+- [ ] Test fix on Android
+- [ ] Deploy hotfix
+- [ ] Update prevention strategies based on incident
+
+## Tools and Commands
+
+```bash
+# Run unit tests
+bun test:expo 
+
+# Test specific component
+bun test TextInput.test.tsx
+
+# Run E2E tests (Android)
+bun test:e2e:android
+
+# Lint for input-related issues
+bun lint --fix
+```
+
+## Common Mistakes to Avoid
+
+❌ **Don't do this:**
+```typescript
+import { TextInput } from 'react-native';  // Direct import
+<TextInput onChangeText={...} />  // No ref
+```
+
+✅ **Do this instead:**
+```typescript
+import { TextInput } from 'expo-app/components/TextInput';
+const ref = useRef(null);
+<TextInput ref={ref} onChangeText={...} />
+```
+
+❌ **Don't do this:**
+```typescript
+// Custom input without keyboard fix
+export const MyInput = (props) => (
+  <SomeInputComponent {...props} />
+);
+```
+
+✅ **Do this instead:**
+```typescript
+export const MyInput = forwardRef((props, ref) => {
+  const inputRef = useRef(null);
+  useKeyboardHideBlur(inputRef);  // Always add this
+  useImperativeHandle(ref, () => inputRef.current);
+  return <SomeInputComponent ref={inputRef} {...props} />;
+});
+```
+
+## Resources
+- [Prevention Strategies Document](./android-keyboard-focus-prevention-strategies.md)
+- [useKeyboardHideBlur Hook](../apps/expo/lib/hooks/useKeyboardHideBlur.tsx)
+- [Enhanced TextInput Component](../apps/expo/components/TextInput.tsx)
+- [Enhanced SearchInput Component](../apps/expo/components/SearchInput.tsx)
\ No newline at end of file
diff --git a/docs/solutions/ui-bugs/android-textinput-keyboard-focus-loss.md b/docs/solutions/ui-bugs/android-textinput-keyboard-focus-loss.md
new file mode 100644
index 0000000000..7af27b181c
--- /dev/null
+++ b/docs/solutions/ui-bugs/android-textinput-keyboard-focus-loss.md
@@ -0,0 +1,347 @@
+---
+title: "Android TextInput Focus Persists After Keyboard Dismissal"
+category: ui-bugs
+date: 2026-04-21
+tags:
+  - android
+  - keyboard
+  - textinput
+  - focus
+  - nativewindui
+  - react-native
+  - user-experience
+affected_components:
+  - React Native TextInput
+  - NativeWindUI SearchInput
+platforms:
+  - Android
+severity: medium
+problem_type: platform-specific-behavior
+symptoms:
+  - TextInput retains focus after keyboard dismissal
+  - Keyboard fails to reappear on subsequent focus attempts
+  - Inconsistent keyboard behavior flow
+impact:
+  - Degraded user input experience
+  - Potential user confusion about input state
+  - Platform inconsistency (Android vs iOS behavior)
+reproducibility: consistent
+environment:
+  - React Native 0.81
+  - Expo 54
+  - NativeWindUI
+  - Android platform
+---
+
+# Android TextInput Focus Persists After Keyboard Dismissal
+
+## Problem Description
+
+On Android, TextInput and SearchInput components retain focus after the keyboard is dismissed through system gestures (back button, tapping outside, or swipe gestures). This creates a broken user experience where:
+
+1. The text input appears visually focused but the keyboard is hidden
+2. Subsequent taps on the input fail to bring the keyboard back
+3. Users must tap elsewhere to blur the input, then tap again to refocus and show the keyboard
+
+This behavior is inconsistent with iOS, which automatically manages focus when the keyboard is dismissed.
+
+## Root Cause Analysis
+
+**Root Cause**: React Native's Android implementation doesn't automatically blur TextInput components when the keyboard is dismissed via system interactions, unlike iOS which handles this automatically.
+
+The issue occurs because:
+- Android's keyboard dismissal events don't automatically trigger React Native's blur behavior
+- TextInput components maintain their focused state even when the keyboard is no longer visible
+- The disconnect between keyboard visibility and focus state causes subsequent interaction failures
+
+## Solution
+
+### Core Implementation: useKeyboardHideBlur Hook
+
+Created a custom hook that listens for keyboard dismissal and automatically blurs text inputs:
+
+```tsx
+// apps/expo/lib/hooks/useKeyboardHideBlur.tsx
+import { useEffect } from 'react';
+import { Keyboard } from 'react-native';
+
+/**
+ * Hook that automatically blurs a text input when the keyboard is hidden.
+ * Useful for fixing keyboard behavior issues on Android.
+ *
+ * @param textInputRef - Ref to the TextInput or SearchInput component
+ * @param options - Optional configuration
+ * @param options.enabled - Whether the hook should be active (default: true)
+ */
+export function useKeyboardHideBlur(
+  textInputRef: React.RefObject<{ blur?: () => void } | null>,
+  options?: { enabled?: boolean },
+) {
+  const { enabled = true } = options ?? {};
+
+  useEffect(() => {
+    if (!enabled) {
+      return;
+    }
+
+    const keyboardDidHideCallback = () => {
+      if (textInputRef.current?.blur) {
+        textInputRef.current.blur();
+      }
+    };
+
+    const keyboardDidHideSubscription = Keyboard.addListener(
+      'keyboardDidHide',
+      keyboardDidHideCallback,
+    );
+
+    return () => {
+      keyboardDidHideSubscription?.remove();
+    };
+  }, [textInputRef, enabled]);
+}
+```
+
+### Enhanced Components
+
+#### Enhanced TextInput Component
+
+```tsx
+// apps/expo/components/TextInput.tsx
+import { assertPresent } from '@packrat/guards';
+import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
+import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
+import { TextInput as RNTextInput, type TextInputProps } from 'react-native';
+
+/**
+ * Enhanced TextInput component that automatically handles keyboard hide blur fix.
+ * Drop-in replacement for React Native's TextInput with built-in Android keyboard behavior fix.
+ */
+export const TextInput = forwardRef<RNTextInput, TextInputProps>((props, ref) => {
+  const textInputRef = useRef<RNTextInput>(null);
+
+  // Apply keyboard hide blur fix
+  useKeyboardHideBlur(asNonNullableRef(textInputRef));
+
+  // Forward ref methods to the internal ref
+  useImperativeHandle(ref, () => {
+    assertPresent(textInputRef.current);
+    return textInputRef.current;
+  }, []);
+
+  return <RNTextInput ref={textInputRef} {...props} />;
+});
+
+TextInput.displayName = 'TextInput';
+```
+
+#### Enhanced SearchInput Component
+
+```tsx
+// apps/expo/components/SearchInput.tsx
+import { assertPresent } from '@packrat/guards';
+import { SearchInput as NativeWindUISearchInput } from '@packrat/ui/nativewindui';
+import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
+import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
+
+/**
+ * Enhanced SearchInput component that automatically handles keyboard hide blur fix.
+ * Drop-in replacement for NativeWindUI's SearchInput with built-in Android keyboard behavior fix.
+ */
+export const SearchInput = forwardRef<
+  React.ComponentRef<typeof NativeWindUISearchInput>,
+  React.ComponentProps<typeof NativeWindUISearchInput>
+>((props, ref) => {
+  const searchInputRef = useRef<React.ComponentRef<typeof NativeWindUISearchInput>>(null);
+
+  // Apply keyboard hide blur fix
+  useKeyboardHideBlur(asNonNullableRef(searchInputRef));
+
+  // Forward ref methods to the internal ref
+  useImperativeHandle(ref, () => {
+    assertPresent(searchInputRef.current);
+    return searchInputRef.current;
+  }, []);
+
+  return <NativeWindUISearchInput ref={searchInputRef} {...props} />;
+});
+
+SearchInput.displayName = 'SearchInput';
+```
+
+### Usage Examples
+
+#### Drop-in Component Replacement
+
+```tsx
+// Before
+import { TextInput } from 'react-native';
+
+// After
+import { TextInput } from 'expo-app/components/TextInput';
+
+// No other changes needed - same API
+<TextInput
+  placeholder="Enter text..."
+  value={value}
+  onChangeText={setValue}
+/>
+```
+
+#### Direct Hook Usage for Complex Components
+
+```tsx
+// apps/expo/app/auth/one-time-password.tsx
+function OTPField({ /* props */ }) {
+  const inputRef = React.useRef<TextInput>(null);
+  
+  // Apply keyboard hide blur fix
+  useKeyboardHideBlur(inputRef);
+  
+  return (
+    <TextField
+      ref={inputRef}
+      value={value}
+      // ... other props
+    />
+  );
+}
+```
+
+## Implementation Details
+
+### Systematic Application
+
+The solution was applied systematically across the codebase:
+
+1. **Enhanced Components**: Created drop-in replacements for common input components
+   - `apps/expo/components/TextInput.tsx`
+   - `apps/expo/components/SearchInput.tsx`
+
+2. **Import Updates**: Updated all TextInput/SearchInput imports throughout the app:
+   - Authentication screens
+   - Chat interfaces  
+   - Search functionality
+   - Form components
+   - Content creation screens
+
+3. **Direct Hook Usage**: Applied directly in complex components that couldn't use enhanced wrappers:
+   - OTP input fields (`apps/expo/app/auth/one-time-password.tsx`)
+   - Custom form implementations
+
+### Files Modified
+
+**New Files Created:**
+- `apps/expo/lib/hooks/useKeyboardHideBlur.tsx` - Core hook implementation
+- `apps/expo/components/TextInput.tsx` - Enhanced TextInput component
+- `apps/expo/components/SearchInput.tsx` - Enhanced SearchInput component
+
+**Files Updated:**
+- `apps/expo/app/(app)/ai-chat.tsx`
+- `apps/expo/app/(app)/messages/chat.tsx` 
+- `apps/expo/app/(app)/messages/chat.android.tsx`
+- `apps/expo/app/(app)/textinputdebug.tsx`
+- `apps/expo/app/auth/one-time-password.tsx`
+- `apps/expo/features/weather/screens/LocationsScreen.tsx`
+- `apps/expo/features/weather/screens/LocationSearchScreen.tsx`
+- `apps/expo/features/feed/screens/PostDetailScreen.tsx`
+- `apps/expo/features/feed/screens/CreatePostScreen.tsx`
+- `apps/expo/features/ai/components/ReportModal.tsx`
+- `apps/expo/features/ai-packs/screens/AIPacksScreen.tsx`
+- `apps/expo/features/catalog/components/CatalogBrowserModal.tsx`
+- `apps/expo/features/catalog/screens/PackSelectionScreen.tsx`
+- `apps/expo/features/wildlife/screens/IdentificationScreen.tsx`
+- `apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx`
+- `apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx`
+- `apps/expo/app/(app)/trip/location-search.tsx`
+
+## Prevention Strategies
+
+### 1. Architectural Prevention
+
+**Use Enhanced Components by Default**
+- Always import TextInput from `expo-app/components/TextInput`
+- Always import SearchInput from `expo-app/components/SearchInput`
+- These components include the fix automatically
+
+**Component Enhancement Pattern**
+- When wrapping third-party input components, include `useKeyboardHideBlur`
+- Follow the forwardRef pattern to maintain API compatibility
+- Use `useImperativeHandle` to properly forward ref methods
+
+### 2. Development Guidelines
+
+**For New Components:**
+```tsx
+// ✅ Correct - Use enhanced components
+import { TextInput } from 'expo-app/components/TextInput';
+
+// ❌ Wrong - Direct React Native import
+import { TextInput } from 'react-native';
+```
+
+**For Complex Custom Inputs:**
+```tsx
+// ✅ Correct - Apply hook directly
+const inputRef = useRef(null);
+useKeyboardHideBlur(inputRef);
+
+// ❌ Wrong - No keyboard blur handling
+const inputRef = useRef(null);
+```
+
+### 3. Testing Recommendations
+
+**Unit Tests:**
+- Test that `useKeyboardHideBlur` properly subscribes to keyboard events
+- Verify that blur() is called when keyboard hides
+- Test that event listeners are cleaned up properly
+
+**Integration Tests:**
+- Test enhanced components maintain TextInput API compatibility
+- Verify ref forwarding works correctly
+- Test that existing component behavior is preserved
+
+**E2E Tests:**
+- Test keyboard dismissal via back button on Android
+- Test keyboard dismissal via tapping outside input
+- Verify keyboard reappears on subsequent input focus
+
+### 4. Code Review Checklist
+
+- [ ] New TextInput components use enhanced wrapper or `useKeyboardHideBlur` hook
+- [ ] Imports are from `expo-app/components/TextInput` not `react-native`
+- [ ] SearchInput imports are from `expo-app/components/SearchInput` not `@packrat/ui/nativewindui`
+- [ ] Refs are properly forwarded if component wrapping is needed
+- [ ] No direct keyboard event listeners that could conflict
+
+## Related Issues
+
+- **GitHub Issue #1424**: Related search behavior issue in LocationsScreen
+- **General Focus Management**: This solution addresses platform-specific focus issues that affect multiple input types
+
+## Cross References
+
+- **Architecture**: [CLAUDE.md](../../../CLAUDE.md#L79-L96) - Mobile app architecture patterns
+- **Testing**: [TESTING.md](../../../TESTING.md#L57-L61) - Mobile component testing patterns
+- **Component Patterns**: Enhanced component pattern can be applied to other third-party UI components
+
+## Verification
+
+The solution successfully resolves the Android keyboard focus issue:
+
+✅ **Automatic Focus Management**: Text inputs automatically lose focus when keyboard is dismissed  
+✅ **Consistent Behavior**: Keyboard reappears reliably on subsequent taps  
+✅ **Zero Breaking Changes**: Drop-in replacements maintain full API compatibility  
+✅ **Performance**: Minimal overhead - single event listener per input  
+✅ **Cross-Platform**: Safe on iOS, fixes Android behavior  
+✅ **Comprehensive Coverage**: Applied across authentication, chat, search, and form components  
+
+## Future Considerations
+
+1. **Monitor React Native Updates**: Future RN versions may fix this behavior natively
+2. **Extend Pattern**: Apply similar enhancement patterns to other third-party input components  
+3. **Testing Framework**: Consider adding automated tests that verify keyboard behavior on Android devices
+4. **Documentation**: Update component style guides to reference enhanced components as defaults
\ No newline at end of file
diff --git a/package.json b/package.json
index 67ca422219..b7b940626b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "packrat-monorepo",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "workspaces": [
     "apps/*",
     "packages/*"
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
index acc2397bd3..deada916c8 100644
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/analytics",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index f404be3a77..460e3a5584 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/api-client",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "description": "PackRat typed API client — authenticated HTTP client with error handling and MCP result helpers",
   "type": "module",
diff --git a/packages/api/container_src/package.json b/packages/api/container_src/package.json
index 01b7d02499..fce743949b 100644
--- a/packages/api/container_src/package.json
+++ b/packages/api/container_src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "container",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "type": "module",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.0.0",
diff --git a/packages/api/package.json b/packages/api/package.json
index 8fc2527c4b..780335248e 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/api",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "scripts": {
     "check-types": "tsc --noEmit",
     "check-types-watch": "tsc --noEmit --watch",
diff --git a/packages/checks/package.json b/packages/checks/package.json
index 3ef42b55dd..901d72f3a3 100644
--- a/packages/checks/package.json
+++ b/packages/checks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/checks",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index cc504e6ed4..2da074fafe 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/cli",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "type": "module",
   "bin": {
diff --git a/packages/config/package.json b/packages/config/package.json
index 92fa2d1ad1..c61eae76ee 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/config",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "type": "module",
   "exports": {
diff --git a/packages/env/package.json b/packages/env/package.json
index 89685a0bdb..7b33a175f8 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/env",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "type": "module",
   "exports": {
diff --git a/packages/guards/package.json b/packages/guards/package.json
index ea7faa6479..7d5140be8d 100644
--- a/packages/guards/package.json
+++ b/packages/guards/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/guards",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "type": "module",
   "exports": {
diff --git a/packages/mcp/package.json b/packages/mcp/package.json
index b80681b7f7..24afef7754 100644
--- a/packages/mcp/package.json
+++ b/packages/mcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/mcp",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "description": "PackRat MCP Server — outdoor adventure planning via Model Context Protocol",
   "scripts": {
diff --git a/packages/ui/package.json b/packages/ui/package.json
index be3b727eac..b9ff4b6041 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/ui",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "dependencies": {
     "@packrat-ai/nativewindui": "^2.0.2"
diff --git a/packages/web-ui/package.json b/packages/web-ui/package.json
index 4a607ca5cc..08a2b64450 100644
--- a/packages/web-ui/package.json
+++ b/packages/web-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@packrat/web-ui",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "private": true,
   "type": "module",
   "exports": {