fix: issue #468

ForkbombEu · Oct 10, 2024 · caf4bd0 · caf4bd0
1 parent 76e2150
commit caf4bd0
Showing 1 changed file with 35 additions and 28 deletions.
diff --git a/src/routes/[[lang]]/(protected)/activity/+page.svelte b/src/routes/[[lang]]/(protected)/activity/+page.svelte
@@ -46,48 +46,55 @@
 		await setAllActivitiesAsRead();
 		hasChangesFlag = true;
 	};
-
-	$: if (hasChangesFlag) {
-		invalidate(_protectedLayoutKey);
-	}
+	const reloadActivities = async () => {
+		await invalidate(_protectedLayoutKey);
+		await invalidate(_activityKey);
+		activities = data.activities;
+	};
+	$: if (hasChangesFlag) reloadActivities();
 </script>
 
 <d-tab-page tab="activity" title={m.Notifications()} {...scanButton}>
 	<div class="flex w-full flex-col items-center">
 		{#if activities.length > 0}
-			<div class="flex justify-end gap-2.5 pb-4 w-full">
+			<div class="flex w-full justify-end gap-2.5 pb-4">
 				<d-button size="small" color="accent" onClick={clear}> {m.clear_all()} </d-button>
 				<d-button size="small" color="primary" onClick={setAllRead}>
 					{m.mark_all_as_read()}
 				</d-button>
 			</div>
 		{/if}
-			{#each activities as activity}
-				<d-activity-card {...activity} logo={activity.logo.url} id={String(activity.at)} use:setAsRead>
+		{#each activities as activity}
+			<d-activity-card
+				{...activity}
+				logo={activity.logo.url}
+				id={String(activity.at)}
+				use:setAsRead
+			>
+				<d-button
+					size="small"
+					color="accent"
+					onClick={async () => await cancelActivity(activity.at)}
+				>
+					{m.remove()}
+				</d-button>
+				{#if activity.credential}
 					<d-button
 						size="small"
-						color="accent"
-						onClick={async () => await cancelActivity(activity.at)}
+						color="primary"
+						href={r(`/${activity.credential.id}/credential-detail`)}
 					>
-						{m.remove()}
+						{m.show_me()}
 					</d-button>
-					{#if activity.credential}
-						<d-button
-							size="small"
-							color="primary"
-							href={r(`/${activity.credential.id}/credential-detail`)}
-						>
-							{m.show_me()}
-						</d-button>
-					{/if}
-				</d-activity-card>
-			{:else}
-				<d-empty-state
-					heading={m.No_activity_yet()}
-					text={m.Get_alerts_on_new_activities_and_keep_your_account_uptodate_()}
-				>
-					<Bell />
-				</d-empty-state>
-			{/each}
+				{/if}
+			</d-activity-card>
+		{:else}
+			<d-empty-state
+				heading={m.No_activity_yet()}
+				text={m.Get_alerts_on_new_activities_and_keep_your_account_uptodate_()}
+			>
+				<Bell />
+			</d-empty-state>
+		{/each}
 	</div>
 </d-tab-page>