chore: resolve merge conflicts with dev branch

Merge dev into feat/notification-system, keeping all i18n keys from both branches (notification system keys + reservation price/budget keys).
2026-06-20 22:01:45 +00:00 · 2026-04-05 01:43:43 +02:00
parent fc29c5f7d0 b8058a2755
commit 6df8b2555d
21 changed files with 354 additions and 57 deletions
@@ -598,6 +598,7 @@ export default function TripPlannerPage(): React.ReactElement | null {
              leftWidth={leftCollapsed ? 0 : leftWidth}
              rightWidth={rightCollapsed ? 0 : rightWidth}
              hasInspector={!!selectedPlace}
+              hasDayDetail={!!showDayDetail && !selectedPlace}
            />