From ccf378419e20353b94ca1495534f11633cbcb91a Mon Sep 17 00:00:00 2001
From: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Date: Fri, 28 Aug 2026 09:04:54 +0530
Subject: [PATCH] pull riverpod out of string interpolation

---
 .../widgets/people/partner_user_avatar.widget.dart            | 4 ++--
 mobile/lib/widgets/common/user_circle_avatar.dart             | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/presentation/widgets/people/partner_user_avatar.widget.dart b/mobile/lib/presentation/widgets/people/partner_user_avatar.widget.dart
index 16cbb49f25..257de7c73f 100644
--- a/mobile/lib/presentation/widgets/people/partner_user_avatar.widget.dart
+++ b/mobile/lib/presentation/widgets/people/partner_user_avatar.widget.dart
@@ -12,12 +12,12 @@ class PartnerUserAvatar extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final url = "${ref.watch(authSessionProvider.select((s) => s.serverEndpoint))}/users/$userId/profile-image";
+    final serverEndpoint = ref.watch(authSessionProvider.select((s) => s.serverEndpoint));
     final nameFirstLetter = name.isNotEmpty ? name[0] : "";
     return CircleAvatar(
       radius: 16,
       backgroundColor: context.primaryColor.withAlpha(50),
-      foregroundImage: RemoteImageProvider(url: url),
+      foregroundImage: RemoteImageProvider(url: "$serverEndpoint/users/$userId/profile-image"),
       // silence errors if user has no profile image, use initials as fallback
       onForegroundImageError: (exception, stackTrace) {},
       child: Text(nameFirstLetter.toUpperCase()),
diff --git a/mobile/lib/widgets/common/user_circle_avatar.dart b/mobile/lib/widgets/common/user_circle_avatar.dart
index 1a2521fd70..fd9140fde1 100644
--- a/mobile/lib/widgets/common/user_circle_avatar.dart
+++ b/mobile/lib/widgets/common/user_circle_avatar.dart
@@ -15,8 +15,9 @@ class UserCircleAvatar extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final userAvatarColor = user.avatarColor.toColor().withValues(alpha: opacity);
+    final serverEndpoint = ref.watch(authSessionProvider.select((s) => s.serverEndpoint));
     final profileImageUrl =
-        '${ref.watch(authSessionProvider.select((s) => s.serverEndpoint))}/users/${user.id}/profile-image?d=${user.profileChangedAt.millisecondsSinceEpoch}';
+        '$serverEndpoint/users/${user.id}/profile-image?d=${user.profileChangedAt.millisecondsSinceEpoch}';
 
     final textColor = (user.avatarColor.toColor().computeLuminance() > 0.5 ? Colors.black : Colors.white).withValues(
       alpha: opacity,