stor refactor CurrentDate -> SelectedDate