thêm giao diện cảnh báo

cập nhật phần modal thêm chuyến đi mới
cập nhật icon trong filter
2025-12-09 11:37:19 +07:00 · 2025-12-08 23:41:05 +07:00 · 2025-12-08 10:58:12 +07:00 · 2025-12-08 10:05:04 +07:00
30 changed files with 5487 additions and 1259 deletions
--- a/ReactQuery_Axios.md
+++ b/ReactQuery_Axios.md
--- a/add_trip_modal_summary.md
+++ b/add_trip_modal_summary.md
@@ -0,0 +1,277 @@
+# Add Trip Modal - Implementation Summary
+
+## Overview
+Đã tạo thành công modal **Add Trip** (Thêm chuyến đi) cho ứng dụng di động với cấu trúc component rõ ràng, UI hoàn chỉnh, và chức năng ghi log thay vì call API thực.
+
+## Uploaded Form Reference
+![Add Trip Form Reference](/Users/nguyennhatminh/.gemini/antigravity/brain/8d790068-d5bf-410f-a259-de9d4bdb1e20/uploaded_image_1765167755463.png)
+
+## Component Structure
+
+### Main Modal Component
+**[index.tsx](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/components/diary/addTripModal/index.tsx)**
+- Component chính quản lý toàn bộ modal
+- Quản lý state của form (trip name, fishing gears, material costs, dates, ports, initial stock)
+- Xử lý submit: Log dữ liệu thay vì call API
+- Bao gồm header, scrollable content, và footer với các nút hành động
+
+### Sub-Components
+
+#### 1. **[TripNameInput.tsx](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/components/diary/addTripModal/TripNameInput.tsx)**
+- Input field để nhập tên chuyến đi
+- Props: `value`, `onChange`
+- Hỗ trợ theme động
+
+#### 2. **[FishingGearList.tsx](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/components/diary/addTripModal/FishingGearList.tsx)**
+- Danh sách ngư cụ với khả năng thêm/xóa
+- Nút "Thêm ngư cụ" với border dashed
+- Hiển thị từng item với tên và số lượng
+- Có nút xóa cho mỗi item
+
+#### 3. **[MaterialCostList.tsx](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/components/diary/addTripModal/MaterialCostList.tsx)**
+- Danh sách chi phí nguyên liệu với chức năng thêm/xóa
+- Hiển thị: tên, số lượng, đơn vị, và giá (định dạng VNĐ)
+- Nút "Thêm nguyên liệu" với border dashed
+- Có nút xóa cho mỗi item
+
+#### 4. **[TripDurationPicker.tsx](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/components/diary/addTripModal/TripDurationPicker.tsx)**
+- Chọn thời gian bắt đầu và kết thúc chuyến đi
+- Layout 2 cột (Bắt đầu | Kết thúc)
+- Sử dụng `DateTimePicker` với modal
+- Hiển thị ngày theo định dạng DD/MM/YYYY
+- Validation: Ngày kết thúc không thể trước ngày bắt đầu
+
+#### 5. **[PortSelector.tsx](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/components/diary/addTripModal/PortSelector.tsx)**
+- Chọn cảng khởi hành và cảng cập bến
+- Layout 2 cột (Cảng khởi hành | Cảng cập bến)
+- Placeholder cho việc mở rộng: modal/dropdown chọn cảng trong tương lai
+- Hiện tại: Set giá trị dummy khi nhấn vào selector
+
+#### 6. **[BasicInfoInput.tsx](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/components/diary/addTripModal/BasicInfoInput.tsx)**
+- Nhập thông tin cơ bản: Ổ khai thác (Initial Stock)
+- Input numeric với placeholder
+
+#### 7. **[AutoFillSection.tsx](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/components/diary/addTripModal/AutoFillSection.tsx)**
+- Tự động điền dữ liệu từ chuyến đi cuối cùng của tàu
+- Hiển thị ở đầu modal với UI card dashed border
+- Cho phép chọn tàu từ danh sách (có tìm kiếm)
+- Gọi API `GET /api/sgw/trips/last/{thingId}` để lấy dữ liệu chuyến đi cuối
+- Tự động fill các trường:
+  - Ship Selector (thingId của tàu)
+  - Tên chuyến đi
+  - Danh sách ngư cụ
+  - Chi phí nguyên liệu
+  - Cảng khởi hành / cập bến
+  - Ô ngư trường khai thác
+- Hiển thị Alert thông báo khi fill thành công
+
+## Data Structure
+
+### Form Data Interface
+```typescript
+interface TripFormData {
+  tripName: string;
+  fishingGears: FishingGear[];
+  materialCosts: MaterialCost[];
+  startDate: Date | null;
+  endDate: Date | null;
+  departurePort: string;
+  arrivalPort: string;
+  initialStock: string;
+}
+
+interface FishingGear {
+  id: string;
+  name: string;
+  quantity: number;
+}
+
+interface MaterialCost {
+  id: string;
+  name: string;
+  quantity: number;
+  unit: string;
+  price: number;
+}
+```
+
+## Integration with Diary Screen
+
+### Changes to [diary.tsx](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/app/(tabs)/diary.tsx)
+
+1. **Import AddTripModal:**
+```typescript
+import AddTripModal from "@/components/diary/addTripModal";
+```
+
+2. **Add State:**
+```typescript
+const [showAddTripModal, setShowAddTripModal] = useState(false);
+```
+
+3. **Update Button:**
+```typescript
+<TouchableOpacity
+  style={[styles.addButton, themedStyles.addButton]}
+  onPress={() => setShowAddTripModal(true)}
+  activeOpacity={0.7}
+>
+  <Ionicons name="add" size={20} color="#FFFFFF" />
+  <Text style={styles.addButtonText}>{t("diary.addTrip")}</Text>
+</TouchableOpacity>
+```
+
+4. **Add Modal Component:**
+```typescript
+<AddTripModal
+  visible={showAddTripModal}
+  onClose={() => setShowAddTripModal(false)}
+/>
+```
+
+## Localization (i18n)
+
+### Added Translation Keys
+
+#### Vietnamese ([vi.json](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/locales/vi.json))
+```json
+{
+  "common": {
+    "done": "Xong"
+  },
+  "diary": {
+    "createTrip": "Tạo chuyến đi",
+    "tripNameLabel": "Tên chuyến đi",
+    "tripNamePlaceholder": "Nhập tên chuyến đi",
+    "fishingGearList": "Danh sách ngư cụ",
+    "addFishingGear": "Thêm ngư cụ",
+    "quantity": "Số lượng",
+    "materialCostList": "Chi phí nguyên liệu",
+    "addMaterialCost": "Thêm nguyên liệu",
+    "tripDuration": "Thời gian chuyến đi",
+    "startDate": "Bắt đầu",
+    "endDate": "Kết thúc",
+    "selectDate": "Chọn ngày",
+    "selectStartDate": "Chọn ngày bắt đầu",
+    "selectEndDate": "Chọn ngày kết thúc",
+    "portLabel": "Cảng",
+    "departurePort": "Cảng khởi hành",
+    "arrivalPort": "Cảng cập bến",
+    "selectPort": "Chọn cảng",
+    "basicInfo": "Thông tin cơ bản",
+    "initialStock": "Ổ khai thác",
+    "initialStockPlaceholder": "Nhập số ổ khai thác",
+    "autoFill": {
+      "title": "Tự động điền dữ liệu",
+      "description": "Điền từ chuyến đi cuối cùng của tàu",
+      "selectShip": "Chọn tàu",
+      "modalTitle": "Chọn tàu để lấy dữ liệu",
+      "loading": "Đang tải dữ liệu...",
+      "success": "Đã điền dữ liệu từ chuyến đi cuối cùng",
+      "error": "Không thể lấy dữ liệu chuyến đi",
+      "noData": "Không có dữ liệu chuyến đi trước đó"
+    }
+  }
+}
+```
+
+#### English ([en.json](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/locales/en.json))
+- All corresponding English translations added
+
+## Features
+
+### ✅ Implemented
+- [x] Modal với animation slide từ dưới lên
+- [x] Header với nút đóng và tiêu đề
+- [x] Scrollable content area
+- [x] Component tách biệt rõ ràng (8 components)
+- [x] Form validation cơ bản
+- [x] Theme support (light/dark mode)
+- [x] i18n support (Vietnamese/English)
+- [x] Console logging khi submit (thay vì API call)
+- [x] Reset form khi cancel/submit thành công
+- [x] Add/Remove fishing gears
+- [x] Add/Remove material costs
+- [x] Date pickers với validation
+- [x] Port selectors (placeholder cho future implementation)
+- [x] Basic info input
+- [x] **Auto-fill từ chuyến đi cuối cùng của tàu**
+  - Chọn tàu để lấy dữ liệu
+  - Gọi API GET /api/sgw/trips/last/{thingId}
+  - Tự động điền tất cả các trường dữ liệu
+  - Hiển thị Alert thông báo thành công
+
+### 🚧 Future Enhancements (TODO)
+- [ ] Modal chi tiết để thêm/edit fishing gear (hiện tại dùng dummy data)
+- [ ] Modal chi tiết để thêm/edit material cost (hiện tại dùng dummy data)
+- [ ] Dropdown/Modal chọn cảng thực tế
+- [ ] Form validation chi tiết (required fields, format validation)
+- [ ] API integration thay vì console.log
+- [ ] Loading state khi submit
+- [ ] Error handling và hiển thị thông báo
+- [ ] Success notification sau khi tạo
+- [ ] Refresh danh sách trips sau khi tạo mới
+
+## Testing
+
+### How to Test
+1. Chạy ứng dụng: `npx expo start`
+2. Mở tab "Nhật ký" (Diary)
+3. Nhấn nút "Thêm chuyến đi"
+4. Điền thông tin vào form
+5. Nhấn nút "Thêm ngư cụ" hoặc "Thêm nguyên liệu" để test add/remove
+6. Chọn ngày bắt đầu và kết thúc
+7. Nhấn "Tạo chuyến đi" để xem console log output
+
+### Expected Console Output
+```json
+=== Submitting Trip Data ===
+{
+  "tripName": "Chuyến đi mẫu",
+  "fishingGears": [
+    {
+      "id": "1733637655123",
+      "name": "Ngư cụ 1",
+      "quantity": 1
+    }
+  ],
+  "materialCosts": [
+    {
+      "id": "1733637660456",
+      "name": "Nguyên liệu 1",
+      "quantity": 1,
+      "unit": "kg",
+      "price": 0
+    }
+  ],
+  "startDate": "2024-12-08T04:00:00.000Z",
+  "endDate": "2024-12-15T04:00:00.000Z",
+  "departurePort": "Cảng Nha Trang",
+  "arrivalPort": "Cảng Quy Nhơn",
+  "initialStock": "10"
+}
+=== End Trip Data ===
+```
+
+## Code Quality
+
+- ✅ TypeScript types cho tất cả interfaces
+- ✅ Proper component separation
+- ✅ Theme-aware styling
+- ✅ Internationalization support
+- ✅ Clean code structure
+- ✅ Reusable components
+- ✅ No circular dependencies
+- ✅ Platform-specific styles (iOS/Android)
+
+## Summary
+
+Modal Add Trip đã được implement hoàn chỉnh với:
+- **7 components** tách biệt rõ ràng trong [addTripModal](file:///Users/nguyennhatminh/Documents/file%20code/Smatec/sgw-owner-app/components/diary/addTripModal) directory
+- **UI đầy đủ** theo design reference từ ảnh upload
+- **Chức năng log** dữ liệu thay vì API call (đúng yêu cầu)
+- **Theme support** cho dark/light mode
+- **i18n support** cho cả Tiếng Việt và English
+- **Ready for API integration** khi cần
+
+Tất cả code đã được tích hợp vào diary screen và sẵn sàng để test!
--- a/app/(tabs)/diary.tsx
+++ b/app/(tabs)/diary.tsx
@@ -1,7 +1,8 @@
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import {
+  ActivityIndicator,
+  FlatList,
  Platform,
-  ScrollView,
  StyleSheet,
  Text,
  TouchableOpacity,
@@ -12,6 +13,7 @@ import { Ionicons } from "@expo/vector-icons";
 import FilterButton from "@/components/diary/FilterButton";
 import TripCard from "@/components/diary/TripCard";
 import FilterModal, { FilterValues } from "@/components/diary/FilterModal";
+import AddTripModal from "@/components/diary/addTripModal";
 import { useThings } from "@/state/use-thing";
 import { useTripsList } from "@/state/use-tripslist";
 import dayjs from "dayjs";
@@ -22,6 +24,7 @@ export default function diary() {
  const { t } = useI18n();
  const { colors } = useThemeContext();
  const [showFilterModal, setShowFilterModal] = useState(false);
+  const [showAddTripModal, setShowAddTripModal] = useState(false);
  const [filters, setFilters] = useState<FilterValues>({
    status: null,
    startDate: null,
@@ -29,6 +32,12 @@ export default function diary() {
    selectedShip: null, // Tàu được chọn
  });

+  // State for pagination
+  const [allTrips, setAllTrips] = useState<any[]>([]);
+  const [isLoadingMore, setIsLoadingMore] = useState(false);
+  const [hasMore, setHasMore] = useState(true);
+  const isInitialLoad = useRef(true);
+
  // Body call API things (đang fix cứng)
  const payloadThings: Model.SearchThingBody = {
    offset: 0,
@@ -65,18 +74,48 @@ export default function diary() {
    },
  });

-  const { tripsList, getTripsList } = useTripsList();
+  const { tripsList, getTripsList, loading } = useTripsList();
+
+  // console.log("Payload trips:", payloadTrips);

  // Gọi API trips lần đầu
  useEffect(() => {
+    isInitialLoad.current = true;
+    setAllTrips([]);
+    setHasMore(true);
    getTripsList(payloadTrips);
  }, []);

-  // Gọi lại API khi payload thay đổi (do filter)
+  // Xử lý khi nhận được dữ liệu mới từ API
  useEffect(() => {
-    getTripsList(payloadTrips);
-    console.log("Payload trips:", payloadTrips);
-  }, [payloadTrips]);
+    if (tripsList?.trips && tripsList.trips.length > 0) {
+      if (isInitialLoad.current || payloadTrips.offset === 0) {
+        // Load lần đầu hoặc reset do filter
+        setAllTrips(tripsList.trips);
+        isInitialLoad.current = false;
+      } else {
+        // Load more - append data
+        setAllTrips((prevTrips) => {
+          // Tránh duplicate bằng cách check ID
+          const existingIds = new Set(prevTrips.map((trip) => trip.id));
+          const newTrips = tripsList.trips!.filter(
+            (trip) => !existingIds.has(trip.id)
+          );
+          return [...prevTrips, ...newTrips];
+        });
+      }
+
+      // Check if có thêm data không
+      const totalFetched = payloadTrips.offset + tripsList.trips.length;
+      setHasMore(totalFetched < (tripsList.total || 0));
+      setIsLoadingMore(false);
+    } else if (tripsList && payloadTrips.offset === 0) {
+      // Trường hợp API trả về rỗng khi filter
+      setAllTrips([]);
+      setHasMore(false);
+      setIsLoadingMore(false);
+    }
+  }, [tripsList]);

  const handleFilter = () => {
    setShowFilterModal(true);
@@ -85,10 +124,11 @@ export default function diary() {
  const handleApplyFilters = (newFilters: FilterValues) => {
    setFilters(newFilters);

-    // Cập nhật payload với filter mới
+    // Cập nhật payload với filter mới và reset offset
    // Lưu ý: status gửi lên server là string
    const updatedPayload: Model.TripListBody = {
      ...payloadTrips,
+      offset: 0, // Reset về đầu khi filter
      metadata: {
        ...payloadTrips.metadata,
        from: newFilters.startDate
@@ -104,10 +144,30 @@ export default function diary() {
      },
    };

+    // Reset trips khi apply filter mới
+    setAllTrips([]);
+    setHasMore(true);
    setPayloadTrips(updatedPayload);
+    getTripsList(updatedPayload);
    setShowFilterModal(false);
  };

+  // Hàm load more data khi scroll đến cuối
+  const handleLoadMore = useCallback(() => {
+    if (isLoadingMore || !hasMore) {
+      return;
+    }
+
+    setIsLoadingMore(true);
+    const newOffset = payloadTrips.offset + payloadTrips.limit;
+    const updatedPayload = {
+      ...payloadTrips,
+      offset: newOffset,
+    };
+    setPayloadTrips(updatedPayload);
+    getTripsList(updatedPayload);
+  }, [isLoadingMore, hasMore, payloadTrips]);
+
  const handleTripPress = (tripId: string) => {
    // TODO: Navigate to trip detail
    console.log("Trip pressed:", tripId);
@@ -157,6 +217,59 @@ export default function diary() {
    },
  };

+  // Render mỗi item trong FlatList
+  const renderTripItem = useCallback(
+    ({ item }: { item: any }) => (
+      <TripCard
+        trip={item}
+        onPress={() => handleTripPress(item.id)}
+        onView={() => handleViewTrip(item.id)}
+        onEdit={() => handleEditTrip(item.id)}
+        onTeam={() => handleViewTeam(item.id)}
+        onSend={() => handleSendTrip(item.id)}
+        onDelete={() => handleDeleteTrip(item.id)}
+      />
+    ),
+    []
+  );
+
+  // Key extractor cho FlatList
+  const keyExtractor = useCallback((item: any) => item.id, []);
+
+  // Loading indicator khi load more
+  const renderFooter = () => {
+    // Không hiển thị loading footer nếu không có dữ liệu hoặc không đang load more
+    if (!isLoadingMore || allTrips.length === 0) return null;
+    return (
+      <View style={styles.loadingFooter}>
+        <ActivityIndicator size="small" color={colors.primary} />
+        <Text style={[styles.loadingText, { color: colors.textSecondary }]}>
+          {t("diary.loadingMore")}
+        </Text>
+      </View>
+    );
+  };
+
+  // Empty component
+  const renderEmpty = () => {
+    // Hiển thị loading khi đang load (lần đầu hoặc load more) và chưa có dữ liệu
+    if (loading && allTrips.length === 0) {
+      return (
+        <View style={styles.emptyState}>
+          <ActivityIndicator size="large" color={colors.primary} />
+        </View>
+      );
+    }
+    // Chỉ hiển thị "không có dữ liệu" khi đã load xong và thực sự không có trips
+    return (
+      <View style={styles.emptyState}>
+        <Text style={[styles.emptyText, themedStyles.emptyText]}>
+          {t("diary.noTripsFound")}
+        </Text>
+      </View>
+    );
+  };
+
  return (
    <SafeAreaView style={[styles.safeArea, themedStyles.safeArea]} edges={["top"]}>
      <View style={styles.container}>
@@ -176,7 +289,7 @@ export default function diary() {
          />
          <TouchableOpacity
            style={[styles.addButton, themedStyles.addButton]}
-            onPress={() => console.log("Add trip")}
+            onPress={() => setShowAddTripModal(true)}
            activeOpacity={0.7}
          >
            <Ionicons name="add" size={20} color="#FFFFFF" />
@@ -189,33 +302,22 @@ export default function diary() {
          {t("diary.tripListCount", { count: tripsList?.total || 0 })}
        </Text>

-        {/* Trip List */}
-        <ScrollView
-          style={styles.scrollView}
+        {/* Trip List with FlatList */}
+        <FlatList
+          data={allTrips}
+          renderItem={renderTripItem}
+          keyExtractor={keyExtractor}
          contentContainerStyle={styles.scrollContent}
          showsVerticalScrollIndicator={false}
-        >
-          {tripsList?.trips?.map((trip) => (
-            <TripCard
-              key={trip.id}
-              trip={trip}
-              onPress={() => handleTripPress(trip.id)}
-              onView={() => handleViewTrip(trip.id)}
-              onEdit={() => handleEditTrip(trip.id)}
-              onTeam={() => handleViewTeam(trip.id)}
-              onSend={() => handleSendTrip(trip.id)}
-              onDelete={() => handleDeleteTrip(trip.id)}
-            />
-          ))}
-
-          {(!tripsList || !tripsList.trips || tripsList.trips.length === 0) && (
-            <View style={styles.emptyState}>
-              <Text style={[styles.emptyText, themedStyles.emptyText]}>
-                {t("diary.noTripsFound")}
-              </Text>
-            </View>
-          )}
-        </ScrollView>
+          onEndReached={handleLoadMore}
+          onEndReachedThreshold={0.5}
+          ListFooterComponent={renderFooter}
+          ListEmptyComponent={renderEmpty}
+          removeClippedSubviews={true}
+          maxToRenderPerBatch={10}
+          windowSize={10}
+          initialNumToRender={10}
+        />
      </View>

      {/* Filter Modal */}
@@ -224,6 +326,12 @@ export default function diary() {
        onClose={() => setShowFilterModal(false)}
        onApply={handleApplyFilters}
      />
+
+      {/* Add Trip Modal */}
+      <AddTripModal
+        visible={showAddTripModal}
+        onClose={() => setShowAddTripModal(false)}
+      />
    </SafeAreaView>
  );
 }
@@ -289,9 +397,6 @@ const styles = StyleSheet.create({
      default: "System",
    }),
  },
-  scrollView: {
-    flex: 1,
-  },
  scrollContent: {
    paddingBottom: 20,
  },
@@ -308,4 +413,19 @@ const styles = StyleSheet.create({
      default: "System",
    }),
  },
+  loadingFooter: {
+    paddingVertical: 20,
+    alignItems: "center",
+    justifyContent: "center",
+    flexDirection: "row",
+    gap: 10,
+  },
+  loadingText: {
+    fontSize: 14,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
 });
--- a/app/(tabs)/warning.tsx
+++ b/app/(tabs)/warning.tsx
@@ -1,302 +1,246 @@
+import { AlarmCard } from "@/components/alarm/AlarmCard";
+import AlarmSearchForm from "@/components/alarm/AlarmSearchForm";
 import { ThemedText } from "@/components/themed-text";
 import { ThemedView } from "@/components/themed-view";
+import { queryAlarms } from "@/controller/AlarmController";
+import { useThemeContext } from "@/hooks/use-theme-context";
 import { Ionicons } from "@expo/vector-icons";
-import dayjs from "dayjs";
-import React, { useCallback, useMemo } from "react";
-import { FlatList, StyleSheet, TouchableOpacity, View } from "react-native";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import {
+  ActivityIndicator,
+  Animated,
+  FlatList,
+  LayoutAnimation,
+  Platform,
+  StyleSheet,
+  TouchableOpacity,
+  View,
+} from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
-import { AlarmData } from ".";

-// ============ Types ============
-type AlarmType = "approaching" | "entered" | "fishing";
+const PAGE_SIZE = 2;

-interface AlarmCardProps {
-  alarm: AlarmData;
-  onPress?: () => void;
-}
+const WarningScreen = () => {
+  const [defaultAlarmParams, setDefaultAlarmParams] =
+    useState<Model.AlarmPayload>({
+      offset: 0,
+      limit: PAGE_SIZE,
+      order: "time",
+      dir: "desc",
+    });
+  const [alarms, setAlarms] = useState<Model.Alarm[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [isLoadingMore, setIsLoadingMore] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
+  const [offset, setOffset] = useState(0);
+  const [hasMore, setHasMore] = useState(true);
+  const [isShowSearchForm, setIsShowSearchForm] = useState(false);
+  const [formOpacity] = useState(new Animated.Value(0));

-// ============ Config ============
-const ALARM_CONFIG: Record<
-  AlarmType,
-  {
-    icon: keyof typeof Ionicons.glyphMap;
-    label: string;
-    bgColor: string;
-    borderColor: string;
-    iconBgColor: string;
-    iconColor: string;
-    labelColor: string;
-  }
-> = {
-  entered: {
-    icon: "warning",
-    label: "Xâm nhập",
-    bgColor: "bg-red-50",
-    borderColor: "border-red-200",
-    iconBgColor: "bg-red-100",
-    iconColor: "#DC2626",
-    labelColor: "text-red-600",
-  },
-  approaching: {
-    icon: "alert-circle",
-    label: "Tiếp cận",
-    bgColor: "bg-amber-50",
-    borderColor: "border-amber-200",
-    iconBgColor: "bg-amber-100",
-    iconColor: "#D97706",
-    labelColor: "text-amber-600",
-  },
-  fishing: {
-    icon: "fish",
-    label: "Đánh bắt",
-    bgColor: "bg-orange-50",
-    borderColor: "border-orange-200",
-    iconBgColor: "bg-orange-100",
-    iconColor: "#EA580C",
-    labelColor: "text-orange-600",
-  },
-};
+  const { colors } = useThemeContext();

-// ============ Helper Functions ============
-const formatTimestamp = (timestamp?: number): string => {
-  if (!timestamp) return "N/A";
-  return dayjs.unix(timestamp).format("DD/MM/YYYY HH:mm:ss");
-};
+  const hasFilters = useMemo(() => {
+    return Boolean(
+      (defaultAlarmParams as any)?.name ||
+        ((defaultAlarmParams as any)?.level !== undefined &&
+          (defaultAlarmParams as any).level !== 0) ||
+        (defaultAlarmParams as any)?.confirmed !== undefined
+    );
+  }, [defaultAlarmParams]);

-// ============ AlarmCard Component ============
-const AlarmCard = React.memo(({ alarm, onPress }: AlarmCardProps) => {
-  const config = ALARM_CONFIG[alarm.type];
+  useEffect(() => {
+    getAlarmsData(0, false);
+  }, []);

-  return (
-    <TouchableOpacity
-      onPress={onPress}
-      activeOpacity={0.7}
-      className={`rounded-2xl p-4 ${config.bgColor} ${config.borderColor} border shadow-sm`}
-    >
-      <View className="flex-row items-start gap-3">
-        {/* Icon Container */}
-        <View
-          className={`w-12 h-12 rounded-xl items-center justify-center ${config.iconBgColor}`}
-        >
-          <Ionicons name={config.icon} size={24} color={config.iconColor} />
-        </View>
+  useEffect(() => {
+    if (isShowSearchForm) {
+      // Reset opacity to 0, then animate to 1
+      formOpacity.setValue(0);
+      Animated.timing(formOpacity, {
+        toValue: 1,
+        duration: 300,
+        useNativeDriver: true,
+      }).start();
+    } else {
+      formOpacity.setValue(0);
+    }
+  }, [isShowSearchForm, formOpacity]);

-        {/* Content */}
-        <View className="flex-1">
-          {/* Header: Ship name + Badge */}
-          <View className="flex-row items-center justify-between mb-1">
-            <ThemedText className="text-base font-bold text-gray-800 flex-1 mr-2">
-              {alarm.ship_name || alarm.thing_id}
-            </ThemedText>
-            <View className={`px-2 py-1 rounded-full ${config.iconBgColor}`}>
-              <ThemedText
-                className={`text-xs font-semibold ${config.labelColor}`}
-              >
-                {config.label}
-              </ThemedText>
-            </View>
-          </View>
+  const getAlarmsData = async (
+    nextOffset = 0,
+    append = false,
+    paramsOverride?: Model.AlarmPayload
+  ) => {
+    try {
+      if (append) setIsLoadingMore(true);
+      else setLoading(true);
+      // console.log("Call alarm with offset: ", nextOffset);
+      const usedParams = paramsOverride ?? defaultAlarmParams;
+      // console.log("params: ", usedParams);

-          {/* Zone Info */}
-          <ThemedText className="text-sm text-gray-600 mb-2" numberOfLines={2}>
-            {alarm.zone.message || alarm.zone.zone_name}
-          </ThemedText>
+      const resp = await queryAlarms({
+        ...usedParams,
+        offset: nextOffset,
+      });
+      const slice = resp.data?.alarms ?? [];

-          {/* Footer: Zone ID + Time */}
-          <View className="flex-row items-center justify-between">
-            <View className="flex-row items-center gap-1">
-              <Ionicons name="time-outline" size={20} color="#6B7280" />
-              <ThemedText className="text-xs text-gray-500">
-                {formatTimestamp(alarm.zone.gps_time)}
-              </ThemedText>
-            </View>
-          </View>
-        </View>
-      </View>
-    </TouchableOpacity>
-  );
-});
+      setAlarms((prev) => (append ? [...prev, ...slice] : slice));
+      setOffset(nextOffset);
+      setHasMore(nextOffset + PAGE_SIZE < resp.data?.total!);
+    } catch (error) {
+      console.error("Cannot get Alarm Data: ", error);
+    } finally {
+      setLoading(false);
+      setIsLoadingMore(false);
+      setRefreshing(false);
+    }
+  };

-AlarmCard.displayName = "AlarmCard";
-
-// ============ Main Component ============
-interface WarningScreenProps {
-  alarms?: AlarmData[];
-}
-
-export default function WarningScreen({ alarms = [] }: WarningScreenProps) {
-  // Mock data for demo - replace with actual props
-  const sampleAlarms: AlarmData[] = useMemo(
-    () => [
-      {
-        thing_id: "SHIP-001",
-        ship_name: "Ocean Star",
-        type: "entered",
-        zone: {
-          zone_type: 1,
-          zone_name: "Khu vực cấm A1",
-          zone_id: "A1",
-          message: "Tàu đã đi vào vùng cấm A1",
-          alarm_type: 1,
-          lat: 10.12345,
-          lon: 106.12345,
-          s: 12,
-          h: 180,
-          fishing: false,
-          gps_time: 1733389200,
-        },
-      },
-      {
-        thing_id: "SHIP-002",
-        ship_name: "Blue Whale",
-        type: "approaching",
-        zone: {
-          zone_type: 2,
-          zone_name: "Vùng cảnh báo B3",
-          zone_id: "B3",
-          message: "Tàu đang tiếp cận khu vực cấm B3",
-          alarm_type: 2,
-          lat: 9.87654,
-          lon: 105.87654,
-          gps_time: 1733389260,
-        },
-      },
-      {
-        thing_id: "SHIP-003",
-        ship_name: "Sea Dragon",
-        type: "fishing",
-        zone: {
-          zone_type: 3,
-          zone_name: "Vùng cấm đánh bắt C2",
-          zone_id: "C2",
-          message: "Phát hiện hành vi đánh bắt trong vùng cấm C2",
-          alarm_type: 3,
-          lat: 11.11223,
-          lon: 107.44556,
-          fishing: true,
-          gps_time: 1733389320,
-        },
-      },
-      {
-        thing_id: "SHIP-004",
-        ship_name: "Red Coral",
-        type: "entered",
-        zone: {
-          zone_type: 1,
-          zone_name: "Khu vực A2",
-          zone_id: "A2",
-          message: "Tàu đã đi sâu vào khu vực A2",
-          alarm_type: 1,
-          gps_time: 1733389380,
-        },
-      },
-      {
-        thing_id: "SHIP-005",
-        ship_name: "Silver Wind",
-        type: "approaching",
-        zone: {
-          zone_type: 2,
-          zone_name: "Vùng B1",
-          zone_id: "B1",
-          message: "Tàu đang tiến gần vào vùng B1",
-          alarm_type: 2,
-          gps_time: 1733389440,
-        },
-      },
-    ],
-    []
-  );
-
-  const displayAlarms = alarms.length > 0 ? alarms : sampleAlarms;
-
-  const handleAlarmPress = useCallback((alarm: AlarmData) => {
-    console.log("Alarm pressed:", alarm);
-    // TODO: Navigate to alarm detail or show modal
+  const handleAlarmReload = useCallback((onReload: boolean) => {
+    if (onReload) {
+      getAlarmsData(0, false, undefined);
+    }
  }, []);

  const renderAlarmCard = useCallback(
-    ({ item }: { item: AlarmData }) => (
-      <AlarmCard alarm={item} onPress={() => handleAlarmPress(item)} />
+    ({ item }: { item: Model.Alarm }) => (
+      <AlarmCard alarm={item} onReload={handleAlarmReload} />
    ),
-    [handleAlarmPress]
+    [handleAlarmReload]
  );

  const keyExtractor = useCallback(
-    (item: AlarmData, index: number) => `${item.thing_id}-${index}`,
+    (item: Model.Alarm, index: number) =>
+      `${`${item.id} + ${item.time} + ${item.level} + ${index}` || index}`,
    []
  );

-  const ItemSeparator = useCallback(() => <View className="h-3" />, []);
+  const handleLoadMore = useCallback(() => {
+    if (isLoadingMore || !hasMore) return;
+    const nextOffset = offset + PAGE_SIZE;
+    getAlarmsData(nextOffset, true);
+  }, [isLoadingMore, hasMore, offset]);

-  // Count alarms by type
-  const alarmCounts = useMemo(() => {
-    return displayAlarms.reduce((acc, alarm) => {
-      acc[alarm.type] = (acc[alarm.type] || 0) + 1;
-      return acc;
-    }, {} as Record<AlarmType, number>);
-  }, [displayAlarms]);
+  const handleRefresh = useCallback(() => {
+    setRefreshing(true);
+    getAlarmsData(0, false, undefined);
+  }, []);
+
+  const onSearch = useCallback(
+    (values: { name?: string; level?: number; confirmed?: boolean }) => {
+      const mapped = {
+        offset: 0,
+        limit: defaultAlarmParams.limit,
+        order: defaultAlarmParams.order,
+        dir: defaultAlarmParams.dir,
+        ...(values.name && { name: values.name }),
+        ...(values.level && values.level !== 0 && { level: values.level }),
+        ...(values.confirmed !== undefined && { confirmed: values.confirmed }),
+      };
+
+      setDefaultAlarmParams(mapped);
+      // Call getAlarmsData with the mapped params directly so the
+      // request uses the updated params immediately (setState is async)
+      getAlarmsData(0, false, mapped);
+      toggleSearchForm();
+    },
+    [defaultAlarmParams]
+  );
+
+  const toggleSearchForm = useCallback(() => {
+    if (Platform.OS === "ios") {
+      LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
+    }
+
+    if (isShowSearchForm) {
+      // Hide form
+      Animated.timing(formOpacity, {
+        toValue: 0,
+        duration: 300,
+        useNativeDriver: true,
+      }).start(() => {
+        setIsShowSearchForm(false);
+      });
+    } else {
+      // Show form
+      setIsShowSearchForm(true);
+      Animated.timing(formOpacity, {
+        toValue: 1,
+        duration: 300,
+        useNativeDriver: true,
+      }).start();
+    }
+  }, [isShowSearchForm, formOpacity]);

  return (
    <SafeAreaView style={styles.container} edges={["top"]}>
      <ThemedView style={styles.content}>
        {/* Header */}
        <View style={styles.header}>
-          <View className="flex-row items-center gap-3">
-            <View className="w-10 h-10 rounded-xl bg-red-500 items-center justify-center">
-              <Ionicons name="warning" size={22} color="#fff" />
-            </View>
+          <View style={styles.headerLeft}>
            <ThemedText style={styles.titleText}>Cảnh báo</ThemedText>
          </View>
-          <View className="bg-red-500 px-3 py-1 rounded-full">
-            <ThemedText className="text-white text-sm font-semibold">
-              {displayAlarms.length}
-            </ThemedText>
+          <View style={styles.badgeContainer}>
+            <TouchableOpacity onPress={toggleSearchForm}>
+              <Ionicons
+                size={20}
+                name="filter-outline"
+                color={hasFilters ? colors.primary : colors.text}
+              />
+            </TouchableOpacity>
          </View>
        </View>

-        {/* Stats Bar */}
-        <View className="flex-row px-4 pb-3 gap-2">
-          {(["entered", "approaching", "fishing"] as AlarmType[]).map(
-            (type) => {
-              const config = ALARM_CONFIG[type];
-              const count = alarmCounts[type] || 0;
-              return (
-                <View
-                  key={type}
-                  className={`flex-1 flex-row items-center justify-center gap-1 py-2 rounded-lg ${config.iconBgColor}`}
-                >
-                  <Ionicons
-                    name={config.icon}
-                    size={14}
-                    color={config.iconColor}
-                  />
-                  <ThemedText
-                    className={`text-xs font-medium ${config.labelColor}`}
-                  >
-                    {count}
-                  </ThemedText>
-                </View>
-              );
-            }
-          )}
-        </View>
+        {/* Search Form */}
+        {isShowSearchForm && (
+          <Animated.View style={{ opacity: formOpacity, zIndex: 100 }}>
+            <AlarmSearchForm
+              initialValue={{
+                name: defaultAlarmParams.name || "",
+                level: defaultAlarmParams.level || 0,
+                confirmed: defaultAlarmParams.confirmed,
+              }}
+              onSubmit={onSearch}
+              onReset={toggleSearchForm}
+            />
+          </Animated.View>
+        )}

        {/* Alarm List */}
-        <FlatList
-          data={displayAlarms}
-          renderItem={renderAlarmCard}
-          keyExtractor={keyExtractor}
-          ItemSeparatorComponent={ItemSeparator}
-          contentContainerStyle={styles.listContent}
-          showsVerticalScrollIndicator={false}
-          initialNumToRender={10}
-          maxToRenderPerBatch={10}
-          windowSize={5}
-        />
+        {alarms.length > 0 ? (
+          <FlatList
+            data={alarms}
+            renderItem={renderAlarmCard}
+            keyExtractor={keyExtractor}
+            contentContainerStyle={styles.listContent}
+            showsVerticalScrollIndicator={false}
+            onEndReached={handleLoadMore}
+            onEndReachedThreshold={0.5}
+            refreshing={refreshing}
+            onRefresh={handleRefresh}
+            ListFooterComponent={
+              isLoadingMore ? (
+                <View style={styles.footer}>
+                  <ActivityIndicator size="small" color="#dc2626" />
+                  <ThemedText style={styles.footerText}>Đang tải...</ThemedText>
+                </View>
+              ) : null
+            }
+          />
+        ) : (
+          <View style={styles.emptyContainer}>
+            <Ionicons name="shield-checkmark" size={48} color="#16a34a" />
+            <ThemedText style={styles.emptyText}>
+              Không có cảnh báo nào
+            </ThemedText>
+          </View>
+        )}
      </ThemedView>
    </SafeAreaView>
  );
-}
+};
+
+export default WarningScreen;

 const styles = StyleSheet.create({
  container: {
@@ -311,13 +255,60 @@ const styles = StyleSheet.create({
    justifyContent: "space-between",
    paddingHorizontal: 16,
    paddingVertical: 16,
+    borderBottomWidth: 1,
+    borderBottomColor: "#e5e7eb",
+  },
+  headerLeft: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: 12,
+  },
+  iconContainer: {
+    width: 40,
+    height: 40,
+    borderRadius: 8,
+    backgroundColor: "#dc2626",
+    alignItems: "center",
+    justifyContent: "center",
  },
  titleText: {
-    fontSize: 26,
+    fontSize: 24,
    fontWeight: "700",
  },
+  badgeContainer: {
+    // backgroundColor: "#dc2626",
+    paddingHorizontal: 12,
+    paddingVertical: 6,
+    borderRadius: 16,
+  },
+  badgeText: {
+    color: "#fff",
+    fontSize: 14,
+    fontWeight: "600",
+  },
  listContent: {
    paddingHorizontal: 16,
-    paddingBottom: 20,
+    paddingVertical: 16,
+  },
+  footer: {
+    paddingVertical: 16,
+    alignItems: "center",
+    justifyContent: "center",
+    flexDirection: "row",
+    gap: 8,
+  },
+  footerText: {
+    fontSize: 14,
+    fontWeight: "500",
+  },
+  emptyContainer: {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+    gap: 16,
+  },
+  emptyText: {
+    fontSize: 16,
+    fontWeight: "500",
  },
 });
--- a/components/ButtonCancelTrip.tsx
+++ b/components/ButtonCancelTrip.tsx
@@ -1,48 +0,0 @@
-import { useI18n } from "@/hooks/use-i18n";
-import React from "react";
-import { StyleSheet, Text, TouchableOpacity } from "react-native";
-
-interface ButtonCancelTripProps {
-  title?: string;
-  onPress?: () => void;
-}
-
-const ButtonCancelTrip: React.FC<ButtonCancelTripProps> = ({
-  title,
-  onPress,
-}) => {
-  const { t } = useI18n();
-  const displayTitle = title || t("trip.buttonCancelTrip.title");
-  return (
-    <TouchableOpacity
-      style={styles.button}
-      onPress={onPress}
-      activeOpacity={0.8}
-    >
-      <Text style={styles.text}>{displayTitle}</Text>
-    </TouchableOpacity>
-  );
-};
-
-const styles = StyleSheet.create({
-  button: {
-    backgroundColor: "#f45b57", // đỏ nhẹ giống ảnh
-    borderRadius: 8,
-    paddingVertical: 10,
-    paddingHorizontal: 20,
-    alignSelf: "flex-start",
-    shadowColor: "#000",
-    shadowOpacity: 0.1,
-    shadowRadius: 2,
-    shadowOffset: { width: 0, height: 1 },
-    elevation: 2, // cho Android
-  },
-  text: {
-    color: "#fff",
-    fontSize: 16,
-    fontWeight: "600",
-    textAlign: "center",
-  },
-});
-
-export default ButtonCancelTrip;
--- a/components/ButtonCreateNewHaulOrTrip.tsx
+++ b/components/ButtonCreateNewHaulOrTrip.tsx
@@ -1,213 +0,0 @@
-import { queryGpsData } from "@/controller/DeviceController";
-import {
-  queryStartNewHaul,
-  queryUpdateTripState,
-} from "@/controller/TripController";
-import { useI18n } from "@/hooks/use-i18n";
-import {
-  showErrorToast,
-  showSuccessToast,
-  showWarningToast,
-} from "@/services/toast_service";
-import { useTrip } from "@/state/use-trip";
-import { AntDesign } from "@expo/vector-icons";
-import React, { useEffect, useState } from "react";
-import { Alert, StyleSheet, View } from "react-native";
-import IconButton from "./IconButton";
-import CreateOrUpdateHaulModal from "./tripInfo/modal/CreateOrUpdateHaulModal";
-
-interface StartButtonProps {
-  gpsData?: Model.GPSResponse;
-  onPress?: () => void;
-}
-
-interface a {
-  fishingLogs?: Model.FishingLogInfo[] | null;
-  onCallback?: (fishingLogs: Model.FishingLogInfo[]) => void;
-  isEditing?: boolean;
-}
-
-const ButtonCreateNewHaulOrTrip: React.FC<StartButtonProps> = ({
-  gpsData,
-  onPress,
-}) => {
-  const [isStarted, setIsStarted] = useState(false);
-  const [isFinishHaulModalOpen, setIsFinishHaulModalOpen] = useState(false);
-  const { t } = useI18n();
-
-  const { trip, getTrip } = useTrip();
-  useEffect(() => {
-    getTrip();
-  }, []);
-
-  const checkHaulFinished = () => {
-    return trip?.fishing_logs?.some((h) => h.status === 0);
-  };
-
-  const handlePress = () => {
-    if (isStarted) {
-      Alert.alert(t("trip.endHaulTitle"), t("trip.endHaulConfirm"), [
-        {
-          text: t("trip.cancelButton"),
-          style: "cancel",
-        },
-        {
-          text: t("trip.endButton"),
-          onPress: () => {
-            setIsStarted(false);
-            Alert.alert(t("trip.successTitle"), t("trip.endHaulSuccess"));
-          },
-        },
-      ]);
-    } else {
-      Alert.alert(t("trip.startHaulTitle"), t("trip.startHaulConfirm"), [
-        {
-          text: t("trip.cancelButton"),
-          style: "cancel",
-        },
-        {
-          text: t("trip.startButton"),
-          onPress: () => {
-            setIsStarted(true);
-            Alert.alert(t("trip.successTitle"), t("trip.startHaulSuccess"));
-          },
-        },
-      ]);
-    }
-
-    if (onPress) {
-      onPress();
-    }
-  };
-
-  const handleStartTrip = async (state: number, note?: string) => {
-    if (trip?.trip_status !== 2) {
-      showWarningToast(t("trip.alreadyStarted"));
-      return;
-    }
-    try {
-      const resp = await queryUpdateTripState({
-        status: state,
-        note: note || "",
-      });
-      if (resp.status === 200) {
-        showSuccessToast(t("trip.startTripSuccess"));
-        await getTrip();
-      }
-    } catch (error) {
-      console.error("Error stating trip :", error);
-      showErrorToast("");
-    }
-  };
-
-  const createNewHaul = async () => {
-    if (trip?.fishing_logs?.some((f) => f.status === 0)) {
-      showWarningToast(t("trip.finishCurrentHaul"));
-      return;
-    }
-    if (!gpsData) {
-      const response = await queryGpsData();
-      gpsData = response.data;
-    }
-    try {
-      const body: Model.NewFishingLogRequest = {
-        trip_id: trip?.id || "",
-        start_at: new Date(),
-        start_lat: gpsData.lat,
-        start_lon: gpsData.lon,
-        weather_description: t("trip.weatherDescription"),
-      };
-
-      const resp = await queryStartNewHaul(body);
-      if (resp.status === 200) {
-        showSuccessToast(t("trip.startHaulSuccess"));
-        await getTrip();
-      } else {
-        showErrorToast(t("trip.createHaulFailed"));
-      }
-    } catch (error) {
-      console.log(error);
-      // showErrorToast(t("trip.createHaulFailed"));
-    }
-  };
-
-  // Không render gì nếu trip đã hoàn thành hoặc bị hủy
-  if (trip?.trip_status === 4 || trip?.trip_status === 5) {
-    return null;
-  }
-
-  return (
-    <View>
-      {trip?.trip_status === 2 ? (
-        <IconButton
-          icon={<AntDesign name="plus" />}
-          type="primary"
-          style={{ backgroundColor: "green", borderRadius: 10 }}
-          onPress={async () => handleStartTrip(3)}
-        >
-          {t("trip.startTrip")}
-        </IconButton>
-      ) : checkHaulFinished() ? (
-        <IconButton
-          icon={<AntDesign name="plus" color={"white"} />}
-          type="primary"
-          style={{ borderRadius: 10 }}
-          onPress={() => setIsFinishHaulModalOpen(true)}
-        >
-          {t("trip.endHaul")}
-        </IconButton>
-      ) : (
-        <IconButton
-          icon={<AntDesign name="plus" color={"white"} />}
-          type="primary"
-          style={{ borderRadius: 10 }}
-          onPress={async () => {
-            createNewHaul();
-          }}
-        >
-          {t("trip.startHaul")}
-        </IconButton>
-      )}
-      <CreateOrUpdateHaulModal
-        fishingLog={trip?.fishing_logs?.find((f) => f.status === 0)!}
-        fishingLogIndex={trip?.fishing_logs?.length!}
-        isVisible={isFinishHaulModalOpen}
-        onClose={function (): void {
-          setIsFinishHaulModalOpen(false);
-        }}
-      />
-    </View>
-  );
-};
-
-const styles = StyleSheet.create({
-  button: {
-    backgroundColor: "#4ecdc4", // màu ngọc lam
-    borderRadius: 8,
-    paddingVertical: 10,
-    paddingHorizontal: 16,
-    alignSelf: "flex-start",
-    shadowColor: "#000",
-    shadowOpacity: 0.15,
-    shadowRadius: 3,
-    shadowOffset: { width: 0, height: 2 },
-    elevation: 3, // hiệu ứng nổi trên Android
-  },
-  buttonActive: {
-    backgroundColor: "#e74c3c", // màu đỏ khi đang hoạt động
-  },
-  content: {
-    flexDirection: "row",
-    alignItems: "center",
-  },
-  icon: {
-    marginRight: 6,
-  },
-  text: {
-    color: "#fff",
-    fontSize: 16,
-    fontWeight: "600",
-  },
-});
-
-export default ButtonCreateNewHaulOrTrip;
--- a/components/ButtonEndTrip.tsx
+++ b/components/ButtonEndTrip.tsx
@@ -1,45 +0,0 @@
-import { useI18n } from "@/hooks/use-i18n";
-import React from "react";
-import { StyleSheet, Text, TouchableOpacity } from "react-native";
-
-interface ButtonEndTripProps {
-  title?: string;
-  onPress?: () => void;
-}
-
-const ButtonEndTrip: React.FC<ButtonEndTripProps> = ({ title, onPress }) => {
-  const { t } = useI18n();
-  const displayTitle = title || t("trip.buttonEndTrip.title");
-  return (
-    <TouchableOpacity
-      style={styles.button}
-      onPress={onPress}
-      activeOpacity={0.85}
-    >
-      <Text style={styles.text}>{displayTitle}</Text>
-    </TouchableOpacity>
-  );
-};
-
-const styles = StyleSheet.create({
-  button: {
-    backgroundColor: "#ed9434", // màu cam sáng
-    borderRadius: 8,
-    paddingVertical: 10,
-    paddingHorizontal: 28,
-    alignSelf: "flex-start",
-    shadowColor: "#000",
-    shadowOpacity: 0.1,
-    shadowRadius: 3,
-    shadowOffset: { width: 0, height: 1 },
-    elevation: 2, // hiệu ứng nổi trên Android
-  },
-  text: {
-    color: "#fff",
-    fontSize: 16,
-    fontWeight: "600",
-    textAlign: "center",
-  },
-});
-
-export default ButtonEndTrip;
--- a/components/alarm/AlarmCard.tsx
+++ b/components/alarm/AlarmCard.tsx
@@ -0,0 +1,439 @@
+import {
+  queryConfirmAlarm,
+  queryrUnconfirmAlarm,
+} from "@/controller/AlarmController";
+import { useThemeContext } from "@/hooks/use-theme-context";
+import { Ionicons } from "@expo/vector-icons";
+import dayjs from "dayjs";
+import React, { useMemo, useState } from "react";
+import {
+  ActivityIndicator,
+  Alert,
+  Modal,
+  StyleSheet,
+  Text,
+  TextInput,
+  TouchableOpacity,
+  View,
+} from "react-native";
+
+interface AlarmCardProps {
+  alarm: Model.Alarm;
+  onReload?: (onReload: boolean) => void;
+}
+
+export const AlarmCard: React.FC<AlarmCardProps> = ({ alarm, onReload }) => {
+  const { colors } = useThemeContext();
+  const [showModal, setShowModal] = useState(false);
+  const [note, setNote] = useState("");
+  const [submitting, setSubmitting] = useState(false);
+
+  const canSubmit = useMemo(
+    () => note.trim().length > 0 || alarm.confirmed,
+    [note, alarm.confirmed]
+  );
+
+  // Determine level and colors based on alarm level
+  const getAlarmConfig = (level?: number) => {
+    if (level === 3) {
+      // Danger - Red
+      return {
+        level: 3,
+        icon: "warning" as const,
+        bgColor: "#fee2e2",
+        borderColor: "#DC0E0E",
+        iconColor: "#dc2626",
+        statusBg: "#dcfce7",
+        statusText: "#166534",
+      };
+    } else if (level === 2) {
+      // Caution - Yellow/Orange
+      return {
+        level: 2,
+        icon: "alert-circle" as const,
+        bgColor: "#fef3c7",
+        borderColor: "#FF6C0C",
+        iconColor: "#d97706",
+        statusBg: "#fef08a",
+        statusText: "#713f12",
+      };
+    } else {
+      // Info - Green
+      return {
+        level: 1,
+        icon: "information-circle" as const,
+        bgColor: "#fffefe",
+        borderColor: "#FF937E",
+        iconColor: "#FF937E",
+        statusBg: "#dcfce7",
+        statusText: "#166534",
+      };
+    }
+  };
+
+  const config = getAlarmConfig(alarm.level);
+
+  const formatDate = (timestamp?: number) => {
+    if (!timestamp) return "N/A";
+    return dayjs.unix(timestamp).format("YYYY-MM-DD HH:mm");
+  };
+
+  const ensurePayload = () => {
+    if (!alarm.id || !alarm.thing_id || !alarm.time) {
+      Alert.alert("Thiếu dữ liệu", "Không đủ thông tin để xác nhận cảnh báo");
+      return false;
+    }
+    return true;
+  };
+
+  const submitConfirm = async (action: "confirm" | "unconfirm") => {
+    if (!ensurePayload()) return;
+    if (action === "confirm" && note.trim().length === 0) {
+      Alert.alert("Thông báo", "Vui lòng nhập ghi chú để xác nhận");
+      return;
+    }
+
+    try {
+      setSubmitting(true);
+      if (action === "confirm") {
+        await queryConfirmAlarm({
+          id: alarm.id!,
+          thing_id: alarm.thing_id!,
+          time: alarm.time!,
+          description: note.trim(),
+        });
+      } else {
+        await queryrUnconfirmAlarm({
+          id: alarm.id!,
+          thing_id: alarm.thing_id!,
+          time: alarm.time!,
+        });
+      }
+      onReload?.(true);
+    } catch (error: any) {
+      console.error("Cannot confirm/unconfirm alarm: ", error);
+      const status = error?.response?.status ?? error?.status;
+      // If server returns 404, ignore silently
+      if (status !== 404) {
+        Alert.alert("Lỗi", "Không thể xử lý yêu cầu. Vui lòng thử lại.");
+      }
+    } finally {
+      setSubmitting(false);
+      setShowModal(false);
+      setNote("");
+    }
+  };
+
+  const handlePress = (alarm: Model.Alarm) => {
+    if (alarm.confirmed) {
+      Alert.alert(
+        "Thông báo",
+        "Bạn có chắc muốn ngừng xác nhận cảnh báo này?",
+        [
+          { text: "Hủy", style: "cancel" },
+          {
+            text: "Ngừng xác nhận",
+            style: "destructive",
+            onPress: () => submitConfirm("unconfirm"),
+          },
+        ]
+      );
+    } else {
+      setShowModal(true);
+    }
+  };
+
+  return (
+    <View
+      style={[
+        styles.card,
+        {
+          backgroundColor: config.bgColor,
+          borderLeftColor: config.borderColor,
+          borderLeftWidth: 5,
+          boxShadow: "0px 1px 3px rgba(0, 0, 0, 0.2)",
+        },
+      ]}
+    >
+      <View style={styles.container}>
+        {/* Left Side - Icon and Content */}
+        <View style={styles.content}>
+          {/* Icon */}
+          <View
+            style={[styles.iconContainer, { backgroundColor: config.bgColor }]}
+          >
+            <Ionicons name={config.icon} size={24} color={config.iconColor} />
+          </View>
+
+          {/* Title and Info */}
+          <View style={styles.textContainer}>
+            {/* Name */}
+            <View style={styles.titleRow}>
+              <Text
+                style={[styles.title, { color: colors.text }]}
+                numberOfLines={2}
+              >
+                {alarm.name || alarm.thing_name || "Unknown"}
+              </Text>
+            </View>
+
+            {/* Location (thing_name) and Time */}
+            <View style={styles.infoRow}>
+              <View style={styles.infoItem}>
+                <Text
+                  style={[styles.infoLabel, { color: colors.textSecondary }]}
+                >
+                  Trạm
+                </Text>
+                <Text
+                  style={[styles.infoValue, { color: colors.text }]}
+                  numberOfLines={1}
+                >
+                  {alarm.thing_name || "Unknown"}
+                </Text>
+              </View>
+              <View style={styles.infoItem}>
+                <Text
+                  style={[styles.infoLabel, { color: colors.textSecondary }]}
+                >
+                  Thời gian
+                </Text>
+                <Text
+                  style={[styles.infoValue, { color: colors.text }]}
+                  numberOfLines={1}
+                >
+                  {formatDate(alarm.time)}
+                </Text>
+              </View>
+            </View>
+
+            {/* Status Badge */}
+            <TouchableOpacity
+              style={styles.statusContainer}
+              onPress={() => handlePress(alarm)}
+              activeOpacity={0.7}
+            >
+              <View
+                style={[
+                  styles.statusBadge,
+                  {
+                    backgroundColor: alarm.confirmed ? "#8FD14F" : "#EEEEEE",
+                  },
+                ]}
+              >
+                <Text
+                  style={[
+                    styles.statusText,
+                    { color: alarm.confirmed ? "#166534" : "black" },
+                  ]}
+                >
+                  {alarm.confirmed ? "Đã xác nhận" : "Chờ xác nhận"}
+                </Text>
+              </View>
+            </TouchableOpacity>
+          </View>
+        </View>
+
+        {alarm.confirmed && (
+          <View style={styles.rightIcon}>
+            <Ionicons
+              name="checkmark-done"
+              size={20}
+              color={alarm.confirmed ? "#78C841" : config.iconColor}
+            />
+          </View>
+        )}
+      </View>
+
+      <Modal
+        visible={showModal}
+        transparent
+        animationType="fade"
+        onRequestClose={() => setShowModal(false)}
+      >
+        <View style={styles.modalOverlay}>
+          <View
+            style={[
+              styles.modalContent,
+              { backgroundColor: colors.background },
+            ]}
+          >
+            <Text style={[styles.modalTitle, { color: colors.text }]}>
+              Nhập ghi chú xác nhận
+            </Text>
+            <TextInput
+              style={[styles.input, { color: colors.text }]}
+              placeholder="Nhập ghi chú"
+              placeholderTextColor={colors.textSecondary}
+              multiline
+              value={note}
+              onChangeText={setNote}
+              editable={!submitting}
+            />
+            <View style={styles.modalActions}>
+              <TouchableOpacity
+                style={[styles.modalButton, styles.cancelButton]}
+                onPress={() => {
+                  setShowModal(false);
+                  setNote("");
+                }}
+                disabled={submitting}
+              >
+                <Text style={styles.cancelText}>Hủy</Text>
+              </TouchableOpacity>
+              <TouchableOpacity
+                style={[
+                  styles.modalButton,
+                  styles.confirmButton,
+                  !canSubmit && styles.disabledButton,
+                ]}
+                onPress={() => submitConfirm("confirm")}
+                disabled={submitting || !canSubmit}
+              >
+                {submitting ? (
+                  <ActivityIndicator color="#fff" size="small" />
+                ) : (
+                  <Text style={styles.confirmText}>Xác nhận</Text>
+                )}
+              </TouchableOpacity>
+            </View>
+          </View>
+        </View>
+      </Modal>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  card: {
+    borderRadius: 12,
+    // borderWidth: 1,
+    paddingVertical: 16,
+    paddingHorizontal: 12,
+    marginBottom: 12,
+  },
+  container: {
+    flexDirection: "row",
+    alignItems: "flex-start",
+    justifyContent: "space-between",
+  },
+  content: {
+    flex: 1,
+    flexDirection: "row",
+    alignItems: "flex-start",
+  },
+  iconContainer: {
+    width: 48,
+    height: 48,
+    borderRadius: 12,
+    alignItems: "flex-start",
+    justifyContent: "flex-start",
+    // marginRight: 5,
+  },
+  textContainer: {
+    flex: 1,
+  },
+  titleRow: {
+    marginBottom: 8,
+  },
+  code: {
+    fontSize: 12,
+    fontWeight: "600",
+    marginBottom: 4,
+  },
+  title: {
+    fontSize: 16,
+    fontWeight: "600",
+    marginBottom: 8,
+  },
+  infoRow: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    marginBottom: 12,
+    gap: 16,
+  },
+  infoItem: {
+    flex: 1,
+  },
+  infoLabel: {
+    fontSize: 12,
+    marginBottom: 4,
+  },
+  infoValue: {
+    fontSize: 14,
+    fontWeight: "500",
+  },
+  statusContainer: {
+    marginTop: 8,
+  },
+  statusBadge: {
+    alignSelf: "flex-start",
+    paddingVertical: 6,
+    paddingHorizontal: 12,
+    borderRadius: 20,
+    borderWidth: 0.2,
+  },
+  statusText: {
+    fontSize: 12,
+    fontWeight: "600",
+  },
+  rightIcon: {
+    width: 24,
+    height: 24,
+    alignItems: "center",
+    justifyContent: "center",
+    marginLeft: 12,
+  },
+  modalOverlay: {
+    flex: 1,
+    backgroundColor: "rgba(0,0,0,0.3)",
+    justifyContent: "center",
+    paddingHorizontal: 16,
+  },
+  modalContent: {
+    borderRadius: 12,
+    padding: 16,
+    gap: 12,
+  },
+  modalTitle: {
+    fontSize: 16,
+    fontWeight: "700",
+  },
+  input: {
+    minHeight: 80,
+    borderRadius: 8,
+    borderWidth: 1,
+    borderColor: "#e5e7eb",
+    padding: 12,
+    textAlignVertical: "top",
+  },
+  modalActions: {
+    flexDirection: "row",
+    justifyContent: "flex-end",
+    gap: 12,
+  },
+  modalButton: {
+    paddingHorizontal: 16,
+    paddingVertical: 10,
+    borderRadius: 8,
+  },
+  cancelButton: {
+    backgroundColor: "#e5e7eb",
+  },
+  confirmButton: {
+    backgroundColor: "#dc2626",
+  },
+  disabledButton: {
+    opacity: 0.6,
+  },
+  cancelText: {
+    color: "#111827",
+    fontWeight: "600",
+  },
+  confirmText: {
+    color: "#fff",
+    fontWeight: "700",
+  },
+});
+
+export default AlarmCard;
--- a/components/alarm/AlarmSearchForm.tsx
+++ b/components/alarm/AlarmSearchForm.tsx
@@ -0,0 +1,305 @@
+import Select, { SelectOption } from "@/components/Select";
+import { ThemedText } from "@/components/themed-text";
+import { ThemedView } from "@/components/themed-view";
+import { useThemeContext } from "@/hooks/use-theme-context";
+import { Ionicons } from "@expo/vector-icons";
+import { useEffect } from "react";
+import { Controller, useForm } from "react-hook-form";
+import { StyleSheet, TextInput, TouchableOpacity, View } from "react-native";
+
+interface AlarmSearchFormProps {
+  initialValue?: {
+    name?: string;
+    level?: number;
+    confirmed?: boolean;
+  };
+  onSubmit: (payload: {
+    name?: string;
+    level?: number;
+    confirmed?: boolean;
+  }) => void;
+  onReset?: () => void;
+}
+
+interface FormData {
+  name: string;
+  level: number;
+  confirmed: string; // Using string for Select component compatibility
+}
+
+const AlarmSearchForm: React.FC<AlarmSearchFormProps> = ({
+  initialValue,
+  onSubmit,
+  onReset,
+}) => {
+  const { colors } = useThemeContext();
+
+  const levelOptions: SelectOption[] = [
+    { label: "Tất cả", value: 0 },
+    { label: "Cảnh báo", value: 1 },
+    { label: "Nguy hiểm", value: 2 },
+  ];
+
+  const confirmedOptions: SelectOption[] = [
+    { label: "Tất cả", value: "" },
+    { label: "Đã xác nhận", value: "true" },
+    { label: "Chưa xác nhận", value: "false" },
+  ];
+
+  const { control, handleSubmit, reset } = useForm<FormData>({
+    defaultValues: {
+      name: initialValue?.name || "",
+      level: initialValue?.level || 0,
+      confirmed:
+        initialValue?.confirmed !== undefined
+          ? initialValue.confirmed.toString()
+          : "",
+    },
+  });
+
+  useEffect(() => {
+    if (initialValue) {
+      reset({
+        name: initialValue.name || "",
+        level: initialValue.level || 0,
+        confirmed:
+          initialValue.confirmed !== undefined
+            ? initialValue.confirmed.toString()
+            : "",
+      });
+    }
+  }, [initialValue, reset]);
+
+  const onFormSubmit = (data: FormData) => {
+    const payload: {
+      name?: string;
+      level?: number;
+      confirmed?: boolean;
+    } = {
+      ...(data.name && { name: data.name }),
+      ...(data.level !== 0 && { level: data.level }),
+      ...(data.confirmed !== "" && {
+        confirmed: data.confirmed === "true",
+      }),
+    };
+
+    onSubmit(payload);
+  };
+
+  const handleReset = () => {
+    reset({
+      name: "",
+      level: 0,
+      confirmed: undefined,
+    });
+
+    // Submit empty payload to reset filters
+    onSubmit({});
+    onReset?.();
+  };
+
+  return (
+    <ThemedView
+      style={[
+        styles.container,
+        {
+          backgroundColor: colors.background,
+          borderBottomColor: colors.border,
+          height: "auto",
+        },
+      ]}
+    >
+      <View style={styles.content}>
+        {/* Search Input */}
+        <Controller
+          control={control}
+          name="name"
+          render={({ field: { onChange, onBlur, value } }) => (
+            <View style={styles.inputContainer}>
+              <ThemedText style={styles.label}>Tìm kiếm</ThemedText>
+              <View
+                style={[styles.inputWrapper, { borderColor: colors.border }]}
+              >
+                <TextInput
+                  style={[styles.input, { color: colors.text }]}
+                  placeholder="Tìm theo tên cảnh báo"
+                  placeholderTextColor={colors.textSecondary}
+                  value={value}
+                  onChangeText={onChange}
+                  onBlur={onBlur}
+                />
+                {value ? (
+                  <TouchableOpacity
+                    onPress={() => onChange("")}
+                    style={styles.clearButton}
+                  >
+                    <Ionicons
+                      name="close-circle"
+                      size={20}
+                      color={colors.textSecondary}
+                    />
+                  </TouchableOpacity>
+                ) : null}
+              </View>
+            </View>
+          )}
+        />
+
+        {/* Level and Confirmed Selects */}
+        <View style={styles.row}>
+          <View style={styles.halfWidth}>
+            <Controller
+              control={control}
+              name="level"
+              render={({ field: { onChange, value } }) => (
+                <View style={styles.selectContainer}>
+                  <ThemedText style={styles.label}>Mức độ</ThemedText>
+                  <Select
+                    placeholder="Chọn mức độ"
+                    value={value}
+                    onChange={onChange}
+                    options={levelOptions}
+                    size="middle"
+                  />
+                </View>
+              )}
+            />
+          </View>
+
+          <View style={styles.halfWidth}>
+            <Controller
+              control={control}
+              name="confirmed"
+              render={({ field: { onChange, value } }) => (
+                <View style={styles.selectContainer}>
+                  <ThemedText style={styles.label}>Trạng thái</ThemedText>
+                  <Select
+                    placeholder="Chọn trạng thái"
+                    value={value}
+                    onChange={onChange}
+                    options={confirmedOptions}
+                    size="middle"
+                  />
+                </View>
+              )}
+            />
+          </View>
+        </View>
+
+        {/* Action Buttons */}
+        <View style={styles.buttonRow}>
+          <TouchableOpacity
+            style={[
+              styles.button,
+              styles.secondaryButton,
+              {
+                backgroundColor: colors.backgroundSecondary,
+                borderColor: colors.border,
+              },
+            ]}
+            onPress={handleReset}
+          >
+            <ThemedText style={[styles.buttonText, { color: colors.text }]}>
+              Đặt lại
+            </ThemedText>
+          </TouchableOpacity>
+
+          <TouchableOpacity
+            style={[
+              styles.button,
+              styles.primaryButton,
+              { backgroundColor: colors.primary },
+            ]}
+            onPress={handleSubmit(onFormSubmit)}
+          >
+            <ThemedText style={[styles.buttonText, { color: "#fff" }]}>
+              Tìm kiếm
+            </ThemedText>
+          </TouchableOpacity>
+        </View>
+      </View>
+    </ThemedView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    borderBottomWidth: 1,
+    shadowColor: "#000",
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.1,
+    shadowRadius: 3.84,
+    elevation: 5,
+    zIndex: 100,
+  },
+  content: {
+    padding: 16,
+    overflow: "visible",
+  },
+  inputContainer: {
+    marginBottom: 16,
+  },
+  label: {
+    fontSize: 14,
+    fontWeight: "500",
+    marginBottom: 6,
+  },
+  inputWrapper: {
+    flexDirection: "row",
+    alignItems: "center",
+    borderWidth: 1,
+    borderRadius: 8,
+    paddingHorizontal: 12,
+  },
+  input: {
+    flex: 1,
+    height: 40,
+    fontSize: 16,
+  },
+  clearButton: {
+    marginLeft: 8,
+    padding: 4,
+  },
+  row: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    marginBottom: 16,
+    zIndex: 10,
+  },
+  halfWidth: {
+    width: "48%",
+    zIndex: 5000,
+  },
+  selectContainer: {
+    // flex: 1, // Remove this to prevent taking full width
+    zIndex: 5000,
+  },
+  buttonRow: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    gap: 12,
+    marginTop: 16,
+  },
+  button: {
+    flex: 1,
+    height: 40,
+    borderRadius: 8,
+    justifyContent: "center",
+    alignItems: "center",
+  },
+  secondaryButton: {
+    borderWidth: 1,
+  },
+  primaryButton: {
+    // backgroundColor is set dynamically
+  },
+  buttonText: {
+    fontSize: 16,
+    fontWeight: "600",
+  },
+});
+
+export default AlarmSearchForm;
--- a/components/alarm/WarningCard.tsx
+++ b/components/alarm/WarningCard.tsx
@@ -1,197 +0,0 @@
-import { Ionicons } from "@expo/vector-icons";
-import dayjs from "dayjs";
-import { FlatList, Text, TouchableOpacity, View } from "react-native";
-
-export type AlarmStatus = "confirmed" | "pending";
-
-export interface AlarmListItem {
-  id: string;
-  code: string;
-  title: string;
-  station: string;
-  timestamp: number;
-  level: 1 | 2 | 3; // 1: warning (yellow), 2: caution (orange/yellow), 3: danger (red)
-  status: AlarmStatus;
-}
-
-type AlarmProp = {
-  alarmsData: AlarmListItem[];
-  onPress?: (alarm: AlarmListItem) => void;
-};
-
-const AlarmList = ({ alarmsData, onPress }: AlarmProp) => {
-  return (
-    <FlatList
-      data={alarmsData}
-      contentContainerStyle={{ paddingHorizontal: 16, paddingVertical: 8 }}
-      ItemSeparatorComponent={() => <View className="h-3" />}
-      renderItem={({ item }) => (
-        <AlarmCard alarm={item} onPress={() => onPress?.(item)} />
-      )}
-      keyExtractor={(item) => item.id}
-      showsVerticalScrollIndicator={false}
-    />
-  );
-};
-
-type AlarmCardProps = {
-  alarm: AlarmListItem;
-  onPress?: () => void;
-};
-
-const AlarmCard = ({ alarm, onPress }: AlarmCardProps) => {
-  const { bgColor, borderColor, iconColor, iconBgColor } = getColorsByLevel(
-    alarm.level
-  );
-  const statusConfig = getStatusConfig(alarm.status);
-
-  return (
-    <TouchableOpacity
-      onPress={onPress}
-      activeOpacity={0.7}
-      className={`rounded-xl p-4 ${bgColor} ${borderColor} border`}
-    >
-      <View className="flex-row justify-between items-start">
-        {/* Left content */}
-        <View className="flex-row flex-1">
-          {/* Icon */}
-          <View
-            className={`w-10 h-10 rounded-full items-center justify-center mr-3 ${iconBgColor}`}
-          >
-            <Ionicons
-              name={getIconByLevel(alarm.level)}
-              size={20}
-              color={iconColor}
-            />
-          </View>
-
-          {/* Info */}
-          <View className="flex-1">
-            {/* Code */}
-            <Text
-              className={`text-xs font-medium mb-1 ${getCodeTextColor(
-                alarm.level
-              )}`}
-            >
-              {alarm.code}
-            </Text>
-
-            {/* Title */}
-            <Text className="text-base font-semibold text-gray-800 mb-2">
-              {alarm.title}
-            </Text>
-
-            {/* Station and Time */}
-            <View className="flex-row">
-              <View className="mr-6">
-                <Text className="text-xs text-gray-400 mb-0.5">Trạm</Text>
-                <Text className="text-sm text-gray-600">{alarm.station}</Text>
-              </View>
-              <View>
-                <Text className="text-xs text-gray-400 mb-0.5">Thời gian</Text>
-                <Text className="text-sm text-gray-600">
-                  {formatTimestamp(alarm.timestamp)}
-                </Text>
-              </View>
-            </View>
-
-            {/* Status Badge */}
-            {/* <View className="mt-3">
-              <View
-                className={`self-start px-3 py-1.5 rounded-full ${statusConfig.bgColor}`}
-              >
-                <Text
-                  className={`text-xs font-medium ${statusConfig.textColor}`}
-                >
-                  {statusConfig.label}
-                </Text>
-              </View>
-            </View> */}
-          </View>
-        </View>
-
-        {/* Checkmark for confirmed */}
-        {/* {alarm.status === "confirmed" && (
-          <View className="w-6 h-6 rounded-full bg-green-500 items-center justify-center">
-            <Ionicons name="checkmark" size={16} color="white" />
-          </View>
-        )} */}
-      </View>
-    </TouchableOpacity>
-  );
-};
-
-const getColorsByLevel = (level: number) => {
-  switch (level) {
-    case 3: // Danger - Red
-      return {
-        bgColor: "bg-red-50",
-        borderColor: "border-red-200",
-        iconColor: "#DC2626",
-        iconBgColor: "bg-red-100",
-      };
-    case 2: // Caution - Yellow/Orange
-      return {
-        bgColor: "bg-yellow-50",
-        borderColor: "border-yellow-200",
-        iconColor: "#CA8A04",
-        iconBgColor: "bg-yellow-100",
-      };
-    case 1: // Info - Green
-    default:
-      return {
-        bgColor: "bg-green-50",
-        borderColor: "border-green-200",
-        iconColor: "#16A34A",
-        iconBgColor: "bg-green-100",
-      };
-  }
-};
-
-const getIconByLevel = (level: number): keyof typeof Ionicons.glyphMap => {
-  switch (level) {
-    case 3:
-      return "warning";
-    case 2:
-      return "alert-circle";
-    case 1:
-    default:
-      return "checkmark-circle";
-  }
-};
-
-const getCodeTextColor = (level: number) => {
-  switch (level) {
-    case 3:
-      return "text-red-600";
-    case 2:
-      return "text-yellow-600";
-    case 1:
-    default:
-      return "text-green-600";
-  }
-};
-
-const getStatusConfig = (status: AlarmStatus) => {
-  switch (status) {
-    case "confirmed":
-      return {
-        label: "Đã xác nhận",
-        bgColor: "bg-green-100",
-        textColor: "text-green-700",
-      };
-    case "pending":
-    default:
-      return {
-        label: "Chờ xác nhận",
-        bgColor: "bg-yellow-100",
-        textColor: "text-yellow-700",
-      };
-  }
-};
-
-const formatTimestamp = (timestamp: number) => {
-  return dayjs.unix(timestamp).format("YYYY-MM-DD HH:mm");
-};
-
-export default AlarmList;
--- a/components/diary/ShipDropdown.tsx
+++ b/components/diary/ShipDropdown.tsx
@@ -80,7 +80,7 @@ export default function ShipDropdown({ value, onChange }: ShipDropdownProps) {
        <Text style={[styles.selectorText, themedStyles.selectorText, !value && themedStyles.placeholder]}>
          {displayValue}
        </Text>
-        <Ionicons name="chevron-down" size={20} color={colors.textSecondary} />
+        <Ionicons name="ellipsis-horizontal" size={20} color={colors.textSecondary} />
      </TouchableOpacity>

      <Modal
--- a/components/diary/TripCard.tsx
+++ b/components/diary/TripCard.tsx
@@ -117,9 +117,9 @@ export default function TripCard({
        {/* Info Grid */}
        <View style={styles.infoGrid}>
          <View style={styles.infoRow}>
-            <Text style={[styles.label, themedStyles.label]}>{t("diary.tripCard.shipCode")}</Text>
+            <Text style={[styles.label, themedStyles.label]}>{t("diary.tripCard.shipName")}</Text>
            <Text style={[styles.value, themedStyles.value]}>
-              {thingOfTrip?.metadata?.ship_reg_number /* hoặc trip.ship_id */}
+              {thingOfTrip?.metadata?.ship_name /* hoặc trip.ship_id */}
            </Text>
          </View>

@@ -204,16 +204,16 @@ export default function TripCard({

 const styles = StyleSheet.create({
  card: {
-    borderRadius: 12,
-    padding: 16,
-    marginBottom: 12,
+    borderRadius: 8,
+    padding: 12,
+    marginBottom: 8,
    shadowColor: "#000",
    shadowOffset: {
      width: 0,
-      height: 2,
+      height: 1,
    },
    shadowOpacity: 0.05,
-    shadowRadius: 8,
+    shadowRadius: 4,
    elevation: 2,
    borderWidth: 1,
  },
@@ -221,7 +221,7 @@ const styles = StyleSheet.create({
    flexDirection: "row",
    justifyContent: "space-between",
    alignItems: "flex-start",
-    marginBottom: 16,
+    marginBottom: 8,
  },
  headerLeft: {
    flexDirection: "row",
@@ -229,7 +229,7 @@ const styles = StyleSheet.create({
    flex: 1,
  },
  titleContainer: {
-    marginLeft: 12,
+    marginLeft: 8,
    flex: 1,
  },
  title: {
@@ -244,9 +244,9 @@ const styles = StyleSheet.create({
  },

  badge: {
-    paddingHorizontal: 12,
-    paddingVertical: 4,
-    borderRadius: 12,
+    paddingHorizontal: 8,
+    paddingVertical: 2,
+    borderRadius: 8,
  },
  badgeText: {
    fontSize: 12,
@@ -258,13 +258,13 @@ const styles = StyleSheet.create({
    }),
  },
  infoGrid: {
-    gap: 12,
-    marginBottom: 12,
+    gap: 6,
+    marginBottom: 8,
  },
  infoRow: {
    flexDirection: "row",
    justifyContent: "space-between",
-    paddingVertical: 8,
+    paddingVertical: 4,
  },
  label: {
    fontSize: 14,
@@ -285,7 +285,7 @@ const styles = StyleSheet.create({
  },
  divider: {
    height: 1,
-    marginVertical: 12,
+    marginVertical: 8,
  },
  actionsContainer: {
    flexDirection: "row",
@@ -296,6 +296,7 @@ const styles = StyleSheet.create({
    flexDirection: "row",
    alignItems: "center",
    gap: 4,
+    paddingVertical: 4,
  },
  actionText: {
    fontSize: 14,
--- a/components/diary/addTripModal/AutoFillSection.tsx
+++ b/components/diary/addTripModal/AutoFillSection.tsx
@@ -0,0 +1,388 @@
+import React, { useState } from "react";
+import {
+  View,
+  Text,
+  TouchableOpacity,
+  StyleSheet,
+  Modal,
+  Platform,
+  ScrollView,
+  TextInput,
+  ActivityIndicator,
+  Alert,
+} from "react-native";
+import { Ionicons } from "@expo/vector-icons";
+import { useThings } from "@/state/use-thing";
+import { useI18n } from "@/hooks/use-i18n";
+import { useThemeContext } from "@/hooks/use-theme-context";
+import { queryLastTrip } from "@/controller/TripController";
+import { showErrorToast } from "@/services/toast_service";
+
+interface AutoFillSectionProps {
+  onAutoFill: (tripData: Model.Trip, selectedShipId: string) => void;
+}
+
+export default function AutoFillSection({ onAutoFill }: AutoFillSectionProps) {
+  const { t } = useI18n();
+  const { colors } = useThemeContext();
+  const [isOpen, setIsOpen] = useState(false);
+  const [searchText, setSearchText] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+
+  const { things } = useThings();
+
+  // Convert things to ship options
+  const shipOptions =
+    things
+      ?.filter((thing) => thing.id != null)
+      .map((thing) => ({
+        id: thing.id as string,
+        shipName: thing.metadata?.ship_name || "",
+      })) || [];
+
+  // Filter ships based on search text
+  const filteredShips = shipOptions.filter((ship) => {
+    const searchLower = searchText.toLowerCase();
+    return ship.shipName.toLowerCase().includes(searchLower);
+  });
+
+  const handleSelectShip = async (shipId: string) => {
+    setIsLoading(true);
+    try {
+      const response = await queryLastTrip(shipId);
+      if (response.data) {
+        // Close the modal first before showing alert
+        setIsOpen(false);
+        setSearchText("");
+        
+        // Pass shipId (thingId) along with trip data for filling ShipSelector
+        onAutoFill(response.data, shipId);
+        
+        // Use Alert instead of Toast so it appears above all modals
+        Alert.alert(
+          t("common.success"),
+          t("diary.autoFill.success")
+        );
+      } else {
+        showErrorToast(t("diary.autoFill.noData"));
+      }
+    } catch (error) {
+      console.error("Error fetching last trip:", error);
+      showErrorToast(t("diary.autoFill.error"));
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const themedStyles = {
+    container: {
+      backgroundColor: colors.backgroundSecondary,
+      borderColor: colors.primary,
+    },
+    label: { color: colors.text },
+    description: { color: colors.textSecondary },
+    button: {
+      backgroundColor: colors.primary,
+    },
+    modalContent: { backgroundColor: colors.card },
+    searchContainer: {
+      backgroundColor: colors.backgroundSecondary,
+      borderColor: colors.border,
+    },
+    searchInput: { color: colors.text },
+    option: { borderBottomColor: colors.separator },
+    optionText: { color: colors.text },
+    emptyText: { color: colors.textSecondary },
+  };
+
+  return (
+    <View style={[styles.container, themedStyles.container]}>
+      <View style={styles.contentWrapper}>
+        <View style={styles.iconContainer}>
+          <Ionicons name="flash" size={24} color={colors.primary} />
+        </View>
+        <View style={styles.textContainer}>
+          <Text style={[styles.label, themedStyles.label]}>
+            {t("diary.autoFill.title")}
+          </Text>
+          <Text style={[styles.description, themedStyles.description]}>
+            {t("diary.autoFill.description")}
+          </Text>
+        </View>
+      </View>
+      <TouchableOpacity
+        style={[styles.button, themedStyles.button]}
+        onPress={() => setIsOpen(true)}
+        activeOpacity={0.7}
+      >
+        <Text style={styles.buttonText}>{t("diary.autoFill.selectShip")}</Text>
+      </TouchableOpacity>
+
+      <Modal
+        visible={isOpen}
+        transparent
+        animationType="fade"
+        onRequestClose={() => setIsOpen(false)}
+      >
+        <TouchableOpacity
+          style={styles.modalOverlay}
+          activeOpacity={1}
+          onPress={() => setIsOpen(false)}
+        >
+          <View
+            style={[styles.modalContent, themedStyles.modalContent]}
+            onStartShouldSetResponder={() => true}
+          >
+            {/* Header */}
+            <View style={styles.modalHeader}>
+              <Text style={[styles.modalTitle, { color: colors.text }]}>
+                {t("diary.autoFill.modalTitle")}
+              </Text>
+            </View>
+
+            {/* Search Input */}
+            <View
+              style={[styles.searchContainer, themedStyles.searchContainer]}
+            >
+              <Ionicons
+                name="search"
+                size={20}
+                color={colors.textSecondary}
+                style={styles.searchIcon}
+              />
+              <TextInput
+                style={[styles.searchInput, themedStyles.searchInput]}
+                placeholder={t("diary.searchShip")}
+                placeholderTextColor={colors.textSecondary}
+                value={searchText}
+                onChangeText={setSearchText}
+                autoCapitalize="none"
+              />
+              {searchText.length > 0 && (
+                <TouchableOpacity onPress={() => setSearchText("")}>
+                  <Ionicons
+                    name="close-circle"
+                    size={20}
+                    color={colors.textSecondary}
+                  />
+                </TouchableOpacity>
+              )}
+            </View>
+
+            {isLoading ? (
+              <View style={styles.loadingContainer}>
+                <ActivityIndicator size="large" color={colors.primary} />
+                <Text style={[styles.loadingText, { color: colors.textSecondary }]}>
+                  {t("diary.autoFill.loading")}
+                </Text>
+              </View>
+            ) : (
+              <ScrollView style={styles.optionsList}>
+                {/* Filtered ship options */}
+                {filteredShips.length > 0 ? (
+                  filteredShips.map((ship) => (
+                    <TouchableOpacity
+                      key={ship.id}
+                      style={[styles.option, themedStyles.option]}
+                      onPress={() => handleSelectShip(ship.id)}
+                    >
+                      <View style={styles.optionContent}>
+                        <Ionicons
+                          name="boat"
+                          size={20}
+                          color={colors.primary}
+                          style={styles.optionIcon}
+                        />
+                        <Text style={[styles.optionText, themedStyles.optionText]}>
+                          {ship.shipName}
+                        </Text>
+                      </View>
+                      <Ionicons
+                        name="chevron-forward"
+                        size={20}
+                        color={colors.textSecondary}
+                      />
+                    </TouchableOpacity>
+                  ))
+                ) : (
+                  <View style={styles.emptyContainer}>
+                    <Text style={[styles.emptyText, themedStyles.emptyText]}>
+                      {t("diary.noShipsFound")}
+                    </Text>
+                  </View>
+                )}
+              </ScrollView>
+            )}
+          </View>
+        </TouchableOpacity>
+      </Modal>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    marginBottom: 20,
+    padding: 16,
+    borderRadius: 12,
+    borderWidth: 1,
+    borderStyle: "dashed",
+  },
+  contentWrapper: {
+    flexDirection: "row",
+    alignItems: "center",
+    marginBottom: 12,
+  },
+  iconContainer: {
+    width: 40,
+    height: 40,
+    borderRadius: 20,
+    backgroundColor: "rgba(59, 130, 246, 0.1)",
+    justifyContent: "center",
+    alignItems: "center",
+    marginRight: 12,
+  },
+  textContainer: {
+    flex: 1,
+  },
+  label: {
+    fontSize: 16,
+    fontWeight: "600",
+    marginBottom: 4,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  description: {
+    fontSize: 13,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  button: {
+    paddingVertical: 10,
+    paddingHorizontal: 16,
+    borderRadius: 8,
+    alignItems: "center",
+  },
+  buttonText: {
+    fontSize: 14,
+    fontWeight: "600",
+    color: "#FFFFFF",
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  modalOverlay: {
+    flex: 1,
+    backgroundColor: "rgba(0, 0, 0, 0.5)",
+    justifyContent: "center",
+    alignItems: "center",
+  },
+  modalContent: {
+    borderRadius: 12,
+    width: "85%",
+    maxHeight: "70%",
+    overflow: "hidden",
+    shadowColor: "#000",
+    shadowOffset: {
+      width: 0,
+      height: 4,
+    },
+    shadowOpacity: 0.3,
+    shadowRadius: 8,
+    elevation: 8,
+  },
+  modalHeader: {
+    paddingHorizontal: 20,
+    paddingVertical: 16,
+  },
+  modalTitle: {
+    fontSize: 18,
+    fontWeight: "700",
+    textAlign: "center",
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  searchContainer: {
+    flexDirection: "row",
+    alignItems: "center",
+    paddingHorizontal: 16,
+    paddingVertical: 12,
+    borderBottomWidth: 1,
+  },
+  searchIcon: {
+    marginRight: 8,
+  },
+  searchInput: {
+    flex: 1,
+    fontSize: 16,
+    padding: 0,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  optionsList: {
+    maxHeight: 350,
+  },
+  option: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    paddingHorizontal: 20,
+    paddingVertical: 16,
+    borderBottomWidth: 1,
+  },
+  optionContent: {
+    flexDirection: "row",
+    alignItems: "center",
+    flex: 1,
+  },
+  optionIcon: {
+    marginRight: 12,
+  },
+  optionText: {
+    fontSize: 16,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  emptyContainer: {
+    paddingVertical: 24,
+    alignItems: "center",
+  },
+  emptyText: {
+    fontSize: 14,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  loadingContainer: {
+    paddingVertical: 40,
+    alignItems: "center",
+  },
+  loadingText: {
+    marginTop: 12,
+    fontSize: 14,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+});
--- a/components/diary/addTripModal/BasicInfoInput.tsx
+++ b/components/diary/addTripModal/BasicInfoInput.tsx
@@ -0,0 +1,89 @@
+import React from "react";
+import {
+  View,
+  Text,
+  TextInput,
+  StyleSheet,
+  Platform,
+} from "react-native";
+import { useI18n } from "@/hooks/use-i18n";
+import { useThemeContext } from "@/hooks/use-theme-context";
+
+interface BasicInfoInputProps {
+  fishingGroundCodes: string;
+  onChange: (value: string) => void;
+}
+
+export default function BasicInfoInput({
+  fishingGroundCodes,
+  onChange,
+}: BasicInfoInputProps) {
+  const { t } = useI18n();
+  const { colors } = useThemeContext();
+
+  const themedStyles = {
+    label: { color: colors.text },
+    subLabel: { color: colors.textSecondary },
+    input: {
+      backgroundColor: colors.card,
+      borderColor: colors.border,
+      color: colors.text,
+    },
+  };
+
+  return (
+    <View style={styles.container}>
+      <Text style={[styles.label, themedStyles.label]}>
+        {t("diary.fishingGroundCodes")}
+      </Text>
+      <Text style={[styles.subLabel, themedStyles.subLabel]}>
+        {t("diary.fishingGroundCodesHint")}
+      </Text>
+      <TextInput
+        style={[styles.input, themedStyles.input]}
+        value={fishingGroundCodes}
+        onChangeText={onChange}
+        placeholder={t("diary.fishingGroundCodesPlaceholder")}
+        placeholderTextColor={colors.textSecondary}
+        keyboardType="numeric"
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    marginBottom: 20,
+  },
+  label: {
+    fontSize: 16,
+    fontWeight: "600",
+    marginBottom: 12,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  subLabel: {
+    fontSize: 14,
+    marginBottom: 8,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  input: {
+    borderWidth: 1,
+    borderRadius: 8,
+    paddingHorizontal: 16,
+    paddingVertical: 12,
+    fontSize: 16,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+});
--- a/components/diary/addTripModal/FishingGearList.tsx
+++ b/components/diary/addTripModal/FishingGearList.tsx
@@ -0,0 +1,225 @@
+import React from "react";
+import {
+  View,
+  Text,
+  TouchableOpacity,
+  StyleSheet,
+  Platform,
+  TextInput,
+} from "react-native";
+import { Ionicons } from "@expo/vector-icons";
+import { useI18n } from "@/hooks/use-i18n";
+import { useThemeContext } from "@/hooks/use-theme-context";
+
+interface FishingGear {
+  id: string;
+  name: string;
+  number: string;
+}
+
+interface FishingGearListProps {
+  items: FishingGear[];
+  onChange: (items: FishingGear[]) => void;
+}
+
+export default function FishingGearList({
+  items,
+  onChange,
+}: FishingGearListProps) {
+  const { t } = useI18n();
+  const { colors } = useThemeContext();
+
+  const handleAddGear = () => {
+    const newGear: FishingGear = {
+      id: Date.now().toString(),
+      name: "",
+      number: "",
+    };
+    onChange([...items, newGear]);
+  };
+
+  const handleRemoveGear = (id: string) => {
+    onChange(items.filter((item) => item.id !== id));
+  };
+
+  const handleDuplicateGear = (gear: FishingGear) => {
+    const duplicatedGear: FishingGear = {
+      id: Date.now().toString(),
+      name: gear.name,
+      number: gear.number,
+    };
+    onChange([...items, duplicatedGear]);
+  };
+
+  const handleUpdateGear = (id: string, field: keyof FishingGear, value: string) => {
+    onChange(
+      items.map((item) =>
+        item.id === id ? { ...item, [field]: value } : item
+      )
+    );
+  };
+
+  const themedStyles = {
+    sectionTitle: { color: colors.text },
+    fieldLabel: { color: colors.text },
+    input: {
+      backgroundColor: colors.card,
+      borderColor: colors.border,
+      color: colors.text,
+    },
+    addButton: {
+      borderColor: colors.primary,
+    },
+    addButtonText: { color: colors.primary },
+  };
+
+  return (
+    <View style={styles.container}>
+      <Text style={[styles.sectionTitle, themedStyles.sectionTitle]}>
+        {t("diary.fishingGearList")}
+      </Text>
+
+      {/* Gear Items List */}
+      {items.map((gear, index) => (
+        <View key={gear.id} style={styles.gearRow}>
+          {/* Name Input */}
+          <View style={styles.inputGroup}>
+            <Text style={[styles.fieldLabel, themedStyles.fieldLabel]}>
+              {t("diary.gearName")}
+            </Text>
+            <TextInput
+              style={[styles.input, styles.nameInput, themedStyles.input]}
+              value={gear.name}
+              onChangeText={(value) => handleUpdateGear(gear.id, "name", value)}
+              placeholder={t("diary.gearNamePlaceholder")}
+              placeholderTextColor={colors.textSecondary}
+            />
+          </View>
+
+          {/* Number Input */}
+          <View style={styles.inputGroup}>
+            <Text style={[styles.fieldLabel, themedStyles.fieldLabel]}>
+              {t("diary.gearNumber")}
+            </Text>
+            <TextInput
+              style={[styles.input, styles.numberInput, themedStyles.input]}
+              value={gear.number}
+              onChangeText={(value) => handleUpdateGear(gear.id, "number", value)}
+              placeholder={t("diary.gearNumberPlaceholder")}
+              placeholderTextColor={colors.textSecondary}
+              keyboardType="numeric"
+            />
+          </View>
+
+          {/* Action Buttons */}
+          <View style={styles.actionButtons}>
+            <TouchableOpacity
+              onPress={() => handleDuplicateGear(gear)}
+              hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
+            >
+              <Ionicons name="copy-outline" size={20} color={colors.text} />
+            </TouchableOpacity>
+            <TouchableOpacity
+              onPress={() => handleRemoveGear(gear.id)}
+              hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
+            >
+              <Ionicons name="trash-outline" size={20} color={colors.error} />
+            </TouchableOpacity>
+          </View>
+        </View>
+      ))}
+
+      {/* Add Button */}
+      <TouchableOpacity
+        style={[styles.addButton, themedStyles.addButton]}
+        onPress={handleAddGear}
+        activeOpacity={0.7}
+      >
+        <Ionicons name="add" size={20} color={colors.primary} />
+        <Text style={[styles.addButtonText, themedStyles.addButtonText]}>
+          {t("diary.addFishingGear")}
+        </Text>
+      </TouchableOpacity>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    marginBottom: 20,
+  },
+  sectionTitle: {
+    fontSize: 16,
+    fontWeight: "700",
+    marginBottom: 16,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  gearRow: {
+    flexDirection: "row",
+    alignItems: "flex-end",
+    gap: 12,
+    marginBottom: 16,
+  },
+  inputGroup: {
+    flex: 1,
+  },
+  fieldLabel: {
+    fontSize: 14,
+    fontWeight: "500",
+    marginBottom: 6,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  input: {
+    borderWidth: 1,
+    borderRadius: 8,
+    paddingHorizontal: 12,
+    paddingVertical: 10,
+    fontSize: 15,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  nameInput: {
+    flex: 1,
+  },
+  numberInput: {
+    flex: 1,
+  },
+  actionButtons: {
+    flexDirection: "row",
+    gap: 12,
+    alignItems: "center",
+    paddingBottom: 10,
+  },
+  addButton: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center",
+    gap: 8,
+    paddingVertical: 12,
+    paddingHorizontal: 16,
+    borderWidth: 1.5,
+    borderRadius: 8,
+    borderStyle: "dashed",
+    marginTop: 4,
+  },
+  addButtonText: {
+    fontSize: 14,
+    fontWeight: "600",
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+});
--- a/components/diary/addTripModal/MaterialCostList.tsx
+++ b/components/diary/addTripModal/MaterialCostList.tsx
@@ -0,0 +1,472 @@
+import React, { useState } from "react";
+import {
+  View,
+  Text,
+  TouchableOpacity,
+  StyleSheet,
+  Platform,
+  TextInput,
+  Modal,
+  ScrollView,
+} from "react-native";
+import { Ionicons } from "@expo/vector-icons";
+import { useI18n } from "@/hooks/use-i18n";
+import { useThemeContext } from "@/hooks/use-theme-context";
+
+interface TripCost {
+  id: string;
+  type: string;
+  amount: number;
+  unit: string;
+  cost_per_unit: number;
+  total_cost: number;
+}
+
+interface MaterialCostListProps {
+  items: TripCost[];
+  onChange: (items: TripCost[]) => void;
+}
+
+// Predefined cost types
+const COST_TYPES = [
+  { value: "fuel", label: "Nhiên liệu" },
+  { value: "food", label: "Thực phẩm" },
+  { value: "crew_salary", label: "Lương thuyền viên" },
+  { value: "ice_salt_cost", label: "Muối đá" },
+  { value: "other", label: "Khác" },
+];
+
+export default function MaterialCostList({
+  items,
+  onChange,
+}: MaterialCostListProps) {
+  const { t } = useI18n();
+  const { colors } = useThemeContext();
+  const [typeDropdownVisible, setTypeDropdownVisible] = useState<string | null>(null);
+
+  const handleAddMaterial = () => {
+    const newMaterial: TripCost = {
+      id: Date.now().toString(),
+      type: "",
+      amount: 0,
+      unit: "",
+      cost_per_unit: 0,
+      total_cost: 0,
+    };
+    onChange([...items, newMaterial]);
+  };
+
+  const handleRemoveMaterial = (id: string) => {
+    onChange(items.filter((item) => item.id !== id));
+  };
+
+  const handleDuplicateMaterial = (material: TripCost) => {
+    const duplicatedMaterial: TripCost = {
+      id: Date.now().toString(),
+      type: material.type,
+      amount: material.amount,
+      unit: material.unit,
+      cost_per_unit: material.cost_per_unit,
+      total_cost: material.total_cost,
+    };
+    onChange([...items, duplicatedMaterial]);
+  };
+
+  const handleUpdateMaterial = (id: string, field: keyof TripCost, value: string | number) => {
+    onChange(
+      items.map((item) => {
+        if (item.id === id) {
+          const updatedItem = { ...item, [field]: value };
+          // Auto-calculate total_cost when amount or cost_per_unit changes
+          if (field === "amount" || field === "cost_per_unit") {
+            const amount = field === "amount" ? Number(value) : item.amount;
+            const costPerUnit = field === "cost_per_unit" ? Number(value) : item.cost_per_unit;
+            updatedItem.total_cost = amount * costPerUnit;
+          }
+          return updatedItem;
+        }
+        return item;
+      })
+    );
+  };
+
+  const getTypeLabel = (value: string) => {
+    const type = COST_TYPES.find((t) => t.value === value);
+    return type ? type.label : value || t("diary.selectType");
+  };
+
+  const formatCurrency = (amount: number) => {
+    return new Intl.NumberFormat("vi-VN").format(amount);
+  };
+
+  const themedStyles = {
+    sectionTitle: { color: colors.text },
+    fieldLabel: { color: colors.text },
+    input: {
+      backgroundColor: colors.card,
+      borderColor: colors.border,
+      color: colors.text,
+    },
+    dropdown: {
+      backgroundColor: colors.card,
+      borderColor: colors.border,
+    },
+    dropdownText: { color: colors.text },
+    placeholder: { color: colors.textSecondary },
+    addButton: {
+      borderColor: colors.primary,
+    },
+    addButtonText: { color: colors.primary },
+    modalOverlay: {
+      backgroundColor: "rgba(0, 0, 0, 0.5)",
+    },
+    modalContent: {
+      backgroundColor: colors.card,
+    },
+    option: {
+      borderBottomColor: colors.separator,
+    },
+    optionText: { color: colors.text },
+  };
+
+  return (
+    <View style={styles.container}>
+      <Text style={[styles.sectionTitle, themedStyles.sectionTitle]}>
+        {t("diary.materialCostList")}
+      </Text>
+
+      {/* Cost Items List */}
+      {items.map((cost) => (
+        <View key={cost.id} style={styles.costRow}>
+          <View style={styles.formRow}>
+            {/* Type Dropdown */}
+            <View style={[styles.inputGroup, styles.typeGroup]}>
+              <Text style={[styles.fieldLabel, themedStyles.fieldLabel]}>
+                {t("diary.costType")}
+              </Text>
+              <TouchableOpacity
+                style={[styles.dropdown, themedStyles.dropdown]}
+                onPress={() => setTypeDropdownVisible(cost.id)}
+                activeOpacity={0.7}
+              >
+                <Text
+                  style={[
+                    styles.dropdownText,
+                    themedStyles.dropdownText,
+                    !cost.type && themedStyles.placeholder,
+                  ]}
+                >
+                  {getTypeLabel(cost.type)}
+                </Text>
+                <Ionicons
+                  name="chevron-down"
+                  size={16}
+                  color={colors.textSecondary}
+                />
+              </TouchableOpacity>
+
+              {/* Type Dropdown Modal */}
+              <Modal
+                visible={typeDropdownVisible === cost.id}
+                transparent
+                animationType="fade"
+                onRequestClose={() => setTypeDropdownVisible(null)}
+              >
+                <TouchableOpacity
+                  style={[styles.modalOverlay, themedStyles.modalOverlay]}
+                  activeOpacity={1}
+                  onPress={() => setTypeDropdownVisible(null)}
+                >
+                  <View style={[styles.modalContent, themedStyles.modalContent]}>
+                    <ScrollView>
+                      {COST_TYPES.map((type) => (
+                        <TouchableOpacity
+                          key={type.value}
+                          style={[styles.option, themedStyles.option]}
+                          onPress={() => {
+                            handleUpdateMaterial(cost.id, "type", type.value);
+                            setTypeDropdownVisible(null);
+                          }}
+                        >
+                          <Text
+                            style={[styles.optionText, themedStyles.optionText]}
+                          >
+                            {type.label}
+                          </Text>
+                          {cost.type === type.value && (
+                            <Ionicons
+                              name="checkmark"
+                              size={20}
+                              color={colors.primary}
+                            />
+                          )}
+                        </TouchableOpacity>
+                      ))}
+                    </ScrollView>
+                  </View>
+                </TouchableOpacity>
+              </Modal>
+            </View>
+
+            {/* Amount Input */}
+            <View style={[styles.inputGroup, styles.smallGroup]}>
+              <Text style={[styles.fieldLabel, themedStyles.fieldLabel]}>
+                {t("diary.amount")}
+              </Text>
+              <TextInput
+                style={[styles.input, styles.smallInput, themedStyles.input]}
+                value={cost.amount.toString()}
+                onChangeText={(value) =>
+                  handleUpdateMaterial(cost.id, "amount", Number(value) || 0)
+                }
+                placeholder="0"
+                placeholderTextColor={colors.textSecondary}
+                keyboardType="numeric"
+              />
+            </View>
+
+            {/* Unit Input */}
+            <View style={[styles.inputGroup, styles.smallGroup]}>
+              <Text style={[styles.fieldLabel, themedStyles.fieldLabel]}>
+                {t("diary.unit")}
+              </Text>
+              <TextInput
+                style={[styles.input, styles.smallInput, themedStyles.input]}
+                value={cost.unit}
+                onChangeText={(value) =>
+                  handleUpdateMaterial(cost.id, "unit", value)
+                }
+                placeholder={t("diary.unitPlaceholder")}
+                placeholderTextColor={colors.textSecondary}
+              />
+            </View>
+          </View>
+
+          <View style={styles.formRow}>
+            {/* Cost Per Unit Input */}
+            <View style={[styles.inputGroup, styles.mediumGroup]}>
+              <Text style={[styles.fieldLabel, themedStyles.fieldLabel]}>
+                {t("diary.costPerUnit")}
+              </Text>
+              <TextInput
+                style={[styles.input, styles.mediumInput, themedStyles.input]}
+                value={cost.cost_per_unit.toString()}
+                onChangeText={(value) =>
+                  handleUpdateMaterial(
+                    cost.id,
+                    "cost_per_unit",
+                    Number(value) || 0
+                  )
+                }
+                placeholder="0"
+                placeholderTextColor={colors.textSecondary}
+                keyboardType="numeric"
+              />
+            </View>
+
+            {/* Total Cost (Read-only, auto-calculated) */}
+            <View style={[styles.inputGroup, styles.mediumGroup]}>
+              <Text style={[styles.fieldLabel, themedStyles.fieldLabel]}>
+                {t("diary.totalCost")}
+              </Text>
+              <View style={[styles.input, styles.mediumInput, themedStyles.input, styles.readOnlyInput]}>
+                <Text style={[styles.readOnlyText, themedStyles.dropdownText]}>
+                  {formatCurrency(cost.total_cost)}
+                </Text>
+              </View>
+            </View>
+
+            {/* Action Buttons */}
+            <View style={styles.actionButtons}>
+              <TouchableOpacity
+                onPress={() => handleDuplicateMaterial(cost)}
+                hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
+              >
+                <Ionicons name="copy-outline" size={20} color={colors.text} />
+              </TouchableOpacity>
+              <TouchableOpacity
+                onPress={() => handleRemoveMaterial(cost.id)}
+                hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
+              >
+                <Ionicons
+                  name="trash-outline"
+                  size={20}
+                  color={colors.error}
+                />
+              </TouchableOpacity>
+            </View>
+          </View>
+        </View>
+      ))}
+
+      {/* Add Button */}
+      <TouchableOpacity
+        style={[styles.addButton, themedStyles.addButton]}
+        onPress={handleAddMaterial}
+        activeOpacity={0.7}
+      >
+        <Ionicons name="add" size={20} color={colors.primary} />
+        <Text style={[styles.addButtonText, themedStyles.addButtonText]}>
+          {t("diary.addMaterialCost")}
+        </Text>
+      </TouchableOpacity>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    marginBottom: 20,
+  },
+  sectionTitle: {
+    fontSize: 16,
+    fontWeight: "700",
+    marginBottom: 16,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  costRow: {
+    marginBottom: 20,
+    paddingBottom: 16,
+    borderBottomWidth: 1,
+    borderBottomColor: "#E5E5E5",
+  },
+  formRow: {
+    flexDirection: "row",
+    alignItems: "flex-end",
+    gap: 12,
+    marginBottom: 12,
+  },
+  inputGroup: {
+    flex: 1,
+  },
+  typeGroup: {
+    flex: 1.5,
+  },
+  smallGroup: {
+    flex: 0.8,
+  },
+  mediumGroup: {
+    flex: 1,
+  },
+  fieldLabel: {
+    fontSize: 14,
+    fontWeight: "500",
+    marginBottom: 6,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  input: {
+    borderWidth: 1,
+    borderRadius: 8,
+    paddingHorizontal: 12,
+    paddingVertical: 10,
+    fontSize: 15,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  smallInput: {},
+  mediumInput: {},
+  dropdown: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    borderWidth: 1,
+    borderRadius: 8,
+    paddingHorizontal: 12,
+    paddingVertical: 10,
+  },
+  dropdownText: {
+    fontSize: 15,
+    flex: 1,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  readOnlyInput: {
+    justifyContent: "center",
+    opacity: 0.7,
+  },
+  readOnlyText: {
+    fontSize: 15,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  actionButtons: {
+    flexDirection: "row",
+    gap: 12,
+    alignItems: "center",
+    paddingBottom: 10,
+  },
+  addButton: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center",
+    gap: 8,
+    paddingVertical: 12,
+    paddingHorizontal: 16,
+    borderWidth: 1.5,
+    borderRadius: 8,
+    borderStyle: "dashed",
+    marginTop: 4,
+  },
+  addButtonText: {
+    fontSize: 14,
+    fontWeight: "600",
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  // Modal styles
+  modalOverlay: {
+    flex: 1,
+    justifyContent: "center",
+    alignItems: "center",
+  },
+  modalContent: {
+    borderRadius: 12,
+    width: "80%",
+    maxHeight: "50%",
+    overflow: "hidden",
+    shadowColor: "#000",
+    shadowOffset: {
+      width: 0,
+      height: 4,
+    },
+    shadowOpacity: 0.3,
+    shadowRadius: 8,
+    elevation: 8,
+  },
+  option: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    paddingHorizontal: 20,
+    paddingVertical: 16,
+    borderBottomWidth: 1,
+  },
+  optionText: {
+    fontSize: 16,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+});
--- a/components/diary/addTripModal/PortSelector.tsx
+++ b/components/diary/addTripModal/PortSelector.tsx
@@ -0,0 +1,171 @@
+import React from "react";
+import {
+  View,
+  Text,
+  TouchableOpacity,
+  StyleSheet,
+  Platform,
+} from "react-native";
+import { Ionicons } from "@expo/vector-icons";
+import { useI18n } from "@/hooks/use-i18n";
+import { useThemeContext } from "@/hooks/use-theme-context";
+
+interface PortSelectorProps {
+  departurePortId: number;
+  arrivalPortId: number;
+  onDeparturePortChange: (portId: number) => void;
+  onArrivalPortChange: (portId: number) => void;
+}
+
+export default function PortSelector({
+  departurePortId,
+  arrivalPortId,
+  onDeparturePortChange,
+  onArrivalPortChange,
+}: PortSelectorProps) {
+  const { t } = useI18n();
+  const { colors } = useThemeContext();
+
+  const handleSelectDeparturePort = () => {
+    console.log("Select departure port pressed");
+    // TODO: Implement port selection modal/dropdown
+    // For now, just set a dummy ID
+    onDeparturePortChange(1);
+  };
+
+  const handleSelectArrivalPort = () => {
+    console.log("Select arrival port pressed");
+    // TODO: Implement port selection modal/dropdown
+    // For now, just set a dummy ID
+    onArrivalPortChange(1);
+  };
+
+  // Helper to display port name (in production, fetch from port list by ID)
+  const getPortDisplayName = (portId: number): string => {
+    // TODO: Fetch actual port name by ID from port list
+    return portId ? `Cảng (ID: ${portId})` : t("diary.selectPort");
+  };
+
+  const themedStyles = {
+    label: { color: colors.text },
+    portSelector: {
+      backgroundColor: colors.card,
+      borderColor: colors.border,
+    },
+    portText: { color: colors.text },
+    placeholder: { color: colors.textSecondary },
+  };
+
+  return (
+    <View style={styles.container}>
+      <Text style={[styles.label, themedStyles.label]}>
+        {t("diary.portLabel")}
+      </Text>
+      <View style={styles.portContainer}>
+        {/* Departure Port */}
+        <View style={styles.portSection}>
+          <Text style={[styles.subLabel, themedStyles.placeholder]}>
+            {t("diary.departurePort")}
+          </Text>
+          <TouchableOpacity
+            style={[styles.portSelector, themedStyles.portSelector]}
+            onPress={handleSelectDeparturePort}
+            activeOpacity={0.7}
+          >
+            <Text
+              style={[
+                styles.portText,
+                themedStyles.portText,
+                !departurePortId && themedStyles.placeholder,
+              ]}
+            >
+              {getPortDisplayName(departurePortId)}
+            </Text>
+            <Ionicons
+              name="ellipsis-horizontal"
+              size={20}
+              color={colors.textSecondary}
+            />
+          </TouchableOpacity>
+        </View>
+
+        {/* Arrival Port */}
+        <View style={styles.portSection}>
+          <Text style={[styles.subLabel, themedStyles.placeholder]}>
+            {t("diary.arrivalPort")}
+          </Text>
+          <TouchableOpacity
+            style={[styles.portSelector, themedStyles.portSelector]}
+            onPress={handleSelectArrivalPort}
+            activeOpacity={0.7}
+          >
+            <Text
+              style={[
+                styles.portText,
+                themedStyles.portText,
+                !arrivalPortId && themedStyles.placeholder,
+              ]}
+            >
+              {getPortDisplayName(arrivalPortId)}
+            </Text>
+            <Ionicons
+              name="ellipsis-horizontal"
+              size={20}
+              color={colors.textSecondary}
+            />
+          </TouchableOpacity>
+        </View>
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    marginBottom: 20,
+  },
+  label: {
+    fontSize: 16,
+    fontWeight: "600",
+    marginBottom: 12,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  subLabel: {
+    fontSize: 14,
+    marginBottom: 6,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  portContainer: {
+    flexDirection: "row",
+    gap: 12,
+  },
+  portSection: {
+    flex: 1,
+  },
+  portSelector: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    borderWidth: 1,
+    borderRadius: 8,
+    paddingHorizontal: 12,
+    paddingVertical: 12,
+  },
+  portText: {
+    fontSize: 15,
+    flex: 1,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+});
--- a/components/diary/addTripModal/ShipSelector.tsx
+++ b/components/diary/addTripModal/ShipSelector.tsx
@@ -0,0 +1,293 @@
+import React, { useState } from "react";
+import {
+  View,
+  Text,
+  TouchableOpacity,
+  StyleSheet,
+  Modal,
+  Platform,
+  ScrollView,
+  TextInput,
+} from "react-native";
+import { Ionicons } from "@expo/vector-icons";
+import { useThings } from "@/state/use-thing";
+import { useI18n } from "@/hooks/use-i18n";
+import { useThemeContext } from "@/hooks/use-theme-context";
+
+interface ShipSelectorProps {
+  selectedShipId: string;
+  onChange: (shipId: string) => void;
+}
+
+export default function ShipSelector({
+  selectedShipId,
+  onChange,
+}: ShipSelectorProps) {
+  const { t } = useI18n();
+  const { colors } = useThemeContext();
+  const [isOpen, setIsOpen] = useState(false);
+  const [searchText, setSearchText] = useState("");
+
+  const { things } = useThings();
+
+  // Convert things to ship options
+  const shipOptions =
+    things
+      ?.filter((thing) => thing.id != null)
+      .map((thing) => ({
+        id: thing.id as string,
+        shipName: thing.metadata?.ship_name || "",
+      })) || [];
+
+  // Filter ships based on search text
+  const filteredShips = shipOptions.filter((ship) => {
+    const searchLower = searchText.toLowerCase();
+    return ship.shipName.toLowerCase().includes(searchLower);
+  });
+
+  const handleSelect = (shipId: string) => {
+    onChange(shipId);
+    setIsOpen(false);
+    setSearchText("");
+  };
+
+  const selectedShip = shipOptions.find((ship) => ship.id === selectedShipId);
+  const displayValue = selectedShip
+    ? selectedShip.shipName
+    : t("diary.selectShip");
+
+  const themedStyles = {
+    label: { color: colors.text },
+    selector: { backgroundColor: colors.card, borderColor: colors.border },
+    selectorText: { color: colors.text },
+    placeholder: { color: colors.textSecondary },
+    modalContent: { backgroundColor: colors.card },
+    searchContainer: {
+      backgroundColor: colors.backgroundSecondary,
+      borderColor: colors.border,
+    },
+    searchInput: { color: colors.text },
+    option: { borderBottomColor: colors.separator },
+    selectedOption: { backgroundColor: colors.backgroundSecondary },
+    optionText: { color: colors.text },
+    emptyText: { color: colors.textSecondary },
+  };
+
+  return (
+    <View style={styles.container}>
+      <Text style={[styles.label, themedStyles.label]}>
+        {t("diary.shipSelector")}
+        <Text style={styles.required}> *</Text>
+      </Text>
+      <TouchableOpacity
+        style={[styles.selector, themedStyles.selector]}
+        onPress={() => setIsOpen(true)}
+        activeOpacity={0.7}
+      >
+        <Text
+          style={[
+            styles.selectorText,
+            themedStyles.selectorText,
+            !selectedShipId && themedStyles.placeholder,
+          ]}
+        >
+          {displayValue}
+        </Text>
+        <Ionicons
+          name="ellipsis-horizontal"
+          size={20}
+          color={colors.textSecondary}
+        />
+      </TouchableOpacity>
+
+      <Modal
+        visible={isOpen}
+        transparent
+        animationType="fade"
+        onRequestClose={() => setIsOpen(false)}
+      >
+        <TouchableOpacity
+          style={styles.modalOverlay}
+          activeOpacity={1}
+          onPress={() => setIsOpen(false)}
+        >
+          <View
+            style={[styles.modalContent, themedStyles.modalContent]}
+            onStartShouldSetResponder={() => true}
+          >
+            {/* Search Input */}
+            <View
+              style={[styles.searchContainer, themedStyles.searchContainer]}
+            >
+              <Ionicons
+                name="search"
+                size={20}
+                color={colors.textSecondary}
+                style={styles.searchIcon}
+              />
+              <TextInput
+                style={[styles.searchInput, themedStyles.searchInput]}
+                placeholder={t("diary.searchShip")}
+                placeholderTextColor={colors.textSecondary}
+                value={searchText}
+                onChangeText={setSearchText}
+                autoCapitalize="none"
+              />
+              {searchText.length > 0 && (
+                <TouchableOpacity onPress={() => setSearchText("")}>
+                  <Ionicons
+                    name="close-circle"
+                    size={20}
+                    color={colors.textSecondary}
+                  />
+                </TouchableOpacity>
+              )}
+            </View>
+
+            <ScrollView style={styles.optionsList}>
+              {/* Filtered ship options */}
+              {filteredShips.length > 0 ? (
+                filteredShips.map((ship) => (
+                  <TouchableOpacity
+                    key={ship.id}
+                    style={[
+                      styles.option,
+                      themedStyles.option,
+                      selectedShipId === ship.id && themedStyles.selectedOption,
+                    ]}
+                    onPress={() => handleSelect(ship.id)}
+                  >
+                    <Text style={[styles.optionText, themedStyles.optionText]}>
+                      {ship.shipName}
+                    </Text>
+                    {selectedShipId === ship.id && (
+                      <Ionicons
+                        name="checkmark"
+                        size={20}
+                        color={colors.primary}
+                      />
+                    )}
+                  </TouchableOpacity>
+                ))
+              ) : (
+                <View style={styles.emptyContainer}>
+                  <Text style={[styles.emptyText, themedStyles.emptyText]}>
+                    {t("diary.noShipsFound")}
+                  </Text>
+                </View>
+              )}
+            </ScrollView>
+          </View>
+        </TouchableOpacity>
+      </Modal>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    marginBottom: 20,
+  },
+  label: {
+    fontSize: 16,
+    fontWeight: "600",
+    marginBottom: 8,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  required: {
+    color: "#EF4444",
+  },
+  selector: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    borderWidth: 1,
+    borderRadius: 8,
+    paddingHorizontal: 16,
+    paddingVertical: 12,
+  },
+  selectorText: {
+    fontSize: 16,
+    flex: 1,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  modalOverlay: {
+    flex: 1,
+    backgroundColor: "rgba(0, 0, 0, 0.5)",
+    justifyContent: "center",
+    alignItems: "center",
+  },
+  modalContent: {
+    borderRadius: 12,
+    width: "85%",
+    maxHeight: "70%",
+    overflow: "hidden",
+    shadowColor: "#000",
+    shadowOffset: {
+      width: 0,
+      height: 4,
+    },
+    shadowOpacity: 0.3,
+    shadowRadius: 8,
+    elevation: 8,
+  },
+  searchContainer: {
+    flexDirection: "row",
+    alignItems: "center",
+    paddingHorizontal: 16,
+    paddingVertical: 12,
+    borderBottomWidth: 1,
+  },
+  searchIcon: {
+    marginRight: 8,
+  },
+  searchInput: {
+    flex: 1,
+    fontSize: 16,
+    padding: 0,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  optionsList: {
+    maxHeight: 350,
+  },
+  option: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    paddingHorizontal: 20,
+    paddingVertical: 16,
+    borderBottomWidth: 1,
+  },
+  optionText: {
+    fontSize: 16,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  emptyContainer: {
+    paddingVertical: 24,
+    alignItems: "center",
+  },
+  emptyText: {
+    fontSize: 14,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+});
--- a/components/diary/addTripModal/TripDurationPicker.tsx
+++ b/components/diary/addTripModal/TripDurationPicker.tsx
@@ -0,0 +1,289 @@
+import React, { useState } from "react";
+import {
+  View,
+  Text,
+  TouchableOpacity,
+  StyleSheet,
+  Platform,
+  Modal,
+} from "react-native";
+import { Ionicons } from "@expo/vector-icons";
+import DateTimePicker from "@react-native-community/datetimepicker";
+import { useI18n } from "@/hooks/use-i18n";
+import { useThemeContext } from "@/hooks/use-theme-context";
+
+interface TripDurationPickerProps {
+  startDate: Date | null;
+  endDate: Date | null;
+  onStartDateChange: (date: Date | null) => void;
+  onEndDateChange: (date: Date | null) => void;
+}
+
+export default function TripDurationPicker({
+  startDate,
+  endDate,
+  onStartDateChange,
+  onEndDateChange,
+}: TripDurationPickerProps) {
+  const { t } = useI18n();
+  const { colors, colorScheme } = useThemeContext();
+  const [showStartPicker, setShowStartPicker] = useState(false);
+  const [showEndPicker, setShowEndPicker] = useState(false);
+
+  const formatDate = (date: Date | null) => {
+    if (!date) return "";
+    const day = date.getDate().toString().padStart(2, "0");
+    const month = (date.getMonth() + 1).toString().padStart(2, "0");
+    const year = date.getFullYear();
+    return `${day}/${month}/${year}`;
+  };
+
+  const handleStartDateChange = (event: any, selectedDate?: Date) => {
+    setShowStartPicker(Platform.OS === "ios");
+    if (selectedDate) {
+      onStartDateChange(selectedDate);
+    }
+  };
+
+  const handleEndDateChange = (event: any, selectedDate?: Date) => {
+    setShowEndPicker(Platform.OS === "ios");
+    if (selectedDate) {
+      onEndDateChange(selectedDate);
+    }
+  };
+
+  const themedStyles = {
+    label: { color: colors.text },
+    dateInput: {
+      backgroundColor: colors.card,
+      borderColor: colors.border,
+    },
+    dateText: { color: colors.text },
+    placeholder: { color: colors.textSecondary },
+    pickerContainer: { backgroundColor: colors.card },
+    pickerHeader: { borderBottomColor: colors.border },
+    pickerTitle: { color: colors.text },
+    cancelButton: { color: colors.textSecondary },
+  };
+
+  return (
+    <View style={styles.container}>
+      <Text style={[styles.label, themedStyles.label]}>
+        {t("diary.tripDuration")}
+      </Text>
+      <View style={styles.dateRangeContainer}>
+        {/* Start Date */}
+        <View style={styles.dateSection}>
+          <Text style={[styles.subLabel, themedStyles.placeholder]}>
+            {t("diary.startDate")}
+          </Text>
+          <TouchableOpacity
+            style={[styles.dateInput, themedStyles.dateInput]}
+            onPress={() => setShowStartPicker(true)}
+            activeOpacity={0.7}
+          >
+            <Text
+              style={[
+                styles.dateText,
+                themedStyles.dateText,
+                !startDate && themedStyles.placeholder,
+              ]}
+            >
+              {startDate ? formatDate(startDate) : t("diary.selectDate")}
+            </Text>
+            <Ionicons
+              name="calendar-outline"
+              size={20}
+              color={colors.textSecondary}
+            />
+          </TouchableOpacity>
+        </View>
+
+        {/* End Date */}
+        <View style={styles.dateSection}>
+          <Text style={[styles.subLabel, themedStyles.placeholder]}>
+            {t("diary.endDate")}
+          </Text>
+          <TouchableOpacity
+            style={[styles.dateInput, themedStyles.dateInput]}
+            onPress={() => setShowEndPicker(true)}
+            activeOpacity={0.7}
+          >
+            <Text
+              style={[
+                styles.dateText,
+                themedStyles.dateText,
+                !endDate && themedStyles.placeholder,
+              ]}
+            >
+              {endDate ? formatDate(endDate) : t("diary.selectDate")}
+            </Text>
+            <Ionicons
+              name="calendar-outline"
+              size={20}
+              color={colors.textSecondary}
+            />
+          </TouchableOpacity>
+        </View>
+      </View>
+
+      {/* Start Date Picker */}
+      {showStartPicker && (
+        <Modal transparent animationType="fade" visible={showStartPicker}>
+          <View style={styles.modalOverlay}>
+            <View style={[styles.pickerContainer, themedStyles.pickerContainer]}>
+              <View style={[styles.pickerHeader, themedStyles.pickerHeader]}>
+                <TouchableOpacity onPress={() => setShowStartPicker(false)}>
+                  <Text style={[styles.cancelButton, themedStyles.cancelButton]}>
+                    {t("common.cancel")}
+                  </Text>
+                </TouchableOpacity>
+                <Text style={[styles.pickerTitle, themedStyles.pickerTitle]}>
+                  {t("diary.selectStartDate")}
+                </Text>
+                <TouchableOpacity onPress={() => setShowStartPicker(false)}>
+                  <Text style={styles.doneButton}>{t("common.done")}</Text>
+                </TouchableOpacity>
+              </View>
+              <DateTimePicker
+                value={startDate || new Date()}
+                mode="date"
+                display={Platform.OS === "ios" ? "spinner" : "default"}
+                onChange={handleStartDateChange}
+                maximumDate={endDate || undefined}
+                themeVariant={colorScheme}
+                textColor={colors.text}
+              />
+            </View>
+          </View>
+        </Modal>
+      )}
+
+      {/* End Date Picker */}
+      {showEndPicker && (
+        <Modal transparent animationType="fade" visible={showEndPicker}>
+          <View style={styles.modalOverlay}>
+            <View style={[styles.pickerContainer, themedStyles.pickerContainer]}>
+              <View style={[styles.pickerHeader, themedStyles.pickerHeader]}>
+                <TouchableOpacity onPress={() => setShowEndPicker(false)}>
+                  <Text style={[styles.cancelButton, themedStyles.cancelButton]}>
+                    {t("common.cancel")}
+                  </Text>
+                </TouchableOpacity>
+                <Text style={[styles.pickerTitle, themedStyles.pickerTitle]}>
+                  {t("diary.selectEndDate")}
+                </Text>
+                <TouchableOpacity onPress={() => setShowEndPicker(false)}>
+                  <Text style={styles.doneButton}>{t("common.done")}</Text>
+                </TouchableOpacity>
+              </View>
+              <DateTimePicker
+                value={endDate || new Date()}
+                mode="date"
+                display={Platform.OS === "ios" ? "spinner" : "default"}
+                onChange={handleEndDateChange}
+                minimumDate={startDate || undefined}
+                themeVariant={colorScheme}
+                textColor={colors.text}
+              />
+            </View>
+          </View>
+        </Modal>
+      )}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    marginBottom: 20,
+  },
+  label: {
+    fontSize: 16,
+    fontWeight: "600",
+    marginBottom: 12,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  subLabel: {
+    fontSize: 14,
+    marginBottom: 6,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  dateRangeContainer: {
+    flexDirection: "row",
+    gap: 12,
+  },
+  dateSection: {
+    flex: 1,
+  },
+  dateInput: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    borderWidth: 1,
+    borderRadius: 8,
+    paddingHorizontal: 12,
+    paddingVertical: 12,
+  },
+  dateText: {
+    fontSize: 15,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  modalOverlay: {
+    flex: 1,
+    backgroundColor: "rgba(0, 0, 0, 0.5)",
+    justifyContent: "flex-end",
+  },
+  pickerContainer: {
+    borderTopLeftRadius: 20,
+    borderTopRightRadius: 20,
+    paddingBottom: 20,
+  },
+  pickerHeader: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    paddingHorizontal: 20,
+    paddingVertical: 16,
+    borderBottomWidth: 1,
+  },
+  pickerTitle: {
+    fontSize: 16,
+    fontWeight: "600",
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  cancelButton: {
+    fontSize: 16,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  doneButton: {
+    fontSize: 16,
+    fontWeight: "600",
+    color: "#3B82F6",
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+});
--- a/components/diary/addTripModal/TripNameInput.tsx
+++ b/components/diary/addTripModal/TripNameInput.tsx
@@ -0,0 +1,72 @@
+import React from "react";
+import {
+  View,
+  Text,
+  TextInput,
+  StyleSheet,
+  Platform,
+} from "react-native";
+import { useI18n } from "@/hooks/use-i18n";
+import { useThemeContext } from "@/hooks/use-theme-context";
+
+interface TripNameInputProps {
+  value: string;
+  onChange: (value: string) => void;
+}
+
+export default function TripNameInput({ value, onChange }: TripNameInputProps) {
+  const { t } = useI18n();
+  const { colors } = useThemeContext();
+
+  const themedStyles = {
+    label: { color: colors.text },
+    input: {
+      backgroundColor: colors.card,
+      borderColor: colors.border,
+      color: colors.text,
+    },
+  };
+
+  return (
+    <View style={styles.container}>
+      <Text style={[styles.label, themedStyles.label]}>
+        {t("diary.tripNameLabel")}
+      </Text>
+      <TextInput
+        style={[styles.input, themedStyles.input]}
+        value={value}
+        onChangeText={onChange}
+        placeholder={t("diary.tripNamePlaceholder")}
+        placeholderTextColor={colors.textSecondary}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    marginBottom: 20,
+  },
+  label: {
+    fontSize: 16,
+    fontWeight: "600",
+    marginBottom: 8,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  input: {
+    borderWidth: 1,
+    borderRadius: 8,
+    paddingHorizontal: 16,
+    paddingVertical: 12,
+    fontSize: 16,
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+});
--- a/components/diary/addTripModal/index.tsx
+++ b/components/diary/addTripModal/index.tsx
@@ -0,0 +1,386 @@
+import React, { useState } from "react";
+import {
+  View,
+  Text,
+  Modal,
+  TouchableOpacity,
+  StyleSheet,
+  Platform,
+  ScrollView,
+} from "react-native";
+import { Ionicons } from "@expo/vector-icons";
+import { useI18n } from "@/hooks/use-i18n";
+import { useThemeContext } from "@/hooks/use-theme-context";
+import FishingGearList from "@/components/diary/addTripModal/FishingGearList";
+import MaterialCostList from "@/components/diary/addTripModal/MaterialCostList";
+import TripNameInput from "@/components/diary/addTripModal/TripNameInput";
+import TripDurationPicker from "@/components/diary/addTripModal/TripDurationPicker";
+import PortSelector from "@/components/diary/addTripModal/PortSelector";
+import BasicInfoInput from "@/components/diary/addTripModal/BasicInfoInput";
+import ShipSelector from "./ShipSelector";
+import AutoFillSection from "./AutoFillSection";
+
+
+// Internal component interfaces
+export interface FishingGear {
+  id: string;
+  name: string;
+  number: string; // Changed from quantity to number (string)
+}
+
+export interface TripCost {
+  id: string;
+  type: string;
+  amount: number;
+  unit: string;
+  cost_per_unit: number;
+  total_cost: number;
+}
+
+// API body interface
+export interface TripAPIBody {
+  thing_id?: string; // Ship ID
+  name: string;
+  departure_time: string; // ISO string
+  departure_port_id: number;
+  arrival_time: string; // ISO string
+  arrival_port_id: number;
+  fishing_ground_codes: number[]; // Array of numbers
+  fishing_gears: Array<{
+    name: string;
+    number: string;
+  }>;
+  trip_cost: Array<{
+    type: string;
+    amount: number;
+    unit: string;
+    cost_per_unit: number;
+    total_cost: number;
+  }>;
+}
+
+interface AddTripModalProps {
+  visible: boolean;
+  onClose: () => void;
+}
+
+export default function AddTripModal({ visible, onClose }: AddTripModalProps) {
+  const { t } = useI18n();
+  const { colors } = useThemeContext();
+
+  // Form state
+  const [selectedShipId, setSelectedShipId] = useState<string>("");
+  const [tripName, setTripName] = useState("");
+  const [fishingGears, setFishingGears] = useState<FishingGear[]>([]);
+  const [tripCosts, setTripCosts] = useState<TripCost[]>([]);
+  const [startDate, setStartDate] = useState<Date | null>(null);
+  const [endDate, setEndDate] = useState<Date | null>(null);
+  const [departurePortId, setDeparturePortId] = useState<number>(1);
+  const [arrivalPortId, setArrivalPortId] = useState<number>(1);
+  const [fishingGroundCodes, setFishingGroundCodes] = useState<string>(""); // Input as string, convert to array
+
+  const handleCancel = () => {
+    // Reset form
+    setSelectedShipId("");
+    setTripName("");
+    setFishingGears([]);
+    setTripCosts([]);
+    setStartDate(null);
+    setEndDate(null);
+    setDeparturePortId(1);
+    setArrivalPortId(1);
+    setFishingGroundCodes("");
+    onClose();
+  };
+
+  // Handle auto-fill from last trip data
+  const handleAutoFill = (tripData: Model.Trip, selectedThingId: string) => {
+    // Fill ship ID (use the thingId from the selected ship for ShipSelector)
+    setSelectedShipId(selectedThingId);
+
+    // Fill trip name
+    if (tripData.name) {
+      setTripName(tripData.name);
+    }
+
+    // Fill fishing gears
+    if (tripData.fishing_gears && Array.isArray(tripData.fishing_gears)) {
+      const gears: FishingGear[] = tripData.fishing_gears.map((gear, index) => ({
+        id: `auto-${Date.now()}-${index}`,
+        name: gear.name || "",
+        number: gear.number?.toString() || "",
+      }));
+      setFishingGears(gears);
+    }
+
+    // Fill trip costs
+    if (tripData.trip_cost && Array.isArray(tripData.trip_cost)) {
+      const costs: TripCost[] = tripData.trip_cost.map((cost, index) => ({
+        id: `auto-${Date.now()}-${index}`,
+        type: cost.type || "",
+        amount: cost.amount || 0,
+        unit: cost.unit || "",
+        cost_per_unit: cost.cost_per_unit || 0,
+        total_cost: cost.total_cost || 0,
+      }));
+      setTripCosts(costs);
+    }
+
+    // Fill departure and arrival ports
+    if (tripData.departure_port_id) {
+      setDeparturePortId(tripData.departure_port_id);
+    }
+    if (tripData.arrival_port_id) {
+      setArrivalPortId(tripData.arrival_port_id);
+    }
+
+    // Fill fishing ground codes
+    if (tripData.fishing_ground_codes && Array.isArray(tripData.fishing_ground_codes)) {
+      setFishingGroundCodes(tripData.fishing_ground_codes.join(", "));
+    }
+  };
+
+  const handleSubmit = () => {
+    // Parse fishing ground codes from comma-separated string to array of numbers
+    const fishingGroundCodesArray = fishingGroundCodes
+      .split(",")
+      .map((code) => parseInt(code.trim()))
+      .filter((code) => !isNaN(code));
+
+    // Format API body
+    const apiBody: TripAPIBody = {
+      thing_id: selectedShipId || undefined,
+      name: tripName,
+      departure_time: startDate ? startDate.toISOString() : "",
+      departure_port_id: departurePortId,
+      arrival_time: endDate ? endDate.toISOString() : "",
+      arrival_port_id: arrivalPortId,
+      fishing_ground_codes: fishingGroundCodesArray,
+      fishing_gears: fishingGears.map((gear) => ({
+        name: gear.name,
+        number: gear.number,
+      })),
+      trip_cost: tripCosts.map((cost) => ({
+        type: cost.type,
+        amount: cost.amount,
+        unit: cost.unit,
+        cost_per_unit: cost.cost_per_unit,
+        total_cost: cost.total_cost,
+      })),
+    };
+
+    // Simulate API call - log the formatted data
+    console.log("=== Submitting Trip Data (API Format) ===");
+    console.log(JSON.stringify(apiBody, null, 2));
+    console.log("=== End Trip Data ===");
+
+    // Reset form and close modal
+    handleCancel();
+  };
+
+  const themedStyles = {
+    modalContainer: {
+      backgroundColor: colors.card,
+    },
+    header: {
+      borderBottomColor: colors.separator,
+    },
+    title: {
+      color: colors.text,
+    },
+    footer: {
+      borderTopColor: colors.separator,
+    },
+    cancelButton: {
+      backgroundColor: colors.backgroundSecondary,
+    },
+    cancelButtonText: {
+      color: colors.textSecondary,
+    },
+    submitButton: {
+      backgroundColor: colors.primary,
+    },
+  };
+
+  return (
+    <Modal
+      visible={visible}
+      animationType="fade"
+      transparent
+      onRequestClose={onClose}
+    >
+      <View style={styles.overlay}>
+        <View style={[styles.modalContainer, themedStyles.modalContainer]}>
+          {/* Header */}
+          <View style={[styles.header, themedStyles.header]}>
+            <TouchableOpacity onPress={handleCancel} style={styles.closeButton}>
+              <Ionicons name="close" size={24} color={colors.text} />
+            </TouchableOpacity>
+            <Text style={[styles.title, themedStyles.title]}>
+              {t("diary.addTrip")}
+            </Text>
+            <View style={styles.placeholder} />
+          </View>
+
+          {/* Content */}
+          <ScrollView
+            style={styles.content}
+            showsVerticalScrollIndicator={false}
+          >
+            {/* Auto Fill Section */}
+            <AutoFillSection onAutoFill={handleAutoFill} />
+
+            {/* Ship Selector */}
+            <ShipSelector
+              selectedShipId={selectedShipId}
+              onChange={setSelectedShipId}
+            />
+
+            {/* Trip Name */}
+            <TripNameInput value={tripName} onChange={setTripName} />
+
+            {/* Fishing Gear List */}
+            <FishingGearList
+              items={fishingGears}
+              onChange={setFishingGears}
+            />
+
+            {/* Trip Cost List */}
+            <MaterialCostList
+              items={tripCosts}
+              onChange={setTripCosts}
+            />
+
+            {/* Trip Duration */}
+            <TripDurationPicker
+              startDate={startDate}
+              endDate={endDate}
+              onStartDateChange={setStartDate}
+              onEndDateChange={setEndDate}
+            />
+
+            {/* Port Selector */}
+            <PortSelector
+              departurePortId={departurePortId}
+              arrivalPortId={arrivalPortId}
+              onDeparturePortChange={setDeparturePortId}
+              onArrivalPortChange={setArrivalPortId}
+            />
+
+            {/* Fishing Ground Codes */}
+            <BasicInfoInput
+              fishingGroundCodes={fishingGroundCodes}
+              onChange={setFishingGroundCodes}
+            />
+          </ScrollView>
+
+          {/* Footer */}
+          <View style={[styles.footer, themedStyles.footer]}>
+            <TouchableOpacity
+              style={[styles.cancelButton, themedStyles.cancelButton]}
+              onPress={handleCancel}
+              activeOpacity={0.7}
+            >
+              <Text style={[styles.cancelButtonText, themedStyles.cancelButtonText]}>
+                {t("common.cancel")}
+              </Text>
+            </TouchableOpacity>
+            <TouchableOpacity
+              style={[styles.submitButton, themedStyles.submitButton]}
+              onPress={handleSubmit}
+              activeOpacity={0.7}
+            >
+              <Text style={styles.submitButtonText}>
+                {t("diary.createTrip")}
+              </Text>
+            </TouchableOpacity>
+          </View>
+        </View>
+      </View>
+    </Modal>
+  );
+}
+
+const styles = StyleSheet.create({
+  overlay: {
+    flex: 1,
+    backgroundColor: "rgba(0, 0, 0, 0.5)",
+    justifyContent: "flex-end",
+  },
+  modalContainer: {
+    borderTopLeftRadius: 24,
+    borderTopRightRadius: 24,
+    maxHeight: "90%",
+    shadowColor: "#000",
+    shadowOffset: {
+      width: 0,
+      height: -4,
+    },
+    shadowOpacity: 0.1,
+    shadowRadius: 12,
+    elevation: 8,
+  },
+  header: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
+    paddingHorizontal: 20,
+    paddingVertical: 16,
+    borderBottomWidth: 1,
+  },
+  closeButton: {
+    padding: 4,
+  },
+  title: {
+    fontSize: 18,
+    fontWeight: "700",
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  placeholder: {
+    width: 32,
+  },
+  content: {
+    padding: 20,
+  },
+  footer: {
+    flexDirection: "row",
+    gap: 12,
+    padding: 20,
+    borderTopWidth: 1,
+  },
+  cancelButton: {
+    flex: 1,
+    paddingVertical: 14,
+    borderRadius: 12,
+    alignItems: "center",
+  },
+  cancelButtonText: {
+    fontSize: 16,
+    fontWeight: "600",
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+  submitButton: {
+    flex: 1,
+    paddingVertical: 14,
+    borderRadius: 12,
+    alignItems: "center",
+  },
+  submitButtonText: {
+    fontSize: 16,
+    fontWeight: "600",
+    color: "#FFFFFF",
+    fontFamily: Platform.select({
+      ios: "System",
+      android: "Roboto",
+      default: "System",
+    }),
+  },
+});
--- a/components/map/SosButton.tsx
+++ b/components/map/SosButton.tsx
@@ -1,249 +0,0 @@
-import {
-  queryDeleteSos,
-  queryGetSos,
-  querySendSosMessage,
-} from "@/controller/DeviceController";
-import { useI18n } from "@/hooks/use-i18n";
-import { showErrorToast } from "@/services/toast_service";
-import { sosMessage } from "@/utils/sosUtils";
-import { MaterialIcons } from "@expo/vector-icons";
-import { useEffect, useState } from "react";
-import { StyleSheet, Text, TextInput, View } from "react-native";
-import IconButton from "../IconButton";
-import Select from "../Select";
-import Modal from "../ui/modal";
-import { useThemeColor } from "@/hooks/use-theme-color";
-
-const SosButton = () => {
-  const [sosData, setSosData] = useState<Model.SosResponse | null>();
-  const [showConfirmSosDialog, setShowConfirmSosDialog] = useState(false);
-  const [selectedSosMessage, setSelectedSosMessage] = useState<number | null>(
-    null
-  );
-  const [customMessage, setCustomMessage] = useState("");
-  const [errors, setErrors] = useState<{ [key: string]: string }>({});
-  const { t } = useI18n();
-
-  // Theme colors
-  const textColor = useThemeColor({}, 'text');
-  const borderColor = useThemeColor({}, 'border');
-  const errorColor = useThemeColor({}, 'error');
-  const backgroundColor = useThemeColor({}, 'background');
-
-  // Dynamic styles
-  const styles = SosButtonStyles(textColor, borderColor, errorColor, backgroundColor);
-
-  const sosOptions = [
-    ...sosMessage.map((msg) => ({
-      ma: msg.ma,
-      moTa: msg.moTa,
-      label: msg.moTa,
-      value: msg.ma,
-    })),
-    { ma: 999, moTa: "Khác", label: "Khác", value: 999 },
-  ];
-
-  const getSosData = async () => {
-    try {
-      const response = await queryGetSos();
-      // console.log("SoS ResponseL: ", response);
-
-      setSosData(response.data);
-    } catch (error) {
-      console.error("Failed to fetch SOS data:", error);
-    }
-  };
-
-  useEffect(() => {
-    getSosData();
-  }, []);
-
-  const validateForm = () => {
-    const newErrors: { [key: string]: string } = {};
-
-    if (selectedSosMessage === 999 && customMessage.trim() === "") {
-      newErrors.customMessage = t("home.sos.statusRequired");
-    }
-
-    setErrors(newErrors);
-    return Object.keys(newErrors).length === 0;
-  };
-
-  const handleConfirmSos = async () => {
-    if (!validateForm()) {
-      console.log("Form chưa validate");
-      return; // Không đóng modal nếu validate fail
-    }
-
-    let messageToSend = "";
-    if (selectedSosMessage === 999) {
-      messageToSend = customMessage.trim();
-    } else {
-      const selectedOption = sosOptions.find(
-        (opt) => opt.ma === selectedSosMessage
-      );
-      messageToSend = selectedOption ? selectedOption.moTa : "";
-    }
-
-    // Gửi dữ liệu đi
-    await sendSosMessage(messageToSend);
-
-    // Đóng modal và reset form sau khi gửi thành công
-    setShowConfirmSosDialog(false);
-    setSelectedSosMessage(null);
-    setCustomMessage("");
-    setErrors({});
-  };
-
-  const handleClickButton = async (isActive: boolean) => {
-    console.log("Is Active: ", isActive);
-
-    if (isActive) {
-      const resp = await queryDeleteSos();
-      if (resp.status === 200) {
-        await getSosData();
-      }
-    } else {
-      setSelectedSosMessage(11); // Mặc định chọn lý do ma: 11
-      setShowConfirmSosDialog(true);
-    }
-  };
-
-  const sendSosMessage = async (message: string) => {
-    try {
-      const resp = await querySendSosMessage(message);
-      if (resp.status === 200) {
-        await getSosData();
-      }
-    } catch (error) {
-      console.error("Error when send sos: ", error);
-      showErrorToast(t("home.sos.sendError"));
-    }
-  };
-
-  return (
-    <>
-      <IconButton
-        icon={<MaterialIcons name="warning" size={20} color="white" />}
-        type="danger"
-        size="middle"
-        onPress={() => handleClickButton(sosData?.active || false)}
-        style={{ borderRadius: 20 }}
-      >
-        {sosData?.active ? t("home.sos.active") : t("home.sos.inactive")}
-      </IconButton>
-      <Modal
-        open={showConfirmSosDialog}
-        onCancel={() => {
-          setShowConfirmSosDialog(false);
-          setSelectedSosMessage(null);
-          setCustomMessage("");
-          setErrors({});
-        }}
-        okText={t("home.sos.confirm")}
-        cancelText={t("home.sos.cancel")}
-        title={t("home.sos.title")}
-        centered
-        onOk={handleConfirmSos}
-      >
-        {/* Select Nội dung SOS */}
-        <View style={styles.formGroup}>
-          <Text style={styles.label}>{t("home.sos.content")}</Text>
-
-          <Select
-            value={selectedSosMessage ?? undefined}
-            options={sosOptions}
-            placeholder={t("home.sos.selectReason")}
-            onChange={(value) => {
-              setSelectedSosMessage(value as number);
-              // Clear custom message nếu chọn khác lý do
-              if (value !== 999) {
-                setCustomMessage("");
-              }
-              // Clear error if exists
-              if (errors.sosMessage) {
-                setErrors((prev) => {
-                  const newErrors = { ...prev };
-                  delete newErrors.sosMessage;
-                  return newErrors;
-                });
-              }
-            }}
-            showSearch={false}
-            style={[errors.sosMessage ? styles.errorBorder : undefined]}
-          />
-          {errors.sosMessage && (
-            <Text style={styles.errorText}>{errors.sosMessage}</Text>
-          )}
-        </View>
-
-        {/* Input Custom Message nếu chọn "Khác" */}
-        {selectedSosMessage === 999 && (
-          <View style={styles.formGroup}>
-            <Text style={styles.label}>{t("home.sos.statusInput")}</Text>
-            <TextInput
-              style={[
-                styles.input,
-                errors.customMessage ? styles.errorInput : {},
-              ]}
-              placeholder={t("home.sos.enterStatus")}
-              placeholderTextColor={textColor + '99'} // Add transparency
-              value={customMessage}
-              onChangeText={(text) => {
-                setCustomMessage(text);
-                if (text.trim() !== "") {
-                  setErrors((prev) => {
-                    const newErrors = { ...prev };
-                    delete newErrors.customMessage;
-                    return newErrors;
-                  });
-                }
-              }}
-              multiline
-              numberOfLines={4}
-            />
-            {errors.customMessage && (
-              <Text style={styles.errorText}>{errors.customMessage}</Text>
-            )}
-          </View>
-        )}
-      </Modal>
-    </>
-  );
-};
-
-const SosButtonStyles = (textColor: string, borderColor: string, errorColor: string, backgroundColor: string) => StyleSheet.create({
-  formGroup: {
-    marginBottom: 16,
-  },
-  label: {
-    fontSize: 14,
-    fontWeight: "600",
-    marginBottom: 8,
-    color: textColor,
-  },
-  errorBorder: {
-    borderColor: errorColor,
-  },
-  input: {
-    borderWidth: 1,
-    borderColor: borderColor,
-    borderRadius: 8,
-    paddingHorizontal: 12,
-    paddingVertical: 12,
-    fontSize: 14,
-    color: textColor,
-    backgroundColor: backgroundColor,
-    textAlignVertical: "top",
-  },
-  errorInput: {
-    borderColor: errorColor,
-  },
-  errorText: {
-    color: errorColor,
-    fontSize: 12,
-    marginTop: 4,
-  },
-});
-
-export default SosButton;
--- a/constants/index.ts
+++ b/constants/index.ts
@@ -54,3 +54,6 @@ export const API_PATH_SHIP_TRACK_POINTS = "/api/sgw/trackpoints";
 export const API_GET_ALL_BANZONES = "/api/sgw/banzones";
 export const API_GET_SHIP_TYPES = "/api/sgw/ships/types";
 export const API_GET_SHIP_GROUPS = "/api/sgw/shipsgroup";
+export const API_GET_LAST_TRIP = "/api/sgw/trips/last";
+export const API_GET_ALARM = "/api/alarms";
+export const API_MANAGER_ALARM = "/api/alarms/confirm";
--- a/controller/AlarmController.ts
+++ b/controller/AlarmController.ts
@@ -0,0 +1,15 @@
+import { api } from "@/config";
+import { API_GET_ALARM, API_MANAGER_ALARM } from "@/constants";
+
+export async function queryAlarms(payload: Model.AlarmPayload) {
+  return await api.get<Model.AlarmResponse>(API_GET_ALARM, {
+    params: payload,
+  });
+}
+
+export async function queryConfirmAlarm(body: Model.AlarmConfirmRequest) {
+  return await api.post(API_MANAGER_ALARM, body);
+}
+export async function queryrUnconfirmAlarm(body: Model.AlarmConfirmRequest) {
+  return await api.delete(API_MANAGER_ALARM, { data: body });
+}
--- a/controller/DeviceController.ts
+++ b/controller/DeviceController.ts
@@ -1,43 +1,9 @@
 import { api } from "@/config";
 import {
-  API_GET_ALARMS,
-  API_GET_GPS,
  API_GET_SHIP_GROUPS,
  API_GET_SHIP_TYPES,
-  API_PATH_ENTITIES,
  API_PATH_SEARCH_THINGS,
-  API_PATH_SHIP_TRACK_POINTS,
-  API_SOS,
 } from "@/constants";
-import { transformEntityResponse } from "@/utils/tranform";
-
-export async function queryGpsData() {
-  return api.get<Model.GPSResponse>(API_GET_GPS);
-}
-
-export async function queryAlarm() {
-  return api.get<Model.AlarmResponse>(API_GET_ALARMS);
-}
-
-export async function queryTrackPoints() {
-  return api.get<Model.ShipTrackPoint[]>(API_PATH_SHIP_TRACK_POINTS);
-}
-
-export async function queryEntities(): Promise<Model.TransformedEntity[]> {
-  const response = await api.get<Model.EntityResponse[]>(API_PATH_ENTITIES);
-  return response.data.map(transformEntityResponse);
-}
-
-export async function queryGetSos() {
-  return await api.get<Model.SosResponse>(API_SOS);
-}
-export async function queryDeleteSos() {
-  return await api.delete<Model.SosResponse>(API_SOS);
-}
-
-export async function querySendSosMessage(message: string) {
-  return await api.put<Model.SosRequest>(API_SOS, { message });
-}

 export async function querySearchThings(body: Model.SearchThingBody) {
  return await api.post<Model.ThingsResponse>(API_PATH_SEARCH_THINGS, body);
--- a/controller/TripController.ts
+++ b/controller/TripController.ts
@@ -5,12 +5,17 @@ import {
  API_POST_TRIPSLIST,
  API_UPDATE_FISHING_LOGS,
  API_UPDATE_TRIP_STATUS,
+  API_GET_LAST_TRIP,
 } from "@/constants";

 export async function queryTrip() {
  return api.get<Model.Trip>(API_GET_TRIP);
 }

+export async function queryLastTrip(thingId: string) {
+  return api.get<Model.Trip>(`${API_GET_LAST_TRIP}/${thingId}`);
+}
+
 export async function queryUpdateTripState(body: Model.TripUpdateStateRequest) {
  return api.put(API_UPDATE_TRIP_STATUS, body);
 }
--- a/controller/typings.d.ts
+++ b/controller/typings.d.ts
@@ -17,41 +17,6 @@ declare namespace Model {
    fishing: boolean;
    t: number;
  }
-  interface Alarm {
-    name: string;
-    t: number; // timestamp (epoch seconds)
-    level: number;
-    id: string;
-  }
-
-  interface AlarmResponse {
-    alarms: Alarm[];
-    level: number;
-  }
-
-  interface ShipTrackPoint {
-    time: number;
-    lon: number;
-    lat: number;
-    s: number;
-    h: number;
-  }
-  interface EntityResponse {
-    id: string;
-    v: number;
-    vs: string;
-    t: number;
-    type: string;
-  }
-  interface TransformedEntity {
-    id: string;
-    value: number;
-    valueString: string;
-    time: number;
-    type: string;
-  }
-
-  // Banzones
  // Banzone
  interface Zone {
    id?: string;
@@ -332,4 +297,43 @@ declare namespace Model {
    owner_id?: string;
    description?: string;
  }
+
+  interface AlarmPayload {
+    offset: number;
+    limit: number;
+    order?: string;
+    dir?: "asc" | "desc";
+    name?: string;
+    level?: number;
+    confirmed?: boolean;
+  }
+
+  interface AlarmResponse {
+    total?: number;
+    limit?: number;
+    order?: string;
+    dir?: string;
+    alarms?: Alarm[];
+  }
+
+  interface Alarm {
+    name?: string;
+    time?: number;
+    level?: number;
+    id?: string;
+    confirmed?: boolean;
+    confirmed_email?: string;
+    confirmed_time?: number;
+    confirmed_desc?: string;
+    thing_id?: string;
+    thing_name?: string;
+    thing_type?: ThingType;
+  }
+
+  interface AlarmConfirmRequest {
+    id: string;
+    description?: string;
+    thing_id: string;
+    time: number;
+  }
 }
--- a/locales/en.json
+++ b/locales/en.json
@@ -4,6 +4,7 @@
    "footer_text": "Product of Mobifone v1.0",
    "ok": "OK",
    "cancel": "Cancel",
+    "done": "Done",
    "save": "Save",
    "delete": "Delete",
    "edit": "Edit",
@@ -67,6 +68,7 @@
    "tripList": "Trip List",
    "tripListCount": "Trip List ({{count}})",
    "noTripsFound": "No matching trips found",
+    "loadingMore": "Loading more...",
    "reset": "Reset",
    "apply": "Apply",
    "selectedFilters": "Selected filters:",
@@ -101,6 +103,7 @@
    },
    "tripCard": {
      "shipCode": "Ship Code",
+      "shipName": "Ship Name",
      "departure": "Departure",
      "return": "Return",
      "view": "View",
@@ -116,6 +119,52 @@
      "departed": "Departed",
      "completed": "Completed",
      "cancelled": "Cancelled"
+    },
+    "createTrip": "Create Trip",
+    "shipSelector": "Select Ship",
+    "selectShip": "Select ship",
+    "searchShip": "Search ship...",
+    "noShipsFound": "No ships found",
+    "tripNameLabel": "Trip Name",
+    "tripNamePlaceholder": "Enter trip name",
+    "fishingGearList": "Fishing Gear List",
+    "addFishingGear": "Add Fishing Gear",
+    "gearName": "Name",
+    "gearNamePlaceholder": "Name",
+    "gearNumber": "Quantity",
+    "gearNumberPlaceholder": "Quantity",
+    "quantity": "Quantity",
+    "materialCostList": "Material Costs",
+    "addMaterialCost": "Add Material",
+    "costType": "Type",
+    "selectType": "Select type",
+    "amount": "Amount",
+    "unit": "Unit",
+    "unitPlaceholder": "Unit",
+    "costPerUnit": "Cost",
+    "totalCost": "Total Cost",
+    "tripDuration": "Trip Duration",
+    "startDate": "Start",
+    "endDate": "End",
+    "selectDate": "Select Date",
+    "selectStartDate": "Select start date",
+    "selectEndDate": "Select end date",
+    "portLabel": "Port",
+    "departurePort": "Departure Port",
+    "arrivalPort": "Arrival Port",
+    "selectPort": "Select port",
+    "fishingGroundCodes": "Fishing Ground Codes",
+    "fishingGroundCodesHint": "Enter fishing ground codes (comma separated)",
+    "fishingGroundCodesPlaceholder": "e.g: 1,2,3",
+    "autoFill": {
+      "title": "Auto-fill data",
+      "description": "Fill from the ship's last trip",
+      "selectShip": "Select ship",
+      "modalTitle": "Select ship to get data",
+      "loading": "Loading data...",
+      "success": "Data filled from last trip",
+      "error": "Unable to fetch trip data",
+      "noData": "No previous trip data available"
    }
  },
  "trip": {
--- a/locales/vi.json
+++ b/locales/vi.json
@@ -4,6 +4,7 @@
    "footer_text": "Sản phẩm của Mobifone v1.0",
    "ok": "OK",
    "cancel": "Hủy",
+    "done": "Xong",
    "save": "Lưu",
    "delete": "Xóa",
    "edit": "Chỉnh sửa",
@@ -67,6 +68,7 @@
    "tripList": "Danh sách chuyến đi",
    "tripListCount": "Danh sách chuyến đi ({{count}})",
    "noTripsFound": "Không tìm thấy chuyến đi phù hợp",
+    "loadingMore": "Đang tải thêm...",
    "reset": "Đặt lại",
    "apply": "Áp dụng",
    "selectedFilters": "Bộ lọc đã chọn:",
@@ -101,6 +103,7 @@
    },
    "tripCard": {
      "shipCode": "Mã Tàu",
+      "shipName": "Tên Tàu",
      "departure": "Khởi hành",
      "return": "Trở về",
      "view": "Xem",
@@ -116,6 +119,52 @@
      "departed": "Đã xuất bến",
      "completed": "Đã hoàn thành",
      "cancelled": "Đã huỷ"
+    },
+    "createTrip": "Tạo chuyến đi",
+    "shipSelector": "Chọn tàu",
+    "selectShip": "Chọn tàu",
+    "searchShip": "Tìm kiếm tàu...",
+    "noShipsFound": "Không tìm thấy tàu phù hợp",
+    "tripNameLabel": "Tên chuyến đi",
+    "tripNamePlaceholder": "Nhập tên chuyến đi",
+    "fishingGearList": "Danh sách ngư cụ",
+    "addFishingGear": "Thêm ngư cụ",
+    "gearName": "Tên",
+    "gearNamePlaceholder": "Tên",
+    "gearNumber": "Số lượng",
+    "gearNumberPlaceholder": "Số lượng",
+    "quantity": "Số lượng",
+    "materialCostList": "Chi phí nguyên liệu",
+    "addMaterialCost": "Thêm nguyên liệu",
+    "costType": "Loại",
+    "selectType": "Chọn loại",
+    "amount": "Số lượng",
+    "unit": "Đơn vị",
+    "unitPlaceholder": "Đơn vị",
+    "costPerUnit": "Chi phí",
+    "totalCost": "Tổng chi phí",
+    "tripDuration": "Thời gian chuyến đi",
+    "startDate": "Bắt đầu",
+    "endDate": "Kết thúc",
+    "selectDate": "Chọn ngày",
+    "selectStartDate": "Chọn ngày bắt đầu",
+    "selectEndDate": "Chọn ngày kết thúc",
+    "portLabel": " Cả",
+    "departurePort": "Cảng khởi hành",
+    "arrivalPort": "Cảng cập bến",
+    "selectPort": "Chọn cảng",
+    "fishingGroundCodes": "Ô ngư trường khai thác",
+    "fishingGroundCodesHint": "Nhập mã ô ngư trường (cách nhau bằng dấu phẩy)",
+    "fishingGroundCodesPlaceholder": "Ví dụ: 1,2,3",
+    "autoFill": {
+      "title": "Tự động điền dữ liệu",
+      "description": "Điền từ chuyến đi cuối cùng của tàu",
+      "selectShip": "Chọn tàu",
+      "modalTitle": "Chọn tàu để lấy dữ liệu",
+      "loading": "Đang tải dữ liệu...",
+      "success": "Đã điền dữ liệu từ chuyến đi cuối cùng",
+      "error": "Không thể lấy dữ liệu chuyến đi",
+      "noData": "Không có dữ liệu chuyến đi trước đó"
    }
  },
  "trip": {
--- a/services/device_events.ts
+++ b/services/device_events.ts
@@ -1,139 +1,20 @@
 import {
  AUTO_REFRESH_INTERVAL,
-  EVENT_ALARM_DATA,
  EVENT_BANZONE_DATA,
-  EVENT_ENTITY_DATA,
-  EVENT_GPS_DATA,
  EVENT_SEARCH_THINGS,
-  EVENT_TRACK_POINTS_DATA,
 } from "@/constants";
-import {
-  queryAlarm,
-  queryEntities,
-  queryGpsData,
-  querySearchThings,
-  queryTrackPoints,
-} from "@/controller/DeviceController";
+import { querySearchThings } from "@/controller/DeviceController";
 import { queryBanzones } from "@/controller/MapController";
 import eventBus from "@/utils/eventBus";

 const intervals: {
-  gps: ReturnType<typeof setInterval> | null;
-  alarm: ReturnType<typeof setInterval> | null;
-  entities: ReturnType<typeof setInterval> | null;
-  trackPoints: ReturnType<typeof setInterval> | null;
  banzones: ReturnType<typeof setInterval> | null;
  searchThings: ReturnType<typeof setInterval> | null;
 } = {
-  gps: null,
-  alarm: null,
-  entities: null,
-  trackPoints: null,
  banzones: null,
  searchThings: null,
 };

-export function getGpsEventBus() {
-  if (intervals.gps) return;
-  // console.log("Starting GPS poller");
-
-  const getGpsData = async () => {
-    try {
-      // console.log("GPS: fetching data...");
-      const resp = await queryGpsData();
-      if (resp && resp.data) {
-        // console.log("GPS: emitting data", resp.data);
-        eventBus.emit(EVENT_GPS_DATA, resp.data);
-      } else {
-        console.log("GPS: no data returned");
-      }
-    } catch (err) {
-      console.error("GPS: fetch error", err);
-    }
-  };
-
-  // Run immediately once, then schedule
-  getGpsData();
-  intervals.gps = setInterval(() => {
-    getGpsData();
-  }, AUTO_REFRESH_INTERVAL);
-}
-
-export function getAlarmEventBus() {
-  if (intervals.alarm) return;
-  // console.log("Goi ham get Alarm");
-  const getAlarmData = async () => {
-    try {
-      // console.log("Alarm: fetching data...");
-      const resp = await queryAlarm();
-      if (resp && resp.data) {
-        // console.log(
-        // "Alarm: emitting data",
-        // resp.data?.alarms?.length ?? resp.data
-        // );
-        eventBus.emit(EVENT_ALARM_DATA, resp.data);
-      } else {
-        console.log("Alarm: no data returned");
-      }
-    } catch (err) {
-      console.error("Alarm: fetch error", err);
-    }
-  };
-
-  getAlarmData();
-  intervals.alarm = setInterval(() => {
-    getAlarmData();
-  }, AUTO_REFRESH_INTERVAL);
-}
-
-export function getEntitiesEventBus() {
-  if (intervals.entities) return;
-  // console.log("Goi ham get Entities");
-  const getEntitiesData = async () => {
-    try {
-      // console.log("Entities: fetching data...");
-      const resp = await queryEntities();
-      if (resp && resp.length > 0) {
-        // console.log("Entities: emitting", resp.length);
-        eventBus.emit(EVENT_ENTITY_DATA, resp);
-      } else {
-        console.log("Entities: no data returned");
-      }
-    } catch (err) {
-      console.error("Entities: fetch error", err);
-    }
-  };
-
-  getEntitiesData();
-  intervals.entities = setInterval(() => {
-    getEntitiesData();
-  }, AUTO_REFRESH_INTERVAL);
-}
-
-export function getTrackPointsEventBus() {
-  if (intervals.trackPoints) return;
-  // console.log("Goi ham get Track Points");
-  const getTrackPointsData = async () => {
-    try {
-      // console.log("TrackPoints: fetching data...");
-      const resp = await queryTrackPoints();
-      if (resp && resp.data && resp.data.length > 0) {
-        // console.log("TrackPoints: emitting", resp.data.length);
-        eventBus.emit(EVENT_TRACK_POINTS_DATA, resp.data);
-      } else {
-        console.log("TrackPoints: no data returned");
-      }
-    } catch (err) {
-      console.error("TrackPoints: fetch error", err);
-    }
-  };
-
-  getTrackPointsData();
-  intervals.trackPoints = setInterval(() => {
-    getTrackPointsData();
-  }, AUTO_REFRESH_INTERVAL);
-}
-
 export function getBanzonesEventBus() {
  if (intervals.banzones) return;
  const getBanzonesData = async () => {
@@ -199,9 +80,5 @@ export function stopEvents() {
 }

 export function startEvents() {
-  getGpsEventBus();
-  getAlarmEventBus();
-  getEntitiesEventBus();
-  getTrackPointsEventBus();
  getBanzonesEventBus();
 }
Author	SHA1	Message	Date
Tran Anh Tuan	df4318fed4	thêm giao diện cảnh báo	2025-12-09 11:37:19 +07:00
MinhNN	7c3497d159	cập nhật phần modal thêm chuyến đi mới	2025-12-08 23:41:05 +07:00
MinhNN	0e1332f433	cập nhật icon trong filter	2025-12-08 10:58:12 +07:00
MinhNN	347bd1a7c1	Gip khi cuộn xuống ( tab diary )	2025-12-08 10:05:04 +07:00