Skip to content

Commit 661d220

Browse files
klopez4212Terp
andcommitted
fix(mobile): fence default-agent launches across community switches
Co-authored-by: Terp <5856f6900e8e0a4e0ea1f4f8d2ee33e4753d2119bc122f94ecafc660b46c0511@buzz.block.builderlab.xyz> Signed-off-by: kenny lopez <[email protected]>
1 parent 51525b1 commit 661d220

2 files changed

Lines changed: 84 additions & 4 deletions

File tree

‎mobile/lib/features/channels/default_agent_launcher.dart‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ class DefaultAgentLauncher extends HookConsumerWidget {
2727
@override
2828
Widget build(BuildContext context, WidgetRef ref) {
2929
final preference = ref.watch(defaultAgentProvider);
30-
final pubkey = preference.value;
30+
final scope = ref.watch(meSyncProvider);
31+
final pubkey = preference.isLoading ? null : preference.value;
3132
final profiles = ref.watch(userCacheProvider);
3233
final profile = profiles[pubkey];
3334
final opening = useState(false);
@@ -44,7 +45,13 @@ class DefaultAgentLauncher extends HookConsumerWidget {
4445
? 'Retry default agent'
4546
: 'Default agent';
4647
Future<void> open() async {
47-
if (opening.value) return;
48+
final currentPreference = ref.read(defaultAgentProvider);
49+
if (opening.value ||
50+
currentPreference.isLoading ||
51+
ref.read(meSyncProvider) != scope ||
52+
currentPreference.value != pubkey) {
53+
return;
54+
}
4855
unawaited(HapticFeedback.lightImpact());
4956
if (preference.hasError) {
5057
ref.invalidate(defaultAgentProvider);
@@ -54,7 +61,6 @@ class DefaultAgentLauncher extends HookConsumerWidget {
5461
onChooseAgent();
5562
return;
5663
}
57-
final scope = ref.read(meSyncProvider);
5864
opening.value = true;
5965
try {
6066
final channelState = ref.read(channelsProvider);
@@ -81,6 +87,7 @@ class DefaultAgentLauncher extends HookConsumerWidget {
8187
if (!context.mounted) return;
8288
// A community switch invalidates an in-flight destination.
8389
if (ref.read(meSyncProvider) != scope ||
90+
ref.read(defaultAgentProvider).isLoading ||
8491
ref.read(defaultAgentProvider).value != pubkey) {
8592
return;
8693
}
@@ -119,7 +126,7 @@ class DefaultAgentLauncher extends HookConsumerWidget {
119126
child: IconButton(
120127
tooltip: label,
121128
padding: EdgeInsets.zero,
122-
onPressed: opening.value ? null : open,
129+
onPressed: opening.value || preference.isLoading ? null : open,
123130
icon: ExcludeSemantics(
124131
child: resolving.value
125132
? const SizedBox.square(
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
import 'dart:async';
2+
3+
import 'package:buzz/features/channels/default_agent_launcher.dart';
4+
import 'package:buzz/shared/me/default_agent.dart';
5+
import 'package:buzz/shared/me/default_agent_writer.dart';
6+
import 'package:buzz/shared/me/me_sync.dart';
7+
import 'package:buzz/shared/relay/relay.dart';
8+
import 'package:buzz/shared/theme/theme.dart';
9+
import 'package:flutter/material.dart';
10+
import 'package:flutter_test/flutter_test.dart';
11+
import 'package:hooks_riverpod/hooks_riverpod.dart';
12+
import 'package:nostr/nostr.dart' as nostr;
13+
14+
import '../../shared/me/me_sync_test.dart' show FakeRelay;
15+
16+
void main() {
17+
testWidgets(
18+
'community switch cannot launch a retained default while loading',
19+
(tester) async {
20+
const secret =
21+
'0000000000000000000000000000000000000000000000000000000000000001';
22+
final nsec = nostr.Nip19.encode(
23+
prefix: nostr.Nip19Prefix.nsec,
24+
data: secret,
25+
);
26+
final relayA = FakeRelay();
27+
final relayB = FakeRelay();
28+
final a = MeSync(
29+
relayA,
30+
RelayConfig(baseUrl: 'https://a.test', nsec: nsec),
31+
);
32+
final b = MeSync(
33+
relayB,
34+
RelayConfig(baseUrl: 'https://b.test', nsec: nsec),
35+
);
36+
await saveDefaultAgent(a, 'a' * 64);
37+
final pending = Completer<List<NostrEvent>>();
38+
relayB.pendingRead = pending.future;
39+
var choices = 0;
40+
Widget app(MeSync scope) => ProviderScope(
41+
overrides: [
42+
meSyncProvider.overrideWithValue(scope),
43+
relaySessionProvider.overrideWith(() => relayA),
44+
],
45+
child: MaterialApp(
46+
theme: AppTheme.light(),
47+
home: Scaffold(
48+
body: DefaultAgentLauncher(onChooseAgent: () => choices++),
49+
),
50+
),
51+
);
52+
await tester.pumpWidget(app(a));
53+
await tester.pumpAndSettle();
54+
final button = find.byType(IconButton);
55+
final staleAction = tester.widget<IconButton>(button).onPressed!;
56+
await tester.pumpWidget(app(b));
57+
await tester.pumpAndSettle();
58+
final container = ProviderScope.containerOf(tester.element(button));
59+
expect(container.read(defaultAgentProvider).isLoading, isTrue);
60+
// Riverpod can keep A's previous data while B's first read is pending.
61+
expect(tester.widget<IconButton>(button).onPressed, isNull);
62+
staleAction();
63+
await tester.pumpAndSettle();
64+
expect(choices, 0);
65+
expect(relayB.writes, 0);
66+
pending.complete([]);
67+
await tester.pumpAndSettle();
68+
await tester.tap(button);
69+
expect(choices, 1);
70+
expect(tester.takeException(), isNull);
71+
},
72+
);
73+
}

0 commit comments

Comments
 (0)