Merge branch 'staging' into BEDS-397/respect_per_user_email_limits

gobitfly · Oct 17, 2024 · 506ecaa · 506ecaa
2 parents 19fadcf + e715e8b
commit 506ecaa
Show file tree

Hide file tree

Showing 16 changed files with 1,063 additions and 1,178 deletions.
diff --git a/backend/pkg/api/data_access/notifications.go b/backend/pkg/api/data_access/notifications.go
@@ -285,7 +285,6 @@ func (d *DataAccessService) GetDashboardNotifications(ctx context.Context, userI
 		)).
 		Where(
 			goqu.Ex{"uvd.user_id": userId},
-			goqu.L("uvd.network = ANY(?)", pq.Array(chainIds)),
 		).
 		GroupBy(
 			goqu.I("uvdnh.epoch"),
@@ -295,6 +294,12 @@ func (d *DataAccessService) GetDashboardNotifications(ctx context.Context, userI
 			goqu.I("uvdg.name"),
 		)
 
+	if chainIds != nil {
+		vdbQuery = vdbQuery.Where(
+			goqu.L("uvd.network = ANY(?)", pq.Array(chainIds)),
+		)
+	}
+
 	// TODO account dashboards
 	/*adbQuery := goqu.Dialect("postgres").
 		From(goqu.T("adb_notifications_history").As("anh")).