From de2691f871bab47517cacbda86d5a10a01eac04a Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Thu, 27 Nov 2025 03:30:00 -0500
Subject: [PATCH] fix actions

---
 app/api/services/account.py   | 28 ++++++++++++++--------------
 app/models/members_actions.py |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/api/services/account.py b/app/api/services/account.py
index 0d31b01..e98f114 100644
--- a/app/api/services/account.py
+++ b/app/api/services/account.py
@@ -122,20 +122,20 @@ class AccountService(BaseService):
 
                 member_actions = MembersActions.get_recent_member_actions(member_data.id)
                 member_actions_data = []
-
-                for t in member_actions:
-                    member_actions_data.append({
-                        'id': t.id,
-                        'uid': t.uid,
-                        'member_id': t.member_id,
-                        'member_uid': t.member_uid,
-                        'action_label': t.action_label,
-                        'action_name': t.action_name,
-                        'status_description': t.status_description,
-                        'status': t.status,
-                        'added': t.added,
-                        'updated': t.updated
-                    })
+                if member_actions:
+                    for t in member_actions:
+                        member_actions_data.append({
+                            'id': t.id,
+                            'uid': t.uid,
+                            'member_id': t.member_id,
+                            'member_uid': t.member_uid,
+                            'action_label': t.action_label,
+                            'action_name': t.action_name,
+                            'status_description': t.status_description,
+                            'status': t.status,
+                            'added': t.added,
+                            'updated': t.updated
+                        })
 
             action_data = {
                 "recent_actions": member_actions_data,
diff --git a/app/models/members_actions.py b/app/models/members_actions.py
index c6ec93d..dd4072f 100644
--- a/app/models/members_actions.py
+++ b/app/models/members_actions.py
@@ -40,7 +40,7 @@ class MembersActions(db.Model):
         member_actions = cls.query.filter_by(member_id=member_id).order_by(cls.id.desc()).limit(4).all()
 
         if not member_actions:
-            raise ValueError(f"No Member Actions")
+            return None
         return member_actions
 
     @classmethod
@@ -49,7 +49,7 @@ class MembersActions(db.Model):
         member_actions = cls.query.filter_by(member_id=member_id).order_by(cls.id.desc()).limit(limit).all()
 
         if not member_actions:
-            raise ValueError(f"No Member Actions")
+            return None
         return member_actions
 
 # '''