From c9494f69f1bd615711abc7cb71ddd34564284c8d Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Tue, 12 Aug 2025 15:52:26 -0400
Subject: [PATCH] chore: fallback to old activity IDs (#3707)

---
 lib/pangea/activity_planner/activity_plan_model.dart | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/pangea/activity_planner/activity_plan_model.dart b/lib/pangea/activity_planner/activity_plan_model.dart
index c71471ef1..93b74e01f 100644
--- a/lib/pangea/activity_planner/activity_plan_model.dart
+++ b/lib/pangea/activity_planner/activity_plan_model.dart
@@ -102,7 +102,7 @@ class ActivityPlanModel {
             )
           : null,
       roles: roles,
-      bookmarkId: json[ModelKey.activityPlanBookmarkId],
+      bookmarkId: json[ModelKey.activityPlanBookmarkId] ?? json["bookmark_id"],
     );
   }
 
@@ -214,10 +214,16 @@ class ActivityRole {
   });
 
   factory ActivityRole.fromJson(Map<String, dynamic> json) {
+    final urlContent = json['avatar_url'] as String?;
+    String? avatarUrl;
+    if (urlContent != null && urlContent.isNotEmpty) {
+      avatarUrl = urlContent;
+    }
+
     return ActivityRole(
       id: json['id'],
       name: json['name'],
-      avatarUrl: json['avatar_url'],
+      avatarUrl: avatarUrl,
     );
   }