From 55724b8c2fd8c5e86a6e000cbc036b4e5208052e Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Mon, 1 Dec 2025 13:05:41 +0200
Subject: [PATCH] simplify logic a bit

---
 src/state/queries/list-memberships.ts | 36 +++++++++++++--------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/state/queries/list-memberships.ts b/src/state/queries/list-memberships.ts
index 4f0fffd98f..e95a45b881 100644
--- a/src/state/queries/list-memberships.ts
+++ b/src/state/queries/list-memberships.ts
@@ -180,6 +180,7 @@ export function useListMembershipAddMutation({
               starterPacksWithMembership: page.starterPacksWithMembership.map(
                 spWithMembership => {
                   if (
+                    spWithMembership.starterPack.list &&
                     spWithMembership.starterPack.list?.uri === variables.listUri
                   ) {
                     return {
@@ -195,14 +196,12 @@ export function useListMembershipAddMutation({
                             item => item.subject.did !== variables.actorDid,
                           ) ?? []),
                         ],
-                        list: spWithMembership.starterPack.list
-                          ? {
-                              ...spWithMembership.starterPack.list,
-                              listItemCount:
-                                (spWithMembership.starterPack.list
-                                  .listItemCount ?? 0) + 1,
-                            }
-                          : undefined,
+                        list: {
+                          ...spWithMembership.starterPack.list,
+                          listItemCount:
+                            (spWithMembership.starterPack.list.listItemCount ??
+                              0) + 1,
+                        },
                       },
                       listItem: {
                         uri: data.uri,
@@ -287,7 +286,8 @@ export function useListMembershipRemoveMutation({
             starterPacksWithMembership: page.starterPacksWithMembership.map(
               spWithMembership => {
                 if (
-                  spWithMembership.starterPack.list?.uri === variables.listUri
+                  spWithMembership.starterPack.list &&
+                  spWithMembership.starterPack.list.uri === variables.listUri
                 ) {
                   return {
                     ...spWithMembership,
@@ -297,16 +297,14 @@ export function useListMembershipRemoveMutation({
                         spWithMembership.starterPack.listItemsSample?.filter(
                           item => item.subject.did !== variables.actorDid,
                         ),
-                      list: spWithMembership.starterPack.list
-                        ? {
-                            ...spWithMembership.starterPack.list,
-                            listItemCount: Math.max(
-                              0,
-                              (spWithMembership.starterPack.list
-                                .listItemCount ?? 1) - 1,
-                            ),
-                          }
-                        : undefined,
+                      list: {
+                        ...spWithMembership.starterPack.list,
+                        listItemCount: Math.max(
+                          0,
+                          (spWithMembership.starterPack.list.listItemCount ??
+                            1) - 1,
+                        ),
+                      },
                     },
                     listItem: undefined,
                   }