From 195ba69f579a322bfc00b70128470b2138533368 Mon Sep 17 00:00:00 2001
From: wistkeylab <ilham.s@wistkey.dev>
Date: Thu, 30 Apr 2026 13:45:41 +0700
Subject: [PATCH] fix current adapot

---
 .../src/routes/adapot/current/+page.server.ts | 28 +++++++
 .../src/routes/adapot/current/+page.svelte    | 73 +++++--------------
 2 files changed, 45 insertions(+), 56 deletions(-)
 create mode 100644 applications/viewer/src/routes/adapot/current/+page.server.ts

diff --git a/applications/viewer/src/routes/adapot/current/+page.server.ts b/applications/viewer/src/routes/adapot/current/+page.server.ts
new file mode 100644
index 00000000..1c7e17c5
--- /dev/null
+++ b/applications/viewer/src/routes/adapot/current/+page.server.ts
@@ -0,0 +1,28 @@
+import type { PageServerLoad } from './$types';
+import { env } from '$env/dynamic/public';
+
+export const load: PageServerLoad = async () => {
+    try {
+        const baseUrl = env.PUBLIC_INDEXER_BASE_URL;
+        const response = await fetch(`${baseUrl}/adapot`);
+
+        if (response.status === 404) {
+            return {
+                adapot: null,
+                error: 'No AdaPot data available yet. AdaPot is calculated at epoch boundaries — wait for the first epoch to complete.'
+            };
+        }
+
+        if (!response.ok) {
+            return { adapot: null, error: 'Failed to fetch current AdaPot' };
+        }
+
+        const data = await response.json();
+        return { adapot: data, error: null };
+    } catch (e) {
+        return {
+            adapot: null,
+            error: e instanceof Error ? e.message : 'An error occurred while loading AdaPot'
+        };
+    }
+};
diff --git a/applications/viewer/src/routes/adapot/current/+page.svelte b/applications/viewer/src/routes/adapot/current/+page.svelte
index ae27348a..b8372ca1 100644
--- a/applications/viewer/src/routes/adapot/current/+page.svelte
+++ b/applications/viewer/src/routes/adapot/current/+page.svelte
@@ -1,59 +1,24 @@
 <script lang="ts">
     import { formatAda, formatLovelace } from '$lib/util';
-    import { onMount } from 'svelte';
-    import { env } from '$env/dynamic/public';
+    import type { PageData } from './$types';
 
-    interface AdaPotData {
-        epoch: number;
-        totalAmount: number;
-        details: {
-            fees: number;
-            treasury: number;
-            reserves: number;
-            circulation: number;
-            distributedRewards: number;
-            undistributedRewards: number;
-            poolRewardsPot: number;
-        };
-    }
-
-    let adapot: AdaPotData | null = null;
-    let loading = true;
-    let error: string | null = null;
+    export let data: PageData;
 
-    async function loadCurrentAdapot() {
-        loading = true;
-        error = null;
-        try {
-            const baseUrl = env.PUBLIC_INDEXER_BASE_URL;
-            const response = await fetch(`${baseUrl}/adapot`); 
-            if (!response.ok) {
-                throw new Error('Failed to fetch current AdaPot');
-            }
-            const data = await response.json();
-            adapot = {
-                epoch: data.epoch,
-                totalAmount: data.rewards_pot,
-                details: {
-                    fees: data.fees,
-                    treasury: data.treasury,
-                    reserves: data.reserves,
-                    circulation: data.circulation,
-                    distributedRewards: data.distributed_rewards,
-                    undistributedRewards: data.undistributed_rewards,
-                    poolRewardsPot: data.pool_rewards_pot
-                }
-            };
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'An error occurred while loading AdaPot';
-        } finally {
-            loading = false;
+    $: raw = data.adapot;
+    $: error = data.error;
+    $: adapot = raw ? {
+        epoch: raw.epoch,
+        totalAmount: raw.rewards_pot ?? 0,
+        details: {
+            fees: raw.fees ?? 0,
+            treasury: raw.treasury ?? 0,
+            reserves: raw.reserves ?? 0,
+            circulation: raw.circulation ?? 0,
+            distributedRewards: raw.distributed_rewards ?? 0,
+            undistributedRewards: raw.undistributed_rewards ?? 0,
+            poolRewardsPot: raw.pool_rewards_pot ?? 0
         }
-    }
-
-    onMount(() => {
-        loadCurrentAdapot();
-    });
+    } : null;
 </script>
 
 <div class="container mx-auto px-4 py-8">
@@ -71,11 +36,7 @@
         </div>
     {/if}
 
-    {#if loading}
-        <div class="flex justify-center items-center py-8">
-            <span class="loading loading-spinner loading-lg text-primary"></span>
-        </div>
-    {:else if adapot}
+    {#if adapot}
         <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
             <!-- Epoch Card -->
             <div class="card bg-base-100 shadow-xl">