Skip to content

Commit 99b2418

Browse files
square-tombclaude
andcommitted
mobile: reschedule existing reminder and hide follow in solo inbox rows
Remind me on an Inbox row now loads the reminder list first and, when the message already has a pending reminder, republishes it under the same d tag (keeping its note) instead of adding a second reminder. Follow is no longer offered on Solo chat rows, which have no threads. Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: Tom Brow <[email protected]>
1 parent b0ade6a commit 99b2418

5 files changed

Lines changed: 172 additions & 25 deletions

File tree

‎mobile/lib/features/activity/activity_page/inbox_row.dart‎

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,13 @@ class _InboxRow extends HookConsumerWidget {
373373

374374
/// Thread root that Follow acts on: the conversation's root for thread
375375
/// rows, the message itself for top-level rows (matching the message
376-
/// actions sheet). Grouped DM conversations have no single thread to follow.
377-
String? get _followRootId =>
378-
item.conversationId.startsWith('dm:') ? null : item.conversationId;
376+
/// actions sheet). Solo chats have no threads, and grouped DM conversations
377+
/// have no single thread, so neither offers Follow.
378+
String? get _followRootId {
379+
if (channel?.isSolo ?? false) return null;
380+
if (item.conversationId.startsWith('dm:')) return null;
381+
return item.conversationId;
382+
}
379383

380384
void _showRowActions(BuildContext context, WidgetRef ref) {
381385
final followRootId = _followRootId;
@@ -433,17 +437,8 @@ class _InboxRow extends HookConsumerWidget {
433437
title: const Text('Remind me'),
434438
onTap: () {
435439
Navigator.of(sheetContext).pop();
436-
showRemindMeLaterSheet(
437-
context: context,
438-
ref: ref,
439-
target: ReminderTarget(
440-
eventId: item.item.id,
441-
channelId: reminderChannelId,
442-
preview: item.item.displayContent.characters
443-
.take(_inboxReminderPreviewLength)
444-
.toString(),
445-
authorPubkey: item.item.pubkey,
446-
),
440+
unawaited(
441+
_remindMe(context, ref, channelId: reminderChannelId),
447442
);
448443
},
449444
),
@@ -463,6 +458,53 @@ class _InboxRow extends HookConsumerWidget {
463458
),
464459
);
465460
}
461+
462+
/// Opens the reminder sheet for the row's message. An existing pending
463+
/// reminder for that message is rescheduled rather than duplicated, so the
464+
/// reminder list must be loaded first (it otherwise loads only with the
465+
/// Reminders filter).
466+
Future<void> _remindMe(
467+
BuildContext context,
468+
WidgetRef ref, {
469+
required String channelId,
470+
}) async {
471+
final List<Reminder> reminders;
472+
try {
473+
reminders = await ref.read(remindersProvider.future);
474+
} catch (error) {
475+
debugPrint('[Inbox] loading reminders failed: $error');
476+
if (!context.mounted) return;
477+
ScaffoldMessenger.of(context).showFeedbackSnackBar(
478+
const SnackBar(content: Text('Couldn’t load reminders. Try again.')),
479+
kind: ToastKind.error,
480+
);
481+
return;
482+
}
483+
if (!context.mounted) return;
484+
final existing = reminders
485+
.where(
486+
(reminder) =>
487+
reminder.status == 'pending' &&
488+
reminder.target?.eventId == item.item.id,
489+
)
490+
.firstOrNull;
491+
showRemindMeLaterSheet(
492+
context: context,
493+
ref: ref,
494+
target: ReminderTarget(
495+
eventId: item.item.id,
496+
channelId: channelId,
497+
preview: item.item.displayContent.characters
498+
.take(_inboxReminderPreviewLength)
499+
.toString(),
500+
authorPubkey: item.item.pubkey,
501+
),
502+
existing: existing == null
503+
? null
504+
: (dTag: existing.id, note: existing.note),
505+
onSaved: () => unawaited(ref.read(remindersProvider.notifier).refresh()),
506+
);
507+
}
466508
}
467509

468510
class _InboxSwipeAction extends StatelessWidget {

‎mobile/lib/shared/reminders/remind_me_later_sheet.dart‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@ import 'reminder_time_presets.dart';
1212
/// Bottom sheet for "Remind me later": desktop-parity presets plus a native
1313
/// date/time picker, publishing the same author-private kind-30300 reminder
1414
/// events desktop reads.
15+
///
16+
/// With [existing], the chosen time reschedules that pending reminder (same
17+
/// `d` tag, note kept) instead of adding a second one. [onSaved] runs after
18+
/// the relay accepts the reminder.
1519
void showRemindMeLaterSheet({
1620
required BuildContext context,
1721
required WidgetRef ref,
1822
required ReminderTarget target,
23+
({String dTag, String? note})? existing,
24+
VoidCallback? onSaved,
1925
}) {
2026
final service = ref.read(reminderServiceProvider);
2127
final messenger = ScaffoldMessenger.of(context);
@@ -29,9 +35,17 @@ void showRemindMeLaterSheet({
2935

3036
Future<void> submit(int notBefore) async {
3137
try {
32-
await service.createReminder(target: target, notBefore: notBefore);
38+
await service.createReminder(
39+
target: target,
40+
notBefore: notBefore,
41+
note: existing?.note,
42+
replacingDTag: existing?.dTag,
43+
);
44+
onSaved?.call();
3345
messenger.showFeedbackSnackBar(
34-
const SnackBar(content: Text('Reminder set')),
46+
SnackBar(
47+
content: Text(existing == null ? 'Reminder set' : 'Reminder updated'),
48+
),
3549
kind: ToastKind.success,
3650
);
3751
} catch (error) {

‎mobile/lib/shared/reminders/reminder_service.dart‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,26 @@ class ReminderService {
104104
}) : _signedEventRelay = signedEventRelay,
105105
_crypto = crypto;
106106

107-
/// Encrypt, sign, and publish a new pending reminder. [notBefore] is a Unix
107+
/// Encrypt, sign, and publish a pending reminder. [notBefore] is a Unix
108108
/// timestamp in seconds after which clients surface the reminder.
109+
///
110+
/// Pass [replacingDTag] to reschedule an existing reminder: kind 30300 is
111+
/// addressable, so reusing its `d` tag replaces it instead of adding one.
109112
Future<void> createReminder({
110113
required ReminderTarget target,
111114
required int notBefore,
112115
String? note,
116+
String? replacingDTag,
113117
}) async {
114118
final plaintext = buildReminderPlaintext(target: target, note: note);
115119
final ciphertext = _crypto.encrypt(plaintext);
116120
await _signedEventRelay.submit(
117121
kind: EventKind.eventReminder,
118122
content: ciphertext,
119-
tags: buildReminderTags(dTag: randomReminderDTag(), notBefore: notBefore),
123+
tags: buildReminderTags(
124+
dTag: replacingDTag ?? randomReminderDTag(),
125+
notBefore: notBefore,
126+
),
120127
);
121128
}
122129
}

‎mobile/test/features/activity/activity_page_test.dart‎

Lines changed: 90 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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

11901271
class _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
}

‎mobile/test/shared/reminders/remind_me_later_sheet_test.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class _RecordingReminderService extends ReminderService {
3333
required ReminderTarget target,
3434
required int notBefore,
3535
String? note,
36+
String? replacingDTag,
3637
}) async {
3738
final error = this.error;
3839
if (error != null) throw error;

0 commit comments

Comments
 (0)