From 73c7ef984073f00f77ec5a6245a29e01f141bb04 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sat, 18 Sep 2021 12:18:16 +0200
Subject: [PATCH] fix: Do not call matrix.of inside of matrix.dart

---
 lib/widgets/matrix.dart | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index d46cca16..27f6e8a3 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -79,14 +79,13 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
   }
 
   Client createLoginClient() {
-    final multiAccount = Matrix.of(context).client.isLogged();
-    final client = multiAccount
-        ? ClientManager.createClient(
-            Matrix.of(context).client.generateUniqueTransactionId())
-        : Matrix.of(context).client;
+    final multiAccount = client.isLogged();
+    final newClient = multiAccount
+        ? ClientManager.createClient(client.generateUniqueTransactionId())
+        : client;
     if (multiAccount) {
       // Add to client list
-      client.onLoginStateChanged.stream
+      newClient.onLoginStateChanged.stream
           .where((l) => l == LoginState.loggedIn)
           .first
           .then((_) {
@@ -95,7 +94,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
         _registerSubs(client.clientName);
       });
     }
-    return client;
+    return newClient;
   }
 
   Client getClientByName(String name) => widget.clients
@@ -204,14 +203,12 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
             return uiaRequest
                 .cancel(Exception(L10n.of(context).serverRequiresEmail));
           }
-          final clientSecret =
-              Matrix.of(context).client.generateUniqueTransactionId();
-          final currentThreepidCreds =
-              await Matrix.of(context).client.requestTokenToRegisterEmail(
-                    clientSecret,
-                    emailInput.single,
-                    0,
-                  );
+          final clientSecret = client.generateUniqueTransactionId();
+          final currentThreepidCreds = await client.requestTokenToRegisterEmail(
+            clientSecret,
+            emailInput.single,
+            0,
+          );
           final auth = AuthenticationThreePidCreds(
             session: uiaRequest.session,
             type: AuthenticationTypes.emailIdentity,