From 7c34be2094151fa10083f32f31557973a31267fc Mon Sep 17 00:00:00 2001 From: Jay Date: Wed, 18 Jun 2025 12:07:10 +0100 Subject: [PATCH] fix: manage scouts properly .then()s so allChildren isnt used before init --- .../lib/events/event_add_participant.dart | 14 ++++++++------ .../lib/events/single_event.dart | 3 ++- scouts_finances_server/lib/src/payments.dart | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scouts_finances_flutter/lib/events/event_add_participant.dart b/scouts_finances_flutter/lib/events/event_add_participant.dart index 4839c61..e4a3fd4 100644 --- a/scouts_finances_flutter/lib/events/event_add_participant.dart +++ b/scouts_finances_flutter/lib/events/event_add_participant.dart @@ -31,7 +31,7 @@ class _EventAddParticipantState extends State { late StreamSubscription stream; - void _getChildren() async { + Future _getChildren() async { try { allChildren = await client.scouts.getChildren(); } catch (e) { @@ -56,20 +56,22 @@ class _EventAddParticipantState extends State { loading--; } - void refresh() { + void refresh() async { setState(() { loading = 2; err = null; }); - _getChildren(); - _getEventChildren(); + _getChildren().then((_) { + _getEventChildren(); + }); } @override void initState() { super.initState(); - _getChildren(); - _getEventChildren(); + _getChildren().then((_) { + _getEventChildren(); + }); stream = client.event.eventStream().listen((_) { refresh(); }); diff --git a/scouts_finances_flutter/lib/events/single_event.dart b/scouts_finances_flutter/lib/events/single_event.dart index 671cece..527dd36 100644 --- a/scouts_finances_flutter/lib/events/single_event.dart +++ b/scouts_finances_flutter/lib/events/single_event.dart @@ -345,7 +345,8 @@ class _SingleEventState extends State { closeFn: () => _getEventDetails(), ), ])), - if (children.isNotEmpty) reminderButton + if (children.isNotEmpty) reminderButton, + const SizedBox(height: 128), ], ), ), diff --git a/scouts_finances_server/lib/src/payments.dart b/scouts_finances_server/lib/src/payments.dart index 49224af..2dfc415 100644 --- a/scouts_finances_server/lib/src/payments.dart +++ b/scouts_finances_server/lib/src/payments.dart @@ -135,7 +135,7 @@ class PaymentEndpoint extends Endpoint { buffer.writeln('Dear ${parent.firstName},\n'); buffer.writeln( - 'Your payment of ${assignablePayments.fold(0, (sum, p) => sum + p.amount).formatMoney} have been recieved and processed successfully.'); + 'Your payment of ${assignablePayments.fold(0, (sum, p) => sum + p.amount).formatMoney} has been recieved and processed successfully.'); buffer.writeln('Your new financial standing is as follows:'); final financialStanding = await eventRemindersForParent(session, parent); buffer.writeln(financialStanding);