diff --git a/app/home/HomePage.tsx b/app/home/HomePage.tsx
index 3676ad88..aa9c2801 100644
--- a/app/home/HomePage.tsx
+++ b/app/home/HomePage.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import React, { useState, useEffect } from 'react';
+import { useAccount } from 'wagmi';
 import PrimaryButton from '@/components/common/PrimaryButton';
 import Footer from '@/components/layout/footer/Footer';
 import backgroundImage from '@/imgs/bg/bg.png';
@@ -16,6 +17,8 @@ export default function HomePage() {
     return () => clearInterval(interval);
   }, []);
 
+  const { address } = useAccount();
+
   return (
     <div className="flex min-h-screen flex-col bg-primary">
       <div
@@ -49,7 +52,7 @@ export default function HomePage() {
           <PrimaryButton isSecondary href="/info">
             Why Monarch
           </PrimaryButton>
-          <PrimaryButton href="/markets">View Markets</PrimaryButton>
+          <PrimaryButton href={`/positions/${address ?? ''}`}>View Portfolio</PrimaryButton>
         </div>
       </div>
       <Footer />
diff --git a/app/layout.tsx b/app/layout.tsx
index 5a90b55f..a84da744 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -33,7 +33,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
             {children}
             <RiskNotificationModal />
           </OnchainProviders>
-          <ToastContainer position="bottom-right" />
+          <ToastContainer position="bottom-right" bodyClassName="font-zen" />
         </Providers>
       </body>
       <GoogleAnalytics />
diff --git a/app/markets/components/RiskIndicator.tsx b/app/markets/components/RiskIndicator.tsx
index 50714821..dd08c618 100644
--- a/app/markets/components/RiskIndicator.tsx
+++ b/app/markets/components/RiskIndicator.tsx
@@ -1,5 +1,5 @@
 import { Tooltip } from '@nextui-org/tooltip';
-import { Market } from '@/utils/types';
+import { WarningWithDetail } from '@/utils/types';
 import { WarningCategory } from '@/utils/types';
 
 type RiskFlagProps = {
@@ -22,57 +22,93 @@ export function RiskIndicator({ level, description }: RiskFlagProps) {
 export function RiskIndicatorFromWarning({
   market,
   category,
-  greeDescription,
+  greenDescription,
   yellowDescription,
   redDescription,
+  isBatched = false,
 }: {
-  market: Market;
+  market: { warningsWithDetail: WarningWithDetail[] };
   category: WarningCategory;
-  greeDescription: string;
+  greenDescription: string;
   yellowDescription: string;
   redDescription: string;
+  isBatched?: boolean;
 }) {
   const warnings = market.warningsWithDetail.filter((w) => w.category === category);
   if (warnings.length === 0) {
-    return <RiskIndicator level="green" description={greeDescription} />;
+    return <RiskIndicator level="green" description={greenDescription} />;
   }
   if (warnings.some((warning) => warning.level === 'alert')) {
-    return <RiskIndicator level="red" description={redDescription} />;
-  } else return <RiskIndicator level="yellow" description={yellowDescription} />;
+    return (
+      <RiskIndicator
+        level="red"
+        description={isBatched ? `One or more markets have: ${redDescription}` : redDescription}
+      />
+    );
+  } else
+    return (
+      <RiskIndicator
+        level="yellow"
+        description={
+          isBatched ? `One or more markets have: ${yellowDescription}` : yellowDescription
+        }
+      />
+    );
 }
 
-export function MarketAssetIndicator({ market }: { market: Market }) {
+export function MarketAssetIndicator({
+  market,
+  isBatched = false,
+}: {
+  market: { warningsWithDetail: WarningWithDetail[] };
+  isBatched?: boolean;
+}) {
   return (
     <RiskIndicatorFromWarning
       market={market}
       category={WarningCategory.asset}
-      greeDescription="Recognized assets"
+      greenDescription="Recognized assets"
       yellowDescription="Some warnings flagged with the assets"
       redDescription="Potentially dangerous assets"
+      isBatched={isBatched}
     />
   );
 }
 
-export function MarketOracleIndicator({ market }: { market: Market }) {
+export function MarketOracleIndicator({
+  market,
+  isBatched = false,
+}: {
+  market: { warningsWithDetail: WarningWithDetail[] };
+  isBatched?: boolean;
+}) {
   return (
     <RiskIndicatorFromWarning
       market={market}
       category={WarningCategory.oracle}
-      greeDescription="Recognized oracles"
+      greenDescription="Recognized oracles"
       yellowDescription="Some warnings flagged with the oracle"
       redDescription="Some alerts flagged with the oracle"
+      isBatched={isBatched}
     />
   );
 }
 
-export function MarketDebtIndicator({ market }: { market: Market }) {
+export function MarketDebtIndicator({
+  market,
+  isBatched = false,
+}: {
+  market: { warningsWithDetail: WarningWithDetail[] };
+  isBatched?: boolean;
+}) {
   return (
     <RiskIndicatorFromWarning
       market={market}
       category={WarningCategory.debt}
-      greeDescription="No bad debt"
+      greenDescription="No bad debt"
       yellowDescription="Bad debt has occurred"
       redDescription="Bad debt higher than 1% of supply"
+      isBatched={isBatched}
     />
   );
 }
diff --git a/app/positions/components/PositionsContent.tsx b/app/positions/components/PositionsContent.tsx
index e0f267e5..b952b5b1 100644
--- a/app/positions/components/PositionsContent.tsx
+++ b/app/positions/components/PositionsContent.tsx
@@ -28,7 +28,7 @@ export default function Positions() {
       <Header />
       <div className="container gap-8" style={{ padding: '0 5%' }}>
         <div className="flex items-center justify-between pb-4">
-          <h1 className="flex items-center gap-2 py-4 font-zen text-2xl">Your Supplies</h1>
+          <h1 className="flex items-center gap-2 py-4 font-zen text-2xl">Portfolio</h1>
           <div className="flex gap-4">
             <Link href={`/history/${account}`}>
               <button
diff --git a/app/positions/components/PositionsSummaryTable.tsx b/app/positions/components/PositionsSummaryTable.tsx
index 1b2c73db..9e912ddb 100644
--- a/app/positions/components/PositionsSummaryTable.tsx
+++ b/app/positions/components/PositionsSummaryTable.tsx
@@ -5,11 +5,15 @@ import Image from 'next/image';
 import { GrRefresh } from 'react-icons/gr';
 import { toast } from 'react-toastify';
 import { useAccount } from 'wagmi';
+import { TokenIcon } from '@/components/TokenIcon';
 import { formatReadable, formatBalance } from '@/utils/balance';
 import { getNetworkImg } from '@/utils/networks';
-import { findToken } from '@/utils/tokens';
 import { MarketPosition, GroupedPosition } from '@/utils/types';
-import { getCollateralColor } from '../utils/colors';
+import {
+  MarketAssetIndicator,
+  MarketOracleIndicator,
+  MarketDebtIndicator,
+} from 'app/markets/components/RiskIndicator';
 import { RebalanceModal } from './RebalanceModal';
 import { SuppliedMarketsDetail } from './SuppliedMarketsDetail';
 
@@ -57,19 +61,24 @@ export function PositionsSummaryTable({
           collaterals: [],
           markets: [],
           processedCollaterals: [],
+          allWarnings: [], // Initialize allWarnings as an empty array
         };
         acc.push(groupedPosition);
       }
 
+      groupedPosition.markets.push(position);
+
+      // Combine warnings from all markets
+      groupedPosition.allWarnings = [
+        ...new Set([...groupedPosition.allWarnings, ...position.warningsWithDetail]),
+      ];
+
       const supplyAmount = Number(
         formatBalance(position.supplyAssets, position.market.loanAsset.decimals),
       );
       groupedPosition.totalSupply += supplyAmount;
 
       const weightedApy = supplyAmount * position.market.dailyApys.netSupplyApy;
-      if (!groupedPosition.totalWeightedApy) {
-        groupedPosition.totalWeightedApy = 0;
-      }
       groupedPosition.totalWeightedApy += weightedApy;
 
       const collateralAddress = position.market.collateralAsset?.address;
@@ -90,7 +99,6 @@ export function PositionsSummaryTable({
         }
       }
 
-      groupedPosition.markets.push(position);
       return acc;
     }, []);
   }, [marketPositions]);
@@ -125,6 +133,8 @@ export function PositionsSummaryTable({
     });
   }, [groupedPositions]);
 
+  console.log('processedPositions', processedPositions);
+
   // Update selectedGroupedPosition when groupedPositions change, don't depend on selectedGroupedPosition
   useEffect(() => {
     if (selectedGroupedPosition) {
@@ -162,7 +172,7 @@ export function PositionsSummaryTable({
     <div className="space-y-4 overflow-x-auto">
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-2">
-          <h2 className="text-xl font-semibold">Position Summary</h2>
+          <h2 className="text-xl font-semibold">Your Supply</h2>
           {isRefetching && <Spinner size="sm" />}
         </div>
         <button
@@ -180,10 +190,10 @@ export function PositionsSummaryTable({
           <tr>
             <th className="w-10" />
             <th className="w-10">Network</th>
-            <th>Asset</th>
-            <th>Total Supplied</th>
+            <th>Size</th>
             <th>Avg APY</th>
-            <th className="w-1/4">Collateral Exposure</th>
+            <th>Collateral Exposure</th>
+            <th>Warnings</th>
             <th>Actions</th>
           </tr>
         </thead>
@@ -192,6 +202,7 @@ export function PositionsSummaryTable({
             const rowKey = `${position.loanAssetAddress}-${position.chainId}`;
             const isExpanded = expandedRows.has(rowKey);
             const avgApy = position.totalWeightedApy / position.totalSupply;
+
             return (
               <React.Fragment key={rowKey}>
                 <tr className="cursor-pointer hover:bg-gray-50" onClick={() => toggleRow(rowKey)}>
@@ -208,63 +219,52 @@ export function PositionsSummaryTable({
                       />
                     </div>
                   </td>
-                  <td data-label="Asset">
+                  <td data-label="Size">
                     <div className="flex items-center justify-center gap-2">
-                      {findToken(position.loanAssetAddress, position.chainId)?.img && (
-                        <Image
-                          src={findToken(position.loanAssetAddress, position.chainId)?.img ?? ''}
-                          alt={position.loanAsset}
-                          width={24}
-                          height={24}
-                        />
-                      )}
-                      <span className="font-medium">{position.loanAsset}</span>
-                    </div>
-                  </td>
-                  <td data-label="Total Supplied">
-                    <div className="text-center">
-                      {formatReadable(position.totalSupply)} {position.loanAsset}
+                      <span className="font-medium">{formatReadable(position.totalSupply)}</span>
+                      <span>{position.loanAsset}</span>
+                      <TokenIcon
+                        address={position.loanAssetAddress}
+                        chainId={position.chainId}
+                        width={16}
+                        height={16}
+                      />
                     </div>
                   </td>
                   <td data-label="Avg APY">
                     <div className="text-center">{formatReadable(avgApy * 100)}%</div>
                   </td>
-                  <td data-label="Collateral Breakdown" className="w-1/4">
-                    <div className="flex h-3 w-full overflow-hidden rounded-full bg-secondary">
-                      {position.processedCollaterals.map((collateral, colIndex) => (
-                        <div
-                          key={`${collateral.address}-${colIndex}`}
-                          className="h-full opacity-70"
-                          style={{
-                            width: `${collateral.percentage}%`,
-                            backgroundColor:
-                              collateral.symbol === 'Others'
-                                ? '#A0AEC0'
-                                : getCollateralColor(collateral.address),
-                          }}
-                          title={`${collateral.symbol}: ${collateral.percentage.toFixed(2)}%`}
-                        />
-                      ))}
+                  <td data-label="Collateral Exposure">
+                    <div className="flex items-center justify-center gap-1">
+                      {position.collaterals.length > 0 ? (
+                        position.collaterals.map((collateral, index) => (
+                          <TokenIcon
+                            key={`${collateral.address}-${index}`}
+                            address={collateral.address}
+                            chainId={position.chainId}
+                            width={20}
+                            height={20}
+                          />
+                        ))
+                      ) : (
+                        <span className="text-sm text-gray-500">No known collaterals</span>
+                      )}
                     </div>
-                    <div className="mt-1 flex flex-wrap justify-center text-xs">
-                      {position.processedCollaterals.map((collateral, colIndex) => (
-                        <span
-                          key={`${collateral.address}-${colIndex}`}
-                          className="mb-1 mr-2 opacity-70"
-                        >
-                          <span
-                            style={{
-                              color:
-                                collateral.symbol === 'Others'
-                                  ? '#A0AEC0'
-                                  : getCollateralColor(collateral.address),
-                            }}
-                          >
-                            ■
-                          </span>{' '}
-                          {collateral.symbol}
-                        </span>
-                      ))}
+                  </td>
+                  <td data-label="Warnings" className="align-middle">
+                    <div className="flex items-center justify-center gap-1">
+                      <MarketAssetIndicator
+                        market={{ warningsWithDetail: position.allWarnings }}
+                        isBatched
+                      />
+                      <MarketOracleIndicator
+                        market={{ warningsWithDetail: position.allWarnings }}
+                        isBatched
+                      />
+                      <MarketDebtIndicator
+                        market={{ warningsWithDetail: position.allWarnings }}
+                        isBatched
+                      />
                     </div>
                   </td>
                   <td data-label="Actions" className="text-right">
diff --git a/app/positions/components/SuppliedMarketsDetail.tsx b/app/positions/components/SuppliedMarketsDetail.tsx
index 8d583df3..b2079174 100644
--- a/app/positions/components/SuppliedMarketsDetail.tsx
+++ b/app/positions/components/SuppliedMarketsDetail.tsx
@@ -1,10 +1,12 @@
 import React from 'react';
+import { Tooltip } from '@nextui-org/tooltip';
 import { ExternalLinkIcon } from '@radix-ui/react-icons';
-import Image from 'next/image';
+import { IoWarningOutline } from 'react-icons/io5';
+import { TokenIcon } from '@/components/TokenIcon';
 import { formatReadable, formatBalance } from '@/utils/balance';
 import { getMarketURL } from '@/utils/external';
-import { findToken } from '@/utils/tokens';
-import { MarketPosition, GroupedPosition } from '@/utils/types';
+import { MarketPosition, GroupedPosition, WarningWithDetail, WarningCategory } from '@/utils/types';
+import { getCollateralColor } from '../utils/colors';
 
 type SuppliedMarketsDetailProps = {
   groupedPosition: GroupedPosition;
@@ -12,12 +14,32 @@ type SuppliedMarketsDetailProps = {
   setSelectedPosition: (position: MarketPosition) => void;
 };
 
+function WarningTooltip({ warnings }: { warnings: WarningWithDetail[] }) {
+  return (
+    <div className="p-2 font-zen">
+      {Object.values(WarningCategory).map((category) => {
+        const categoryWarnings = warnings.filter((w) => w.category === category);
+        if (categoryWarnings.length === 0) return null;
+        return (
+          <div key={category} className="mb-2">
+            <h4 className="font-bold capitalize">{category}</h4>
+            <ul className="list-none pl-0">
+              {categoryWarnings.map((warning, index) => (
+                <li key={index}>- {warning.description}</li>
+              ))}
+            </ul>
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
 export function SuppliedMarketsDetail({
   groupedPosition,
   setShowModal,
   setSelectedPosition,
 }: SuppliedMarketsDetailProps) {
-  // Sort markets by supplied size (descending order)
   const sortedMarkets = [...groupedPosition.markets].sort(
     (a, b) =>
       Number(formatBalance(b.supplyAssets, b.market.loanAsset.decimals)) -
@@ -26,63 +48,115 @@ export function SuppliedMarketsDetail({
 
   const totalSupply = groupedPosition.totalSupply;
 
+  const getWarningColor = (warnings: WarningWithDetail[]) => {
+    if (warnings.some((w) => w.level === 'alert')) return 'text-red-500';
+    if (warnings.some((w) => w.level === 'warning')) return 'text-yellow-500';
+    return '';
+  };
+
   return (
-    <div className="bg-secondary px-2 py-4">
+    <div className="bg-secondary bg-opacity-20 p-4">
+      <div className="mb-4 flex items-center justify-center">
+        <div className="my-4 w-1/2">
+          <h3 className="mb-2 text-base font-semibold">Collateral Exposure</h3>
+          <div className="flex h-3 w-full overflow-hidden rounded-full bg-gray-200">
+            {groupedPosition.processedCollaterals.map((collateral, colIndex) => (
+              <div
+                key={`${collateral.address}-${colIndex}`}
+                className="h-full opacity-70"
+                style={{
+                  width: `${collateral.percentage}%`,
+                  backgroundColor:
+                    collateral.symbol === 'Others'
+                      ? '#A0AEC0'
+                      : getCollateralColor(collateral.address),
+                }}
+                title={`${collateral.symbol}: ${collateral.percentage.toFixed(2)}%`}
+              />
+            ))}
+          </div>
+          <div className="mt-1 flex flex-wrap justify-center text-xs">
+            {groupedPosition.processedCollaterals.map((collateral, colIndex) => (
+              <span key={`${collateral.address}-${colIndex}`} className="mb-1 mr-2 opacity-70">
+                <span
+                  style={{
+                    color:
+                      collateral.symbol === 'Others'
+                        ? '#A0AEC0'
+                        : getCollateralColor(collateral.address),
+                  }}
+                >
+                  ■
+                </span>{' '}
+                {collateral.symbol}: {formatReadable(collateral.percentage)}%
+              </span>
+            ))}
+          </div>
+        </div>
+      </div>
       <table className="no-hover-effect w-full font-zen">
         <thead className="table-header">
           <tr>
-            <th>Market ID</th>
+            <th>Market</th>
             <th>Collateral</th>
             <th>LLTV</th>
             <th>APY</th>
             <th>Supplied</th>
-            <th>% of Market</th>
-            <th>% of My Supply</th>
+            <th>% of Portfolio</th>
             <th>Actions</th>
           </tr>
         </thead>
-        <tbody className="table-body text-sm">
+        <tbody className="table-body text-xs">
           {sortedMarkets.map((position) => {
             const suppliedAmount = Number(
               formatBalance(position.supplyAssets, position.market.loanAsset.decimals),
             );
-            const percentageOfMySupply = (suppliedAmount / totalSupply) * 100;
+            const percentageOfPortfolio = totalSupply > 0 ? (suppliedAmount / totalSupply) * 100 : 0;
+            const warningColor = getWarningColor(position.warningsWithDetail);
 
             return (
-              <tr key={position.market.uniqueKey}>
-                <td data-label="Market ID" className="text-center">
-                  <a
-                    className="group flex items-center justify-center gap-1 no-underline hover:underline"
-                    href={getMarketURL(
-                      position.market.uniqueKey,
-                      position.market.morphoBlue.chain.id,
-                    )}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    {position.market.uniqueKey.slice(2, 8)}
-                    <ExternalLinkIcon className="opacity-0 group-hover:opacity-100" />
-                  </a>
+              <tr key={position.market.uniqueKey} className="gap-1">
+                <td data-label="Market" className="text-center">
+                  <div className="flex items-center justify-center">
+                    <div className="mr-1 w-4">
+                      {position.warningsWithDetail.length > 0 ? (
+                        <Tooltip
+                          content={<WarningTooltip warnings={position.warningsWithDetail} />}
+                          placement="top"
+                        >
+                          <div>
+                            <IoWarningOutline className={`h-4 w-4 ${warningColor}`} />
+                          </div>
+                        </Tooltip>
+                      ) : (
+                        <div className="h-4 w-4" />
+                      )}
+                    </div>
+                    {/* <Tooltip content="View on Explorer" placement="top"> */}
+                    <a
+                      className="group flex items-center justify-center no-underline hover:underline"
+                      href={getMarketURL(
+                        position.market.uniqueKey,
+                        position.market.morphoBlue.chain.id,
+                      )}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    >
+                      {position.market.uniqueKey.slice(2, 8)}
+                      <ExternalLinkIcon className="ml-1 opacity-0 group-hover:opacity-100" />
+                    </a>
+                    {/* </Tooltip> */}
+                  </div>
                 </td>
                 <td data-label="Collateral" className="text-center">
                   {position.market.collateralAsset ? (
                     <div className="flex items-center justify-center gap-1">
-                      {findToken(
-                        position.market.collateralAsset.address,
-                        position.market.morphoBlue.chain.id,
-                      )?.img && (
-                        <Image
-                          src={
-                            findToken(
-                              position.market.collateralAsset.address,
-                              position.market.morphoBlue.chain.id,
-                            )?.img ?? ''
-                          }
-                          alt={position.market.collateralAsset.symbol}
-                          width={18}
-                          height={18}
-                        />
-                      )}
+                      <TokenIcon
+                        address={position.market.collateralAsset.address}
+                        chainId={position.market.morphoBlue.chain.id}
+                        width={18}
+                        height={18}
+                      />
                       {position.market.collateralAsset.symbol}
                     </div>
                   ) : (
@@ -98,20 +172,23 @@ export function SuppliedMarketsDetail({
                 <td data-label="Supplied" className="text-center">
                   {formatReadable(suppliedAmount)} {position.market.loanAsset.symbol}
                 </td>
-                <td data-label="% of Market" className="text-center">
-                  {formatReadable(
-                    (Number(position.supplyAssets) / Number(position.market.state.supplyAssets)) *
-                      100,
-                  )}
-                  %
-                </td>
-                <td data-label="% of My Supply" className="text-center">
-                  {formatReadable(percentageOfMySupply)}%
+                <td data-label="% of Portfolio" className="text-center">
+                  <div className="flex items-center">
+                    <div className="mr-2 h-2 w-full rounded-full bg-gray-200">
+                      <div
+                        className="h-full rounded-full bg-blue-500"
+                        style={{ width: `${percentageOfPortfolio}%` }}
+                      />
+                    </div>
+                    <span className="whitespace-nowrap">
+                      {formatReadable(percentageOfPortfolio)}%
+                    </span>
+                  </div>
                 </td>
                 <td data-label="Actions" className="text-right">
                   <button
                     type="button"
-                    className="bg-hovered rounded-sm p-2 text-xs duration-300 ease-in-out hover:bg-orange-500"
+                    className="bg-hovered rounded-sm p-1 text-xs duration-300 ease-in-out hover:bg-orange-500"
                     onClick={() => {
                       setShowModal(true);
                       setSelectedPosition(position);
diff --git a/src/components/TokenIcon.tsx b/src/components/TokenIcon.tsx
new file mode 100644
index 00000000..21511675
--- /dev/null
+++ b/src/components/TokenIcon.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import Image from 'next/image';
+import { findToken } from '@/utils/tokens';
+
+type TokenIconProps = {
+  address: string;
+  chainId: number;
+  width: number;
+  height: number;
+};
+
+export function TokenIcon({ address, chainId, width, height }: TokenIconProps) {
+  const token = findToken(address, chainId);
+
+   
+  if (!token?.img) {
+    return <div className="rounded-full bg-gray-300" style={{ width, height }} />;
+  }
+
+  return <Image src={token.img} alt={token.symbol || 'Token'} width={width} height={height} />;
+}
diff --git a/src/components/layout/header/Navbar.tsx b/src/components/layout/header/Navbar.tsx
index 53709e7c..1845131a 100644
--- a/src/components/layout/header/Navbar.tsx
+++ b/src/components/layout/header/Navbar.tsx
@@ -76,13 +76,13 @@ function Navbar() {
         <div className="flex items-center justify-start gap-8">
           <ul className="hidden items-center justify-start gap-4 text-opacity-80 md:flex">
             <li className="flex">
-              <NavbarLink href="/markets" matchKey="markets">
-                Markets
+              <NavbarLink href={`/positions/${address ?? ''}`} matchKey="positions">
+                Dashboard
               </NavbarLink>
             </li>
             <li className="flex">
-              <NavbarLink href={`/positions/${address ?? ''}`} matchKey="positions">
-                Portfolio
+              <NavbarLink href="/markets" matchKey="markets">
+                Markets
               </NavbarLink>
             </li>
             <li className="flex">
diff --git a/src/hooks/useUserPositions.ts b/src/hooks/useUserPositions.ts
index 54e63742..1fa731c7 100644
--- a/src/hooks/useUserPositions.ts
+++ b/src/hooks/useUserPositions.ts
@@ -3,6 +3,7 @@
 import { useState, useEffect, useCallback } from 'react';
 import { SupportedNetworks } from '@/utils/networks';
 import { MarketPosition, UserTransaction } from '@/utils/types';
+import { getMarketWarningsWithDetail } from '@/utils/warnings';
 
 const query = `query getUserMarketPositions(
   $address: String!
@@ -83,6 +84,11 @@ const query = `query getUserMarketPositions(
         oracleInfo {
           type
         }
+        warnings {
+          type
+          level
+          __typename
+        }
       }
     }
     transactions {
@@ -188,12 +194,14 @@ const useUserPositions = (user: string | undefined) => {
           }
         }
 
-        const filtered = marketPositions.filter(
-          (position: MarketPosition) => position.supplyShares.toString() !== '0',
-        );
+        const filtered = marketPositions
+          .filter((position: MarketPosition) => position.supplyShares.toString() !== '0')
+          .map((position: MarketPosition) => ({
+            ...position,
+            warningsWithDetail: getMarketWarningsWithDetail(position.market),
+          }));
 
         setHistory(transactions);
-
         setData(filtered);
       } catch (_error) {
         setError(_error);
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 86755df5..a7ec64db 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -57,7 +57,9 @@ export type MarketPosition = {
       }[];
       utilization: number;
     };
+    warnings: MarketWarning[];
   };
+  warningsWithDetail: WarningWithDetail[];
 };
 
 export enum UserTxTypes {
@@ -238,6 +240,7 @@ export type GroupedPosition = {
     amount: number;
     percentage: number;
   }[];
+  allWarnings: WarningWithDetail[];
 };
 
 // Add this type to the existing types in the file
diff --git a/src/utils/warnings.ts b/src/utils/warnings.ts
index 88765638..6aca8fb6 100644
--- a/src/utils/warnings.ts
+++ b/src/utils/warnings.ts
@@ -1,4 +1,4 @@
-import { Market } from '@/utils/types';
+import { MarketWarning } from '@/utils/types';
 import { WarningCategory, WarningWithDetail } from './types';
 
 const morphoOfficialWarnings: WarningWithDetail[] = [
@@ -80,7 +80,7 @@ const morphoOfficialWarnings: WarningWithDetail[] = [
   {
     code: 'low_liquidity',
     level: 'warning',
-    description: 'This market has low liquidity, you may not be able to withdraw once supplied',
+    description: 'This market has low liquidity.',
     category: WarningCategory.general,
   },
   {
@@ -92,7 +92,7 @@ const morphoOfficialWarnings: WarningWithDetail[] = [
   },
 ];
 
-export const getMarketWarningsWithDetail = (market: Market) => {
+export const getMarketWarningsWithDetail = (market: {warnings: MarketWarning[]}) => {
   const result = [];
 
   // process official warnings