1 files changed, 23 insertions, 1 deletions
diff --git a/internal/tui/shared.go b/internal/tui/shared.go
index ebaec6f..769d367 100644
--- a/internal/tui/shared.go
+++ b/internal/tui/shared.go
@@ -187,6 +187,7 @@ func RenderBottomBar(m AppModel, bindings []KeyBinding, err error) string {
 func getAppData(
 	ctx context.Context,
 	q *queries.Queries,
+	filter HistoryFilter,
 ) (
 	info TimerInfo,
 	stats TimeStats,
@@ -235,7 +236,28 @@ func getAppData(
 		)
 	}
 
-	entries, err = q.GetRecentTimeEntries(ctx, time.Now().Add(-time.Hour*24*14))
+	// Use filtered query with the provided filter
+	var endTimeParam interface{}
+	if filter.EndDate != nil {
+		endTimeParam = *filter.EndDate
+	}
+
+	var clientIDParam interface{}
+	if filter.ClientID != nil {
+		clientIDParam = *filter.ClientID
+	}
+
+	var projectIDParam interface{}
+	if filter.ProjectID != nil {
+		projectIDParam = *filter.ProjectID
+	}
+
+	entries, err = q.GetFilteredTimeEntries(ctx, queries.GetFilteredTimeEntriesParams{
+		StartTime: filter.StartDate,
+		EndTime:   endTimeParam,
+		ClientID:  clientIDParam,
+		ProjectID: projectIDParam,
+	})
 	if err != nil {
 		return
 	}