diff --git a/components/waves/drop/MemesSingleWaveDropInfoPanel.tsx b/components/waves/drop/MemesSingleWaveDropInfoPanel.tsx
index 4b015cb25a..b4e2d7682f 100644
--- a/components/waves/drop/MemesSingleWaveDropInfoPanel.tsx
+++ b/components/waves/drop/MemesSingleWaveDropInfoPanel.tsx
@@ -18,44 +18,17 @@ import WaveDropDeleteButton from "@/components/utils/button/WaveDropDeleteButton
 import { ImageScale } from "@/helpers/image.helpers";
 import Download from "@/components/download/Download";
 import { getFileInfoFromUrl } from "@/helpers/file.helpers";
-import { ApiWaveOutcomeCredit } from "@/generated/models/ApiWaveOutcomeCredit";
-import { ApiWaveOutcomeType } from "@/generated/models/ApiWaveOutcomeType";
 import { VotingModal, MobileVotingModal } from "@/components/voting";
 import useIsMobileScreen from "@/hooks/isMobileScreen";
 import { WaveDropVoteSummary } from "./WaveDropVoteSummary";
 import { WaveDropMetaRow } from "./WaveDropMetaRow";
+import { useWaveRankReward } from "@/hooks/waves/useWaveRankReward";
 
 interface MemesSingleWaveDropInfoPanelProps {
   readonly drop: ExtendedDrop;
   readonly wave: ApiWave | null;
 }
 
