diff --git a/lib/pages/login.dart b/lib/pages/login.dart index 96add64..0f1d5c0 100644 --- a/lib/pages/login.dart +++ b/lib/pages/login.dart @@ -26,7 +26,9 @@ class LoginPage extends StatelessWidget { if (result['signature'] != null) { final key = bech32ToHex(result['signature']); loginData.value = LoginAccount.externalPublicKeyHex(key); - ctx.go("/"); + if (ctx.mounted) { + ctx.go("/"); + } } }, ); diff --git a/lib/pages/new_account.dart b/lib/pages/new_account.dart index c9928f5..c6afb59 100644 --- a/lib/pages/new_account.dart +++ b/lib/pages/new_account.dart @@ -99,7 +99,9 @@ class _NewAccountPage extends State { loginData.value = LoginAccount.privateKeyHex( _privateKey.privateKey!, ); - context.go("/"); + if (context.mounted) { + context.go("/"); + } }) .catchError((e) { setState(() { diff --git a/lib/widgets/chat.dart b/lib/widgets/chat.dart index a3047c6..52b2af3 100644 --- a/lib/widgets/chat.dart +++ b/lib/widgets/chat.dart @@ -1,5 +1,3 @@ -import 'dart:developer' as developer; - import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:ndk/ndk.dart'; @@ -327,6 +325,7 @@ class _ChatMessageWidget extends StatelessWidget { if (reactions.isNotEmpty) ...reactions .fold(>{}, (acc, v) { + // ignore: prefer_collection_literals acc[v.content] ??= Set(); acc[v.content]!.add(v.pubKey); return acc;