From cd86f697e07ddfe79d94c7bfb70ef9bd96a20bcd Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Thu, 14 Nov 2024 16:31:02 -0500
Subject: [PATCH 1/2] don't log email in use error

---
 lib/pangea/pages/sign_up/signup.dart | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/pangea/pages/sign_up/signup.dart b/lib/pangea/pages/sign_up/signup.dart
index f62108027..7ec5ac1a4 100644
--- a/lib/pangea/pages/sign_up/signup.dart
+++ b/lib/pangea/pages/sign_up/signup.dart
@@ -6,6 +6,7 @@ import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:matrix/matrix_api_lite/model/matrix_exception.dart';
 
 class SignupPage extends StatefulWidget {
   const SignupPage({super.key});
@@ -137,6 +138,10 @@ class SignupPageController extends State<SignupPage> {
           displayname,
         );
       }
+    } on MatrixException catch (e) {
+      if (e.error != MatrixError.M_THREEPID_IN_USE) {
+        rethrow;
+      }
     } catch (e, s) {
       //#Pangea
       const cancelledString = "Exception: Request has been canceled";

From fb3a564da74d091e50126d8ec6d8d6fbc0553c28 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Thu, 14 Nov 2024 16:36:39 -0500
Subject: [PATCH 2/2] make room dialog result nullable

---
 lib/pages/chat_list/space_view.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index 4053bbb01..2fced0f79 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -333,7 +333,7 @@ class _SpaceViewState extends State<SpaceView> {
     if (roomType == null) return;
 
     // #Pangea
-    final RoomResponse? response = await showDialog<RoomResponse>(
+    final RoomResponse? response = await showDialog<RoomResponse?>(
       context: context,
       builder: (context) {
         return AddRoomDialog(