fluffychat merge

lib/pangea/public_spaces/public_room_bottom_sheet.dart

@@ -142,7 +142,7 @@ class PublicRoomBottomSheetState extends State<PublicRoomBottomSheet> {
       context: context,
       future: () async => client.knockRoom(
         roomAlias ?? chunk!.roomId,
-        serverName: via,
+        via: via,
       ),
       onSuccess: () => L10n.of(context).knockSpaceSuccess,
       delay: false,

pubspec.lock

@@ -1108,7 +1108,7 @@ packages:
       sha256: "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a"
       url: "https://pub.dev"
     source: hosted
-    version: "14.8.1"
+    version: "15.1.2"
   graphs:
     dependency: transitive
     description:
@@ -1510,11 +1510,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: disable-space-hierarchy-cache
-      resolved-ref: "8f62b78df9cea6490ee8b23802e46d7b320aeb83"
+      ref: main
+      resolved-ref: "3fb6836b3f8b37091b5874b194aa25b17bb12b32"
       url: "https://github.com/pangeachat/matrix-dart-sdk.git"
     source: git
-    version: "0.38.0"
+    version: "0.40.0"
   meta:
     dependency: transitive
     description:
@@ -1583,10 +1583,10 @@ packages:
     dependency: transitive
     description:
       name: olm
-      sha256: "3306bf534ceb914fd148b3b4a3d603fb5e067b2e6da8304025b47c24cfdf6b46"
+      sha256: "6a3fe1e5170b954dd9e4ba3b27513e6aa9b7591eb7bb0d7f6f32140b7f140c6f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "3.1.0"
   open_file:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -72,7 +72,7 @@ dependencies:
   matrix:
     git:
       url: https://github.com/pangeachat/matrix-dart-sdk.git # repo
-      ref: disable-space-hierarchy-cache # branch
+      ref: main
   # matrix: ^0.40.0
   # Pangea#
   mime: ^1.0.6