From 1c9a3115c92a54017038f9a369197e069f1351cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Sun, 1 Jun 2025 10:26:17 +0200
Subject: [PATCH 1/2] chore: Remove custom errorwidgetbuilder

We should rather switch to sentry at one point instead of
annoying users with error popups
all the time.
---
 lib/main.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index d9ac10b4c..e3265819f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -8,7 +8,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/client_manager.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
-import 'package:fluffychat/widgets/error_widget.dart';
 import 'config/setting_keys.dart';
 import 'utils/background_push.dart';
 import 'widgets/fluffy_chat_app.dart';
@@ -72,7 +71,6 @@ Future<void> startGui(List<Client> clients, SharedPreferences store) async {
   await firstClient?.roomsLoading;
   await firstClient?.accountDataLoading;
 
-  ErrorWidget.builder = (details) => FluffyChatErrorWidget(details);
   runApp(FluffyChatApp(clients: clients, pincode: pin, store: store));
 }
 

From dbba21f552fefe0e5126780b76cdf951b386f0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Sun, 1 Jun 2025 10:27:27 +0200
Subject: [PATCH 2/2] fix: Add missing mounted check to mxcImage

---
 lib/widgets/mxc_image.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart
index 605d5078b..d8ced1965 100644
--- a/lib/widgets/mxc_image.dart
+++ b/lib/widgets/mxc_image.dart
@@ -66,6 +66,7 @@ class _MxcImageState extends State<MxcImage> {
   }
 
   Future<void> _load() async {
+    if (!mounted) return;
     final client =
         widget.client ?? widget.event?.room.client ?? Matrix.of(context).client;
     final uri = widget.uri;