From 940e108e7587664254322c675b3b4ef596e91bd3 Mon Sep 17 00:00:00 2001
From: MinhNN <minhnguyennhatt@gmail.com>
Date: Wed, 31 Dec 2025 15:48:44 +0700
Subject: [PATCH] =?UTF-8?q?fix=20bug=20ch=E1=BB=8Dn=20th=E1=BB=9Di=20gian?=
 =?UTF-8?q?=20kh=E1=BB=9Fi=20h=C3=A0nh=20/=20k=E1=BA=BFt=20th=C3=BAc=20(?=
 =?UTF-8?q?=20chuy=E1=BA=BFn=20=C4=91i=20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TripFormModal/TripDurationPicker.tsx      | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/components/diary/TripFormModal/TripDurationPicker.tsx b/components/diary/TripFormModal/TripDurationPicker.tsx
index 1eb0fd5..2161492 100644
--- a/components/diary/TripFormModal/TripDurationPicker.tsx
+++ b/components/diary/TripFormModal/TripDurationPicker.tsx
@@ -348,8 +348,8 @@ export default function TripDurationPicker({
         handleOpenEndTimePicker
       )}
 
-      {/* Unified Picker Modal */}
-      {activePicker && (
+      {/* iOS: Modal wrapper with spinner */}
+      {activePicker && Platform.OS === "ios" && (
         <Modal transparent animationType="fade" visible={!!activePicker}>
           <View style={styles.modalOverlay}>
             <View
@@ -373,7 +373,7 @@ export default function TripDurationPicker({
               <DateTimePicker
                 value={isStartPicker ? tempStartDate : tempEndDate}
                 mode={isTimePicker ? "time" : "date"}
-                display={Platform.OS === "ios" ? "spinner" : "default"}
+                display="spinner"
                 onChange={
                   isStartPicker
                     ? handleStartPickerChange
@@ -385,8 +385,10 @@ export default function TripDurationPicker({
                     : undefined
                 }
                 minimumDate={
-                  !isStartPicker && !isTimePicker
-                    ? startDate || undefined
+                  !isTimePicker
+                    ? isStartPicker
+                      ? new Date()
+                      : startDate || new Date()
                     : undefined
                 }
                 themeVariant={colorScheme}
@@ -397,6 +399,28 @@ export default function TripDurationPicker({
           </View>
         </Modal>
       )}
+
+      {/* Android: Native dialog (no Modal wrapper needed) */}
+      {activePicker && Platform.OS === "android" && (
+        <DateTimePicker
+          value={isStartPicker ? tempStartDate : tempEndDate}
+          mode={isTimePicker ? "time" : "date"}
+          display="default"
+          onChange={
+            isStartPicker ? handleStartPickerChange : handleEndPickerChange
+          }
+          maximumDate={
+            isStartPicker && !isTimePicker ? endDate || undefined : undefined
+          }
+          minimumDate={
+            !isTimePicker
+              ? isStartPicker
+                ? new Date()
+                : startDate || new Date()
+              : undefined
+          }
+        />
+      )}
     </View>
   );
 }