From 122550a238999bb6d79d25326e5411db4f6cf9ed Mon Sep 17 00:00:00 2001
From: roaring30s <okaaycrypto@gmail.com>
Date: Thu, 29 Jan 2026 11:11:43 -0500
Subject: [PATCH 1/2] feat: add useDelegationReview hook

---
 components/DelegatingWidget/Footer.tsx        | 12 +++-
 components/DelegationReview/index.tsx         | 31 +++++++++++
 components/Redelegate/index.tsx               | 10 +++-
 .../RedelegateFromUndelegated/index.tsx       | 17 +++++-
 components/StakeTransactions/index.tsx        | 14 ++++-
 components/WithdrawStake/index.tsx            | 10 +++-
 hooks/index.tsx                               |  1 +
 hooks/useDelegationReview.tsx                 | 55 +++++++++++++++++++
 8 files changed, 144 insertions(+), 6 deletions(-)
 create mode 100644 components/DelegationReview/index.tsx
 create mode 100644 hooks/useDelegationReview.tsx

diff --git a/components/DelegatingWidget/Footer.tsx b/components/DelegatingWidget/Footer.tsx
index 7b542a4d..3cafcd5f 100644
--- a/components/DelegatingWidget/Footer.tsx
+++ b/components/DelegatingWidget/Footer.tsx
@@ -12,13 +12,14 @@ import {
   useAccountAddress,
   useAccountBalanceData,
   usePendingFeesAndStakeData,
+  useDelegationReview,
 } from "hooks";
 import { useMemo } from "react";
-import { parseEther } from "viem";
-
+import DelegationReview from "../DelegationReview";
 import Delegate from "./Delegate";
 import Footnote from "./Footnote";
 import Undelegate from "./Undelegate";
