From 5c4be817a3941f286f8ac9429d6558bb71a11ffa Mon Sep 17 00:00:00 2001
From: Marcin Ciarka <marcin@oazoapps.com>
Date: Wed, 6 Nov 2024 10:23:56 +0100
Subject: [PATCH] Earn protocol WIP #20 (#559)

# 20 of N pull requests.

This pull request introduces several enhancements to the
`apps/earn-protocol` application, focusing on incorporating user
activity data and top depositors into various pages and components. The
most important changes include updates to the `EarnVaultManagePage`,
`EarnVaultOpenPage`, and `UserActivityPage` to fetch and display this
new data, as well as modifications to the server handlers and components
to support these updates.

### Enhancements to data fetching and display:

*
`apps/earn-protocol/app/earn/[network]/position/[vaultId]/[walletAddress]/page.tsx`:
Added `getUserActivity` to fetch user activity and top depositors, and
updated `EarnVaultManagePage` to include this data in the component
props.
([apps/earn-protocol/app/earn/[network]/position/[vaultId]/[walletAddress]/page.tsxR6](diffhunk://#diff-aec0650e1d631148c7236a9124bdf58ab593e3e089754ba25c6ca8b08b32ed61R6),
[apps/earn-protocol/app/earn/[network]/position/[vaultId]/[walletAddress]/page.tsxL22-R23](diffhunk://#diff-aec0650e1d631148c7236a9124bdf58ab593e3e089754ba25c6ca8b08b32ed61L22-R23),
[apps/earn-protocol/app/earn/[network]/position/[vaultId]/[walletAddress]/page.tsxR34-R38](diffhunk://#diff-aec0650e1d631148c7236a9124bdf58ab593e3e089754ba25c6ca8b08b32ed61R34-R38),
[apps/earn-protocol/app/earn/[network]/position/[vaultId]/[walletAddress]/page.tsxR65-R66](diffhunk://#diff-aec0650e1d631148c7236a9124bdf58ab593e3e089754ba25c6ca8b08b32ed61R65-R66))
* `apps/earn-protocol/app/earn/[network]/position/[vaultId]/page.tsx`:
Updated `EarnVaultOpenPage` to fetch user activity and top depositors
and pass this data to the `VaultOpenView` component.
([apps/earn-protocol/app/earn/[network]/position/[vaultId]/page.tsxR4](diffhunk://#diff-eaafa83dbaa20354e007ae0e12db9f7a702c4eda62f13e8ac7f97562a32e633cR4),
[apps/earn-protocol/app/earn/[network]/position/[vaultId]/page.tsxL18-R25](diffhunk://#diff-eaafa83dbaa20354e007ae0e12db9f7a702c4eda62f13e8ac7f97562a32e633cL18-R25),
[apps/earn-protocol/app/earn/[network]/position/[vaultId]/page.tsxL34-R43](diffhunk://#diff-eaafa83dbaa20354e007ae0e12db9f7a702c4eda62f13e8ac7f97562a32e633cL34-R43))
*
[`apps/earn-protocol/app/earn/user-activity/page.tsx`](diffhunk://#diff-00a406f55b8254b1f7ebb56bdffb224cf8036f0c3b2bf475a55323c66fe4bf24L16-R16):
Modified `UserActivityPage` to include top depositors in the fetched
data and pass it to the `UserActivityView` component.
[[1]](diffhunk://#diff-00a406f55b8254b1f7ebb56bdffb224cf8036f0c3b2bf475a55323c66fe4bf24L16-R16)
[[2]](diffhunk://#diff-00a406f55b8254b1f7ebb56bdffb224cf8036f0c3b2bf475a55323c66fe4bf24R25)

### Updates to server handlers:

*
[`apps/earn-protocol/app/server-handlers/sdk/get-user-activity.ts`](diffhunk://#diff-410dafcceab060e8269aee988d0fec5ba9126561247c8a7181761fe1f2b6b48cR1-R74):
Created a new function `getUserActivity` to fetch user activity and top
depositors.
*
[`apps/earn-protocol/app/server-handlers/sdk/get-users-activity.ts`](diffhunk://#diff-e5a3f2bcbd2b174bc55aaec59dde8bca644433d0ab0ef25de8ec779eb53c10d4L3-R14):
Updated `getUsersActivity` to include top depositors in the returned
data.
[[1]](diffhunk://#diff-e5a3f2bcbd2b174bc55aaec59dde8bca644433d0ab0ef25de8ec779eb53c10d4L3-R14)
[[2]](diffhunk://#diff-e5a3f2bcbd2b174bc55aaec59dde8bca644433d0ab0ef25de8ec779eb53c10d4L41-R39)
[[3]](diffhunk://#diff-e5a3f2bcbd2b174bc55aaec59dde8bca644433d0ab0ef25de8ec779eb53c10d4R58-R66)

### Component modifications:

*
[`apps/earn-protocol/components/layout/VaultManageView/VaultManageView.tsx`](diffhunk://#diff-180e4453ecde0323c93bedc67a55441498ddf30fa5f732446fd12cc2dc575ba9L3-R8):
Updated `VaultManageView` to accept and pass user activity and top
depositors to the `VaultManageViewComponent`.
[[1]](diffhunk://#diff-180e4453ecde0323c93bedc67a55441498ddf30fa5f732446fd12cc2dc575ba9L3-R8)
[[2]](diffhunk://#diff-180e4453ecde0323c93bedc67a55441498ddf30fa5f732446fd12cc2dc575ba9R18-R26)
[[3]](diffhunk://#diff-180e4453ecde0323c93bedc67a55441498ddf30fa5f732446fd12cc2dc575ba9R35-R36)
*
[`apps/earn-protocol/components/layout/VaultManageView/VaultManageViewComponent.tsx`](diffhunk://#diff-093401e3ee1390c1d36183263365baea6f0df465c9bc2cdafe8c6205c965caccR1):
Enhanced `VaultManageViewComponent` to display user activity, top
depositors, and other related data.
[[1]](diffhunk://#diff-093401e3ee1390c1d36183263365baea6f0df465c9bc2cdafe8c6205c965caccR1)
[[2]](diffhunk://#diff-093401e3ee1390c1d36183263365baea6f0df465c9bc2cdafe8c6205c965caccR11-R35)
[[3]](diffhunk://#diff-093401e3ee1390c1d36183263365baea6f0df465c9bc2cdafe8c6205c965caccR44-R75)
[[4]](diffhunk://#diff-093401e3ee1390c1d36183263365baea6f0df465c9bc2cdafe8c6205c965caccL71-R94)
[[5]](diffhunk://#diff-093401e3ee1390c1d36183263365baea6f0df465c9bc2cdafe8c6205c965caccL82-R117)
[[6]](diffhunk://#diff-093401e3ee1390c1d36183263365baea6f0df465c9bc2cdafe8c6205c965caccL101-R127)
[[7]](diffhunk://#diff-093401e3ee1390c1d36183263365baea6f0df465c9bc2cdafe8c6205c965caccL148-R174)
[[8]](diffhunk://#diff-093401e3ee1390c1d36183263365baea6f0df465c9bc2cdafe8c6205c965caccL178-R209)
*
[`apps/earn-protocol/components/layout/VaultOpenView/VaultOpenView.tsx`](diffhunk://#diff-a40498ddbf1bf5830448800c7d93442c21fc90a4f6c4eed0b672478679ce71a9L3-R8):
Updated `VaultOpenView` to accept and pass user activity and top
depositors to the `VaultOpenViewComponent`.
[[1]](diffhunk://#diff-a40498ddbf1bf5830448800c7d93442c21fc90a4f6c4eed0b672478679ce71a9L3-R8)
[[2]](diffhunk://#diff-a40498ddbf1bf5830448800c7d93442c21fc90a4f6c4eed0b672478679ce71a9R17-R32)

---------

Co-authored-by: sebastianPiekarczyk <sebastian@oazoapps.com>
---
 .../[vaultId]/[walletAddress]/page.tsx        |  10 +-
 .../[network]/position/[vaultId]/page.tsx     |  13 +-
 .../app/earn/user-activity/page.tsx           |   3 +-
 .../server-handlers/sdk/get-user-activity.ts  |  74 +++++++++
 .../server-handlers/sdk/get-users-activity.ts |  31 ++--
 .../VaultManageView/VaultManageView.tsx       |  13 +-
 .../VaultManageViewComponent.tsx              |  67 +++++---
 .../layout/VaultOpenView/VaultOpenView.tsx    |  18 ++-
 .../VaultOpenView/VaultOpenViewComponent.tsx  |  73 +++++----
 .../components/layout/VaultOpenView/mocks.ts  |  24 ---
 .../organisms/Charts/HistoricalYieldChart.tsx |  11 +-
 .../organisms/UserActivity/UserActivity.tsx   |  68 ++++----
 .../TopDepositorsTable/TopDepositorsTable.tsx |  40 +++++
 .../UserActivityTable/UserActivityTable.tsx   |   4 +-
 .../UserActivityView/UserActivityView.tsx     | 148 +++++++++++++-----
 .../table/filters/top-depositors-filter.ts    |  30 ++++
 .../{filters.ts => user-activity-filters.ts}  |   2 +-
 .../table/top-depositors-columns.ts           |  42 +++++
 .../table/top-depositors-mapper.tsx           | 113 +++++++++++++
 .../table/top-depositors-sorter.ts            |  69 ++++++++
 .../{columns.ts => user-activity-columns.ts}  |   0
 .../{mapper.tsx => user-activity-mapper.tsx}  |   2 +-
 .../{sorter.ts => user-activity-sorter.ts}    |   0
 .../features/user-activity/types/tabs.ts      |   4 +
 apps/earn-protocol/hooks/use-amount.ts        | 103 ++++++++++++
 apps/earn-protocol/hooks/use-client.ts        | 107 +++++++++++++
 apps/earn-protocol/hooks/use-transaction.ts   | 108 ++++---------
 .../InputWithDropdown/InputWithDropdown.tsx   |  13 +-
 .../types/src/earn-protocol/index.ts          |  11 ++
 .../src/helpers/get-past-timestamp.ts         |  25 +++
 packages/app-utils/src/index.ts               |   1 +
 .../src/common/index.ts                       |   1 +
 .../src/common/interfaces/IArmadaManager.ts   |  11 ++
 .../common/implementation/ArmadaManager.ts    |  10 +-
 .../ArmadaManager/ArmadaManagerUsersClient.ts |   5 +
 .../IArmadaManagerUsersClient.ts              |  11 ++
 sdk/sdk-server/src/SDKAppRouter.ts            |   2 +
 .../users/getUserActivityRaw.ts               |  13 ++
 .../src/generated/client.ts                   |  46 +++++-
 .../src/interfaces/IArmadaSubgraphManager.ts  |  11 ++
 .../src/queries/user-activity.graphql         |  28 ++++
 .../src/queries/users-activity.graphql        |   1 +
 .../src/queries/vaults.graphql                |   1 +
 .../armada/ArmadaSubgraphManager.ts           |   4 +
 44 files changed, 1129 insertions(+), 242 deletions(-)
 create mode 100644 apps/earn-protocol/app/server-handlers/sdk/get-user-activity.ts
 create mode 100644 apps/earn-protocol/features/user-activity/components/TopDepositorsTable/TopDepositorsTable.tsx
 create mode 100644 apps/earn-protocol/features/user-activity/table/filters/top-depositors-filter.ts
 rename apps/earn-protocol/features/user-activity/table/filters/{filters.ts => user-activity-filters.ts} (95%)
 create mode 100644 apps/earn-protocol/features/user-activity/table/top-depositors-columns.ts
 create mode 100644 apps/earn-protocol/features/user-activity/table/top-depositors-mapper.tsx
 create mode 100644 apps/earn-protocol/features/user-activity/table/top-depositors-sorter.ts
 rename apps/earn-protocol/features/user-activity/table/{columns.ts => user-activity-columns.ts} (100%)
 rename apps/earn-protocol/features/user-activity/table/{mapper.tsx => user-activity-mapper.tsx} (99%)
 rename apps/earn-protocol/features/user-activity/table/{sorter.ts => user-activity-sorter.ts} (100%)
 create mode 100644 apps/earn-protocol/features/user-activity/types/tabs.ts
 create mode 100644 apps/earn-protocol/hooks/use-amount.ts
 create mode 100644 apps/earn-protocol/hooks/use-client.ts
 create mode 100644 packages/app-utils/src/helpers/get-past-timestamp.ts
 create mode 100644 sdk/sdk-server/src/armada-protocol-handlers/users/getUserActivityRaw.ts
 create mode 100644 sdk/subgraph-manager-common/src/queries/user-activity.graphql

diff --git a/apps/earn-protocol/app/earn/[network]/position/[vaultId]/[walletAddress]/page.tsx b/apps/earn-protocol/app/earn/[network]/position/[vaultId]/[walletAddress]/page.tsx
index 91d7374bc..3345a873e 100644
--- a/apps/earn-protocol/app/earn/[network]/position/[vaultId]/[walletAddress]/page.tsx
+++ b/apps/earn-protocol/app/earn/[network]/position/[vaultId]/[walletAddress]/page.tsx
@@ -3,6 +3,7 @@ import { type SDKNetwork } from '@summerfi/app-types'
 import { parseServerResponseToClient } from '@summerfi/app-utils'
 import { type IArmadaPosition } from '@summerfi/sdk-client-react'
 
+import { getUserActivity } from '@/app/server-handlers/sdk/get-user-activity'
 import { getUserPosition } from '@/app/server-handlers/sdk/get-user-position'
 import { getVaultDetails } from '@/app/server-handlers/sdk/get-vault-details'
 import { getVaultsList } from '@/app/server-handlers/sdk/get-vaults-list'
@@ -19,7 +20,7 @@ type EarnVaultManagePageProps = {
 export const revalidate = 60
 
 const EarnVaultManagePage = async ({ params }: EarnVaultManagePageProps) => {
-  const [vault, { vaults }, position] = await Promise.all([
+  const [vault, { vaults }, position, { userActivity, topDepositors }] = await Promise.all([
     getVaultDetails({
       vaultAddress: params.vaultId,
       network: params.network,
@@ -30,6 +31,11 @@ const EarnVaultManagePage = async ({ params }: EarnVaultManagePageProps) => {
       network: params.network,
       walletAddress: params.walletAddress,
     }),
+    getUserActivity({
+      vaultAddress: params.vaultId,
+      network: params.network,
+      walletAddress: params.walletAddress,
+    }),
   ])
 
   if (!vault) {
@@ -56,6 +62,8 @@ const EarnVaultManagePage = async ({ params }: EarnVaultManagePageProps) => {
       vaults={vaults}
       position={positionJsonSafe}
       viewWalletAddress={params.walletAddress}
+      userActivity={userActivity}
+      topDepositors={topDepositors}
     />
   )
 }
diff --git a/apps/earn-protocol/app/earn/[network]/position/[vaultId]/page.tsx b/apps/earn-protocol/app/earn/[network]/position/[vaultId]/page.tsx
index ba31e84e7..a9ab0ed77 100644
--- a/apps/earn-protocol/app/earn/[network]/position/[vaultId]/page.tsx
+++ b/apps/earn-protocol/app/earn/[network]/position/[vaultId]/page.tsx
@@ -1,6 +1,7 @@
 import { Text } from '@summerfi/app-earn-ui'
 import { type SDKNetwork } from '@summerfi/app-types'
 
+import { getUserActivity } from '@/app/server-handlers/sdk/get-user-activity'
 import { getVaultDetails } from '@/app/server-handlers/sdk/get-vault-details'
 import { getVaultsList } from '@/app/server-handlers/sdk/get-vaults-list'
 import { VaultOpenView } from '@/components/layout/VaultOpenView/VaultOpenView'
@@ -15,12 +16,13 @@ type EarnVaultOpenPageProps = {
 export const revalidate = 60
 
 const EarnVaultOpenPage = async ({ params }: EarnVaultOpenPageProps) => {
-  const [vault, { vaults }] = await Promise.all([
+  const [vault, { vaults }, { userActivity, topDepositors }] = await Promise.all([
     getVaultDetails({
       vaultAddress: params.vaultId,
       network: params.network,
     }),
     getVaultsList(),
+    getUserActivity({ vaultAddress: params.vaultId, network: params.network }),
   ])
 
   if (!vault) {
@@ -31,7 +33,14 @@ const EarnVaultOpenPage = async ({ params }: EarnVaultOpenPageProps) => {
     )
   }
 
-  return <VaultOpenView vault={vault} vaults={vaults} />
+  return (
+    <VaultOpenView
+      vault={vault}
+      vaults={vaults}
+      userActivity={userActivity}
+      topDepositors={topDepositors}
+    />
+  )
 }
 
 export default EarnVaultOpenPage
diff --git a/apps/earn-protocol/app/earn/user-activity/page.tsx b/apps/earn-protocol/app/earn/user-activity/page.tsx
index 626e8f0d7..86c246429 100644
--- a/apps/earn-protocol/app/earn/user-activity/page.tsx
+++ b/apps/earn-protocol/app/earn/user-activity/page.tsx
@@ -13,7 +13,7 @@ interface UserActivityPageProps {
 }
 
 const UserActivityPage: FC<UserActivityPageProps> = async ({ searchParams }) => {
-  const [{ vaults }, { usersActivity, totalUsers }] = await Promise.all([
+  const [{ vaults }, { usersActivity, totalUsers, topDepositors }] = await Promise.all([
     getVaultsList(),
     getUsersActivity(),
   ])
@@ -22,6 +22,7 @@ const UserActivityPage: FC<UserActivityPageProps> = async ({ searchParams }) =>
     <UserActivityView
       vaultsList={vaults}
       usersActivity={usersActivity}
+      topDepositors={topDepositors}
       totalUsers={totalUsers}
       searchParams={parseQueryStringServerSide({ searchParams })}
     />
diff --git a/apps/earn-protocol/app/server-handlers/sdk/get-user-activity.ts b/apps/earn-protocol/app/server-handlers/sdk/get-user-activity.ts
new file mode 100644
index 000000000..d09d12ce6
--- /dev/null
+++ b/apps/earn-protocol/app/server-handlers/sdk/get-user-activity.ts
@@ -0,0 +1,74 @@
+import {
+  type SDKNetwork,
+  type SDKUsersActivityType,
+  UserActivityType,
+  type UsersActivity,
+} from '@summerfi/app-types'
+import { simpleSort, SortDirection } from '@summerfi/app-utils'
+import { ArmadaVaultId } from '@summerfi/armada-protocol-service'
+import { Address, getChainInfoByChainId } from '@summerfi/sdk-common'
+
+import { backendSDK } from '@/app/server-handlers/sdk/sdk-backend-client'
+import { subgraphNetworkToId } from '@/helpers/network-helpers'
+
+export async function getUserActivity({
+  network,
+  vaultAddress,
+  walletAddress,
+}: {
+  network: SDKNetwork
+  vaultAddress: string
+  walletAddress?: string
+}): Promise<{
+  userActivity: UsersActivity
+  topDepositors: SDKUsersActivityType
+  callDataTimestamp: number
+}> {
+  const chainId = subgraphNetworkToId(network)
+  const chainInfo = getChainInfoByChainId(chainId)
+
+  const fleetAddress = Address.createFromEthereum({
+    value: vaultAddress,
+  })
+  const poolId = ArmadaVaultId.createFrom({
+    chainInfo,
+    fleetAddress,
+  })
+
+  const { positions } = await backendSDK.armada.users.getUserActivityRaw({
+    poolId,
+  })
+
+  const userActivityList = positions
+    .filter((position) =>
+      walletAddress ? position.account.id === walletAddress.toLowerCase() : true,
+    )
+    .flatMap((position) => [
+      ...position.deposits.map((deposit) => ({
+        ...deposit,
+        balance: position.inputTokenBalance,
+        vault: position.vault,
+        account: position.account.id,
+        activity: UserActivityType.DEPOSIT,
+      })),
+      ...position.withdrawals.map((deposit) => ({
+        ...deposit,
+        balance: position.inputTokenBalance,
+        vault: position.vault,
+        account: position.account.id,
+        activity: UserActivityType.WITHDRAW,
+      })),
+    ])
+
+  const topDepositors = positions
+    .sort((a, b) =>
+      simpleSort({ a: a.inputTokenBalance, b: b.inputTokenBalance, direction: SortDirection.DESC }),
+    )
+    .filter((item) => item.deposits.length > 0)
+
+  return {
+    userActivity: userActivityList,
+    topDepositors,
+    callDataTimestamp: Date.now(),
+  }
+}
diff --git a/apps/earn-protocol/app/server-handlers/sdk/get-users-activity.ts b/apps/earn-protocol/app/server-handlers/sdk/get-users-activity.ts
index ebb542dd4..b1920bfcd 100644
--- a/apps/earn-protocol/app/server-handlers/sdk/get-users-activity.ts
+++ b/apps/earn-protocol/app/server-handlers/sdk/get-users-activity.ts
@@ -1,25 +1,17 @@
 import {
   sdkSupportedNetworks,
-  type SDKUserActivityType,
+  type SDKUsersActivityType,
   UserActivityType,
+  type UsersActivity,
 } from '@summerfi/app-types'
+import { simpleSort, SortDirection } from '@summerfi/app-utils'
 import { getChainInfoByChainId } from '@summerfi/sdk-common'
 
 import { backendSDK } from '@/app/server-handlers/sdk/sdk-backend-client'
 
-export interface UserActivity {
-  timestamp: SDKUserActivityType['deposits'][0]['timestamp']
-  amount: SDKUserActivityType['deposits'][0]['amount']
-  balance: SDKUserActivityType['inputTokenBalance']
-  vault: SDKUserActivityType['vault']
-  account: SDKUserActivityType['account']['id']
-  activity: UserActivityType
-}
-
-export type UsersActivity = UserActivity[]
-
 export async function getUsersActivity(): Promise<{
   usersActivity: UsersActivity
+  topDepositors: SDKUsersActivityType
   totalUsers: number
   callDataTimestamp: number
 }> {
@@ -38,7 +30,13 @@ export async function getUsersActivity(): Promise<{
     (typeof usersActivityByNetwork)[number]['positions']
   >((acc, { positions }) => [...acc, ...positions], [])
 
-  const totalUsers = usersActivityListRaw.filter((position) => position.deposits.length > 0).length
+  const totalUsers = [
+    ...new Set(
+      usersActivityListRaw
+        .filter((position) => position.deposits.length > 0)
+        .map((position) => position.account.id),
+    ),
+  ].length
 
   const usersActivityList = usersActivityListRaw.flatMap((position) => [
     ...position.deposits.map((deposit) => ({
@@ -57,8 +55,15 @@ export async function getUsersActivity(): Promise<{
     })),
   ])
 
+  const topDepositors = usersActivityListRaw
+    .sort((a, b) =>
+      simpleSort({ a: a.inputTokenBalance, b: b.inputTokenBalance, direction: SortDirection.DESC }),
+    )
+    .filter((item) => item.deposits.length > 0)
+
   return {
     usersActivity: usersActivityList,
+    topDepositors,
     totalUsers,
     callDataTimestamp: Date.now(),
   }
diff --git a/apps/earn-protocol/components/layout/VaultManageView/VaultManageView.tsx b/apps/earn-protocol/components/layout/VaultManageView/VaultManageView.tsx
index 03b2d0965..aea13d967 100644
--- a/apps/earn-protocol/components/layout/VaultManageView/VaultManageView.tsx
+++ b/apps/earn-protocol/components/layout/VaultManageView/VaultManageView.tsx
@@ -1,6 +1,11 @@
 'use client'
 
-import { type SDKVaultishType, type SDKVaultsListType } from '@summerfi/app-types'
+import {
+  type SDKUsersActivityType,
+  type SDKVaultishType,
+  type SDKVaultsListType,
+  type UsersActivity,
+} from '@summerfi/app-types'
 import { type IArmadaPosition, SDKContextProvider } from '@summerfi/sdk-client-react'
 
 import { VaultManageViewComponent } from '@/components/layout/VaultManageView/VaultManageViewComponent'
@@ -10,11 +15,15 @@ export const VaultManageView = ({
   vault,
   vaults,
   position,
+  userActivity,
+  topDepositors,
   viewWalletAddress,
 }: {
   vault: SDKVaultishType
   vaults: SDKVaultsListType
   position: IArmadaPosition
+  userActivity: UsersActivity
+  topDepositors: SDKUsersActivityType
   viewWalletAddress: string
 }) => {
   return (
@@ -23,6 +32,8 @@ export const VaultManageView = ({
         vault={vault}
         vaults={vaults}
         position={position}
+        userActivity={userActivity}
+        topDepositors={topDepositors}
         viewWalletAddress={viewWalletAddress}
       />
     </SDKContextProvider>
diff --git a/apps/earn-protocol/components/layout/VaultManageView/VaultManageViewComponent.tsx b/apps/earn-protocol/components/layout/VaultManageView/VaultManageViewComponent.tsx
index 96f7032bf..6a5e30941 100644
--- a/apps/earn-protocol/components/layout/VaultManageView/VaultManageViewComponent.tsx
+++ b/apps/earn-protocol/components/layout/VaultManageView/VaultManageViewComponent.tsx
@@ -1,3 +1,4 @@
+import { useUser } from '@account-kit/react'
 import {
   Button,
   Expander,
@@ -7,27 +8,31 @@ import {
   SidebarFootnote,
   sidebarFootnote,
   type SidebarProps,
+  SkeletonLine,
   Text,
   VaultManageGrid,
 } from '@summerfi/app-earn-ui'
 import {
   type DropdownOption,
+  type SDKUsersActivityType,
   type SDKVaultishType,
   type SDKVaultsListType,
   type TokenSymbolsList,
+  type UsersActivity,
 } from '@summerfi/app-types'
 import { formatCryptoBalance } from '@summerfi/app-utils'
 import { type IArmadaPosition } from '@summerfi/sdk-client-react'
-import BigNumber from 'bignumber.js'
 import { capitalize } from 'lodash-es'
 
-import { userActivityRawData, vaultExposureRawData } from '@/components/layout/VaultOpenView/mocks'
+import { vaultExposureRawData } from '@/components/layout/VaultOpenView/mocks'
 import { TransactionHashPill } from '@/components/molecules/TransactionHashPill/TransactionHashPill'
-import { MockedLineChart } from '@/components/organisms/Charts/MockedLineChart'
+import { HistoricalYieldChart } from '@/components/organisms/Charts/HistoricalYieldChart'
 import { RebalancingActivity } from '@/components/organisms/RebalancingActivity/RebalancingActivity'
 import { UserActivity } from '@/components/organisms/UserActivity/UserActivity'
 import { VaultExposure } from '@/components/organisms/VaultExposure/VaultExposure'
 import { TransactionAction } from '@/constants/transaction-actions'
+import { useAmount } from '@/hooks/use-amount'
+import { useClient } from '@/hooks/use-client'
 import { useTransaction } from '@/hooks/use-transaction'
 
 import vaultManageViewStyles from './VaultManageView.module.scss'
@@ -36,26 +41,38 @@ export const VaultManageViewComponent = ({
   vault,
   vaults,
   position,
+  userActivity,
+  topDepositors,
   viewWalletAddress,
 }: {
   vault: SDKVaultishType
   vaults: SDKVaultsListType
   position: IArmadaPosition
+  userActivity: UsersActivity
+  topDepositors: SDKUsersActivityType
   viewWalletAddress: string
 }) => {
+  const user = useUser()
+  const { publicClient, transactionClient, tokenBalance, tokenBalanceLoading } = useClient({
+    vault,
+  })
+  const { amountParsed, amountDisplay, manualSetAmount, handleAmountChange, onFocus, onBlur } =
+    useAmount({ vault })
   const {
-    amountDisplayValue,
-    handleAmountChange,
     sidebar,
-    amount,
     txHashes,
     removeTxHash,
     vaultChainId,
     reset,
-    user,
-    setTransactionType,
     transactionType,
-  } = useTransaction({ vault })
+    setTransactionType,
+  } = useTransaction({
+    vault,
+    publicClient,
+    transactionClient,
+    amountParsed,
+    manualSetAmount,
+  })
 
   const options: DropdownOption[] = [
     ...[...new Set(vaults.map(({ inputToken }) => inputToken.symbol))].map((symbol) => ({
@@ -68,7 +85,13 @@ export const VaultManageViewComponent = ({
   const dropdownValue =
     options.find((option) => option.value === vault.inputToken.symbol) ?? options[0]
 
-  const balance = new BigNumber(123123)
+  const balanceValue = tokenBalanceLoading ? (
+    <SkeletonLine width={70} height={10} style={{ marginTop: '7px' }} />
+  ) : tokenBalance ? (
+    `${formatCryptoBalance(tokenBalance)} ${vault.inputToken.symbol}`
+  ) : (
+    '-'
+  )
 
   const sidebarProps: SidebarProps = {
     title: capitalize(transactionType),
@@ -79,16 +102,19 @@ export const VaultManageViewComponent = ({
     content: (
       <>
         <InputWithDropdown
-          value={amountDisplayValue}
-          secondaryValue={amountDisplayValue ? `$${amountDisplayValue}` : undefined}
+          value={amountDisplay}
+          secondaryValue={amountDisplay ? `$${amountDisplay}` : undefined}
           handleChange={handleAmountChange}
           options={options}
           dropdownValue={dropdownValue}
+          onFocus={onFocus}
+          onBlur={onBlur}
           heading={{
             label: 'Balance',
-            value: `${formatCryptoBalance(balance)} ${vault.inputToken.symbol}`,
-            // eslint-disable-next-line no-console
-            action: () => console.log('clicked'),
+            value: balanceValue,
+            action: () => {
+              manualSetAmount(tokenBalance?.toString())
+            },
           }}
         />
         <ProjectedEarnings earnings="1353" symbol={vault.inputToken.symbol as TokenSymbolsList} />
@@ -98,7 +124,7 @@ export const VaultManageViewComponent = ({
     primaryButton: sidebar.primaryButton,
     footnote: (
       <>
-        {sidebar.error ?? amount?.gt(0) ? (
+        {sidebar.error ?? amountParsed.gt(0) ? (
           <Button
             variant="secondarySmall"
             style={{ width: '100%', marginBottom: 'var(--general-space-12)' }}
@@ -145,7 +171,7 @@ export const VaultManageViewComponent = ({
             }
             defaultExpanded
           >
-            <MockedLineChart />
+            <HistoricalYieldChart aprHourlyList={vault.aprValues} />
           </Expander>
           <Expander
             title={
@@ -175,7 +201,12 @@ export const VaultManageViewComponent = ({
             }
             defaultExpanded
           >
-            <UserActivity rawData={userActivityRawData} />
+            <UserActivity
+              userActivity={userActivity}
+              topDepositors={topDepositors}
+              vaultId={vault.id}
+              page="manage"
+            />
           </Expander>
         </div>
       }
diff --git a/apps/earn-protocol/components/layout/VaultOpenView/VaultOpenView.tsx b/apps/earn-protocol/components/layout/VaultOpenView/VaultOpenView.tsx
index 5b4d35d51..63610070b 100644
--- a/apps/earn-protocol/components/layout/VaultOpenView/VaultOpenView.tsx
+++ b/apps/earn-protocol/components/layout/VaultOpenView/VaultOpenView.tsx
@@ -1,6 +1,11 @@
 'use client'
 
-import { type SDKVaultishType, type SDKVaultsListType } from '@summerfi/app-types'
+import {
+  type SDKUsersActivityType,
+  type SDKVaultishType,
+  type SDKVaultsListType,
+  type UsersActivity,
+} from '@summerfi/app-types'
 import { SDKContextProvider } from '@summerfi/sdk-client-react'
 
 import { VaultOpenViewComponent } from '@/components/layout/VaultOpenView/VaultOpenViewComponent'
@@ -9,13 +14,22 @@ import { sdkApiUrl } from '@/constants/sdk'
 export const VaultOpenView = ({
   vault,
   vaults,
+  userActivity,
+  topDepositors,
 }: {
   vault: SDKVaultishType
   vaults: SDKVaultsListType
+  userActivity: UsersActivity
+  topDepositors: SDKUsersActivityType
 }) => {
   return (
     <SDKContextProvider value={{ apiURL: sdkApiUrl }}>
-      <VaultOpenViewComponent vault={vault} vaults={vaults} />
+      <VaultOpenViewComponent
+        vault={vault}
+        vaults={vaults}
+        userActivity={userActivity}
+        topDepositors={topDepositors}
+      />
     </SDKContextProvider>
   )
 }
diff --git a/apps/earn-protocol/components/layout/VaultOpenView/VaultOpenViewComponent.tsx b/apps/earn-protocol/components/layout/VaultOpenView/VaultOpenViewComponent.tsx
index 21bea21e1..2a0e2ea32 100644
--- a/apps/earn-protocol/components/layout/VaultOpenView/VaultOpenViewComponent.tsx
+++ b/apps/earn-protocol/components/layout/VaultOpenView/VaultOpenViewComponent.tsx
@@ -6,24 +6,22 @@ import {
   Sidebar,
   SidebarFootnote,
   sidebarFootnote,
+  SkeletonLine,
   Text,
   VaultOpenGrid,
 } from '@summerfi/app-earn-ui'
 import {
   type DropdownOption,
+  type SDKUsersActivityType,
   type SDKVaultishType,
   type SDKVaultsListType,
   type TokenSymbolsList,
+  type UsersActivity,
 } from '@summerfi/app-types'
 import { formatCryptoBalance } from '@summerfi/app-utils'
-import BigNumber from 'bignumber.js'
 import { capitalize } from 'lodash-es'
 
-import {
-  detailsLinks,
-  userActivityRawData,
-  vaultExposureRawData,
-} from '@/components/layout/VaultOpenView/mocks'
+import { detailsLinks, vaultExposureRawData } from '@/components/layout/VaultOpenView/mocks'
 import { VaultOpenHeaderBlock } from '@/components/layout/VaultOpenView/VaultOpenHeaderBlock'
 import { VaultSimulationGraph } from '@/components/layout/VaultOpenView/VaultSimulationGraph'
 import { TransactionHashPill } from '@/components/molecules/TransactionHashPill/TransactionHashPill'
@@ -32,6 +30,8 @@ import { RebalancingActivity } from '@/components/organisms/RebalancingActivity/
 import { UserActivity } from '@/components/organisms/UserActivity/UserActivity'
 import { VaultExposure } from '@/components/organisms/VaultExposure/VaultExposure'
 import { TransactionAction } from '@/constants/transaction-actions'
+import { useAmount } from '@/hooks/use-amount'
+import { useClient } from '@/hooks/use-client'
 import { usePosition } from '@/hooks/use-position'
 import { useRedirectToPosition } from '@/hooks/use-redirect-to-position'
 import { useTransaction } from '@/hooks/use-transaction'
@@ -41,20 +41,26 @@ import vaultOpenViewStyles from './VaultOpenView.module.scss'
 export const VaultOpenViewComponent = ({
   vault,
   vaults,
+  userActivity,
+  topDepositors,
 }: {
   vault: SDKVaultishType
   vaults: SDKVaultsListType
+  userActivity: UsersActivity
+  topDepositors: SDKUsersActivityType
 }) => {
-  const {
-    amountDisplayValue,
-    handleAmountChange,
-    sidebar,
-    amount,
-    txHashes,
-    removeTxHash,
-    vaultChainId,
-    reset,
-  } = useTransaction({ vault })
+  const { publicClient, transactionClient, tokenBalance, tokenBalanceLoading } = useClient({
+    vault,
+  })
+  const { amountParsed, manualSetAmount, amountDisplay, handleAmountChange, onBlur, onFocus } =
+    useAmount({ vault })
+  const { sidebar, txHashes, removeTxHash, vaultChainId, reset } = useTransaction({
+    vault,
+    publicClient,
+    transactionClient,
+    amountParsed,
+    manualSetAmount,
+  })
 
   const position = usePosition({
     chainId: vaultChainId,
@@ -74,24 +80,32 @@ export const VaultOpenViewComponent = ({
   const dropdownValue =
     options.find((option) => option.value === vault.inputToken.symbol) ?? options[0]
 
-  const balance = new BigNumber(123123)
-  const displayGraph = !!amount && amount.gt(0)
+  const displayGraph = amountParsed.gt(0)
 
   const sidebarProps = {
     title: capitalize(TransactionAction.DEPOSIT),
     content: (
       <>
         <InputWithDropdown
-          value={amountDisplayValue}
-          secondaryValue={amountDisplayValue ? `$${amountDisplayValue}` : undefined}
+          value={amountDisplay}
+          secondaryValue={amountDisplay ? `$${amountDisplay}` : undefined}
           handleChange={handleAmountChange}
           options={options}
           dropdownValue={dropdownValue}
+          onFocus={onFocus}
+          onBlur={onBlur}
           heading={{
             label: 'Balance',
-            value: `${formatCryptoBalance(balance)} ${vault.inputToken.symbol}`,
-            // eslint-disable-next-line no-console
-            action: () => console.log('clicked'),
+            value: tokenBalanceLoading ? (
+              <SkeletonLine />
+            ) : tokenBalance ? (
+              `${formatCryptoBalance(tokenBalance)} ${vault.inputToken.symbol}`
+            ) : (
+              '-'
+            ),
+            action: () => {
+              manualSetAmount(tokenBalance?.toString())
+            },
           }}
         />
         <ProjectedEarnings earnings="1353" symbol={vault.inputToken.symbol as TokenSymbolsList} />
@@ -101,7 +115,7 @@ export const VaultOpenViewComponent = ({
     primaryButton: sidebar.primaryButton,
     footnote: (
       <>
-        {sidebar.error ?? amount?.gt(0) ? (
+        {sidebar.error ?? amountParsed.gt(0) ? (
           <Button
             variant="secondarySmall"
             style={{ width: '100%', marginBottom: 'var(--general-space-12)' }}
@@ -136,7 +150,7 @@ export const VaultOpenViewComponent = ({
       vault={vault}
       vaults={vaults}
       displayGraph={displayGraph}
-      simulationGraph={<VaultSimulationGraph vault={vault} amount={amount} />}
+      simulationGraph={<VaultSimulationGraph vault={vault} amount={amountParsed} />}
       detailsContent={
         <div className={vaultOpenViewStyles.leftContentWrapper}>
           <VaultOpenHeaderBlock detailsLinks={detailsLinks} vault={vault} />
@@ -173,12 +187,17 @@ export const VaultOpenViewComponent = ({
           <Expander
             title={
               <Text as="p" variant="p1semi">
-                User activity
+                Users activity
               </Text>
             }
             defaultExpanded
           >
-            <UserActivity rawData={userActivityRawData} />
+            <UserActivity
+              userActivity={userActivity}
+              topDepositors={topDepositors}
+              vaultId={vault.id}
+              page="open"
+            />
           </Expander>
         </div>
       }
diff --git a/apps/earn-protocol/components/layout/VaultOpenView/mocks.ts b/apps/earn-protocol/components/layout/VaultOpenView/mocks.ts
index 1d17876d5..37636fd78 100644
--- a/apps/earn-protocol/components/layout/VaultOpenView/mocks.ts
+++ b/apps/earn-protocol/components/layout/VaultOpenView/mocks.ts
@@ -1,4 +1,3 @@
-import { type UserActivityRawData } from '@/components/organisms/UserActivity/UserActivity'
 import { type VaultExposureRawData } from '@/components/organisms/VaultExposure/VaultExposure'
 
 export const vaultExposureRawData: VaultExposureRawData[] = [
@@ -48,29 +47,6 @@ export const vaultExposureRawData: VaultExposureRawData[] = [
   },
 ]
 
-export const userActivityRawData: UserActivityRawData[] = [
-  {
-    balance: '120000',
-    amount: '123123',
-    numberOfDeposits: '13',
-    time: '1727385013506',
-    earningStreak: {
-      link: '/',
-      label: 'View',
-    },
-  },
-  {
-    balance: '1420000',
-    amount: '321321',
-    numberOfDeposits: '9',
-    time: '1727585013506',
-    earningStreak: {
-      link: '/',
-      label: 'View',
-    },
-  },
-]
-
 export const detailsLinks = [
   {
     label: 'How it all works',
diff --git a/apps/earn-protocol/components/organisms/Charts/HistoricalYieldChart.tsx b/apps/earn-protocol/components/organisms/Charts/HistoricalYieldChart.tsx
index 07a3e09e4..d1e0336aa 100644
--- a/apps/earn-protocol/components/organisms/Charts/HistoricalYieldChart.tsx
+++ b/apps/earn-protocol/components/organisms/Charts/HistoricalYieldChart.tsx
@@ -30,10 +30,13 @@ export const HistoricalYieldChart = ({
   const parsedData = useMemo(() => {
     const now = dayjs().startOf('hour')
 
-    return [...aprHourlyList].reverse().map((item, itemIndex) => ({
-      name: now.subtract(itemIndex, 'hour').format('MMM DD, HH:mm'),
-      'Summer Strategy': new BigNumber(item).toFixed(2),
-    }))
+    return [...aprHourlyList]
+      .reverse()
+      .map((item, itemIndex) => ({
+        name: now.subtract(itemIndex, 'hour').format('MMM DD, HH:mm'),
+        'Summer Strategy': new BigNumber(item).toFixed(2),
+      }))
+      .reverse()
   }, [aprHourlyList])
 
   return (
diff --git a/apps/earn-protocol/components/organisms/UserActivity/UserActivity.tsx b/apps/earn-protocol/components/organisms/UserActivity/UserActivity.tsx
index d68bf9361..f541039f9 100644
--- a/apps/earn-protocol/components/organisms/UserActivity/UserActivity.tsx
+++ b/apps/earn-protocol/components/organisms/UserActivity/UserActivity.tsx
@@ -1,43 +1,53 @@
 'use client'
-import { type FC, useMemo } from 'react'
-import { Card, TabBar, Table, WithArrow } from '@summerfi/app-earn-ui'
+import { type FC } from 'react'
+import { Card, TabBar, WithArrow } from '@summerfi/app-earn-ui'
+import { type SDKUsersActivityType, type UsersActivity } from '@summerfi/app-types'
 import Link from 'next/link'
 
-import { userActivityColumns } from '@/components/organisms/UserActivity/columns'
-import { userActivityMapper } from '@/components/organisms/UserActivity/mapper'
-
-export interface UserActivityRawData {
-  balance: string
-  amount: string
-  numberOfDeposits: string
-  time: string
-  earningStreak: {
-    link: string
-    label: string
-  }
-}
+import { TopDepositorsTable } from '@/features/user-activity/components/TopDepositorsTable/TopDepositorsTable'
+import { UserActivityTable } from '@/features/user-activity/components/UserActivityTable/UserActivityTable'
+import { UserActivityTab } from '@/features/user-activity/types/tabs'
 
 interface UserActivityProps {
-  rawData: UserActivityRawData[]
+  userActivity: UsersActivity
+  topDepositors: SDKUsersActivityType
+  vaultId: string
+  page: 'open' | 'manage'
 }
 
-enum UserActivityType {
-  TOP_DEPOSITORS = 'TOP_DEPOSITORS',
-  LATEST_ACTIVITY = 'LATEST_ACTIVITY',
-}
+export const UserActivity: FC<UserActivityProps> = ({
+  userActivity,
+  topDepositors,
+  vaultId,
+  page,
+}) => {
+  const userActivityHiddenColumns = {
+    open: ['strategy'],
+    manage: ['strategy', 'link', 'balance'],
+  }[page]
 
-export const UserActivity: FC<UserActivityProps> = ({ rawData }) => {
-  const rows = useMemo(() => userActivityMapper(rawData), [rawData])
   const tabs = [
     {
-      id: UserActivityType.TOP_DEPOSITORS,
-      label: 'Top depositors',
-      content: <Table rows={rows} columns={userActivityColumns} />,
+      id: UserActivityTab.LATEST_ACTIVITY,
+      label: 'Latest activity',
+      content: (
+        <UserActivityTable
+          userActivityList={userActivity}
+          hiddenColumns={userActivityHiddenColumns}
+          rowsToDisplay={4}
+        />
+      ),
     },
     {
-      id: UserActivityType.LATEST_ACTIVITY,
-      label: 'Latest activity',
-      content: <Table rows={rows} columns={userActivityColumns} />,
+      id: UserActivityTab.TOP_DEPOSITORS,
+      label: 'Top depositors',
+      content: (
+        <TopDepositorsTable
+          topDepositorsList={topDepositors}
+          hiddenColumns={['user', 'strategy', 'numberOfDeposits']}
+          rowsToDisplay={4}
+        />
+      ),
     },
   ]
 
@@ -45,7 +55,7 @@ export const UserActivity: FC<UserActivityProps> = ({ rawData }) => {
     <Card variant="cardSecondary" style={{ marginTop: 'var(--spacing-space-medium)' }}>
       <div style={{ display: 'flex', flexDirection: 'column', width: '100%' }}>
         <TabBar tabs={tabs} textVariant="p3semi" />
-        <Link href="/" style={{ width: 'fit-content' }}>
+        <Link href={`/earn/users-activity?strategies=${vaultId}`} style={{ width: 'fit-content' }}>
           <WithArrow as="p" variant="p4semi" style={{ color: 'var(--earn-protocol-primary-100)' }}>
             View all depositors
           </WithArrow>
diff --git a/apps/earn-protocol/features/user-activity/components/TopDepositorsTable/TopDepositorsTable.tsx b/apps/earn-protocol/features/user-activity/components/TopDepositorsTable/TopDepositorsTable.tsx
new file mode 100644
index 000000000..b4e07adf4
--- /dev/null
+++ b/apps/earn-protocol/features/user-activity/components/TopDepositorsTable/TopDepositorsTable.tsx
@@ -0,0 +1,40 @@
+import { type FC, type ReactNode, useMemo, useState } from 'react'
+import { Table, type TableSortedColumn } from '@summerfi/app-earn-ui'
+import { type SDKUsersActivityType } from '@summerfi/app-types'
+
+import { topDepositorsColumns } from '@/features/user-activity/table/top-depositors-columns'
+import { topDepositorsMapper } from '@/features/user-activity/table/top-depositors-mapper'
+
+interface TopDepositorsTableProps {
+  topDepositorsList: SDKUsersActivityType
+  customRow?: {
+    idx: number
+    content: ReactNode
+  }
+  hiddenColumns?: string[]
+  rowsToDisplay?: number
+}
+
+export const TopDepositorsTable: FC<TopDepositorsTableProps> = ({
+  topDepositorsList,
+  customRow,
+  hiddenColumns,
+  rowsToDisplay,
+}) => {
+  const [sortConfig, setSortConfig] = useState<TableSortedColumn<string>>()
+
+  const rows = useMemo(
+    () => topDepositorsMapper(topDepositorsList, sortConfig),
+    [topDepositorsList, sortConfig],
+  )
+
+  return (
+    <Table
+      rows={rows.slice(0, rowsToDisplay)}
+      columns={topDepositorsColumns}
+      customRow={customRow}
+      handleSort={(_sortConfig) => setSortConfig(_sortConfig)}
+      hiddenColumns={hiddenColumns}
+    />
+  )
+}
diff --git a/apps/earn-protocol/features/user-activity/components/UserActivityTable/UserActivityTable.tsx b/apps/earn-protocol/features/user-activity/components/UserActivityTable/UserActivityTable.tsx
index 1bc961392..e5c39c491 100644
--- a/apps/earn-protocol/features/user-activity/components/UserActivityTable/UserActivityTable.tsx
+++ b/apps/earn-protocol/features/user-activity/components/UserActivityTable/UserActivityTable.tsx
@@ -2,8 +2,8 @@ import { type FC, type ReactNode, useMemo, useState } from 'react'
 import { Table, type TableSortedColumn } from '@summerfi/app-earn-ui'
 
 import { type UsersActivity } from '@/app/server-handlers/sdk/get-users-activity'
-import { userActivityColumns } from '@/features/user-activity/table/columns'
-import { userActivityMapper } from '@/features/user-activity/table/mapper'
+import { userActivityColumns } from '@/features/user-activity/table/user-activity-columns'
+import { userActivityMapper } from '@/features/user-activity/table/user-activity-mapper'
 
 interface UserActivityTableProps {
   userActivityList: UsersActivity
diff --git a/apps/earn-protocol/features/user-activity/components/UserActivityView/UserActivityView.tsx b/apps/earn-protocol/features/user-activity/components/UserActivityView/UserActivityView.tsx
index 0410951d3..9651f6f99 100644
--- a/apps/earn-protocol/features/user-activity/components/UserActivityView/UserActivityView.tsx
+++ b/apps/earn-protocol/features/user-activity/components/UserActivityView/UserActivityView.tsx
@@ -5,13 +5,19 @@ import {
   GenericMultiselect,
   getTwitterShareUrl,
   HeadingWithCards,
+  TabBar,
   TableCarousel,
   useCurrentUrl,
   useQueryParams,
 } from '@summerfi/app-earn-ui'
-import { type SDKVaultsListType, UserActivityType } from '@summerfi/app-types'
+import {
+  type SDKUsersActivityType,
+  type SDKVaultsListType,
+  UserActivityType,
+  type UsersActivity,
+} from '@summerfi/app-types'
 
-import { type UsersActivity } from '@/app/server-handlers/sdk/get-users-activity'
+import { TopDepositorsTable } from '@/features/user-activity/components/TopDepositorsTable/TopDepositorsTable'
 import { UserActivityTable } from '@/features/user-activity/components/UserActivityTable/UserActivityTable'
 import {
   getUserActivityHeadingCards,
@@ -19,14 +25,17 @@ import {
 } from '@/features/user-activity/components/UserActivityView/cards'
 import { userActivityTableCarouselData } from '@/features/user-activity/components/UserActivityView/carousel'
 import { getUsersActivityMedianDeposit } from '@/features/user-activity/helpers/get-median-deposit'
-import { userActivityActivityFilter } from '@/features/user-activity/table/filters/filters'
 import { mapMultiselectOptions } from '@/features/user-activity/table/filters/mappers'
+import { topDepositorsFilter } from '@/features/user-activity/table/filters/top-depositors-filter'
+import { userActivityFilter } from '@/features/user-activity/table/filters/user-activity-filters'
+import { UserActivityTab } from '@/features/user-activity/types/tabs'
 
 import classNames from './UserActivityView.module.scss'
 
 interface UserActivityViewProps {
   vaultsList: SDKVaultsListType
   usersActivity: UsersActivity
+  topDepositors: SDKUsersActivityType
   totalUsers: number
   searchParams?: { [key: string]: string[] }
 }
@@ -36,6 +45,7 @@ const initialRows = 10
 export const UserActivityView: FC<UserActivityViewProps> = ({
   vaultsList,
   usersActivity,
+  topDepositors,
   totalUsers,
   searchParams,
 }) => {
@@ -44,33 +54,56 @@ export const UserActivityView: FC<UserActivityViewProps> = ({
   const [tokenFilter, setTokenFilter] = useState<string[]>(searchParams?.tokens ?? [])
   const currentUrl = useCurrentUrl()
 
-  const [current, setCurrent] = useState(initialRows)
+  const [currentUserActivityIdx, setCurrentUserActivityIdx] = useState(initialRows)
+  const [currentTopDepositorsIdx, setCurrentTopDepositorsIdx] = useState(initialRows)
 
-  const [currentlyLoadedList, setCurrentlyLoadedList] = useState(
+  const [loadedUserActivityList, setLoadedUserActivityList] = useState(
     usersActivity.slice(0, initialRows),
   )
 
+  const [loadedTopDepositorsList, setLoadedTopDepositorsList] = useState(
+    topDepositors.slice(0, initialRows),
+  )
+
   const { strategiesOptions, tokensOptions } = useMemo(
     () => mapMultiselectOptions(vaultsList),
     [vaultsList],
   )
 
-  const handleMoreItems = () => {
-    setCurrentlyLoadedList((prev) => [
+  const handleMoreUserActivityItems = () => {
+    setLoadedUserActivityList((prev) => [
+      ...prev,
+      ...usersActivity.slice(currentUserActivityIdx, currentUserActivityIdx + initialRows),
+    ])
+    setCurrentUserActivityIdx(currentUserActivityIdx + initialRows)
+  }
+
+  const handleMoreTopDepositorsItems = () => {
+    setLoadedTopDepositorsList((prev) => [
       ...prev,
-      ...usersActivity.slice(current, current + initialRows),
+      ...topDepositors.slice(currentTopDepositorsIdx, currentTopDepositorsIdx + initialRows),
     ])
-    setCurrent(current + initialRows)
+    setCurrentTopDepositorsIdx(currentTopDepositorsIdx + initialRows)
   }
 
-  const filteredList = useMemo(
+  const userActivityFilteredList = useMemo(
+    () =>
+      userActivityFilter({
+        userActivityList: loadedUserActivityList,
+        strategyFilter,
+        tokenFilter,
+      }),
+    [loadedUserActivityList, strategyFilter, tokenFilter],
+  )
+
+  const topDepositorsFilteredList = useMemo(
     () =>
-      userActivityActivityFilter({
-        userActivityList: currentlyLoadedList,
+      topDepositorsFilter({
+        topDepositorsList: loadedTopDepositorsList,
         strategyFilter,
         tokenFilter,
       }),
-    [currentlyLoadedList, strategyFilter, tokenFilter],
+    [loadedTopDepositorsList, strategyFilter, tokenFilter],
   )
 
   const genericMultiSelectFilters = [
@@ -94,16 +127,77 @@ export const UserActivityView: FC<UserActivityViewProps> = ({
     },
   ]
 
-  const totalItems = usersActivity.filter(
+  const totalUserActivityItems = usersActivity.filter(
     (item) => item.activity === UserActivityType.DEPOSIT,
   ).length
+
   const medianDeposit = useMemo(() => getUsersActivityMedianDeposit(usersActivity), [usersActivity])
 
   const cards = useMemo(
-    () => getUserActivityHeadingCards({ totalItems, medianDeposit, totalUsers }),
-    [totalItems, medianDeposit, totalUsers],
+    () =>
+      getUserActivityHeadingCards({
+        totalItems: totalUserActivityItems,
+        medianDeposit,
+        totalUsers,
+      }),
+    [totalUserActivityItems, medianDeposit, totalUsers],
   )
 
+  const filters = (
+    <div className={classNames.filtersWrapper}>
+      {genericMultiSelectFilters.map((filter) => (
+        <GenericMultiselect
+          key={filter.label}
+          options={filter.options}
+          label={filter.label}
+          onChange={filter.onChange}
+          initialValues={filter.initialValues}
+        />
+      ))}
+    </div>
+  )
+
+  const tabs = [
+    {
+      id: UserActivityTab.TOP_DEPOSITORS,
+      label: 'Top depositors',
+      content: (
+        <InfiniteScroll
+          loadMore={handleMoreTopDepositorsItems}
+          hasMore={topDepositors.length > loadedTopDepositorsList.length}
+        >
+          {filters}
+          <TopDepositorsTable
+            topDepositorsList={topDepositorsFilteredList}
+            customRow={{
+              idx: 3,
+              content: <TableCarousel carouselData={userActivityTableCarouselData} />,
+            }}
+          />
+        </InfiniteScroll>
+      ),
+    },
+    {
+      id: UserActivityTab.LATEST_ACTIVITY,
+      label: 'Latest activity',
+      content: (
+        <InfiniteScroll
+          loadMore={handleMoreUserActivityItems}
+          hasMore={totalUserActivityItems > loadedUserActivityList.length}
+        >
+          {filters}
+          <UserActivityTable
+            userActivityList={userActivityFilteredList}
+            customRow={{
+              idx: 3,
+              content: <TableCarousel carouselData={userActivityTableCarouselData} />,
+            }}
+          />
+        </InfiniteScroll>
+      ),
+    },
+  ]
+
   return (
     <div className={classNames.wrapper}>
       <HeadingWithCards
@@ -118,26 +212,8 @@ export const UserActivityView: FC<UserActivityViewProps> = ({
           }),
         }}
       />
-      <div className={classNames.filtersWrapper}>
-        {genericMultiSelectFilters.map((filter) => (
-          <GenericMultiselect
-            key={filter.label}
-            options={filter.options}
-            label={filter.label}
-            onChange={filter.onChange}
-            initialValues={filter.initialValues}
-          />
-        ))}
-      </div>
-      <InfiniteScroll loadMore={handleMoreItems} hasMore={totalItems > currentlyLoadedList.length}>
-        <UserActivityTable
-          userActivityList={filteredList}
-          customRow={{
-            idx: 3,
-            content: <TableCarousel carouselData={userActivityTableCarouselData} />,
-          }}
-        />
-      </InfiniteScroll>
+
+      <TabBar tabs={tabs} textVariant="p3semi" />
     </div>
   )
 }
diff --git a/apps/earn-protocol/features/user-activity/table/filters/top-depositors-filter.ts b/apps/earn-protocol/features/user-activity/table/filters/top-depositors-filter.ts
new file mode 100644
index 000000000..f09089de0
--- /dev/null
+++ b/apps/earn-protocol/features/user-activity/table/filters/top-depositors-filter.ts
@@ -0,0 +1,30 @@
+import { type SDKUserActivityType, type SDKUsersActivityType } from '@summerfi/app-types'
+
+const userActivityFilterStrategies = ({
+  strategyFilter,
+  userActivity,
+}: {
+  strategyFilter: string[]
+  userActivity: SDKUserActivityType
+}) => !strategyFilter.length || strategyFilter.includes(userActivity.vault.id)
+
+const userActivityFilterTokens = ({
+  tokenFilter,
+  userActivity,
+}: {
+  tokenFilter: string[]
+  userActivity: SDKUserActivityType
+}) => !tokenFilter.length || tokenFilter.includes(userActivity.vault.inputToken.symbol)
+
+export const topDepositorsFilter = ({
+  topDepositorsList,
+  strategyFilter,
+  tokenFilter,
+}: {
+  topDepositorsList: SDKUsersActivityType
+  strategyFilter: string[]
+  tokenFilter: string[]
+}) =>
+  topDepositorsList
+    .filter((userActivity) => userActivityFilterStrategies({ strategyFilter, userActivity }))
+    .filter((userActivity) => userActivityFilterTokens({ tokenFilter, userActivity }))
diff --git a/apps/earn-protocol/features/user-activity/table/filters/filters.ts b/apps/earn-protocol/features/user-activity/table/filters/user-activity-filters.ts
similarity index 95%
rename from apps/earn-protocol/features/user-activity/table/filters/filters.ts
rename to apps/earn-protocol/features/user-activity/table/filters/user-activity-filters.ts
index 5dcf9f3fc..1b4d1bfc1 100644
--- a/apps/earn-protocol/features/user-activity/table/filters/filters.ts
+++ b/apps/earn-protocol/features/user-activity/table/filters/user-activity-filters.ts
@@ -16,7 +16,7 @@ const userActivityFilterTokens = ({
   userActivity: UserActivity
 }) => !tokenFilter.length || tokenFilter.includes(userActivity.vault.inputToken.symbol)
 
-export const userActivityActivityFilter = ({
+export const userActivityFilter = ({
   userActivityList,
   strategyFilter,
   tokenFilter,
diff --git a/apps/earn-protocol/features/user-activity/table/top-depositors-columns.ts b/apps/earn-protocol/features/user-activity/table/top-depositors-columns.ts
new file mode 100644
index 000000000..e3154f139
--- /dev/null
+++ b/apps/earn-protocol/features/user-activity/table/top-depositors-columns.ts
@@ -0,0 +1,42 @@
+export const topDepositorsColumns = [
+  {
+    title: 'User',
+    key: 'user',
+    sortable: false,
+  },
+  {
+    title: 'Position Balance',
+    key: 'balance',
+    sortable: true,
+  },
+  {
+    title: 'Strategy',
+    key: 'strategy',
+    sortable: false,
+  },
+  {
+    title: 'Change (7d)',
+    key: 'change7d',
+    sortable: true,
+  },
+  {
+    title: 'Projected 1yr Earnings',
+    key: 'projected1yrEarnings',
+    sortable: true,
+  },
+  {
+    title: '# of Deposits',
+    key: 'numberOfDeposits',
+    sortable: true,
+  },
+  {
+    title: 'Earnings Streak',
+    key: 'earningsStreak',
+    sortable: true,
+  },
+  {
+    title: '',
+    key: 'link',
+    sortable: false,
+  },
+]
diff --git a/apps/earn-protocol/features/user-activity/table/top-depositors-mapper.tsx b/apps/earn-protocol/features/user-activity/table/top-depositors-mapper.tsx
new file mode 100644
index 000000000..d6cf05c68
--- /dev/null
+++ b/apps/earn-protocol/features/user-activity/table/top-depositors-mapper.tsx
@@ -0,0 +1,113 @@
+import {
+  getVaultPositionUrl,
+  Icon,
+  TableCellText,
+  type TableSortedColumn,
+  WithArrow,
+} from '@summerfi/app-earn-ui'
+import {
+  type SDKUserActivityType,
+  type SDKUsersActivityType,
+  type TokenSymbolsList,
+} from '@summerfi/app-types'
+import { formatCryptoBalance, getPastTimestamp } from '@summerfi/app-utils'
+import BigNumber from 'bignumber.js'
+import Link from 'next/link'
+
+import { topDepositorsSorter } from '@/features/user-activity/table/top-depositors-sorter'
+
+export const calculateTopDepositors7daysChange = (item: SDKUserActivityType) => {
+  const timeStamp7daysAgo = getPastTimestamp(7)
+
+  const depositsFromLast7Days = item.deposits
+    .filter((deposit) => Number(deposit.timestamp) * 1000 > timeStamp7daysAgo)
+    .reduce((acc, curr) => acc + Number(curr.amount), 0)
+
+  const withdrawalsFromLast7Days = item.withdrawals
+    .filter((withdraw) => Number(withdraw.timestamp) * 1000 > timeStamp7daysAgo)
+    .reduce((acc, curr) => acc + Number(curr.amount), 0)
+
+  return new BigNumber(depositsFromLast7Days - withdrawalsFromLast7Days).shiftedBy(
+    -item.vault.inputToken.decimals,
+  )
+}
+
+export const topDepositorsMapper = (
+  rawData: SDKUsersActivityType,
+  sortConfig?: TableSortedColumn<string>,
+) => {
+  const sorted = topDepositorsSorter({ data: rawData, sortConfig })
+
+  return sorted.map((item) => {
+    const { decimals } = item.vault.inputToken
+    const asset = item.vault.inputToken.symbol as TokenSymbolsList
+    const balance = new BigNumber(item.inputTokenBalance.toString()).shiftedBy(-decimals)
+
+    const change7days = calculateTopDepositors7daysChange(item)
+    const changeSign = change7days.isZero() ? '' : change7days.gt(0) ? '+' : '-'
+    const changeColor = change7days.isZero()
+      ? 'var(--earn-protocol-secondary-100)'
+      : change7days.gt(0)
+        ? 'var(--earn-protocol-success-100)'
+        : 'var(--earn-protocol-warning-100)'
+
+    return {
+      content: {
+        user: <TableCellText>{item.account.id.slice(0, 8)}</TableCellText>,
+        balance: (
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: 'var(--spacing-space-2x-small)',
+            }}
+          >
+            <Icon tokenName={asset} variant="s" />
+            <TableCellText>{formatCryptoBalance(balance)}</TableCellText>
+          </div>
+        ),
+        strategy: <TableCellText>{item.vault.name}</TableCellText>,
+        change7d: (
+          <TableCellText style={{ color: changeColor }}>
+            {changeSign}
+            {formatCryptoBalance(change7days)}
+          </TableCellText>
+        ),
+        projected1yrEarnings: (
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: 'var(--spacing-space-2x-small)',
+            }}
+          >
+            <Icon tokenName={asset} variant="s" />
+            <TableCellText>
+              {formatCryptoBalance(balance.times(item.vault.apr365d).div(100))}
+            </TableCellText>
+          </div>
+        ),
+        numberOfDeposits: <TableCellText>{item.deposits.length}</TableCellText>,
+        earningsStreak: <TableCellText>TBD</TableCellText>,
+        link: (
+          <Link
+            href={getVaultPositionUrl({
+              network: item.vault.protocol.network,
+              vaultId: item.vault.id,
+              walletAddress: item.account.id,
+            })}
+          >
+            <WithArrow
+              as="p"
+              variant="p4semi"
+              style={{ color: 'var(--earn-protocol-primary-100)' }}
+              withStatic
+            >
+              View
+            </WithArrow>
+          </Link>
+        ),
+      },
+    }
+  })
+}
diff --git a/apps/earn-protocol/features/user-activity/table/top-depositors-sorter.ts b/apps/earn-protocol/features/user-activity/table/top-depositors-sorter.ts
new file mode 100644
index 000000000..5f667f629
--- /dev/null
+++ b/apps/earn-protocol/features/user-activity/table/top-depositors-sorter.ts
@@ -0,0 +1,69 @@
+import { type TableSortedColumn } from '@summerfi/app-earn-ui'
+import { type SDKUsersActivityType } from '@summerfi/app-types'
+import { simpleSort, SortDirection } from '@summerfi/app-utils'
+import BigNumber from 'bignumber.js'
+
+import { calculateTopDepositors7daysChange } from '@/features/user-activity/table/top-depositors-mapper'
+
+export const topDepositorsSorter = ({
+  data,
+  sortConfig,
+}: {
+  data: SDKUsersActivityType
+  sortConfig?: TableSortedColumn<string>
+}) => {
+  switch (sortConfig?.key) {
+    case 'balance':
+      return data.sort((a, b) =>
+        simpleSort({
+          a: a.inputTokenBalance,
+          b: b.inputTokenBalance,
+          direction: sortConfig.direction,
+        }),
+      )
+    case 'change7d':
+      return data.sort((a, b) =>
+        simpleSort({
+          a: calculateTopDepositors7daysChange(a).toNumber(),
+          b: calculateTopDepositors7daysChange(b).toNumber(),
+          direction: sortConfig.direction,
+        }),
+      )
+    case 'projected1yrEarnings':
+      return data.sort((a, b) =>
+        simpleSort({
+          a: new BigNumber(a.inputTokenBalance.toString())
+            .times(Number(a.vault.apr365d) / 100)
+            .toNumber(),
+          b: new BigNumber(b.inputTokenBalance.toString())
+            .times(Number(b.vault.apr365d) / 100)
+            .toNumber(),
+          direction: sortConfig.direction,
+        }),
+      )
+    case 'numberOfDeposits':
+      return data.sort((a, b) =>
+        simpleSort({
+          a: a.deposits.length,
+          b: b.deposits.length,
+          direction: sortConfig.direction,
+        }),
+      )
+    case 'earningsStreak':
+      return data.sort((a, b) =>
+        simpleSort({
+          a: a.inputTokenBalance,
+          b: b.inputTokenBalance,
+          direction: sortConfig.direction,
+        }),
+      )
+    default:
+      return data.sort((a, b) =>
+        simpleSort({
+          a: a.inputTokenBalance,
+          b: b.inputTokenBalance,
+          direction: SortDirection.DESC,
+        }),
+      )
+  }
+}
diff --git a/apps/earn-protocol/features/user-activity/table/columns.ts b/apps/earn-protocol/features/user-activity/table/user-activity-columns.ts
similarity index 100%
rename from apps/earn-protocol/features/user-activity/table/columns.ts
rename to apps/earn-protocol/features/user-activity/table/user-activity-columns.ts
diff --git a/apps/earn-protocol/features/user-activity/table/mapper.tsx b/apps/earn-protocol/features/user-activity/table/user-activity-mapper.tsx
similarity index 99%
rename from apps/earn-protocol/features/user-activity/table/mapper.tsx
rename to apps/earn-protocol/features/user-activity/table/user-activity-mapper.tsx
index 63ee59bd5..44bc71db4 100644
--- a/apps/earn-protocol/features/user-activity/table/mapper.tsx
+++ b/apps/earn-protocol/features/user-activity/table/user-activity-mapper.tsx
@@ -11,7 +11,7 @@ import BigNumber from 'bignumber.js'
 import Link from 'next/link'
 
 import { type UsersActivity } from '@/app/server-handlers/sdk/get-users-activity'
-import { userActivitySorter } from '@/features/user-activity/table/sorter'
+import { userActivitySorter } from '@/features/user-activity/table/user-activity-sorter'
 
 const activityLabelMap = {
   [UserActivityType.DEPOSIT]: 'Deposit',
diff --git a/apps/earn-protocol/features/user-activity/table/sorter.ts b/apps/earn-protocol/features/user-activity/table/user-activity-sorter.ts
similarity index 100%
rename from apps/earn-protocol/features/user-activity/table/sorter.ts
rename to apps/earn-protocol/features/user-activity/table/user-activity-sorter.ts
diff --git a/apps/earn-protocol/features/user-activity/types/tabs.ts b/apps/earn-protocol/features/user-activity/types/tabs.ts
new file mode 100644
index 000000000..26b7c43ac
--- /dev/null
+++ b/apps/earn-protocol/features/user-activity/types/tabs.ts
@@ -0,0 +1,4 @@
+export enum UserActivityTab {
+  TOP_DEPOSITORS = 'TOP_DEPOSITORS',
+  LATEST_ACTIVITY = 'LATEST_ACTIVITY',
+}
diff --git a/apps/earn-protocol/hooks/use-amount.ts b/apps/earn-protocol/hooks/use-amount.ts
new file mode 100644
index 000000000..b69321d40
--- /dev/null
+++ b/apps/earn-protocol/hooks/use-amount.ts
@@ -0,0 +1,103 @@
+import { type ChangeEvent, useEffect, useMemo, useState } from 'react'
+import { type SDKVaultishType } from '@summerfi/app-types'
+import BigNumber from 'bignumber.js'
+
+type UseAmountProps = {
+  vault: SDKVaultishType
+}
+
+export const useAmount = ({ vault }: UseAmountProps) => {
+  const vaultTokenDecimals = vault.inputToken.decimals
+
+  const [editMode, setEditMode] = useState(false)
+  const [amountRaw, setAmountRaw] = useState<string>()
+
+  const amountDisplay = useMemo(() => {
+    if (!amountRaw && amountRaw !== '0') {
+      return '0.00'
+    }
+
+    if (new BigNumber(amountRaw).isNaN() || editMode) {
+      return amountRaw
+    }
+
+    const amountWithNoFollowingZeroes = new BigNumber(
+      // double parsing removes zeroes at the end
+      new BigNumber(amountRaw).toFixed(vaultTokenDecimals), // and this gives it a "max" decimals
+    ).toString()
+
+    return amountWithNoFollowingZeroes
+  }, [amountRaw, editMode, vaultTokenDecimals])
+
+  useEffect(() => {
+    if (!editMode) {
+      setAmountRaw(amountDisplay)
+    }
+  }, [editMode, amountDisplay])
+
+  const amountParsed = useMemo(() => {
+    if (!amountRaw || new BigNumber(amountRaw).isNaN()) {
+      return new BigNumber(0)
+    }
+
+    return new BigNumber(amountRaw)
+  }, [amountRaw])
+
+  const handleAmountChange = (ev: ChangeEvent<HTMLInputElement>) => {
+    const { value } = ev.target
+
+    if (!value) {
+      setAmountRaw(undefined)
+
+      return
+    }
+    const [integer, decimal] = value.split('.')
+
+    if (integer.startsWith('0')) {
+      ev.stopPropagation()
+      ev.preventDefault()
+
+      return
+    }
+
+    if (
+      // only one dot
+      value.split('').filter((char) => char === '.').length > 1 ||
+      // only numbers and dots
+      /[^0-9.]/gu.test(value) ||
+      // leading numbers max is vaultTokenDecimals
+      (decimal || '').length > vaultTokenDecimals
+    ) {
+      ev.stopPropagation()
+      ev.preventDefault()
+
+      return
+    }
+    setAmountRaw(value.trim())
+  }
+
+  return {
+    /**
+      A is a string version of the amount
+    */
+    amountRaw,
+    /**
+      A parsed (bignumber) version of the amount
+    */
+    amountParsed,
+    /**
+      A string version of the amount, formatted for display
+    */
+    amountDisplay,
+    /**
+      A function to handle changes to the amount (with event)
+    */
+    handleAmountChange,
+    /**
+      A function to manually set the amount
+    */
+    manualSetAmount: setAmountRaw,
+    onFocus: () => setEditMode(true),
+    onBlur: () => setEditMode(false),
+  }
+}
diff --git a/apps/earn-protocol/hooks/use-client.ts b/apps/earn-protocol/hooks/use-client.ts
new file mode 100644
index 000000000..e4b64982d
--- /dev/null
+++ b/apps/earn-protocol/hooks/use-client.ts
@@ -0,0 +1,107 @@
+import { useEffect, useMemo, useState } from 'react'
+import { useChain, useUser } from '@account-kit/react'
+import { type SDKVaultishType } from '@summerfi/app-types'
+import { ten } from '@summerfi/app-utils'
+import BigNumber from 'bignumber.js'
+import { createPublicClient, createWalletClient, custom, erc20Abi } from 'viem'
+
+import { subgraphNetworkToSDKId } from '@/helpers/network-helpers'
+
+export const useClient = ({ vault }: { vault?: SDKVaultishType }) => {
+  const user = useUser()
+  const { chain: connectedChain } = useChain()
+  const [tokenBalance, setTokenBalance] = useState<BigNumber>()
+  const [tokenBalanceLoading, setTokenBalanceLoading] = useState(true)
+
+  const transactionClient = useMemo(() => {
+    // used for the tx itself
+    if (user) {
+      // todo: handle other wallets, this is just working with metamask
+      if (user.type === 'eoa') {
+        const externalProvider = window.ethereum
+
+        return createWalletClient({
+          chain: connectedChain,
+          transport: custom(externalProvider),
+          account: user.address,
+        })
+      }
+    }
+
+    return null
+  }, [user, connectedChain])
+
+  const publicClient = useMemo(
+    // used for the tx receipt
+    () => {
+      if (user) {
+        // todo: handle other wallets, this is just working with metamask
+        if (user.type === 'eoa') {
+          const externalProvider = window.ethereum
+
+          return createPublicClient({
+            chain: connectedChain,
+            transport: custom(externalProvider),
+          })
+        }
+      }
+
+      return null
+    },
+    [connectedChain, user],
+  )
+
+  const userChainId = transactionClient?.chain.id
+  const vaultChainId = vault ? subgraphNetworkToSDKId(vault.protocol.network) : null
+
+  const isProperChainSelected = userChainId === vaultChainId
+
+  useEffect(() => {
+    const inputTokenAddress = vault?.inputToken.id
+    const inputTokenDecimals = vault?.inputToken.decimals
+
+    if (!user && tokenBalance) {
+      setTokenBalance(undefined)
+    }
+
+    if (user?.address && publicClient) {
+      if (inputTokenAddress && inputTokenDecimals && !tokenBalance && isProperChainSelected) {
+        setTokenBalanceLoading(true)
+        publicClient
+          .readContract({
+            abi: erc20Abi,
+            address: inputTokenAddress as `0x${string}`,
+            functionName: 'balanceOf',
+            args: [user.address],
+          })
+          .then((val) => {
+            setTokenBalanceLoading(false)
+            setTokenBalance(
+              new BigNumber(val.toString()).div(new BigNumber(ten).pow(inputTokenDecimals)),
+            )
+          })
+          .catch((err) => {
+            setTokenBalanceLoading(false)
+            // eslint-disable-next-line no-console
+            console.error('Error reading token balance', err)
+          })
+      }
+      setTokenBalanceLoading(false)
+    }
+  }, [
+    publicClient,
+    tokenBalance,
+    user,
+    tokenBalanceLoading,
+    vault?.inputToken.id,
+    vault?.inputToken.decimals,
+    isProperChainSelected,
+  ])
+
+  return {
+    publicClient,
+    transactionClient,
+    tokenBalance,
+    tokenBalanceLoading,
+  }
+}
diff --git a/apps/earn-protocol/hooks/use-transaction.ts b/apps/earn-protocol/hooks/use-transaction.ts
index ce623ba94..a99ceb32c 100644
--- a/apps/earn-protocol/hooks/use-transaction.ts
+++ b/apps/earn-protocol/hooks/use-transaction.ts
@@ -1,6 +1,6 @@
 'use client'
 
-import { type ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useAuthModal, useChain, useUser } from '@account-kit/react'
 import {
   type EarnTransactionTypes,
@@ -8,17 +8,24 @@ import {
   type SDKVaultishType,
   type TransactionInfoLabeled,
 } from '@summerfi/app-types'
-import { mapNumericInput } from '@summerfi/app-utils'
 import { Address, ChainInfo, type TransactionInfo } from '@summerfi/sdk-client-react'
-import BigNumber from 'bignumber.js'
+import type BigNumber from 'bignumber.js'
 import { capitalize } from 'lodash-es'
 import { useRouter } from 'next/navigation'
-import { createPublicClient, createWalletClient, custom } from 'viem'
 
 import { SDKChainIdToAAChainMap } from '@/account-kit/config'
 import { TransactionAction } from '@/constants/transaction-actions'
 import { subgraphNetworkToSDKId } from '@/helpers/network-helpers'
 import { useAppSDK } from '@/hooks/use-app-sdk'
+import { type useClient } from '@/hooks/use-client'
+
+type UseTransactionParams = {
+  vault: SDKVaultishType
+  amountParsed: BigNumber | undefined
+  manualSetAmount: (amountParsed: string | undefined) => void
+  transactionClient: ReturnType<typeof useClient>['transactionClient']
+  publicClient: ReturnType<typeof useClient>['publicClient']
+}
 
 const labelTransactions = (transactions: TransactionInfo[]) => {
   return transactions.map((tx) => ({
@@ -28,7 +35,13 @@ const labelTransactions = (transactions: TransactionInfo[]) => {
   }))
 }
 
-export const useTransaction = ({ vault }: { vault: SDKVaultishType }) => {
+export const useTransaction = ({
+  vault,
+  manualSetAmount,
+  transactionClient,
+  publicClient,
+  amountParsed,
+}: UseTransactionParams) => {
   const [transactionType, setTransactionType] = useState<TransactionAction>(
     TransactionAction.DEPOSIT,
   )
@@ -37,80 +50,24 @@ export const useTransaction = ({ vault }: { vault: SDKVaultishType }) => {
   const [txSteps, setTxSteps] = useState<number>()
   const [txStatus, setTxStatus] = useState<EarnTransactionViewStates>('idle')
   const [transactions, setTransactions] = useState<TransactionInfoLabeled[]>()
-  const [amount, setAmount] = useState<BigNumber>()
   const [error, setError] = useState<string>()
   const { getDepositTX, getWithdrawTX } = useAppSDK()
   const user = useUser()
   const { openAuthModal, isOpen: isAuthModalOpen } = useAuthModal()
-  const { chain: connectedChain, setChain, isSettingChain } = useChain()
+  const { setChain, isSettingChain } = useChain()
 
-  const reset = () => {
-    setAmount(undefined)
+  const reset = useCallback(() => {
+    manualSetAmount(undefined)
     setTransactions(undefined)
     setTxStatus('idle')
     setError(undefined)
     setTxHashes([])
-  }
-
-  const handleAmountChange = (ev: ChangeEvent<HTMLInputElement>) => {
-    if (!ev.target.value) {
-      setAmount(undefined)
-
-      return
-    }
-    setAmount(new BigNumber(ev.target.value.replaceAll(',', '').trim()))
-  }
+  }, [manualSetAmount])
 
   const removeTxHash = useCallback((txHash: string) => {
     setTxHashes((prev) => prev.filter((tx) => tx.hash !== txHash))
   }, [])
 
-  const amountDisplayValue = useMemo(() => {
-    if (!amount) {
-      return ''
-    }
-
-    return mapNumericInput(amount.toString())
-  }, [amount])
-
-  const transactionClient = useMemo(() => {
-    // used for the tx itself
-    if (user) {
-      // todo: handle other wallets, this is just working with metamask
-      if (user.type === 'eoa') {
-        const externalProvider = window.ethereum
-
-        return createWalletClient({
-          chain: connectedChain,
-          transport: custom(externalProvider),
-          account: user.address,
-        })
-      }
-    }
-
-    return null
-  }, [user, connectedChain])
-
-  const publicClient = useMemo(
-    // used for the tx receipt
-    () => {
-      if (user) {
-        // todo: handle other wallets, this is just working with metamask
-        if (user.type === 'eoa') {
-          const externalProvider = window.ethereum
-
-          return createPublicClient({
-            chain: connectedChain,
-            transport: custom(externalProvider),
-          })
-        }
-      }
-
-      return null
-    },
-    [connectedChain, user],
-  )
-
   const userChainId = transactionClient?.chain.id
   const vaultChainId = subgraphNetworkToSDKId(vault.protocol.network)
 
@@ -164,7 +121,7 @@ export const useTransaction = ({ vault }: { vault: SDKVaultishType }) => {
   }, [nextTransaction, transactionClient, publicClient, transactions])
 
   const getTransactionsList = useCallback(async () => {
-    if (amount && user) {
+    if (amountParsed && user) {
       setTxStatus('loadingTx')
       try {
         let transactionsList: TransactionInfo[] = []
@@ -175,7 +132,7 @@ export const useTransaction = ({ vault }: { vault: SDKVaultishType }) => {
               walletAddress: Address.createFromEthereum({
                 value: user.address,
               }),
-              amount: amount.toString(),
+              amount: amountParsed.toString(),
               fleetAddress: vault.id,
               chainInfo: ChainInfo.createFrom({
                 name: vault.protocol.network,
@@ -189,7 +146,7 @@ export const useTransaction = ({ vault }: { vault: SDKVaultishType }) => {
               walletAddress: Address.createFromEthereum({
                 value: user.address,
               }),
-              amount: amount.toString(),
+              amount: amountParsed.toString(),
               fleetAddress: vault.id,
               chainInfo: ChainInfo.createFrom({
                 name: vault.protocol.network,
@@ -218,7 +175,7 @@ export const useTransaction = ({ vault }: { vault: SDKVaultishType }) => {
       }
     }
   }, [
-    amount,
+    amountParsed,
     user,
     transactionType,
     getDepositTX,
@@ -250,9 +207,9 @@ export const useTransaction = ({ vault }: { vault: SDKVaultishType }) => {
         loading: isSettingChain,
       }
     }
-    if (!amount || amount.isZero()) {
+    if (!amountParsed || amountParsed.isZero()) {
       return {
-        label: 'Deposit',
+        label: capitalize(transactionType),
         action: () => null,
         disabled: true,
       }
@@ -294,7 +251,7 @@ export const useTransaction = ({ vault }: { vault: SDKVaultishType }) => {
     user,
     isProperChainSelected,
     isSettingChain,
-    amount,
+    amountParsed,
     transactionType,
     txStatus,
     nextTransaction?.label,
@@ -314,12 +271,11 @@ export const useTransaction = ({ vault }: { vault: SDKVaultishType }) => {
       refreshView()
       reset()
     }
-  }, [refreshView, transactions?.length, txStatus])
+  }, [refreshView, reset, transactions?.length, txStatus])
 
   return {
-    amountDisplayValue,
-    handleAmountChange,
-    amount,
+    manualSetAmount,
+    amountParsed,
     sidebar: {
       primaryButton,
       error,
diff --git a/packages/app-earn-ui/src/components/molecules/InputWithDropdown/InputWithDropdown.tsx b/packages/app-earn-ui/src/components/molecules/InputWithDropdown/InputWithDropdown.tsx
index ba5ce53f7..f86cdb142 100644
--- a/packages/app-earn-ui/src/components/molecules/InputWithDropdown/InputWithDropdown.tsx
+++ b/packages/app-earn-ui/src/components/molecules/InputWithDropdown/InputWithDropdown.tsx
@@ -31,6 +31,8 @@ interface InputWithDropdownProps {
     value: ReactNode
     action: () => void
   }
+  onFocus?: () => void
+  onBlur?: () => void
 }
 
 export const InputWithDropdown: FC<InputWithDropdownProps> = ({
@@ -40,6 +42,8 @@ export const InputWithDropdown: FC<InputWithDropdownProps> = ({
   secondaryValue,
   handleChange,
   heading,
+  onFocus,
+  onBlur,
 }) => {
   return (
     <div className={classNames.wrapper}>
@@ -48,7 +52,12 @@ export const InputWithDropdown: FC<InputWithDropdownProps> = ({
           <Text as="p" variant="p3semi" style={{ color: 'var(--earn-protocol-secondary-40)' }}>
             {heading.label}
           </Text>
-          <Text as="p" variant="p3semi" className={classNames.headingWrapperAction}>
+          <Text
+            as="p"
+            variant="p3semi"
+            className={classNames.headingWrapperAction}
+            onClick={heading.action}
+          >
             {heading.value}
           </Text>
         </div>
@@ -72,6 +81,8 @@ export const InputWithDropdown: FC<InputWithDropdownProps> = ({
           value={value}
           onChange={handleChange}
           secondaryValue={secondaryValue}
+          onFocus={onFocus}
+          onBlur={onBlur}
         />
       </div>
     </div>
diff --git a/packages/app-types/types/src/earn-protocol/index.ts b/packages/app-types/types/src/earn-protocol/index.ts
index da76cef00..e4b61683b 100644
--- a/packages/app-types/types/src/earn-protocol/index.ts
+++ b/packages/app-types/types/src/earn-protocol/index.ts
@@ -47,3 +47,14 @@ export enum UserActivityType {
   DEPOSIT = 'DEPOSIT',
   WITHDRAW = 'WITHDRAW',
 }
+
+export interface UserActivity {
+  timestamp: SDKUserActivityType['deposits'][0]['timestamp']
+  amount: SDKUserActivityType['deposits'][0]['amount']
+  balance: SDKUserActivityType['inputTokenBalance']
+  vault: SDKUserActivityType['vault']
+  account: SDKUserActivityType['account']['id']
+  activity: UserActivityType
+}
+
+export type UsersActivity = UserActivity[]
diff --git a/packages/app-utils/src/helpers/get-past-timestamp.ts b/packages/app-utils/src/helpers/get-past-timestamp.ts
new file mode 100644
index 000000000..4437b1ab8
--- /dev/null
+++ b/packages/app-utils/src/helpers/get-past-timestamp.ts
@@ -0,0 +1,25 @@
+/**
+ * Calculates a timestamp for a specific number of days in the past.
+ *
+ * @param daysAgo - The number of days in the past to calculate the timestamp.
+ * @returns A timestamp (in milliseconds) that represents the date `daysAgo` days in the past from the current date.
+ *
+ * @example
+ * const pastTimestamp = getPastTimestamp(7);
+ * console.log(pastTimestamp); // Output: Timestamp for 7 days ago
+ *
+ * @remarks
+ * - This function uses the current system time (`Date.now()`) as the starting point.
+ * - It assumes a day length of 24 hours, and does not account for variations such as daylight saving time.
+ */
+export const getPastTimestamp = (daysAgo: number): number => {
+  // Get the current timestamp in milliseconds
+  const currentTimestamp = Date.now()
+
+  // Calculate milliseconds in a day
+  const millisecondsInADay = 24 * 60 * 60 * 1000
+
+  // Calculate the timestamp 'daysAgo' days in the past
+  // eslint-disable-next-line no-mixed-operators
+  return currentTimestamp - daysAgo * millisecondsInADay
+}
diff --git a/packages/app-utils/src/index.ts b/packages/app-utils/src/index.ts
index 3fca67dea..5b37a0172 100644
--- a/packages/app-utils/src/index.ts
+++ b/packages/app-utils/src/index.ts
@@ -47,3 +47,4 @@ export {
 } from './helpers/config/access-config-context'
 export { toggleArrayItem } from './helpers/toggle-array-item'
 export { simpleSort, SortDirection } from './helpers/simple-sort'
+export { getPastTimestamp } from './helpers/get-past-timestamp'
diff --git a/sdk/armada-protocol-common/src/common/index.ts b/sdk/armada-protocol-common/src/common/index.ts
index 8c214d42b..dc0e6fbf5 100644
--- a/sdk/armada-protocol-common/src/common/index.ts
+++ b/sdk/armada-protocol-common/src/common/index.ts
@@ -4,4 +4,5 @@ export type {
   GetVaultQuery,
   GetGlobalRebalancesQuery,
   GetUsersActivityQuery,
+  GetUserActivityQuery,
 } from '@summerfi/subgraph-manager-common'
diff --git a/sdk/armada-protocol-common/src/common/interfaces/IArmadaManager.ts b/sdk/armada-protocol-common/src/common/interfaces/IArmadaManager.ts
index 76b593e26..9c9cfdf93 100644
--- a/sdk/armada-protocol-common/src/common/interfaces/IArmadaManager.ts
+++ b/sdk/armada-protocol-common/src/common/interfaces/IArmadaManager.ts
@@ -10,6 +10,7 @@ import type {
   GetVaultQuery,
   GetVaultsQuery,
   GetUsersActivityQuery,
+  GetUserActivityQuery,
 } from '@summerfi/subgraph-manager-common'
 import type { IRebalanceData } from '@summerfi/contracts-provider-common'
 
@@ -60,6 +61,16 @@ export interface IArmadaManager {
    */
   getUsersActivityRaw(params: { chainInfo: ChainInfo }): Promise<GetUsersActivityQuery>
 
+  /**
+   * @name getUserActivityRaw
+   * @description Get all user activity per given chain
+   *
+   * @param chainInfo Chain information
+   *
+   * @returns GerUsersActivityQuery
+   */
+  getUserActivityRaw(params: { poolId: IArmadaVaultId }): Promise<GetUserActivityQuery>
+
   /**
    * @name getPoolInfo
    * @description Get the extended position information for a position
diff --git a/sdk/armada-protocol-service/src/common/implementation/ArmadaManager.ts b/sdk/armada-protocol-service/src/common/implementation/ArmadaManager.ts
index bfec9ddcc..717a9f711 100644
--- a/sdk/armada-protocol-service/src/common/implementation/ArmadaManager.ts
+++ b/sdk/armada-protocol-service/src/common/implementation/ArmadaManager.ts
@@ -60,10 +60,18 @@ export class ArmadaManager implements IArmadaManager {
   }
 
   /** @see IArmadaManager.getUsersActivityRaw */
-  async getUsersActivityRaw(params: Parameters<IArmadaManager['getGlobalRebalancesRaw']>[0]) {
+  async getUsersActivityRaw(params: Parameters<IArmadaManager['getUsersActivityRaw']>[0]) {
     return this._subgraphManager.getUsersActivity({ chainId: params.chainInfo.chainId })
   }
 
+  /** @see IArmadaManager.getUserActivityRaw */
+  async getUserActivityRaw(params: Parameters<IArmadaManager['getUserActivityRaw']>[0]) {
+    return this._subgraphManager.getUserActivity({
+      chainId: params.poolId.chainInfo.chainId,
+      vaultId: params.poolId.fleetAddress.value,
+    })
+  }
+
   /** @see IArmadaManager.getPoolInfo */
   async getPoolInfo(params: { poolId: IArmadaVaultId }): Promise<IArmadaPoolInfo> {
     const fleetContract = await this._contractsProvider.getFleetCommanderContract({
diff --git a/sdk/sdk-client/src/implementation/ArmadaManager/ArmadaManagerUsersClient.ts b/sdk/sdk-client/src/implementation/ArmadaManager/ArmadaManagerUsersClient.ts
index b8df98035..3e4bdc508 100644
--- a/sdk/sdk-client/src/implementation/ArmadaManager/ArmadaManagerUsersClient.ts
+++ b/sdk/sdk-client/src/implementation/ArmadaManager/ArmadaManagerUsersClient.ts
@@ -43,6 +43,11 @@ export class ArmadaManagerUsersClient extends IRPCClient implements IArmadaManag
     return this.rpcClient.armada.users.getUsersActivityRaw.query(params)
   }
 
+  /** @see IArmadaManagerUsersClient.getUserActivityRaw */
+  async getUserActivityRaw(params: Parameters<IArmadaManagerUsersClient['getUserActivityRaw']>[0]) {
+    return this.rpcClient.armada.users.getUserActivityRaw.query(params)
+  }
+
   /** @see IArmadaManagerUsersClient.getPoolInfo */
   async getPoolInfo(params: { poolId: IArmadaVaultId }): Promise<IArmadaPoolInfo> {
     return this.rpcClient.armada.users.getPoolInfo.query(params)
diff --git a/sdk/sdk-client/src/interfaces/ArmadaManager/IArmadaManagerUsersClient.ts b/sdk/sdk-client/src/interfaces/ArmadaManager/IArmadaManagerUsersClient.ts
index fa101f7b6..122e6cacc 100644
--- a/sdk/sdk-client/src/interfaces/ArmadaManager/IArmadaManagerUsersClient.ts
+++ b/sdk/sdk-client/src/interfaces/ArmadaManager/IArmadaManagerUsersClient.ts
@@ -7,6 +7,7 @@ import {
   type GetVaultsQuery,
   type GetGlobalRebalancesQuery,
   type GetUsersActivityQuery,
+  type GetUserActivityQuery,
 } from '@summerfi/armada-protocol-common'
 import {
   ITokenAmount,
@@ -62,6 +63,16 @@ export interface IArmadaManagerUsersClient {
    */
   getUsersActivityRaw(params: { chainInfo: ChainInfo }): Promise<GetUsersActivityQuery>
 
+  /**
+   * @name getUserActivityRaw
+   * @description Get all users activity per given chain
+   *
+   * @param chainInfo Chain information
+   *
+   * @returns GerUserActivityQuery
+   */
+  getUserActivityRaw(params: { poolId: IArmadaVaultId }): Promise<GetUserActivityQuery>
+
   /**
    * @method getPoolInfo
    * @description Retrieves the information of an Armada pool by its ID
diff --git a/sdk/sdk-server/src/SDKAppRouter.ts b/sdk/sdk-server/src/SDKAppRouter.ts
index 0cb397423..5c914e8cf 100644
--- a/sdk/sdk-server/src/SDKAppRouter.ts
+++ b/sdk/sdk-server/src/SDKAppRouter.ts
@@ -38,6 +38,7 @@ import { getTokenByName } from './handlers/getTokenByName'
 import { getTokenBySymbol } from './handlers/getTokenBySymbol'
 import { getGlobalRebalancesRaw } from './armada-protocol-handlers/users/getGlobalRebalancesRaw'
 import { getUsersActivityRaw } from './armada-protocol-handlers/users/getUsersActivityRaw'
+import { getUserActivityRaw } from './armada-protocol-handlers/users/getUserActivityRaw'
 
 /**
  * Server
@@ -71,6 +72,7 @@ export const sdkAppRouter = router({
       getVaultRaw: getVaultRaw,
       getGlobalRebalancesRaw: getGlobalRebalancesRaw,
       getUsersActivityRaw: getUsersActivityRaw,
+      getUserActivityRaw: getUserActivityRaw,
       getPoolInfo: getPoolInfo,
       getPosition: getArmadaPosition,
       getUserPositions: getUserPositions,
diff --git a/sdk/sdk-server/src/armada-protocol-handlers/users/getUserActivityRaw.ts b/sdk/sdk-server/src/armada-protocol-handlers/users/getUserActivityRaw.ts
new file mode 100644
index 000000000..3c6ec2457
--- /dev/null
+++ b/sdk/sdk-server/src/armada-protocol-handlers/users/getUserActivityRaw.ts
@@ -0,0 +1,13 @@
+import { z } from 'zod'
+import { publicProcedure } from '../../SDKTRPC'
+import { IArmadaVaultId, isArmadaVaultId } from '@summerfi/armada-protocol-common'
+
+export const getUserActivityRaw = publicProcedure
+  .input(
+    z.object({
+      poolId: z.custom<IArmadaVaultId>(isArmadaVaultId),
+    }),
+  )
+  .query(async (opts) => {
+    return opts.ctx.armadaManager.getUserActivityRaw(opts.input)
+  })
diff --git a/sdk/subgraph-manager-common/src/generated/client.ts b/sdk/subgraph-manager-common/src/generated/client.ts
index a7b2f651a..e4dcaa069 100644
--- a/sdk/subgraph-manager-common/src/generated/client.ts
+++ b/sdk/subgraph-manager-common/src/generated/client.ts
@@ -6946,10 +6946,17 @@ export type GetUserPositionQueryVariables = Exact<{
 
 export type GetUserPositionQuery = { __typename?: 'Query', positions: Array<{ __typename?: 'Position', id: string, inputTokenBalance: bigint, outputTokenBalance: bigint, vault: { __typename?: 'Vault', id: string, inputToken: { __typename?: 'Token', id: string, symbol: string, name: string, decimals: number }, outputToken?: { __typename?: 'Token', id: string, symbol: string, name: string, decimals: number } | null, protocol: { __typename?: 'YieldAggregator', id: string } }, account: { __typename?: 'Account', id: string } }> };
 
+export type GetUserActivityQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type GetUserActivityQuery = { __typename?: 'Query', positions: Array<{ __typename?: 'Position', inputTokenBalance: bigint, account: { __typename?: 'Account', id: string }, deposits: Array<{ __typename?: 'Deposit', timestamp: bigint, amount: bigint }>, withdrawals: Array<{ __typename?: 'Withdraw', timestamp: bigint, amount: bigint }>, vault: { __typename?: 'Vault', id: string, name?: string | null, apr365d: string, inputToken: { __typename?: 'Token', symbol: string, decimals: number }, protocol: { __typename?: 'YieldAggregator', network: Network } } }> };
+
 export type GetUsersActivityQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetUsersActivityQuery = { __typename?: 'Query', positions: Array<{ __typename?: 'Position', inputTokenBalance: bigint, account: { __typename?: 'Account', id: string }, deposits: Array<{ __typename?: 'Deposit', timestamp: bigint, amount: bigint }>, withdrawals: Array<{ __typename?: 'Withdraw', timestamp: bigint, amount: bigint }>, vault: { __typename?: 'Vault', id: string, name?: string | null, inputToken: { __typename?: 'Token', id: string, symbol: string, decimals: number }, protocol: { __typename?: 'YieldAggregator', network: Network } } }> };
+export type GetUsersActivityQuery = { __typename?: 'Query', positions: Array<{ __typename?: 'Position', inputTokenBalance: bigint, account: { __typename?: 'Account', id: string }, deposits: Array<{ __typename?: 'Deposit', timestamp: bigint, amount: bigint }>, withdrawals: Array<{ __typename?: 'Withdraw', timestamp: bigint, amount: bigint }>, vault: { __typename?: 'Vault', id: string, name?: string | null, apr365d: string, inputToken: { __typename?: 'Token', id: string, symbol: string, decimals: number }, protocol: { __typename?: 'YieldAggregator', network: Network } } }> };
 
 export type GetVaultsQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -6961,7 +6968,7 @@ export type GetVaultQueryVariables = Exact<{
 }>;
 
 
-export type GetVaultQuery = { __typename?: 'Query', vault?: { __typename?: 'Vault', id: string, name?: string | null, rewardTokenEmissionsUSD?: Array<string> | null, outputTokenPriceUSD?: string | null, depositLimit: bigint, createdTimestamp: bigint, totalValueLockedUSD: string, cumulativeTotalRevenueUSD: string, cumulativeSupplySideRevenueUSD: string, cumulativeProtocolSideRevenueUSD: string, lastUpdateTimestamp: bigint, apr7d: string, apr30d: string, apr90d: string, apr180d: string, apr365d: string, calculatedApr: string, aprValues: Array<string>, protocol: { __typename?: 'YieldAggregator', network: Network }, rewardTokens?: Array<{ __typename?: 'RewardToken', id: string, token: { __typename?: 'Token', id: string, symbol: string, decimals: number } }> | null, rebalances: Array<{ __typename?: 'Rebalance', id: string, amount: bigint, amountUSD: string, timestamp: bigint, asset: { __typename?: 'Token', symbol: string, decimals: number }, from: { __typename?: 'Ark', name?: string | null, depositLimit: bigint, calculatedApr: string, totalValueLockedUSD: string }, to: { __typename?: 'Ark', name?: string | null, depositLimit: bigint, calculatedApr: string, totalValueLockedUSD: string }, toPostAction: { __typename?: 'PostActionArkSnapshot', totalValueLockedUSD: string, depositLimit: bigint }, fromPostAction: { __typename?: 'PostActionArkSnapshot', totalValueLockedUSD: string, depositLimit: bigint }, protocol: { __typename?: 'YieldAggregator', name: string, network: Network }, vault: { __typename?: 'Vault', id: string, name?: string | null, inputToken: { __typename?: 'Token', id: string, symbol: string } } }>, arks: Array<{ __typename?: 'Ark', id: string, name?: string | null, depositLimit: bigint, cumulativeDeposits: bigint, cumulativeEarnings: bigint, cumulativeWithdrawals: bigint, createdTimestamp: bigint, lastUpdateTimestamp: bigint, inputToken: { __typename?: 'Token', id: string, name: string, symbol: string, decimals: number }, dailySnapshots: Array<{ __typename?: 'ArkDailySnapshot', id: string, apr: string, totalValueLockedUSD: string, inputTokenBalance: bigint }>, hourlySnapshots: Array<{ __typename?: 'ArkHourlySnapshot', id: string, calculatedApr: string, totalValueLockedUSD: string, inputTokenBalance: bigint }>, fees: Array<{ __typename?: 'VaultFee', id: string, feePercentage?: string | null, feeType: VaultFeeType }> }>, inputToken: { __typename?: 'Token', id: string, name: string, symbol: string, decimals: number }, outputToken?: { __typename?: 'Token', id: string, name: string, symbol: string, decimals: number } | null } | null };
+export type GetVaultQuery = { __typename?: 'Query', vault?: { __typename?: 'Vault', id: string, name?: string | null, rewardTokenEmissionsUSD?: Array<string> | null, outputTokenPriceUSD?: string | null, depositLimit: bigint, createdTimestamp: bigint, totalValueLockedUSD: string, cumulativeTotalRevenueUSD: string, cumulativeSupplySideRevenueUSD: string, cumulativeProtocolSideRevenueUSD: string, lastUpdateTimestamp: bigint, apr7d: string, apr30d: string, apr90d: string, apr180d: string, apr365d: string, calculatedApr: string, aprValues: Array<string>, protocol: { __typename?: 'YieldAggregator', network: Network }, rewardTokens?: Array<{ __typename?: 'RewardToken', id: string, token: { __typename?: 'Token', id: string, symbol: string, decimals: number } }> | null, rebalances: Array<{ __typename?: 'Rebalance', id: string, amount: bigint, amountUSD: string, timestamp: bigint, asset: { __typename?: 'Token', id: string, symbol: string, decimals: number }, from: { __typename?: 'Ark', name?: string | null, depositLimit: bigint, calculatedApr: string, totalValueLockedUSD: string }, to: { __typename?: 'Ark', name?: string | null, depositLimit: bigint, calculatedApr: string, totalValueLockedUSD: string }, toPostAction: { __typename?: 'PostActionArkSnapshot', totalValueLockedUSD: string, depositLimit: bigint }, fromPostAction: { __typename?: 'PostActionArkSnapshot', totalValueLockedUSD: string, depositLimit: bigint }, protocol: { __typename?: 'YieldAggregator', name: string, network: Network }, vault: { __typename?: 'Vault', id: string, name?: string | null, inputToken: { __typename?: 'Token', id: string, symbol: string } } }>, arks: Array<{ __typename?: 'Ark', id: string, name?: string | null, depositLimit: bigint, cumulativeDeposits: bigint, cumulativeEarnings: bigint, cumulativeWithdrawals: bigint, createdTimestamp: bigint, lastUpdateTimestamp: bigint, inputToken: { __typename?: 'Token', id: string, name: string, symbol: string, decimals: number }, dailySnapshots: Array<{ __typename?: 'ArkDailySnapshot', id: string, apr: string, totalValueLockedUSD: string, inputTokenBalance: bigint }>, hourlySnapshots: Array<{ __typename?: 'ArkHourlySnapshot', id: string, calculatedApr: string, totalValueLockedUSD: string, inputTokenBalance: bigint }>, fees: Array<{ __typename?: 'VaultFee', id: string, feePercentage?: string | null, feeType: VaultFeeType }> }>, inputToken: { __typename?: 'Token', id: string, name: string, symbol: string, decimals: number }, outputToken?: { __typename?: 'Token', id: string, name: string, symbol: string, decimals: number } | null } | null };
 
 
 export const GetGlobalRebalancesDocument = gql`
@@ -7071,6 +7078,36 @@ export const GetUserPositionDocument = gql`
   }
 }
     `;
+export const GetUserActivityDocument = gql`
+    query GetUserActivity($id: ID!) {
+  positions(where: {vault_: {id: $id}}) {
+    account {
+      id
+    }
+    inputTokenBalance
+    deposits {
+      timestamp
+      amount
+    }
+    withdrawals {
+      timestamp
+      amount
+    }
+    vault {
+      id
+      name
+      inputToken {
+        symbol
+        decimals
+      }
+      protocol {
+        network
+      }
+      apr365d
+    }
+  }
+}
+    `;
 export const GetUsersActivityDocument = gql`
     query GetUsersActivity {
   positions {
@@ -7097,6 +7134,7 @@ export const GetUsersActivityDocument = gql`
       protocol {
         network
       }
+      apr365d
     }
   }
 }
@@ -7187,6 +7225,7 @@ export const GetVaultDocument = gql`
       amount
       amountUSD
       asset {
+        id
         symbol
         decimals
       }
@@ -7304,6 +7343,9 @@ export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper =
     GetUserPosition(variables: GetUserPositionQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<GetUserPositionQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<GetUserPositionQuery>(GetUserPositionDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetUserPosition', 'query', variables);
     },
+    GetUserActivity(variables: GetUserActivityQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<GetUserActivityQuery> {
+      return withWrapper((wrappedRequestHeaders) => client.request<GetUserActivityQuery>(GetUserActivityDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetUserActivity', 'query', variables);
+    },
     GetUsersActivity(variables?: GetUsersActivityQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<GetUsersActivityQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<GetUsersActivityQuery>(GetUsersActivityDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetUsersActivity', 'query', variables);
     },
diff --git a/sdk/subgraph-manager-common/src/interfaces/IArmadaSubgraphManager.ts b/sdk/subgraph-manager-common/src/interfaces/IArmadaSubgraphManager.ts
index f5b67cc2a..7a5fa2428 100644
--- a/sdk/subgraph-manager-common/src/interfaces/IArmadaSubgraphManager.ts
+++ b/sdk/subgraph-manager-common/src/interfaces/IArmadaSubgraphManager.ts
@@ -6,6 +6,7 @@ import type {
   GetVaultsQuery,
   GetGlobalRebalancesQuery,
   GetUsersActivityQuery,
+  GetUserActivityQuery,
 } from '../generated/client'
 
 /**
@@ -85,4 +86,14 @@ export interface IArmadaSubgraphManager {
    * @returns GetUsersActivityQuery
    */
   getUsersActivity(params: { chainId: ChainId }): Promise<GetUsersActivityQuery>
+
+  /**
+   * @name getUserActivity
+   * @description Get all rebalances per given chain
+   *
+   * @param chainInfo Chain information
+   *
+   * @returns GetUserActivityQuery
+   */
+  getUserActivity(params: { chainId: ChainId; vaultId: string }): Promise<GetUserActivityQuery>
 }
diff --git a/sdk/subgraph-manager-common/src/queries/user-activity.graphql b/sdk/subgraph-manager-common/src/queries/user-activity.graphql
new file mode 100644
index 000000000..f931aff3a
--- /dev/null
+++ b/sdk/subgraph-manager-common/src/queries/user-activity.graphql
@@ -0,0 +1,28 @@
+query GetUserActivity($id: ID!) {
+  positions(where: { vault_: { id: $id } }) {
+    account {
+      id
+    }
+    inputTokenBalance
+    deposits {
+      timestamp
+      amount
+    }
+    withdrawals {
+      timestamp
+      amount
+    }
+    vault {
+      id
+      name
+      inputToken {
+        symbol
+        decimals
+      }
+      protocol {
+        network
+      }
+      apr365d
+    }
+  }
+}
diff --git a/sdk/subgraph-manager-common/src/queries/users-activity.graphql b/sdk/subgraph-manager-common/src/queries/users-activity.graphql
index b13093a6a..1a61619a3 100644
--- a/sdk/subgraph-manager-common/src/queries/users-activity.graphql
+++ b/sdk/subgraph-manager-common/src/queries/users-activity.graphql
@@ -23,6 +23,7 @@ query GetUsersActivity {
       protocol {
         network
       }
+      apr365d
     }
   }
 }
diff --git a/sdk/subgraph-manager-common/src/queries/vaults.graphql b/sdk/subgraph-manager-common/src/queries/vaults.graphql
index 1378a2223..cdb4389c1 100644
--- a/sdk/subgraph-manager-common/src/queries/vaults.graphql
+++ b/sdk/subgraph-manager-common/src/queries/vaults.graphql
@@ -81,6 +81,7 @@ query GetVault($id: ID!) {
       amount
       amountUSD
       asset {
+        id
         symbol
         decimals
       }
diff --git a/sdk/subgraph-manager-service/src/implementation/armada/ArmadaSubgraphManager.ts b/sdk/subgraph-manager-service/src/implementation/armada/ArmadaSubgraphManager.ts
index 4c033becb..0980ab844 100644
--- a/sdk/subgraph-manager-service/src/implementation/armada/ArmadaSubgraphManager.ts
+++ b/sdk/subgraph-manager-service/src/implementation/armada/ArmadaSubgraphManager.ts
@@ -40,6 +40,10 @@ export class ArmadaSubgraphManager implements IArmadaSubgraphManager {
     return this._getClient(chainId).GetUsersActivity()
   }
 
+  getUserActivity({ chainId, vaultId }: Parameters<IArmadaSubgraphManager['getUserActivity']>[0]) {
+    return this._getClient(chainId).GetUserActivity({ id: vaultId })
+  }
+
   getUserPositions({ user }: Parameters<IArmadaSubgraphManager['getUserPositions']>[0]) {
     return this._getClient(user.chainInfo.chainId).GetUserPositions({
       accountAddress: user.wallet.address.value,