fluffychat merge

lib/pages/chat/events/image_bubble.dart

@@ -45,9 +45,10 @@ class ImageBubble extends StatelessWidget {
   });
 
   Widget _buildPlaceholder(BuildContext context) {
-    final blurHashString =
-        event.infoMap.tryGet<String>('xyz.amorgan.blurhash') ??
-        'LEHV6nWB2yk8pyo0adR*.7kCMdnj';
+    final String blurHashString =
+        event.infoMap['xyz.amorgan.blurhash'] is String
+        ? event.infoMap['xyz.amorgan.blurhash']
+        : 'LEHV6nWB2yk8pyo0adR*.7kCMdnj';
     return SizedBox(
       width: width,
       height: height,

pubspec.lock

@@ -1472,9 +1472,11 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      path: "/Users/ggurdin/pangea/matrix-dart-sdk"
-      relative: false
-    source: path
+      path: "."
+      ref: merge-upstream-2
+      resolved-ref: "503d9831d8d1acc467f6cdb71d455297f05c5a3c"
+      url: "https://github.com/pangeachat/matrix-dart-sdk.git"
+    source: git
     version: "4.1.0"
   meta:
     dependency: transitive

pubspec.yaml

@@ -60,9 +60,11 @@ dependencies:
   latlong2: ^0.9.1
   linkify: ^5.0.0
   # #Pangea
-  # matrix: ^5.0.0
+  # matrix: ^4.1.0
   matrix:
-    path: /Users/ggurdin/pangea/matrix-dart-sdk
+    git:
+      url: https://github.com/pangeachat/matrix-dart-sdk.git # repo
+      ref: merge-upstream-2
   # Pangea#
   mime: ^2.0.0
   opus_caf_converter_dart: ^1.0.1