+import { parseEther } from "viem";
 
 type FooterData = {
   isTransferStake: boolean;
@@ -78,6 +79,11 @@ const Footer = ({
     () => getDelegatorStatus(delegator, currentRound),
     [currentRound, delegator]
   );
+  const { warnings } = useDelegationReview({
+    action: action || "delegate",
+    delegator,
+    currentRound,
+  });
   const stakeWei = useMemo(
     () =>
       delegatorPendingStakeAndFees?.pendingStake
@@ -161,6 +167,7 @@ const Footer = ({
   if (action === "delegate") {
     return (
       <Box css={{ ...css }}>
+        <DelegationReview warnings={warnings} />
         <Delegate
           to={transcoder?.id}
           amount={amount}
@@ -180,6 +187,7 @@ const Footer = ({
   }
   return (
     <Box css={{ ...css }}>
+      <DelegationReview warnings={warnings} />
       <Undelegate
         amount={amount}
         newPosPrev={newPosPrev}
diff --git a/components/DelegationReview/index.tsx b/components/DelegationReview/index.tsx
new file mode 100644
index 00000000..8145beae
--- /dev/null
+++ b/components/DelegationReview/index.tsx
@@ -0,0 +1,31 @@
+import { Box, Flex, Text } from "@livepeer/design-system";
+import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
+
+const DelegationReview = ({ warnings }: { warnings: string[] }) => {
+  if (!warnings || warnings.length === 0) return null;
+
+  return (
+    <Box css={{ marginBottom: "$3" }}>
+      {warnings.map((warning, i) => (
+        <Flex
+          key={i}
+          css={{
+            alignItems: "center",
+            gap: "$2",
+            color: "$yellow11",
+            backgroundColor: "$yellow3",
+            border: "1px solid $yellow7",
+            borderRadius: "$2",
+            padding: "$2",
+            fontSize: "$2",
+          }}
+        >
+          <ExclamationTriangleIcon />
+          <Text css={{ color: "inherit", fontSize: "inherit" }}>{warning}</Text>
+        </Flex>
+      ))}
+    </Box>
+  );
+};
+
+export default DelegationReview;
diff --git a/components/Redelegate/index.tsx b/components/Redelegate/index.tsx
index 40945c7f..12e34a1c 100644
--- a/components/Redelegate/index.tsx
+++ b/components/Redelegate/index.tsx
@@ -2,9 +2,16 @@ import { bondingManager } from "@lib/api/abis/main/BondingManager";
 import { Button } from "@livepeer/design-system";
 import { useBondingManagerAddress } from "hooks/useContracts";
 import { useHandleTransaction } from "hooks/useHandleTransaction";
+import { useDelegationReview } from "hooks/useDelegationReview";
+import DelegationReview from "@components/DelegationReview";
 import { useSimulateContract, useWriteContract } from "wagmi";
 
-const Index = ({ unbondingLockId, newPosPrev, newPosNext }) => {
+const Index = ({ unbondingLockId, newPosPrev, newPosNext, delegator, currentRound }) => {
+  const { warnings } = useDelegationReview({
+    action: "transfer",
+    delegator,
+    currentRound,
+  });
   const { data: bondingManagerAddress } = useBondingManagerAddress();
 
   const { data: config } = useSimulateContract({
@@ -24,6 +31,7 @@ const Index = ({ unbondingLockId, newPosPrev, newPosNext }) => {
 
   return (
     <>
+      <DelegationReview warnings={warnings} />
       <Button
         css={{
           marginRight: "$3",
diff --git a/components/RedelegateFromUndelegated/index.tsx b/components/RedelegateFromUndelegated/index.tsx
index 66d2191d..7dd7ab3f 100644
--- a/components/RedelegateFromUndelegated/index.tsx
+++ b/components/RedelegateFromUndelegated/index.tsx
@@ -3,9 +3,23 @@ import { Button } from "@livepeer/design-system";
 import { useAccountAddress } from "hooks";
 import { useBondingManagerAddress } from "hooks/useContracts";
 import { useHandleTransaction } from "hooks/useHandleTransaction";
+import { useDelegationReview } from "hooks/useDelegationReview";
+import DelegationReview from "../DelegationReview";
 import { useSimulateContract, useWriteContract } from "wagmi";
 
-const Index = ({ unbondingLockId, delegate, newPosPrev, newPosNext }) => {
+const Index = ({
+  unbondingLockId,
+  delegate,
+  newPosPrev,
+  newPosNext,
+  delegator,
+  currentRound,
+}) => {
+  const { warnings } = useDelegationReview({
+    action: "transfer",
+    delegator,
+    currentRound,
+  });
   const accountAddress = useAccountAddress();
 
   const { data: bondingManagerAddress } = useBondingManagerAddress();
@@ -39,6 +53,7 @@ const Index = ({ unbondingLockId, delegate, newPosPrev, newPosNext }) => {
 
   return (
     <>
+      <DelegationReview warnings={warnings} />
       <Button
         css={{
           marginRight: "$3",
diff --git a/components/StakeTransactions/index.tsx b/components/StakeTransactions/index.tsx
index 85661fca..bc4fa498 100644
--- a/components/StakeTransactions/index.tsx
+++ b/components/StakeTransactions/index.tsx
@@ -111,6 +111,8 @@ const Index = ({ delegator, transcoders, currentRound, isMyAccount }) => {
                             unbondingLockId={lock.unbondingLockId}
                             newPosPrev={newPosPrev}
                             newPosNext={newPosNext}
+                            delegator={delegator}
+                            currentRound={currentRound}
                           />
                         ) : (
                           <RedelegateFromUndelegated
@@ -118,6 +120,8 @@ const Index = ({ delegator, transcoders, currentRound, isMyAccount }) => {
                             delegate={lock.delegate.id}
                             newPosPrev={newPosPrev}
                             newPosNext={newPosNext}
+                              delegator={delegator}
+                              currentRound={currentRound}
                           />
                         )}
                       </Flex>
@@ -221,6 +225,8 @@ const Index = ({ delegator, transcoders, currentRound, isMyAccount }) => {
                             unbondingLockId={lock.unbondingLockId}
                             newPosPrev={newPosPrev}
                             newPosNext={newPosNext}
+                            delegator={delegator}
+                            currentRound={currentRound}
                           />
                         ) : (
                           <RedelegateFromUndelegated
@@ -228,9 +234,15 @@ const Index = ({ delegator, transcoders, currentRound, isMyAccount }) => {
                             delegate={lock.delegate.id}
                             newPosPrev={newPosPrev}
                             newPosNext={newPosNext}
+                              delegator={delegator}
+                              currentRound={currentRound}
                           />
                         )}
-                        <WithdrawStake unbondingLockId={lock.unbondingLockId} />
+                        <WithdrawStake
+                          unbondingLockId={lock.unbondingLockId}
+                          delegator={delegator}
+                          currentRound={currentRound}
+                        />
                       </Flex>
                     )}
                     <Box
diff --git a/components/WithdrawStake/index.tsx b/components/WithdrawStake/index.tsx
index 83698646..27208a31 100644
--- a/components/WithdrawStake/index.tsx
+++ b/components/WithdrawStake/index.tsx
@@ -4,10 +4,17 @@ import { useAccountAddress } from "hooks";
 import { useBondingManagerAddress } from "hooks/useContracts";
 import { useHandleTransaction } from "hooks/useHandleTransaction";
 import { useSimulateContract, useWriteContract } from "wagmi";
+import { useDelegationReview } from "hooks/useDelegationReview";
+import DelegationReview from "@components/DelegationReview";
 
-const Index = ({ unbondingLockId }) => {
+const Index = ({ unbondingLockId, delegator, currentRound }) => {
   const accountAddress = useAccountAddress();
 
+  const { warnings } = useDelegationReview({
+    action: "undelegate",
+    delegator,
+    currentRound,
+  });
   const { data: bondingManagerAddress } = useBondingManagerAddress();
 
   const { data: config } = useSimulateContract({
@@ -29,6 +36,7 @@ const Index = ({ unbondingLockId }) => {
 
   return (
     <>
+      <DelegationReview warnings={warnings} />
       <Button
         css={{
           paddingTop: "$2",
diff --git a/hooks/index.tsx b/hooks/index.tsx
index 9d37f82c..0df3a15e 100644
--- a/hooks/index.tsx
+++ b/hooks/index.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from "react";
 
 // DO NOT IMPORT useHandleTransaction due to @rainbow-me/rainbowkit issues with SSR
+export * from "./useDelegationReview";
 export * from "./useExplorerStore";
 export * from "./useSwr";
 export * from "./wallet";
diff --git a/hooks/useDelegationReview.tsx b/hooks/useDelegationReview.tsx
new file mode 100644
index 00000000..2a597ce6
--- /dev/null
+++ b/hooks/useDelegationReview.tsx
@@ -0,0 +1,55 @@
+import { AccountQueryResult } from "apollo";
+import { useMemo } from "react";
+
+type Delegator = NonNullable<AccountQueryResult["data"]>["delegator"];
+type CurrentRound = NonNullable<
+  NonNullable<AccountQueryResult["data"]>["protocol"]
+>["currentRound"];
+
+export const useDelegationReview = ({
+  action,
+  delegator,
+  currentRound,
+}: {
+  action: "delegate" | "undelegate" | "transfer";
+  delegator?: Delegator | null;
+  currentRound?: CurrentRound | null;
+}) => {
+  const warnings = useMemo(() => {
+    const list: string[] = [];
+
+    // Safety check
+    if (!delegator || !currentRound) return list;
+
+    const isDelegated =
+      delegator?.bondedAmount && delegator?.bondedAmount !== "0";
+
+    const lastClaimRound = delegator?.lastClaimRound?.id
+      ? parseInt(delegator.lastClaimRound.id, 10)
+      : 0;
+
+    // Handle currentRound being an object or number. Types suggest it's likely an object with ID.
+    const currentRoundNum = currentRound?.id
+      ? parseInt(currentRound.id, 10)
+      : 0;
+
+    // Logic: Warn ONLY if lastClaimRound == currentRound
+    const isCurrentRoundClaim = lastClaimRound === currentRoundNum;
+
+    if (
+      isDelegated &&
+      (action === "undelegate" || action === "transfer") &&
+      isCurrentRoundClaim
+    ) {
+      list.push(
+        "You will lose all rewards for the current round if you proceed."
+      );
+    }
+
+    return list;
+  }, [action, delegator, currentRound]);
+
+  return {
+    warnings,
+  };
+};

From 0afde3c751f3f1b128b1d009217224d7bb0dfd70 Mon Sep 17 00:00:00 2001
From: roaring30s <okaaycrypto@gmail.com>
Date: Sat, 31 Jan 2026 18:50:34 -0500
Subject: [PATCH 2/2] feat: add delegation warnings

---
 apollo/subgraph.ts                            |  5 +-
 components/DelegatingView/index.tsx           | 40 +++++++----
 components/DelegatingWidget/Footer.tsx        | 35 +++++++---
 components/DelegationReview/index.tsx         | 45 ++++++------
 components/Redelegate/index.tsx               | 49 +++++++++----
 .../RedelegateFromUndelegated/index.tsx       | 43 +++++++++---
 components/StakeTransactions/index.tsx        | 22 +++---
 components/WithdrawStake/index.tsx            | 10 +--
 hooks/useDelegationReview.tsx                 | 70 ++++++++++++-------
 queries/account.graphql                       |  3 +
 10 files changed, 206 insertions(+), 116 deletions(-)

diff --git a/apollo/subgraph.ts b/apollo/subgraph.ts
index 388763d3..a5225991 100644
--- a/apollo/subgraph.ts
+++ b/apollo/subgraph.ts
@@ -9569,7 +9569,7 @@ export type AccountQueryVariables = Exact<{
 }>;
 
 
-export type AccountQuery = { __typename: 'Query', delegator?: { __typename: 'Delegator', id: string, bondedAmount: string, principal: string, unbonded: string, withdrawnFees: string, startRound: string, lastClaimRound?: { __typename: 'Round', id: string } | null, unbondingLocks?: Array<{ __typename: 'UnbondingLock', id: string, amount: string, unbondingLockId: number, withdrawRound: string, delegate: { __typename: 'Transcoder', id: string } }> | null, delegate?: { __typename: 'Transcoder', id: string, active: boolean, status: TranscoderStatus, totalStake: string } | null } | null, transcoder?: { __typename: 'Transcoder', id: string, active: boolean, feeShare: string, rewardCut: string, status: TranscoderStatus, totalStake: string, totalVolumeETH: string, activationTimestamp: number, activationRound: string, deactivationRound: string, thirtyDayVolumeETH: string, ninetyDayVolumeETH: string, lastRewardRound?: { __typename: 'Round', id: string } | null, pools?: Array<{ __typename: 'Pool', rewardTokens?: string | null }> | null, delegators?: Array<{ __typename: 'Delegator', id: string }> | null } | null, protocol?: { __typename: 'Protocol', id: string, totalSupply: string, totalActiveStake: string, participationRate: string, inflation: string, inflationChange: string, lptPriceEth: string, roundLength: string, currentRound: { __typename: 'Round', id: string } } | null };
+export type AccountQuery = { __typename: 'Query', delegator?: { __typename: 'Delegator', id: string, bondedAmount: string, principal: string, unbonded: string, withdrawnFees: string, startRound: string, lastClaimRound?: { __typename: 'Round', id: string } | null, unbondingLocks?: Array<{ __typename: 'UnbondingLock', id: string, amount: string, unbondingLockId: number, withdrawRound: string, delegate: { __typename: 'Transcoder', id: string } }> | null, delegate?: { __typename: 'Transcoder', id: string, active: boolean, status: TranscoderStatus, totalStake: string, lastRewardRound?: { __typename: 'Round', id: string } | null } | null } | null, transcoder?: { __typename: 'Transcoder', id: string, active: boolean, feeShare: string, rewardCut: string, status: TranscoderStatus, totalStake: string, totalVolumeETH: string, activationTimestamp: number, activationRound: string, deactivationRound: string, thirtyDayVolumeETH: string, ninetyDayVolumeETH: string, lastRewardRound?: { __typename: 'Round', id: string } | null, pools?: Array<{ __typename: 'Pool', rewardTokens?: string | null }> | null, delegators?: Array<{ __typename: 'Delegator', id: string }> | null } | null, protocol?: { __typename: 'Protocol', id: string, totalSupply: string, totalActiveStake: string, participationRate: string, inflation: string, inflationChange: string, lptPriceEth: string, roundLength: string, currentRound: { __typename: 'Round', id: string } } | null };
 
 export type AccountInactiveQueryVariables = Exact<{
   id: Scalars['ID'];
@@ -9701,6 +9701,9 @@ export const AccountDocument = gql`
       active
       status
       totalStake
+      lastRewardRound {
+        id
+      }
     }
   }
   transcoder(id: $account) {
diff --git a/components/DelegatingView/index.tsx b/components/DelegatingView/index.tsx
index 0f32a1b9..9d72b55c 100644
--- a/components/DelegatingView/index.tsx
+++ b/components/DelegatingView/index.tsx
@@ -7,6 +7,7 @@ import { QuestionMarkCircledIcon } from "@modulz/radix-icons";
 import { AccountQueryResult, OrchestratorsSortedQueryResult } from "apollo";
 import {
   useAccountAddress,
+  useDelegationReview,
   useEnsData,
   usePendingFeesAndStakeData,
 } from "hooks";
@@ -20,6 +21,7 @@ import Masonry from "react-masonry-css";
 import { Address } from "viem";
 import { useSimulateContract, useWriteContract } from "wagmi";
 
+import DelegationReview from "../DelegationReview";
 import StakeTransactions from "../StakeTransactions";
 
 const breakpointColumnsObj = {
@@ -49,6 +51,12 @@ const Index = ({ delegator, transcoders, protocol, currentRound }: Props) => {
 
   const pendingFeesAndStake = usePendingFeesAndStakeData(delegator?.id);
 
+  const { delegationWarning } = useDelegationReview({
+    delegator,
+    currentRound,
+    action: "withdrawFees",
+  });
+
   const recipient = delegator?.id as Address | undefined;
   const amount = pendingFeesAndStake?.pendingFees ?? "0";
 
@@ -357,18 +365,26 @@ const Index = ({ delegator, transcoders, protocol, currentRound }: Props) => {
                 </Text>
               </Flex>
               {isMyAccount && !withdrawButtonDisabled && delegator?.id && (
-                <Button
-                  css={{
-                    marginTop: "$3",
-                    width: "100%",
-                  }}
-                  disabled={!config}
-                  onClick={() => config && writeContract(config.request)}
-                  size="4"
-                  variant="primary"
-                >
-                  Withdraw Pending Fees
-                </Button>
+                <>
+                  <Button
+                    css={{
+                      marginTop: "$3",
+                      width: "100%",
+                    }}
+                    disabled={!config}
+                    onClick={() => config && writeContract(config.request)}
+                    size="4"
+                    variant="primary"
+                  >
+                    Withdraw Pending Fees
+                  </Button>
+                  {delegationWarning && (
+                    <DelegationReview
+                      warning={delegationWarning}
+                      css={{ marginTop: "$3" }}
+                    />
+                  )}
+                </>
               )}
             </Box>
           }
diff --git a/components/DelegatingWidget/Footer.tsx b/components/DelegatingWidget/Footer.tsx
index 3cafcd5f..dd281e5a 100644
--- a/components/DelegatingWidget/Footer.tsx
+++ b/components/DelegatingWidget/Footer.tsx
@@ -11,15 +11,16 @@ import {
   StakingAction,
   useAccountAddress,
   useAccountBalanceData,
-  usePendingFeesAndStakeData,
   useDelegationReview,
+  usePendingFeesAndStakeData,
 } from "hooks";
 import { useMemo } from "react";
+import { parseEther } from "viem";
+
 import DelegationReview from "../DelegationReview";
 import Delegate from "./Delegate";
 import Footnote from "./Footnote";
 import Undelegate from "./Undelegate";
-import { parseEther } from "viem";
 
 type FooterData = {
   isTransferStake: boolean;
@@ -70,19 +71,21 @@ const Footer = ({
   );
   const accountBalance = useAccountBalanceData(accountAddress);
 
-  const tokenBalance = useMemo(() => accountBalance?.balance, [accountBalance]);
-  const transferAllowance = useMemo(
-    () => accountBalance?.allowance,
-    [accountBalance]
-  );
+  const tokenBalance = accountBalance?.balance;
+  const transferAllowance = accountBalance?.allowance;
   const delegatorStatus = useMemo(
     () => getDelegatorStatus(delegator, currentRound),
     [currentRound, delegator]
   );
-  const { warnings } = useDelegationReview({
-    action: action || "delegate",
+  const { delegationWarning } = useDelegationReview({
     delegator,
     currentRound,
+    action: isTransferStake
+      ? "moveStake"
+      : action === "delegate"
+      ? "delegate"
+      : "undelegate",
+    targetOrchestrator: action === "delegate" ? transcoder : undefined,
   });
   const stakeWei = useMemo(
     () =>
@@ -167,7 +170,6 @@ const Footer = ({
   if (action === "delegate") {
     return (
       <Box css={{ ...css }}>
-        <DelegationReview warnings={warnings} />
         <Delegate
           to={transcoder?.id}
           amount={amount}
@@ -182,12 +184,17 @@ const Footer = ({
             currDelegateNewPosNext: currDelegateNewPosNext,
           }}
         />
+        {delegationWarning && (isTransferStake || amount) && (
+          <DelegationReview
+            warning={delegationWarning}
+            css={{ marginTop: "$3" }}
+          />
+        )}
       </Box>
     );
   }
   return (
     <Box css={{ ...css }}>
-      <DelegationReview warnings={warnings} />
       <Undelegate
         amount={amount}
         newPosPrev={newPosPrev}
@@ -202,6 +209,12 @@ const Footer = ({
         sufficientStake,
         isMyTranscoder
       )}
+      {delegationWarning && amount && (
+        <DelegationReview
+          warning={delegationWarning}
+          css={{ marginTop: "$3" }}
+        />
+      )}
     </Box>
   );
 };
diff --git a/components/DelegationReview/index.tsx b/components/DelegationReview/index.tsx
index 8145beae..4a632579 100644
--- a/components/DelegationReview/index.tsx
+++ b/components/DelegationReview/index.tsx
@@ -1,29 +1,32 @@
 import { Box, Flex, Text } from "@livepeer/design-system";
 import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
 
-const DelegationReview = ({ warnings }: { warnings: string[] }) => {
-  if (!warnings || warnings.length === 0) return null;
+const DelegationReview = ({
+  warning,
+  css,
+}: {
+  warning?: string | null;
+  css?: object;
+}) => {
+  if (!warning) return null;
 
   return (
-    <Box css={{ marginBottom: "$3" }}>
-      {warnings.map((warning, i) => (
-        <Flex
-          key={i}
-          css={{
-            alignItems: "center",
-            gap: "$2",
-            color: "$yellow11",
-            backgroundColor: "$yellow3",
-            border: "1px solid $yellow7",
-            borderRadius: "$2",
-            padding: "$2",
-            fontSize: "$2",
-          }}
-        >
-          <ExclamationTriangleIcon />
-          <Text css={{ color: "inherit", fontSize: "inherit" }}>{warning}</Text>
-        </Flex>
-      ))}
+    <Box css={{ marginBottom: "$3", ...css }}>
+      <Flex
+        css={{
+          alignItems: "center",
+          gap: "$2",
+          color: "$yellow11",
+          backgroundColor: "$yellow3",
+          border: "1px solid $yellow7",
+          borderRadius: "$2",
+          padding: "$2",
+          fontSize: "$2",
+        }}
+      >
+        <ExclamationTriangleIcon width={28} height={28} />
+        <Text css={{ color: "inherit", fontSize: "inherit" }}>{warning}</Text>
+      </Flex>
     </Box>
   );
 };
diff --git a/components/Redelegate/index.tsx b/components/Redelegate/index.tsx
index 12e34a1c..e63723bb 100644
--- a/components/Redelegate/index.tsx
+++ b/components/Redelegate/index.tsx
@@ -1,16 +1,23 @@
+import { ExplorerTooltip } from "@components/ExplorerTooltip";
 import { bondingManager } from "@lib/api/abis/main/BondingManager";
-import { Button } from "@livepeer/design-system";
+import { Box, Button, Flex } from "@livepeer/design-system";
+import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
 import { useBondingManagerAddress } from "hooks/useContracts";
-import { useHandleTransaction } from "hooks/useHandleTransaction";
 import { useDelegationReview } from "hooks/useDelegationReview";
-import DelegationReview from "@components/DelegationReview";
+import { useHandleTransaction } from "hooks/useHandleTransaction";
 import { useSimulateContract, useWriteContract } from "wagmi";
 
-const Index = ({ unbondingLockId, newPosPrev, newPosNext, delegator, currentRound }) => {
-  const { warnings } = useDelegationReview({
-    action: "transfer",
+const Index = ({
+  unbondingLockId,
+  newPosPrev,
+  newPosNext,
+  delegator,
+  currentRound,
+}) => {
+  const { delegationWarning } = useDelegationReview({
     delegator,
     currentRound,
+    action: "redelegate",
   });
   const { data: bondingManagerAddress } = useBondingManagerAddress();
 
@@ -30,14 +37,32 @@ const Index = ({ unbondingLockId, newPosPrev, newPosNext, delegator, currentRoun
   });
 
   return (
-    <>
-      <DelegationReview warnings={warnings} />
+    <Flex
+      css={{
+        gap: "$2",
+        alignItems: "center",
+        flexDirection: "row-reverse",
+        "@bp2": {
+          flexDirection: "row",
+        },
+      }}
+    >
+      {delegationWarning && (
+        <ExplorerTooltip content={delegationWarning} multiline>
+          <Box
+            css={{
+              display: "inline-flex",
+              color: "$yellow11",
+            }}
+          >
+            <ExclamationTriangleIcon width={18} height={18} />
+          </Box>
+        </ExplorerTooltip>
+      )}
       <Button
         css={{
-          marginRight: "$3",
-          width: "100%",
           "@bp2": {
-            width: "auto",
+            marginRight: "$3",
           },
         }}
         disabled={!config}
@@ -47,7 +72,7 @@ const Index = ({ unbondingLockId, newPosPrev, newPosNext, delegator, currentRoun
       >
         Redelegate
       </Button>
-    </>
+    </Flex>
   );
 };
 
diff --git a/components/RedelegateFromUndelegated/index.tsx b/components/RedelegateFromUndelegated/index.tsx
index 7dd7ab3f..cbf09bb2 100644
--- a/components/RedelegateFromUndelegated/index.tsx
+++ b/components/RedelegateFromUndelegated/index.tsx
@@ -1,12 +1,14 @@
 import { bondingManager } from "@lib/api/abis/main/BondingManager";
-import { Button } from "@livepeer/design-system";
+import { Box, Button, Flex } from "@livepeer/design-system";
+import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
 import { useAccountAddress } from "hooks";
 import { useBondingManagerAddress } from "hooks/useContracts";
-import { useHandleTransaction } from "hooks/useHandleTransaction";
 import { useDelegationReview } from "hooks/useDelegationReview";
-import DelegationReview from "../DelegationReview";
+import { useHandleTransaction } from "hooks/useHandleTransaction";
 import { useSimulateContract, useWriteContract } from "wagmi";
 
+import { ExplorerTooltip } from "../ExplorerTooltip";
+
 const Index = ({
   unbondingLockId,
   delegate,
@@ -15,10 +17,10 @@ const Index = ({
   delegator,
   currentRound,
 }) => {
-  const { warnings } = useDelegationReview({
-    action: "transfer",
+  const { delegationWarning } = useDelegationReview({
     delegator,
     currentRound,
+    action: "redelegateFromUndelegated",
   });
   const accountAddress = useAccountAddress();
 
@@ -52,14 +54,20 @@ const Index = ({
   }
 
   return (
-    <>
-      <DelegationReview warnings={warnings} />
+    <Flex
+      css={{
+        gap: "$2",
+        alignItems: "center",
+        flexDirection: "row-reverse",
+        "@bp2": {
+          flexDirection: "row",
+        },
+      }}
+    >
       <Button
         css={{
-          marginRight: "$3",
-          width: "100%",
           "@bp2": {
-            width: "auto",
+            marginRight: "$3",
           },
         }}
         disabled={!config}
@@ -69,7 +77,20 @@ const Index = ({
       >
         Redelegate
       </Button>
-    </>
+      {delegationWarning && (
+        <ExplorerTooltip content={delegationWarning} multiline>
+          <Box
+            css={{
+              display: "inline-flex",
+              color: "$yellow11",
+              cursor: "help",
+            }}
+          >
+            <ExclamationTriangleIcon width={18} height={18} />
+          </Box>
+        </ExplorerTooltip>
+      )}
+    </Flex>
   );
 };
 
diff --git a/components/StakeTransactions/index.tsx b/components/StakeTransactions/index.tsx
index bc4fa498..1d737c7c 100644
--- a/components/StakeTransactions/index.tsx
+++ b/components/StakeTransactions/index.tsx
@@ -120,19 +120,19 @@ const Index = ({ delegator, transcoders, currentRound, isMyAccount }) => {
                             delegate={lock.delegate.id}
                             newPosPrev={newPosPrev}
                             newPosNext={newPosNext}
-                              delegator={delegator}
-                              currentRound={currentRound}
+                            delegator={delegator}
+                            currentRound={currentRound}
                           />
                         )}
                       </Flex>
                     )}
                     <Box
                       css={{
-                        alignSelf: "flex-end",
+                        alignSelf: "flex-start",
                         fontWeight: 700,
                         marginTop: "$1",
                         "@bp2": {
-                          alignSelf: "auto",
+                          alignSelf: "center",
                           fontWeight: 400,
                           marginLeft: "$4",
                           marginTop: 0,
@@ -234,24 +234,20 @@ const Index = ({ delegator, transcoders, currentRound, isMyAccount }) => {
                             delegate={lock.delegate.id}
                             newPosPrev={newPosPrev}
                             newPosNext={newPosNext}
-                              delegator={delegator}
-                              currentRound={currentRound}
+                            delegator={delegator}
+                            currentRound={currentRound}
                           />
                         )}
-                        <WithdrawStake
-                          unbondingLockId={lock.unbondingLockId}
-                          delegator={delegator}
-                          currentRound={currentRound}
-                        />
+                        <WithdrawStake unbondingLockId={lock.unbondingLockId} />
                       </Flex>
                     )}
                     <Box
                       css={{
-                        alignSelf: "flex-end",
+                        alignSelf: "flex-start",
                         fontWeight: 700,
                         marginTop: "$1",
                         "@bp2": {
-                          alignSelf: "auto",
+                          alignSelf: "flex-end",
                           fontWeight: 400,
                           marginLeft: "$4",
                           marginTop: 0,
diff --git a/components/WithdrawStake/index.tsx b/components/WithdrawStake/index.tsx
index 27208a31..83698646 100644
--- a/components/WithdrawStake/index.tsx
+++ b/components/WithdrawStake/index.tsx
@@ -4,17 +4,10 @@ import { useAccountAddress } from "hooks";
 import { useBondingManagerAddress } from "hooks/useContracts";
 import { useHandleTransaction } from "hooks/useHandleTransaction";
 import { useSimulateContract, useWriteContract } from "wagmi";
-import { useDelegationReview } from "hooks/useDelegationReview";
-import DelegationReview from "@components/DelegationReview";
 
-const Index = ({ unbondingLockId, delegator, currentRound }) => {
+const Index = ({ unbondingLockId }) => {
   const accountAddress = useAccountAddress();
 
-  const { warnings } = useDelegationReview({
-    action: "undelegate",
-    delegator,
-    currentRound,
-  });
   const { data: bondingManagerAddress } = useBondingManagerAddress();
 
   const { data: config } = useSimulateContract({
@@ -36,7 +29,6 @@ const Index = ({ unbondingLockId, delegator, currentRound }) => {
 
   return (
     <>
-      <DelegationReview warnings={warnings} />
       <Button
         css={{
           paddingTop: "$2",
diff --git a/hooks/useDelegationReview.tsx b/hooks/useDelegationReview.tsx
index 2a597ce6..f46a8216 100644
--- a/hooks/useDelegationReview.tsx
+++ b/hooks/useDelegationReview.tsx
@@ -6,50 +6,68 @@ type CurrentRound = NonNullable<
   NonNullable<AccountQueryResult["data"]>["protocol"]
 >["currentRound"];
 
+type DelegationAction =
+  | "delegate"
+  | "undelegate"
+  | "moveStake"
+  | "redelegate"
+  | "redelegateFromUndelegated"
+  | "withdrawFees";
+
 export const useDelegationReview = ({
-  action,
   delegator,
   currentRound,
+  action,
+  targetOrchestrator,
 }: {
-  action: "delegate" | "undelegate" | "transfer";
   delegator?: Delegator | null;
   currentRound?: CurrentRound | null;
+  action: DelegationAction;
+  targetOrchestrator?: { lastRewardRound?: { id: string } | null } | null;
 }) => {
-  const warnings = useMemo(() => {
-    const list: string[] = [];
-
+  const delegationWarning = useMemo(() => {
     // Safety check
-    if (!delegator || !currentRound) return list;
+    if (!delegator || !currentRound) {
+      return null;
+    }
 
     const isDelegated =
-      delegator?.bondedAmount && delegator?.bondedAmount !== "0";
+      delegator.bondedAmount && delegator.bondedAmount !== "0";
 
-    const lastClaimRound = delegator?.lastClaimRound?.id
-      ? parseInt(delegator.lastClaimRound.id, 10)
+    // Get orchestrator's last reward round
+    // Use targetOrchestrator if provided (for moving stake), otherwise use current delegate
+    const orchestratorToCheck = targetOrchestrator || delegator.delegate;
+    const orchestratorLastRewardRound = orchestratorToCheck?.lastRewardRound?.id
+      ? parseInt(orchestratorToCheck.lastRewardRound.id, 10)
       : 0;
 
-    // Handle currentRound being an object or number. Types suggest it's likely an object with ID.
-    const currentRoundNum = currentRound?.id
-      ? parseInt(currentRound.id, 10)
-      : 0;
-
-    // Logic: Warn ONLY if lastClaimRound == currentRound
-    const isCurrentRoundClaim = lastClaimRound === currentRoundNum;
+    const currentRoundNum = currentRound.id ? parseInt(currentRound.id, 10) : 0;
 
-    if (
+    // Per LIP-36: Warn if orchestrator hasn't called reward() yet this round
+    // This affects bond(), unbond(), rebond(), rebondFromUnbonded(), and withdrawFees()
+    // Only warn if we have valid delegate data to avoid false positives
+    const orchestratorHasntCalledReward =
       isDelegated &&
-      (action === "undelegate" || action === "transfer") &&
-      isCurrentRoundClaim
-    ) {
-      list.push(
-        "You will lose all rewards for the current round if you proceed."
-      );
+      orchestratorToCheck?.lastRewardRound?.id &&
+      orchestratorLastRewardRound < currentRoundNum;
+
+    if (!orchestratorHasntCalledReward) {
+      return null;
     }
 
-    return list;
-  }, [action, delegator, currentRound]);
+    // Action-specific warning messages
+    switch (action) {
+      case "redelegate":
+        return "Rebonding will forfeit rewards and fees for the current round on your entire stake.";
+      case "moveStake":
+      case "redelegateFromUndelegated":
+        return "Moving stake to a different orchestrator will forfeit rewards and fees for the current round.";
+      default:
+        return "Performing this action before your orchestrator calls reward will forfeit rewards and fees for the current round.";
+    }
+  }, [delegator, currentRound, action, targetOrchestrator]);
 
   return {
-    warnings,
+    delegationWarning,
   };
 };
diff --git a/queries/account.graphql b/queries/account.graphql
index 39104fd2..311950fc 100644
--- a/queries/account.graphql
+++ b/queries/account.graphql
@@ -23,6 +23,9 @@ query account($account: ID!) {
       active
       status
       totalStake
+      lastRewardRound {
+        id
+      }
     }
   }
   transcoder(id: $account) {