-const calculateOutcomes = (drop: ExtendedDrop, wave: ApiWave | null) => {
-  if (!wave || !drop.rank)
-    return { nicTotal: 0, repTotal: 0, manualOutcomes: [] as string[] };
-
-  const rank = drop.rank;
-  const outcomes = wave.outcomes;
-
-  const nicTotal = outcomes
-    .filter((o) => o.credit === ApiWaveOutcomeCredit.Cic)
-    .reduce((acc, o) => acc + (o.distribution?.[rank - 1]?.amount ?? 0), 0);
-
-  const repTotal = outcomes
-    .filter((o) => o.credit === ApiWaveOutcomeCredit.Rep)
-    .reduce((acc, o) => acc + (o.distribution?.[rank - 1]?.amount ?? 0), 0);
-
-  const manualOutcomes = outcomes
-    .filter(
-      (o) =>
-        o.type === ApiWaveOutcomeType.Manual &&
-        o.distribution?.[rank - 1]?.amount
-    )
-    .map((o) => o.distribution?.[rank - 1]?.description ?? "");
-
-  return { nicTotal, repTotal, manualOutcomes };
-};
-
 export const MemesSingleWaveDropInfoPanel = ({
   drop,
   wave,
@@ -63,12 +36,14 @@ export const MemesSingleWaveDropInfoPanel = ({
   const [isFullscreen, setIsFullscreen] = useState(false);
   const [isVotingOpen, setIsVotingOpen] = useState(false);
   const isMobileScreen = useIsMobileScreen();
-  const { isWinner, canDelete, canShowVote, isVotingEnded } = useDropInteractionRules(drop);
+  const { isWinner, canDelete, canShowVote, isVotingEnded } =
+    useDropInteractionRules(drop);
 
-  const { nicTotal, repTotal, manualOutcomes } = useMemo(
-    () => calculateOutcomes(drop, wave),
-    [drop, wave]
-  );
+  const { nicTotal, repTotal, manualOutcomes } = useWaveRankReward({
+    waveId: drop.wave.id,
+    rank: drop.rank,
+    enabled: true,
+  });
 
   const title = useMemo(
     () =>
@@ -115,11 +90,11 @@ export const MemesSingleWaveDropInfoPanel = ({
   return (
     <>
       <div className="tw-w-full">
-        <div className="tw-w-full tw-min-h-screen tw-flex tw-flex-col">
-          <div className="tw-flex-1 tw-flex tw-items-center tw-justify-center tw-px-4 sm:tw-px-6 xl:tw-px-20 tw-py-6 lg:tw-py-8">
+        <div className="tw-flex tw-min-h-screen tw-w-full tw-flex-col">
+          <div className="tw-flex tw-flex-1 tw-items-center tw-justify-center tw-px-4 tw-py-6 sm:tw-px-6 lg:tw-py-8 xl:tw-px-20">
             {artworkMedia && (
-              <div className="tw-w-full md:tw-max-w-4xl tw-mx-auto tw-flex tw-items-center tw-justify-center">
-                <div className="tw-relative tw-w-full tw-h-[60vh] md:tw-h-[80vh] lg:tw-h-[95vh]">
+              <div className="tw-mx-auto tw-flex tw-w-full tw-items-center tw-justify-center md:tw-max-w-4xl">
+                <div className="tw-relative tw-h-[60vh] tw-w-full md:tw-h-[80vh] lg:tw-h-[95vh]">
                   <DropListItemContentMedia
                     media_mime_type={artworkMedia.mime_type}
                     media_url={artworkMedia.url}
@@ -131,9 +106,9 @@ export const MemesSingleWaveDropInfoPanel = ({
             )}
           </div>
 
-          <div className="tw-px-4 sm:tw-px-6 xl:tw-px-20 tw-mt-4 md:tw-mt-6">
-            <div className="tw-max-w-3xl tw-mx-auto tw-w-full">
-              <div className="tw-flex tw-justify-center tw-mb-8">
+          <div className="tw-mt-4 tw-px-4 sm:tw-px-6 md:tw-mt-6 xl:tw-px-20">
+            <div className="tw-mx-auto tw-w-full tw-max-w-3xl">
+              <div className="tw-mb-8 tw-flex tw-justify-center">
                 <WaveDropVoteSummary
                   drop={drop}
                   isWinner={isWinner}
@@ -145,11 +120,11 @@ export const MemesSingleWaveDropInfoPanel = ({
               </div>
 
               <div className="tw-mb-6">
-                <h1 className="tw-text-lg sm:tw-text-2xl tw-font-bold tw-text-white tw-mb-4 tw-tracking-tight">
+                <h1 className="tw-mb-4 tw-text-lg tw-font-bold tw-tracking-tight tw-text-white sm:tw-text-2xl">
                   {title}
                 </h1>
                 {description && (
-                  <p className="tw-text-sm lg:tw-text-md tw-text-white/60 tw-mb-0">
+                  <p className="tw-mb-0 tw-text-sm tw-text-white/60 lg:tw-text-md">
                     {description}
                   </p>
                 )}
@@ -174,7 +149,7 @@ export const MemesSingleWaveDropInfoPanel = ({
                     <span className="tw-text-white/40">·</span>
                     <FontAwesomeIcon
                       icon={faAddressCard}
-                      className="tw-w-4 tw-h-4 tw-text-white/40"
+                      className="tw-h-4 tw-w-4 tw-text-white/40"
                     />
                     <span className="tw-text-sm tw-text-white/60">
                       {nicTotal} NIC
@@ -186,7 +161,7 @@ export const MemesSingleWaveDropInfoPanel = ({
                     <span className="tw-text-white/40">·</span>
                     <FontAwesomeIcon
                       icon={faStar}
-                      className="tw-w-4 tw-h-4 tw-text-white/40"
+                      className="tw-h-4 tw-w-4 tw-text-white/40"
                     />
                     <span className="tw-text-sm tw-text-white/60">
                       {repTotal} Rep
@@ -198,16 +173,16 @@ export const MemesSingleWaveDropInfoPanel = ({
           </div>
         </div>
 
-        <div className="tw-w-full tw-h-px tw-bg-white/10 tw-my-8 md:tw-my-10"></div>
+        <div className="tw-my-8 tw-h-px tw-w-full tw-bg-white/10 md:tw-my-10"></div>
 
-        <div className="tw-px-4 sm:tw-px-6 xl:tw-px-20 tw-pb-8 md:tw-pb-10">
-          <div className="tw-max-w-3xl tw-mx-auto tw-space-y-8">
+        <div className="tw-px-4 tw-pb-8 sm:tw-px-6 md:tw-pb-10 xl:tw-px-20">
+          <div className="tw-mx-auto tw-max-w-3xl tw-space-y-8">
             <SingleWaveDropTraits drop={drop} />
 
             <SingleWaveDropInfoDetails drop={drop} />
 
             {artworkMedia && fileInfo && (
-              <div className="tw-flex tw-gap-x-3 tw-items-center">
+              <div className="tw-flex tw-items-center tw-gap-x-3">
                 <span className="tw-text-xs tw-font-medium tw-text-iron-600">
                   Media Type:{" "}
                   <span className="tw-text-iron-400">
@@ -238,9 +213,9 @@ export const MemesSingleWaveDropInfoPanel = ({
             animate={{ opacity: 1 }}
             exit={{ opacity: 0 }}
             transition={{ duration: 0.3 }}
-            className="tw-fixed tw-inset-0 tw-z-50 tw-bg-iron-950/90 tw-flex tw-flex-col tw-items-center tw-justify-center tw-p-4"
+            className="tw-fixed tw-inset-0 tw-z-50 tw-flex tw-flex-col tw-items-center tw-justify-center tw-bg-iron-950/90 tw-p-4"
           >
-            <div className="tw-w-full tw-max-w-5xl tw-flex tw-justify-between tw-items-center tw-mb-4">
+            <div className="tw-mb-4 tw-flex tw-w-full tw-max-w-5xl tw-items-center tw-justify-between">
               <div className="tw-flex tw-flex-col">
                 <div className="tw-flex tw-items-center tw-gap-x-3">
                   <SingleWaveDropPosition rank={drop.rank ?? 1} drop={drop} />
@@ -249,7 +224,7 @@ export const MemesSingleWaveDropInfoPanel = ({
                   </h3>
                 </div>
                 {description && (
-                  <p className="tw-text-iron-400 tw-text-md tw-mt-1 tw-ml-10">
+                  <p className="tw-ml-10 tw-mt-1 tw-text-md tw-text-iron-400">
                     {description}
                   </p>
                 )}
@@ -261,20 +236,18 @@ export const MemesSingleWaveDropInfoPanel = ({
 
               <button
                 onClick={toggleFullscreen}
-                className="tw-bg-iron-900/80 tw-text-iron-100 tw-p-3 tw-rounded-lg 
-                        tw-transition-colors tw-duration-200 hover:tw-bg-iron-800 
-                        focus:tw-outline-none focus:tw-ring-2 focus:tw-ring-primary-400"
+                className="tw-rounded-lg tw-bg-iron-900/80 tw-p-3 tw-text-iron-100 tw-transition-colors tw-duration-200 hover:tw-bg-iron-800 focus:tw-outline-none focus:tw-ring-2 focus:tw-ring-primary-400"
                 aria-label="Exit fullscreen view"
               >
-                <FontAwesomeIcon icon={faCompress} className="tw-w-5 tw-h-5" />
+                <FontAwesomeIcon icon={faCompress} className="tw-h-5 tw-w-5" />
               </button>
             </div>
 
-            <div className="tw-w-full tw-h-full tw-flex tw-items-center tw-justify-center">
+            <div className="tw-flex tw-h-full tw-w-full tw-items-center tw-justify-center">
               <img
                 src={artworkMedia.url}
                 alt={title}
-                className="tw-max-w-full tw-max-h-full tw-object-contain"
+                className="tw-max-h-full tw-max-w-full tw-object-contain"
               />
             </div>
           </motion.div>
diff --git a/components/waves/winners/DefaultWaveWinnerDropSmall.tsx b/components/waves/winners/DefaultWaveWinnerDropSmall.tsx
index f04a98465b..ba54b1e195 100644
--- a/components/waves/winners/DefaultWaveWinnerDropSmall.tsx
+++ b/components/waves/winners/DefaultWaveWinnerDropSmall.tsx
@@ -2,7 +2,6 @@
 
 import { memo, useCallback } from "react";
 import { ExtendedDrop } from "@/helpers/waves/drop.helpers";
-import { ApiWave } from "@/generated/models/ApiWave";
 import Link from "next/link";
 import { formatNumberWithCommas } from "@/helpers/Helpers";
 import { getScaledImageUri, ImageScale } from "@/helpers/image.helpers";
@@ -17,12 +16,11 @@ import { ApiWaveCreditType } from "@/generated/models/ApiWaveCreditType";
 interface DefaultWaveWinnerDropSmallProps {
   readonly drop: ExtendedDrop;
   readonly onDropClick: (drop: ExtendedDrop) => void;
-  readonly wave: ApiWave;
   readonly rank?: number | undefined; // For explicitly setting rank from decision winners
 }
 
 export const DefaultWaveWinnerDropSmall = memo<DefaultWaveWinnerDropSmallProps>(
-  ({ drop, onDropClick, wave, rank }) => {
+  ({ drop, onDropClick, rank }) => {
     // Use provided rank or fall back to drop.rank
     const effectiveRank = rank ?? drop.rank;
 
@@ -63,10 +61,10 @@ export const DefaultWaveWinnerDropSmall = memo<DefaultWaveWinnerDropSmallProps>(
     return (
       <div
         onClick={handleDropClick}
-        className="tw-w-full tw-text-left tw-cursor-pointer tw-group tw-rounded-xl tw-overflow-hidden"
+        className="tw-group tw-w-full tw-cursor-pointer tw-overflow-hidden tw-rounded-xl tw-text-left"
       >
-        <div className="tw-rounded-xl tw-bg-iron-900 tw-p-4 tw-relative desktop-hover:hover:tw-bg-iron-800/80 tw-transition-all tw-duration-300 tw-ease-out">
-          <div className="tw-flex tw-flex-col tw-relative">
+        <div className="tw-relative tw-rounded-xl tw-bg-iron-900 tw-p-4 tw-transition-all tw-duration-300 tw-ease-out desktop-hover:hover:tw-bg-iron-800/80">
+          <div className="tw-relative tw-flex tw-flex-col">
             <div className="tw-flex tw-items-start tw-justify-between tw-gap-x-4">
               <div className="tw-flex tw-items-center tw-gap-x-3">
                 {effectiveRank && (
@@ -80,7 +78,7 @@ export const DefaultWaveWinnerDropSmall = memo<DefaultWaveWinnerDropSmallProps>(
                 )}
               </div>
 
-              <div className="tw-flex tw-justify-end tw-items-center tw-gap-x-3 tw-flex-wrap">
+              <div className="tw-flex tw-flex-wrap tw-items-center tw-justify-end tw-gap-x-3">
                 <div className="tw-flex tw-items-center tw-gap-x-1.5">
                   <span
                     className={`tw-text-sm tw-font-semibold ${ratingStyle}`}
@@ -102,7 +100,7 @@ export const DefaultWaveWinnerDropSmall = memo<DefaultWaveWinnerDropSmallProps>(
 
                 {hasUserVoted && (
                   <div className="tw-flex tw-items-center tw-gap-x-1.5 tw-whitespace-nowrap">
-                    <span className="tw-text-iron-400 tw-text-sm">You:</span>
+                    <span className="tw-text-sm tw-text-iron-400">You:</span>
                     <span
                       className={`tw-text-sm tw-font-medium ${userVoteStyle}`}
                     >
@@ -114,11 +112,11 @@ export const DefaultWaveWinnerDropSmall = memo<DefaultWaveWinnerDropSmallProps>(
             </div>
           </div>
 
-          <div className="tw-flex tw-items-center tw-gap-x-3 tw-mt-4">
+          <div className="tw-mt-4 tw-flex tw-items-center tw-gap-x-3">
             <Link
               href={`/${drop.author.handle}`}
               onClick={(e) => e.stopPropagation()}
-              className="tw-block tw-flex-shrink-0 desktop-hover:group-hover:tw-opacity-90 tw-transition-opacity"
+              className="tw-block tw-flex-shrink-0 tw-transition-opacity desktop-hover:group-hover:tw-opacity-90"
             >
               {drop.author.pfp ? (
                 <img
@@ -127,10 +125,10 @@ export const DefaultWaveWinnerDropSmall = memo<DefaultWaveWinnerDropSmallProps>(
                     ImageScale.W_AUTO_H_50
                   )}
                   alt={`${drop.author.handle}'s profile`}
-                  className="tw-size-7 tw-rounded-lg tw-ring-1 tw-ring-white/10 tw-object-cover"
+                  className="tw-size-7 tw-rounded-lg tw-object-cover tw-ring-1 tw-ring-white/10"
                 />
               ) : (
-                <div className="tw-size-7 tw-rounded-lg tw-ring-1 tw-ring-white/10 tw-bg-iron-800" />
+                <div className="tw-size-7 tw-rounded-lg tw-bg-iron-800 tw-ring-1 tw-ring-white/10" />
               )}
             </Link>
 
@@ -141,15 +139,15 @@ export const DefaultWaveWinnerDropSmall = memo<DefaultWaveWinnerDropSmallProps>(
                 <Link
                   href={`/${drop.author.handle}`}
                   onClick={(e) => e.stopPropagation()}
-                  className="tw-no-underline tw-truncate desktop-hover:hover:tw-underline"
+                  className="tw-truncate tw-no-underline desktop-hover:hover:tw-underline"
                 >
-                  <span className="tw-text-sm tw-font-semibold tw-text-iron-200 desktop-hover:hover:tw-text-iron-100 tw-transition-colors">
+                  <span className="tw-text-sm tw-font-semibold tw-text-iron-200 tw-transition-colors desktop-hover:hover:tw-text-iron-100">
                     {drop.author.handle}
                   </span>
                 </Link>
               </UserProfileTooltipWrapper>
-              <span className="tw-size-[3px] tw-bg-iron-600 tw-rounded-full tw-flex-shrink-0"></span>
-              <span className="tw-text-xs tw-text-iron-400 tw-flex-shrink-0">
+              <span className="tw-size-[3px] tw-flex-shrink-0 tw-rounded-full tw-bg-iron-600"></span>
+              <span className="tw-flex-shrink-0 tw-text-xs tw-text-iron-400">
                 {Time.millis(drop.created_at).toLocaleDropDateAndTimeString()}
               </span>
             </div>
@@ -157,8 +155,8 @@ export const DefaultWaveWinnerDropSmall = memo<DefaultWaveWinnerDropSmallProps>(
 
           <div className="tw-ml-10">
             <DropContentSmall drop={drop} onDropClick={onDropClick} />
-            <div className="tw-mt-2 tw-relative">
-              <WaveWinnersSmallOutcome drop={drop} wave={wave} />
+            <div className="tw-relative tw-mt-2">
+              <WaveWinnersSmallOutcome drop={drop} />
             </div>
           </div>
         </div>
diff --git a/components/waves/winners/MemesWaveWinnerDropSmall.tsx b/components/waves/winners/MemesWaveWinnerDropSmall.tsx
index ebb3484fc2..e4ab87b391 100644
--- a/components/waves/winners/MemesWaveWinnerDropSmall.tsx
+++ b/components/waves/winners/MemesWaveWinnerDropSmall.tsx
@@ -2,7 +2,6 @@
 
 import { memo, useCallback } from "react";
 import { ExtendedDrop } from "@/helpers/waves/drop.helpers";
-import { ApiWave } from "@/generated/models/ApiWave";
 import Link from "next/link";
 import { formatNumberWithCommas } from "@/helpers/Helpers";
 import { getScaledImageUri, ImageScale } from "@/helpers/image.helpers";
@@ -17,12 +16,11 @@ import { ApiWaveCreditType } from "@/generated/models/ApiWaveCreditType";
 interface MemesWaveWinnerDropSmallProps {
   readonly drop: ExtendedDrop;
   readonly onDropClick: (drop: ExtendedDrop) => void;
-  readonly wave: ApiWave;
   readonly rank?: number | undefined; // For explicitly setting rank from decision winners
 }
 
 export const MemesWaveWinnerDropSmall = memo<MemesWaveWinnerDropSmallProps>(
-  ({ drop, onDropClick, wave, rank }) => {
+  ({ drop, onDropClick, rank }) => {
     // Use provided rank or fall back to drop.rank
     const effectiveRank = rank ?? drop.rank;
 
@@ -65,10 +63,10 @@ export const MemesWaveWinnerDropSmall = memo<MemesWaveWinnerDropSmallProps>(
     return (
       <div
         onClick={handleDropClick}
-        className="tw-w-full tw-text-left tw-cursor-pointer tw-group tw-rounded-xl tw-overflow-hidden"
+        className="tw-group tw-w-full tw-cursor-pointer tw-overflow-hidden tw-rounded-xl tw-text-left"
       >
-        <div className="tw-rounded-xl tw-bg-iron-900 tw-p-4 tw-relative desktop-hover:hover:tw-bg-iron-800/80 tw-transition-all tw-duration-300 tw-ease-out">
-          <div className="tw-flex tw-flex-col tw-relative">
+        <div className="tw-relative tw-rounded-xl tw-bg-iron-900 tw-p-4 tw-transition-all tw-duration-300 tw-ease-out desktop-hover:hover:tw-bg-iron-800/80">
+          <div className="tw-relative tw-flex tw-flex-col">
             <div className="tw-flex tw-items-start tw-justify-between tw-gap-x-4">
               <div className="tw-flex tw-items-center tw-gap-x-3">
                 {effectiveRank && (
@@ -82,7 +80,7 @@ export const MemesWaveWinnerDropSmall = memo<MemesWaveWinnerDropSmallProps>(
                 )}
               </div>
 
-              <div className="tw-flex tw-justify-end tw-items-center tw-gap-x-3 tw-flex-wrap">
+              <div className="tw-flex tw-flex-wrap tw-items-center tw-justify-end tw-gap-x-3">
                 <div className="tw-flex tw-items-center tw-gap-x-1.5">
                   <span
                     className={`tw-text-sm tw-font-semibold ${ratingStyle}`}
@@ -104,7 +102,7 @@ export const MemesWaveWinnerDropSmall = memo<MemesWaveWinnerDropSmallProps>(
 
                 {hasUserVoted && (
                   <div className="tw-flex tw-items-center tw-gap-x-1.5 tw-whitespace-nowrap">
-                    <span className="tw-text-iron-400 tw-text-sm">You:</span>
+                    <span className="tw-text-sm tw-text-iron-400">You:</span>
                     <span
                       className={`tw-text-sm tw-font-medium ${userVoteStyle}`}
                     >
@@ -116,11 +114,11 @@ export const MemesWaveWinnerDropSmall = memo<MemesWaveWinnerDropSmallProps>(
             </div>
           </div>
 
-          <div className="tw-flex tw-items-center tw-gap-x-3 tw-mt-4">
+          <div className="tw-mt-4 tw-flex tw-items-center tw-gap-x-3">
             <Link
               href={`/${drop.author.handle}`}
               onClick={(e) => e.stopPropagation()}
-              className="tw-block tw-flex-shrink-0 desktop-hover:group-hover:tw-opacity-90 tw-transition-opacity"
+              className="tw-block tw-flex-shrink-0 tw-transition-opacity desktop-hover:group-hover:tw-opacity-90"
             >
               {drop.author.pfp ? (
                 <img
@@ -129,10 +127,10 @@ export const MemesWaveWinnerDropSmall = memo<MemesWaveWinnerDropSmallProps>(
                     ImageScale.W_AUTO_H_50
                   )}
                   alt={`${drop.author.handle}'s profile`}
-                  className="tw-size-7 tw-rounded-lg tw-ring-1 tw-ring-white/10 tw-object-cover"
+                  className="tw-size-7 tw-rounded-lg tw-object-cover tw-ring-1 tw-ring-white/10"
                 />
               ) : (
-                <div className="tw-size-7 tw-rounded-lg tw-ring-1 tw-ring-white/10 tw-bg-iron-800" />
+                <div className="tw-size-7 tw-rounded-lg tw-bg-iron-800 tw-ring-1 tw-ring-white/10" />
               )}
             </Link>
 
@@ -143,22 +141,22 @@ export const MemesWaveWinnerDropSmall = memo<MemesWaveWinnerDropSmallProps>(
                 <Link
                   href={`/${drop.author.handle}`}
                   onClick={(e) => e.stopPropagation()}
-                  className="tw-no-underline tw-truncate desktop-hover:hover:tw-underline"
+                  className="tw-truncate tw-no-underline desktop-hover:hover:tw-underline"
                 >
-                  <span className="tw-text-sm tw-font-semibold tw-text-iron-200 desktop-hover:hover:tw-text-opacity-80 tw-transition-colors">
+                  <span className="tw-text-sm tw-font-semibold tw-text-iron-200 tw-transition-colors desktop-hover:hover:tw-text-opacity-80">
                     {drop.author.handle}
                   </span>
                 </Link>
               </UserProfileTooltipWrapper>
-              <span className="tw-size-[3px] tw-bg-iron-600 tw-rounded-full tw-flex-shrink-0"></span>
+              <span className="tw-size-[3px] tw-flex-shrink-0 tw-rounded-full tw-bg-iron-600"></span>
               <WaveDropTime timestamp={drop.created_at} />
             </div>
           </div>
 
           <div className="tw-ml-10">
             <DropContentSmall drop={drop} onDropClick={onDropClick} />
-            <div className="tw-mt-2 tw-relative">
-              <WaveWinnersSmallOutcome drop={drop} wave={wave} />
+            <div className="tw-relative tw-mt-2">
+              <WaveWinnersSmallOutcome drop={drop} />
             </div>
           </div>
         </div>
diff --git a/components/waves/winners/WaveWinnerItemSmall.tsx b/components/waves/winners/WaveWinnerItemSmall.tsx
index ccb48b7fb9..8500033716 100644
--- a/components/waves/winners/WaveWinnerItemSmall.tsx
+++ b/components/waves/winners/WaveWinnerItemSmall.tsx
@@ -21,7 +21,6 @@ export const WaveWinnerItemSmall = memo<WaveWinnerItemSmallProps>(
         <MemesWaveWinnerDropSmall
           drop={drop}
           onDropClick={onDropClick}
-          wave={wave}
           rank={rank}
         />
       );
@@ -30,7 +29,6 @@ export const WaveWinnerItemSmall = memo<WaveWinnerItemSmallProps>(
         <DefaultWaveWinnerDropSmall
           drop={drop}
           onDropClick={onDropClick}
-          wave={wave}
           rank={rank}
         />
       );
diff --git a/components/waves/winners/WaveWinnersSmallOutcome.tsx b/components/waves/winners/WaveWinnersSmallOutcome.tsx
index feac02ba60..9493cb18af 100644
--- a/components/waves/winners/WaveWinnersSmallOutcome.tsx
+++ b/components/waves/winners/WaveWinnersSmallOutcome.tsx
@@ -2,19 +2,17 @@
 
 import React, { useState, useEffect } from "react";
 import { Tooltip } from "react-tooltip";
-import { ApiWave } from "@/generated/models/ApiWave";
 import { ExtendedDrop } from "@/helpers/waves/drop.helpers";
-import { useDropOutcomes } from "@/hooks/drops/useDropOutcomes";
 import { formatNumberWithCommas } from "@/helpers/Helpers";
+import { useWaveRankReward } from "@/hooks/waves/useWaveRankReward";
 
 interface WaveWinnersSmallOutcomeProps {
   readonly drop: ExtendedDrop;
-  readonly wave: ApiWave;
 }
 
 export const WaveWinnersSmallOutcome: React.FC<
   WaveWinnersSmallOutcomeProps
-> = ({ drop, wave }) => {
+> = ({ drop }) => {
   const [isTouch, setIsTouch] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
 
@@ -29,92 +27,81 @@ export const WaveWinnersSmallOutcome: React.FC<
     }
   };
 
-  const {
-    outcomes: { nicOutcomes, repOutcomes, manualOutcomes },
-    haveOutcomes,
-  } = useDropOutcomes({
-    drop,
-    wave,
+  const { nicTotal, repTotal, manualOutcomes } = useWaveRankReward({
+    waveId: drop.wave.id,
+    rank: drop.rank,
   });
 
-  if (!haveOutcomes) {
+  if (!(nicTotal || repTotal || manualOutcomes.length)) {
     return null;
   }
 
   const tooltipContent = (
-    <div className="tw-p-3.5 tw-space-y-3 lg:tw-min-w-[220px] tw-backdrop-blur-xl tw-bg-iron-900/95 tw-border tw-border-iron-800/60 tw-rounded-xl tw-shadow-[0_8px_32px_rgba(0,0,0,0.35)]">
+    <div className="tw-space-y-3 tw-rounded-xl tw-border tw-border-iron-800/60 tw-bg-iron-900/95 tw-p-3.5 tw-shadow-[0_8px_32px_rgba(0,0,0,0.35)] tw-backdrop-blur-xl lg:tw-min-w-[220px]">
       <div className="tw-space-y-2.5">
         <span className="tw-text-xs tw-font-medium tw-text-iron-400">
           Outcome Details
         </span>
         <div className="tw-space-y-2">
-          {nicOutcomes.map((nicOutcome) => (
-            <div
-              key={`NIC-${nicOutcome.value}`}
-              className="tw-flex tw-items-center tw-justify-between tw-p-2 tw-rounded-lg tw-bg-iron-800/40">
+          <div className="tw-flex tw-items-center tw-justify-between tw-rounded-lg tw-bg-iron-800/40 tw-p-2">
+            <div className="tw-flex tw-items-center tw-gap-2">
+              <svg
+                className="tw-size-4 tw-flex-shrink-0 tw-text-[#A4C2DB]"
+                viewBox="0 0 24 24"
+                aria-hidden="true"
+                fill="none"
+              >
+                <path
+                  d="M9 6.75H15M9 12H15M9 17.25H12M3.75 19.5H20.25C21.0784 19.5 21.75 18.8284 21.75 18V6C21.75 5.17157 21.0784 4.5 20.25 4.5H3.75C2.92157 4.5 2.25 5.17157 2.25 6V18C2.25 18.8284 2.92157 19.5 3.75 19.5Z"
+                  stroke="currentColor"
+                  strokeWidth="1.5"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                />
+              </svg>
+              <span className="tw-text-sm tw-font-medium tw-text-iron-200">
+                NIC
+              </span>
+            </div>
+            <span className="tw-text-sm tw-font-semibold tw-text-[#A4C2DB]">
+              {formatNumberWithCommas(nicTotal)}
+            </span>
+          </div>
+
+          <div className="tw-flex tw-flex-col tw-gap-y-1 tw-rounded-lg tw-bg-iron-800/40 tw-p-2">
+            <div className="tw-flex tw-items-center tw-justify-between">
               <div className="tw-flex tw-items-center tw-gap-2">
                 <svg
-                  className="tw-size-4 tw-text-[#A4C2DB] tw-flex-shrink-0"
+                  className="tw-size-4 tw-flex-shrink-0 tw-text-[#C3B5D9]"
                   viewBox="0 0 24 24"
                   aria-hidden="true"
-                  fill="none">
+                  fill="none"
+                >
                   <path
-                    d="M9 6.75H15M9 12H15M9 17.25H12M3.75 19.5H20.25C21.0784 19.5 21.75 18.8284 21.75 18V6C21.75 5.17157 21.0784 4.5 20.25 4.5H3.75C2.92157 4.5 2.25 5.17157 2.25 6V18C2.25 18.8284 2.92157 19.5 3.75 19.5Z"
+                    d="M11.48 3.499a.562.562 0 011.04 0l2.125 5.111a.563.563 0 00.475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 00-.182.557l1.285 5.385a.562.562 0 01-.84.61l-4.725-2.885a.563.563 0 00-.586 0L6.982 20.54a.562.562 0 01-.84-.61l1.285-5.386a.562.562 0 00-.182-.557l-4.204-3.602a.563.563 0 01.321-.988l5.518-.442a.563.563 0 00.475-.345L11.48 3.5z"
                     stroke="currentColor"
                     strokeWidth="1.5"
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
                   />
                 </svg>
                 <span className="tw-text-sm tw-font-medium tw-text-iron-200">
-                  NIC
-                </span>
-              </div>
-              <span className="tw-text-sm tw-font-semibold tw-text-[#A4C2DB]">
-                {formatNumberWithCommas(nicOutcome.value)}
-              </span>
-            </div>
-          ))}
-          {repOutcomes.map((repOutcome) => (
-            <div
-              key={`REP-${repOutcome.category}-${repOutcome.value}`}
-              className="tw-p-2 tw-flex tw-flex-col tw-gap-y-1 tw-rounded-lg tw-bg-iron-800/40">
-              <div className="tw-flex tw-items-center tw-justify-between">
-                <div className="tw-flex tw-items-center tw-gap-2">
-                  <svg
-                    className="tw-size-4 tw-text-[#C3B5D9] tw-flex-shrink-0"
-                    viewBox="0 0 24 24"
-                    aria-hidden="true"
-                    fill="none">
-                    <path
-                      d="M11.48 3.499a.562.562 0 011.04 0l2.125 5.111a.563.563 0 00.475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 00-.182.557l1.285 5.385a.562.562 0 01-.84.61l-4.725-2.885a.563.563 0 00-.586 0L6.982 20.54a.562.562 0 01-.84-.61l1.285-5.386a.562.562 0 00-.182-.557l-4.204-3.602a.563.563 0 01.321-.988l5.518-.442a.563.563 0 00.475-.345L11.48 3.5z"
-                      stroke="currentColor"
-                      strokeWidth="1.5"
-                    />
-                  </svg>
-                  <span className="tw-text-sm tw-font-medium tw-text-iron-200">
-                    Rep
-                  </span>
-                </div>
-                <span className="tw-text-sm tw-font-semibold tw-text-[#C3B5D9]">
-                  {formatNumberWithCommas(repOutcome.value)}
+                  Rep
                 </span>
               </div>
               <span className="tw-text-sm tw-font-semibold tw-text-[#C3B5D9]">
-                {repOutcome.category}
+                {formatNumberWithCommas(repTotal)}
               </span>
             </div>
-          ))}
+          </div>
+
           {manualOutcomes.map((outcome) => (
-            <div
-              key={`MANUAL-${outcome.description}`}
-              className="tw-flex tw-items-center tw-justify-between tw-p-2 tw-rounded-lg tw-bg-iron-800/40">
+            <div key={`manual-${outcome}`} className="tw-flex tw-items-center tw-justify-between tw-rounded-lg tw-bg-iron-800/40 tw-p-2">
               <div className="tw-flex tw-items-center tw-gap-2">
                 <svg
-                  className="tw-size-4 tw-text-[#D4C5AA] tw-flex-shrink-0"
+                  className="tw-size-4 tw-flex-shrink-0 tw-text-[#D4C5AA]"
                   viewBox="0 0 24 24"
                   aria-hidden="true"
-                  fill="none">
+                  fill="none"
+                >
                   <path
                     d="M12 18v-3m0-3v.01M12.75 3.25h-1.5L8.5 7H4.75l.5 3.5L2 13l3.25 2.5-.5 3.5h3.75l2.75 3.75h1.5L15.5 19h3.75l-.5-3.5L22 13l-3.25-2.5.5-3.5H15.5l-2.75-3.75z"
                     stroke="currentColor"
@@ -124,7 +111,7 @@ export const WaveWinnersSmallOutcome: React.FC<
                   />
                 </svg>
                 <span className="tw-text-sm tw-font-medium tw-text-iron-200">
-                  {outcome.description}
+                  {outcome}
                 </span>
               </div>
             </div>
@@ -141,19 +128,20 @@ export const WaveWinnersSmallOutcome: React.FC<
           e.stopPropagation();
           handleClick(e);
         }}
-        className="tw-border-0 tw-rounded-lg tw-flex tw-items-center tw-gap-2 tw-min-w-6 tw-py-1.5 tw-px-2 tw-bg-iron-800 tw-ring-1 tw-ring-iron-700"
+        className="tw-flex tw-min-w-6 tw-items-center tw-gap-2 tw-rounded-lg tw-border-0 tw-bg-iron-800 tw-px-2 tw-py-1.5 tw-ring-1 tw-ring-iron-700"
         data-tooltip-id={`outcome-small-${drop.id}`}
       >
         <span className="tw-text-xs tw-font-normal tw-text-iron-200">
           Outcome:
         </span>
         <div className="tw-flex tw-items-center tw-gap-2">
-          {!!nicOutcomes.length && (
+          {!!nicTotal && (
             <svg
-              className="tw-size-4 tw-text-[#A4C2DB] tw-flex-shrink-0"
+              className="tw-size-4 tw-flex-shrink-0 tw-text-[#A4C2DB]"
               viewBox="0 0 24 24"
               aria-hidden="true"
-              fill="none">
+              fill="none"
+            >
               <path
                 d="M9 6.75H15M9 12H15M9 17.25H12M3.75 19.5H20.25C21.0784 19.5 21.75 18.8284 21.75 18V6C21.75 5.17157 21.0784 4.5 20.25 4.5H3.75C2.92157 4.5 2.25 5.17157 2.25 6V18C2.25 18.8284 2.92157 19.5 3.75 19.5Z"
                 stroke="currentColor"
@@ -163,12 +151,13 @@ export const WaveWinnersSmallOutcome: React.FC<
               />
             </svg>
           )}
-          {!!repOutcomes.length && (
+          {!!repTotal && (
             <svg
-              className="tw-size-4 tw-text-[#C3B5D9] tw-flex-shrink-0"
+              className="tw-size-4 tw-flex-shrink-0 tw-text-[#C3B5D9]"
               viewBox="0 0 24 24"
               aria-hidden="true"
-              fill="none">
+              fill="none"
+            >
               <path
                 d="M11.48 3.499a.562.562 0 011.04 0l2.125 5.111a.563.563 0 00.475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 00-.182.557l1.285 5.385a.562.562 0 01-.84.61l-4.725-2.885a.563.563 0 00-.586 0L6.982 20.54a.562.562 0 01-.84-.61l1.285-5.386a.562.562 0 00-.182-.557l-4.204-3.602a.563.563 0 01.321-.988l5.518-.442a.563.563 0 00.475-.345L11.48 3.5z"
                 stroke="currentColor"
@@ -178,10 +167,11 @@ export const WaveWinnersSmallOutcome: React.FC<
           )}
           {!!manualOutcomes.length && (
             <svg
-              className="tw-size-4 tw-text-[#D4C5AA] tw-flex-shrink-0"
+              className="tw-size-4 tw-flex-shrink-0 tw-text-[#D4C5AA]"
               viewBox="0 0 24 24"
               aria-hidden="true"
-              fill="none">
+              fill="none"
+            >
               <path
                 d="M12 18v-3m0-3v.01M12.75 3.25h-1.5L8.5 7H4.75l.5 3.5L2 13l3.25 2.5-.5 3.5h3.75l2.75 3.75h1.5L15.5 19h3.75l-.5-3.5L22 13l-3.25-2.5.5-3.5H15.5l-2.75-3.75z"
                 stroke="currentColor"
diff --git a/components/waves/winners/drops/header/WaveWinnersDropOutcome.tsx b/components/waves/winners/drops/header/WaveWinnersDropOutcome.tsx
index 0168300537..c96fc6f21d 100644
--- a/components/waves/winners/drops/header/WaveWinnersDropOutcome.tsx
+++ b/components/waves/winners/drops/header/WaveWinnersDropOutcome.tsx
@@ -2,7 +2,6 @@ import { formatNumberWithCommas } from "@/helpers/Helpers";
 import { ApiWaveDecisionWinner } from "@/generated/models/ApiWaveDecisionWinner";
 import { ApiWaveOutcomeCredit } from "@/generated/models/ApiWaveOutcomeCredit";
 import { ApiWaveOutcomeType } from "@/generated/models/ApiWaveOutcomeType";
-import { OutcomeType } from "@/hooks/drops/useDropOutcomes";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faAddressCard, faStar } from "@fortawesome/free-regular-svg-icons";
 import { faAward } from "@fortawesome/free-solid-svg-icons";
@@ -23,7 +22,7 @@ export default function WaveWinnersDropOutcome({
         award.amount > 0
     )
     .map((award) => ({
-      type: OutcomeType.NIC as const,
+      type: ApiWaveOutcomeCredit.Cic as const,
       value: award.amount ?? 0,
     }));
 
@@ -35,7 +34,7 @@ export default function WaveWinnersDropOutcome({
         award.amount > 0
     )
     .map((award) => ({
-      type: OutcomeType.REP as const,
+      type: ApiWaveOutcomeCredit.Rep as const,
       value: award.amount ?? 0,
       category: award.rep_category ?? "",
     }));
@@ -45,7 +44,7 @@ export default function WaveWinnersDropOutcome({
       (award) => award.type === ApiWaveOutcomeType.Manual && award.description
     )
     .map((award) => ({
-      type: OutcomeType.MANUAL as const,
+      type: ApiWaveOutcomeType.Manual as const,
       description: award.description ?? "",
     }));
 
diff --git a/components/waves/winners/podium/WavePodiumItemContentOutcomes.tsx b/components/waves/winners/podium/WavePodiumItemContentOutcomes.tsx
index 5a615cb6b5..d188df1afb 100644
--- a/components/waves/winners/podium/WavePodiumItemContentOutcomes.tsx
+++ b/components/waves/winners/podium/WavePodiumItemContentOutcomes.tsx
@@ -6,7 +6,6 @@ import { ApiWaveDecisionWinner } from "@/generated/models/ApiWaveDecisionWinner"
 import { ApiWaveOutcomeCredit } from "@/generated/models/ApiWaveOutcomeCredit";
 import { ApiWaveOutcomeType } from "@/generated/models/ApiWaveOutcomeType";
 import { formatNumberWithCommas } from "@/helpers/Helpers";
-import { OutcomeType } from "@/hooks/drops/useDropOutcomes";
 
 interface WavePodiumItemContentOutcomesProps {
   readonly winner: ApiWaveDecisionWinner;
@@ -40,7 +39,7 @@ export const WavePodiumItemContentOutcomes: React.FC<
             award.amount > 0
         )
         .map((award) => ({
-          type: OutcomeType.NIC as const,
+          type: ApiWaveOutcomeCredit.Cic,
           value: award.amount || 0,
         }));
 
@@ -52,7 +51,7 @@ export const WavePodiumItemContentOutcomes: React.FC<
             award.amount > 0
         )
         .map((award) => ({
-          type: OutcomeType.REP as const,
+          type: ApiWaveOutcomeCredit.Rep,
           value: award.amount ?? 0,
           category: award.rep_category ?? "",
         }));
@@ -63,7 +62,7 @@ export const WavePodiumItemContentOutcomes: React.FC<
             award.type === ApiWaveOutcomeType.Manual && award.description
         )
         .map((award) => ({
-          type: OutcomeType.MANUAL as const,
+          type: ApiWaveOutcomeType.Manual,
           description: award.description,
         }));
 
@@ -78,7 +77,7 @@ export const WavePodiumItemContentOutcomes: React.FC<
   }
 
   const tooltipContent = (
-    <div className="tw-p-3.5 tw-space-y-3 lg:tw-min-w-[220px] tw-backdrop-blur-xl tw-bg-iron-900/95 tw-border tw-border-iron-800/60 tw-rounded-xl tw-shadow-[0_8px_32px_rgba(0,0,0,0.35)]">
+    <div className="tw-space-y-3 tw-rounded-xl tw-border tw-border-iron-800/60 tw-bg-iron-900/95 tw-p-3.5 tw-shadow-[0_8px_32px_rgba(0,0,0,0.35)] tw-backdrop-blur-xl lg:tw-min-w-[220px]">
       <div className="tw-space-y-2.5">
         <span className="tw-text-xs tw-font-medium tw-text-iron-400">
           Outcome Details
@@ -87,13 +86,15 @@ export const WavePodiumItemContentOutcomes: React.FC<
           {nicOutcomes.map((nicOutcome) => (
             <div
               key={`NIC-${nicOutcome.value}`}
-              className="tw-flex tw-items-center tw-justify-between tw-p-2 tw-rounded-lg tw-bg-iron-800/40">
+              className="tw-flex tw-items-center tw-justify-between tw-rounded-lg tw-bg-iron-800/40 tw-p-2"
+            >
               <div className="tw-flex tw-items-center tw-gap-2">
                 <svg
-                  className="tw-size-4 tw-text-[#A4C2DB] tw-flex-shrink-0"
+                  className="tw-size-4 tw-flex-shrink-0 tw-text-[#A4C2DB]"
                   viewBox="0 0 24 24"
                   aria-hidden="true"
-                  fill="none">
+                  fill="none"
+                >
                   <path
                     d="M9 6.75H15M9 12H15M9 17.25H12M3.75 19.5H20.25C21.0784 19.5 21.75 18.8284 21.75 18V6C21.75 5.17157 21.0784 4.5 20.25 4.5H3.75C2.92157 4.5 2.25 5.17157 2.25 6V18C2.25 18.8284 2.92157 19.5 3.75 19.5Z"
                     stroke="currentColor"
@@ -114,14 +115,16 @@ export const WavePodiumItemContentOutcomes: React.FC<
           {repOutcomes.map((repOutcome) => (
             <div
               key={`REP-${repOutcome.category}-${repOutcome.value}`}
-              className="tw-p-2 tw-flex tw-flex-col tw-gap-y-1 tw-rounded-lg tw-bg-iron-800/40">
+              className="tw-flex tw-flex-col tw-gap-y-1 tw-rounded-lg tw-bg-iron-800/40 tw-p-2"
+            >
               <div className="tw-flex tw-items-center tw-justify-between">
                 <div className="tw-flex tw-items-center tw-gap-2">
                   <svg
-                    className="tw-size-4 tw-text-[#C3B5D9] tw-flex-shrink-0"
+                    className="tw-size-4 tw-flex-shrink-0 tw-text-[#C3B5D9]"
                     viewBox="0 0 24 24"
                     aria-hidden="true"
-                    fill="none">
+                    fill="none"
+                  >
                     <path
                       d="M11.48 3.499a.562.562 0 011.04 0l2.125 5.111a.563.563 0 00.475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 00-.182.557l1.285 5.385a.562.562 0 01-.84.61l-4.725-2.885a.563.563 0 00-.586 0L6.982 20.54a.562.562 0 01-.84-.61l1.285-5.386a.562.562 0 00-.182-.557l-4.204-3.602a.563.563 0 01.321-.988l5.518-.442a.563.563 0 00.475-.345L11.48 3.5z"
                       stroke="currentColor"
@@ -144,13 +147,15 @@ export const WavePodiumItemContentOutcomes: React.FC<
           {manualOutcomes.map((outcome) => (
             <div
               key={`MANUAL-${outcome.description}`}
-              className="tw-flex tw-items-center tw-justify-between tw-p-2 tw-rounded-lg tw-bg-iron-800/40">
+              className="tw-flex tw-items-center tw-justify-between tw-rounded-lg tw-bg-iron-800/40 tw-p-2"
+            >
               <div className="tw-flex tw-items-center tw-gap-2">
                 <svg
-                  className="tw-size-4 tw-text-[#D4C5AA] tw-flex-shrink-0"
+                  className="tw-size-4 tw-flex-shrink-0 tw-text-[#D4C5AA]"
                   viewBox="0 0 24 24"
                   aria-hidden="true"
-                  fill="none">
+                  fill="none"
+                >
                   <path
                     d="M12 18v-3m0-3v.01M12.75 3.25h-1.5L8.5 7H4.75l.5 3.5L2 13l3.25 2.5-.5 3.5h3.75l2.75 3.75h1.5L15.5 19h3.75l-.5-3.5L22 13l-3.25-2.5.5-3.5H15.5l-2.75-3.75z"
                     stroke="currentColor"
@@ -178,20 +183,21 @@ export const WavePodiumItemContentOutcomes: React.FC<
           e.stopPropagation();
           handleClick(e);
         }}
-        className="tw-transition-all tw-duration-200 tw-flex tw-items-center tw-gap-2 tw-px-3 tw-py-1.5 tw-rounded-xl tw-bg-iron-800/40 tw-backdrop-blur-sm tw-border tw-border-solid tw-border-iron-700/20 hover:tw-bg-iron-800/60 hover:tw-border-iron-700/40 hover:tw-shadow-lg"
+        className="tw-flex tw-items-center tw-gap-2 tw-rounded-xl tw-border tw-border-solid tw-border-iron-700/20 tw-bg-iron-800/40 tw-px-3 tw-py-1.5 tw-backdrop-blur-sm tw-transition-all tw-duration-200 hover:tw-border-iron-700/40 hover:tw-bg-iron-800/60 hover:tw-shadow-lg"
         data-tooltip-id={`outcome-${winner.place}-${winner.drop.id}`}
       >
-        <span className="tw-text-sm tw-font-medium tw-text-iron-300 tw-hidden md:tw-block">
+        <span className="tw-hidden tw-text-sm tw-font-medium tw-text-iron-300 md:tw-block">
           Outcome
         </span>
         <div className="tw-flex tw-items-center tw-gap-1.5">
           {!!nicOutcomes.length && (
-            <div className="tw-flex tw-items-center tw-justify-center tw-size-5 tw-rounded-full tw-bg-[#A4C2DB]/10">
+            <div className="tw-flex tw-size-5 tw-items-center tw-justify-center tw-rounded-full tw-bg-[#A4C2DB]/10">
               <svg
                 className="tw-size-3.5 tw-text-[#A4C2DB]"
                 viewBox="0 0 24 24"
                 aria-hidden="true"
-                fill="none">
+                fill="none"
+              >
                 <path
                   d="M9 6.75H15M9 12H15M9 17.25H12M3.75 19.5H20.25C21.0784 19.5 21.75 18.8284 21.75 18V6C21.75 5.17157 21.0784 4.5 20.25 4.5H3.75C2.92157 4.5 2.25 5.17157 2.25 6V18C2.25 18.8284 2.92157 19.5 3.75 19.5Z"
                   stroke="currentColor"
@@ -203,12 +209,13 @@ export const WavePodiumItemContentOutcomes: React.FC<
             </div>
           )}
           {!!repOutcomes.length && (
-            <div className="tw-flex tw-items-center tw-justify-center tw-size-5 tw-rounded-full tw-bg-[#C3B5D9]/10">
+            <div className="tw-flex tw-size-5 tw-items-center tw-justify-center tw-rounded-full tw-bg-[#C3B5D9]/10">
               <svg
                 className="tw-size-3.5 tw-text-[#C3B5D9]"
                 viewBox="0 0 24 24"
                 aria-hidden="true"
-                fill="none">
+                fill="none"
+              >
                 <path
                   d="M11.48 3.499a.562.562 0 011.04 0l2.125 5.111a.563.563 0 00.475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 00-.182.557l1.285 5.385a.562.562 0 01-.84.61l-4.725-2.885a.563.563 0 00-.586 0L6.982 20.54a.562.562 0 01-.84-.61l1.285-5.386a.562.562 0 00-.182-.557l-4.204-3.602a.563.563 0 01.321-.988l5.518-.442a.563.563 0 00.475-.345L11.48 3.5z"
                   stroke="currentColor"
@@ -218,12 +225,13 @@ export const WavePodiumItemContentOutcomes: React.FC<
             </div>
           )}
           {!!manualOutcomes.length && (
-            <div className="tw-flex tw-items-center tw-justify-center tw-size-5 tw-rounded-full tw-bg-[#D4C5AA]/10">
+            <div className="tw-flex tw-size-5 tw-items-center tw-justify-center tw-rounded-full tw-bg-[#D4C5AA]/10">
               <svg
                 className="tw-size-3.5 tw-text-[#D4C5AA]"
                 viewBox="0 0 24 24"
                 aria-hidden="true"
-                fill="none">
+                fill="none"
+              >
                 <path
                   d="M12 18v-3m0-3v.01M12.75 3.25h-1.5L8.5 7H4.75l.5 3.5L2 13l3.25 2.5-.5 3.5h3.75l2.75 3.75h1.5L15.5 19h3.75l-.5-3.5L22 13l-3.25-2.5.5-3.5H15.5l-2.75-3.75z"
                   stroke="currentColor"
diff --git a/hooks/drops/useDropOutcomes.tsx b/hooks/drops/useDropOutcomes.tsx
deleted file mode 100644
index 6792eea6c5..0000000000
--- a/hooks/drops/useDropOutcomes.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { ApiDrop } from "@/generated/models/ApiDrop";
-import { ApiWave } from "@/generated/models/ApiWave";
-import { ApiWaveOutcomeCredit } from "@/generated/models/ApiWaveOutcomeCredit";
-import { ApiWaveOutcomeType } from "@/generated/models/ApiWaveOutcomeType";
-
-export enum OutcomeType {
-  NIC = "NIC",
-  REP = "REP",
-  MANUAL = "MANUAL",
-}
-
-interface NICOutcome {
-  type: OutcomeType.NIC;
-  value: number;
-}
-
-interface REPOutcome {
-  type: OutcomeType.REP;
-  value: number;
-  category: string;
-}
-
-interface ManualOutcome {
-  type: OutcomeType.MANUAL;
-  description: string;
-}
-
-interface DropOutcomes {
-  outcomes: {
-    nicOutcomes: NICOutcome[];
-    repOutcomes: REPOutcome[];
-    manualOutcomes: ManualOutcome[];
-  };
-  haveOutcomes: boolean;
-}
-
-interface DropOutcomesInput {
-  readonly drop: ApiDrop;
-  readonly wave: ApiWave;
-}
-
-export function useDropOutcomes({
-  drop,
-  wave,
-}: DropOutcomesInput): DropOutcomes {
-  const rank = drop.rank;
-  if (!rank || !wave?.outcomes) {
-    return {
-      outcomes: { nicOutcomes: [], repOutcomes: [], manualOutcomes: [] },
-      haveOutcomes: false,
-    };
-  }
-
-  const nicOutcomes = wave.outcomes
-    .filter((outcome) => outcome.credit === ApiWaveOutcomeCredit.Cic)
-    .map((outcome) => ({
-      type: OutcomeType.NIC as const,
-      value: outcome.distribution?.[rank - 1]?.amount ?? 0,
-    }))
-    .filter((outcome) => outcome.value > 0);
-
-  const repOutcomes = wave.outcomes
-    .filter((outcome) => outcome.credit === ApiWaveOutcomeCredit.Rep)
-    .map((outcome) => ({
-      type: OutcomeType.REP as const,
-      value: outcome.distribution?.[rank - 1]?.amount ?? 0,
-      category: outcome.rep_category ?? "",
-    }))
-    .filter((outcome) => outcome.value > 0);
-
-  const manualOutcomes = wave.outcomes
-    .filter((outcome) => outcome.type === ApiWaveOutcomeType.Manual)
-    .map((outcome) => ({
-      type: OutcomeType.MANUAL as const,
-      description: outcome.distribution?.[rank - 1]?.description ?? "",
-    }))
-    .filter((outcome) => outcome.description !== "");
-
-  const outcomes = { nicOutcomes, repOutcomes, manualOutcomes };
-  const haveOutcomes =
-    !!nicOutcomes.length || !!repOutcomes.length || !!manualOutcomes.length;
-  return {
-    outcomes,
-    haveOutcomes,
-  };
-}
diff --git a/hooks/waves/useWaveRankReward.ts b/hooks/waves/useWaveRankReward.ts
index df1a2848bb..91096af687 100644
--- a/hooks/waves/useWaveRankReward.ts
+++ b/hooks/waves/useWaveRankReward.ts
@@ -61,8 +61,8 @@ export function useWaveRankReward({
       nicTotal: 0,
       repTotal: 0,
       manualOutcomes: [],
-      isLoading: false
-    }
+      isLoading: false,
+    };
   }
 
   let nicTotal = 0;
@@ -72,7 +72,7 @@ export function useWaveRankReward({
   outcomes.forEach((outcome, i) => {
     const query = distributionQueries[i];
     if (query?.data?.data) {
-      const item = query.data.data.find((d) => d.index === targetIndex);
+      const item = query.data.data.find((d) => d.index - 1 === targetIndex);
       if (item?.amount) {
         if (outcome.credit === ApiWaveOutcomeCredit.Cic) {
           nicTotal += item.amount;
diff --git a/package-lock.json b/package-lock.json
index 8f9c5294f7..9a5475a658 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30007,6 +30007,7 @@
       "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "~0.27.0",
         "get-tsconfig": "^4.7.5"
@@ -30028,6 +30029,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30044,6 +30046,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30060,6 +30063,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30076,6 +30080,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30092,6 +30097,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30108,6 +30114,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30124,6 +30131,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30140,6 +30148,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30156,6 +30165,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30172,6 +30182,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30188,6 +30199,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30204,6 +30216,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30220,6 +30233,7 @@
       "cpu": [
         "mips64el"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30236,6 +30250,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30252,6 +30267,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30268,6 +30284,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30284,6 +30301,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30300,6 +30318,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30316,6 +30335,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30332,6 +30352,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30348,6 +30369,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30364,6 +30386,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30380,6 +30403,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30396,6 +30420,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30412,6 +30437,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -30428,6 +30454,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [