feat: replace native alerts with custom dialog modals

.gitea/workflows/ci.yml

@@ -3,6 +3,10 @@ on:
   push:
     branches:
       - main
+    paths:
+      - '**/*.js'
+      - '**/*.json'
+      - '.gitea/workflows/**'
 
 jobs:
   build-android:

.gitea/workflows/dev.yml

@@ -3,6 +3,10 @@ on:
   push:
     branches-ignore:
       - main
+    paths:
+      - '**/*.js'
+      - '**/*.json'
+      - '.gitea/workflows/**'
 
 jobs:
   validate:

TODO.md

@@ -1,41 +1,14 @@
 # TODO - Luggage List
 
-## Stage
-Improving & Fixing Bugs (V3)
+This file was intentionally nuked.
 
-## V2 Changes Requested
-- [x] Trip can be selected from everywhere (global trip picker)
-- [x] Fixed trip switching behavior for web by removing aggressive auto-reselect
-- [x] Removed trip image crop (gallery pick without editing)
-- [x] Item updates now happen in a modal
-- [x] Redesigned item cards
-- [x] Moved top nav to bottom and made it mobile-friendly
-- [x] Removed top title block
-- [x] Reworked check-up flow to yes/no checklist
-- [x] “No” now opens update modal for check-up-only changes
-- [x] Added optional toggle to also sync fix into trip item list
-- [x] Removed JSON export feature
-- [x] Improved keyboard behavior with KeyboardAvoidingView + scroll-safe forms
-- [x] Full UI redesign (dark-first minimalist with accent colors)
-- [x] Set new icon from `https://cdn.reversed.dev/pictures/yesnt.png`
-
-## Validation
-- [x] `npm install`
-- [x] `npx expo export --platform web`
-
-## Progress Log
-- [x] V1 prototype complete and shipped
-- [x] CI adjusted (no `eas init` in workflows)
-- [x] V2 redesign + behavior fixes implemented
-- [x] Removed legacy template src folder
-- [x] Rebuilt app into modular `src/` structure (tabs/components/modals/styles/utils)
-- [x] Fixed status-bar overlap with top spacing
-- [x] Replaced trip date text inputs with calendar modal picker
-- [x] Improved keyboard focus scrolling to focused input (not scroll-to-end)
-- [x] Reworked bottom nav to real icons + labels
-- [x] Clarified history as selected-trip check-up history
-- [x] Increased safe top inset to avoid status-bar overlap
-- [x] Added check-up stats (correct/bad/pending) and persisted per snapshot
-- [x] Extra UI polish pass (spacing, cards, hierarchy)
-- [x] Centered and enlarged edit/check-up modals to fully overlay nav
-- [x] Fixed modal keyboard glitching (stable centered keyboard-aware layout)
+All pending tasks now live as Gitea issues:
+- https://gitea.reversed.dev/space/luggage-list/issues/1
+- https://gitea.reversed.dev/space/luggage-list/issues/2
+- https://gitea.reversed.dev/space/luggage-list/issues/3
+- https://gitea.reversed.dev/space/luggage-list/issues/4
+- https://gitea.reversed.dev/space/luggage-list/issues/5
+- https://gitea.reversed.dev/space/luggage-list/issues/6
+- https://gitea.reversed.dev/space/luggage-list/issues/7
+- https://gitea.reversed.dev/space/luggage-list/issues/8
+- https://gitea.reversed.dev/space/luggage-list/issues/9

src/AppRoot.js

@@ -1,11 +1,12 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
-import { Alert, KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, StatusBar as RNStatusBar, Text, View } from 'react-native';
+import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, StatusBar as RNStatusBar, Text, View } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import * as ImagePicker from 'expo-image-picker';
 import { StatusBar } from 'expo-status-bar';
 import BottomTab from './components/BottomTab';
 import TripPicker from './components/TripPicker';
 import DatePickerModal from './components/DatePickerModal';
+import AppDialogModal from './components/AppDialogModal';
 import ItemModal from './modals/ItemModal';
 import CheckupFlowModal from './modals/CheckupFlowModal';
 import TripsTab from './tabs/TripsTab';
