From 1699b1067f7e5987a880067bb9410fe9c0864860 Mon Sep 17 00:00:00 2001 From: franzap <_@franzap.com> Date: Wed, 19 Feb 2025 12:28:24 -0300 Subject: [PATCH] Improve sign in method checks --- lib/screens/settings_screen.dart | 2 +- lib/widgets/sign_in_container.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart index 5364b15..8fb7098 100644 --- a/lib/screens/settings_screen.dart +++ b/lib/screens/settings_screen.dart @@ -54,7 +54,7 @@ class SettingsScreen extends HookConsumerWidget { ), Gap(20), if (signedInUser == null || - signedInUser.settings.value!.signInMethod != SignInMethod.nip55) + signedInUser.settings.value?.signInMethod != SignInMethod.nip55) Column( children: [ Text( diff --git a/lib/widgets/sign_in_container.dart b/lib/widgets/sign_in_container.dart index d7d9c18..8535e57 100644 --- a/lib/widgets/sign_in_container.dart +++ b/lib/widgets/sign_in_container.dart @@ -29,7 +29,7 @@ class SignInButton extends ConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { var user = ref.watch(signedInUserProvider); final signedInWithPubkey = - user != null && user.settings.value!.signInMethod != SignInMethod.nip55; + user?.settings.value?.signInMethod == SignInMethod.pubkey; if (requireNip55 && signedInWithPubkey) { user = null; }