diff --git a/apps/mobile/app/components/date-picker/index.tsx b/apps/mobile/app/components/date-picker/index.tsx index 1f0f7ea87..49d170252 100644 --- a/apps/mobile/app/components/date-picker/index.tsx +++ b/apps/mobile/app/components/date-picker/index.tsx @@ -32,7 +32,7 @@ export default function DatePickerComponent(props: { onCancel: () => void; }) { const { colors, isDark } = useThemeColors(); - const dateRef = useRef(dayjs().add(1, "day").toDate()); + const dateRef = useRef(dayjs().add(1, "week").toDate()); const { width } = useWindowDimensions(); diff --git a/apps/mobile/app/components/ui/expiry-date/index.tsx b/apps/mobile/app/components/ui/expiry-date/index.tsx index e5eba35fd..f19c99f0d 100644 --- a/apps/mobile/app/components/ui/expiry-date/index.tsx +++ b/apps/mobile/app/components/ui/expiry-date/index.tsx @@ -42,22 +42,10 @@ export const ExpiryDate = ({ short?: boolean; } & ButtonProps) => { const { colors } = useThemeColors(); - const expiryValue = note?.expiryDate?.value; if (!expiryValue) return null; - const expiryDate = dayjs(expiryValue); - const now = dayjs(); - const isToday = expiryDate.isSame(now, "day"); - const isTomorrow = expiryDate.isSame(now.add(1, "day"), "day"); - - const formattedDate = isToday - ? "Today" - : isTomorrow - ? "Tomorrow" - : expiryDate.format("DD MMM YYYY"); - - const isUrgent = isToday || isTomorrow; + const formattedDate = dayjs(expiryValue).format("DD MMM YYYY"); return (