@@ -80,10 +81,13 @@ export default function AppRoot() {
   const [checkupNoForm, setCheckupNoForm] = useState(emptyCheckupNoForm());
 
   const [selectedCheckupId, setSelectedCheckupId] = useState(null);
+  const [dialogState, setDialogState] = useState({ visible: false, title: '', message: '', buttons: [] });
 
   const topInset = Platform.OS === 'android' ? (RNStatusBar.currentHeight || 0) + 10 : 0;
 
-  const selectedTrip = useMemo(() => data.trips.find((trip) => trip.id === selectedTripId) || null, [data.trips, selectedTripId]);
+  const visibleTrips = useMemo(() => data.trips.filter((trip) => !trip.archived), [data.trips]);
+
+  const selectedTrip = useMemo(() => visibleTrips.find((trip) => trip.id === selectedTripId) || null, [visibleTrips, selectedTripId]);
 
   const selectedTripItems = useMemo(() => {
     if (!selectedTripId) return [];
@@ -114,6 +118,38 @@ export default function AppRoot() {
     return checkupSession[checkupFlowIndex] || null;
   }, [checkupFlowVisible, checkupFlowIndex, checkupSession]);
 
+  function closeDialog() {
+    setDialogState((prev) => ({ ...prev, visible: false }));
+  }
+
+  function showAlert(title, message) {
+    setDialogState({
+      visible: true,
+      title,
+      message,
+      buttons: [{ text: 'OK', tone: 'primary', onPress: closeDialog }],
+    });
+  }
+
+  function showConfirm({ title, message, confirmText = 'Confirm', onConfirm, tone = 'danger' }) {
+    setDialogState({
+      visible: true,
+      title,
+      message,
+      buttons: [
+        { text: 'Cancel', tone: 'neutral', onPress: closeDialog },
+        {
+          text: confirmText,
+          tone,
+          onPress: () => {
+            closeDialog();
+            if (typeof onConfirm === 'function') onConfirm();
+          },
+        },
+      ],
+    });
+  }
+
   useEffect(() => {
     (async () => {
       try {
@@ -123,7 +159,7 @@ export default function AppRoot() {
           setData({ ...emptyData, ...parsed });
         }
       } catch {
-        Alert.alert('Error', 'Could not load local data.');
+        showAlert('Error', 'Could not load local data.');
       } finally {
         setLoaded(true);
       }
@@ -133,24 +169,24 @@ export default function AppRoot() {
   useEffect(() => {
     if (!loaded) return;
     AsyncStorage.setItem(STORAGE_KEY, JSON.stringify(data)).catch(() => {
-      Alert.alert('Error', 'Could not save local data.');
+      showAlert('Error', 'Could not save local data.');
     });
   }, [data, loaded]);
 
   useEffect(() => {
     if (!loaded) return;
-    if (!data.trips.length) {
+    if (!visibleTrips.length) {
       setSelectedTripId(null);
       return;
     }
 
-    if (selectedTripId && data.trips.some((trip) => trip.id === selectedTripId)) {
+    if (selectedTripId && visibleTrips.some((trip) => trip.id === selectedTripId)) {
       return;
     }
 
-    const bestTripId = findBestTripId(data.trips);
-    setSelectedTripId(bestTripId || data.trips[0].id);
-  }, [data.trips, selectedTripId, loaded]);
+    const bestTripId = findBestTripId(visibleTrips);
+    setSelectedTripId(bestTripId || visibleTrips[0].id);
+  }, [visibleTrips, selectedTripId, loaded]);
 
   useEffect(() => {
     if (tab !== 'checkup') return;
@@ -178,7 +214,7 @@ export default function AppRoot() {
   async function pickImage(onPicked) {
     const perm = await ImagePicker.requestMediaLibraryPermissionsAsync();
     if (!perm.granted) {
-      Alert.alert('Permission needed', 'Allow gallery access to select images.');
+      showAlert('Permission needed', 'Allow gallery access to select images.');
       return;
     }
 
@@ -196,7 +232,7 @@ export default function AppRoot() {
   async function takeImage(onPicked) {
     const perm = await ImagePicker.requestCameraPermissionsAsync();
     if (!perm.granted) {
-      Alert.alert('Permission needed', 'Allow camera access to take photos.');
+      showAlert('Permission needed', 'Allow camera access to take photos.');
       return;
     }
 
@@ -212,7 +248,7 @@ export default function AppRoot() {
 
   function createTrip() {
     if (!tripForm.name.trim()) {
-      Alert.alert('Missing name', 'Trip name is required.');
+      showAlert('Missing name', 'Trip name is required.');
       return false;
     }
 
@@ -220,12 +256,12 @@ export default function AppRoot() {
     const end = parseYMD(tripForm.endDate);
 
     if (!start || !end) {
-      Alert.alert('Invalid dates', 'Please select valid trip dates.');
+      showAlert('Invalid dates', 'Please select valid trip dates.');
       return false;
     }
 
     if (start > end) {
-      Alert.alert('Invalid dates', 'Start date cannot be after end date.');
+      showAlert('Invalid dates', 'Start date cannot be after end date.');
       return false;
     }
 
@@ -244,6 +280,7 @@ export default function AppRoot() {
             startDate: tripForm.startDate,
             endDate: tripForm.endDate,
             imageUri: tripForm.imageUri,
+            archived: false,
             createdAt: now,
             updatedAt: now,
           },
@@ -278,13 +315,69 @@ export default function AppRoot() {
     setData((prev) => ({ ...prev, defaultTemplateTripId: tripId }));
   }
 
+  function saveTripEdits(tripId, patch) {
+    if (!patch.name.trim()) {
+      showAlert('Missing name', 'Trip name is required.');
+      return false;
+    }
+
+    const start = parseYMD(patch.startDate);
+    const end = parseYMD(patch.endDate);
+
+    if (!start || !end) {
+      showAlert('Invalid dates', 'Please select valid trip dates.');
+      return false;
+    }
+
+    if (start > end) {
+      showAlert('Invalid dates', 'Start date cannot be after end date.');
+      return false;
+    }
+
+    setData((prev) => ({
+      ...prev,
+      trips: prev.trips.map((trip) =>
+        trip.id === tripId
+          ? {
+              ...trip,
+              name: patch.name.trim(),
+              location: patch.location.trim(),
+              startDate: patch.startDate,
+              endDate: patch.endDate,
+              imageUri: patch.imageUri,
+              updatedAt: Date.now(),
+            }
+          : trip
+      ),
+    }));
+
+    return true;
+  }
+
+  function setTripArchived(tripId, archived) {
+    setData((prev) => ({
+      ...prev,
+      trips: prev.trips.map((trip) =>
+        trip.id === tripId
+          ? {
+              ...trip,
+              archived,
+              archivedAt: archived ? Date.now() : null,
+              updatedAt: Date.now(),
+            }
+          : trip
+      ),
+      defaultTemplateTripId: archived && prev.defaultTemplateTripId === tripId ? null : prev.defaultTemplateTripId,
+    }));
+  }
+
   function deleteTrip(tripId) {
-    Alert.alert('Delete trip?', 'Trip items and check-up history will also be deleted.', [
-      { text: 'Cancel', style: 'cancel' },
-      {
-        text: 'Delete',
-        style: 'destructive',
-        onPress: () => {
+    showConfirm({
+      title: 'Delete trip?',
+      message: 'Trip items and check-up history will also be deleted.',
+      confirmText: 'Delete',
+      tone: 'danger',
+      onConfirm: () => {
         setData((prev) => {
           const trips = prev.trips.filter((trip) => trip.id !== tripId);
           const itemsByTrip = { ...prev.itemsByTrip };
@@ -301,8 +394,7 @@ export default function AppRoot() {
           };
         });
       },
-      },
-    ]);
+    });
   }
 
   function openAddItemModal() {
@@ -326,12 +418,12 @@ export default function AppRoot() {
 
   function saveItemFromModal() {
     if (!selectedTripId) {
-      Alert.alert('No trip selected', 'Please select or create a trip first.');
+      showAlert('No trip selected', 'Please select or create a trip first.');
       return;
     }
 
     if (!itemForm.name.trim()) {
-      Alert.alert('Missing name', 'Item name is required.');
+      showAlert('Missing name', 'Item name is required.');
       return;
     }
 
@@ -406,8 +498,39 @@ export default function AppRoot() {
     });
   }
 
+  function bulkSetItemStatus(itemIds, status) {
+    if (!selectedTripId || !itemIds.length) return;
+    const idSet = new Set(itemIds);
+    setData((prev) => {
+      const items = prev.itemsByTrip[selectedTripId] || [];
+      return {
+        ...prev,
+        itemsByTrip: {
+          ...prev.itemsByTrip,
+          [selectedTripId]: items.map((item) =>
+            idSet.has(item.id)
+              ? {
+                  ...item,
+                  status,
+                  lentTo: status === 'lent-to' ? item.lentTo : '',
+                  updatedAt: Date.now(),
+                }
+              : item
+          ),
+        },
+      };
+    });
+  }
+
   function deleteCheckup(checkupId) {
     if (!selectedTripId) return;
+
+    showConfirm({
+      title: 'Delete check-up?',
+      message: 'This snapshot will be removed from history.',
+      confirmText: 'Delete',
+      tone: 'danger',
+      onConfirm: () => {
         setData((prev) => {
           const existing = prev.checkupsByTrip[selectedTripId] || [];
           return {
@@ -419,6 +542,8 @@ export default function AppRoot() {
           };
         });
         setSelectedCheckupId((prev) => (prev === checkupId ? null : prev));
+      },
+    });
   }
 
   function createFreshCheckupSession() {
@@ -431,11 +556,11 @@ export default function AppRoot() {
 
   function startCheckupFlow() {
     if (!selectedTripId) {
-      Alert.alert('No trip selected', 'Please select a trip first.');
+      showAlert('No trip selected', 'Please select a trip first.');
       return;
     }
     if (!selectedTripItems.length) {
-      Alert.alert('No items', 'Add items before starting a check-up.');
+      showAlert('No items', 'Add items before starting a check-up.');
       return;
     }
 
@@ -532,18 +657,18 @@ export default function AppRoot() {
 
   function saveCheckupSnapshot(sessionToSave) {
     if (!selectedTripId) {
-      Alert.alert('No trip selected', 'Please select a trip first.');
+      showAlert('No trip selected', 'Please select a trip first.');
       return false;
     }
 
     if (!sessionToSave.length) {
-      Alert.alert('No items', 'Add items before creating a check-up.');
+      showAlert('No items', 'Add items before creating a check-up.');
       return false;
     }
 
     const pending = sessionToSave.filter((entry) => !entry.confirmed).length;
     if (pending > 0) {
-      Alert.alert('Incomplete', `Please confirm all items first (${pending} remaining).`);
+      showAlert('Incomplete', `Please confirm all items first (${pending} remaining).`);
       return false;
     }
 
@@ -586,7 +711,7 @@ export default function AppRoot() {
     const ok = saveCheckupSnapshot(checkupSession);
     if (!ok) return;
 
-    Alert.alert('Saved', 'Check-up snapshot saved.');
+    showAlert('Saved', 'Check-up snapshot saved.');
     closeCheckupFlow();
     createFreshCheckupSession();
   }
@@ -624,20 +749,32 @@ export default function AppRoot() {
           keyboardShouldPersistTaps="handled"
           showsVerticalScrollIndicator={false}
         >
-          <TripPicker trips={data.trips} selectedTripId={selectedTripId} onChooseTrip={setSelectedTripId} />
+          <TripPicker trips={visibleTrips} selectedTripId={selectedTripId} onChooseTrip={setSelectedTripId} />
 
           {tab === 'trips' && (
             <TripsTab
               tripForm={tripForm}
               updateTripForm={updateTripForm}
-              pickTripImage={() => pickImage((uri) => updateTripForm('imageUri', uri))}
-              takeTripImage={() => takeImage((uri) => updateTripForm('imageUri', uri))}
+              pickTripImage={(onPicked) =>
+                pickImage((uri) => {
+                  if (typeof onPicked === 'function') onPicked(uri);
+                  else updateTripForm('imageUri', uri);
+                })
+              }
+              takeTripImage={(onPicked) =>
+                takeImage((uri) => {
+                  if (typeof onPicked === 'function') onPicked(uri);
+                  else updateTripForm('imageUri', uri);
+                })
+              }
               templateTrip={templateTrip}
               createTrip={createTrip}
               trips={data.trips}
               selectedTripId={selectedTripId}
               chooseTrip={setSelectedTripId}
               setTripAsTemplate={setTripAsTemplate}
+              saveTripEdits={saveTripEdits}
+              setTripArchived={setTripArchived}
               deleteTrip={deleteTrip}
               onInputFocus={onInputFocus}
               defaultTemplateTripId={data.defaultTemplateTripId}
@@ -655,6 +792,7 @@ export default function AppRoot() {
               openEditItemModal={openEditItemModal}
               deleteItem={deleteItem}
               quickSetItemStatus={quickSetItemStatus}
+              bulkSetItemStatus={bulkSetItemStatus}
             />
           )}
 
@@ -713,6 +851,14 @@ export default function AppRoot() {
         onSaveNo={saveCurrentCheckupNo}
         onFinish={finishCheckupFlow}
       />
+
+      <AppDialogModal
+        visible={dialogState.visible}
+        title={dialogState.title}
+        message={dialogState.message}
+        buttons={dialogState.buttons}
+        onClose={closeDialog}
+      />
     </SafeAreaView>
   );
 }

src/components/AppDialogModal.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import { Modal, Pressable, Text, View } from 'react-native';
+import { styles } from '../styles';
+
+export default function AppDialogModal({ visible, title, message, buttons = [], onClose }) {
+  if (!visible) return null;
+
+  const safeButtons = buttons.length ? buttons : [{ text: 'OK' }];
+
+  return (
+    <Modal visible={visible} transparent animationType="fade" onRequestClose={onClose}>
+      <View style={styles.dialogBackdrop}>
+        <View style={styles.dialogCard}>
+          <Text style={styles.dialogTitle}>{title || 'Notice'}</Text>
+          {!!message ? <Text style={styles.dialogMessage}>{message}</Text> : null}
+
+          <View style={styles.dialogButtonsRow}>
+            {safeButtons.map((button, idx) => {
+              const tone = button.tone || (button.style === 'destructive' ? 'danger' : button.style === 'cancel' ? 'neutral' : 'primary');
+              return (
+                <Pressable
+                  key={`${button.text}-${idx}`}
+                  style={[
+                    styles.dialogBtn,
+                    tone === 'primary' ? styles.dialogBtnPrimary : null,
+                    tone === 'danger' ? styles.dialogBtnDanger : null,
+                    tone === 'neutral' ? styles.dialogBtnNeutral : null,
+                  ]}
+                  onPress={button.onPress}
+                >
+                  <Text style={styles.dialogBtnText}>{button.text || 'OK'}</Text>
+                </Pressable>
+              );
+            })}
+          </View>
+        </View>
+      </View>
+    </Modal>
+  );
+}

src/styles.js

@@ -89,6 +89,10 @@ export const styles = StyleSheet.create({
   cardActive: {
     borderColor: '#60a5fa',
   },
+  cardArchived: {
+    opacity: 0.72,
+    borderColor: '#374151',
+  },
   cardSoft: {
     backgroundColor: '#0f172a',
     borderRadius: 16,
@@ -480,6 +484,59 @@ export const styles = StyleSheet.create({
     backgroundColor: 'rgba(2,6,23,0.72)',
     paddingHorizontal: 12,
   },
+  dialogBackdrop: {
+    flex: 1,
+    backgroundColor: 'rgba(2,6,23,0.72)',
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingHorizontal: 18,
+  },
+  dialogCard: {
+    width: '100%',
+    backgroundColor: '#0f172a',
+    borderRadius: 16,
+    borderWidth: 1,
+    borderColor: '#1e293b',
+    padding: 14,
+    gap: 12,
+  },
+  dialogTitle: {
+    color: '#f8fafc',
+    fontWeight: '700',
+    fontSize: 17,
+  },
+  dialogMessage: {
+    color: '#cbd5e1',
+    lineHeight: 20,
+  },
+  dialogButtonsRow: {
+    flexDirection: 'row',
+    gap: 8,
+    justifyContent: 'flex-end',
+    flexWrap: 'wrap',
+  },
+  dialogBtn: {
+    borderRadius: 10,
+    paddingVertical: 9,
+    paddingHorizontal: 14,
+    borderWidth: 1,
+  },
+  dialogBtnPrimary: {
+    backgroundColor: '#2563eb',
+    borderColor: '#2563eb',
+  },
+  dialogBtnDanger: {
+    backgroundColor: '#7f1d1d',
+    borderColor: '#991b1b',
+  },
+  dialogBtnNeutral: {
+    backgroundColor: '#1e293b',
+    borderColor: '#334155',
+  },
+  dialogBtnText: {
+    color: '#f8fafc',
+    fontWeight: '700',
+  },
   modalKeyboardWrap: {
     flex: 1,
     width: '100%',

src/tabs/HistoryTab.js

@@ -1,25 +1,8 @@
 import React from 'react';
-import { Alert, Pressable, Text, View } from 'react-native';
+import { Pressable, Text, View } from 'react-native';
 import { styles } from '../styles';
 
-export default function HistoryTab({
-  selectedTrip,
-  selectedTripCheckups,
-  selectedCheckupId,
-  setSelectedCheckupId,
-  onDeleteCheckup,
-}) {
-  function askDelete(checkup) {
-    Alert.alert('Delete check-up?', 'This snapshot will be removed from history.', [
-      { text: 'Cancel', style: 'cancel' },
-      {
-        text: 'Delete',
-        style: 'destructive',
-        onPress: () => onDeleteCheckup(checkup.id),
-      },
-    ]);
-  }
-
+export default function HistoryTab({ selectedTrip, selectedTripCheckups, selectedCheckupId, setSelectedCheckupId, onDeleteCheckup }) {
   return (
     <View style={styles.section}>
       <Text style={styles.sectionTitle}>History</Text>
@@ -32,7 +15,7 @@ export default function HistoryTab({
         <View key={checkup.id} style={styles.cardSoft}>
           <Pressable
             onPress={() => setSelectedCheckupId((prev) => (prev === checkup.id ? null : checkup.id))}
-            onLongPress={() => askDelete(checkup)}
+            onLongPress={() => onDeleteCheckup(checkup.id)}
             delayLongPress={280}
           >
             <Text style={styles.cardTitle}>{new Date(checkup.createdAt).toLocaleString()}</Text>

src/tabs/ItemsTab.js

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useMemo, useState } from 'react';
 import { Pressable, Text, View } from 'react-native';
 import ItemCard from '../components/ItemCard';
+import { ITEM_STATUSES } from '../constants';
 import { styles } from '../styles';
 
 export default function ItemsTab({
@@ -10,7 +11,30 @@ export default function ItemsTab({
   openEditItemModal,
   deleteItem,
   quickSetItemStatus,
+  bulkSetItemStatus,
 }) {
+  const [statusFilter, setStatusFilter] = useState('all');
+  const [categoryFilter, setCategoryFilter] = useState('all');
+
+  const categories = useMemo(
+    () => Array.from(new Set(selectedTripItems.map((item) => item.category?.trim()).filter(Boolean))).sort((a, b) => a.localeCompare(b)),
+    [selectedTripItems]
+  );
+
+  const filteredItems = useMemo(
+    () =>
+      selectedTripItems.filter((item) => {
+        const matchStatus = statusFilter === 'all' || item.status === statusFilter;
+        const itemCategory = item.category?.trim() || '';
+        const matchCategory = categoryFilter === 'all' || itemCategory === categoryFilter;
+        return matchStatus && matchCategory;
+      }),
+    [selectedTripItems, statusFilter, categoryFilter]
+  );
+
+  const filterStatusOptions = ['all', ...ITEM_STATUSES];
+  const filterCategoryOptions = ['all', ...categories];
+
   return (
     <View style={styles.section}>
       <View style={styles.sectionRow}>
@@ -23,7 +47,51 @@ export default function ItemsTab({
       {!selectedTrip ? <Text style={styles.muted}>Select a trip first.</Text> : null}
       {selectedTripItems.length === 0 && selectedTrip ? <Text style={styles.muted}>No items yet.</Text> : null}
 
-      {selectedTripItems.map((item) => (
+      {selectedTrip ? (
+        <View style={styles.cardSoft}>
+          <Text style={styles.cardTitle}>Quick actions</Text>
+          <View style={styles.actionRow}>
+            <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={() => bulkSetItemStatus(filteredItems.map((x) => x.id), 'packed')}>
+              <Text style={styles.secondaryBtnText}>Pack shown ({filteredItems.length})</Text>
+            </Pressable>
+            <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={() => bulkSetItemStatus(filteredItems.map((x) => x.id), 'unpacked')}>
+              <Text style={styles.secondaryBtnText}>Unpack shown ({filteredItems.length})</Text>
+            </Pressable>
+          </View>
+        </View>
+      ) : null}
+
+      {selectedTripItems.length > 0 ? (
+        <View style={styles.cardSoft}>
+          <Text style={styles.cardTitle}>Filters</Text>
+
+          <Text style={styles.cardMeta}>Status</Text>
+          <View style={styles.chipGroup}>
+            {filterStatusOptions.map((status) => {
+              const active = statusFilter === status;
+              return (
+                <Pressable key={status} style={[styles.chip, active && styles.chipActive]} onPress={() => setStatusFilter(status)}>
+                  <Text style={[styles.chipText, active && styles.chipTextActive]}>{status}</Text>
+                </Pressable>
+              );
+            })}
+          </View>
+
+          <Text style={styles.cardMeta}>Category</Text>
+          <View style={styles.chipGroup}>
+            {filterCategoryOptions.map((category) => {
+              const active = categoryFilter === category;
+              return (
+                <Pressable key={category} style={[styles.chip, active && styles.chipActive]} onPress={() => setCategoryFilter(category)}>
+                  <Text style={[styles.chipText, active && styles.chipTextActive]}>{category}</Text>
+                </Pressable>
+              );
+            })}
+          </View>
+        </View>
+      ) : null}
+
+      {filteredItems.map((item) => (
         <ItemCard
           key={item.id}
           item={item}
@@ -33,6 +101,8 @@ export default function ItemsTab({
           onQuickUnpack={() => quickSetItemStatus(item.id, 'unpacked')}
         />
       ))}
+
+      {selectedTripItems.length > 0 && filteredItems.length === 0 ? <Text style={styles.muted}>No items match the current filters.</Text> : null}
     </View>
   );
 }

src/tabs/TripsTab.js

@@ -1,5 +1,6 @@
 import React, { useMemo, useState } from 'react';
 import { Image, KeyboardAvoidingView, Modal, Platform, Pressable, ScrollView, Text, TextInput, View } from 'react-native';
+import DatePickerModal from '../components/DatePickerModal';
 import Field from '../components/Field';
 import { styles } from '../styles';
 
@@ -13,6 +14,14 @@ function DateField({ label, value, onPress }) {
   );
 }
 
+const emptyEditForm = {
+  name: '',
+  location: '',
+  startDate: '',
+  endDate: '',
+  imageUri: '',
+};
+
 export default function TripsTab({
   tripForm,
   updateTripForm,
@@ -24,6 +33,8 @@ export default function TripsTab({
   selectedTripId,
   chooseTrip,
   setTripAsTemplate,
+  saveTripEdits,
+  setTripArchived,
   deleteTrip,
   onInputFocus,
   defaultTemplateTripId,
@@ -33,24 +44,72 @@ export default function TripsTab({
 }) {
   const [createModalVisible, setCreateModalVisible] = useState(false);
   const [viewTripId, setViewTripId] = useState(null);
+  const [editMode, setEditMode] = useState(false);
+  const [editForm, setEditForm] = useState(emptyEditForm);
+  const [viewDatePicker, setViewDatePicker] = useState({ visible: false, field: 'startDate' });
 
   const activeTrip = useMemo(() => trips.find((trip) => trip.id === selectedTripId) || null, [trips, selectedTripId]);
   const viewingTrip = useMemo(() => trips.find((trip) => trip.id === viewTripId) || null, [trips, viewTripId]);
+  const activeTrips = useMemo(() => trips.filter((trip) => !trip.archived), [trips]);
+  const archivedTrips = useMemo(() => trips.filter((trip) => trip.archived), [trips]);
 
   function submitCreateTrip() {
     const ok = createTrip();
     if (ok) setCreateModalVisible(false);
   }
 
+  function openView(tripId) {
+    const trip = trips.find((x) => x.id === tripId);
+    if (!trip) return;
+    setViewTripId(tripId);
+    setEditMode(false);
+    setEditForm({
+      name: trip.name || '',
+      location: trip.location || '',
+      startDate: trip.startDate || '',
+      endDate: trip.endDate || '',
+      imageUri: trip.imageUri || '',
+    });
+  }
+
+  function updateEditForm(field, value) {
+    setEditForm((prev) => ({ ...prev, [field]: value }));
+  }
+
+  function saveEditFromView() {
+    if (!viewingTrip) return;
+    const ok = saveTripEdits(viewingTrip.id, editForm);
+    if (!ok) return;
+    setEditMode(false);
+  }
+
+  function pickViewTripImage() {
+    pickTripImage((uri) => updateEditForm('imageUri', uri));
+  }
+
+  function takeViewTripImage() {
+    takeTripImage((uri) => updateEditForm('imageUri', uri));
+  }
+
   function applyTemplateFromView() {
     if (!viewingTrip) return;
     setTripAsTemplate(viewingTrip.id);
   }
 
+  function toggleArchiveFromView() {
+    if (!viewingTrip) return;
+    setTripArchived(viewingTrip.id, !viewingTrip.archived);
+    if (!viewingTrip.archived) {
+      setViewTripId(null);
+      setEditMode(false);
+    }
+  }
+
   function deleteFromView() {
     if (!viewingTrip) return;
     const tripId = viewingTrip.id;
     setViewTripId(null);
+    setEditMode(false);
     deleteTrip(tripId);
   }
 
@@ -71,12 +130,12 @@ export default function TripsTab({
           <Text style={styles.cardMeta}>{activeTripItemCount} items · {activeTripCheckupCount} check-ups</Text>
         </View>
       ) : (
-        <Text style={styles.muted}>Create your first trip to get started.</Text>
+        <Text style={styles.muted}>No active trips. Unarchive or create one.</Text>
       )}
 
-      <Text style={styles.tripListTitle}>All Trips</Text>
+      <Text style={styles.tripListTitle}>Active Trips</Text>
 
-      {trips
+      {activeTrips
         .slice()
         .sort((a, b) => b.startDate.localeCompare(a.startDate))
         .map((trip) => (
@@ -91,7 +150,7 @@ export default function TripsTab({
                 <Pressable style={styles.miniBtn} onPress={() => chooseTrip(trip.id)}>
                   <Text style={styles.miniBtnText}>Select</Text>
                 </Pressable>
-                <Pressable style={styles.miniBtn} onPress={() => setViewTripId(trip.id)}>
+                <Pressable style={styles.miniBtn} onPress={() => openView(trip.id)}>
                   <Text style={styles.miniBtnText}>View</Text>
                 </Pressable>
               </View>
@@ -100,6 +159,31 @@ export default function TripsTab({
           </View>
         ))}
 
+      {archivedTrips.length > 0 ? (
+        <>
+          <Text style={styles.tripListTitle}>Archived Trips</Text>
+          {archivedTrips
+            .slice()
+            .sort((a, b) => b.startDate.localeCompare(a.startDate))
+            .map((trip) => (
+              <View key={trip.id} style={[styles.card, styles.cardArchived]}>
+                <View style={styles.cardRow}>
+                  <View style={styles.flex}>
+                    <Text style={styles.cardTitle}>{trip.name}</Text>
+                    <Text style={styles.cardMeta}>{trip.location || 'No location'} · {trip.startDate} → {trip.endDate}</Text>
+                    <Text style={styles.cardMeta}>Archived</Text>
+                  </View>
+                  <View style={styles.stackButtons}>
+                    <Pressable style={styles.miniBtn} onPress={() => openView(trip.id)}>
+                      <Text style={styles.miniBtnText}>View</Text>
+                    </Pressable>
+                  </View>
+                </View>
+              </View>
+            ))}
+        </>
+      ) : null}
+
       <Modal visible={createModalVisible} animationType="slide" transparent>
         <View style={styles.modalBackdrop}>
           <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined} style={styles.modalKeyboardWrap}>
@@ -180,7 +264,12 @@ export default function TripsTab({
             <View style={styles.modalCard}>
               <View style={styles.sectionRow}>
                 <Text style={styles.sectionTitle}>Trip View</Text>
-                <Pressable onPress={() => setViewTripId(null)}>
+                <Pressable
+                  onPress={() => {
+                    setViewTripId(null);
+                    setEditMode(false);
+                  }}
+                >
                   <Text style={styles.closeText}>Close</Text>
                 </Pressable>
               </View>
@@ -192,25 +281,94 @@ export default function TripsTab({
                   contentContainerStyle={{ paddingBottom: 12 }}
                   showsVerticalScrollIndicator={false}
                 >
+                  {!editMode ? (
+                    <>
                       {viewingTrip.imageUri ? <Image source={{ uri: viewingTrip.imageUri }} style={styles.previewImage} /> : null}
                       <Text style={styles.tripHeroTitle}>{viewingTrip.name}</Text>
                       <Text style={styles.cardMeta}>{viewingTrip.location || 'No location'}</Text>
                       <Text style={styles.cardMeta}>{viewingTrip.startDate} → {viewingTrip.endDate}</Text>
                       <Text style={styles.cardMeta}>{defaultTemplateTripId === viewingTrip.id ? 'Default template trip' : 'Not default template'}</Text>
+                      <Text style={styles.cardMeta}>{viewingTrip.archived ? 'Archived' : 'Active'}</Text>
+
+                      <Pressable style={styles.miniBtn} onPress={() => setEditMode(true)}>
+                        <Text style={styles.miniBtnText}>Edit Trip</Text>
+                      </Pressable>
 
                       <Pressable style={styles.secondaryBtn} onPress={applyTemplateFromView}>
                         <Text style={styles.secondaryBtnText}>Set as Template</Text>
                       </Pressable>
 
+                      <Pressable style={styles.secondaryBtn} onPress={toggleArchiveFromView}>
+                        <Text style={styles.secondaryBtnText}>{viewingTrip.archived ? 'Unarchive Trip' : 'Archive Trip'}</Text>
+                      </Pressable>
+
                       <Pressable style={styles.miniBtnDanger} onPress={deleteFromView}>
                         <Text style={styles.miniBtnText}>Delete Trip</Text>
                       </Pressable>
+                    </>
+                  ) : (
+                    <>
+                      <Field label="Name">
+                        <TextInput
+                          style={styles.input}
+                          value={editForm.name}
+                          onChangeText={(v) => updateEditForm('name', v)}
+                          placeholder="Trip name"
+                          placeholderTextColor="#6b7280"
+                          onFocus={onInputFocus}
+                        />
+                      </Field>
+
+                      <Field label="Location">
+                        <TextInput
+                          style={styles.input}
+                          value={editForm.location}
+                          onChangeText={(v) => updateEditForm('location', v)}
+                          placeholder="Location"
+                          placeholderTextColor="#6b7280"
+                          onFocus={onInputFocus}
+                        />
+                      </Field>
+
+                      <DateField label="Start Date" value={editForm.startDate} onPress={() => setViewDatePicker({ visible: true, field: 'startDate' })} />
+                      <DateField label="End Date" value={editForm.endDate} onPress={() => setViewDatePicker({ visible: true, field: 'endDate' })} />
+
+                      <View style={styles.actionRow}>
+                        <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={takeViewTripImage}>
+                          <Text style={styles.secondaryBtnText}>Take photo</Text>
+                        </Pressable>
+                        <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={pickViewTripImage}>
+                          <Text style={styles.secondaryBtnText}>{editForm.imageUri ? 'From gallery (change)' : 'From gallery'}</Text>
+                        </Pressable>
+                      </View>
+
+                      {editForm.imageUri ? <Image source={{ uri: editForm.imageUri }} style={styles.previewImage} /> : null}
+
+                      <Pressable style={styles.primaryBtn} onPress={saveEditFromView}>
+                        <Text style={styles.primaryBtnText}>Save Trip</Text>
+                      </Pressable>
+                      <Pressable style={styles.secondaryBtn} onPress={() => setEditMode(false)}>
+                        <Text style={styles.secondaryBtnText}>Cancel Edit</Text>
+                      </Pressable>
+                    </>
+                  )}
                 </ScrollView>
               ) : null}
             </View>
           </KeyboardAvoidingView>
         </View>
       </Modal>
+
+      <DatePickerModal
+        visible={viewDatePicker.visible}
+        title={viewDatePicker.field === 'startDate' ? 'Pick start date' : 'Pick end date'}
+        value={editForm[viewDatePicker.field]}
+        onClose={() => setViewDatePicker((prev) => ({ ...prev, visible: false }))}
+        onSelect={(ymd) => {
+          updateEditForm(viewDatePicker.field, ymd);
+          setViewDatePicker((prev) => ({ ...prev, visible: false }));
+        }}
+      />
     </View>
   );
 }