浏览代码

only a year for trips

Viktoriia 1 月之前
父节点
当前提交
8c5a730a21

+ 5 - 2
src/components/Calendars/RangeCalendar/RangeCalendarWithTabs.tsx

@@ -34,7 +34,10 @@ export type CalendarMode = 'exact' | 'approx';
 
 const CURRENT_YEAR = dayjs().year();
 
-const YEAR_STRINGS: string[] = Array.from({ length: 100 }, (_, i) => String(CURRENT_YEAR - 1 - i));
+const YEAR_STRINGS: string[] = Array.from(
+  { length: 100 },
+  (_, i) => String(CURRENT_YEAR + 1 - i)
+);
 
 const FIXED_CONTENT_HEIGHT = 380;
 
@@ -215,7 +218,7 @@ export default function RangeCalendarWithTabs({
   defaultMode?: CalendarMode;
   initialApproxYear?: number | null;
 }) {
-  const fallbackYear = CURRENT_YEAR - 1;
+  const fallbackYear = CURRENT_YEAR;
 
   const [activeTab, setActiveTab] = useState<CalendarMode>(defaultMode);
   const [selectedYear, setSelectedYear] = useState<number>(initialApproxYear ?? fallbackYear);

+ 3 - 7
src/screens/InAppScreens/TravelsScreen/AddNewTrip2025Screen/index.tsx

@@ -50,7 +50,7 @@ const isFullDate = (d?: DateValue | null): boolean =>
 
 const isValidDate = (d?: DateValue | null): boolean => {
   if (!d?.year) return false;
-  if (d.year >= CURRENT_YEAR) return !!(d.month && d.day);
+  // if (d.year >= CURRENT_YEAR) return !!(d.month && d.day);
   return true;
 };
 
@@ -346,15 +346,11 @@ const AddNewTripScreen = ({ route }: { route: any }) => {
       const id = r._instanceId ?? `idx-${i}`;
 
       if (!isValidDate(s)) {
-        errors[id] = s?.year && s.year >= CURRENT_YEAR
-          ? 'Current or future year requires a full date'
-          : 'Please select visit dates';
+        errors[id] = 'Please select visit dates';
         continue;
       }
       if (!isValidDate(e)) {
-        errors[id] = e?.year && e.year >= CURRENT_YEAR
-          ? 'Current or future year requires a full date'
-          : 'Please select visit dates';
+        errors[id] = 'Please select visit dates';
         continue;
       }