From 3d62a597ed61ad35e17c722d3ee4475a15859cdb Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Fri, 6 Feb 2026 09:54:50 -0500
Subject: [PATCH] fluffychat merge

---
 lib/pages/chat/events/image_bubble.dart | 7 ++++---
 pubspec.lock                            | 8 +++++---
 pubspec.yaml                            | 6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/pages/chat/events/image_bubble.dart b/lib/pages/chat/events/image_bubble.dart
index af4147295..e1c6d934c 100644
--- a/lib/pages/chat/events/image_bubble.dart
+++ b/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,
diff --git a/pubspec.lock b/pubspec.lock
index 44ddd78db..e7d3e9179 100644
--- a/pubspec.lock
+++ b/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
diff --git a/pubspec.yaml b/pubspec.yaml
index 28eb14306..be4f9e7a3 100644
--- a/pubspec.yaml
+++ b/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