Skip to content

Commit 75a612e

Browse files
authored
Merge pull request #3154 from acterglobal/anisha/remove-chat-activity
The activity screen now displays space-related content; chat is excluded.
2 parents 01f1dc3 + 60dd273 commit 75a612e

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- [Fix] : Updated activity screen to show only space-related activity; chat activity is now excluded.

app/lib/features/activities/providers/activities_providers.dart

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:acter/common/models/types.dart';
22
import 'package:acter/common/providers/common_providers.dart';
3+
import 'package:acter/common/providers/room_providers.dart';
34
import 'package:acter/features/activities/providers/notifiers/activities_notifiers.dart';
45
import 'package:acter/features/invitations/providers/invitations_providers.dart';
56
import 'package:acter/features/home/providers/client_providers.dart';
@@ -127,8 +128,15 @@ typedef RoomActivitiesInfo = ({String roomId, List<Activity> activities});
127128
final consecutiveGroupedActivitiesProvider = Provider.family<List<RoomActivitiesInfo>, DateTime>((ref, date) {
128129
final activitiesForDate = ref.watch(activitiesByDateProvider(date));
129130

131+
// Filter activities to only include those from spaces
132+
final spaceActivities = activitiesForDate.where((activity) {
133+
final roomId = activity.roomIdStr();
134+
final room = ref.watch(maybeRoomProvider(roomId)).valueOrNull;
135+
return room?.isSpace() == true;
136+
}).toList();
137+
130138
// Sort by time descending
131-
final sortedActivities = activitiesForDate.toList()..sort((a, b) => b.originServerTs().compareTo(a.originServerTs()));
139+
final sortedActivities = spaceActivities..sort((a, b) => b.originServerTs().compareTo(a.originServerTs()));
132140

133141
// Group consecutive activities by roomId
134142
final groups = <RoomActivitiesInfo>[];

0 commit comments

Comments
 (0)