@@ -132,6 +132,7 @@ void main() {
132132 ValueListenable <int >? tabReselection,
133133 List <ComposeDraft > drafts = const [],
134134 List <Reminder > reminders = const [],
135+ RemindersNotifier Function ()? remindersNotifier,
135136 Set <String > knownAgentPubkeys = const {},
136137 List <Override > overrides = const [],
137138 }) async {
@@ -156,7 +157,9 @@ void main() {
156157 composeDraftsProvider.overrideWith (
157158 () => _FakeComposeDraftsNotifier (drafts),
158159 ),
159- remindersProvider.overrideWith (() => _FakeRemindersNotifier (reminders)),
160+ remindersProvider.overrideWith (
161+ remindersNotifier ?? () => _FakeRemindersNotifier (reminders),
162+ ),
160163 ...overrides,
161164 ],
162165 child: MaterialApp (
@@ -892,8 +895,10 @@ void main() {
892895 tester,
893896 ) async {
894897 final reminders = _CapturingReminderService ();
898+ final remindersNotifier = _FakeRemindersNotifier (const []);
895899 await tester.pumpWidget (
896900 await buildTestable (
901+ remindersNotifier: () => remindersNotifier,
897902 overrides: [
898903 reminder.reminderServiceProvider.overrideWithValue (reminders),
899904 ],
@@ -944,11 +949,82 @@ void main() {
944949 await tester.tap (find.text ('In 1 hour' ));
945950 await tester.pumpAndSettle ();
946951
947- final target = reminders.targets.single;
948- expect (target.eventId, 'm1' );
949- expect (target.channelId, 'ch1' );
950- expect (target.preview, 'Hey check this out' );
952+ final first = reminders.saved.single;
953+ expect (first.target.eventId, 'm1' );
954+ expect (first.target.channelId, 'ch1' );
955+ expect (first.target.preview, 'Hey check this out' );
956+ expect (first.dTag, isNull);
951957 expect (find.text ('Reminder set' ), findsOneWidget);
958+ expect (remindersNotifier.refreshes, 1 );
959+ });
960+
961+ testWidgets ('long-press reschedules an existing reminder instead of adding '
962+ 'one' , (tester) async {
963+ final reminders = _CapturingReminderService ();
964+ final existing = Reminder (
965+ id: 'reminder-d1' ,
966+ notBefore: now + 600 ,
967+ status: 'pending' ,
968+ target: const ReminderTarget (
969+ eventId: 'm1' ,
970+ channelId: 'ch1' ,
971+ preview: 'Hey check this out' ,
972+ authorPubkey:
973+ 'a11ce00000000000000000000000000000000000000000000000000000000000' ,
974+ ),
975+ note: 'Reply after standup' ,
976+ createdAt: now - 60 ,
977+ eventId: 'reminder-event-1' ,
978+ );
979+ await tester.pumpWidget (
980+ await buildTestable (
981+ reminders: [existing],
982+ overrides: [
983+ reminder.reminderServiceProvider.overrideWithValue (reminders),
984+ ],
985+ ),
986+ );
987+ await tester.pumpAndSettle ();
988+
989+ await tester.longPress (find.byKey (const ValueKey ('inbox-row-m1' )));
990+ await tester.pumpAndSettle ();
991+ await tester.tap (find.text ('Remind me' ));
992+ await tester.pumpAndSettle ();
993+ await tester.tap (find.text ('In 1 hour' ));
994+ await tester.pumpAndSettle ();
995+
996+ final saved = reminders.saved.single;
997+ expect (saved.dTag, 'reminder-d1' );
998+ expect (saved.note, 'Reply after standup' );
999+ expect (find.text ('Reminder updated' ), findsOneWidget);
1000+ });
1001+
1002+ testWidgets ('long-press omits Follow in a Solo chat' , (tester) async {
1003+ await tester.pumpWidget (
1004+ await buildTestable (
1005+ channels: [
1006+ Channel (
1007+ id: 'ch1' ,
1008+ name: 'Notes' ,
1009+ channelType: 'stream' ,
1010+ visibility: 'private' ,
1011+ description: '' ,
1012+ createdBy: 'x' ,
1013+ createdAt: DateTime (2025 ),
1014+ memberCount: 1 ,
1015+ isMember: true ,
1016+ labels: const ['buzz.solo' ],
1017+ ),
1018+ testChannels[1 ],
1019+ ],
1020+ ),
1021+ );
1022+ await tester.pumpAndSettle ();
1023+
1024+ await tester.longPress (find.byKey (const ValueKey ('inbox-row-m1' )));
1025+ await tester.pumpAndSettle ();
1026+ expect (find.text ('Open conversation' ), findsOneWidget);
1027+ expect (find.text ('Follow thread' ), findsNothing);
9521028 });
9531029
9541030 testWidgets ('long-press hides reminders when signed out' , (tester) async {
@@ -1183,8 +1259,13 @@ class _FakeRemindersNotifier extends RemindersNotifier {
11831259 final List <Reminder > _reminders;
11841260 _FakeRemindersNotifier (this ._reminders);
11851261
1262+ int refreshes = 0 ;
1263+
11861264 @override
11871265 Future <List <Reminder >> build () async => _reminders;
1266+
1267+ @override
1268+ Future <void > refresh () async => refreshes++ ;
11881269}
11891270
11901271class _FakeComposeDraftsNotifier extends ComposeDraftsNotifier {
@@ -1208,14 +1289,16 @@ class _CapturingReminderService extends reminder.ReminderService {
12081289 factory _CapturingReminderService () =>
12091290 _CapturingReminderService ._(nostr.Keys .generate ());
12101291
1211- final targets = < reminder.ReminderTarget > [];
1292+ final saved =
1293+ < ({reminder.ReminderTarget target, String ? note, String ? dTag})> [];
12121294
12131295 @override
12141296 Future <void > createReminder ({
12151297 required reminder.ReminderTarget target,
12161298 required int notBefore,
12171299 String ? note,
1300+ String ? replacingDTag,
12181301 }) async {
1219- targets .add (target);
1302+ saved .add (( target: target, note : note, dTag : replacingDTag) );
12201303 }
12211304}
0 commit comments