diff --git a/apps/frontend/components/home/table/row/HomeTableRowCurrencies.svelte b/apps/frontend/components/home/table/row/HomeTableRowCurrencies.svelte
index 1c3a68538..10cc39a89 100644
--- a/apps/frontend/components/home/table/row/HomeTableRowCurrencies.svelte
+++ b/apps/frontend/components/home/table/row/HomeTableRowCurrencies.svelte
@@ -26,17 +26,18 @@
     {@const currency =
         currencyId < 1000000 ? wowthingData.static.currencyById.get(currencyId) : undefined}
     {@const itemId = currencyId > 1000000 ? currencyId - 1000000 : 0}
-    {@const { amount, amountRaw, percent, tooltip } = getCurrencyData(
+    {@const { amount, amountRaw, percent, tooltip, weekAmount, weekMax } = getCurrencyData(
         $timeStore,
         character,
         currency,
         itemId
     )}
     {#if amount}
-        {@const good = currencyGood[currencyId]}
+        {@const checkAmount = weekMax ? weekAmount : amountRaw}
+        {@const good = currencyGood[currencyId] || weekMax || 0}
         <td
             class="max-width"
-            class:status-success={good && amountRaw >= good}
+            class:status-success={good && checkAmount >= good}
             class:status-shrug={percent >= 50 && percent < 100}
             class:status-fail={percent >= 100}
             class:got-none={amount === '0' && percent === 0}
diff --git a/apps/frontend/components/tooltips/reputation/RenownRewards.svelte b/apps/frontend/components/tooltips/reputation/RenownRewards.svelte
new file mode 100644
index 000000000..00991f19d
--- /dev/null
+++ b/apps/frontend/components/tooltips/reputation/RenownRewards.svelte
@@ -0,0 +1,56 @@
+<script lang="ts">
+    import type { StaticDataRenownReward } from '@/shared/stores/static/types';
+
+    type Props = { reputationId: number; rewards: StaticDataRenownReward[] };
+    let { reputationId, rewards }: Props = $props();
+
+    // Prey: Season 1 has "New Quest Unlocked" descriptions, useful
+    const useName = (level: number, index: number) =>
+        reputationId === 2764 &&
+        ((level === 1 && index === 0) ||
+            (level === 3 && index === 0) ||
+            (level === 4 && index === 0));
+</script>
+
+<style lang="scss">
+    table {
+        font-size: 95%;
+        margin-top: 0.5rem;
+        width: 24rem;
+    }
+    .level {
+        --width: 2rem;
+
+        text-align: right;
+    }
+    .text {
+        --width: 100%;
+
+        text-align: left;
+    }
+</style>
+
+<table class="table table-striped b-t b-b">
+    <tbody>
+        {#each rewards as { level, names, toastDescriptions } (level)}
+            <tr>
+                <td class="level">{level}</td>
+                <td class="text">
+                    {#each { length: names.length }, index}
+                        {@const name = names[index]}
+                        {@const desc = toastDescriptions[index]}
+                        <div class="reward">
+                            {#if useName(level, index)}
+                                Quests - {name}
+                            {:else if desc}
+                                {desc}
+                            {:else}
+                                {name || '???'} - ???
+                            {/if}
+                        </div>
+                    {/each}
+                </td>
+            </tr>
+        {/each}
+    </tbody>
+</table>
diff --git a/apps/frontend/components/tooltips/reputation/TooltipReputationRenown.svelte b/apps/frontend/components/tooltips/reputation/TooltipReputationRenown.svelte
index 42aebe0a7..3319dd7f6 100644
--- a/apps/frontend/components/tooltips/reputation/TooltipReputationRenown.svelte
+++ b/apps/frontend/components/tooltips/reputation/TooltipReputationRenown.svelte
@@ -2,33 +2,39 @@
     import { Constants } from '@/data/constants';
     import { wowthingData } from '@/shared/stores/data';
     import type { StaticDataReputation } from '@/shared/stores/static/types';
-    import type { Character, CharacterReputationParagon } from '@/types';
+    import type { CharacterReputationParagon } from '@/types';
     import type { ManualDataReputationSet } from '@/types/data/manual';
+    import type { CharacterProps } from '@/types/props';
 
     import ProgressBar from '@/components/common/ProgressBar.svelte';
+    import RenownRewards from './RenownRewards.svelte';
     import WowthingImage from '@/shared/components/images/sources/WowthingImage.svelte';
 
-    export let character: Character;
-    export let characterParagon: CharacterReputationParagon = undefined;
-    export let characterRep: number;
-    export let dataRep: StaticDataReputation;
-    export let reputation: ManualDataReputationSet = undefined;
+    type Props = CharacterProps & {
+        characterRep: number;
+        dataRep: StaticDataReputation;
+        characterParagon?: CharacterReputationParagon;
+        reputation?: ManualDataReputationSet;
+    };
+    let { character, characterRep, dataRep, characterParagon, reputation }: Props = $props();
 
-    let progress: number;
-    let tier: number;
+    let maxRenown = $derived(
+        wowthingData.static.currencyById.get(dataRep.renownCurrencyId)?.maxTotal || 1
+    );
+    let renownValue = $derived(dataRep.maxValues[0] || 2500);
+    let tier = $derived(Math.floor(characterRep / renownValue));
+    let progress = $derived(
+        tier < maxRenown ? characterRep % renownValue : characterParagon?.current || 0
+    );
 
-    $: maxRenown = wowthingData.static.currencyById.get(dataRep.renownCurrencyId)?.maxTotal || 1;
-    $: renownValue = dataRep.maxValues[0] || 2500;
-    $: {
-        tier = Math.floor(characterRep / renownValue);
-        progress = tier < maxRenown ? characterRep % renownValue : characterParagon?.current || 0;
-    }
+    let upcomingRewards = $derived(
+        (wowthingData.static.renownRewards[dataRep.id] || []).filter(
+            (reward) => reward.level > tier
+        )
+    );
 </script>
 
 <style lang="scss">
-    .wowthing-tooltip {
-        width: 15rem;
-    }
     .tooltip-body {
         padding: 0.5rem;
     }
@@ -37,7 +43,7 @@
     }
 </style>
 
-<div class="wowthing-tooltip">
+<div class="wowthing-tooltip" style:width={upcomingRewards.length > 0 ? '25rem' : '15rem'}>
     <h4 class="text-overflow">
         {#if reputation?.both === undefined && character}
             <WowthingImage
@@ -60,5 +66,9 @@
             total={tier < maxRenown ? renownValue : characterParagon?.max}
             shortText={true}
         />
+
+        {#if upcomingRewards.length > 0}
+            <RenownRewards reputationId={dataRep.id} rewards={upcomingRewards} />
+        {/if}
     </div>
 </div>
diff --git a/apps/frontend/components/tooltips/task/TooltipTaskRow.svelte b/apps/frontend/components/tooltips/task/TooltipTaskRow.svelte
index 58f6451e9..a96c597dd 100644
--- a/apps/frontend/components/tooltips/task/TooltipTaskRow.svelte
+++ b/apps/frontend/components/tooltips/task/TooltipTaskRow.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { Strings } from '@/data/constants';
     import { taskChoreMap, taskMap } from '@/data/tasks';
     import { QuestStatus } from '@/enums/quest-status';
     import { iconLibrary, uiIcons } from '@/shared/icons';
@@ -196,13 +197,16 @@
                                     {/if}
                                 </td>
                             {:else if chore.questCount > 1}
-                                {@const cls = getPercentStatusClass(
-                                    ((chore.alwaysStarted
-                                        ? Math.max(1, charTaskChore.progressCurrent)
-                                        : charTaskChore.progressCurrent) /
-                                        charTaskChore.progressTotal) *
-                                        100
-                                )}
+                                {@const cls =
+                                    charTaskChore.statusTexts[0] === Strings.doUnlockQuests
+                                        ? 'status-fail'
+                                        : getPercentStatusClass(
+                                              ((chore.alwaysStarted
+                                                  ? Math.max(1, charTaskChore.progressCurrent)
+                                                  : charTaskChore.progressCurrent) /
+                                                  charTaskChore.progressTotal) *
+                                                  100
+                                          )}
                                 <td class="error-text">
                                     <ParsedText
                                         text={`[|${cls}|${charTaskChore.progressCurrent}/${charTaskChore.progressTotal}]`}
diff --git a/apps/frontend/data/constants.ts b/apps/frontend/data/constants.ts
index d87d30acb..557b5eafb 100644
--- a/apps/frontend/data/constants.ts
+++ b/apps/frontend/data/constants.ts
@@ -35,6 +35,11 @@ export abstract class Constants {
         loammNiffen: 2564,
         delveBrann: 2640,
         delveValeera: 2744,
+
+        midnightAmani: 2696,
+        midnightHarati: 2704,
+        midnightSingulatity: 2699,
+        midnightSilvermoon: 2710,
     };
 
     // static JSON -> itemBonusListGroups -> match upgradeTiers IDs
@@ -91,3 +96,7 @@ export abstract class Constants {
         armorPlate: 'item/102268',
     };
 }
+
+export abstract class Strings {
+    static readonly doUnlockQuests = 'Do unlock quests!';
+}
diff --git a/apps/frontend/data/tasks/11-midnight/12-0-0.ts b/apps/frontend/data/tasks/11-midnight/12-0-0.ts
index 210c19fdc..fbb3cc9c2 100644
--- a/apps/frontend/data/tasks/11-midnight/12-0-0.ts
+++ b/apps/frontend/data/tasks/11-midnight/12-0-0.ts
@@ -211,6 +211,15 @@ export const midChores12_0_0: Task = {
                 },
             ],
         },
+        {
+            key: 'midLostLegends',
+            name: 'Lost Legends',
+            icon: iconLibrary.gameSecretBook,
+            minimumLevel: 83,
+            accountWide: true,
+            questReset: DbResetType.Weekly,
+            questIds: [89268],
+        },
         {
             key: 'midDungeon',
             name: 'Dungeon',
diff --git a/apps/frontend/data/tasks/11-midnight/prey.ts b/apps/frontend/data/tasks/11-midnight/prey.ts
index ca91b3b08..abd629c70 100644
--- a/apps/frontend/data/tasks/11-midnight/prey.ts
+++ b/apps/frontend/data/tasks/11-midnight/prey.ts
@@ -1,123 +1,22 @@
+import { Strings } from '@/data/constants';
 import { iconLibrary } from '@/shared/icons';
 import { DbResetType } from '@/shared/stores/db/enums';
-import type { Character } from '@/types';
-import type { Chore, Task } from '@/types/tasks';
 import { userState } from '@/user-home/state/user';
+import type { Task } from '@/types/tasks';
 
-const normalQuestIds: number[] = [
-    91114, // Prey: Consul Nebulor (Normal)
-    91112, // Prey: Crusader Luxia Maxwell (Normal)
-    91100, // Prey: Deliah Gloomsong (Normal)
-    91124, // Prey: Dengzag, the Darkened Blaze (Normal)
-    91115, // Prey: Executor Kaenius (Normal)
-    91123, // Prey: Grothoz, the Burning Shadow (Normal)
-    91111, // Prey: High Vindicator Vureem (Normal)
-    91116, // Prey: Imperator Enigmalia (Normal)
-    91103, // Prey: Jo'zolo the Breaker (Normal)
-    91117, // Prey: Knight-Errant Bloodshatter (Normal)
-    91098, // Prey: L-N-0R the Recycler (Normal)
-    91110, // Prey: Lamyne of the Undercroft (Normal)
-    91108, // Prey: Lieutenant Blazewing (Normal)
-    91119, // Prey: Lost Theldrin (Normal)
-    91095, // Prey: Magister Sunbreaker (Normal)
-    91096, // Prey: Magistrix Emberlash (Normal)
-    91099, // Prey: Mordril Shadowfell (Normal)
-    91102, // Prey: Nexus-Edge Hadim (Normal)
-    91120, // Prey: Neydra the Starving (Normal)
-    91109, // Prey: Petyoll the Razorleaf (Normal)
-    91101, // Prey: Phaseblade Talasha (Normal)
-    91113, // Prey: Praetor Singularis (Normal)
-    91107, // Prey: Ranger Swiftglade (Normal)
-    91097, // Prey: Senior Tinker Ozwold (Normal)
-    91105, // Prey: The Talon of Janali (Normal)
-    91106, // Prey: The Wing of Akil'zon (Normal)
-    91122, // Prey: Thorn-Witch Liset (Normal)
-    91121, // Prey: Thornspeaker Edgath (Normal)
-    91118, // Prey: Vylenna the Defector (Normal)
-    91104, // Prey: Zadu, Fist of Nalorakk (Normal)
-];
+const PREY_REPUTATION_ID = 2764;
+const NORMAL_UNLOCK = 93086; // To the Sanctum!
+const HEROIC_UNLOCK = 92177; // One Hero's Prey
+const NIGHTMARE_UNLOCK = 92182; // The Sheep or the Wolf
 
-const hardQuestIds: number[] = [
-    91245, // Prey: Consul Nebulor (Hard)
-    91243, // Prey: Crusader Luxia Maxwell (Hard)
-    91220, // Prey: Deliah Gloomsong (Hard)
-    91255, // Prey: Dengzag, the Darkened Blaze (Hard)
-    91246, // Prey: Executor Kaenius (Hard)
-    91254, // Prey: Grothoz, the Burning Shadow (Hard)
-    91242, // Prey: High Vindicator Vureem (Hard)
-    91247, // Prey: Imperator Enigmalia (Hard)
-    91226, // Prey: Jo'zolo the Breaker (Hard)
-    91248, // Prey: Knight-Errant Bloodshatter (Hard)
-    91216, // Prey: L-N-0R the Recycler (Hard)
-    91240, // Prey: Lamyne of the Undercroft (Hard)
-    91236, // Prey: Lieutenant Blazewing (Hard)
-    91250, // Prey: Lost Theldrin (Hard)
-    91210, // Prey: Magister Sunbreaker (Hard)
-    91212, // Prey: Magistrix Emberlash (Hard)
-    91218, // Prey: Mordril Shadowfell (Hard)
-    91224, // Prey: Nexus-Edge Hadim (Hard)
-    91251, // Prey: Neydra the Starving (Hard)
-    91238, // Prey: Petyoll the Razorleaf (Hard)
-    91222, // Prey: Phaseblade Talasha (Hard)
-    91244, // Prey: Praetor Singularis (Hard)
-    91234, // Prey: Ranger Swiftglade (Hard)
-    91214, // Prey: Senior Tinker Ozwold (Hard)
-    91230, // Prey: The Talon of Janali (Hard)
-    91232, // Prey: The Wing of Akil'zon (Hard)
-    91253, // Prey: Thorn-Witch Liset (Hard)
-    91252, // Prey: Thornspeaker Edgath (Hard)
-    91249, // Prey: Vylenna the Defector (Hard)
-    91228, // Prey: Zadu, Fist of Nalorakk (Hard)
-];
+const renownFunc = (renown?: number) => {
+    if (!renown) {
+        return true;
+    }
 
-const nightmareQuestIds: number[] = [
-    91259, // Prey: Consul Nebulor (Nightmare)
-    91257, // Prey: Crusader Luxia Maxwell (Nightmare)
-    91221, // Prey: Deliah Gloomsong (Nightmare)
-    91269, // Prey: Dengzag, the Darkened Blaze (Nightmare)
-    91260, // Prey: Executor Kaenius (Nightmare)
-    91268, // Prey: Grothoz, the Burning Shadow (Nightmare)
-    91256, // Prey: High Vindicator Vureem (Nightmare)
-    91261, // Prey: Imperator Enigmalia (Nightmare)
-    91227, // Prey: Jo'zolo the Breaker (Nightmare)
-    91262, // Prey: Knight-Errant Bloodshatter (Nightmare)
-    91217, // Prey: L-N-0R the Recycler (Nightmare)
-    91241, // Prey: Lamyne of the Undercroft (Nightmare)
-    91237, // Prey: Lieutenant Blazewing (Nightmare)
-    91264, // Prey: Lost Theldrin (Nightmare)
-    91211, // Prey: Magister Sunbreaker (Nightmare)
-    91213, // Prey: Magistrix Emberlash (Nightmare)
-    91219, // Prey: Mordril Shadowfell (Nightmare)
-    91225, // Prey: Nexus-Edge Hadim (Nightmare)
-    91265, // Prey: Neydra the Starving (Nightmare)
-    91239, // Prey: Petyoll the Razorleaf (Nightmare)
-    91223, // Prey: Phaseblade Talasha (Nightmare)
-    91258, // Prey: Praetor Singularis (Nightmare)
-    91235, // Prey: Ranger Swiftglade (Nightmare)
-    91215, // Prey: Senior Tinker Ozwold (Nightmare)
-    91231, // Prey: The Talon of Janali (Nightmare)
-    91233, // Prey: The Wing of Akil'zon (Nightmare)
-    91267, // Prey: Thorn-Witch Liset (Nightmare)
-    91266, // Prey: Thornspeaker Edgath (Nightmare)
-    91263, // Prey: Vylenna the Defector (Nightmare)
-    91229, // Prey: Zadu, Fist of Nalorakk (Nightmare)
-];
-
-const preyFunc = (questIds: number[], index: number) => {
-    return (char: Character) => {
-        const charQuests = userState.quests.characterById.get(char.id);
-        const completedOrInProgress = questIds.filter(
-            (questId) =>
-                charQuests.hasQuestById.has(questId) ||
-                charQuests.progressQuestByKey.has(`q${questId}`)
-        );
-
-        if (completedOrInProgress[index]) {
-            return [completedOrInProgress[index]];
-        } else {
-            return questIds.filter((questId) => !completedOrInProgress.includes(questId));
-        }
-    };
+    const repCharacter =
+        userState.general.characterById[userState.reputations[PREY_REPUTATION_ID]?.[1]];
+    return repCharacter?.reputationData?.['midnight']?.sets?.[2]?.[2]?.value >= renown * 4000;
 };
 
 export const midPrey: Task = {
@@ -126,6 +25,7 @@ export const midPrey: Task = {
     shortName: 'Prey',
     minimumLevel: 80,
     showSeparate: true,
+    sumChores: true,
     chores: [
         {
             key: 'preyRep',
@@ -139,32 +39,59 @@ export const midPrey: Task = {
         },
         {
             key: 'preyNormal',
-            name: 'Normal',
+            name: 'Normal - {item:257023}',
             icon: iconLibrary.notoClownFace,
             alwaysStarted: true,
-            questCount: 4,
+            questCount: 2,
             questReset: DbResetType.Weekly,
-            questIds: normalQuestIds,
+            questIds: [93168, 93156],
+            canGetFunc: (char) =>
+                userState.quests.characterById.get(char.id)?.hasQuestById?.has(NORMAL_UNLOCK)
+                    ? ''
+                    : Strings.doUnlockQuests,
         },
         {
             key: 'preyHard',
-            name: 'Hard',
+            name: 'Hard - {item:257026}',
             icon: iconLibrary.notoCowboyHatFace,
             minimumLevel: 90,
             alwaysStarted: true,
-            questCount: 4,
+            questCount: 2,
             questReset: DbResetType.Weekly,
-            questIds: hardQuestIds,
+            questIds: [93169, 93857],
+            couldGetFunc: () => renownFunc(1),
+            canGetFunc: (char) =>
+                userState.quests.characterById.get(char.id)?.hasQuestById?.has(HEROIC_UNLOCK)
+                    ? ''
+                    : Strings.doUnlockQuests,
         },
         {
             key: 'preyNightmare',
-            name: 'Nightmare',
+            name: 'Nightmare - {item:262346}',
             icon: iconLibrary.notoAngryFaceWithHorns,
             minimumLevel: 90,
             alwaysStarted: true,
-            questCount: 4,
+            questCount: 2,
+            questReset: DbResetType.Weekly,
+            questIds: [93170, 93861],
+            couldGetFunc: () => renownFunc(4),
+            canGetFunc: (char) =>
+                userState.quests.characterById.get(char.id)?.hasQuestById?.has(NIGHTMARE_UNLOCK)
+                    ? ''
+                    : Strings.doUnlockQuests,
+        },
+        {
+            key: 'preyNightmarishTask',
+            name: 'A Nightmarish Task',
+            icon: iconLibrary.notoV1AngryFaceWithHorns,
+            minimumLevel: 90,
             questReset: DbResetType.Weekly,
-            questIds: nightmareQuestIds,
+            questIds: [94446],
+            couldGetFunc: () => renownFunc(4),
+            canGetFunc: (char) =>
+                userState.quests.characterById.get(char.id)?.hasQuestById?.has(NIGHTMARE_UNLOCK)
+                    ? ''
+                    : Strings.doUnlockQuests,
         },
     ],
 };
diff --git a/apps/frontend/shared/icons/library.ts b/apps/frontend/shared/icons/library.ts
index 507e0cc07..bd7c87418 100644
--- a/apps/frontend/shared/icons/library.ts
+++ b/apps/frontend/shared/icons/library.ts
@@ -198,6 +198,8 @@ export { default as notoSnowflake } from '@iconify/icons-noto/snowflake';
 export { default as notoSunWithFace } from '@iconify/icons-noto/sun-with-face';
 export { default as notoWaterWave } from '@iconify/icons-noto/water-wave';
 
+export { default as notoV1AngryFaceWithHorns } from '~icons/noto-v1/angry-face-with-horns';
+
 export { default as openmojiFlagFrance } from '@iconify/icons-openmoji/flag-france';
 export { default as openmojiFlagGermany } from '@iconify/icons-openmoji/flag-germany';
 export { default as openmojiFlagItaly } from '@iconify/icons-openmoji/flag-italy';
diff --git a/apps/frontend/shared/stores/data/static/process.ts b/apps/frontend/shared/stores/data/static/process.ts
index b27c2ffce..cf0ff2368 100644
--- a/apps/frontend/shared/stores/data/static/process.ts
+++ b/apps/frontend/shared/stores/data/static/process.ts
@@ -58,6 +58,7 @@ export function processStaticData(rawData: RawStatic): DataStatic {
 
     data.itemToRequiredAbility = cloneDeep(rawData.itemToRequiredAbility);
     data.itemToSkillLine = cloneDeep(rawData.itemToSkillLine);
+    data.renownRewards = cloneDeep(rawData.renownRewards);
     data.skillLineAbilityItems = cloneDeep(rawData.skillLineAbilityItems);
 
     data.bagById = createObjects(rawData.rawBags, StaticDataBag);
diff --git a/apps/frontend/shared/stores/data/static/types.ts b/apps/frontend/shared/stores/data/static/types.ts
index 7086b36b0..4e5db2a8f 100644
--- a/apps/frontend/shared/stores/data/static/types.ts
+++ b/apps/frontend/shared/stores/data/static/types.ts
@@ -109,6 +109,7 @@ export class DataStatic {
     public keystoneAffixById: Map<number, StaticDataKeystoneAffix>;
     public questNameById: Map<number, string>;
     public reagentCategoriesById: Map<number, number[]>;
+    public renownRewards: Record<number, StaticDataRenownReward[]>;
     public reputationTierById: Map<number, StaticDataReputationTier>;
     public sharedStringById: Map<number, string>;
 
diff --git a/apps/frontend/types/tasks.ts b/apps/frontend/types/tasks.ts
index 6e3086335..136b141e2 100644
--- a/apps/frontend/types/tasks.ts
+++ b/apps/frontend/types/tasks.ts
@@ -15,6 +15,7 @@ export type Task = {
     requiredHolidays?: Holiday[];
     requiredQuestId?: number;
     showSeparate?: boolean;
+    sumChores?: boolean;
     chores: Chore[];
 };
 
diff --git a/apps/frontend/user-home/state/user/derived.svelte.ts b/apps/frontend/user-home/state/user/derived.svelte.ts
index 579a5b6e8..19c9ab45b 100644
--- a/apps/frontend/user-home/state/user/derived.svelte.ts
+++ b/apps/frontend/user-home/state/user/derived.svelte.ts
@@ -412,13 +412,19 @@ export class DataUserDerived {
                 }
 
                 if (!charChore.skipped) {
-                    charTask.countTotal++;
+                    charTask.countTotal += task.sumChores ? charChore.progressTotal : 1;
 
                     if (charChore.status === QuestStatus.Completed) {
-                        charTask.countCompleted++;
+                        charTask.countCompleted += task.sumChores ? charChore.progressCurrent : 1;
                     } else if (charChore.status === QuestStatus.InProgress) {
                         charTask.status ||= QuestStatus.InProgress;
-                        charTask.countStarted++;
+
+                        if (task.sumChores) {
+                            charTask.countCompleted += charChore.progressCurrent;
+                        } else {
+                            charTask.countStarted++;
+                        }
+
                         if (
                             charChore.status === QuestStatus.InProgress &&
                             charChore.quest?.objectives?.length > 0
@@ -698,8 +704,6 @@ export class DataUserDerived {
 
         charChore.name ||= chore.name;
 
-        if (chore.key === 'preyRep') console.log(character.name, charChore);
-
         return charChore;
     }
 
diff --git a/apps/frontend/utils/characters/get-currency-data.ts b/apps/frontend/utils/characters/get-currency-data.ts
index b23d26fa2..64e628f46 100644
--- a/apps/frontend/utils/characters/get-currency-data.ts
+++ b/apps/frontend/utils/characters/get-currency-data.ts
@@ -18,6 +18,8 @@ interface CharacterCurrencyData {
     capRemaining: number;
     percent: number;
     tooltip: string;
+    weekAmount: number;
+    weekMax: number;
 }
 
 export function getCurrencyData(
@@ -32,6 +34,8 @@ export function getCurrencyData(
         capRemaining: 0,
         percent: 0,
         tooltip: '',
+        weekAmount: 0,
+        weekMax: 0,
     };
 
     if (currency) {
@@ -56,19 +60,26 @@ export function getCurrencyData(
         const amount = characterCurrency.quantity;
         ret.amount = toNiceNumber(amount);
         ret.amountRaw = amount;
+        ret.weekAmount = characterCurrency.weekQuantity;
+        ret.weekMax = characterCurrency.weekMax;
 
         if (characterCurrency.isMovingMax && characterCurrency.max > 0) {
             ret.capRemaining = characterCurrency.max - characterCurrency.totalQuantity;
             ret.percent = (characterCurrency.totalQuantity / characterCurrency.max) * 100;
             ret.tooltip = `${characterCurrency.totalQuantity.toLocaleString()} / ${characterCurrency.max.toLocaleString()}`;
         } else {
+            ret.tooltip = amount.toLocaleString();
+
             if (characterCurrency.max > 0) {
                 ret.capRemaining = characterCurrency.max - amount;
                 ret.percent = (amount / characterCurrency.max) * 100;
-                ret.tooltip = `${amount.toLocaleString()} / ${characterCurrency.max.toLocaleString()}`;
+                ret.tooltip = `${ret.tooltip} / ${characterCurrency.max.toLocaleString()}`;
+            } else if (characterCurrency.weekMax > 0) {
+                ret.capRemaining = characterCurrency.weekMax - characterCurrency.weekQuantity;
+                ret.percent = (characterCurrency.weekQuantity / characterCurrency.weekMax) * 100;
+                extraTooltip = `${characterCurrency.weekQuantity.toLocaleString()} / ${characterCurrency.weekMax.toLocaleString()} weekly cap`;
             } else {
                 ret.percent = 0;
-                ret.tooltip = amount.toLocaleString();
             }
         }
         ret.tooltip += ` ${currency.name}`;
diff --git a/apps/web/Converters/ApiUserCharacterCurrencyConverter.cs b/apps/web/Converters/ApiUserCharacterCurrencyConverter.cs
index 09e28f8c7..dad1ff14c 100644
--- a/apps/web/Converters/ApiUserCharacterCurrencyConverter.cs
+++ b/apps/web/Converters/ApiUserCharacterCurrencyConverter.cs
@@ -14,40 +14,13 @@ public override void Write(Utf8JsonWriter writer, ApiUserCharacterCurrency curre
         writer.WriteStartArray();
 
         writer.WriteNumberValue(currency.CurrencyId);
-
-        bool useQuantity = currency.Quantity > 0;
-        bool useMax = currency.Max > 0;
-        bool useTotalQuantity = currency.TotalQuantity > 0;
-        bool useIsMovingMax = currency.IsMovingMax;
-        bool useWeekly = currency.IsWeekly;
-
-        if (useWeekly || useIsMovingMax || useTotalQuantity || useMax || useQuantity)
-        {
-            writer.WriteNumberValue(currency.Quantity);
-        }
-
-        if (useWeekly || useIsMovingMax || useTotalQuantity || useMax)
-        {
-            writer.WriteNumberValue(currency.Max);
-        }
-
-        if (useWeekly || useIsMovingMax || useTotalQuantity)
-        {
-            writer.WriteNumberValue(currency.TotalQuantity);
-        }
-
-        if (useWeekly || useIsMovingMax)
-        {
-            writer.WriteNumberValue(currency.IsMovingMax ? 1 : 0);
-        }
-
-        if (useWeekly)
-        {
-            writer.WriteNumberValue(currency.IsWeekly ? 1 : 0);
-            writer.WriteNumberValue(currency.WeekQuantity);
-            writer.WriteNumberValue(currency.WeekMax);
-        }
-
+        writer.WriteNumberValue(currency.Quantity);
+        writer.WriteNumberValue(currency.Max);
+        writer.WriteNumberValue(currency.TotalQuantity);
+        writer.WriteNumberValue(currency.IsMovingMax ? 1 : 0);
+        writer.WriteNumberValue(currency.IsWeekly ? 1 : 0);
+        writer.WriteNumberValue(currency.WeekQuantity);
+        writer.WriteNumberValue(currency.WeekMax);
         writer.WriteEndArray();
     }
 }