From aca9c9ae81368fe8bbddc6660950eea216c58a75 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Thu, 18 Jul 2024 18:40:19 +0200
Subject: [PATCH 01/68] feat(wallet-dashboard): fetch supply increase
 timelocked portfolio

---
 apps/core/src/constants/index.ts              |  1 +
 apps/core/src/constants/packages.constants.ts |  5 +++
 apps/core/src/hooks/index.ts                  |  1 +
 .../core/src/hooks/useGetTimelockedObjects.ts | 36 +++++++++++++++++++
 .../lib/constants/vesting.constants.ts        |  3 ++
 5 files changed, 46 insertions(+)
 create mode 100644 apps/core/src/constants/packages.constants.ts
 create mode 100644 apps/core/src/hooks/useGetTimelockedObjects.ts

diff --git a/apps/core/src/constants/index.ts b/apps/core/src/constants/index.ts
index 50a180aa574..719fddeb388 100644
--- a/apps/core/src/constants/index.ts
+++ b/apps/core/src/constants/index.ts
@@ -4,3 +4,4 @@
 export * from './staking.constants';
 export * from './recognizedPackages.constants';
 export * from './coins.constants';
+export * from './packages.constants';
diff --git a/apps/core/src/constants/packages.constants.ts b/apps/core/src/constants/packages.constants.ts
new file mode 100644
index 00000000000..a1b6caa943f
--- /dev/null
+++ b/apps/core/src/constants/packages.constants.ts
@@ -0,0 +1,5 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export const TIMELOCK_PACKAGE_ID =
+    '0xa9ed4baf8210bda422feaf348dd5dd730618bf736372871bfcf4d755e942dd61'; // TODO: modify with real package https://github.com/iotaledger/iota/issues/1219
diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index 646721aa723..92aff722afb 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -34,5 +34,6 @@ export * from './useExtendedTransactionSummary';
 export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
+export * from './useGetTimelockedObjects';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useGetTimelockedObjects.ts b/apps/core/src/hooks/useGetTimelockedObjects.ts
new file mode 100644
index 00000000000..16719e816b2
--- /dev/null
+++ b/apps/core/src/hooks/useGetTimelockedObjects.ts
@@ -0,0 +1,36 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { useIotaClient } from '@iota/dapp-kit';
+import { PaginatedObjectsResponse, type IotaObjectDataFilter } from '@iota/iota.js/client';
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { TIMELOCK_PACKAGE_ID } from '../constants';
+
+const MAX_OBJECTS_PER_REQ = 6;
+
+export function useGetTimelockedObjects(address: string, maxObjectRequests = MAX_OBJECTS_PER_REQ) {
+    const client = useIotaClient();
+    const filter: IotaObjectDataFilter = {
+        Package: TIMELOCK_PACKAGE_ID,
+    };
+    return useInfiniteQuery<PaginatedObjectsResponse>({
+        initialPageParam: null,
+        queryKey: ['get-timelocked-objects', address, filter, maxObjectRequests],
+        queryFn: ({ pageParam }) =>
+            client.getOwnedObjects({
+                owner: address,
+                filter,
+                options: {
+                    showType: true,
+                    showContent: true,
+                    showDisplay: true,
+                },
+                limit: maxObjectRequests,
+                cursor: pageParam as string | null,
+            }),
+
+        staleTime: 10 * 1000,
+        enabled: !!address,
+        getNextPageParam: ({ hasNextPage, nextCursor }) => (hasNextPage ? nextCursor : null),
+    });
+}
diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index 976f74f8356..dd6459e9434 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -18,6 +18,9 @@ export const SUPPLY_INCREASE_INVESTOR_VESTING_DURATION = 4; // Years
 export const SUPPLY_INCREASE_VESTING_LABEL =
     '000000000000000000000000000000000000000000000000000000000000107a::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
 
+export const TESTING_SUPPLY_INCREASE_VESTING_LABEL =
+    'a9ed4baf8210bda422feaf348dd5dd730618bf736372871bfcf4d755e942dd61::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
+
 export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     {
         id: {

From 82cd25c0a2c0aca1613fb2c640bab04d23798579 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Fri, 19 Jul 2024 14:45:14 +0200
Subject: [PATCH 02/68] feat(wallet-dashboard): add new route to vesting

---
 .../wallet-dashboard/app/dashboard/layout.tsx |  1 +
 .../app/dashboard/vesting/page.tsx            | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 apps/wallet-dashboard/app/dashboard/vesting/page.tsx

diff --git a/apps/wallet-dashboard/app/dashboard/layout.tsx b/apps/wallet-dashboard/app/dashboard/layout.tsx
index 6234343c32f..7cd36c639ce 100644
--- a/apps/wallet-dashboard/app/dashboard/layout.tsx
+++ b/apps/wallet-dashboard/app/dashboard/layout.tsx
@@ -14,6 +14,7 @@ function DashboardLayout({ children }: PropsWithChildren): JSX.Element {
         { title: 'Apps', path: '/dashboard/apps' },
         { title: 'Activity', path: '/dashboard/activity' },
         { title: 'Migrations', path: '/dashboard/migrations' },
+        { title: 'Vesting', path: '/dashboard/vesting' },
     ];
 
     // TODO: check if the wallet is connected and if not redirect to the welcome screen
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
new file mode 100644
index 00000000000..f18c1701b34
--- /dev/null
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -0,0 +1,51 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+'use client';
+
+import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
+import { useGetAllTimelockedObjects } from '@iota/core';
+import { useCurrentAccount } from '@iota/dapp-kit';
+
+function VestingDashboardPage(): JSX.Element {
+    const account = useCurrentAccount();
+    const { data: timelockedObjects } = useGetAllTimelockedObjects(account?.address || '');
+    const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
+    const vestingSchedule = getVestingOverview(timelockedMapped);
+
+    return (
+        <div className="flex flex-col items-center justify-center space-y-4 pt-12">
+            <h1>VESTING</h1>
+            <div className="flex flex-row space-x-4">
+                <div className="flex flex-col items-center rounded-lg border p-4">
+                    <span>Total Vested</span>
+                    <span>{vestingSchedule.totalVested}</span>
+                </div>
+                <div className="flex flex-col items-center rounded-lg border p-4">
+                    <span>Total Locked</span>
+                    <span>{vestingSchedule.totalLocked}</span>
+                </div>
+                <div className="flex flex-col items-center rounded-lg border p-4">
+                    <span>Total Unlocked</span>
+                    <span>{vestingSchedule.totalUnlocked}</span>
+                </div>
+                <div className="flex flex-col items-center rounded-lg border p-4">
+                    <span>Total Staked</span>
+                    <span>{vestingSchedule.totalStaked}</span>
+                </div>
+            </div>
+            <div className="flex flex-row space-x-4">
+                <div className="flex flex-col items-center rounded-lg border p-4">
+                    <span>Available Claiming</span>
+                    <span>{vestingSchedule.availableClaiming}</span>
+                </div>
+                <div className="flex flex-col items-center rounded-lg border p-4">
+                    <span>Available Staking</span>
+                    <span>{vestingSchedule.availableStaking}</span>
+                </div>
+            </div>
+        </div>
+    );
+}
+
+export default VestingDashboardPage;

From e7206c8d261e8b0972c5f7a1653a500603b5498b Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Fri, 19 Jul 2024 14:46:01 +0200
Subject: [PATCH 03/68] feat(wallet-dashboard): update request timelocked
 objets to get all

---
 apps/core/src/hooks/index.ts                  |  2 +-
 .../src/hooks/useGetAllTimelockedObjects.ts   | 51 +++++++++++++++++++
 .../core/src/hooks/useGetTimelockedObjects.ts | 36 -------------
 3 files changed, 52 insertions(+), 37 deletions(-)
 create mode 100644 apps/core/src/hooks/useGetAllTimelockedObjects.ts
 delete mode 100644 apps/core/src/hooks/useGetTimelockedObjects.ts

diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index 92aff722afb..141953eecb0 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -34,6 +34,6 @@ export * from './useExtendedTransactionSummary';
 export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
-export * from './useGetTimelockedObjects';
+export * from './useGetAllTimelockedObjects';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useGetAllTimelockedObjects.ts b/apps/core/src/hooks/useGetAllTimelockedObjects.ts
new file mode 100644
index 00000000000..f0a3cc1a623
--- /dev/null
+++ b/apps/core/src/hooks/useGetAllTimelockedObjects.ts
@@ -0,0 +1,51 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { useIotaClient } from '@iota/dapp-kit';
+import { IotaObjectData, type IotaObjectDataFilter } from '@iota/iota.js/client';
+import { useQuery } from '@tanstack/react-query';
+import { TIMELOCK_PACKAGE_ID } from '../constants';
+
+const MAX_OBJECTS_PER_REQ = 10;
+
+export function useGetAllTimelockedObjects(address: string) {
+    const client = useIotaClient();
+    const filter: IotaObjectDataFilter = {
+        Package: TIMELOCK_PACKAGE_ID,
+    };
+    return useQuery({
+        queryKey: ['get-all-timelocked-objects', address, filter],
+        queryFn: async () => {
+            let cursor: string | undefined | null = null;
+            const allData: IotaObjectData[] = [];
+            // keep fetching until cursor is null or undefined
+            do {
+                const { data: objectResponse, nextCursor } = await client.getOwnedObjects({
+                    owner: address,
+                    filter,
+                    options: {
+                        showType: true,
+                        showContent: true,
+                        showDisplay: true,
+                    },
+                    limit: MAX_OBJECTS_PER_REQ,
+                    cursor,
+                });
+                if (!objectResponse || !objectResponse.length) {
+                    break;
+                }
+
+                const mappedData = objectResponse
+                    .map((response) => response?.data)
+                    .filter((obj): obj is IotaObjectData => obj !== null && obj !== undefined);
+
+                allData.push(...mappedData);
+                cursor = nextCursor;
+            } while (cursor);
+
+            return allData;
+        },
+        staleTime: 10 * 1000,
+        enabled: !!address,
+    });
+}
diff --git a/apps/core/src/hooks/useGetTimelockedObjects.ts b/apps/core/src/hooks/useGetTimelockedObjects.ts
deleted file mode 100644
index 16719e816b2..00000000000
--- a/apps/core/src/hooks/useGetTimelockedObjects.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-import { useIotaClient } from '@iota/dapp-kit';
-import { PaginatedObjectsResponse, type IotaObjectDataFilter } from '@iota/iota.js/client';
-import { useInfiniteQuery } from '@tanstack/react-query';
-import { TIMELOCK_PACKAGE_ID } from '../constants';
-
-const MAX_OBJECTS_PER_REQ = 6;
-
-export function useGetTimelockedObjects(address: string, maxObjectRequests = MAX_OBJECTS_PER_REQ) {
-    const client = useIotaClient();
-    const filter: IotaObjectDataFilter = {
-        Package: TIMELOCK_PACKAGE_ID,
-    };
-    return useInfiniteQuery<PaginatedObjectsResponse>({
-        initialPageParam: null,
-        queryKey: ['get-timelocked-objects', address, filter, maxObjectRequests],
-        queryFn: ({ pageParam }) =>
-            client.getOwnedObjects({
-                owner: address,
-                filter,
-                options: {
-                    showType: true,
-                    showContent: true,
-                    showDisplay: true,
-                },
-                limit: maxObjectRequests,
-                cursor: pageParam as string | null,
-            }),
-
-        staleTime: 10 * 1000,
-        enabled: !!address,
-        getNextPageParam: ({ hasNextPage, nextCursor }) => (hasNextPage ? nextCursor : null),
-    });
-}

From 230fc1974a4412f63057e0bb9020b9441896b485 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Fri, 19 Jul 2024 14:47:11 +0200
Subject: [PATCH 04/68] feat(wallet-dashboard): improve the way to get timelock
 objects

---
 .../lib/constants/vesting.constants.ts        | 410 ++++++++----------
 .../lib/interfaces/vesting.interface.ts       |   8 +-
 apps/wallet-dashboard/lib/utils/timelock.ts   |   7 +-
 .../lib/utils/vesting/vesting.ts              |  27 ++
 4 files changed, 206 insertions(+), 246 deletions(-)

diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index dd6459e9434..4b86d459506 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -24,9 +24,7 @@ export const TESTING_SUPPLY_INCREASE_VESTING_LABEL =
 export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     {
         id: {
-            id: {
-                bytes: '0xfe755ca67e3a0714f97ec3c49cfc6f3ecdab2673d96b5840294d3a5db376c999',
-            },
+            id: '0xfe755ca67e3a0714f97ec3c49cfc6f3ecdab2673d96b5840294d3a5db376c99',
         },
         locked: {
             value: 1000,
@@ -36,9 +34,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x682d14613231dd1dde39397977cdfafb6b6263b5683b6782348c597c104b834c',
-            },
+            id: '0x682d14613231dd1dde39397977cdfafb6b6263b5683b6782348c597c104b834',
         },
         locked: {
             value: 1000,
@@ -48,9 +44,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x93f2bf2d044e45e1a85c010c22357892d1625436b8c95b26dcdb6f3093190643',
-            },
+            id: '0x93f2bf2d044e45e1a85c010c22357892d1625436b8c95b26dcdb6f309319064',
         },
         locked: {
             value: 1000,
@@ -60,9 +54,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x44fa510ba216cd555ecd6b99d1ebd612f82e2bf421091c973bca49b064dc72bb',
-            },
+            id: '0x44fa510ba216cd555ecd6b99d1ebd612f82e2bf421091c973bca49b064dc72b',
         },
         locked: {
             value: 1000,
@@ -72,9 +64,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xacd861b6dc5d108af03655a2175545ac6d432c526bcbe294b90e722fa36b459b',
-            },
+            id: '0xacd861b6dc5d108af03655a2175545ac6d432c526bcbe294b90e722fa36b459',
         },
         locked: {
             value: 1000,
@@ -84,9 +74,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x8f9eeb5953c77d53dcff3057619af7a29be1d9ce67bf66c86ad5309379d17e50',
-            },
+            id: '0x8f9eeb5953c77d53dcff3057619af7a29be1d9ce67bf66c86ad5309379d17e5',
         },
         locked: {
             value: 1000,
@@ -96,9 +84,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x70b1063c1104760afc06df5217bebdf02f937e1aff51211fc0472e677ba8c745',
-            },
+            id: '0x70b1063c1104760afc06df5217bebdf02f937e1aff51211fc0472e677ba8c74',
         },
         locked: {
             value: 1000,
@@ -108,9 +94,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xb0aa6f655d08f630c15a2cfb4e3e13e307ce9d96c52c1e91c65a71a204819bd5',
-            },
+            id: '0xb0aa6f655d08f630c15a2cfb4e3e13e307ce9d96c52c1e91c65a71a204819bd',
         },
         locked: {
             value: 1000,
@@ -120,9 +104,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x65224b9a3b9eadc55be4cb6efa363f283b924607496d60c02deef2aa6bf9e22d',
-            },
+            id: '0x65224b9a3b9eadc55be4cb6efa363f283b924607496d60c02deef2aa6bf9e22',
         },
         locked: {
             value: 1000,
@@ -132,9 +114,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x68f9a2af0ebd0bcd9e3cc836ac7103670a9602e8dca8fd28e7b2b5a693898f28',
-            },
+            id: '0x68f9a2af0ebd0bcd9e3cc836ac7103670a9602e8dca8fd28e7b2b5a693898f2',
         },
         locked: {
             value: 1000,
@@ -144,9 +124,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x637e6b758efdb8d49ee96397ca909d579bb77b79f8b64e7e7f1af13ad4f7ce4c',
-            },
+            id: '0x637e6b758efdb8d49ee96397ca909d579bb77b79f8b64e7e7f1af13ad4f7ce4',
         },
         locked: {
             value: 1000,
@@ -156,9 +134,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xbd0f349c21b67faec992b6c9a1b9b6343b4ff1f2ad5f33b0b4cd0fc31be2b311',
-            },
+            id: '0xbd0f349c21b67faec992b6c9a1b9b6343b4ff1f2ad5f33b0b4cd0fc31be2b31',
         },
         locked: {
             value: 1000,
@@ -168,9 +144,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xfb8c3539b22e4086bd03417027e70515e6fb6d18f366876ad5ad0d8da3bde0f7',
-            },
+            id: '0xfb8c3539b22e4086bd03417027e70515e6fb6d18f366876ad5ad0d8da3bde0f',
         },
         locked: {
             value: 1000,
@@ -180,9 +154,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xbfb7c1a941885cc55a191e579c7c6d5dc345d6b5b9cfa439f724a343d3540320',
-            },
+            id: '0xbfb7c1a941885cc55a191e579c7c6d5dc345d6b5b9cfa439f724a343d354032',
         },
         locked: {
             value: 1000,
@@ -192,9 +164,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x8935a904f90e23f6f453cb0c85a03859e07f1c9e5a5d1644b2fbe7005d8e1580',
-            },
+            id: '0x8935a904f90e23f6f453cb0c85a03859e07f1c9e5a5d1644b2fbe7005d8e158',
         },
         locked: {
             value: 1000,
@@ -204,9 +174,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x73be6f8df4b73b83f8ccf909d61aabb56c56c56aa597d2806eccf3ab4fac66b7',
-            },
+            id: '0x73be6f8df4b73b83f8ccf909d61aabb56c56c56aa597d2806eccf3ab4fac66b',
         },
         locked: {
             value: 1000,
@@ -216,9 +184,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x20075cc2ebd5fa6e069829e58e55e6e010ad115e8cbc48d7a3d98d079ce649a5',
-            },
+            id: '0x20075cc2ebd5fa6e069829e58e55e6e010ad115e8cbc48d7a3d98d079ce649a',
         },
         locked: {
             value: 1000,
@@ -228,9 +194,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xce03433d496cb231ead90a661fe08b924eb9b0cfb43dd560ea02a8060f6afd0e',
-            },
+            id: '0xce03433d496cb231ead90a661fe08b924eb9b0cfb43dd560ea02a8060f6afd0',
         },
         locked: {
             value: 1000,
@@ -240,9 +204,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xf111b8705ba276f8c6b76bdf72a4a46889cb8207cc5a80d3df0f40d9576116a3',
-            },
+            id: '0xf111b8705ba276f8c6b76bdf72a4a46889cb8207cc5a80d3df0f40d9576116a',
         },
         locked: {
             value: 1000,
@@ -252,9 +214,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xbc27940fb9c6f96ae9e2c11ad151446e30de5281172e48aac7f600d1da92c109',
-            },
+            id: '0xbc27940fb9c6f96ae9e2c11ad151446e30de5281172e48aac7f600d1da92c10',
         },
         locked: {
             value: 1000,
@@ -264,9 +224,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x016fae8797d3d12a26e215ec1815ee8adce70bb93149b4d55eb06a81c476ff9e',
-            },
+            id: '0x016fae8797d3d12a26e215ec1815ee8adce70bb93149b4d55eb06a81c476ff9',
         },
         locked: {
             value: 1000,
@@ -276,9 +234,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x06f1e354ff551d76da8dc890eab728a65319defb3608991b4c70a1a2b30e8f1b',
-            },
+            id: '0x06f1e354ff551d76da8dc890eab728a65319defb3608991b4c70a1a2b30e8f1',
         },
         locked: {
             value: 1000,
@@ -288,9 +244,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xc4cf3ea32480aab7d78784c6f00b9210ce0ffaabbcbb8cddd846073e7455386c',
-            },
+            id: '0xc4cf3ea32480aab7d78784c6f00b9210ce0ffaabbcbb8cddd846073e7455386',
         },
         locked: {
             value: 1000,
@@ -300,9 +254,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x6dc10a8008855549b8d92e7704c799253a953d9835af001970426414fdd3ba70',
-            },
+            id: '0x6dc10a8008855549b8d92e7704c799253a953d9835af001970426414fdd3ba7',
         },
         locked: {
             value: 1000,
@@ -312,9 +264,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xa5f7a66c575db3f74c5fe7043c28f7231a2127aec4dc2de88f5b9d3cf0205115',
-            },
+            id: '0xa5f7a66c575db3f74c5fe7043c28f7231a2127aec4dc2de88f5b9d3cf020511',
         },
         locked: {
             value: 1000,
@@ -324,9 +274,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xde0a4c2e0f16541983302c596339815ffa4d4743509e8115bc06fcf7f71ea8fc',
-            },
+            id: '0xde0a4c2e0f16541983302c596339815ffa4d4743509e8115bc06fcf7f71ea8f',
         },
         locked: {
             value: 1000,
@@ -336,9 +284,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0xccc5d23ab69789b934b9bf7f5006e43eef45c2d7a251e3eec8b7dd24bc20a079',
-            },
+            id: '0xccc5d23ab69789b934b9bf7f5006e43eef45c2d7a251e3eec8b7dd24bc20a07',
         },
         locked: {
             value: 1000,
@@ -348,9 +294,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x503dc8844b0cd6e74e735433751328e8283569e81b4602aaa6941ce3fe826bbc',
-            },
+            id: '0x503dc8844b0cd6e74e735433751328e8283569e81b4602aaa6941ce3fe826bb',
         },
         locked: {
             value: 1000,
@@ -360,9 +304,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x0fac98b5ac955644dffa0700933aababe438fae6fc58b8a4bd1f740c8aba9415',
-            },
+            id: '0x0fac98b5ac955644dffa0700933aababe438fae6fc58b8a4bd1f740c8aba941',
         },
         locked: {
             value: 1000,
@@ -372,9 +314,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x756483e3c7dd3491ea405f682df6c5dc1e4a59d8b5c9725b0d194815a25ea95a',
-            },
+            id: '0x756483e3c7dd3491ea405f682df6c5dc1e4a59d8b5c9725b0d194815a25ea95',
         },
         locked: {
             value: 1000,
@@ -384,9 +324,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x72c4318876f51bed94c2228b395d18f5dce5f243039c7e3d8fad690dfe918fcf',
-            },
+            id: '0x72c4318876f51bed94c2228b395d18f5dce5f243039c7e3d8fad690dfe918fc',
         },
         locked: {
             value: 1000,
@@ -396,9 +334,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x37f68fd72af05b4c923268b64a0baa7511f27bc4cbd90641e444e7116f026042',
-            },
+            id: '0x37f68fd72af05b4c923268b64a0baa7511f27bc4cbd90641e444e7116f02604',
         },
         locked: {
             value: 1000,
@@ -408,9 +344,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     },
     {
         id: {
-            id: {
-                bytes: '0x97bedf66e48392a0b9baf8a8280e72fcce9b32ff980832edfe1a90a14ce90479',
-            },
+            id: '0x97bedf66e48392a0b9baf8a8280e72fcce9b32ff980832edfe1a90a14ce9047',
         },
         locked: {
             value: 1000,
@@ -422,12 +356,12 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
 
 export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] = [
     {
-        id: { id: { bytes: '0x1d981f9fde96c2e509de1c925a95b78b2a3cb910d9b384ca4dbeb1bd14aa1cf2' } },
+        id: { id: '0x1d981f9fde96c2e509de1c925a95b78b2a3cb910d9b384ca4dbeb1bd14aa1cf2' },
         stakedIota: {
             id: {
-                id: { bytes: '0x2a1df8ec18ef82da39f8af22ae1b8656037706df377ad4af0fc2036f50373f1d' },
+                id: '0x2a1df8ec18ef82da39f8af22ae1b8656037706df377ad4af0fc2036f50373f1d',
             },
-            poolId: { bytes: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c' },
+            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -435,12 +369,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x72b7bafbe81584599b8c8d1e58758fd6f34e4a4e65fe22899cf4485063826aee' } },
+        id: { id: '0x72b7bafbe81584599b8c8d1e58758fd6f34e4a4e65fe22899cf4485063826aee' },
         stakedIota: {
             id: {
-                id: { bytes: '0x75e69abfc76ad38944e747f36ecf0dfd0933f80134187c7a67952f0011623b21' },
+                id: '0x75e69abfc76ad38944e747f36ecf0dfd0933f80134187c7a67952f0011623b21',
             },
-            poolId: { bytes: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac' },
+            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -448,12 +382,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xe438122ed11983492bfcabdd78b52d0739124802f8667fefcbdea4d0e1f6ff55' } },
+        id: { id: '0xe438122ed11983492bfcabdd78b52d0739124802f8667fefcbdea4d0e1f6ff55' },
         stakedIota: {
             id: {
-                id: { bytes: '0x6c9abc5d279d79f1693f09fa220300ef8483bcbdcca410e3d533e4892d7a60f9' },
+                id: '0x6c9abc5d279d79f1693f09fa220300ef8483bcbdcca410e3d533e4892d7a60f9',
             },
-            poolId: { bytes: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531' },
+            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -461,12 +395,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x6f1f54bda98e0d82cdb90045fee0bb32bae8672f19e4c7797cb28409898c9a3f' } },
+        id: { id: '0x6f1f54bda98e0d82cdb90045fee0bb32bae8672f19e4c7797cb28409898c9a3f' },
         stakedIota: {
             id: {
-                id: { bytes: '0x40d2fcada5c4b87854b458115d678d87317bf14b28abce0ae94be2063a5c9c0f' },
+                id: '0x40d2fcada5c4b87854b458115d678d87317bf14b28abce0ae94be2063a5c9c0f',
             },
-            poolId: { bytes: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c' },
+            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -474,12 +408,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xfb476568cd1e6563874a2a325677be253a3dfe46872c9ce89eb8af3ea731dea6' } },
+        id: { id: '0xfb476568cd1e6563874a2a325677be253a3dfe46872c9ce89eb8af3ea731dea6' },
         stakedIota: {
             id: {
-                id: { bytes: '0xfa414fb4078c7424f353a0206a0d18a07a21ff5ccc99e81fd15cf201fd0a65d4' },
+                id: '0xfa414fb4078c7424f353a0206a0d18a07a21ff5ccc99e81fd15cf201fd0a65d4',
             },
-            poolId: { bytes: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531' },
+            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -487,12 +421,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x323760b2fea142c255ec9fb7c75a2380adb1c41cd65ca704e7076564f9db990c' } },
+        id: { id: '0x323760b2fea142c255ec9fb7c75a2380adb1c41cd65ca704e7076564f9db990c' },
         stakedIota: {
             id: {
-                id: { bytes: '0x67564a23c8a07f02755c8f23d3d97ed23de5f1af1b702e23e0fe6d5b68592334' },
+                id: '0x67564a23c8a07f02755c8f23d3d97ed23de5f1af1b702e23e0fe6d5b68592334',
             },
-            poolId: { bytes: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531' },
+            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -500,12 +434,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xc556e3e84b39f730d6fd7ea152d2f947526b45c989a03633e5a79186fe52a3a0' } },
+        id: { id: '0xc556e3e84b39f730d6fd7ea152d2f947526b45c989a03633e5a79186fe52a3a0' },
         stakedIota: {
             id: {
-                id: { bytes: '0xd2f93f458c41ace2099f877f97233fc84f04eafbfb5a48b39ef15896bf34dcdb' },
+                id: '0xd2f93f458c41ace2099f877f97233fc84f04eafbfb5a48b39ef15896bf34dcdb',
             },
-            poolId: { bytes: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531' },
+            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -513,12 +447,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x2b771bd4c3b0f36a261ff1249d8bf70858e5c53ca3182c8088ea53e0e62d9ba3' } },
+        id: { id: '0x2b771bd4c3b0f36a261ff1249d8bf70858e5c53ca3182c8088ea53e0e62d9ba3' },
         stakedIota: {
             id: {
-                id: { bytes: '0x38847bb6e80fc93d2a1924e65f37aa7f39c2b66c9cd0465cba4f8f7a2aa69cf4' },
+                id: '0x38847bb6e80fc93d2a1924e65f37aa7f39c2b66c9cd0465cba4f8f7a2aa69cf4',
             },
-            poolId: { bytes: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c' },
+            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -526,12 +460,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x97d108f7ead86885654018931854c75314d82ee25d1bd3e25e169bd9ef848965' } },
+        id: { id: '0x97d108f7ead86885654018931854c75314d82ee25d1bd3e25e169bd9ef848965' },
         stakedIota: {
             id: {
-                id: { bytes: '0xe9c230f1046e3460d38ff70c46aa7e4b812d797e81d91e6048966dd457516908' },
+                id: '0xe9c230f1046e3460d38ff70c46aa7e4b812d797e81d91e6048966dd457516908',
             },
-            poolId: { bytes: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c' },
+            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -539,12 +473,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x72793b91fea132f81df2065cd78e597a0b426da1b75b737689529fbaa7ae5e02' } },
+        id: { id: '0x72793b91fea132f81df2065cd78e597a0b426da1b75b737689529fbaa7ae5e02' },
         stakedIota: {
             id: {
-                id: { bytes: '0x584049fcd0854e2d9ae7f5442ddcd7a6774941cea32f446baa42ed471c0c9b5e' },
+                id: '0x584049fcd0854e2d9ae7f5442ddcd7a6774941cea32f446baa42ed471c0c9b5e',
             },
-            poolId: { bytes: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac' },
+            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -552,12 +486,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xc7a986cbdaf4d7b6f5167b2706f3f2d692846fee010f55f46540987a81a5a0d9' } },
+        id: { id: '0xc7a986cbdaf4d7b6f5167b2706f3f2d692846fee010f55f46540987a81a5a0d9' },
         stakedIota: {
             id: {
-                id: { bytes: '0x0fce2e04c142b904eddd7b644161335387e0c76398add8d4b75af8b973eb06c1' },
+                id: '0x0fce2e04c142b904eddd7b644161335387e0c76398add8d4b75af8b973eb06c1',
             },
-            poolId: { bytes: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1' },
+            poolId: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -565,12 +499,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xac1a96522df60536fd5bb6e0ad9452870b623262cedb01bc28eedd5322d849d2' } },
+        id: { id: '0xac1a96522df60536fd5bb6e0ad9452870b623262cedb01bc28eedd5322d849d2' },
         stakedIota: {
             id: {
-                id: { bytes: '0x8b3145f22980a2d506aa4d179657ca3acf2196509b4982d06d6c6a1cc033d47c' },
+                id: '0x8b3145f22980a2d506aa4d179657ca3acf2196509b4982d06d6c6a1cc033d47c',
             },
-            poolId: { bytes: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531' },
+            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -578,12 +512,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x69adfd0c384f62e1d56b4658521b84c3343418187fb3b53fd8836ec20c294477' } },
+        id: { id: '0x69adfd0c384f62e1d56b4658521b84c3343418187fb3b53fd8836ec20c294477' },
         stakedIota: {
             id: {
-                id: { bytes: '0x687a70de2a11071592da1e1c7e65530407577974a253fbb291ab694fa1862556' },
+                id: '0x687a70de2a11071592da1e1c7e65530407577974a253fbb291ab694fa1862556',
             },
-            poolId: { bytes: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac' },
+            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -591,12 +525,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x2a60bbc881f361455155158dd28bbf70bf532f775d9e397e98629c338b254354' } },
+        id: { id: '0x2a60bbc881f361455155158dd28bbf70bf532f775d9e397e98629c338b254354' },
         stakedIota: {
             id: {
-                id: { bytes: '0xcb5b7b159752b1854c368d2f178f92e579a27c64a882669ca8ffddb921d5934e' },
+                id: '0xcb5b7b159752b1854c368d2f178f92e579a27c64a882669ca8ffddb921d5934e',
             },
-            poolId: { bytes: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c' },
+            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -604,12 +538,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x50468640fc1c7623bd380ed93e6e6e7a0578c26dd0d78a8a0894c5cfd3718162' } },
+        id: { id: '0x50468640fc1c7623bd380ed93e6e6e7a0578c26dd0d78a8a0894c5cfd3718162' },
         stakedIota: {
             id: {
-                id: { bytes: '0x9d44592883927293bd177924cca351bc7c6c075a834d44711bb5f85cebd47cb9' },
+                id: '0x9d44592883927293bd177924cca351bc7c6c075a834d44711bb5f85cebd47cb9',
             },
-            poolId: { bytes: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac' },
+            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -617,12 +551,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xb220dfabba1985b2d3f4ef4899561b12c3d921aab8607cce87e02a7bfaa7c7ca' } },
+        id: { id: '0xb220dfabba1985b2d3f4ef4899561b12c3d921aab8607cce87e02a7bfaa7c7ca' },
         stakedIota: {
             id: {
-                id: { bytes: '0x72b8c7e5695e86b043b4f66202687fe7d1a11a0118bc795133f2af2f5229b4c7' },
+                id: '0x72b8c7e5695e86b043b4f66202687fe7d1a11a0118bc795133f2af2f5229b4c7',
             },
-            poolId: { bytes: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac' },
+            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -630,12 +564,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x303fc97a8b1c20fed2c0732b8ad6290725dcb668a2224f3e79cbbe28c7c1cde6' } },
+        id: { id: '0x303fc97a8b1c20fed2c0732b8ad6290725dcb668a2224f3e79cbbe28c7c1cde6' },
         stakedIota: {
             id: {
-                id: { bytes: '0x7bbd702f91697c81e05a17c6c6cca7160032627e1ca3af2736fd826f42196ff7' },
+                id: '0x7bbd702f91697c81e05a17c6c6cca7160032627e1ca3af2736fd826f42196ff7',
             },
-            poolId: { bytes: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c' },
+            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -643,12 +577,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x81c7661212e17f6acd3620a4f4191b350a350b6fdabdefdd7f0940b962f5e6e3' } },
+        id: { id: '0x81c7661212e17f6acd3620a4f4191b350a350b6fdabdefdd7f0940b962f5e6e3' },
         stakedIota: {
             id: {
-                id: { bytes: '0xaf4544a2086985b0c29fee18df4f2fe616370824ef6d62c2965615c74f53fbee' },
+                id: '0xaf4544a2086985b0c29fee18df4f2fe616370824ef6d62c2965615c74f53fbee',
             },
-            poolId: { bytes: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c' },
+            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -656,12 +590,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x4a20ce4aec17d1ec33fcb305195422b0ef4dd1410c267f79e0cb80c4f9232fe0' } },
+        id: { id: '0x4a20ce4aec17d1ec33fcb305195422b0ef4dd1410c267f79e0cb80c4f9232fe0' },
         stakedIota: {
             id: {
-                id: { bytes: '0x511517082f68c3604ef87f40bd98e3b1e37a54b7d4918c380a5c62e9e6f8c601' },
+                id: '0x511517082f68c3604ef87f40bd98e3b1e37a54b7d4918c380a5c62e9e6f8c601',
             },
-            poolId: { bytes: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c' },
+            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -669,12 +603,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x4b6ee8ee6dcc2eeeea0861ce658c4e4e684c80dba901442ed5ef69addd8a45d6' } },
+        id: { id: '0x4b6ee8ee6dcc2eeeea0861ce658c4e4e684c80dba901442ed5ef69addd8a45d6' },
         stakedIota: {
             id: {
-                id: { bytes: '0x081a7840adef1fcba660166b380182083af6fe009f84821fb75f8105a2a60aa4' },
+                id: '0x081a7840adef1fcba660166b380182083af6fe009f84821fb75f8105a2a60aa4',
             },
-            poolId: { bytes: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c' },
+            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -682,12 +616,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x429b75bcad49db078fcbb9d23e64b2596429c3657f48c84e12e66ea4c8c0e3a7' } },
+        id: { id: '0x429b75bcad49db078fcbb9d23e64b2596429c3657f48c84e12e66ea4c8c0e3a7' },
         stakedIota: {
             id: {
-                id: { bytes: '0x0cc8c2143be582d836c062e0b4ed54c478361e9454c33588daf04e948c24bc14' },
+                id: '0x0cc8c2143be582d836c062e0b4ed54c478361e9454c33588daf04e948c24bc14',
             },
-            poolId: { bytes: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531' },
+            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -695,12 +629,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xab5d982443f648472dd8a2d06fb760067267b2d8c08a4d7c6e7464eb58dac832' } },
+        id: { id: '0xab5d982443f648472dd8a2d06fb760067267b2d8c08a4d7c6e7464eb58dac832' },
         stakedIota: {
             id: {
-                id: { bytes: '0xa42903e420c9dac333be82300fcbc62edddcaa88da0ffa05b3a0351a01235571' },
+                id: '0xa42903e420c9dac333be82300fcbc62edddcaa88da0ffa05b3a0351a01235571',
             },
-            poolId: { bytes: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531' },
+            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -708,12 +642,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xd2cfd53537bff38e4ce90db46cbd15fa76f766a1c2cdc5aa2a075ae0e3ed2b8b' } },
+        id: { id: '0xd2cfd53537bff38e4ce90db46cbd15fa76f766a1c2cdc5aa2a075ae0e3ed2b8b' },
         stakedIota: {
             id: {
-                id: { bytes: '0x5aff0e4a0dcc530ac5f6e74fa347ac618c8d4a72f0de9194ea3b967a67604189' },
+                id: '0x5aff0e4a0dcc530ac5f6e74fa347ac618c8d4a72f0de9194ea3b967a67604189',
             },
-            poolId: { bytes: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1' },
+            poolId: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -721,12 +655,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x3be9dcf0bc43471220a4529c206191b213244ac2f0e16ac40df41cca3ce98122' } },
+        id: { id: '0x3be9dcf0bc43471220a4529c206191b213244ac2f0e16ac40df41cca3ce98122' },
         stakedIota: {
             id: {
-                id: { bytes: '0x33f5d6b77caa9dcef34bd6ed9b4f0510f225485e6bb54f992877fa85fd984cbd' },
+                id: '0x33f5d6b77caa9dcef34bd6ed9b4f0510f225485e6bb54f992877fa85fd984cbd',
             },
-            poolId: { bytes: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac' },
+            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -734,12 +668,12 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x27838c3896b664b7dcc71a98f1dfda1fbbcb1383d60118da1d7fb938ebe4b8f1' } },
+        id: { id: '0x27838c3896b664b7dcc71a98f1dfda1fbbcb1383d60118da1d7fb938ebe4b8f1' },
         stakedIota: {
             id: {
-                id: { bytes: '0x305a9dd458d67124ffc61c8be38cd59c7d417b03184f1c23ba19b17e0d2d76d2' },
+                id: '0x305a9dd458d67124ffc61c8be38cd59c7d417b03184f1c23ba19b17e0d2d76d2',
             },
-            poolId: { bytes: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1' },
+            poolId: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1',
             stakeActivationEpoch: 5555,
             principal: { value: 1000 },
         },
@@ -753,18 +687,18 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
     | TimelockedStakedIota
 )[] = [
     {
-        id: { id: { bytes: '0x286b2c0317cc9dcfb8cc571c5f6b92c2f69b4d9666580b454291b0946fc3b37b' } },
+        id: { id: '0x286b2c0317cc9dcfb8cc571c5f6b92c2f69b4d9666580b454291b0946fc3b37b' },
         locked: { value: 589 },
         expirationTimestampMs: 1703368800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xe574e0d2abb35b96f8b3918f5a1fdb66e71733fd7c02dee71abdd5427e9b3431' } },
+        id: { id: '0xe574e0d2abb35b96f8b3918f5a1fdb66e71733fd7c02dee71abdd5427e9b3431' },
         stakedIota: {
             id: {
-                id: { bytes: '0xb417430c07e03845e58fdde3f187acda86aea1e59c2c1dabd0d1d676b4845a75' },
+                id: '0xb417430c07e03845e58fdde3f187acda86aea1e59c2c1dabd0d1d676b4845a75',
             },
-            poolId: { bytes: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc' },
+            poolId: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
             stakeActivationEpoch: 5555,
             principal: { value: 411 },
         },
@@ -772,30 +706,30 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x38bf384d2dc4b9a5c2584432db3787d3e911231f7115a3b31fa9fd5652220e76' } },
+        id: { id: '0x38bf384d2dc4b9a5c2584432db3787d3e911231f7115a3b31fa9fd5652220e76' },
         locked: { value: 1000 },
         expirationTimestampMs: 1704578400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xa4c61f4c58fc899a058916bbbd0e9215b1a88c04c360ca92db50ab313974f6b6' } },
+        id: { id: '0xa4c61f4c58fc899a058916bbbd0e9215b1a88c04c360ca92db50ab313974f6b6' },
         locked: { value: 1000 },
         expirationTimestampMs: 1705788000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x972452318c6bcf35b6a73757866c66af64e6b0284a3cac676ec70ad7c2c6cabe' } },
+        id: { id: '0x972452318c6bcf35b6a73757866c66af64e6b0284a3cac676ec70ad7c2c6cabe' },
         locked: { value: 144 },
         expirationTimestampMs: 1706997600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x55fb53235e7f7dea2239f4d5e69c8fc85f35e25fac6b76500f51f2a3ea181532' } },
+        id: { id: '0x55fb53235e7f7dea2239f4d5e69c8fc85f35e25fac6b76500f51f2a3ea181532' },
         stakedIota: {
             id: {
-                id: { bytes: '0x7050c4d8a28eb65043c802f603e8c3c5b9af4ad5d061b78c68c914e8b2dfc01e' },
+                id: '0x7050c4d8a28eb65043c802f603e8c3c5b9af4ad5d061b78c68c914e8b2dfc01e',
             },
-            poolId: { bytes: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc' },
+            poolId: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
             stakeActivationEpoch: 5555,
             principal: { value: 856 },
         },
@@ -803,18 +737,18 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x8be689ee351c1f455e12ea67fe21caf3989a8b029dfe79fa5bf0e47d2eac0f6a' } },
+        id: { id: '0x8be689ee351c1f455e12ea67fe21caf3989a8b029dfe79fa5bf0e47d2eac0f6a' },
         locked: { value: 7 },
         expirationTimestampMs: 1708207200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x09d4bdbd96e33f5c1e1666302483a967d3d4307048c7620512bcdafbc09f6abc' } },
+        id: { id: '0x09d4bdbd96e33f5c1e1666302483a967d3d4307048c7620512bcdafbc09f6abc' },
         stakedIota: {
             id: {
-                id: { bytes: '0x6eec46a3cae99c4398df87cf3e6ebeb3893e4932e6a5dfa69cfdfe7d842258a0' },
+                id: '0x6eec46a3cae99c4398df87cf3e6ebeb3893e4932e6a5dfa69cfdfe7d842258a0',
             },
-            poolId: { bytes: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d' },
+            poolId: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
             stakeActivationEpoch: 5555,
             principal: { value: 993 },
         },
@@ -822,30 +756,30 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xd77236288ee66f6e8d677a974efe7a0b0b5c7e6d1154da7601d9a95560186965' } },
+        id: { id: '0xd77236288ee66f6e8d677a974efe7a0b0b5c7e6d1154da7601d9a95560186965' },
         locked: { value: 1000 },
         expirationTimestampMs: 1709416800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x99fb87d3a7b37bbe08d2634347ecebf11583e840e6a35c58d440b5ff3ab3c7c1' } },
+        id: { id: '0x99fb87d3a7b37bbe08d2634347ecebf11583e840e6a35c58d440b5ff3ab3c7c1' },
         locked: { value: 1000 },
         expirationTimestampMs: 1710626400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xcc26159c849a70969fc4b8aa4b3f7caabd8fcad107e6523ddfac6df27edea921' } },
+        id: { id: '0xcc26159c849a70969fc4b8aa4b3f7caabd8fcad107e6523ddfac6df27edea921' },
         locked: { value: 494 },
         expirationTimestampMs: 1711836000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x4722f43ca6088455583c59051d1831f8ba9749c0ae0fc4e476e7a3362c9db928' } },
+        id: { id: '0x4722f43ca6088455583c59051d1831f8ba9749c0ae0fc4e476e7a3362c9db928' },
         stakedIota: {
             id: {
-                id: { bytes: '0xdfd86394269a34a4418fcf2095994fb2952bdc59c483e9f7e43f1dc638d28ae7' },
+                id: '0xdfd86394269a34a4418fcf2095994fb2952bdc59c483e9f7e43f1dc638d28ae7',
             },
-            poolId: { bytes: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d' },
+            poolId: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
             stakeActivationEpoch: 5555,
             principal: { value: 506 },
         },
@@ -853,30 +787,30 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x479517cc209dc504575993ae9a1691e0a73301d98d63100ea8e5c253c4f79525' } },
+        id: { id: '0x479517cc209dc504575993ae9a1691e0a73301d98d63100ea8e5c253c4f79525' },
         locked: { value: 1000 },
         expirationTimestampMs: 1713045600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x16f4cd14e15efc95a35c9bd5e8da118fbc144aa77f1c63387e2ea438736af3fe' } },
+        id: { id: '0x16f4cd14e15efc95a35c9bd5e8da118fbc144aa77f1c63387e2ea438736af3fe' },
         locked: { value: 1000 },
         expirationTimestampMs: 1714255200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xa0924d0c92513ece94b3aa1e827e76d713c8625c1e6c8f0011be6ecfa3df3e76' } },
+        id: { id: '0xa0924d0c92513ece94b3aa1e827e76d713c8625c1e6c8f0011be6ecfa3df3e76' },
         locked: { value: 711 },
         expirationTimestampMs: 1715464800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x8670f828d3b82be680edee8f8cf9823ca9485e54f8728487d0aa0d367f389ab1' } },
+        id: { id: '0x8670f828d3b82be680edee8f8cf9823ca9485e54f8728487d0aa0d367f389ab1' },
         stakedIota: {
             id: {
-                id: { bytes: '0xff806527381322c9d016230b9d75f5638346aab72e1f5e291b3eb5499122934c' },
+                id: '0xff806527381322c9d016230b9d75f5638346aab72e1f5e291b3eb5499122934c',
             },
-            poolId: { bytes: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d' },
+            poolId: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
             stakeActivationEpoch: 5555,
             principal: { value: 289 },
         },
@@ -884,18 +818,18 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x46e385d485df4581ae373c1ce623b4f513bf0c35ee2cc9d10f8410a3b4ee2cb6' } },
+        id: { id: '0x46e385d485df4581ae373c1ce623b4f513bf0c35ee2cc9d10f8410a3b4ee2cb6' },
         locked: { value: 130 },
         expirationTimestampMs: 1716674400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x197ac9f7b5d0acd93159083ec755916ce3e5ade5cbedf7a49107c8603808069f' } },
+        id: { id: '0x197ac9f7b5d0acd93159083ec755916ce3e5ade5cbedf7a49107c8603808069f' },
         stakedIota: {
             id: {
-                id: { bytes: '0x69d6a5af46a3bf0bce5a97d6a5c5a120293afe2031df08b787c1e0c89eef54e3' },
+                id: '0x69d6a5af46a3bf0bce5a97d6a5c5a120293afe2031df08b787c1e0c89eef54e3',
             },
-            poolId: { bytes: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8' },
+            poolId: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
             stakeActivationEpoch: 5555,
             principal: { value: 870 },
         },
@@ -903,24 +837,24 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x7c056b2af944745852e505086cc793b72e3325ccf7c3c71ec0544f7d49925621' } },
+        id: { id: '0x7c056b2af944745852e505086cc793b72e3325ccf7c3c71ec0544f7d49925621' },
         locked: { value: 1000 },
         expirationTimestampMs: 1717884000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xac214e255e243a7e1aceef94ae7709f7200f7fccbefef67497c59aac4b95b6f8' } },
+        id: { id: '0xac214e255e243a7e1aceef94ae7709f7200f7fccbefef67497c59aac4b95b6f8' },
         locked: { value: 868 },
         expirationTimestampMs: 1719093600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xdce49e0aae09e8643dc997a99bfa7a927247fa2be4de350a970244a8d91ff672' } },
+        id: { id: '0xdce49e0aae09e8643dc997a99bfa7a927247fa2be4de350a970244a8d91ff672' },
         stakedIota: {
             id: {
-                id: { bytes: '0x8d1fa6d30174054a212edf409026a4c9427987361103f7b74797515f860ed763' },
+                id: '0x8d1fa6d30174054a212edf409026a4c9427987361103f7b74797515f860ed763',
             },
-            poolId: { bytes: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc' },
+            poolId: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
             stakeActivationEpoch: 5555,
             principal: { value: 132 },
         },
@@ -928,30 +862,30 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x92bcfa0735940ff8682abe71b0d431712a3ff921b94f1c43b21f51c124e17efd' } },
+        id: { id: '0x92bcfa0735940ff8682abe71b0d431712a3ff921b94f1c43b21f51c124e17efd' },
         locked: { value: 1000 },
         expirationTimestampMs: 1720303200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x15a8796a100bbb71a2fe95d987b3b961f1980293673ea19a320d42ae0dd557c6' } },
+        id: { id: '0x15a8796a100bbb71a2fe95d987b3b961f1980293673ea19a320d42ae0dd557c6' },
         locked: { value: 1000 },
         expirationTimestampMs: 1721512800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x3ddcf7812912bdf7d1c7d015ea418c0734698c6ff5fa0a6d737103709539effc' } },
+        id: { id: '0x3ddcf7812912bdf7d1c7d015ea418c0734698c6ff5fa0a6d737103709539effc' },
         locked: { value: 103 },
         expirationTimestampMs: 1722722400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x1cb238a7c0dddf9ffae6857821518397d68662826ee8361de16d6caece41f1ab' } },
+        id: { id: '0x1cb238a7c0dddf9ffae6857821518397d68662826ee8361de16d6caece41f1ab' },
         stakedIota: {
             id: {
-                id: { bytes: '0x69dfc02157f9033d71677586fbb78c091a9c885dc93cc6f3b312c0aee94c64d3' },
+                id: '0x69dfc02157f9033d71677586fbb78c091a9c885dc93cc6f3b312c0aee94c64d3',
             },
-            poolId: { bytes: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa' },
+            poolId: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa',
             stakeActivationEpoch: 5555,
             principal: { value: 897 },
         },
@@ -959,18 +893,18 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x84960f357289ecf9b81ced44bc5d80b1868b6d3816183a3b56b8690425a4bfa3' } },
+        id: { id: '0x84960f357289ecf9b81ced44bc5d80b1868b6d3816183a3b56b8690425a4bfa3' },
         locked: { value: 299 },
         expirationTimestampMs: 1723932000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x53f54d864faa6287d17a53b806bc3f2127d8b32e62303dd6d729c2809f715336' } },
+        id: { id: '0x53f54d864faa6287d17a53b806bc3f2127d8b32e62303dd6d729c2809f715336' },
         stakedIota: {
             id: {
-                id: { bytes: '0xdc88e1f7c5323a0f7009a1cde781e4e61a375400e7a390c88886d8cd55169d5d' },
+                id: '0xdc88e1f7c5323a0f7009a1cde781e4e61a375400e7a390c88886d8cd55169d5d',
             },
-            poolId: { bytes: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d' },
+            poolId: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
             stakeActivationEpoch: 5555,
             principal: { value: 701 },
         },
@@ -978,18 +912,18 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xba31794b7a1dbf11975b08e571fa07346b546678e8460f88d87d55ddba040478' } },
+        id: { id: '0xba31794b7a1dbf11975b08e571fa07346b546678e8460f88d87d55ddba040478' },
         locked: { value: 500 },
         expirationTimestampMs: 1725141600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x17693a56211258fcd5a994a007704fdd9967b52851451b46d6ba330812a5cc3f' } },
+        id: { id: '0x17693a56211258fcd5a994a007704fdd9967b52851451b46d6ba330812a5cc3f' },
         stakedIota: {
             id: {
-                id: { bytes: '0xbe72eb343db6325370586436a4dfc5e248bb009fd93651fc574da4879ee7041d' },
+                id: '0xbe72eb343db6325370586436a4dfc5e248bb009fd93651fc574da4879ee7041d',
             },
-            poolId: { bytes: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8' },
+            poolId: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
             stakeActivationEpoch: 5555,
             principal: { value: 500 },
         },
@@ -997,36 +931,36 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x10e6438bff39079e4518dcb1a87ba95ca65c287b593a0bf9079dabdf77d6233d' } },
+        id: { id: '0x10e6438bff39079e4518dcb1a87ba95ca65c287b593a0bf9079dabdf77d6233d' },
         locked: { value: 1000 },
         expirationTimestampMs: 1726351200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x8ab5eff4f36b1ba0d99624ce8285362784e9bcb4ab18e7553ed9f74d1d521fce' } },
+        id: { id: '0x8ab5eff4f36b1ba0d99624ce8285362784e9bcb4ab18e7553ed9f74d1d521fce' },
         locked: { value: 1000 },
         expirationTimestampMs: 1727560800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x72d7f86677cf4fcc7397a9f62af722a7290e072150f457f60d0548d7b712c22c' } },
+        id: { id: '0x72d7f86677cf4fcc7397a9f62af722a7290e072150f457f60d0548d7b712c22c' },
         locked: { value: 1000 },
         expirationTimestampMs: 1728770400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x1672412d036ad1610f8f8c39b71babfd0a0f0a03d3c8b637635d327842132acd' } },
+        id: { id: '0x1672412d036ad1610f8f8c39b71babfd0a0f0a03d3c8b637635d327842132acd' },
         locked: { value: 347 },
         expirationTimestampMs: 1729980000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x8327bbe04ac8dc866d6f18c98a20ee3137c26ccc72b62effca73402e055a57d7' } },
+        id: { id: '0x8327bbe04ac8dc866d6f18c98a20ee3137c26ccc72b62effca73402e055a57d7' },
         stakedIota: {
             id: {
-                id: { bytes: '0x993b8db7d52e20e24fee279d0effd380f9731c1d07bea6abac545357ca73d316' },
+                id: '0x993b8db7d52e20e24fee279d0effd380f9731c1d07bea6abac545357ca73d316',
             },
-            poolId: { bytes: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc' },
+            poolId: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
             stakeActivationEpoch: 5555,
             principal: { value: 653 },
         },
@@ -1034,18 +968,18 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x1de6fd9da4de9ac869f728060b659c9fb170669213c476adc6763a03c25809c5' } },
+        id: { id: '0x1de6fd9da4de9ac869f728060b659c9fb170669213c476adc6763a03c25809c5' },
         locked: { value: 792 },
         expirationTimestampMs: 1731189600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xd7ad38945ecb7ca6eeaadbf321703b263b4f6ef714e211d00b2aa8fe241fce0c' } },
+        id: { id: '0xd7ad38945ecb7ca6eeaadbf321703b263b4f6ef714e211d00b2aa8fe241fce0c' },
         stakedIota: {
             id: {
-                id: { bytes: '0x850dc90cacec45a555a05f9be3c1b3a828d43bfd7fcaf7c8789319d1369832af' },
+                id: '0x850dc90cacec45a555a05f9be3c1b3a828d43bfd7fcaf7c8789319d1369832af',
             },
-            poolId: { bytes: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8' },
+            poolId: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
             stakeActivationEpoch: 5555,
             principal: { value: 208 },
         },
@@ -1053,18 +987,18 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0x900469a81978d06246234dcf508ff1180b1521184373b87b40c83ae42466b2dc' } },
+        id: { id: '0x900469a81978d06246234dcf508ff1180b1521184373b87b40c83ae42466b2dc' },
         locked: { value: 49 },
         expirationTimestampMs: 1732399200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: { bytes: '0xfae93493826f45ac789f3319316aa55f1a707c171c9edfae5c12b845713163d1' } },
+        id: { id: '0xfae93493826f45ac789f3319316aa55f1a707c171c9edfae5c12b845713163d1' },
         stakedIota: {
             id: {
-                id: { bytes: '0xd194fa4d9a909baec026d8d67e33a85a9d36921df7a47288ed3e8a5eae9b8b9c' },
+                id: '0xd194fa4d9a909baec026d8d67e33a85a9d36921df7a47288ed3e8a5eae9b8b9c',
             },
-            poolId: { bytes: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa' },
+            poolId: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa',
             stakeActivationEpoch: 5555,
             principal: { value: 951 },
         },
diff --git a/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts b/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
index 3e0157d8e36..4d2cf7e804d 100644
--- a/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
+++ b/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
@@ -1,12 +1,8 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-export interface ID {
-    bytes: string;
-}
-
 export interface UID {
-    id: ID;
+    id: string;
 }
 
 export interface Balance {
@@ -22,7 +18,7 @@ export interface Timelocked {
 
 export interface StakedIota {
     id: UID;
-    poolId: ID;
+    poolId: string;
     stakeActivationEpoch: number;
     principal: Balance;
 }
diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index 581bff8f397..08e08424ae2 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SUPPLY_INCREASE_VESTING_LABEL } from '../constants';
+import { SUPPLY_INCREASE_VESTING_LABEL, TESTING_SUPPLY_INCREASE_VESTING_LABEL } from '../constants';
 import { Timelocked, TimelockedStakedIota } from '../interfaces';
 
 export function isTimelockedStakedIota(
@@ -17,5 +17,8 @@ export function isTimelocked(obj: Timelocked | TimelockedStakedIota): obj is Tim
 }
 
 export function isVesting(obj: Timelocked | TimelockedStakedIota): boolean {
-    return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
+    return (
+        obj.label === SUPPLY_INCREASE_VESTING_LABEL ||
+        obj.label === TESTING_SUPPLY_INCREASE_VESTING_LABEL
+    );
 }
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 95c24b4f1b8..5e0fc1ee279 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -1,6 +1,7 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
+import { IotaObjectData } from '@iota/iota.js/client';
 import {
     SUPPLY_INCREASE_INVESTOR_VESTING_DURATION,
     SUPPLY_INCREASE_STAKER_VESTING_DURATION,
@@ -15,6 +16,7 @@ import {
     SupplyIncreaseVestingPortfolio,
     Timelocked,
     TimelockedStakedIota,
+    UID,
     VestingOverview,
 } from '../../interfaces';
 import { isTimelocked, isTimelockedStakedIota, isVesting } from '../timelock';
@@ -172,3 +174,28 @@ export function getSupplyIncreaseVestingPayoutsCount(userType: SupplyIncreaseUse
 
     return SUPPLY_INCREASE_VESTING_PAYOUTS_IN_1_YEAR * vestingDuration;
 }
+
+export function mapTimelockObjects(iotaObjects: IotaObjectData[]): Timelocked[] {
+    return iotaObjects.map((iotaObject) => {
+        if (!iotaObject?.content?.dataType || iotaObject.content.dataType !== 'moveObject') {
+            return {
+                id: { id: '' },
+                locked: { value: 0 },
+                expirationTimestampMs: 0,
+                label: '0',
+            };
+        }
+        const fields = iotaObject.content.fields as unknown as {
+            id: UID;
+            locked: string;
+            expiration_timestamp_ms: string;
+            label: string;
+        };
+        return {
+            id: fields.id,
+            locked: { value: Number(fields.locked) },
+            expirationTimestampMs: Number(fields.expiration_timestamp_ms),
+            label: fields.label,
+        };
+    });
+}

From 292311bd26645d3beaeb996e4163cd7f0019eeea Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 29 Jul 2024 17:30:36 +0200
Subject: [PATCH 05/68] fix(wallet-dashboard): remove testing constants

---
 apps/core/src/constants/index.ts                         | 2 +-
 apps/core/src/constants/packages.constants.ts            | 5 -----
 apps/wallet-dashboard/lib/constants/vesting.constants.ts | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 apps/core/src/constants/packages.constants.ts

diff --git a/apps/core/src/constants/index.ts b/apps/core/src/constants/index.ts
index 719fddeb388..5cd44a65598 100644
--- a/apps/core/src/constants/index.ts
+++ b/apps/core/src/constants/index.ts
@@ -4,4 +4,4 @@
 export * from './staking.constants';
 export * from './recognizedPackages.constants';
 export * from './coins.constants';
-export * from './packages.constants';
+export * from './timelock.constants';
diff --git a/apps/core/src/constants/packages.constants.ts b/apps/core/src/constants/packages.constants.ts
deleted file mode 100644
index a1b6caa943f..00000000000
--- a/apps/core/src/constants/packages.constants.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-export const TIMELOCK_PACKAGE_ID =
-    '0xa9ed4baf8210bda422feaf348dd5dd730618bf736372871bfcf4d755e942dd61'; // TODO: modify with real package https://github.com/iotaledger/iota/issues/1219
diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index dd6459e9434..976f74f8356 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -18,9 +18,6 @@ export const SUPPLY_INCREASE_INVESTOR_VESTING_DURATION = 4; // Years
 export const SUPPLY_INCREASE_VESTING_LABEL =
     '000000000000000000000000000000000000000000000000000000000000107a::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
 
-export const TESTING_SUPPLY_INCREASE_VESTING_LABEL =
-    'a9ed4baf8210bda422feaf348dd5dd730618bf736372871bfcf4d755e942dd61::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
-
 export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
     {
         id: {

From 3649cb7af86ee99401551b3db2f891a387da9503 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 29 Jul 2024 17:31:32 +0200
Subject: [PATCH 06/68] feat(wallet-dashboard): update filter in get timelocked
 objects

---
 apps/core/src/constants/timelock.constants.ts  | 4 ++++
 apps/core/src/hooks/useGetTimelockedObjects.ts | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 apps/core/src/constants/timelock.constants.ts

diff --git a/apps/core/src/constants/timelock.constants.ts b/apps/core/src/constants/timelock.constants.ts
new file mode 100644
index 00000000000..1d7fb7fb44c
--- /dev/null
+++ b/apps/core/src/constants/timelock.constants.ts
@@ -0,0 +1,4 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export const TIMELOCK_TYPE = '0x2::timelock::TimeLock<0x2::balance::Balance<0x2::iota::IOTA>>';
diff --git a/apps/core/src/hooks/useGetTimelockedObjects.ts b/apps/core/src/hooks/useGetTimelockedObjects.ts
index 16719e816b2..4d35d1507fb 100644
--- a/apps/core/src/hooks/useGetTimelockedObjects.ts
+++ b/apps/core/src/hooks/useGetTimelockedObjects.ts
@@ -4,14 +4,14 @@
 import { useIotaClient } from '@iota/dapp-kit';
 import { PaginatedObjectsResponse, type IotaObjectDataFilter } from '@iota/iota.js/client';
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { TIMELOCK_PACKAGE_ID } from '../constants';
+import { TIMELOCK_TYPE } from '../constants';
 
 const MAX_OBJECTS_PER_REQ = 6;
 
 export function useGetTimelockedObjects(address: string, maxObjectRequests = MAX_OBJECTS_PER_REQ) {
     const client = useIotaClient();
     const filter: IotaObjectDataFilter = {
-        Package: TIMELOCK_PACKAGE_ID,
+        StructType: TIMELOCK_TYPE,
     };
     return useInfiniteQuery<PaginatedObjectsResponse>({
         initialPageParam: null,

From eb261a1dc4d9e40e7f0af51b6a31f663cd2e2a83 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 30 Jul 2024 11:00:32 +0200
Subject: [PATCH 07/68] fix(wallet-dashboard): remove
 TESTING_SUPPLY_INCREASE_VESTING_LABEL reference

---
 apps/wallet-dashboard/lib/utils/timelock.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index 08e08424ae2..581bff8f397 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SUPPLY_INCREASE_VESTING_LABEL, TESTING_SUPPLY_INCREASE_VESTING_LABEL } from '../constants';
+import { SUPPLY_INCREASE_VESTING_LABEL } from '../constants';
 import { Timelocked, TimelockedStakedIota } from '../interfaces';
 
 export function isTimelockedStakedIota(
@@ -17,8 +17,5 @@ export function isTimelocked(obj: Timelocked | TimelockedStakedIota): obj is Tim
 }
 
 export function isVesting(obj: Timelocked | TimelockedStakedIota): boolean {
-    return (
-        obj.label === SUPPLY_INCREASE_VESTING_LABEL ||
-        obj.label === TESTING_SUPPLY_INCREASE_VESTING_LABEL
-    );
+    return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
 }

From 8d22b5bcf49b6e35983db088f56be7e1a59bc4d4 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 30 Jul 2024 12:25:30 +0200
Subject: [PATCH 08/68] feat(wallet-dashboard): hook collect(unwrap) feature to
 dashboard WIP

---
 apps/core/src/hooks/index.ts                  |  1 +
 .../useCollectUnlockTimelockedObjects.ts      | 10 +++++++
 .../app/dashboard/vesting/page.tsx            | 26 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts

diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index 141953eecb0..4b7bc4a1786 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -35,5 +35,6 @@ export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
 export * from './useGetAllTimelockedObjects';
+export * from './useCollectUnlockTimelockedObjects';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts b/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
new file mode 100644
index 00000000000..f185a38465f
--- /dev/null
+++ b/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
@@ -0,0 +1,10 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { useCallback } from 'react';
+
+export function useCollectUnlockTimelockedObjects(address: string) {
+    return useCallback(() => {
+        console.log('Collecting!', address);
+    }, []);
+}
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index f18c1701b34..7726fac70ef 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -3,16 +3,30 @@
 
 'use client';
 
+import { Button } from '@/components';
 import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
-import { useGetAllTimelockedObjects } from '@iota/core';
+import { useCollectUnlockTimelockedObjects, useGetAllTimelockedObjects } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
     const { data: timelockedObjects } = useGetAllTimelockedObjects(account?.address || '');
+    const collect = useCollectUnlockTimelockedObjects(account?.address || '');
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
     const vestingSchedule = getVestingOverview(timelockedMapped);
 
+    const handleCollect = () => {
+        // Update Date.now() when #1217 is merged
+        const unlockTimelockedObjects = timelockedMapped?.filter(
+            (timelockedObject) => timelockedObject.expirationTimestampMs <= Date.now(),
+        );
+        console.log('unlockTimelockedObjects', unlockTimelockedObjects);
+        collect();
+    };
+    const handleStake = () => {
+        console.log('Stake');
+    };
+
     return (
         <div className="flex flex-col items-center justify-center space-y-4 pt-12">
             <h1>VESTING</h1>
@@ -44,6 +58,16 @@ function VestingDashboardPage(): JSX.Element {
                     <span>{vestingSchedule.availableStaking}</span>
                 </div>
             </div>
+            {account?.address && (
+                <div className="flex flex-row space-x-4">
+                    {vestingSchedule.availableClaiming && (
+                        <Button onClick={handleCollect}>Collect</Button>
+                    )}
+                    {vestingSchedule.availableStaking && (
+                        <Button onClick={handleStake}>Stake</Button>
+                    )}
+                </div>
+            )}
         </div>
     );
 }

From 0a5debf2a500b666a6e11e1b5b098b8e30138676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Wed, 31 Jul 2024 17:11:29 +0200
Subject: [PATCH 09/68] refactor: revert prettier changes coming from last
 merge

---
 apps/wallet/src/ui/app/components/BadgeLabel.tsx       |  2 +-
 apps/wallet/src/ui/app/components/DAppInfoCard.tsx     |  4 ++--
 .../src/ui/app/components/HideShowDisplayBox.tsx       |  2 +-
 apps/wallet/src/ui/app/components/SummaryCard.tsx      |  6 +++---
 .../ui/app/components/accounts/AccountBalanceItem.tsx  |  2 +-
 .../src/ui/app/components/accounts/AccountIcon.tsx     |  2 +-
 .../src/ui/app/components/accounts/AccountItem.tsx     |  2 +-
 .../accounts/AccountItemApproveConnection.tsx          |  2 +-
 .../src/ui/app/components/accounts/AccountsList.tsx    |  2 +-
 .../ui/app/components/accounts/EditableAccountName.tsx |  2 +-
 .../components/accounts/ImportRecoveryPhraseForm.tsx   |  2 +-
 .../ui/app/components/accounts/LockUnlockButton.tsx    |  2 +-
 .../app/components/accounts/RecoverAccountsGroup.tsx   |  2 +-
 .../ui/app/components/active-coins-card/CoinItem.tsx   |  2 +-
 .../src/ui/app/components/address-input/index.tsx      |  2 +-
 apps/wallet/src/ui/app/components/coin-icon/index.tsx  |  2 +-
 .../wallet/src/ui/app/components/iota-apps/IotaApp.tsx |  6 +++---
 apps/wallet/src/ui/app/components/iota-apps/index.tsx  |  2 +-
 .../ui/app/components/menu/content/MenuListItem.tsx    |  8 ++++----
 .../components/menu/content/WalletSettingsMenuList.tsx |  2 +-
 .../src/ui/app/components/nft-display/NftImage.tsx     |  2 +-
 .../wallet/src/ui/app/components/nft-display/index.tsx |  4 ++--
 .../components/receipt-card/SponsoredTxnGasSummary.tsx |  2 +-
 .../ui/app/components/receipt-card/StakeTxnCard.tsx    |  4 ++--
 .../ui/app/components/receipt-card/TxnGasSummary.tsx   |  2 +-
 .../ui/app/components/receipt-card/UnstakeTxnCard.tsx  |  4 ++--
 .../components/transactions-card/NoActivityCard.tsx    |  2 +-
 .../ui/app/components/user-approve-container/index.tsx |  6 +++---
 .../ui/app/pages/accounts/ImportLedgerAccountsPage.tsx |  8 ++++----
 .../src/ui/app/pages/accounts/ImportPassphrasePage.tsx |  2 +-
 .../src/ui/app/pages/accounts/ImportPrivateKeyPage.tsx |  2 +-
 .../src/ui/app/pages/accounts/ImportSeedPage.tsx       |  2 +-
 .../src/ui/app/pages/accounts/ProtectAccountPage.tsx   |  2 +-
 apps/wallet/src/ui/app/pages/accounts/WelcomePage.tsx  |  2 +-
 .../accounts/forgot-password/ForgotPasswordPage.tsx    |  2 +-
 .../pages/accounts/forgot-password/RecoverManyPage.tsx |  4 ++--
 .../accounts/forgot-password/ResetWarningPage.tsx      |  2 +-
 .../approval-request/transaction-request/GasFees.tsx   |  2 +-
 .../transaction-request/SummaryCard.tsx                |  2 +-
 .../transaction-request/TransactionDetails/Command.tsx |  2 +-
 .../transaction-request/TransactionDetails/index.tsx   |  2 +-
 .../pages/home/hidden-assets/HiddenAssetsProvider.tsx  |  4 ++--
 .../src/ui/app/pages/home/hidden-assets/index.tsx      |  2 +-
 .../src/ui/app/pages/home/nfts/AssetsOptionsMenu.tsx   |  4 ++--
 .../src/ui/app/pages/home/nfts/NonVisualAssets.tsx     |  2 +-
 .../wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx |  2 +-
 .../src/ui/app/pages/home/tokens/TokensDetails.tsx     |  8 ++++----
 .../src/ui/app/pages/home/transactions/index.tsx       |  2 +-
 .../app/pages/home/transfer-coin/PreviewTransfer.tsx   |  4 ++--
 apps/wallet/src/ui/app/pages/restricted/index.tsx      |  2 +-
 apps/wallet/src/ui/app/shared/Dialog.tsx               |  2 +-
 apps/wallet/src/ui/app/shared/InputWithAction.tsx      |  2 +-
 apps/wallet/src/ui/app/shared/LargeButton.tsx          |  4 ++--
 apps/wallet/src/ui/app/shared/card-layout/index.tsx    |  4 ++--
 apps/wallet/src/ui/app/shared/card/index.tsx           |  4 ++--
 apps/wallet/src/ui/app/shared/collapse/index.tsx       |  2 +-
 apps/wallet/src/ui/app/shared/delegated-apy/index.tsx  |  2 +-
 .../src/ui/app/shared/forms/controls/Checkbox.tsx      |  4 ++--
 apps/wallet/src/ui/app/shared/forms/controls/Input.tsx |  2 +-
 .../wallet/src/ui/app/shared/forms/controls/Select.tsx |  6 +++---
 .../src/ui/app/shared/forms/controls/TextArea.tsx      |  2 +-
 apps/wallet/src/ui/app/shared/input/password/index.tsx |  2 +-
 apps/wallet/src/ui/app/shared/tooltip/index.tsx        |  2 +-
 .../src/ui/app/shared/transaction-summary/Card.tsx     |  2 +-
 .../transaction-summary/cards/BalanceChanges.tsx       |  6 +++---
 .../shared/transaction-summary/cards/GasSummary.tsx    |  4 ++--
 .../shared/transaction-summary/cards/ObjectChanges.tsx |  4 ++--
 .../shared/transaction-summary/cards/SummaryCard.tsx   |  2 +-
 .../src/ui/app/shared/transaction-summary/index.tsx    |  2 +-
 .../staking/delegation-detail/DelegationDetailCard.tsx |  2 +-
 apps/wallet/src/ui/app/staking/stake/StakeForm.tsx     | 10 +++++-----
 .../src/ui/app/staking/stake/ValidatorFormDetail.tsx   |  4 ++--
 .../ui/app/staking/validators/SelectValidatorCard.tsx  |  8 ++++----
 .../ui/app/staking/validators/ValidatorListItem.tsx    |  2 +-
 .../src/ui/app/staking/validators/ValidatorsCard.tsx   |  8 ++++----
 75 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/apps/wallet/src/ui/app/components/BadgeLabel.tsx b/apps/wallet/src/ui/app/components/BadgeLabel.tsx
index 042be703b92..bc706296149 100644
--- a/apps/wallet/src/ui/app/components/BadgeLabel.tsx
+++ b/apps/wallet/src/ui/app/components/BadgeLabel.tsx
@@ -11,7 +11,7 @@ interface BadgeLabelProps {
 
 export function BadgeLabel({ label }: BadgeLabelProps) {
     return (
-        <div className="border-gray-45 bg-gray-40 px-1.5 py-1 rounded-2xl border border-solid">
+        <div className="border-gray-45 bg-gray-40 rounded-2xl border border-solid px-1.5 py-1">
             <Text variant="captionSmallExtra" color="steel-dark">
                 {label}
             </Text>
diff --git a/apps/wallet/src/ui/app/components/DAppInfoCard.tsx b/apps/wallet/src/ui/app/components/DAppInfoCard.tsx
index bb77c7bb8fd..aab81deed46 100644
--- a/apps/wallet/src/ui/app/components/DAppInfoCard.tsx
+++ b/apps/wallet/src/ui/app/components/DAppInfoCard.tsx
@@ -38,8 +38,8 @@ export function DAppInfoCard({
     const { unlockAccount, lockAccount, isPending, accountToUnlock } = useUnlockAccount();
 
     return (
-        <div className="p-6 flex flex-col gap-5 bg-white">
-            <div className="py-3 flex flex-row flex-nowrap items-center gap-3.75">
+        <div className="flex flex-col gap-5 bg-white p-6">
+            <div className="flex flex-row flex-nowrap items-center gap-3.75 py-3">
                 <div className="bg-steel/20 flex h-15 w-15 shrink-0 grow-0 items-stretch overflow-hidden rounded-2xl">
                     {iconUrl ? <img className="flex-1" src={iconUrl} alt={name} /> : null}
                 </div>
diff --git a/apps/wallet/src/ui/app/components/HideShowDisplayBox.tsx b/apps/wallet/src/ui/app/components/HideShowDisplayBox.tsx
index 7988de6ab6c..eff9ace3fe7 100644
--- a/apps/wallet/src/ui/app/components/HideShowDisplayBox.tsx
+++ b/apps/wallet/src/ui/app/components/HideShowDisplayBox.tsx
@@ -55,7 +55,7 @@ export function HideShowDisplayBox({
         };
     }, [valueHidden]);
     return (
-        <div className="border-gray-60 px-5 py-4 flex flex-col flex-nowrap items-stretch gap-2 overflow-hidden rounded-lg border border-solid bg-white">
+        <div className="border-gray-60 flex flex-col flex-nowrap items-stretch gap-2 overflow-hidden rounded-lg border border-solid bg-white px-5 py-4">
             <div className="relative break-all">
                 {valueHidden ? null : (
                     <Text variant="pBody" weight="medium" color="steel-darker">
diff --git a/apps/wallet/src/ui/app/components/SummaryCard.tsx b/apps/wallet/src/ui/app/components/SummaryCard.tsx
index 7673367450a..debc78d3724 100644
--- a/apps/wallet/src/ui/app/components/SummaryCard.tsx
+++ b/apps/wallet/src/ui/app/components/SummaryCard.tsx
@@ -34,7 +34,7 @@ export function SummaryCard({
             )}
         >
             {header ? (
-                <div className="bg-gray-40 px-3.75 py-2.5 flex flex-row flex-nowrap items-center justify-center rounded-t-2xl uppercase">
+                <div className="bg-gray-40 flex flex-row flex-nowrap items-center justify-center rounded-t-2xl px-3.75 py-2.5 uppercase">
                     <Text variant="captionSmall" weight="bold" color="steel-darker" truncate>
                         {header}
                     </Text>
@@ -42,7 +42,7 @@ export function SummaryCard({
             ) : null}
             <div
                 className={clsx(
-                    'px-4 flex flex-1 flex-col flex-nowrap items-stretch overflow-y-auto',
+                    'flex flex-1 flex-col flex-nowrap items-stretch overflow-y-auto px-4',
                     minimalPadding ? 'py-2' : 'py-4',
                     showDivider ? 'divide-gray-40 divide-x-0 divide-y divide-solid' : '',
                 )}
@@ -50,7 +50,7 @@ export function SummaryCard({
                 {body}
             </div>
             {footer ? (
-                <div className="border-gray-40 p-4 pt-3 border-x-0 border-b-0 border-t border-solid">
+                <div className="border-gray-40 border-x-0 border-b-0 border-t border-solid p-4 pt-3">
                     {footer}
                 </div>
             ) : null}
diff --git a/apps/wallet/src/ui/app/components/accounts/AccountBalanceItem.tsx b/apps/wallet/src/ui/app/components/accounts/AccountBalanceItem.tsx
index da74e70fd9c..6ffc864ac6d 100644
--- a/apps/wallet/src/ui/app/components/accounts/AccountBalanceItem.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/AccountBalanceItem.tsx
@@ -26,7 +26,7 @@ export function AccountBalanceItem({ account }: AccountBalanceItemProps): JSX.El
     const [formatted, symbol] = useFormatCoin(BigInt(totalBalance), coinType);
 
     return (
-        <div className="border-hero/10 px-4 py-3 group flex cursor-pointer flex-col gap-3 rounded-xl border border-solid bg-white/40">
+        <div className="border-hero/10 group flex cursor-pointer flex-col gap-3 rounded-xl border border-solid bg-white/40 px-4 py-3">
             <div className="flex w-full flex-row items-center justify-between">
                 <div className="text-steel-dark flex gap-1.5 leading-none">
                     <Text variant="body" weight="semibold">
diff --git a/apps/wallet/src/ui/app/components/accounts/AccountIcon.tsx b/apps/wallet/src/ui/app/components/accounts/AccountIcon.tsx
index 42e131f3b6b..eaa4a8ddb95 100644
--- a/apps/wallet/src/ui/app/components/accounts/AccountIcon.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/AccountIcon.tsx
@@ -7,7 +7,7 @@ import { LedgerLogo17, Iota } from '@iota/icons';
 
 function IotaIcon() {
     return (
-        <div className="bg-steel p-1 flex h-4 w-4 items-center justify-center rounded-full text-white">
+        <div className="bg-steel flex h-4 w-4 items-center justify-center rounded-full p-1 text-white">
             <Iota />
         </div>
     );
diff --git a/apps/wallet/src/ui/app/components/accounts/AccountItem.tsx b/apps/wallet/src/ui/app/components/accounts/AccountItem.tsx
index 0569867a6e2..8ee227e3d37 100644
--- a/apps/wallet/src/ui/app/components/accounts/AccountItem.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/AccountItem.tsx
@@ -67,7 +67,7 @@ export const AccountItem = forwardRef<HTMLDivElement, AccountItemProps>(
             <div
                 ref={ref}
                 className={cn(
-                    'border-hero/10 px-4 py-3 group flex cursor-pointer flex-col gap-3 rounded-xl border border-solid bg-white/40',
+                    'border-hero/10 group flex cursor-pointer flex-col gap-3 rounded-xl border border-solid bg-white/40 px-4 py-3',
                     'hover:border-hero/20 hover:bg-white/80',
                     { 'cursor-auto bg-white/80 shadow-card-soft': selected },
                     { 'bg-white/80': isActiveAccount },
diff --git a/apps/wallet/src/ui/app/components/accounts/AccountItemApproveConnection.tsx b/apps/wallet/src/ui/app/components/accounts/AccountItemApproveConnection.tsx
index 17222099481..751c2f56015 100644
--- a/apps/wallet/src/ui/app/components/accounts/AccountItemApproveConnection.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/AccountItemApproveConnection.tsx
@@ -31,7 +31,7 @@ export function AccountItemApproveConnection({
     return (
         <div
             className={clsx(
-                'border-hero/10 px-4 py-3 group cursor-pointer rounded-xl border border-solid',
+                'border-hero/10 group cursor-pointer rounded-xl border border-solid px-4 py-3',
                 'flex items-center justify-start gap-3',
                 selected ? 'bg-white/80 shadow-card-soft' : 'bg-white/40 hover:bg-white/60',
                 disabled ? '!bg-hero-darkest/10 border-transparent' : 'hover:shadow',
diff --git a/apps/wallet/src/ui/app/components/accounts/AccountsList.tsx b/apps/wallet/src/ui/app/components/accounts/AccountsList.tsx
index 11f927957de..eb21c7fa001 100644
--- a/apps/wallet/src/ui/app/components/accounts/AccountsList.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/AccountsList.tsx
@@ -41,7 +41,7 @@ export function AccountsList() {
     if (!accounts || !activeAccount) return null;
 
     return (
-        <div className="border-hero/10 p-4 flex w-full select-none flex-col gap-5 rounded-xl border border-solid bg-gradients-graph-cards">
+        <div className="border-hero/10 flex w-full select-none flex-col gap-5 rounded-xl border border-solid bg-gradients-graph-cards p-4">
             <Heading variant="heading5" weight="semibold" color="steel-darker">
                 Accounts
             </Heading>
diff --git a/apps/wallet/src/ui/app/components/accounts/EditableAccountName.tsx b/apps/wallet/src/ui/app/components/accounts/EditableAccountName.tsx
index c773f49e5ae..c2be5bedfee 100644
--- a/apps/wallet/src/ui/app/components/accounts/EditableAccountName.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/EditableAccountName.tsx
@@ -14,7 +14,7 @@ interface InputProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, '
 
 export const Input = forwardRef<HTMLInputElement, InputProps>((props, forwardedRef) => (
     <input
-        className="text-steel-darker hover:text-hero p-0 peer items-center rounded-sm border-none bg-transparent text-pBody font-semibold outline-none transition focus:bg-transparent"
+        className="text-steel-darker hover:text-hero peer items-center rounded-sm border-none bg-transparent p-0 text-pBody font-semibold outline-none transition focus:bg-transparent"
         ref={forwardedRef}
         {...props}
     />
diff --git a/apps/wallet/src/ui/app/components/accounts/ImportRecoveryPhraseForm.tsx b/apps/wallet/src/ui/app/components/accounts/ImportRecoveryPhraseForm.tsx
index 6f64ebb8ed0..388c8f83815 100644
--- a/apps/wallet/src/ui/app/components/accounts/ImportRecoveryPhraseForm.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/ImportRecoveryPhraseForm.tsx
@@ -113,7 +113,7 @@ export function ImportRecoveryPhraseForm({
                     );
                 })}
             </div>
-            <div className="bg-iota-lightest px-6 pb-7.5 pt-3 sticky -bottom-7.5 -mx-6 -mb-7.5 flex flex-col gap-2.5">
+            <div className="bg-iota-lightest sticky -bottom-7.5 -mx-6 -mb-7.5 flex flex-col gap-2.5 px-6 pb-7.5 pt-3">
                 {touchedFields.recoveryPhrase && errors.recoveryPhrase && (
                     <Alert>{errors.recoveryPhrase.message}</Alert>
                 )}
diff --git a/apps/wallet/src/ui/app/components/accounts/LockUnlockButton.tsx b/apps/wallet/src/ui/app/components/accounts/LockUnlockButton.tsx
index 78a90249bec..5e2b2295c95 100644
--- a/apps/wallet/src/ui/app/components/accounts/LockUnlockButton.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/LockUnlockButton.tsx
@@ -17,7 +17,7 @@ export function LockUnlockButton({ isLocked, onClick, isLoading }: LockUnlockBut
     return (
         <Tooltip tip={isLocked ? 'Unlock Account' : 'Lock Account'}>
             <button
-                className="text-steel hover:text-hero-dark p-0 ml-auto flex cursor-pointer appearance-none items-center justify-center border-none bg-transparent"
+                className="text-steel hover:text-hero-dark ml-auto flex cursor-pointer appearance-none items-center justify-center border-none bg-transparent p-0"
                 onClick={onClick}
                 data-testid={isLocked ? 'unlock-account-button' : 'lock-account-button'}
             >
diff --git a/apps/wallet/src/ui/app/components/accounts/RecoverAccountsGroup.tsx b/apps/wallet/src/ui/app/components/accounts/RecoverAccountsGroup.tsx
index 22503a901f1..bf30c098f6d 100644
--- a/apps/wallet/src/ui/app/components/accounts/RecoverAccountsGroup.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/RecoverAccountsGroup.tsx
@@ -27,7 +27,7 @@ export function RecoverAccountsGroup({
 }: RecoverAccountsGroupProps) {
     return (
         <div className="flex w-full flex-col items-stretch gap-4">
-            <div className="px-2 flex flex-nowrap items-center gap-1">
+            <div className="flex flex-nowrap items-center gap-1 px-2">
                 <Text variant="caption" weight="semibold" color="steel-dark">
                     {title}
                 </Text>
diff --git a/apps/wallet/src/ui/app/components/active-coins-card/CoinItem.tsx b/apps/wallet/src/ui/app/components/active-coins-card/CoinItem.tsx
index 9daa44cb706..0d4b1a8983f 100644
--- a/apps/wallet/src/ui/app/components/active-coins-card/CoinItem.tsx
+++ b/apps/wallet/src/ui/app/components/active-coins-card/CoinItem.tsx
@@ -27,7 +27,7 @@ export function CoinItem({
     const [formatted, symbol, { data: coinMeta }] = useFormatCoin(balance, coinType);
 
     return (
-        <div className="hover:bg-iota/10 py-3 pl-1.5 pr-2 flex w-full items-center justify-center gap-2.5 rounded">
+        <div className="hover:bg-iota/10 flex w-full items-center justify-center gap-2.5 rounded py-3 pl-1.5 pr-2">
             <CoinIcon coinType={coinType} size={isActive ? 'sm' : 'md'} />
             <div className="flex flex-1 items-center justify-between gap-1.5">
                 <div className="max-w-token-width">
diff --git a/apps/wallet/src/ui/app/components/address-input/index.tsx b/apps/wallet/src/ui/app/components/address-input/index.tsx
index 5eb13f98fa8..2c59c6b885b 100644
--- a/apps/wallet/src/ui/app/components/address-input/index.tsx
+++ b/apps/wallet/src/ui/app/components/address-input/index.tsx
@@ -102,7 +102,7 @@ export function AddressInput({
                     hasWarningOrError ? 'border-issue' : 'border-gray-45',
                 )}
             >
-                <div className="py-2 pl-3 flex min-h-[42px] w-full items-center">
+                <div className="flex min-h-[42px] w-full items-center py-2 pl-3">
                     <TextareaAutosize
                         data-testid="address-input"
                         maxRows={3}
diff --git a/apps/wallet/src/ui/app/components/coin-icon/index.tsx b/apps/wallet/src/ui/app/components/coin-icon/index.tsx
index 885c8217351..2a7d179cdea 100644
--- a/apps/wallet/src/ui/app/components/coin-icon/index.tsx
+++ b/apps/wallet/src/ui/app/components/coin-icon/index.tsx
@@ -29,7 +29,7 @@ const imageStyle = cva(['rounded-full flex'], {
 
 function IotaCoin() {
     return (
-        <Iota className="p-1.5 flex h-full w-full items-center justify-center rounded-full text-body text-white" />
+        <Iota className="flex h-full w-full items-center justify-center rounded-full p-1.5 text-body text-white" />
     );
 }
 
diff --git a/apps/wallet/src/ui/app/components/iota-apps/IotaApp.tsx b/apps/wallet/src/ui/app/components/iota-apps/IotaApp.tsx
index 05d073dc463..a60148ad00e 100644
--- a/apps/wallet/src/ui/app/components/iota-apps/IotaApp.tsx
+++ b/apps/wallet/src/ui/app/components/iota-apps/IotaApp.tsx
@@ -30,7 +30,7 @@ function CardView({ name, link, icon }: CardViewProps) {
     const appUrl = getDAppUrl(link);
     const originLabel = appUrl.hostname;
     return (
-        <div className="border-gray-45 hover:border-iota/30 hover:bg-iota/10 p-3.75 box-border flex h-32 w-full flex-col rounded-2xl border border-solid bg-white">
+        <div className="border-gray-45 hover:border-iota/30 hover:bg-iota/10 box-border flex h-32 w-full flex-col rounded-2xl border border-solid bg-white p-3.75">
             <div className="mb-1 flex">
                 <ImageIcon src={icon || null} label={name} fallback={name} size="lg" rounded="lg" />
             </div>
@@ -58,7 +58,7 @@ interface ListViewProps {
 
 function ListView({ name, icon, description, tags }: ListViewProps) {
     return (
-        <div className="item-center hover:bg-iota/10 px-1.25 py-3.5 box-border flex gap-3 rounded bg-white">
+        <div className="item-center hover:bg-iota/10 box-border flex gap-3 rounded bg-white px-1.25 py-3.5">
             <ImageIcon src={icon || null} label={name} fallback={name} size="xxl" rounded="lg" />
             <div className="flex flex-col justify-center gap-1">
                 <Text variant="body" weight="semibold" color="iota-dark">
@@ -71,7 +71,7 @@ function ListView({ name, icon, description, tags }: ListViewProps) {
                     <div className="mt-0.5 flex flex-wrap gap-1">
                         {tags?.map((tag) => (
                             <div
-                                className="item-center border-steel px-1.5 py-0.5 flex justify-center rounded border border-solid"
+                                className="item-center border-steel flex justify-center rounded border border-solid px-1.5 py-0.5"
                                 key={tag}
                             >
                                 <Text variant="captionSmall" weight="medium" color="steel-dark">
diff --git a/apps/wallet/src/ui/app/components/iota-apps/index.tsx b/apps/wallet/src/ui/app/components/iota-apps/index.tsx
index d019b57faa5..e366710dcdb 100644
--- a/apps/wallet/src/ui/app/components/iota-apps/index.tsx
+++ b/apps/wallet/src/ui/app/components/iota-apps/index.tsx
@@ -52,7 +52,7 @@ function AppsPlayGround() {
             <AppsPageBanner />
 
             {filteredEcosystemApps?.length ? (
-                <div className="bg-gray-40 p-4 rounded-xl">
+                <div className="bg-gray-40 rounded-xl p-4">
                     <Text variant="pBodySmall" color="gray-75" weight="normal">
                         Apps below are actively curated but do not indicate any endorsement or
                         relationship with Iota Wallet. Please DYOR.
diff --git a/apps/wallet/src/ui/app/components/menu/content/MenuListItem.tsx b/apps/wallet/src/ui/app/components/menu/content/MenuListItem.tsx
index 34ae7355c3d..6a1916bfc1c 100644
--- a/apps/wallet/src/ui/app/components/menu/content/MenuListItem.tsx
+++ b/apps/wallet/src/ui/app/components/menu/content/MenuListItem.tsx
@@ -31,7 +31,7 @@ function MenuListItem({
     const MenuItemContent = (
         <>
             <div className="flex flex-1 basis-3/5 flex-nowrap items-center gap-2 overflow-hidden">
-                <div className="text-steel text-2xl flex flex-none">{icon}</div>
+                <div className="text-steel flex flex-none text-2xl">{icon}</div>
                 <div className="text-gray-90 flex flex-1 text-body font-semibold">{title}</div>
             </div>
             {subtitle || iconAfter || to ? (
@@ -46,7 +46,7 @@ function MenuListItem({
                             {subtitle}
                         </div>
                     ) : null}
-                    <div className="text-steel group-hover:text-steel-darker text-base flex flex-none transition">
+                    <div className="text-steel group-hover:text-steel-darker flex flex-none text-base transition">
                         {iconAfter || (to && <ChevronRight16 />) || null}
                     </div>
                 </div>
@@ -60,7 +60,7 @@ function MenuListItem({
                 href={href}
                 target="_blank"
                 rel="noreferrer noopener"
-                className="px-1 py-4.5 first:pb-3 first:pt-3 last:pb-3 group flex cursor-pointer flex-nowrap items-center gap-5 overflow-hidden no-underline"
+                className="group flex cursor-pointer flex-nowrap items-center gap-5 overflow-hidden px-1 py-4.5 no-underline first:pb-3 first:pt-3 last:pb-3"
             >
                 {MenuItemContent}
             </a>
@@ -69,7 +69,7 @@ function MenuListItem({
     return (
         <Component
             data-testid={title}
-            className="px-1 py-5 first:pb-3 first:pt-3 last:pb-3 group flex cursor-pointer flex-nowrap items-center gap-5 overflow-hidden no-underline"
+            className="group flex cursor-pointer flex-nowrap items-center gap-5 overflow-hidden px-1 py-5 no-underline first:pb-3 first:pt-3 last:pb-3"
             to={to}
             onClick={onClick}
         >
diff --git a/apps/wallet/src/ui/app/components/menu/content/WalletSettingsMenuList.tsx b/apps/wallet/src/ui/app/components/menu/content/WalletSettingsMenuList.tsx
index d5439f68f42..4a97a0621e4 100644
--- a/apps/wallet/src/ui/app/components/menu/content/WalletSettingsMenuList.tsx
+++ b/apps/wallet/src/ui/app/components/menu/content/WalletSettingsMenuList.tsx
@@ -60,7 +60,7 @@ function MenuList() {
             <div className="mt-2.5 flex flex-col items-stretch">
                 <FaucetRequestButton variant="outline" />
             </div>
-            <div className="px-2.5 mt-3.75 flex flex-col items-center justify-center gap-3.75 no-underline">
+            <div className="mt-3.75 flex flex-col items-center justify-center gap-3.75 px-2.5 no-underline">
                 <Link
                     href={ToS_LINK}
                     text="Terms of service"
diff --git a/apps/wallet/src/ui/app/components/nft-display/NftImage.tsx b/apps/wallet/src/ui/app/components/nft-display/NftImage.tsx
index 75e50face80..99e9563c15a 100644
--- a/apps/wallet/src/ui/app/components/nft-display/NftImage.tsx
+++ b/apps/wallet/src/ui/app/components/nft-display/NftImage.tsx
@@ -104,7 +104,7 @@ export function NftImage({
                     )}
                     title={title}
                 >
-                    <Image32 className="text-steel text-3xl h-6 w-6" />
+                    <Image32 className="text-steel h-6 w-6 text-3xl" />
                     {showLabel ? (
                         <span className="text-captionSmall font-medium">No media</span>
                     ) : null}
diff --git a/apps/wallet/src/ui/app/components/nft-display/index.tsx b/apps/wallet/src/ui/app/components/nft-display/index.tsx
index e28b03ab708..8149be5d80f 100644
--- a/apps/wallet/src/ui/app/components/nft-display/index.tsx
+++ b/apps/wallet/src/ui/app/components/nft-display/index.tsx
@@ -111,8 +111,8 @@ export function NFTDisplayCard({
                         {nftName}
                     </div>
                 ) : !isOwnerToken && !hideLabel ? (
-                    <div className="bg-white/90 absolute bottom-2 left-1/2 flex w-10/12 -translate-x-1/2 items-center justify-center rounded-lg opacity-0 group-hover:opacity-100">
-                        <div className="px-2 py-1 mt-0.5 overflow-hidden">
+                    <div className="absolute bottom-2 left-1/2 flex w-10/12 -translate-x-1/2 items-center justify-center rounded-lg bg-white/90 opacity-0 group-hover:opacity-100">
+                        <div className="mt-0.5 overflow-hidden px-2 py-1">
                             <Text
                                 variant="subtitleSmall"
                                 weight="semibold"
diff --git a/apps/wallet/src/ui/app/components/receipt-card/SponsoredTxnGasSummary.tsx b/apps/wallet/src/ui/app/components/receipt-card/SponsoredTxnGasSummary.tsx
index 7b68e75fbb3..1dcca9eba75 100644
--- a/apps/wallet/src/ui/app/components/receipt-card/SponsoredTxnGasSummary.tsx
+++ b/apps/wallet/src/ui/app/components/receipt-card/SponsoredTxnGasSummary.tsx
@@ -18,7 +18,7 @@ export function SponsoredTxnGasSummary({ totalGas, sponsor }: SponsoredTxnGasSum
     const [sponsorTotalAmount, sponsorTotalAmountSymbol] = useFormatCoin(totalGas, IOTA_TYPE_ARG);
 
     return (
-        <div className="border-steel/20 py-3.5 first:pt-0 flex w-full flex-col gap-3.5 border-x-0 border-b-0 border-t border-solid">
+        <div className="border-steel/20 flex w-full flex-col gap-3.5 border-x-0 border-b-0 border-t border-solid py-3.5 first:pt-0">
             <Text variant="body" weight="medium" color="steel">
                 Gas Fees
             </Text>
diff --git a/apps/wallet/src/ui/app/components/receipt-card/StakeTxnCard.tsx b/apps/wallet/src/ui/app/components/receipt-card/StakeTxnCard.tsx
index 9ab148ca694..a2b1d0abb09 100644
--- a/apps/wallet/src/ui/app/components/receipt-card/StakeTxnCard.tsx
+++ b/apps/wallet/src/ui/app/components/receipt-card/StakeTxnCard.tsx
@@ -70,7 +70,7 @@ export function StakeTxnCard({ event }: StakeTxnCardProps) {
                     <TxnAmount amount={stakedAmount} coinType={IOTA_TYPE_ARG} label="Stake" />
                 )}
                 <div className="flex flex-col">
-                    <div className="py-3.5 flex w-full justify-between">
+                    <div className="flex w-full justify-between py-3.5">
                         <div className="text-steel flex items-baseline justify-center gap-1">
                             <Text variant="body" weight="medium" color="steel-darker">
                                 APY
@@ -83,7 +83,7 @@ export function StakeTxnCard({ event }: StakeTxnCardProps) {
                     </div>
                 </div>
                 <div className="flex flex-col">
-                    <div className="py-3.5 flex w-full justify-between">
+                    <div className="flex w-full justify-between py-3.5">
                         <div className="text-steel flex items-baseline gap-1">
                             <Text variant="body" weight="medium" color="steel-darker">
                                 {timeBeforeStakeRewardsStarts > 0
diff --git a/apps/wallet/src/ui/app/components/receipt-card/TxnGasSummary.tsx b/apps/wallet/src/ui/app/components/receipt-card/TxnGasSummary.tsx
index a7d26bbebbe..4dcbc1de26b 100644
--- a/apps/wallet/src/ui/app/components/receipt-card/TxnGasSummary.tsx
+++ b/apps/wallet/src/ui/app/components/receipt-card/TxnGasSummary.tsx
@@ -20,7 +20,7 @@ export function TxnGasSummary({ totalGas, transferAmount }: TxnGasSummaryProps)
     const [gas, symbol] = useFormatCoin(totalGas, IOTA_TYPE_ARG);
 
     return (
-        <div className="border-steel/20 py-3.5 first:pt-0 flex w-full flex-col items-center gap-3.5 border-x-0 border-b-0 border-t border-solid">
+        <div className="border-steel/20 flex w-full flex-col items-center gap-3.5 border-x-0 border-b-0 border-t border-solid py-3.5 first:pt-0">
             <div className="flex w-full items-center justify-between">
                 <Text variant="body" weight="medium" color="steel-darker">
                     Gas Fees
diff --git a/apps/wallet/src/ui/app/components/receipt-card/UnstakeTxnCard.tsx b/apps/wallet/src/ui/app/components/receipt-card/UnstakeTxnCard.tsx
index d76d14a288f..fab2cd99396 100644
--- a/apps/wallet/src/ui/app/components/receipt-card/UnstakeTxnCard.tsx
+++ b/apps/wallet/src/ui/app/components/receipt-card/UnstakeTxnCard.tsx
@@ -45,7 +45,7 @@ export function UnStakeTxnCard({ event }: UnStakeTxnCardProps) {
                     <TxnAmount amount={totalAmount} coinType={IOTA_TYPE_ARG} label="Total" />
                 )}
 
-                <div className="py-3.5 flex w-full justify-between">
+                <div className="flex w-full justify-between py-3.5">
                     <div className="text-steel flex items-baseline gap-1">
                         <Text variant="body" weight="medium" color="steel-darker">
                             Your IOTA Stake
@@ -59,7 +59,7 @@ export function UnStakeTxnCard({ event }: UnStakeTxnCardProps) {
                     </div>
                 </div>
 
-                <div className="py-3.5 flex w-full justify-between">
+                <div className="flex w-full justify-between py-3.5">
                     <div className="text-steel flex items-baseline gap-1">
                         <Text variant="body" weight="medium" color="steel-darker">
                             Staking Rewards Earned
diff --git a/apps/wallet/src/ui/app/components/transactions-card/NoActivityCard.tsx b/apps/wallet/src/ui/app/components/transactions-card/NoActivityCard.tsx
index dd909adbdf2..f3495989eb2 100644
--- a/apps/wallet/src/ui/app/components/transactions-card/NoActivityCard.tsx
+++ b/apps/wallet/src/ui/app/components/transactions-card/NoActivityCard.tsx
@@ -11,7 +11,7 @@ export interface NoActivityCardProps {
 
 export function NoActivityCard({ message }: NoActivityCardProps) {
     return (
-        <div className="px-10 flex h-full flex-col items-center justify-center gap-4 text-center">
+        <div className="flex h-full flex-col items-center justify-center gap-4 px-10 text-center">
             <TransferObject16 className="text-gray-45 text-3xl" />
             <Text variant="pBody" weight="medium" color="steel">
                 {message}
diff --git a/apps/wallet/src/ui/app/components/user-approve-container/index.tsx b/apps/wallet/src/ui/app/components/user-approve-container/index.tsx
index 04da2be944f..550e31fcf21 100644
--- a/apps/wallet/src/ui/app/components/user-approve-container/index.tsx
+++ b/apps/wallet/src/ui/app/components/user-approve-container/index.tsx
@@ -58,7 +58,7 @@ export function UserApproveContainer({
     const parsedOrigin = useMemo(() => new URL(origin), [origin]);
     return (
         <div className="flex h-full flex-1 flex-col flex-nowrap">
-            <div className="pb-0 flex flex-1 flex-col">
+            <div className="flex flex-1 flex-col pb-0">
                 <DAppInfoCard
                     name={parsedOrigin.host}
                     url={origin}
@@ -66,12 +66,12 @@ export function UserApproveContainer({
                     iconUrl={originFavIcon}
                     connectedAddress={!addressHidden && address ? address : undefined}
                 />
-                <div className="bg-hero-darkest/5 px-6 flex flex-1 flex-col">{children}</div>
+                <div className="bg-hero-darkest/5 flex flex-1 flex-col px-6">{children}</div>
             </div>
             <div className="sticky bottom-0">
                 <div
                     className={cn(
-                        'bg-hero-darkest/5 px-5 py-4 flex items-center gap-2.5 backdrop-blur-lg',
+                        'bg-hero-darkest/5 flex items-center gap-2.5 px-5 py-4 backdrop-blur-lg',
                         {
                             'flex-row-reverse': isWarning,
                         },
diff --git a/apps/wallet/src/ui/app/pages/accounts/ImportLedgerAccountsPage.tsx b/apps/wallet/src/ui/app/pages/accounts/ImportLedgerAccountsPage.tsx
index 1c8fb8f6124..a7ea433b145 100644
--- a/apps/wallet/src/ui/app/pages/accounts/ImportLedgerAccountsPage.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/ImportLedgerAccountsPage.tsx
@@ -105,7 +105,7 @@ export function ImportLedgerAccountsPage() {
     } else if (!encounteredDerviceAccountsError) {
         const selectedLedgerAddresses = selectedLedgerAccounts.map(({ address }) => address);
         summaryCardBody = (
-            <div className="custom-scrollbar pr-2 -mr-2 mt-1 max-h-[272px] overflow-auto">
+            <div className="custom-scrollbar -mr-2 mt-1 max-h-[272px] overflow-auto pr-2">
                 <LedgerAccountList
                     accounts={ledgerAccounts.map((ledgerAccount) => ({
                         ...ledgerAccount,
@@ -127,15 +127,15 @@ export function ImportLedgerAccountsPage() {
         >
             <div className="flex h-full w-full flex-col gap-5">
                 <div className="border-gray-45 flex h-full max-h-[368px] flex-col rounded-2xl border border-solid bg-white">
-                    <div className="bg-gray-40 py-2.5 rounded-t-2xl text-center">
+                    <div className="bg-gray-40 rounded-t-2xl py-2.5 text-center">
                         <Text variant="captionSmall" weight="bold" color="steel-darker" truncate>
                             {areAllAccountsImported
                                 ? 'Ledger Accounts '
                                 : 'Connect Ledger Accounts'}
                         </Text>
                     </div>
-                    <div className="px-4 py-2 grow">{summaryCardBody}</div>
-                    <div className="border-gray-40 pb-4 pt-3 w-full rounded-b-2xl border-x-0 border-b-0 border-t border-solid text-center">
+                    <div className="grow px-4 py-2">{summaryCardBody}</div>
+                    <div className="border-gray-40 w-full rounded-b-2xl border-x-0 border-b-0 border-t border-solid pb-4 pt-3 text-center">
                         <div className="ml-auto mr-auto w-fit">
                             <Link
                                 text="Select All Accounts"
diff --git a/apps/wallet/src/ui/app/pages/accounts/ImportPassphrasePage.tsx b/apps/wallet/src/ui/app/pages/accounts/ImportPassphrasePage.tsx
index fc6733c19f3..61f33d8b48b 100644
--- a/apps/wallet/src/ui/app/pages/accounts/ImportPassphrasePage.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/ImportPassphrasePage.tsx
@@ -17,7 +17,7 @@ export function ImportPassphrasePage() {
     const navigate = useNavigate();
     const [, setFormValues] = useAccountsFormContext();
     return (
-        <div className="bg-iota-lightest px-6 py-10 flex h-full flex-col items-center overflow-auto rounded-20 shadow-wallet-content">
+        <div className="bg-iota-lightest flex h-full flex-col items-center overflow-auto rounded-20 px-6 py-10 shadow-wallet-content">
             <Text variant="caption" color="steel-dark" weight="semibold">
                 Wallet Setup
             </Text>
diff --git a/apps/wallet/src/ui/app/pages/accounts/ImportPrivateKeyPage.tsx b/apps/wallet/src/ui/app/pages/accounts/ImportPrivateKeyPage.tsx
index 0dc4643e8b8..4139bc2e431 100644
--- a/apps/wallet/src/ui/app/pages/accounts/ImportPrivateKeyPage.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/ImportPrivateKeyPage.tsx
@@ -17,7 +17,7 @@ export function ImportPrivateKeyPage() {
     const [, setAccountsFormValues] = useAccountsFormContext();
 
     return (
-        <div className="bg-iota-lightest px-6 py-10 flex h-full w-full flex-col items-center rounded-20 shadow-wallet-content">
+        <div className="bg-iota-lightest flex h-full w-full flex-col items-center rounded-20 px-6 py-10 shadow-wallet-content">
             <Text variant="caption" color="steel-dark" weight="semibold">
                 Wallet Setup
             </Text>
diff --git a/apps/wallet/src/ui/app/pages/accounts/ImportSeedPage.tsx b/apps/wallet/src/ui/app/pages/accounts/ImportSeedPage.tsx
index 2073175223a..3bb12e3270c 100644
--- a/apps/wallet/src/ui/app/pages/accounts/ImportSeedPage.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/ImportSeedPage.tsx
@@ -16,7 +16,7 @@ export function ImportSeedPage() {
     const [, setAccountsFormValues] = useAccountsFormContext();
 
     return (
-        <div className="bg-iota-lightest px-6 py-10 flex h-full w-full flex-col items-center rounded-20 shadow-wallet-content">
+        <div className="bg-iota-lightest flex h-full w-full flex-col items-center rounded-20 px-6 py-10 shadow-wallet-content">
             <Text variant="caption" color="steel-dark" weight="semibold">
                 Wallet Setup
             </Text>
diff --git a/apps/wallet/src/ui/app/pages/accounts/ProtectAccountPage.tsx b/apps/wallet/src/ui/app/pages/accounts/ProtectAccountPage.tsx
index 5d2cc625d5d..da9892ad5ec 100644
--- a/apps/wallet/src/ui/app/pages/accounts/ProtectAccountPage.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/ProtectAccountPage.tsx
@@ -115,7 +115,7 @@ export function ProtectAccountPage() {
     }
 
     return (
-        <div className="bg-iota-lightest px-6 py-10 flex h-screen max-h-popup-height min-h-popup-minimum w-popup-width flex-col items-center overflow-auto rounded-20 shadow-wallet-content">
+        <div className="bg-iota-lightest flex h-screen max-h-popup-height min-h-popup-minimum w-popup-width flex-col items-center overflow-auto rounded-20 px-6 py-10 shadow-wallet-content">
             <Loading loading={showVerifyPasswordView === null}>
                 {showVerifyPasswordView ? (
                     <VerifyPasswordModal
diff --git a/apps/wallet/src/ui/app/pages/accounts/WelcomePage.tsx b/apps/wallet/src/ui/app/pages/accounts/WelcomePage.tsx
index 82c92dd6d68..e9ee4aacbc8 100644
--- a/apps/wallet/src/ui/app/pages/accounts/WelcomePage.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/WelcomePage.tsx
@@ -21,7 +21,7 @@ export function WelcomePage() {
     );
     return (
         <Loading loading={isInitializedLoading || isFullscreenGuardLoading}>
-            <div className="bg-iota-lightest px-7 py-6 flex h-full flex-col items-center overflow-auto rounded-20 shadow-wallet-content">
+            <div className="bg-iota-lightest flex h-full flex-col items-center overflow-auto rounded-20 px-7 py-6 shadow-wallet-content">
                 <div className="shrink-0">
                     <Logo />
                 </div>
diff --git a/apps/wallet/src/ui/app/pages/accounts/forgot-password/ForgotPasswordPage.tsx b/apps/wallet/src/ui/app/pages/accounts/forgot-password/ForgotPasswordPage.tsx
index 74380fe8bff..832cad5f6d8 100644
--- a/apps/wallet/src/ui/app/pages/accounts/forgot-password/ForgotPasswordPage.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/forgot-password/ForgotPasswordPage.tsx
@@ -32,7 +32,7 @@ export function ForgotPasswordPage() {
         setRecoveryData([]);
     }, []);
     return (
-        <div className="bg-iota-lightest px-6 py-10 flex h-full w-full flex-col flex-nowrap items-center gap-6 overflow-auto rounded-20 shadow-wallet-content">
+        <div className="bg-iota-lightest flex h-full w-full flex-col flex-nowrap items-center gap-6 overflow-auto rounded-20 px-6 py-10 shadow-wallet-content">
             <forgotPasswordContext.Provider value={{ value: recoveryData, add, clear }}>
                 <Outlet />
             </forgotPasswordContext.Provider>
diff --git a/apps/wallet/src/ui/app/pages/accounts/forgot-password/RecoverManyPage.tsx b/apps/wallet/src/ui/app/pages/accounts/forgot-password/RecoverManyPage.tsx
index f639f0d069a..b3773b50194 100644
--- a/apps/wallet/src/ui/app/pages/accounts/forgot-password/RecoverManyPage.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/forgot-password/RecoverManyPage.tsx
@@ -54,7 +54,7 @@ export function RecoverManyPage() {
                     </Text>
                 </div>
                 {mnemonicAccounts.length > 0 ? (
-                    <div className="bg-hero-darkest/5 px-4 py-6 flex grow flex-col gap-8 self-stretch overflow-y-auto overflow-x-hidden rounded-lg">
+                    <div className="bg-hero-darkest/5 flex grow flex-col gap-8 self-stretch overflow-y-auto overflow-x-hidden rounded-lg px-4 py-6">
                         {mnemonicAccounts.map(([sourceID, accounts], index) => {
                             const recoveryData = value.find(
                                 ({ accountSourceID }) => accountSourceID === sourceID,
@@ -80,7 +80,7 @@ export function RecoverManyPage() {
                     </div>
                 ) : null}
                 {seedAccounts.length > 0 ? (
-                    <div className="bg-hero-darkest/5 px-4 py-6 flex grow flex-col gap-8 self-stretch overflow-y-auto overflow-x-hidden rounded-lg">
+                    <div className="bg-hero-darkest/5 flex grow flex-col gap-8 self-stretch overflow-y-auto overflow-x-hidden rounded-lg px-4 py-6">
                         {seedAccounts.map(([sourceID, accounts], index) => {
                             const recoveryData = value.find(
                                 ({ accountSourceID }) => accountSourceID === sourceID,
diff --git a/apps/wallet/src/ui/app/pages/accounts/forgot-password/ResetWarningPage.tsx b/apps/wallet/src/ui/app/pages/accounts/forgot-password/ResetWarningPage.tsx
index a781637b371..81336c90734 100644
--- a/apps/wallet/src/ui/app/pages/accounts/forgot-password/ResetWarningPage.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/forgot-password/ResetWarningPage.tsx
@@ -40,7 +40,7 @@ export function ResetWarningPage() {
                     password reset process. You will need to connect/import them again.
                 </Text>
             </div>
-            <div className="bg-hero-darkest/5 px-4 py-6 mb-10 mt-5 flex w-full flex-1 flex-col gap-8 overflow-auto rounded-lg">
+            <div className="bg-hero-darkest/5 mb-10 mt-5 flex w-full flex-1 flex-col gap-8 overflow-auto rounded-lg px-4 py-6">
                 {accountGroupsToRemove.map(([sourceID, accounts]) => (
                     <RecoverAccountsGroup
                         key={sourceID}
diff --git a/apps/wallet/src/ui/app/pages/approval-request/transaction-request/GasFees.tsx b/apps/wallet/src/ui/app/pages/approval-request/transaction-request/GasFees.tsx
index a8c2376c150..64a4e88019f 100644
--- a/apps/wallet/src/ui/app/pages/approval-request/transaction-request/GasFees.tsx
+++ b/apps/wallet/src/ui/app/pages/approval-request/transaction-request/GasFees.tsx
@@ -26,7 +26,7 @@ export function GasFees({ sender, transaction }: GasFeesProps) {
             header="Estimated Gas Fees"
             badge={
                 isSponsored ? (
-                    <div className="text-success px-1.5 py-0.5 rounded-full bg-white text-captionSmallExtra font-medium uppercase">
+                    <div className="text-success rounded-full bg-white px-1.5 py-0.5 text-captionSmallExtra font-medium uppercase">
                         Sponsored
                     </div>
                 ) : null
diff --git a/apps/wallet/src/ui/app/pages/approval-request/transaction-request/SummaryCard.tsx b/apps/wallet/src/ui/app/pages/approval-request/transaction-request/SummaryCard.tsx
index 13a1dde69d6..09ed7402b2c 100644
--- a/apps/wallet/src/ui/app/pages/approval-request/transaction-request/SummaryCard.tsx
+++ b/apps/wallet/src/ui/app/pages/approval-request/transaction-request/SummaryCard.tsx
@@ -32,7 +32,7 @@ export function SummaryCard({
         >
             <button
                 onClick={() => setExpanded((expanded) => !expanded)}
-                className="bg-gray-40 px-4 py-2 relative flex w-full cursor-pointer items-center gap-1.5 border-none text-left"
+                className="bg-gray-40 relative flex w-full cursor-pointer items-center gap-1.5 border-none px-4 py-2 text-left"
             >
                 <div className="flex-1">
                     <Text variant="captionSmall" weight="semibold" color="steel-darker">
diff --git a/apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/Command.tsx b/apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/Command.tsx
index c41416bac3a..b20dd2cd238 100644
--- a/apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/Command.tsx
+++ b/apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/Command.tsx
@@ -100,7 +100,7 @@ export function Command({ command }: CommandProps) {
         <div>
             <button
                 onClick={() => setExpanded((expanded) => !expanded)}
-                className="p-0 flex w-full items-center gap-2 border-none bg-transparent"
+                className="flex w-full items-center gap-2 border-none bg-transparent p-0"
             >
                 <Text variant="body" weight="semibold" color="steel-darker">
                     {command.kind}
diff --git a/apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/index.tsx b/apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/index.tsx
index b86972dfbe5..e22aecfee94 100644
--- a/apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/index.tsx
+++ b/apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/index.tsx
@@ -17,7 +17,7 @@ interface TransactionDetailsProps {
 
 const Tab = (props: TabProps<'div'>) => (
     <HeadlessTab
-        className="text-steel-darker ui-selected:border-hero ui-selected:text-hero-dark p-0 pb-2 -mb-px cursor-pointer border-0 border-b border-solid border-transparent bg-transparent text-body font-semibold outline-none"
+        className="text-steel-darker ui-selected:border-hero ui-selected:text-hero-dark -mb-px cursor-pointer border-0 border-b border-solid border-transparent bg-transparent p-0 pb-2 text-body font-semibold outline-none"
         {...props}
     />
 );
diff --git a/apps/wallet/src/ui/app/pages/home/hidden-assets/HiddenAssetsProvider.tsx b/apps/wallet/src/ui/app/pages/home/hidden-assets/HiddenAssetsProvider.tsx
index 0af4be5a61b..393a9315795 100644
--- a/apps/wallet/src/ui/app/pages/home/hidden-assets/HiddenAssetsProvider.tsx
+++ b/apps/wallet/src/ui/app/pages/home/hidden-assets/HiddenAssetsProvider.tsx
@@ -67,7 +67,7 @@ export const HiddenAssetsProvider = ({ children }: { children: ReactNode }) => {
                 toast.custom(
                     (t) => (
                         <div
-                            className="border-gray-45 px-3 py-2 flex w-full items-center justify-between gap-2 rounded-full border-solid bg-white shadow-notification"
+                            className="border-gray-45 flex w-full items-center justify-between gap-2 rounded-full border-solid bg-white px-3 py-2 shadow-notification"
                             style={{
                                 animation: 'fade-in-up 200ms ease-in-out',
                             }}
@@ -147,7 +147,7 @@ export const HiddenAssetsProvider = ({ children }: { children: ReactNode }) => {
                 toast.custom(
                     (t) => (
                         <div
-                            className="border-gray-45 px-3 py-2 flex w-full items-center justify-between gap-2 rounded-full border-solid bg-white shadow-notification"
+                            className="border-gray-45 flex w-full items-center justify-between gap-2 rounded-full border-solid bg-white px-3 py-2 shadow-notification"
                             style={{
                                 animation: 'fade-in-up 200ms ease-in-out',
                             }}
diff --git a/apps/wallet/src/ui/app/pages/home/hidden-assets/index.tsx b/apps/wallet/src/ui/app/pages/home/hidden-assets/index.tsx
index 7618f920103..179e7a35ee3 100644
--- a/apps/wallet/src/ui/app/pages/home/hidden-assets/index.tsx
+++ b/apps/wallet/src/ui/app/pages/home/hidden-assets/index.tsx
@@ -86,7 +86,7 @@ function HiddenNftsPage() {
                             const { objectId, type } = nft.data!;
                             return (
                                 <div
-                                    className="pr-1 pt-2 flex items-center justify-between"
+                                    className="flex items-center justify-between pr-1 pt-2"
                                     key={objectId}
                                 >
                                     <Link
diff --git a/apps/wallet/src/ui/app/pages/home/nfts/AssetsOptionsMenu.tsx b/apps/wallet/src/ui/app/pages/home/nfts/AssetsOptionsMenu.tsx
index dffc38e9b18..b5eec8085c5 100644
--- a/apps/wallet/src/ui/app/pages/home/nfts/AssetsOptionsMenu.tsx
+++ b/apps/wallet/src/ui/app/pages/home/nfts/AssetsOptionsMenu.tsx
@@ -21,14 +21,14 @@ const AssetsOptionsMenu = () => {
                 <Ooo24 className="text-gray-90 h-full w-full" />
             </Menu.Button>
             <Menu.Items className="absolute right-0 top-4 z-50 mt-2 w-50 divide-y divide-gray-200 rounded-md bg-white">
-                <div className="p-2 h-full w-full rounded-md shadow-card-soft">
+                <div className="h-full w-full rounded-md p-2 shadow-card-soft">
                     <Menu.Item>
                         {({ active }) => (
                             <Link
                                 to="/nfts/hidden-assets"
                                 className="text-steel-darker hover:text-steel-darker focus:text-steel-darker disabled:text-steel-darker text-bodySmall font-medium no-underline"
                             >
-                                <div className="hover:bg-iota-light bg-opacity-50 p-3 rounded-md">
+                                <div className="hover:bg-iota-light rounded-md bg-opacity-50 p-3">
                                     View Hidden Assets
                                 </div>
                             </Link>
diff --git a/apps/wallet/src/ui/app/pages/home/nfts/NonVisualAssets.tsx b/apps/wallet/src/ui/app/pages/home/nfts/NonVisualAssets.tsx
index 83557ac373b..9380a0afd8b 100644
--- a/apps/wallet/src/ui/app/pages/home/nfts/NonVisualAssets.tsx
+++ b/apps/wallet/src/ui/app/pages/home/nfts/NonVisualAssets.tsx
@@ -20,7 +20,7 @@ export default function NonVisualAssets({ items }: NonVisualAssetsProps) {
                     {items.map((item) => {
                         const { address, module, name } = parseStructTag(item.type!);
                         return (
-                            <div className="pt-3 grid grid-cols-3" key={item.objectId}>
+                            <div className="grid grid-cols-3 pt-3" key={item.objectId}>
                                 <ExplorerLink
                                     className="text-hero-dark no-underline"
                                     objectID={item.objectId!}
diff --git a/apps/wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx b/apps/wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx
index beb4b28ae54..5d0d70a4641 100644
--- a/apps/wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx
+++ b/apps/wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx
@@ -44,7 +44,7 @@ export default function VisualAssets({ items }: VisualAssetsProps) {
                     className="relative no-underline"
                 >
                     <div className="group">
-                        <div className="text-gray-60 p-0 pointer-events-auto absolute z-10 h-full w-full justify-center transition-colors duration-200">
+                        <div className="text-gray-60 pointer-events-auto absolute z-10 h-full w-full justify-center p-0 transition-colors duration-200">
                             {!isKioskOwnerToken(kioskClient.network, object) ? (
                                 <div className="absolute right-3 top-2 h-8 w-8 rounded-md opacity-0 group-hover:opacity-100">
                                     <Button
diff --git a/apps/wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx b/apps/wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx
index 9450b9d6bd3..9b757a5e151 100644
--- a/apps/wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx
+++ b/apps/wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx
@@ -112,7 +112,7 @@ export function TokenRow({ coinBalance, renderActions, onClick }: TokenRowProps)
     return (
         <Tag
             className={clsx(
-                'hover:bg-iota/10 py-3 pl-1.5 pr-2 group flex items-center rounded border-transparent bg-transparent',
+                'hover:bg-iota/10 group flex items-center rounded border-transparent bg-transparent py-3 pl-1.5 pr-2',
                 onClick && 'hover:cursor-pointer',
             )}
             onClick={onClick}
@@ -373,7 +373,7 @@ function TokenDetails({ coinType }: TokenDetailsProps) {
     return (
         <>
             {isMainnet && data?.degraded && (
-                <div className="border-warning-dark/20 bg-warning-light text-warning-dark px-3 py-2 mb-4 flex items-center rounded-2xl border border-solid">
+                <div className="border-warning-dark/20 bg-warning-light text-warning-dark mb-4 flex items-center rounded-2xl border border-solid px-3 py-2">
                     <Info12 className="shrink-0" />
                     <div className="ml-2">
                         <Text variant="pBodySmall" weight="medium">
@@ -405,7 +405,7 @@ function TokenDetails({ coinType }: TokenDetailsProps) {
                                 <div
                                     data-testid="coin-balance"
                                     className={clsx(
-                                        'px-4 py-5 mt-4 flex w-full flex-col items-center gap-3 rounded-2xl',
+                                        'mt-4 flex w-full flex-col items-center gap-3 rounded-2xl px-4 py-5',
                                         isDefiWalletEnabled
                                             ? 'bg-gradients-graph-cards'
                                             : 'bg-hero/5',
@@ -417,7 +417,7 @@ function TokenDetails({ coinType }: TokenDetailsProps) {
 
                                     {!accountHasIota ? (
                                         <div className="flex flex-col gap-5">
-                                            <div className="px-2.5 flex flex-col flex-nowrap items-center justify-center text-center">
+                                            <div className="flex flex-col flex-nowrap items-center justify-center px-2.5 text-center">
                                                 <Text
                                                     variant="pBodySmall"
                                                     color="gray-80"
diff --git a/apps/wallet/src/ui/app/pages/home/transactions/index.tsx b/apps/wallet/src/ui/app/pages/home/transactions/index.tsx
index 91d509ec5ac..536d2b0e2ae 100644
--- a/apps/wallet/src/ui/app/pages/home/transactions/index.tsx
+++ b/apps/wallet/src/ui/app/pages/home/transactions/index.tsx
@@ -22,7 +22,7 @@ function TransactionBlocksPage() {
     return (
         <div className="flex h-full flex-col flex-nowrap overflow-x-visible">
             <PageTitle title="Your Activity" />
-            <div className="divide-gray-45 px-5 -mx-5 mt-5 flex-grow divide-x-0 divide-y divide-solid overflow-y-auto">
+            <div className="divide-gray-45 -mx-5 mt-5 flex-grow divide-x-0 divide-y divide-solid overflow-y-auto px-5">
                 <CompletedTransactions />
             </div>
         </div>
diff --git a/apps/wallet/src/ui/app/pages/home/transfer-coin/PreviewTransfer.tsx b/apps/wallet/src/ui/app/pages/home/transfer-coin/PreviewTransfer.tsx
index 7318da7e837..e25da2eb553 100644
--- a/apps/wallet/src/ui/app/pages/home/transfer-coin/PreviewTransfer.tsx
+++ b/apps/wallet/src/ui/app/pages/home/transfer-coin/PreviewTransfer.tsx
@@ -29,7 +29,7 @@ export function PreviewTransfer({
     const amountWithoutDecimals = parseAmount(amount, metadata?.decimals ?? 0);
 
     return (
-        <div className="divide-steel/20 px-2.5 flex w-full flex-col divide-x-0 divide-y divide-solid">
+        <div className="divide-steel/20 flex w-full flex-col divide-x-0 divide-y divide-solid px-2.5">
             <TxnAmount
                 amount={amountWithoutDecimals.toString()}
                 label="Sending"
@@ -38,7 +38,7 @@ export function PreviewTransfer({
             />
             <TxnAddress address={accountAddress || ''} label="From" />
             <TxnAddress address={to} label="To" />
-            <div className="pt-3.5 mb-5 flex w-full justify-between gap-2">
+            <div className="mb-5 flex w-full justify-between gap-2 pt-3.5">
                 <div className="flex gap-1">
                     <Text variant="body" color="gray-80" weight="medium">
                         Estimated Gas Fees
diff --git a/apps/wallet/src/ui/app/pages/restricted/index.tsx b/apps/wallet/src/ui/app/pages/restricted/index.tsx
index afa4c47d743..4e053c3a2e6 100644
--- a/apps/wallet/src/ui/app/pages/restricted/index.tsx
+++ b/apps/wallet/src/ui/app/pages/restricted/index.tsx
@@ -10,7 +10,7 @@ export function RestrictedPage() {
     useInitializedGuard(true);
 
     return (
-        <div className="bg-iota/10 px-10 py-15 flex w-full max-w-[400px] flex-col items-center gap-10 rounded-20 text-center">
+        <div className="bg-iota/10 flex w-full max-w-[400px] flex-col items-center gap-10 rounded-20 px-10 py-15 text-center">
             <SadCapy role="presentation" />
             <Text variant="pBody" color="steel-darker" weight="medium">
                 Regrettably this service is not available to you. Applicable laws prohibit us from
diff --git a/apps/wallet/src/ui/app/shared/Dialog.tsx b/apps/wallet/src/ui/app/shared/Dialog.tsx
index d190e100281..1673ac2f0bb 100644
--- a/apps/wallet/src/ui/app/shared/Dialog.tsx
+++ b/apps/wallet/src/ui/app/shared/Dialog.tsx
@@ -37,7 +37,7 @@ const DialogContent = React.forwardRef<
             <RadixDialog.Content
                 ref={ref}
                 className={cx(
-                    'p-6 absolute left-1/2 top-1/2 z-[99999] flex max-h-[60vh] w-80 max-w-[85vw] -translate-x-1/2 -translate-y-1/2 flex-col justify-center gap-3 overflow-hidden rounded-xl shadow-wallet-modal data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%]',
+                    'absolute left-1/2 top-1/2 z-[99999] flex max-h-[60vh] w-80 max-w-[85vw] -translate-x-1/2 -translate-y-1/2 flex-col justify-center gap-3 overflow-hidden rounded-xl p-6 shadow-wallet-modal data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%]',
                     className,
                     background === 'white'
                         ? 'bg-white'
diff --git a/apps/wallet/src/ui/app/shared/InputWithAction.tsx b/apps/wallet/src/ui/app/shared/InputWithAction.tsx
index ee482bc3d90..dd09ab2051a 100644
--- a/apps/wallet/src/ui/app/shared/InputWithAction.tsx
+++ b/apps/wallet/src/ui/app/shared/InputWithAction.tsx
@@ -219,7 +219,7 @@ export const InputWithActionButton = forwardRef<HTMLInputElement, InputWithActio
                         autoFocus
                         type={type}
                         className={clsx(
-                            'text-steel-darker caret-hero p-0 z-10 h-6 border-none bg-transparent text-heading5 font-semibold',
+                            'text-steel-darker caret-hero z-10 h-6 border-none bg-transparent p-0 text-heading5 font-semibold',
                             loading && 'text-transparent',
                         )}
                         disabled={disabled}
diff --git a/apps/wallet/src/ui/app/shared/LargeButton.tsx b/apps/wallet/src/ui/app/shared/LargeButton.tsx
index d0b341bab3b..5acb561546e 100644
--- a/apps/wallet/src/ui/app/shared/LargeButton.tsx
+++ b/apps/wallet/src/ui/app/shared/LargeButton.tsx
@@ -55,7 +55,7 @@ export const LargeButton = forwardRef(
                 ref={ref}
                 {...otherProps}
                 className={clsx(
-                    'px-8 py-2 group flex items-center justify-between rounded-md border border-solid border-transparent no-underline',
+                    'group flex items-center justify-between rounded-md border border-solid border-transparent px-8 py-2 no-underline',
                     disabled
                         ? 'bg-hero-darkest/5 pointer-events-none'
                         : 'hover:border-iota/10 bg-white/80',
@@ -65,7 +65,7 @@ export const LargeButton = forwardRef(
                 )}
             >
                 {loading && (
-                    <div className="p-2 flex h-full w-full items-center justify-center">
+                    <div className="flex h-full w-full items-center justify-center p-2">
                         <LoadingIndicator />
                     </div>
                 )}
diff --git a/apps/wallet/src/ui/app/shared/card-layout/index.tsx b/apps/wallet/src/ui/app/shared/card-layout/index.tsx
index cfa2d0346fb..925eb7892e2 100644
--- a/apps/wallet/src/ui/app/shared/card-layout/index.tsx
+++ b/apps/wallet/src/ui/app/shared/card-layout/index.tsx
@@ -17,9 +17,9 @@ export interface CardLayoutProps {
 
 export function CardLayout({ children, title, subtitle, headerCaption, icon }: CardLayoutProps) {
     return (
-        <div className="bg-iota-lightest p-7.5 pt-10 flex max-h-popup-height w-full max-w-popup-width flex-grow flex-col flex-nowrap items-center overflow-auto rounded-20 shadow-wallet-content">
+        <div className="bg-iota-lightest flex max-h-popup-height w-full max-w-popup-width flex-grow flex-col flex-nowrap items-center overflow-auto rounded-20 p-7.5 pt-10 shadow-wallet-content">
             {icon === 'success' ? (
-                <div className="border-success p-1 mb-2.5 flex h-12 w-12 items-center justify-center rounded-full border-2 border-dotted">
+                <div className="border-success mb-2.5 flex h-12 w-12 items-center justify-center rounded-full border-2 border-dotted p-1">
                     <div className="bg-success flex h-8 w-8 items-center justify-center rounded-full">
                         <ThumbUpFill32 className="text-2xl text-white" />
                     </div>
diff --git a/apps/wallet/src/ui/app/shared/card/index.tsx b/apps/wallet/src/ui/app/shared/card/index.tsx
index dc57a0633d8..2708cf1d163 100644
--- a/apps/wallet/src/ui/app/shared/card/index.tsx
+++ b/apps/wallet/src/ui/app/shared/card/index.tsx
@@ -42,8 +42,8 @@ export function Card({ header, footer, children, ...styleProps }: CardProps) {
             <div className={cardContentStyle(styleProps)}>
                 {children}
                 {footer && (
-                    <div className={'pt-0 flex w-full flex-col justify-center'}>
-                        {children && <span className="bg-gray-45 px-4 mb-3.5 h-px w-full"></span>}
+                    <div className={'flex w-full flex-col justify-center pt-0'}>
+                        {children && <span className="bg-gray-45 mb-3.5 h-px w-full px-4"></span>}
                         <div className="flex justify-between">{footer}</div>
                     </div>
                 )}
diff --git a/apps/wallet/src/ui/app/shared/collapse/index.tsx b/apps/wallet/src/ui/app/shared/collapse/index.tsx
index 3bba1c40779..50c36bffeaf 100644
--- a/apps/wallet/src/ui/app/shared/collapse/index.tsx
+++ b/apps/wallet/src/ui/app/shared/collapse/index.tsx
@@ -37,7 +37,7 @@ export function Collapsible({
             open={isOpen ?? open}
             onOpenChange={handleOpenChange}
         >
-            <CollapsiblePrimitive.Trigger className="p-0 group flex w-full cursor-pointer items-center gap-2 border-none bg-transparent">
+            <CollapsiblePrimitive.Trigger className="group flex w-full cursor-pointer items-center gap-2 border-none bg-transparent p-0">
                 <div
                     className={cn(
                         'group-hover:text-hero text-captionSmall font-semibold uppercase',
diff --git a/apps/wallet/src/ui/app/shared/delegated-apy/index.tsx b/apps/wallet/src/ui/app/shared/delegated-apy/index.tsx
index 1f7ae58bd09..ee825c1c9b2 100644
--- a/apps/wallet/src/ui/app/shared/delegated-apy/index.tsx
+++ b/apps/wallet/src/ui/app/shared/delegated-apy/index.tsx
@@ -35,7 +35,7 @@ export function DelegatedAPY({ stakedValidators }: DelegatedAPYProps) {
 
     if (isPending) {
         return (
-            <div className="p-2 flex h-full w-full items-center justify-center">
+            <div className="flex h-full w-full items-center justify-center p-2">
                 <LoadingIndicator />
             </div>
         );
diff --git a/apps/wallet/src/ui/app/shared/forms/controls/Checkbox.tsx b/apps/wallet/src/ui/app/shared/forms/controls/Checkbox.tsx
index 10897d97f6c..d692c5872cb 100644
--- a/apps/wallet/src/ui/app/shared/forms/controls/Checkbox.tsx
+++ b/apps/wallet/src/ui/app/shared/forms/controls/Checkbox.tsx
@@ -13,9 +13,9 @@ type CheckboxProps = {
 
 export const Checkbox = forwardRef<HTMLButtonElement, CheckboxProps>(
     ({ label, ...props }, forwardedRef) => (
-        <div className="pl-2.5 flex items-center gap-2">
+        <div className="flex items-center gap-2 pl-2.5">
             <RadixCheckbox.Root
-                className="p-0 group peer m-0 appearance-none border-0 bg-transparent"
+                className="group peer m-0 appearance-none border-0 bg-transparent p-0"
                 ref={forwardedRef}
                 id={props.name}
                 {...props}
diff --git a/apps/wallet/src/ui/app/shared/forms/controls/Input.tsx b/apps/wallet/src/ui/app/shared/forms/controls/Input.tsx
index b7dc7dc735d..50fa517f291 100644
--- a/apps/wallet/src/ui/app/shared/forms/controls/Input.tsx
+++ b/apps/wallet/src/ui/app/shared/forms/controls/Input.tsx
@@ -9,7 +9,7 @@ type InputProps = Omit<ComponentProps<'input'>, 'className'>;
 
 export const Input = forwardRef<HTMLInputElement, InputProps>((props, forwardedRef) => (
     <input
-        className="border-gray-45 text-steel-dark placeholder:text-gray-60 hover:border-steel hover:text-steel-darker focus:border-steel focus:text-steel-darker disabled:border-gray-45 disabled:text-gray-60 p-3 peer w-full items-center rounded-lg border border-solid bg-white text-body font-medium shadow-sm transition"
+        className="border-gray-45 text-steel-dark placeholder:text-gray-60 hover:border-steel hover:text-steel-darker focus:border-steel focus:text-steel-darker disabled:border-gray-45 disabled:text-gray-60 peer w-full items-center rounded-lg border border-solid bg-white p-3 text-body font-medium shadow-sm transition"
         ref={forwardedRef}
         {...props}
     />
diff --git a/apps/wallet/src/ui/app/shared/forms/controls/Select.tsx b/apps/wallet/src/ui/app/shared/forms/controls/Select.tsx
index c29f4beee89..e55094b0e90 100644
--- a/apps/wallet/src/ui/app/shared/forms/controls/Select.tsx
+++ b/apps/wallet/src/ui/app/shared/forms/controls/Select.tsx
@@ -16,7 +16,7 @@ const SelectTrigger = forwardRef<
 >(({ className, children, ...props }, ref) => (
     <SelectPrimitive.Trigger
         ref={ref}
-        className="border-gray-45 text-steel-dark hover:border-steel hover:text-steel-darker active:bg-hero/5 active:text-steel-dark disabled:border-gray-45 disabled:text-gray-60 px-4 py-3 group flex cursor-pointer items-center gap-0.5 rounded-lg border border-solid bg-white shadow-sm transition focus:outline-none disabled:cursor-default disabled:bg-white"
+        className="border-gray-45 text-steel-dark hover:border-steel hover:text-steel-darker active:bg-hero/5 active:text-steel-dark disabled:border-gray-45 disabled:text-gray-60 group flex cursor-pointer items-center gap-0.5 rounded-lg border border-solid bg-white px-4 py-3 shadow-sm transition focus:outline-none disabled:cursor-default disabled:bg-white"
         {...props}
     >
         {children}
@@ -37,7 +37,7 @@ const SelectContent = forwardRef<
             className="z-[99999] min-w-[112px] bg-transparent"
             {...props}
         >
-            <SelectPrimitive.Viewport className="border-gray-45 p-2 rounded-lg border border-solid bg-white shadow-sm">
+            <SelectPrimitive.Viewport className="border-gray-45 rounded-lg border border-solid bg-white p-2 shadow-sm">
                 {children}
             </SelectPrimitive.Viewport>
         </SelectPrimitive.Content>
@@ -51,7 +51,7 @@ const SelectItem = forwardRef<
 >(({ className, children, ...props }, ref) => (
     <SelectPrimitive.Item
         ref={ref}
-        className="text-steel-dark hover:bg-hero/5 hover:text-steel-darker p-2 flex cursor-pointer items-center rounded-md outline-none transition"
+        className="text-steel-dark hover:bg-hero/5 hover:text-steel-darker flex cursor-pointer items-center rounded-md p-2 outline-none transition"
         {...props}
     >
         <SelectPrimitive.ItemText>
diff --git a/apps/wallet/src/ui/app/shared/forms/controls/TextArea.tsx b/apps/wallet/src/ui/app/shared/forms/controls/TextArea.tsx
index 1009d5974ae..46cdf121974 100644
--- a/apps/wallet/src/ui/app/shared/forms/controls/TextArea.tsx
+++ b/apps/wallet/src/ui/app/shared/forms/controls/TextArea.tsx
@@ -9,7 +9,7 @@ type TextAreaProps = Omit<ComponentProps<'textarea'>, 'className' | 'ref'>;
 
 export const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>((props, forwardedRef) => (
     <textarea
-        className="border-gray-45 text-steel-dark focus:border-steel p-3 w-full resize-none rounded-2lg border border-solid text-body font-medium shadow-button focus:shadow-none"
+        className="border-gray-45 text-steel-dark focus:border-steel w-full resize-none rounded-2lg border border-solid p-3 text-body font-medium shadow-button focus:shadow-none"
         ref={forwardedRef}
         {...props}
     />
diff --git a/apps/wallet/src/ui/app/shared/input/password/index.tsx b/apps/wallet/src/ui/app/shared/input/password/index.tsx
index fa142b46b50..c0fa4ff913c 100644
--- a/apps/wallet/src/ui/app/shared/input/password/index.tsx
+++ b/apps/wallet/src/ui/app/shared/input/password/index.tsx
@@ -23,7 +23,7 @@ export function PasswordInputField({ ...props }: PasswordInputProps) {
                 {...props}
                 {...field}
                 className={
-                    'border-gray-45 text-steel-dark placeholder-gray-65 focus:border-steel py-2.5 pl-3 pr-0 peer flex h-11 w-full items-center gap-5 rounded-2lg border  border-solid bg-white text-body font-medium shadow-button focus:shadow-none'
+                    'border-gray-45 text-steel-dark placeholder-gray-65 focus:border-steel peer flex h-11 w-full items-center gap-5 rounded-2lg border border-solid bg-white py-2.5  pl-3 pr-0 text-body font-medium shadow-button focus:shadow-none'
                 }
             />
             <IconComponent
diff --git a/apps/wallet/src/ui/app/shared/tooltip/index.tsx b/apps/wallet/src/ui/app/shared/tooltip/index.tsx
index a8cb3be60b2..90717b46a1f 100644
--- a/apps/wallet/src/ui/app/shared/tooltip/index.tsx
+++ b/apps/wallet/src/ui/app/shared/tooltip/index.tsx
@@ -127,7 +127,7 @@ export function Tooltip({ tip, children, noFullWidth, placement = 'top' }: Toolt
                             }}
                             {...getFloatingProps({ ref: refs.setFloating })}
                         >
-                            <div className="p-2 flex flex-col flex-nowrap gap-px rounded-md bg-gray-100">
+                            <div className="flex flex-col flex-nowrap gap-px rounded-md bg-gray-100 p-2">
                                 {tip}
                             </div>
                             <div
diff --git a/apps/wallet/src/ui/app/shared/transaction-summary/Card.tsx b/apps/wallet/src/ui/app/shared/transaction-summary/Card.tsx
index 89196a5ac9e..ce9b6e3ba5e 100644
--- a/apps/wallet/src/ui/app/shared/transaction-summary/Card.tsx
+++ b/apps/wallet/src/ui/app/shared/transaction-summary/Card.tsx
@@ -28,7 +28,7 @@ type ExtendedCardProps = CardProps & AnchorHTMLAttributes<HTMLAnchorElement>;
 
 export function SummaryCardFooter({ children }: { children: ReactNode }) {
     return (
-        <div className="bg-iota/10 px-4 py-2 -mx-4.5 -mb-4.5 flex items-center justify-between rounded-b-2xl ">
+        <div className="bg-iota/10 -mx-4.5 -mb-4.5 flex items-center justify-between rounded-b-2xl px-4 py-2 ">
             {children}
         </div>
     );
diff --git a/apps/wallet/src/ui/app/shared/transaction-summary/cards/BalanceChanges.tsx b/apps/wallet/src/ui/app/shared/transaction-summary/cards/BalanceChanges.tsx
index 1626c111332..e6c30fae3a9 100644
--- a/apps/wallet/src/ui/app/shared/transaction-summary/cards/BalanceChanges.tsx
+++ b/apps/wallet/src/ui/app/shared/transaction-summary/cards/BalanceChanges.tsx
@@ -70,14 +70,14 @@ function BalanceChangeEntries({ changes }: { changes: BalanceChange[] }) {
 
     return (
         <div className="flex flex-col gap-2">
-            <div className="pb-3 flex flex-col gap-4">
+            <div className="flex flex-col gap-4 pb-3">
                 {recognizedTokenChanges.map((change) => (
                     <BalanceChangeEntry change={change} key={change.coinType + change.amount} />
                 ))}
                 {unRecognizedTokenChanges.length > 0 && (
                     <div
                         className={classNames(
-                            'pt-2 flex flex-col gap-2',
+                            'flex flex-col gap-2 pt-2',
                             recognizedTokenChanges?.length && 'border-gray-45 border-t',
                         )}
                     >
@@ -97,7 +97,7 @@ export function BalanceChanges({ changes }: BalanceChangesProps) {
         <>
             {Object.entries(changes).map(([owner, changes]) => (
                 <Card heading="Balance Changes" key={owner} footer={<OwnerFooter owner={owner} />}>
-                    <div className="pb-3 flex flex-col gap-4">
+                    <div className="flex flex-col gap-4 pb-3">
                         <BalanceChangeEntries changes={changes} />
                     </div>
                 </Card>
diff --git a/apps/wallet/src/ui/app/shared/transaction-summary/cards/GasSummary.tsx b/apps/wallet/src/ui/app/shared/transaction-summary/cards/GasSummary.tsx
index 6c8c1e9fb24..e33fcafcce0 100644
--- a/apps/wallet/src/ui/app/shared/transaction-summary/cards/GasSummary.tsx
+++ b/apps/wallet/src/ui/app/shared/transaction-summary/cards/GasSummary.tsx
@@ -21,12 +21,12 @@ export function GasSummary({ gasSummary }: GasSummaryProps) {
 
     return (
         <div className="relative flex flex-col rounded-2xl bg-white shadow-card-soft">
-            <div className="bg-gray-40 px-4 py-2.5 rounded-t-2xl">
+            <div className="bg-gray-40 rounded-t-2xl px-4 py-2.5">
                 <Text color="steel-darker" variant="captionSmall" weight="semibold">
                     Gas Fees
                 </Text>
             </div>
-            <div className="px-4 py-3 flex w-full flex-col items-center gap-2">
+            <div className="flex w-full flex-col items-center gap-2 px-4 py-3">
                 <div className="flex w-full items-center justify-start">
                     {address === gasSummary?.owner && (
                         <div className="mr-auto">
diff --git a/apps/wallet/src/ui/app/shared/transaction-summary/cards/ObjectChanges.tsx b/apps/wallet/src/ui/app/shared/transaction-summary/cards/ObjectChanges.tsx
index 8100851d863..78beadc60d3 100644
--- a/apps/wallet/src/ui/app/shared/transaction-summary/cards/ObjectChanges.tsx
+++ b/apps/wallet/src/ui/app/shared/transaction-summary/cards/ObjectChanges.tsx
@@ -51,7 +51,7 @@ export function ObjectDetail({ change, display }: ObjectDetailProps) {
             {({ open }) => (
                 <div className="flex flex-col gap-1">
                     <div className="grid cursor-pointer grid-cols-2 overflow-auto">
-                        <Disclosure.Button className="ouline-none text-steel-dark hover:text-steel-darker p-0 flex cursor-pointer select-none items-center gap-1 border-none bg-transparent">
+                        <Disclosure.Button className="ouline-none text-steel-dark hover:text-steel-darker flex cursor-pointer select-none items-center gap-1 border-none bg-transparent p-0">
                             <Text variant="pBody" weight="medium">
                                 Object
                             </Text>
@@ -152,7 +152,7 @@ export function ObjectChangeEntry({ changes, type }: ObjectChangeEntryProps) {
                     >
                         <Disclosure defaultOpen>
                             {({ open }) => (
-                                <div className={cx({ 'gap-4': open }, 'pb-3 flex flex-col')}>
+                                <div className={cx({ 'gap-4': open }, 'flex flex-col pb-3')}>
                                     <Disclosure.Button
                                         as="div"
                                         className="flex w-full cursor-pointer flex-col gap-2"
diff --git a/apps/wallet/src/ui/app/shared/transaction-summary/cards/SummaryCard.tsx b/apps/wallet/src/ui/app/shared/transaction-summary/cards/SummaryCard.tsx
index 51b8bf00018..29309677f6b 100644
--- a/apps/wallet/src/ui/app/shared/transaction-summary/cards/SummaryCard.tsx
+++ b/apps/wallet/src/ui/app/shared/transaction-summary/cards/SummaryCard.tsx
@@ -31,7 +31,7 @@ export function SummaryCard({
         >
             <button
                 onClick={() => setExpanded((expanded) => !expanded)}
-                className="bg-gray-40 px-4 py-2 relative flex w-full cursor-pointer items-center gap-1.5 border-none text-left"
+                className="bg-gray-40 relative flex w-full cursor-pointer items-center gap-1.5 border-none px-4 py-2 text-left"
             >
                 <div className="flex-1">
                     <Text variant="captionSmall" weight="semibold" color="steel-darker">
diff --git a/apps/wallet/src/ui/app/shared/transaction-summary/index.tsx b/apps/wallet/src/ui/app/shared/transaction-summary/index.tsx
index 20a2c881bd0..ea25e3a663d 100644
--- a/apps/wallet/src/ui/app/shared/transaction-summary/index.tsx
+++ b/apps/wallet/src/ui/app/shared/transaction-summary/index.tsx
@@ -29,7 +29,7 @@ export function TransactionSummary({
     return (
         <section className="bg-iota/10 -mx-6 min-h-full">
             {isLoading ? (
-                <div className="p-10 flex items-center justify-center">
+                <div className="flex items-center justify-center p-10">
                     <LoadingIndicator />
                 </div>
             ) : (
diff --git a/apps/wallet/src/ui/app/staking/delegation-detail/DelegationDetailCard.tsx b/apps/wallet/src/ui/app/staking/delegation-detail/DelegationDetailCard.tsx
index 9d97553ccc8..1b1f25d6216 100644
--- a/apps/wallet/src/ui/app/staking/delegation-detail/DelegationDetailCard.tsx
+++ b/apps/wallet/src/ui/app/staking/delegation-detail/DelegationDetailCard.tsx
@@ -107,7 +107,7 @@ export function DelegationDetailCard({ validatorAddress, stakedId }: DelegationD
 
     if (isPending || loadingValidators) {
         return (
-            <div className="p-2 flex h-full w-full items-center justify-center">
+            <div className="flex h-full w-full items-center justify-center p-2">
                 <LoadingIndicator />
             </div>
         );
diff --git a/apps/wallet/src/ui/app/staking/stake/StakeForm.tsx b/apps/wallet/src/ui/app/staking/stake/StakeForm.tsx
index 0a2ac743383..7209cee86bb 100644
--- a/apps/wallet/src/ui/app/staking/stake/StakeForm.tsx
+++ b/apps/wallet/src/ui/app/staking/stake/StakeForm.tsx
@@ -80,7 +80,7 @@ function StakeForm({ validatorAddress, coinBalance, coinType, epoch }: StakeFrom
                 variant="gray"
                 titleDivider
                 header={
-                    <div className="p-2.5 flex w-full bg-white">
+                    <div className="flex w-full bg-white p-2.5">
                         <Field
                             data-testid="stake-amount-input"
                             component={NumberInput}
@@ -93,7 +93,7 @@ function StakeForm({ validatorAddress, coinBalance, coinType, epoch }: StakeFrom
                         />
                         {!HIDE_MAX ? (
                             <button
-                                className="border-gray-60 text-steel-darker hover:border-steel-dark hover:text-steel-darker disabled:opacity-50 flex h-6 w-11 cursor-pointer items-center justify-center rounded-2xl border border-solid bg-white text-bodySmall font-medium disabled:cursor-auto"
+                                className="border-gray-60 text-steel-darker hover:border-steel-dark hover:text-steel-darker flex h-6 w-11 cursor-pointer items-center justify-center rounded-2xl border border-solid bg-white text-bodySmall font-medium disabled:cursor-auto disabled:opacity-50"
                                 onClick={setMaxToken}
                                 disabled={queryResult.isPending}
                                 type="button"
@@ -104,7 +104,7 @@ function StakeForm({ validatorAddress, coinBalance, coinType, epoch }: StakeFrom
                     </div>
                 }
                 footer={
-                    <div className="py-px flex w-full justify-between">
+                    <div className="flex w-full justify-between py-px">
                         <Text variant="body" weight="medium" color="steel-darker">
                             Gas Fees
                         </Text>
@@ -114,7 +114,7 @@ function StakeForm({ validatorAddress, coinBalance, coinType, epoch }: StakeFrom
                     </div>
                 }
             >
-                <div className="pb-3.75 flex w-full justify-between">
+                <div className="flex w-full justify-between pb-3.75">
                     <Text variant="body" weight="medium" color="steel-darker">
                         Staking Rewards Start
                     </Text>
@@ -133,7 +133,7 @@ function StakeForm({ validatorAddress, coinBalance, coinType, epoch }: StakeFrom
                         </Text>
                     )}
                 </div>
-                <div className="item-center pb-3.75 flex w-full justify-between">
+                <div className="item-center flex w-full justify-between pb-3.75">
                     <div className="flex-1">
                         <Text variant="pBody" weight="medium" color="steel-darker">
                             Staking Rewards Redeemable
diff --git a/apps/wallet/src/ui/app/staking/stake/ValidatorFormDetail.tsx b/apps/wallet/src/ui/app/staking/stake/ValidatorFormDetail.tsx
index e9ffcfafdb8..33b45d6adf4 100644
--- a/apps/wallet/src/ui/app/staking/stake/ValidatorFormDetail.tsx
+++ b/apps/wallet/src/ui/app/staking/stake/ValidatorFormDetail.tsx
@@ -92,7 +92,7 @@ export function ValidatorFormDetail({ validatorAddress, unstake }: ValidatorForm
 
     if (isPending || loadingValidators) {
         return (
-            <div className="p-2 flex h-full w-full items-center justify-center">
+            <div className="flex h-full w-full items-center justify-center p-2">
                 <LoadingIndicator />
             </div>
         );
@@ -116,7 +116,7 @@ export function ValidatorFormDetail({ validatorAddress, unstake }: ValidatorForm
                 <Card
                     titleDivider
                     header={
-                        <div className="px-3.75 py-2.5 flex items-center gap-2">
+                        <div className="flex items-center gap-2 px-3.75 py-2.5">
                             <ValidatorLogo
                                 validatorAddress={validatorAddress}
                                 iconSize="sm"
diff --git a/apps/wallet/src/ui/app/staking/validators/SelectValidatorCard.tsx b/apps/wallet/src/ui/app/staking/validators/SelectValidatorCard.tsx
index 715ab24af7a..72bad919fa2 100644
--- a/apps/wallet/src/ui/app/staking/validators/SelectValidatorCard.tsx
+++ b/apps/wallet/src/ui/app/staking/validators/SelectValidatorCard.tsx
@@ -97,7 +97,7 @@ export function SelectValidatorCard() {
 
     if (isPending) {
         return (
-            <div className="p-2 flex h-full w-full items-center justify-center">
+            <div className="flex h-full w-full items-center justify-center p-2">
                 <LoadingIndicator />
             </div>
         );
@@ -116,7 +116,7 @@ export function SelectValidatorCard() {
     return (
         <div className="-my-5 flex h-full w-full flex-col">
             <Content className="flex w-full flex-col items-center">
-                <div className="pb-2.5 pt-5 sticky -top-5 z-50 mt-0 flex w-full flex-col items-center bg-white">
+                <div className="sticky -top-5 z-50 mt-0 flex w-full flex-col items-center bg-white pb-2.5 pt-5">
                     <div className="mb-2 flex w-full items-start">
                         <Text variant="subtitle" weight="medium" color="steel-darker">
                             Sort by:
@@ -126,7 +126,7 @@ export function SelectValidatorCard() {
                                 return (
                                     <button
                                         key={key}
-                                        className="p-0 flex cursor-pointer gap-1 border-0 bg-transparent"
+                                        className="flex cursor-pointer gap-1 border-0 bg-transparent p-0"
                                         onClick={() => handleSortByKey(key as SortKeys)}
                                     >
                                         <Text
@@ -178,7 +178,7 @@ export function SelectValidatorCard() {
                 </div>
             </Content>
             {selectedValidator && (
-                <Menu stuckClass="staked-cta" className="px-0 pb-5 -bottom-5 mx-0 w-full">
+                <Menu stuckClass="staked-cta" className="-bottom-5 mx-0 w-full px-0 pb-5">
                     <Button
                         data-testid="select-validator-cta"
                         size="tall"
diff --git a/apps/wallet/src/ui/app/staking/validators/ValidatorListItem.tsx b/apps/wallet/src/ui/app/staking/validators/ValidatorListItem.tsx
index faeabcae00b..a682e1cb657 100644
--- a/apps/wallet/src/ui/app/staking/validators/ValidatorListItem.tsx
+++ b/apps/wallet/src/ui/app/staking/validators/ValidatorListItem.tsx
@@ -25,7 +25,7 @@ export function ValidatorListItem({ selected, value, validatorAddress }: Validat
                 <div
                     className={cx(
                         selected ? 'bg-iota/10' : '',
-                        'hover:bg-iota/10 px-2 py-3.5 group flex w-full items-center justify-between gap-1 rounded-lg',
+                        'hover:bg-iota/10 group flex w-full items-center justify-between gap-1 rounded-lg px-2 py-3.5',
                     )}
                     role="button"
                 >
diff --git a/apps/wallet/src/ui/app/staking/validators/ValidatorsCard.tsx b/apps/wallet/src/ui/app/staking/validators/ValidatorsCard.tsx
index 70f7575195a..dbaf7405860 100644
--- a/apps/wallet/src/ui/app/staking/validators/ValidatorsCard.tsx
+++ b/apps/wallet/src/ui/app/staking/validators/ValidatorsCard.tsx
@@ -72,7 +72,7 @@ export function ValidatorsCard() {
 
     if (isPending) {
         return (
-            <div className="p-2 flex h-full w-full items-center justify-center">
+            <div className="flex h-full w-full items-center justify-center p-2">
                 <LoadingIndicator />
             </div>
         );
@@ -80,7 +80,7 @@ export function ValidatorsCard() {
 
     if (isError) {
         return (
-            <div className="p-2 mb-2 flex h-full w-full items-center justify-center">
+            <div className="mb-2 flex h-full w-full items-center justify-center p-2">
                 <Alert>
                     <strong>{error?.message}</strong>
                 </Alert>
@@ -117,7 +117,7 @@ export function ValidatorsCard() {
                         <Card
                             padding="none"
                             header={
-                                <div className="px-3.75 py-2.5 flex w-full justify-center">
+                                <div className="flex w-full justify-center px-3.75 py-2.5">
                                     <Text
                                         variant="captionSmall"
                                         weight="semibold"
@@ -157,7 +157,7 @@ export function ValidatorsCard() {
                         </div>
                     </div>
                 </Content>
-                <Menu stuckClass="staked-cta" className="px-0 pb-0 mx-0 w-full">
+                <Menu stuckClass="staked-cta" className="mx-0 w-full px-0 pb-0">
                     <Button
                         size="tall"
                         variant="secondary"

From 09723beee4e1c4790f83f4b1e0a49d3064d58c75 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Wed, 31 Jul 2024 17:42:31 +0200
Subject: [PATCH 10/68] fix(wallet-dashboard): remove debris

---
 apps/core/src/hooks/index.ts                  |  1 -
 .../core/src/hooks/useGetTimelockedObjects.ts | 36 -------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 apps/core/src/hooks/useGetTimelockedObjects.ts

diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index 2587d121371..141953eecb0 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -35,6 +35,5 @@ export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
 export * from './useGetAllTimelockedObjects';
-export * from './useGetTimelockedObjects';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useGetTimelockedObjects.ts b/apps/core/src/hooks/useGetTimelockedObjects.ts
deleted file mode 100644
index 4d35d1507fb..00000000000
--- a/apps/core/src/hooks/useGetTimelockedObjects.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-import { useIotaClient } from '@iota/dapp-kit';
-import { PaginatedObjectsResponse, type IotaObjectDataFilter } from '@iota/iota.js/client';
-import { useInfiniteQuery } from '@tanstack/react-query';
-import { TIMELOCK_TYPE } from '../constants';
-
-const MAX_OBJECTS_PER_REQ = 6;
-
-export function useGetTimelockedObjects(address: string, maxObjectRequests = MAX_OBJECTS_PER_REQ) {
-    const client = useIotaClient();
-    const filter: IotaObjectDataFilter = {
-        StructType: TIMELOCK_TYPE,
-    };
-    return useInfiniteQuery<PaginatedObjectsResponse>({
-        initialPageParam: null,
-        queryKey: ['get-timelocked-objects', address, filter, maxObjectRequests],
-        queryFn: ({ pageParam }) =>
-            client.getOwnedObjects({
-                owner: address,
-                filter,
-                options: {
-                    showType: true,
-                    showContent: true,
-                    showDisplay: true,
-                },
-                limit: maxObjectRequests,
-                cursor: pageParam as string | null,
-            }),
-
-        staleTime: 10 * 1000,
-        enabled: !!address,
-        getNextPageParam: ({ hasNextPage, nextCursor }) => (hasNextPage ? nextCursor : null),
-    });
-}

From 336821c6a41fb778d7d9fa47ac75865c90316eaa Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Wed, 31 Jul 2024 17:43:52 +0200
Subject: [PATCH 11/68] fix(wallet-dashboard): add current epoch ms to
 getVestingOverview

---
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index f18c1701b34..560207aa528 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -3,15 +3,17 @@
 
 'use client';
 
+import { useGetCurrentEpochStartTimestamp } from '@/hooks';
 import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
 import { useGetAllTimelockedObjects } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
+    const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
     const { data: timelockedObjects } = useGetAllTimelockedObjects(account?.address || '');
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
-    const vestingSchedule = getVestingOverview(timelockedMapped);
+    const vestingSchedule = getVestingOverview(timelockedMapped, Number(currentEpochMs));
 
     return (
         <div className="flex flex-col items-center justify-center space-y-4 pt-12">

From 56ca42c6bbc08e349b3e0071a31968401ba39f15 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Wed, 31 Jul 2024 17:44:50 +0200
Subject: [PATCH 12/68] feat(wallet-dashboard): add stale time to get current
 epoch hook

---
 apps/wallet-dashboard/hooks/useGetCurrentEpochStartTimestamp.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/wallet-dashboard/hooks/useGetCurrentEpochStartTimestamp.ts b/apps/wallet-dashboard/hooks/useGetCurrentEpochStartTimestamp.ts
index c541993bbb9..8e591e6e1aa 100644
--- a/apps/wallet-dashboard/hooks/useGetCurrentEpochStartTimestamp.ts
+++ b/apps/wallet-dashboard/hooks/useGetCurrentEpochStartTimestamp.ts
@@ -13,5 +13,6 @@ export function useGetCurrentEpochStartTimestamp() {
             const iotaSystemState = await client.getLatestIotaSystemState();
             return iotaSystemState.epochStartTimestampMs;
         },
+        staleTime: 10 * 60 * 1000, // 10 minutes
     });
 }

From e129911baa1775230f5d0c2d4aa6705efeb5e552 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Wed, 31 Jul 2024 18:07:03 +0200
Subject: [PATCH 13/68] feat(wallet-dashboard): add timelock stakes to vesting
 portfolio logic

---
 apps/core/src/constants/timelock.constants.ts     | 1 +
 apps/core/src/hooks/useGetAllTimelockedObjects.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/core/src/constants/timelock.constants.ts b/apps/core/src/constants/timelock.constants.ts
index 1d7fb7fb44c..fca42518f64 100644
--- a/apps/core/src/constants/timelock.constants.ts
+++ b/apps/core/src/constants/timelock.constants.ts
@@ -2,3 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const TIMELOCK_TYPE = '0x2::timelock::TimeLock<0x2::balance::Balance<0x2::iota::IOTA>>';
+export const TIMELOCK_STAKED_TYPE = '0x3::timelocked_staking::TimelockedStakedIota';
diff --git a/apps/core/src/hooks/useGetAllTimelockedObjects.ts b/apps/core/src/hooks/useGetAllTimelockedObjects.ts
index b5279c153ee..bf09cb46dde 100644
--- a/apps/core/src/hooks/useGetAllTimelockedObjects.ts
+++ b/apps/core/src/hooks/useGetAllTimelockedObjects.ts
@@ -4,14 +4,14 @@
 import { useIotaClient } from '@iota/dapp-kit';
 import { IotaObjectData, type IotaObjectDataFilter } from '@iota/iota.js/client';
 import { useQuery } from '@tanstack/react-query';
-import { TIMELOCK_TYPE } from '../constants';
+import { TIMELOCK_STAKED_TYPE, TIMELOCK_TYPE } from '../constants';
 
 const MAX_OBJECTS_PER_REQ = 10;
 
 export function useGetAllTimelockedObjects(address: string) {
     const client = useIotaClient();
     const filter: IotaObjectDataFilter = {
-        StructType: TIMELOCK_TYPE,
+        MatchAll: [{ StructType: TIMELOCK_TYPE }, { StructType: TIMELOCK_STAKED_TYPE }],
     };
     return useQuery({
         queryKey: ['get-all-timelocked-objects', address, filter],

From 6752846c8ed4da88e12f7548d09701415686f27b Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 5 Aug 2024 19:09:28 +0200
Subject: [PATCH 14/68] feat(wallet-dashboard): add ptb to unlock all
 timelocked objects

---
 .../useCollectUnlockTimelockedObjects.ts      | 28 +++++++++++---
 apps/core/src/utils/transaction/index.ts      |  1 +
 .../unlockAllTimelockedObjectTransaction.ts   | 36 ++++++++++++++++++
 .../app/dashboard/vesting/page.tsx            | 38 ++++++++++++++-----
 4 files changed, 89 insertions(+), 14 deletions(-)
 create mode 100644 apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts

diff --git a/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts b/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
index f185a38465f..6e4eaaf242f 100644
--- a/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
+++ b/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
@@ -1,10 +1,28 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { useCallback } from 'react';
+import { useIotaClient } from '@iota/dapp-kit';
+import { unlockAllTimelockedObjectTransaction } from '../utils';
+import { useQuery } from '@tanstack/react-query';
 
-export function useCollectUnlockTimelockedObjects(address: string) {
-    return useCallback(() => {
-        console.log('Collecting!', address);
-    }, []);
+export function useCollectUnlockTimelockedObjects(address: string, objectIds: string[]) {
+    const client = useIotaClient();
+
+    return useQuery({
+        // eslint-disable-next-line @tanstack/query/exhaustive-deps
+        queryKey: ['unlock-all-timelocked-objects-transaction', address, objectIds],
+        queryFn: async () => {
+            const transaction = unlockAllTimelockedObjectTransaction({ address, objectIds });
+            transaction.setSender(address);
+            await transaction.build({ client });
+            return transaction;
+        },
+        enabled: !!address && !!objectIds,
+        gcTime: 0,
+        select: (transaction) => {
+            return {
+                transaction,
+            };
+        },
+    });
 }
diff --git a/apps/core/src/utils/transaction/index.ts b/apps/core/src/utils/transaction/index.ts
index b0e0f6d30e7..063c60028b1 100644
--- a/apps/core/src/utils/transaction/index.ts
+++ b/apps/core/src/utils/transaction/index.ts
@@ -13,3 +13,4 @@ export * from './getObjectChangeLabel';
 export * from './createTokenTransferTransaction';
 export * from './getObjectDisplayLookup';
 export * from './createNftSendValidationSchema';
+export * from './unlockAllTimelockedObjectTransaction';
diff --git a/apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts b/apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts
new file mode 100644
index 00000000000..8a0d65079c3
--- /dev/null
+++ b/apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts
@@ -0,0 +1,36 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { TransactionBlock } from '@iota/iota.js/transactions';
+import { IOTA_TYPE_ARG, IOTA_FRAMEWORK_ADDRESS } from '@iota/iota.js/utils';
+
+interface Options {
+    address: string;
+    objectIds: string[];
+}
+
+export function unlockAllTimelockedObjectTransaction({ address, objectIds }: Options) {
+    const ptb = new TransactionBlock();
+    const coins: { index: number; resultIndex: number; kind: 'NestedResult' }[] = [];
+
+    for (let index = 0; index < objectIds.length; index++) {
+        const objectId = objectIds[index];
+        const [unlock] = ptb.moveCall({
+            target: `${IOTA_FRAMEWORK_ADDRESS}::timelock::unlock`,
+            typeArguments: [`${IOTA_FRAMEWORK_ADDRESS}::balance::Balance<${IOTA_TYPE_ARG}>`],
+            arguments: [ptb.object(objectId)],
+        });
+
+        // Convert Balance in Coin
+        const [coin] = ptb.moveCall({
+            target: '0x02::coin::from_balance',
+            typeArguments: [IOTA_TYPE_ARG],
+            arguments: [ptb.object(unlock)],
+        });
+
+        coins.push(coin);
+    }
+    ptb.transferObjects(coins, ptb.pure.address(address));
+    return ptb;
+}
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 0617a357c2d..506777852bc 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -4,27 +4,47 @@
 'use client';
 
 import { Button } from '@/components';
-import { useGetCurrentEpochStartTimestamp } from '@/hooks';
+import { useGetCurrentEpochStartTimestamp, useNotifications } from '@/hooks';
 import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
+import { NotificationType } from '@/stores/notificationStore';
 import { useCollectUnlockTimelockedObjects, useGetAllTimelockedObjects } from '@iota/core';
-import { useCurrentAccount } from '@iota/dapp-kit';
+import { useCurrentAccount, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
 
+    const { addNotification } = useNotifications();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
     const { data: timelockedObjects } = useGetAllTimelockedObjects(account?.address || '');
-    const collect = useCollectUnlockTimelockedObjects(account?.address || '');
+    const { mutateAsync: signAndExecuteTransactionBlock } = useSignAndExecuteTransactionBlock();
+
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
     const vestingSchedule = getVestingOverview(timelockedMapped, Number(currentEpochMs));
 
+    const { data: unlockAllTimelockedObjects } = useCollectUnlockTimelockedObjects(
+        account?.address || '',
+        timelockedMapped.map((timelocked) => timelocked.id.id) || [],
+    );
+
     const handleCollect = () => {
         // Update Date.now() when #1217 is merged
         const unlockTimelockedObjects = timelockedMapped?.filter(
             (timelockedObject) => timelockedObject.expirationTimestampMs <= Date.now(),
         );
-        console.log('unlockTimelockedObjects', unlockTimelockedObjects);
-        collect();
+        if (!unlockAllTimelockedObjects?.transaction || unlockTimelockedObjects.length === 0) {
+            addNotification('There was an error with the transaction', NotificationType.Error);
+            return;
+        } else {
+            signAndExecuteTransactionBlock({
+                transactionBlock: unlockAllTimelockedObjects.transaction,
+            })
+                .then(() => {
+                    addNotification('Transfer transaction has been sent');
+                })
+                .catch(() => {
+                    addNotification('Transfer transaction was not sent', NotificationType.Error);
+                });
+        }
     };
     const handleStake = () => {
         console.log('Stake');
@@ -63,12 +83,12 @@ function VestingDashboardPage(): JSX.Element {
             </div>
             {account?.address && (
                 <div className="flex flex-row space-x-4">
-                    {vestingSchedule.availableClaiming && (
+                    {vestingSchedule.availableClaiming ? (
                         <Button onClick={handleCollect}>Collect</Button>
-                    )}
-                    {vestingSchedule.availableStaking && (
+                    ) : null}
+                    {vestingSchedule.availableStaking ? (
                         <Button onClick={handleStake}>Stake</Button>
-                    )}
+                    ) : null}
                 </div>
             )}
         </div>

From 78e7003bcffdbfa867f183c7a9db1885f8a653b2 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 6 Aug 2024 18:06:23 +0200
Subject: [PATCH 15/68] fix(wallet-dashboard): improvements

---
 .../transaction/unlockAllTimelockedObjectTransaction.ts      | 5 ++---
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx         | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts b/apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts
index 8a0d65079c3..33759781059 100644
--- a/apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts
+++ b/apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts
@@ -1,5 +1,4 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
+// Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionBlock } from '@iota/iota.js/transactions';
@@ -24,7 +23,7 @@ export function unlockAllTimelockedObjectTransaction({ address, objectIds }: Opt
 
         // Convert Balance in Coin
         const [coin] = ptb.moveCall({
-            target: '0x02::coin::from_balance',
+            target: `${IOTA_FRAMEWORK_ADDRESS}::coin::from_balance`,
             typeArguments: [IOTA_TYPE_ARG],
             arguments: [ptb.object(unlock)],
         });
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 506777852bc..9e93cb54592 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -18,12 +18,13 @@ function VestingDashboardPage(): JSX.Element {
     const { data: timelockedObjects } = useGetAllTimelockedObjects(account?.address || '');
     const { mutateAsync: signAndExecuteTransactionBlock } = useSignAndExecuteTransactionBlock();
 
-    const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
+    const timelockedMapped = timelockedObjects ? mapTimelockObjects(timelockedObjects) : [];
     const vestingSchedule = getVestingOverview(timelockedMapped, Number(currentEpochMs));
+    const objectIds: string[] = timelockedMapped.map((timelocked) => timelocked.id.id) || [];
 
     const { data: unlockAllTimelockedObjects } = useCollectUnlockTimelockedObjects(
         account?.address || '',
-        timelockedMapped.map((timelocked) => timelocked.id.id) || [],
+        objectIds,
     );
 
     const handleCollect = () => {

From 91faa9d8acc5ee41ae3933aa710f52804ac0dfb5 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 6 Aug 2024 18:15:54 +0200
Subject: [PATCH 16/68] fix(wallet-dashboard): improve filters to get
 timelocked objects

---
 apps/core/src/hooks/useGetAllTimelockedObjects.ts    | 2 +-
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/core/src/hooks/useGetAllTimelockedObjects.ts b/apps/core/src/hooks/useGetAllTimelockedObjects.ts
index bf09cb46dde..c2e1c910dbe 100644
--- a/apps/core/src/hooks/useGetAllTimelockedObjects.ts
+++ b/apps/core/src/hooks/useGetAllTimelockedObjects.ts
@@ -11,7 +11,7 @@ const MAX_OBJECTS_PER_REQ = 10;
 export function useGetAllTimelockedObjects(address: string) {
     const client = useIotaClient();
     const filter: IotaObjectDataFilter = {
-        MatchAll: [{ StructType: TIMELOCK_TYPE }, { StructType: TIMELOCK_STAKED_TYPE }],
+        MatchAny: [{ StructType: TIMELOCK_TYPE }, { StructType: TIMELOCK_STAKED_TYPE }],
     };
     return useQuery({
         queryKey: ['get-all-timelocked-objects', address, filter],
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 560207aa528..c4d5e72f49b 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -5,14 +5,17 @@
 
 import { useGetCurrentEpochStartTimestamp } from '@/hooks';
 import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
-import { useGetAllTimelockedObjects } from '@iota/core';
+import { TIMELOCK_TYPE, useGetAllTimelockedObjects } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
     const { data: timelockedObjects } = useGetAllTimelockedObjects(account?.address || '');
-    const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
+    const timelockedObjectsWithoutStaking = timelockedObjects?.filter(
+        (timelocked) => timelocked.type === TIMELOCK_TYPE,
+    );
+    const timelockedMapped = mapTimelockObjects(timelockedObjectsWithoutStaking || []);
     const vestingSchedule = getVestingOverview(timelockedMapped, Number(currentEpochMs));
 
     return (

From 01f748df6ea3e212475c864500e920b2153752a2 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Wed, 7 Aug 2024 09:17:47 +0200
Subject: [PATCH 17/68] feat(wallet-dashboard): map timelocked staked iota
 response

---
 apps/core/src/hooks/index.ts                  |  2 +-
 ...kedObjects.ts => useGetAllOwnedObjects.ts} |  8 +---
 .../app/dashboard/vesting/page.tsx            | 21 ++++++----
 .../lib/interfaces/vesting.interface.ts       | 22 ++++++++++
 .../lib/utils/vesting/vesting.ts              | 41 +++++++++++++++----
 5 files changed, 72 insertions(+), 22 deletions(-)
 rename apps/core/src/hooks/{useGetAllTimelockedObjects.ts => useGetAllOwnedObjects.ts} (82%)

diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index 141953eecb0..66e67165955 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -34,6 +34,6 @@ export * from './useExtendedTransactionSummary';
 export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
-export * from './useGetAllTimelockedObjects';
+export * from './useGetAllOwnedObjects';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useGetAllTimelockedObjects.ts b/apps/core/src/hooks/useGetAllOwnedObjects.ts
similarity index 82%
rename from apps/core/src/hooks/useGetAllTimelockedObjects.ts
rename to apps/core/src/hooks/useGetAllOwnedObjects.ts
index c2e1c910dbe..fcfa4a3c169 100644
--- a/apps/core/src/hooks/useGetAllTimelockedObjects.ts
+++ b/apps/core/src/hooks/useGetAllOwnedObjects.ts
@@ -4,17 +4,13 @@
 import { useIotaClient } from '@iota/dapp-kit';
 import { IotaObjectData, type IotaObjectDataFilter } from '@iota/iota.js/client';
 import { useQuery } from '@tanstack/react-query';
-import { TIMELOCK_STAKED_TYPE, TIMELOCK_TYPE } from '../constants';
 
 const MAX_OBJECTS_PER_REQ = 10;
 
-export function useGetAllTimelockedObjects(address: string) {
+export function useGetAllOwnedObjects(address: string, filter?: IotaObjectDataFilter) {
     const client = useIotaClient();
-    const filter: IotaObjectDataFilter = {
-        MatchAny: [{ StructType: TIMELOCK_TYPE }, { StructType: TIMELOCK_STAKED_TYPE }],
-    };
     return useQuery({
-        queryKey: ['get-all-timelocked-objects', address, filter],
+        queryKey: ['get-all-owned-objects', address, filter],
         queryFn: async () => {
             let cursor: string | undefined | null = null;
             const allData: IotaObjectData[] = [];
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index c4d5e72f49b..7a3f96b5145 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -4,19 +4,26 @@
 'use client';
 
 import { useGetCurrentEpochStartTimestamp } from '@/hooks';
-import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
-import { TIMELOCK_TYPE, useGetAllTimelockedObjects } from '@iota/core';
+import { getVestingOverview, mapStakedTimelockObjects, mapTimelockObjects } from '@/lib/utils';
+import { TIMELOCK_STAKED_TYPE, TIMELOCK_TYPE, useGetAllOwnedObjects } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
-    const { data: timelockedObjects } = useGetAllTimelockedObjects(account?.address || '');
-    const timelockedObjectsWithoutStaking = timelockedObjects?.filter(
-        (timelocked) => timelocked.type === TIMELOCK_TYPE,
+    const { data: timelockedObjects } = useGetAllOwnedObjects(account?.address || '', {
+        StructType: TIMELOCK_TYPE,
+    });
+    const { data: stakedTimelockedObjects } = useGetAllOwnedObjects(account?.address || '', {
+        StructType: TIMELOCK_STAKED_TYPE,
+    });
+
+    const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
+    const stakedTimelockedMapped = mapStakedTimelockObjects(stakedTimelockedObjects || []);
+    const vestingSchedule = getVestingOverview(
+        [...timelockedMapped, ...stakedTimelockedMapped],
+        Number(currentEpochMs),
     );
-    const timelockedMapped = mapTimelockObjects(timelockedObjectsWithoutStaking || []);
-    const vestingSchedule = getVestingOverview(timelockedMapped, Number(currentEpochMs));
 
     return (
         <div className="flex flex-col items-center justify-center space-y-4 pt-12">
diff --git a/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts b/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
index 4d2cf7e804d..6e3a285158c 100644
--- a/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
+++ b/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
@@ -16,6 +16,13 @@ export interface Timelocked {
     label?: string;
 }
 
+export interface TimelockedIotaResponse {
+    id: UID;
+    locked: string;
+    expiration_timestamp_ms: string;
+    label?: string;
+}
+
 export interface StakedIota {
     id: UID;
     poolId: string;
@@ -30,6 +37,21 @@ export interface TimelockedStakedIota {
     label?: string;
 }
 
+export interface TimelockedStakedIotaResponse {
+    id: UID;
+    expiration_timestamp_ms: string;
+    staked_iota: {
+        type: string;
+        fields: {
+            id: UID;
+            pool_id: string;
+            principal: string;
+            stake_activation_epoch: string;
+        };
+    };
+    label?: string;
+}
+
 export enum SupplyIncreaseUserType {
     Staker = 'Staker',
     Entity = 'Entity',
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index a8ed8400c93..ff008f2c5c4 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -15,8 +15,9 @@ import {
     SupplyIncreaseVestingPayout,
     SupplyIncreaseVestingPortfolio,
     Timelocked,
+    TimelockedIotaResponse,
     TimelockedStakedIota,
-    UID,
+    TimelockedStakedIotaResponse,
     VestingOverview,
 } from '../../interfaces';
 import { isTimelocked, isTimelockedStakedIota, isVesting } from '../timelock';
@@ -192,15 +193,9 @@ export function mapTimelockObjects(iotaObjects: IotaObjectData[]): Timelocked[]
                 id: { id: '' },
                 locked: { value: 0 },
                 expirationTimestampMs: 0,
-                label: '0',
             };
         }
-        const fields = iotaObject.content.fields as unknown as {
-            id: UID;
-            locked: string;
-            expiration_timestamp_ms: string;
-            label: string;
-        };
+        const fields = iotaObject.content.fields as unknown as TimelockedIotaResponse;
         return {
             id: fields.id,
             locked: { value: Number(fields.locked) },
@@ -209,3 +204,33 @@ export function mapTimelockObjects(iotaObjects: IotaObjectData[]): Timelocked[]
         };
     });
 }
+
+export function mapStakedTimelockObjects(iotaObjects: IotaObjectData[]): TimelockedStakedIota[] {
+    return iotaObjects.map((iotaObject) => {
+        if (!iotaObject?.content?.dataType || iotaObject.content.dataType !== 'moveObject') {
+            return {
+                id: { id: '' },
+                stakedIota: {
+                    id: { id: '' },
+                    poolId: '',
+                    stakeActivationEpoch: 0,
+                    principal: { value: 0 },
+                },
+                expirationTimestampMs: 0,
+            };
+        }
+
+        const fields = iotaObject.content.fields as unknown as TimelockedStakedIotaResponse;
+        return {
+            id: fields.id,
+            expirationTimestampMs: Number(fields.expiration_timestamp_ms),
+            stakedIota: {
+                id: fields.staked_iota.fields.id,
+                poolId: fields.staked_iota.fields.pool_id,
+                stakeActivationEpoch: Number(fields.staked_iota.fields.stake_activation_epoch),
+                principal: { value: Number(fields.staked_iota.fields.principal) },
+            },
+            label: fields.label,
+        };
+    });
+}

From 3c82818fd431417fc9f8c7c5cb20e5a582d8c458 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Wed, 7 Aug 2024 16:30:42 +0200
Subject: [PATCH 18/68] fix(wallet-dashboard): update Date.now by current epoch

---
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 9e93cb54592..418ff48ca06 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -28,9 +28,8 @@ function VestingDashboardPage(): JSX.Element {
     );
 
     const handleCollect = () => {
-        // Update Date.now() when #1217 is merged
         const unlockTimelockedObjects = timelockedMapped?.filter(
-            (timelockedObject) => timelockedObject.expirationTimestampMs <= Date.now(),
+            (timelockedObject) => timelockedObject.expirationTimestampMs <= Number(currentEpochMs),
         );
         if (!unlockAllTimelockedObjects?.transaction || unlockTimelockedObjects.length === 0) {
             addNotification('There was an error with the transaction', NotificationType.Error);

From c01a4782f0a5ac4f9bd5e381e021e74da2eda412 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Wed, 7 Aug 2024 16:34:08 +0200
Subject: [PATCH 19/68] fix(wallet-dashboard): improve transaction to unlock
 timelocked objects

---
 .../wallet-dashboard/app/dashboard/vesting/page.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 418ff48ca06..b8e7702e9a5 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -20,18 +20,19 @@ function VestingDashboardPage(): JSX.Element {
 
     const timelockedMapped = timelockedObjects ? mapTimelockObjects(timelockedObjects) : [];
     const vestingSchedule = getVestingOverview(timelockedMapped, Number(currentEpochMs));
-    const objectIds: string[] = timelockedMapped.map((timelocked) => timelocked.id.id) || [];
 
+    const unlockTimelockedObjects = timelockedMapped?.filter(
+        (timelockedObject) => timelockedObject.expirationTimestampMs <= Number(currentEpochMs),
+    );
+    const unlockTimelockedbjectIds: string[] =
+        unlockTimelockedObjects.map((timelocked) => timelocked.id.id) || [];
     const { data: unlockAllTimelockedObjects } = useCollectUnlockTimelockedObjects(
         account?.address || '',
-        objectIds,
+        unlockTimelockedbjectIds,
     );
 
     const handleCollect = () => {
-        const unlockTimelockedObjects = timelockedMapped?.filter(
-            (timelockedObject) => timelockedObject.expirationTimestampMs <= Number(currentEpochMs),
-        );
-        if (!unlockAllTimelockedObjects?.transaction || unlockTimelockedObjects.length === 0) {
+        if (!unlockAllTimelockedObjects?.transaction) {
             addNotification('There was an error with the transaction', NotificationType.Error);
             return;
         } else {

From ee95e684ecb23656d2d68dde57a7f0e744cd583a Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Thu, 8 Aug 2024 10:37:41 +0200
Subject: [PATCH 20/68] fix(wallet-dashboard): improve unlock timelocked
 objects transaction

---
 .../app/dashboard/vesting/page.tsx            | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index b8e7702e9a5..6a311a3dcfa 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -9,9 +9,11 @@ import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
 import { NotificationType } from '@/stores/notificationStore';
 import { useCollectUnlockTimelockedObjects, useGetAllTimelockedObjects } from '@iota/core';
 import { useCurrentAccount, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
+import { useQueryClient } from '@tanstack/react-query';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
+    const queryClient = useQueryClient();
 
     const { addNotification } = useNotifications();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
@@ -36,15 +38,31 @@ function VestingDashboardPage(): JSX.Element {
             addNotification('There was an error with the transaction', NotificationType.Error);
             return;
         } else {
-            signAndExecuteTransactionBlock({
-                transactionBlock: unlockAllTimelockedObjects.transaction,
-            })
-                .then(() => {
-                    addNotification('Transfer transaction has been sent');
-                })
-                .catch(() => {
-                    addNotification('Transfer transaction was not sent', NotificationType.Error);
-                });
+            signAndExecuteTransactionBlock(
+                {
+                    transactionBlock: unlockAllTimelockedObjects.transaction,
+                },
+                {
+                    onSuccess: (result) => {
+                        console.log('executed transaction', result.digest);
+                        queryClient.invalidateQueries({
+                            queryKey: ['get-all-timelocked-objects'], // Correct usage
+                        });
+                        addNotification('Transfer transaction has been sent');
+                    },
+                    onError: (result) => {
+                        console.error(
+                            'error to execute unlock all timelocked object transaction',
+                            result,
+                        );
+
+                        addNotification(
+                            'Transfer transaction was not sent',
+                            NotificationType.Error,
+                        );
+                    },
+                },
+            );
         }
     };
     const handleStake = () => {

From 4bbd3c3218104195150ef007010f03f7d6bf7056 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 12 Aug 2024 09:57:13 +0200
Subject: [PATCH 21/68] fix(wallet-dashboard): improvements and rename
 variables

---
 .../useCollectUnlockTimelockedObjects.ts      |  6 +-
 ...eUnlockAllTimelockedObjectsTransaction.ts} | 12 ++--
 apps/core/src/utils/transaction/index.ts      |  2 +-
 .../app/dashboard/vesting/page.tsx            | 56 +++++++++----------
 4 files changed, 37 insertions(+), 39 deletions(-)
 rename apps/core/src/utils/transaction/{unlockAllTimelockedObjectTransaction.ts => createUnlockAllTimelockedObjectsTransaction.ts} (78%)

diff --git a/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts b/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
index 6e4eaaf242f..66985f17360 100644
--- a/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
+++ b/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { useIotaClient } from '@iota/dapp-kit';
-import { unlockAllTimelockedObjectTransaction } from '../utils';
+import { createUnlockAllTimelockedObjectsTransaction } from '../utils';
 import { useQuery } from '@tanstack/react-query';
 
 export function useCollectUnlockTimelockedObjects(address: string, objectIds: string[]) {
@@ -12,7 +12,7 @@ export function useCollectUnlockTimelockedObjects(address: string, objectIds: st
         // eslint-disable-next-line @tanstack/query/exhaustive-deps
         queryKey: ['unlock-all-timelocked-objects-transaction', address, objectIds],
         queryFn: async () => {
-            const transaction = unlockAllTimelockedObjectTransaction({ address, objectIds });
+            const transaction = createUnlockAllTimelockedObjectsTransaction({ address, objectIds });
             transaction.setSender(address);
             await transaction.build({ client });
             return transaction;
@@ -21,7 +21,7 @@ export function useCollectUnlockTimelockedObjects(address: string, objectIds: st
         gcTime: 0,
         select: (transaction) => {
             return {
-                transaction,
+                transactionBlock: transaction,
             };
         },
     });
diff --git a/apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts b/apps/core/src/utils/transaction/createUnlockAllTimelockedObjectsTransaction.ts
similarity index 78%
rename from apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts
rename to apps/core/src/utils/transaction/createUnlockAllTimelockedObjectsTransaction.ts
index 33759781059..d3f10ab4395 100644
--- a/apps/core/src/utils/transaction/unlockAllTimelockedObjectTransaction.ts
+++ b/apps/core/src/utils/transaction/createUnlockAllTimelockedObjectsTransaction.ts
@@ -4,24 +4,26 @@
 import { TransactionBlock } from '@iota/iota.js/transactions';
 import { IOTA_TYPE_ARG, IOTA_FRAMEWORK_ADDRESS } from '@iota/iota.js/utils';
 
-interface Options {
+interface UnlockAllTimelockedObjectTransactionOptions {
     address: string;
     objectIds: string[];
 }
 
-export function unlockAllTimelockedObjectTransaction({ address, objectIds }: Options) {
+export function createUnlockAllTimelockedObjectsTransaction({
+    address,
+    objectIds,
+}: UnlockAllTimelockedObjectTransactionOptions) {
     const ptb = new TransactionBlock();
     const coins: { index: number; resultIndex: number; kind: 'NestedResult' }[] = [];
 
-    for (let index = 0; index < objectIds.length; index++) {
-        const objectId = objectIds[index];
+    for (const objectId of objectIds) {
         const [unlock] = ptb.moveCall({
             target: `${IOTA_FRAMEWORK_ADDRESS}::timelock::unlock`,
             typeArguments: [`${IOTA_FRAMEWORK_ADDRESS}::balance::Balance<${IOTA_TYPE_ARG}>`],
             arguments: [ptb.object(objectId)],
         });
 
-        // Convert Balance in Coin
+        // Convert Balance to Coin
         const [coin] = ptb.moveCall({
             target: `${IOTA_FRAMEWORK_ADDRESS}::coin::from_balance`,
             typeArguments: [IOTA_TYPE_ARG],
diff --git a/apps/core/src/utils/transaction/index.ts b/apps/core/src/utils/transaction/index.ts
index 063c60028b1..de4549f8357 100644
--- a/apps/core/src/utils/transaction/index.ts
+++ b/apps/core/src/utils/transaction/index.ts
@@ -13,4 +13,4 @@ export * from './getObjectChangeLabel';
 export * from './createTokenTransferTransaction';
 export * from './getObjectDisplayLookup';
 export * from './createNftSendValidationSchema';
-export * from './unlockAllTimelockedObjectTransaction';
+export * from './createUnlockAllTimelockedObjectsTransaction';
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 6a311a3dcfa..a38ca711c20 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -23,47 +23,43 @@ function VestingDashboardPage(): JSX.Element {
     const timelockedMapped = timelockedObjects ? mapTimelockObjects(timelockedObjects) : [];
     const vestingSchedule = getVestingOverview(timelockedMapped, Number(currentEpochMs));
 
-    const unlockTimelockedObjects = timelockedMapped?.filter(
+    const unlockedTimelockedObjects = timelockedMapped?.filter(
         (timelockedObject) => timelockedObject.expirationTimestampMs <= Number(currentEpochMs),
     );
-    const unlockTimelockedbjectIds: string[] =
-        unlockTimelockedObjects.map((timelocked) => timelocked.id.id) || [];
+    const unlockedTimelockedbjectIds: string[] =
+        unlockedTimelockedObjects.map((timelocked) => timelocked.id.id) || [];
     const { data: unlockAllTimelockedObjects } = useCollectUnlockTimelockedObjects(
         account?.address || '',
-        unlockTimelockedbjectIds,
+        unlockedTimelockedbjectIds,
     );
 
     const handleCollect = () => {
-        if (!unlockAllTimelockedObjects?.transaction) {
-            addNotification('There was an error with the transaction', NotificationType.Error);
+        if (!unlockAllTimelockedObjects?.transactionBlock) {
+            addNotification('Failed to create a Transaction', NotificationType.Error);
             return;
-        } else {
-            signAndExecuteTransactionBlock(
-                {
-                    transactionBlock: unlockAllTimelockedObjects.transaction,
+        }
+        signAndExecuteTransactionBlock(
+            {
+                transactionBlock: unlockAllTimelockedObjects.transactionBlock,
+            },
+            {
+                onSuccess: (result) => {
+                    console.log('executed transaction', result.digest);
+                    queryClient.invalidateQueries({
+                        queryKey: ['get-all-timelocked-objects'],
+                    });
+                    addNotification('Transaction has been sent');
                 },
-                {
-                    onSuccess: (result) => {
-                        console.log('executed transaction', result.digest);
-                        queryClient.invalidateQueries({
-                            queryKey: ['get-all-timelocked-objects'], // Correct usage
-                        });
-                        addNotification('Transfer transaction has been sent');
-                    },
-                    onError: (result) => {
-                        console.error(
-                            'error to execute unlock all timelocked object transaction',
-                            result,
-                        );
+                onError: (result) => {
+                    console.error(
+                        'error to execute unlock all timelocked object transaction',
+                        result,
+                    );
 
-                        addNotification(
-                            'Transfer transaction was not sent',
-                            NotificationType.Error,
-                        );
-                    },
+                    addNotification('Transaction was not sent', NotificationType.Error);
                 },
-            );
-        }
+            },
+        );
     };
     const handleStake = () => {
         console.log('Stake');

From 612978245219bd21904088f6657490b953e7170b Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 12 Aug 2024 13:24:24 +0200
Subject: [PATCH 22/68] fix(wallet-dashboard): rename hook

---
 apps/core/src/hooks/index.ts                                  | 2 +-
 ...lockTimelockedObjects.ts => useUnlockTimelockedObjects.ts} | 2 +-
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename apps/core/src/hooks/{useCollectUnlockTimelockedObjects.ts => useUnlockTimelockedObjects.ts} (91%)

diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index 4b7bc4a1786..7bbd7894fe5 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -35,6 +35,6 @@ export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
 export * from './useGetAllTimelockedObjects';
-export * from './useCollectUnlockTimelockedObjects';
+export * from './useUnlockTimelockedObjects';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts b/apps/core/src/hooks/useUnlockTimelockedObjects.ts
similarity index 91%
rename from apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
rename to apps/core/src/hooks/useUnlockTimelockedObjects.ts
index 66985f17360..06bf3aabe08 100644
--- a/apps/core/src/hooks/useCollectUnlockTimelockedObjects.ts
+++ b/apps/core/src/hooks/useUnlockTimelockedObjects.ts
@@ -5,7 +5,7 @@ import { useIotaClient } from '@iota/dapp-kit';
 import { createUnlockAllTimelockedObjectsTransaction } from '../utils';
 import { useQuery } from '@tanstack/react-query';
 
-export function useCollectUnlockTimelockedObjects(address: string, objectIds: string[]) {
+export function useUnlockTimelockedObjects(address: string, objectIds: string[]) {
     const client = useIotaClient();
 
     return useQuery({
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index a38ca711c20..b2bc03f1ea3 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -7,7 +7,7 @@ import { Button } from '@/components';
 import { useGetCurrentEpochStartTimestamp, useNotifications } from '@/hooks';
 import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
 import { NotificationType } from '@/stores/notificationStore';
-import { useCollectUnlockTimelockedObjects, useGetAllTimelockedObjects } from '@iota/core';
+import { useUnlockTimelockedObjects, useGetAllTimelockedObjects } from '@iota/core';
 import { useCurrentAccount, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
 import { useQueryClient } from '@tanstack/react-query';
 
@@ -28,7 +28,7 @@ function VestingDashboardPage(): JSX.Element {
     );
     const unlockedTimelockedbjectIds: string[] =
         unlockedTimelockedObjects.map((timelocked) => timelocked.id.id) || [];
-    const { data: unlockAllTimelockedObjects } = useCollectUnlockTimelockedObjects(
+    const { data: unlockAllTimelockedObjects } = useUnlockTimelockedObjects(
         account?.address || '',
         unlockedTimelockedbjectIds,
     );

From c1ab238f28d459d64092a866ff3e0d426c482f2b Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 12 Aug 2024 14:46:31 +0200
Subject: [PATCH 23/68] feat(wallet-dashboard): use new endpoint to get staked
 timelocked objects

---
 apps/core/src/hooks/index.ts                    |  1 +
 .../src/hooks/useGetStakedTimelockedObjects.ts  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 apps/core/src/hooks/useGetStakedTimelockedObjects.ts

diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index 66e67165955..ba5ebd01283 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -35,5 +35,6 @@ export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
 export * from './useGetAllOwnedObjects';
+export * from './useGetStakedTimelockedObjects';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useGetStakedTimelockedObjects.ts b/apps/core/src/hooks/useGetStakedTimelockedObjects.ts
new file mode 100644
index 00000000000..e1a5d71a52d
--- /dev/null
+++ b/apps/core/src/hooks/useGetStakedTimelockedObjects.ts
@@ -0,0 +1,17 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { useIotaClient } from '@iota/dapp-kit';
+import { useQuery } from '@tanstack/react-query';
+
+export function useGetStakedTimelockedObjects(address: string) {
+    const client = useIotaClient();
+    return useQuery({
+        queryKey: ['get-staked-timelocked-objects', address],
+        queryFn: () =>
+            client.getTimelockedStakes({
+                owner: address,
+            }),
+        enabled: !!address,
+    });
+}

From 7e2b7927f45b417a051953009195aeea4857f5b6 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 12 Aug 2024 14:47:19 +0200
Subject: [PATCH 24/68] fix(wallet-dashboard): modify mapped data with the new
 response

---
 apps/core/src/constants/timelock.constants.ts |  2 +-
 .../app/dashboard/vesting/page.tsx            | 20 +++++----
 .../lib/interfaces/vesting.interface.ts       | 17 +-------
 .../lib/utils/vesting/vesting.ts              | 42 ++++++++-----------
 4 files changed, 32 insertions(+), 49 deletions(-)

diff --git a/apps/core/src/constants/timelock.constants.ts b/apps/core/src/constants/timelock.constants.ts
index fca42518f64..6b9ab9c2627 100644
--- a/apps/core/src/constants/timelock.constants.ts
+++ b/apps/core/src/constants/timelock.constants.ts
@@ -1,5 +1,5 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-export const TIMELOCK_TYPE = '0x2::timelock::TimeLock<0x2::balance::Balance<0x2::iota::IOTA>>';
+export const TIMELOCK_IOTA_TYPE = '0x2::timelock::TimeLock<0x2::balance::Balance<0x2::iota::IOTA>>';
 export const TIMELOCK_STAKED_TYPE = '0x3::timelocked_staking::TimelockedStakedIota';
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 7a3f96b5145..38987f3e723 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -4,22 +4,28 @@
 'use client';
 
 import { useGetCurrentEpochStartTimestamp } from '@/hooks';
-import { getVestingOverview, mapStakedTimelockObjects, mapTimelockObjects } from '@/lib/utils';
-import { TIMELOCK_STAKED_TYPE, TIMELOCK_TYPE, useGetAllOwnedObjects } from '@iota/core';
+import {
+    getVestingOverview,
+    timelockObjectsFromIotaObjects,
+    mapTimelockObjects,
+} from '@/lib/utils';
+import {
+    TIMELOCK_IOTA_TYPE,
+    useGetAllOwnedObjects,
+    useGetStakedTimelockedObjects,
+} from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
     const { data: timelockedObjects } = useGetAllOwnedObjects(account?.address || '', {
-        StructType: TIMELOCK_TYPE,
-    });
-    const { data: stakedTimelockedObjects } = useGetAllOwnedObjects(account?.address || '', {
-        StructType: TIMELOCK_STAKED_TYPE,
+        StructType: TIMELOCK_IOTA_TYPE,
     });
+    const { data: stakedTimelockedObjects } = useGetStakedTimelockedObjects(account?.address || '');
 
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
-    const stakedTimelockedMapped = mapStakedTimelockObjects(stakedTimelockedObjects || []);
+    const stakedTimelockedMapped = timelockObjectsFromIotaObjects(stakedTimelockedObjects || []);
     const vestingSchedule = getVestingOverview(
         [...timelockedMapped, ...stakedTimelockedMapped],
         Number(currentEpochMs),
diff --git a/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts b/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
index 6e3a285158c..12be7e0bfd0 100644
--- a/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
+++ b/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
@@ -34,22 +34,7 @@ export interface TimelockedStakedIota {
     id: UID;
     stakedIota: StakedIota;
     expirationTimestampMs: number;
-    label?: string;
-}
-
-export interface TimelockedStakedIotaResponse {
-    id: UID;
-    expiration_timestamp_ms: string;
-    staked_iota: {
-        type: string;
-        fields: {
-            id: UID;
-            pool_id: string;
-            principal: string;
-            stake_activation_epoch: string;
-        };
-    };
-    label?: string;
+    label?: string | null | undefined;
 }
 
 export enum SupplyIncreaseUserType {
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index ff008f2c5c4..039d4273b6e 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { IotaObjectData } from '@iota/iota.js/client';
+import { DelegatedTimelockedStake, IotaObjectData } from '@iota/iota.js/client';
 import {
     SUPPLY_INCREASE_INVESTOR_VESTING_DURATION,
     SUPPLY_INCREASE_STAKER_VESTING_DURATION,
@@ -17,7 +17,6 @@ import {
     Timelocked,
     TimelockedIotaResponse,
     TimelockedStakedIota,
-    TimelockedStakedIotaResponse,
     VestingOverview,
 } from '../../interfaces';
 import { isTimelocked, isTimelockedStakedIota, isVesting } from '../timelock';
@@ -205,32 +204,25 @@ export function mapTimelockObjects(iotaObjects: IotaObjectData[]): Timelocked[]
     });
 }
 
-export function mapStakedTimelockObjects(iotaObjects: IotaObjectData[]): TimelockedStakedIota[] {
-    return iotaObjects.map((iotaObject) => {
-        if (!iotaObject?.content?.dataType || iotaObject.content.dataType !== 'moveObject') {
+export function timelockObjectsFromIotaObjects(
+    stakedTimelockedObjects: DelegatedTimelockedStake[],
+): TimelockedStakedIota[] {
+    const result: TimelockedStakedIota[] = [];
+    stakedTimelockedObjects.map((stakedTimelockedObject) => {
+        const stakeMapped: TimelockedStakedIota[] = stakedTimelockedObject.stakes.map((stake) => {
             return {
-                id: { id: '' },
+                id: { id: stake.timelockedStakedIotaId },
+                expirationTimestampMs: Number(stake.expirationTimestampMs),
                 stakedIota: {
-                    id: { id: '' },
-                    poolId: '',
-                    stakeActivationEpoch: 0,
-                    principal: { value: 0 },
+                    id: { id: stake.timelockedStakedIotaId },
+                    poolId: stakedTimelockedObject.stakingPool,
+                    stakeActivationEpoch: Number(stake.stakeRequestEpoch),
+                    principal: { value: Number(stake.principal) },
                 },
-                expirationTimestampMs: 0,
+                label: stake.label,
             };
-        }
-
-        const fields = iotaObject.content.fields as unknown as TimelockedStakedIotaResponse;
-        return {
-            id: fields.id,
-            expirationTimestampMs: Number(fields.expiration_timestamp_ms),
-            stakedIota: {
-                id: fields.staked_iota.fields.id,
-                poolId: fields.staked_iota.fields.pool_id,
-                stakeActivationEpoch: Number(fields.staked_iota.fields.stake_activation_epoch),
-                principal: { value: Number(fields.staked_iota.fields.principal) },
-            },
-            label: fields.label,
-        };
+        });
+        result.push(...stakeMapped);
     });
+    return result;
 }

From 54a7370d80bd89ff37ace77ad822a7e65071f56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Mon, 12 Aug 2024 15:53:24 +0200
Subject: [PATCH 25/68] refactor: separate vesting from timelock

---
 .../lib/constants/vesting.constants.ts        |  6 +--
 apps/wallet-dashboard/lib/interfaces/index.ts |  1 +
 .../lib/interfaces/timelock.interface.ts      | 38 +++++++++++++++++++
 .../lib/interfaces/vesting.interface.ts       | 36 ------------------
 apps/wallet-dashboard/lib/utils/timelock.ts   | 15 +++-----
 apps/wallet-dashboard/lib/utils/vesting.ts    | 11 ++++++
 .../lib/utils/vesting/vesting.spec.ts         |  4 +-
 .../lib/utils/vesting/vesting.ts              | 23 +++++------
 8 files changed, 73 insertions(+), 61 deletions(-)
 create mode 100644 apps/wallet-dashboard/lib/interfaces/timelock.interface.ts
 create mode 100644 apps/wallet-dashboard/lib/utils/vesting.ts

diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index cfcb2711e34..7a656db99f5 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { Timelocked, TimelockedStakedIota } from '../interfaces';
+import { TimelockedObject, TimelockedStakedIota } from '../interfaces';
 import { DAYS_PER_WEEK, DAYS_PER_YEAR, MILLISECONDS_PER_DAY } from './time.constants';
 
 export const SUPPLY_INCREASE_VESTING_PAYOUT_SCHEDULE = 2 * DAYS_PER_WEEK;
@@ -18,7 +18,7 @@ export const SUPPLY_INCREASE_INVESTOR_VESTING_DURATION = 4; // Years
 export const SUPPLY_INCREASE_VESTING_LABEL =
     '000000000000000000000000000000000000000000000000000000000000107a::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
 
-export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: Timelocked[] = [
+export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject[] = [
     {
         id: {
             id: '0xfe755ca67e3a0714f97ec3c49cfc6f3ecdab2673d96b5840294d3a5db376c99',
@@ -680,7 +680,7 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] =
 ];
 
 export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
-    | Timelocked
+    | TimelockedObject
     | TimelockedStakedIota
 )[] = [
     {
diff --git a/apps/wallet-dashboard/lib/interfaces/index.ts b/apps/wallet-dashboard/lib/interfaces/index.ts
index 6029b6cc94b..3ef2a0d11e3 100644
--- a/apps/wallet-dashboard/lib/interfaces/index.ts
+++ b/apps/wallet-dashboard/lib/interfaces/index.ts
@@ -2,4 +2,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export * from './transactions.interface';
+export * from './timelocks.interface';
 export * from './vesting.interface';
diff --git a/apps/wallet-dashboard/lib/interfaces/timelock.interface.ts b/apps/wallet-dashboard/lib/interfaces/timelock.interface.ts
new file mode 100644
index 00000000000..ac97614fe2a
--- /dev/null
+++ b/apps/wallet-dashboard/lib/interfaces/timelock.interface.ts
@@ -0,0 +1,38 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export interface UID {
+    id: string;
+}
+
+export interface Balance {
+    value: number;
+}
+
+export interface TimelockedObject {
+    id: UID;
+    locked: Balance; // TODO: extend to support other types of locked assets
+    expirationTimestampMs: number;
+    label?: string;
+}
+
+export interface TimelockedIotaResponse {
+    id: UID;
+    locked: string;
+    expiration_timestamp_ms: string;
+    label?: string;
+}
+
+export interface StakedIota {
+    id: UID;
+    poolId: string;
+    stakeActivationEpoch: number;
+    principal: Balance;
+}
+
+export interface TimelockedStakedIota {
+    id: UID;
+    stakedIota: StakedIota;
+    expirationTimestampMs: number;
+    label?: string | null | undefined;
+}
diff --git a/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts b/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
index 12be7e0bfd0..c997986f065 100644
--- a/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
+++ b/apps/wallet-dashboard/lib/interfaces/vesting.interface.ts
@@ -1,42 +1,6 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-export interface UID {
-    id: string;
-}
-
-export interface Balance {
-    value: number;
-}
-
-export interface Timelocked {
-    id: UID;
-    locked: Balance;
-    expirationTimestampMs: number;
-    label?: string;
-}
-
-export interface TimelockedIotaResponse {
-    id: UID;
-    locked: string;
-    expiration_timestamp_ms: string;
-    label?: string;
-}
-
-export interface StakedIota {
-    id: UID;
-    poolId: string;
-    stakeActivationEpoch: number;
-    principal: Balance;
-}
-
-export interface TimelockedStakedIota {
-    id: UID;
-    stakedIota: StakedIota;
-    expirationTimestampMs: number;
-    label?: string | null | undefined;
-}
-
 export enum SupplyIncreaseUserType {
     Staker = 'Staker',
     Entity = 'Entity',
diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index 581bff8f397..5d4856aeb35 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -1,21 +1,18 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SUPPLY_INCREASE_VESTING_LABEL } from '../constants';
-import { Timelocked, TimelockedStakedIota } from '../interfaces';
+import { TimelockedObject, TimelockedStakedIota } from '../interfaces';
 
 export function isTimelockedStakedIota(
-    obj: Timelocked | TimelockedStakedIota,
+    obj: TimelockedObject | TimelockedStakedIota,
 ): obj is TimelockedStakedIota {
     const referenceProperty: keyof TimelockedStakedIota = 'stakedIota';
     return referenceProperty in obj;
 }
 
-export function isTimelocked(obj: Timelocked | TimelockedStakedIota): obj is Timelocked {
-    const referenceProperty: keyof Timelocked = 'locked';
+export function isTimelockedObject(
+    obj: TimelockedObject | TimelockedStakedIota,
+): obj is TimelockedObject {
+    const referenceProperty: keyof TimelockedObject = 'locked';
     return referenceProperty in obj;
 }
-
-export function isVesting(obj: Timelocked | TimelockedStakedIota): boolean {
-    return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
-}
diff --git a/apps/wallet-dashboard/lib/utils/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting.ts
new file mode 100644
index 00000000000..70dd22b431b
--- /dev/null
+++ b/apps/wallet-dashboard/lib/utils/vesting.ts
@@ -0,0 +1,11 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { SUPPLY_INCREASE_VESTING_LABEL } from '../constants';
+import { TimelockedObject, TimelockedStakedIota } from '../interfaces';
+
+export function isSupplyIncreaseVestingObject(
+    obj: TimelockedObject | TimelockedStakedIota,
+): boolean {
+    return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
+}
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts
index 1f4c1b5e6c9..d1ebc37f1b0 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts
@@ -10,7 +10,7 @@ import {
 } from '../../constants';
 
 import { SupplyIncreaseUserType, SupplyIncreaseVestingPayout } from '../../interfaces';
-import { isTimelocked, isTimelockedStakedIota } from '../timelock';
+import { isTimelockedObject, isTimelockedStakedIota } from '../timelock';
 
 import {
     getVestingOverview,
@@ -220,7 +220,7 @@ describe('vesting overview', () => {
             .reduce((acc, current) => acc + current.stakedIota.principal.value, 0);
         expect(vestingOverview.totalStaked).toEqual(totalStaked);
 
-        const timelockObjects = mixedObjects.filter(isTimelocked);
+        const timelockObjects = mixedObjects.filter(isTimelockedObject);
         const availableClaiming = timelockObjects.reduce(
             (acc, current) =>
                 current.expirationTimestampMs <= Date.now() ? acc + current.locked.value : acc,
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 039d4273b6e..e42470ccee9 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -14,17 +14,18 @@ import {
     SupplyIncreaseUserType,
     SupplyIncreaseVestingPayout,
     SupplyIncreaseVestingPortfolio,
-    Timelocked,
     TimelockedIotaResponse,
+    TimelockedObject,
     TimelockedStakedIota,
     VestingOverview,
 } from '../../interfaces';
-import { isTimelocked, isTimelockedStakedIota, isVesting } from '../timelock';
+import { isTimelockedObject, isTimelockedStakedIota } from '../timelock';
+import { isSupplyIncreaseVestingObject } from '../vesting';
 
 export function getLastSupplyIncreaseVestingPayout(
-    objects: (Timelocked | TimelockedStakedIota)[],
+    objects: (TimelockedObject | TimelockedStakedIota)[],
 ): SupplyIncreaseVestingPayout | undefined {
-    const vestingObjects = objects.filter(isVesting);
+    const vestingObjects = objects.filter(isSupplyIncreaseVestingObject);
 
     if (vestingObjects.length === 0) {
         return undefined;
@@ -38,14 +39,14 @@ export function getLastSupplyIncreaseVestingPayout(
 }
 
 function supplyIncreaseVestingObjectsToPayoutMap(
-    vestingObjects: (Timelocked | TimelockedStakedIota)[],
+    vestingObjects: (TimelockedObject | TimelockedStakedIota)[],
 ): Map<number, SupplyIncreaseVestingPayout> {
     const expirationToVestingPayout = new Map<number, SupplyIncreaseVestingPayout>();
 
     for (const vestingObject of vestingObjects) {
         let objectValue = 0;
-        if (isTimelocked(vestingObject)) {
-            objectValue = (vestingObject as Timelocked).locked.value;
+        if (isTimelockedObject(vestingObject)) {
+            objectValue = (vestingObject as TimelockedObject).locked.value;
         } else if (isTimelockedStakedIota(vestingObject)) {
             objectValue = (vestingObject as TimelockedStakedIota).stakedIota.principal.value;
         }
@@ -111,10 +112,10 @@ export function buildSupplyIncreaseVestingSchedule(
 }
 
 export function getVestingOverview(
-    objects: (Timelocked | TimelockedStakedIota)[],
+    objects: (TimelockedObject | TimelockedStakedIota)[],
     currentEpochTimestamp: number,
 ): VestingOverview {
-    const vestingObjects = objects.filter(isVesting);
+    const vestingObjects = objects.filter(isSupplyIncreaseVestingObject);
     const latestPayout = getLastSupplyIncreaseVestingPayout(vestingObjects);
 
     if (vestingObjects.length === 0 || !latestPayout) {
@@ -148,7 +149,7 @@ export function getVestingOverview(
         0,
     );
 
-    const timelockedObjects = vestingObjects.filter(isTimelocked);
+    const timelockedObjects = vestingObjects.filter(isTimelockedObject);
 
     const totalAvailableClaimingAmount = timelockedObjects.reduce(
         (acc, current) =>
@@ -185,7 +186,7 @@ export function getSupplyIncreaseVestingPayoutsCount(userType: SupplyIncreaseUse
     return SUPPLY_INCREASE_VESTING_PAYOUTS_IN_1_YEAR * vestingDuration;
 }
 
-export function mapTimelockObjects(iotaObjects: IotaObjectData[]): Timelocked[] {
+export function mapTimelockObjects(iotaObjects: IotaObjectData[]): TimelockedObject[] {
     return iotaObjects.map((iotaObject) => {
         if (!iotaObject?.content?.dataType || iotaObject.content.dataType !== 'moveObject') {
             return {

From 7ac981743f6d76584061ef95a0fcf7d8b7d2cbed Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 12 Aug 2024 16:17:22 +0200
Subject: [PATCH 26/68] fix(wallet-dashboard): create a util function to check
 if a timelocked object is unlocked

---
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx | 6 +++---
 apps/wallet-dashboard/lib/utils/timelock.ts          | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index b2bc03f1ea3..1044badef68 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -5,7 +5,7 @@
 
 import { Button } from '@/components';
 import { useGetCurrentEpochStartTimestamp, useNotifications } from '@/hooks';
-import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
+import { getVestingOverview, isTimelockedUnlocked, mapTimelockObjects } from '@/lib/utils';
 import { NotificationType } from '@/stores/notificationStore';
 import { useUnlockTimelockedObjects, useGetAllTimelockedObjects } from '@iota/core';
 import { useCurrentAccount, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
@@ -23,8 +23,8 @@ function VestingDashboardPage(): JSX.Element {
     const timelockedMapped = timelockedObjects ? mapTimelockObjects(timelockedObjects) : [];
     const vestingSchedule = getVestingOverview(timelockedMapped, Number(currentEpochMs));
 
-    const unlockedTimelockedObjects = timelockedMapped?.filter(
-        (timelockedObject) => timelockedObject.expirationTimestampMs <= Number(currentEpochMs),
+    const unlockedTimelockedObjects = timelockedMapped?.filter((timelockedObject) =>
+        isTimelockedUnlocked(timelockedObject, Number(currentEpochMs)),
     );
     const unlockedTimelockedbjectIds: string[] =
         unlockedTimelockedObjects.map((timelocked) => timelocked.id.id) || [];
diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index 581bff8f397..b82e30b439d 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -19,3 +19,10 @@ export function isTimelocked(obj: Timelocked | TimelockedStakedIota): obj is Tim
 export function isVesting(obj: Timelocked | TimelockedStakedIota): boolean {
     return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
 }
+
+export function isTimelockedUnlocked(
+    timelockedObject: Timelocked | TimelockedStakedIota,
+    currentEpochMs: number,
+): boolean {
+    return timelockedObject.expirationTimestampMs <= Number(currentEpochMs);
+}

From 8bdf25940572e6a7efde967fa11be7615daf8f9a Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 12 Aug 2024 16:23:40 +0200
Subject: [PATCH 27/68] fix(wallet-dashboard): remove redundant "all" in
 unlockedTimelockedObjects

---
 apps/core/src/hooks/useUnlockTimelockedObjects.ts  |  6 +++---
 ...=> createUnlockTimelockedObjectsTransaction.ts} |  6 +++---
 apps/core/src/utils/transaction/index.ts           |  2 +-
 .../app/dashboard/vesting/page.tsx                 | 14 ++++----------
 4 files changed, 11 insertions(+), 17 deletions(-)
 rename apps/core/src/utils/transaction/{createUnlockAllTimelockedObjectsTransaction.ts => createUnlockTimelockedObjectsTransaction.ts} (86%)

diff --git a/apps/core/src/hooks/useUnlockTimelockedObjects.ts b/apps/core/src/hooks/useUnlockTimelockedObjects.ts
index 06bf3aabe08..27f2ccc77d7 100644
--- a/apps/core/src/hooks/useUnlockTimelockedObjects.ts
+++ b/apps/core/src/hooks/useUnlockTimelockedObjects.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { useIotaClient } from '@iota/dapp-kit';
-import { createUnlockAllTimelockedObjectsTransaction } from '../utils';
+import { createUnlockTimelockedObjectsTransaction } from '../utils';
 import { useQuery } from '@tanstack/react-query';
 
 export function useUnlockTimelockedObjects(address: string, objectIds: string[]) {
@@ -10,9 +10,9 @@ export function useUnlockTimelockedObjects(address: string, objectIds: string[])
 
     return useQuery({
         // eslint-disable-next-line @tanstack/query/exhaustive-deps
-        queryKey: ['unlock-all-timelocked-objects-transaction', address, objectIds],
+        queryKey: ['unlock-timelocked-objects', address, objectIds],
         queryFn: async () => {
-            const transaction = createUnlockAllTimelockedObjectsTransaction({ address, objectIds });
+            const transaction = createUnlockTimelockedObjectsTransaction({ address, objectIds });
             transaction.setSender(address);
             await transaction.build({ client });
             return transaction;
diff --git a/apps/core/src/utils/transaction/createUnlockAllTimelockedObjectsTransaction.ts b/apps/core/src/utils/transaction/createUnlockTimelockedObjectsTransaction.ts
similarity index 86%
rename from apps/core/src/utils/transaction/createUnlockAllTimelockedObjectsTransaction.ts
rename to apps/core/src/utils/transaction/createUnlockTimelockedObjectsTransaction.ts
index d3f10ab4395..0eba7a16b8c 100644
--- a/apps/core/src/utils/transaction/createUnlockAllTimelockedObjectsTransaction.ts
+++ b/apps/core/src/utils/transaction/createUnlockTimelockedObjectsTransaction.ts
@@ -4,15 +4,15 @@
 import { TransactionBlock } from '@iota/iota.js/transactions';
 import { IOTA_TYPE_ARG, IOTA_FRAMEWORK_ADDRESS } from '@iota/iota.js/utils';
 
-interface UnlockAllTimelockedObjectTransactionOptions {
+interface CreateUnlockTimelockedObjectTransactionOptions {
     address: string;
     objectIds: string[];
 }
 
-export function createUnlockAllTimelockedObjectsTransaction({
+export function createUnlockTimelockedObjectsTransaction({
     address,
     objectIds,
-}: UnlockAllTimelockedObjectTransactionOptions) {
+}: CreateUnlockTimelockedObjectTransactionOptions) {
     const ptb = new TransactionBlock();
     const coins: { index: number; resultIndex: number; kind: 'NestedResult' }[] = [];
 
diff --git a/apps/core/src/utils/transaction/index.ts b/apps/core/src/utils/transaction/index.ts
index de4549f8357..5fcc02257ca 100644
--- a/apps/core/src/utils/transaction/index.ts
+++ b/apps/core/src/utils/transaction/index.ts
@@ -13,4 +13,4 @@ export * from './getObjectChangeLabel';
 export * from './createTokenTransferTransaction';
 export * from './getObjectDisplayLookup';
 export * from './createNftSendValidationSchema';
-export * from './createUnlockAllTimelockedObjectsTransaction';
+export * from './createUnlockTimelockedObjectsTransaction';
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 1044badef68..8f233cb69d4 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -26,11 +26,11 @@ function VestingDashboardPage(): JSX.Element {
     const unlockedTimelockedObjects = timelockedMapped?.filter((timelockedObject) =>
         isTimelockedUnlocked(timelockedObject, Number(currentEpochMs)),
     );
-    const unlockedTimelockedbjectIds: string[] =
+    const unlockedTimelockedObjectIds: string[] =
         unlockedTimelockedObjects.map((timelocked) => timelocked.id.id) || [];
     const { data: unlockAllTimelockedObjects } = useUnlockTimelockedObjects(
         account?.address || '',
-        unlockedTimelockedbjectIds,
+        unlockedTimelockedObjectIds,
     );
 
     const handleCollect = () => {
@@ -43,19 +43,13 @@ function VestingDashboardPage(): JSX.Element {
                 transactionBlock: unlockAllTimelockedObjects.transactionBlock,
             },
             {
-                onSuccess: (result) => {
-                    console.log('executed transaction', result.digest);
+                onSuccess: () => {
                     queryClient.invalidateQueries({
                         queryKey: ['get-all-timelocked-objects'],
                     });
                     addNotification('Transaction has been sent');
                 },
-                onError: (result) => {
-                    console.error(
-                        'error to execute unlock all timelocked object transaction',
-                        result,
-                    );
-
+                onError: () => {
                     addNotification('Transaction was not sent', NotificationType.Error);
                 },
             },

From 25cebdadf3a9273e114dea6e549d3b55bdfa245c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Mon, 12 Aug 2024 16:26:51 +0200
Subject: [PATCH 28/68] fix: mising files from refactor

---
 apps/wallet-dashboard/lib/interfaces/index.ts      |  2 +-
 apps/wallet-dashboard/lib/utils/vesting.ts         | 11 -----------
 apps/wallet-dashboard/lib/utils/vesting/vesting.ts |  9 +++++++--
 3 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 apps/wallet-dashboard/lib/utils/vesting.ts

diff --git a/apps/wallet-dashboard/lib/interfaces/index.ts b/apps/wallet-dashboard/lib/interfaces/index.ts
index 3ef2a0d11e3..b00df15b193 100644
--- a/apps/wallet-dashboard/lib/interfaces/index.ts
+++ b/apps/wallet-dashboard/lib/interfaces/index.ts
@@ -2,5 +2,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export * from './transactions.interface';
-export * from './timelocks.interface';
+export * from './timelock.interface';
 export * from './vesting.interface';
diff --git a/apps/wallet-dashboard/lib/utils/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting.ts
deleted file mode 100644
index 70dd22b431b..00000000000
--- a/apps/wallet-dashboard/lib/utils/vesting.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-import { SUPPLY_INCREASE_VESTING_LABEL } from '../constants';
-import { TimelockedObject, TimelockedStakedIota } from '../interfaces';
-
-export function isSupplyIncreaseVestingObject(
-    obj: TimelockedObject | TimelockedStakedIota,
-): boolean {
-    return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
-}
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index e42470ccee9..0749afb6c40 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -6,10 +6,10 @@ import {
     SUPPLY_INCREASE_INVESTOR_VESTING_DURATION,
     SUPPLY_INCREASE_STAKER_VESTING_DURATION,
     SUPPLY_INCREASE_STARTING_VESTING_YEAR,
+    SUPPLY_INCREASE_VESTING_LABEL,
     SUPPLY_INCREASE_VESTING_PAYOUTS_IN_1_YEAR,
     SUPPLY_INCREASE_VESTING_PAYOUT_SCHEDULE_MILLISECONDS,
 } from '../../constants';
-
 import {
     SupplyIncreaseUserType,
     SupplyIncreaseVestingPayout,
@@ -20,7 +20,6 @@ import {
     VestingOverview,
 } from '../../interfaces';
 import { isTimelockedObject, isTimelockedStakedIota } from '../timelock';
-import { isSupplyIncreaseVestingObject } from '../vesting';
 
 export function getLastSupplyIncreaseVestingPayout(
     objects: (TimelockedObject | TimelockedStakedIota)[],
@@ -227,3 +226,9 @@ export function timelockObjectsFromIotaObjects(
     });
     return result;
 }
+
+export function isSupplyIncreaseVestingObject(
+    obj: TimelockedObject | TimelockedStakedIota,
+): boolean {
+    return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
+}

From 4f7816946ed80a8279cf03866ace7e3aeb0ac235 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 13 Aug 2024 08:16:33 +0200
Subject: [PATCH 29/68] fix(wallet-dashboard): remove unnecessary conversion

---
 apps/wallet-dashboard/lib/utils/timelock.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index b82e30b439d..4dc02f18310 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -24,5 +24,5 @@ export function isTimelockedUnlocked(
     timelockedObject: Timelocked | TimelockedStakedIota,
     currentEpochMs: number,
 ): boolean {
-    return timelockedObject.expirationTimestampMs <= Number(currentEpochMs);
+    return timelockedObject.expirationTimestampMs <= currentEpochMs;
 }

From f6c4327ac4f46f020a85dc7e1ef6fc30f2b2022d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Tue, 13 Aug 2024 15:00:24 +0200
Subject: [PATCH 30/68] refactor: update iota-sdk name

---
 .../transaction/createUnlockTimelockedObjectsTransaction.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/core/src/utils/transaction/createUnlockTimelockedObjectsTransaction.ts b/apps/core/src/utils/transaction/createUnlockTimelockedObjectsTransaction.ts
index 0eba7a16b8c..fbc0a608527 100644
--- a/apps/core/src/utils/transaction/createUnlockTimelockedObjectsTransaction.ts
+++ b/apps/core/src/utils/transaction/createUnlockTimelockedObjectsTransaction.ts
@@ -1,8 +1,8 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { TransactionBlock } from '@iota/iota.js/transactions';
-import { IOTA_TYPE_ARG, IOTA_FRAMEWORK_ADDRESS } from '@iota/iota.js/utils';
+import { TransactionBlock } from '@iota/iota-sdk/transactions';
+import { IOTA_TYPE_ARG, IOTA_FRAMEWORK_ADDRESS } from '@iota/iota-sdk/utils';
 
 interface CreateUnlockTimelockedObjectTransactionOptions {
     address: string;

From 88963a1e498e64a261c848272944320aab644420 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 13 Aug 2024 16:17:03 +0200
Subject: [PATCH 31/68] fix(wallet-dashboard): update logic with new
 DelegatedTimelockedStake interface

---
 .../app/dashboard/vesting/page.tsx                 |  9 ++-------
 .../lib/interfaces/timelock.interface.ts           | 14 --------------
 apps/wallet-dashboard/lib/utils/timelock.ts        | 11 ++++++-----
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 38987f3e723..724896dff7c 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -4,11 +4,7 @@
 'use client';
 
 import { useGetCurrentEpochStartTimestamp } from '@/hooks';
-import {
-    getVestingOverview,
-    timelockObjectsFromIotaObjects,
-    mapTimelockObjects,
-} from '@/lib/utils';
+import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
 import {
     TIMELOCK_IOTA_TYPE,
     useGetAllOwnedObjects,
@@ -25,9 +21,8 @@ function VestingDashboardPage(): JSX.Element {
     const { data: stakedTimelockedObjects } = useGetStakedTimelockedObjects(account?.address || '');
 
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
-    const stakedTimelockedMapped = timelockObjectsFromIotaObjects(stakedTimelockedObjects || []);
     const vestingSchedule = getVestingOverview(
-        [...timelockedMapped, ...stakedTimelockedMapped],
+        [...timelockedMapped, ...(stakedTimelockedObjects || [])],
         Number(currentEpochMs),
     );
 
diff --git a/apps/wallet-dashboard/lib/interfaces/timelock.interface.ts b/apps/wallet-dashboard/lib/interfaces/timelock.interface.ts
index ac97614fe2a..12b26daeecb 100644
--- a/apps/wallet-dashboard/lib/interfaces/timelock.interface.ts
+++ b/apps/wallet-dashboard/lib/interfaces/timelock.interface.ts
@@ -22,17 +22,3 @@ export interface TimelockedIotaResponse {
     expiration_timestamp_ms: string;
     label?: string;
 }
-
-export interface StakedIota {
-    id: UID;
-    poolId: string;
-    stakeActivationEpoch: number;
-    principal: Balance;
-}
-
-export interface TimelockedStakedIota {
-    id: UID;
-    stakedIota: StakedIota;
-    expirationTimestampMs: number;
-    label?: string | null | undefined;
-}
diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index 5d4856aeb35..14453d1d3b9 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -1,17 +1,18 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { TimelockedObject, TimelockedStakedIota } from '../interfaces';
+import { DelegatedTimelockedStake } from '@iota/iota-sdk/client';
+import { TimelockedObject } from '../interfaces';
 
 export function isTimelockedStakedIota(
-    obj: TimelockedObject | TimelockedStakedIota,
-): obj is TimelockedStakedIota {
-    const referenceProperty: keyof TimelockedStakedIota = 'stakedIota';
+    obj: TimelockedObject | DelegatedTimelockedStake,
+): obj is DelegatedTimelockedStake {
+    const referenceProperty: keyof DelegatedTimelockedStake = 'stakes';
     return referenceProperty in obj;
 }
 
 export function isTimelockedObject(
-    obj: TimelockedObject | TimelockedStakedIota,
+    obj: TimelockedObject | DelegatedTimelockedStake,
 ): obj is TimelockedObject {
     const referenceProperty: keyof TimelockedObject = 'locked';
     return referenceProperty in obj;

From 106aa114b5b4d40466f3da6482143c0e49363027 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 13 Aug 2024 16:17:16 +0200
Subject: [PATCH 32/68] fix(wallet-dashboard): update test logic with new
 DelegatedTimelockedStake interface

---
 .../lib/constants/vesting.constants.ts        | 897 +++++++++---------
 .../lib/utils/vesting/vesting.spec.ts         |  35 +-
 .../lib/utils/vesting/vesting.ts              | 104 +-
 3 files changed, 540 insertions(+), 496 deletions(-)

diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index 7a656db99f5..67ad3687aa6 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -1,8 +1,9 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { TimelockedObject, TimelockedStakedIota } from '../interfaces';
+import { TimelockedObject } from '../interfaces';
 import { DAYS_PER_WEEK, DAYS_PER_YEAR, MILLISECONDS_PER_DAY } from './time.constants';
+import { DelegatedTimelockedStake } from '@iota/iota-sdk/client';
 
 export const SUPPLY_INCREASE_VESTING_PAYOUT_SCHEDULE = 2 * DAYS_PER_WEEK;
 export const SUPPLY_INCREASE_VESTING_PAYOUT_SCHEDULE_MILLISECONDS =
@@ -351,337 +352,317 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
     },
 ];
 
-export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: TimelockedStakedIota[] = [
-    {
-        id: { id: '0x1d981f9fde96c2e509de1c925a95b78b2a3cb910d9b384ca4dbeb1bd14aa1cf2' },
-        stakedIota: {
-            id: {
-                id: '0x2a1df8ec18ef82da39f8af22ae1b8656037706df377ad4af0fc2036f50373f1d',
+export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: DelegatedTimelockedStake[] = [
+    {
+        validatorAddress: '0x026d4a3c4bcdea163cef95220a0b8cd9a05995a0f9354730ea8d88e0b7635e66',
+        stakingPool: '0xf59a3e927d5f8dd59b104327a59f48b73eda478aa60c983de1d0b6c7551734f4',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x2a1df8ec18ef82da39f8af22ae1b8656037706df377ad4af0fc2036f50373f1d',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1699740000000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1699740000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x72b7bafbe81584599b8c8d1e58758fd6f34e4a4e65fe22899cf4485063826aee' },
-        stakedIota: {
-            id: {
-                id: '0x75e69abfc76ad38944e747f36ecf0dfd0933f80134187c7a67952f0011623b21',
+            {
+                timelockedStakedIotaId:
+                    '0x75e69abfc76ad38944e747f36ecf0dfd0933f80134187c7a67952f0011623b21',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1700949600000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1700949600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xe438122ed11983492bfcabdd78b52d0739124802f8667fefcbdea4d0e1f6ff55' },
-        stakedIota: {
-            id: {
-                id: '0x6c9abc5d279d79f1693f09fa220300ef8483bcbdcca410e3d533e4892d7a60f9',
+            {
+                timelockedStakedIotaId:
+                    '0x6c9abc5d279d79f1693f09fa220300ef8483bcbdcca410e3d533e4892d7a60f9',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1702159200000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1702159200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x6f1f54bda98e0d82cdb90045fee0bb32bae8672f19e4c7797cb28409898c9a3f' },
-        stakedIota: {
-            id: {
-                id: '0x40d2fcada5c4b87854b458115d678d87317bf14b28abce0ae94be2063a5c9c0f',
+            {
+                timelockedStakedIotaId:
+                    '0x40d2fcada5c4b87854b458115d678d87317bf14b28abce0ae94be2063a5c9c0f',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1703368800000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1703368800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xfb476568cd1e6563874a2a325677be253a3dfe46872c9ce89eb8af3ea731dea6' },
-        stakedIota: {
-            id: {
-                id: '0xfa414fb4078c7424f353a0206a0d18a07a21ff5ccc99e81fd15cf201fd0a65d4',
+            {
+                timelockedStakedIotaId:
+                    '0xfa414fb4078c7424f353a0206a0d18a07a21ff5ccc99e81fd15cf201fd0a65d4',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1704578400000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1704578400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x323760b2fea142c255ec9fb7c75a2380adb1c41cd65ca704e7076564f9db990c' },
-        stakedIota: {
-            id: {
-                id: '0x67564a23c8a07f02755c8f23d3d97ed23de5f1af1b702e23e0fe6d5b68592334',
+            {
+                timelockedStakedIotaId:
+                    '0x67564a23c8a07f02755c8f23d3d97ed23de5f1af1b702e23e0fe6d5b68592334',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1705788000000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1705788000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xc556e3e84b39f730d6fd7ea152d2f947526b45c989a03633e5a79186fe52a3a0' },
-        stakedIota: {
-            id: {
-                id: '0xd2f93f458c41ace2099f877f97233fc84f04eafbfb5a48b39ef15896bf34dcdb',
+        ],
+    },
+    {
+        validatorAddress: '0xc556e3e84b39f730d6fd7ea152d2f947526b45c989a03633e5a79186fe52a3a0',
+        stakingPool: '0x1d981f9fde96c2e509de1c925a95b78b2a3cb910d9b384ca4dbeb1bd14aa1cf2',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0xd2f93f458c41ace2099f877f97233fc84f04eafbfb5a48b39ef15896bf34dcdb',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1706997600000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1706997600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x2b771bd4c3b0f36a261ff1249d8bf70858e5c53ca3182c8088ea53e0e62d9ba3' },
-        stakedIota: {
-            id: {
-                id: '0x38847bb6e80fc93d2a1924e65f37aa7f39c2b66c9cd0465cba4f8f7a2aa69cf4',
+            {
+                timelockedStakedIotaId:
+                    '0x38847bb6e80fc93d2a1924e65f37aa7f39c2b66c9cd0465cba4f8f7a2aa69cf4',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1708207200000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1708207200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x97d108f7ead86885654018931854c75314d82ee25d1bd3e25e169bd9ef848965' },
-        stakedIota: {
-            id: {
-                id: '0xe9c230f1046e3460d38ff70c46aa7e4b812d797e81d91e6048966dd457516908',
+            {
+                timelockedStakedIotaId:
+                    '0xe9c230f1046e3460d38ff70c46aa7e4b812d797e81d91e6048966dd457516908',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1709416800000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1709416800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x72793b91fea132f81df2065cd78e597a0b426da1b75b737689529fbaa7ae5e02' },
-        stakedIota: {
-            id: {
-                id: '0x584049fcd0854e2d9ae7f5442ddcd7a6774941cea32f446baa42ed471c0c9b5e',
+            {
+                timelockedStakedIotaId:
+                    '0x584049fcd0854e2d9ae7f5442ddcd7a6774941cea32f446baa42ed471c0c9b5e',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1710626400000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1710626400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xc7a986cbdaf4d7b6f5167b2706f3f2d692846fee010f55f46540987a81a5a0d9' },
-        stakedIota: {
-            id: {
-                id: '0x0fce2e04c142b904eddd7b644161335387e0c76398add8d4b75af8b973eb06c1',
+            {
+                timelockedStakedIotaId:
+                    '0x0fce2e04c142b904eddd7b644161335387e0c76398add8d4b75af8b973eb06c1',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1711836000000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1711836000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xac1a96522df60536fd5bb6e0ad9452870b623262cedb01bc28eedd5322d849d2' },
-        stakedIota: {
-            id: {
-                id: '0x8b3145f22980a2d506aa4d179657ca3acf2196509b4982d06d6c6a1cc033d47c',
+            {
+                timelockedStakedIotaId:
+                    '0x8b3145f22980a2d506aa4d179657ca3acf2196509b4982d06d6c6a1cc033d47c',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1713045600000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1713045600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x69adfd0c384f62e1d56b4658521b84c3343418187fb3b53fd8836ec20c294477' },
-        stakedIota: {
-            id: {
-                id: '0x687a70de2a11071592da1e1c7e65530407577974a253fbb291ab694fa1862556',
+        ],
+    },
+    {
+        validatorAddress: '0x69adfd0c384f62e1d56b4658521b84c3343418187fb3b53fd8836ec20c294477',
+        stakingPool: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x687a70de2a11071592da1e1c7e65530407577974a253fbb291ab694fa1862556',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1714255200000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1714255200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x2a60bbc881f361455155158dd28bbf70bf532f775d9e397e98629c338b254354' },
-        stakedIota: {
-            id: {
-                id: '0xcb5b7b159752b1854c368d2f178f92e579a27c64a882669ca8ffddb921d5934e',
+            {
+                timelockedStakedIotaId:
+                    '0xcb5b7b159752b1854c368d2f178f92e579a27c64a882669ca8ffddb921d5934e',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1715464800000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1715464800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x50468640fc1c7623bd380ed93e6e6e7a0578c26dd0d78a8a0894c5cfd3718162' },
-        stakedIota: {
-            id: {
-                id: '0x9d44592883927293bd177924cca351bc7c6c075a834d44711bb5f85cebd47cb9',
+            {
+                timelockedStakedIotaId:
+                    '0x9d44592883927293bd177924cca351bc7c6c075a834d44711bb5f85cebd47cb9',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1716674400000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1716674400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xb220dfabba1985b2d3f4ef4899561b12c3d921aab8607cce87e02a7bfaa7c7ca' },
-        stakedIota: {
-            id: {
-                id: '0x72b8c7e5695e86b043b4f66202687fe7d1a11a0118bc795133f2af2f5229b4c7',
+            {
+                timelockedStakedIotaId:
+                    '0x72b8c7e5695e86b043b4f66202687fe7d1a11a0118bc795133f2af2f5229b4c7',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1717884000000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1717884000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x303fc97a8b1c20fed2c0732b8ad6290725dcb668a2224f3e79cbbe28c7c1cde6' },
-        stakedIota: {
-            id: {
-                id: '0x7bbd702f91697c81e05a17c6c6cca7160032627e1ca3af2736fd826f42196ff7',
+            {
+                timelockedStakedIotaId:
+                    '0x7bbd702f91697c81e05a17c6c6cca7160032627e1ca3af2736fd826f42196ff7',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1719093600000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1719093600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x81c7661212e17f6acd3620a4f4191b350a350b6fdabdefdd7f0940b962f5e6e3' },
-        stakedIota: {
-            id: {
-                id: '0xaf4544a2086985b0c29fee18df4f2fe616370824ef6d62c2965615c74f53fbee',
+            {
+                timelockedStakedIotaId:
+                    '0xaf4544a2086985b0c29fee18df4f2fe616370824ef6d62c2965615c74f53fbee',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1720303200000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1720303200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x4a20ce4aec17d1ec33fcb305195422b0ef4dd1410c267f79e0cb80c4f9232fe0' },
-        stakedIota: {
-            id: {
-                id: '0x511517082f68c3604ef87f40bd98e3b1e37a54b7d4918c380a5c62e9e6f8c601',
+        ],
+    },
+    {
+        validatorAddress: '0x81c7661212e17f6acd3620a4f4191b350a350b6fdabdefdd7f0940b962f5e6e3',
+        stakingPool: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x511517082f68c3604ef87f40bd98e3b1e37a54b7d4918c380a5c62e9e6f8c601',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1721512800000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1721512800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x4b6ee8ee6dcc2eeeea0861ce658c4e4e684c80dba901442ed5ef69addd8a45d6' },
-        stakedIota: {
-            id: {
-                id: '0x081a7840adef1fcba660166b380182083af6fe009f84821fb75f8105a2a60aa4',
+            {
+                timelockedStakedIotaId:
+                    '0x081a7840adef1fcba660166b380182083af6fe009f84821fb75f8105a2a60aa4',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1722722400000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xea1a6f7ff4c03ce2a56687716d9c6e373286d2dca12cc0a4a86c2b943173553c',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1722722400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x429b75bcad49db078fcbb9d23e64b2596429c3657f48c84e12e66ea4c8c0e3a7' },
-        stakedIota: {
-            id: {
-                id: '0x0cc8c2143be582d836c062e0b4ed54c478361e9454c33588daf04e948c24bc14',
+            {
+                timelockedStakedIotaId:
+                    '0x0cc8c2143be582d836c062e0b4ed54c478361e9454c33588daf04e948c24bc14',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1723932000000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1723932000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xab5d982443f648472dd8a2d06fb760067267b2d8c08a4d7c6e7464eb58dac832' },
-        stakedIota: {
-            id: {
-                id: '0xa42903e420c9dac333be82300fcbc62edddcaa88da0ffa05b3a0351a01235571',
+            {
+                timelockedStakedIotaId:
+                    '0xa42903e420c9dac333be82300fcbc62edddcaa88da0ffa05b3a0351a01235571',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1725141600000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xb6930369f558843ff3f4d49edfef0e80d526efba150d0772b35d3990df5b4531',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1725141600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xd2cfd53537bff38e4ce90db46cbd15fa76f766a1c2cdc5aa2a075ae0e3ed2b8b' },
-        stakedIota: {
-            id: {
-                id: '0x5aff0e4a0dcc530ac5f6e74fa347ac618c8d4a72f0de9194ea3b967a67604189',
+            {
+                timelockedStakedIotaId:
+                    '0x5aff0e4a0dcc530ac5f6e74fa347ac618c8d4a72f0de9194ea3b967a67604189',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1726351200000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1726351200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x3be9dcf0bc43471220a4529c206191b213244ac2f0e16ac40df41cca3ce98122' },
-        stakedIota: {
-            id: {
-                id: '0x33f5d6b77caa9dcef34bd6ed9b4f0510f225485e6bb54f992877fa85fd984cbd',
+            {
+                timelockedStakedIotaId:
+                    '0x33f5d6b77caa9dcef34bd6ed9b4f0510f225485e6bb54f992877fa85fd984cbd',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1727560800000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xddd255ac76d01579d2d873cc0b0548ad58a11c18ac41c75c03aa0339890ef6ac',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1727560800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x27838c3896b664b7dcc71a98f1dfda1fbbcb1383d60118da1d7fb938ebe4b8f1' },
-        stakedIota: {
-            id: {
-                id: '0x305a9dd458d67124ffc61c8be38cd59c7d417b03184f1c23ba19b17e0d2d76d2',
+        ],
+    },
+    {
+        validatorAddress: '0x27838c3896b664b7dcc71a98f1dfda1fbbcb1383d60118da1d7fb938ebe4b8f1',
+        stakingPool: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x305a9dd458d67124ffc61c8be38cd59c7d417b03184f1c23ba19b17e0d2d76d2',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '1000',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1728770400000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xae37229d0e5779022b31b0ab9c539b02eb9c05659b2d59b3d7ce9c667ae1f3b1',
-            stakeActivationEpoch: 5555,
-            principal: { value: 1000 },
-        },
-        expirationTimestampMs: 1728770400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
 ];
 
 export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
     | TimelockedObject
-    | TimelockedStakedIota
+    | DelegatedTimelockedStake
 )[] = [
     {
         id: { id: '0x286b2c0317cc9dcfb8cc571c5f6b92c2f69b4d9666580b454291b0946fc3b37b' },
@@ -690,17 +671,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0xe574e0d2abb35b96f8b3918f5a1fdb66e71733fd7c02dee71abdd5427e9b3431' },
-        stakedIota: {
-            id: {
-                id: '0xb417430c07e03845e58fdde3f187acda86aea1e59c2c1dabd0d1d676b4845a75',
+        validatorAddress: '0xe574e0d2abb35b96f8b3918f5a1fdb66e71733fd7c02dee71abdd5427e9b3431',
+        stakingPool: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0xb417430c07e03845e58fdde3f187acda86aea1e59c2c1dabd0d1d676b4845a75',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '411',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1703368800000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
-            stakeActivationEpoch: 5555,
-            principal: { value: 411 },
-        },
-        expirationTimestampMs: 1703368800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x38bf384d2dc4b9a5c2584432db3787d3e911231f7115a3b31fa9fd5652220e76' },
@@ -721,17 +706,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0x55fb53235e7f7dea2239f4d5e69c8fc85f35e25fac6b76500f51f2a3ea181532' },
-        stakedIota: {
-            id: {
-                id: '0x7050c4d8a28eb65043c802f603e8c3c5b9af4ad5d061b78c68c914e8b2dfc01e',
+        validatorAddress: '0x55fb53235e7f7dea2239f4d5e69c8fc85f35e25fac6b76500f51f2a3ea181532',
+        stakingPool: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fd',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x7050c4d8a28eb65043c802f603e8c3c5b9af4ad5d061b78c68c914e8b2dfc01e',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '856',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1706997600000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
-            stakeActivationEpoch: 5555,
-            principal: { value: 856 },
-        },
-        expirationTimestampMs: 1706997600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x8be689ee351c1f455e12ea67fe21caf3989a8b029dfe79fa5bf0e47d2eac0f6a' },
@@ -740,17 +729,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0x09d4bdbd96e33f5c1e1666302483a967d3d4307048c7620512bcdafbc09f6abc' },
-        stakedIota: {
-            id: {
-                id: '0x6eec46a3cae99c4398df87cf3e6ebeb3893e4932e6a5dfa69cfdfe7d842258a0',
+        validatorAddress: '0x09d4bdbd96e33f5c1e1666302483a967d3d4307048c7620512bcdafbc09f6abc',
+        stakingPool: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x6eec46a3cae99c4398df87cf3e6ebeb3893e4932e6a5dfa69cfdfe7d842258a0',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '993',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1708207200000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
-            stakeActivationEpoch: 5555,
-            principal: { value: 993 },
-        },
-        expirationTimestampMs: 1708207200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0xd77236288ee66f6e8d677a974efe7a0b0b5c7e6d1154da7601d9a95560186965' },
@@ -771,17 +764,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0x4722f43ca6088455583c59051d1831f8ba9749c0ae0fc4e476e7a3362c9db928' },
-        stakedIota: {
-            id: {
-                id: '0xdfd86394269a34a4418fcf2095994fb2952bdc59c483e9f7e43f1dc638d28ae7',
+        validatorAddress: '0x4722f43ca6088455583c59051d1831f8ba9749c0ae0fc4e476e7a3362c9db928',
+        stakingPool: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0xdfd86394269a34a4418fcf2095994fb2952bdc59c483e9f7e43f1dc638d28ae7',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '506',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1711836000000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
-            stakeActivationEpoch: 5555,
-            principal: { value: 506 },
-        },
-        expirationTimestampMs: 1711836000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x479517cc209dc504575993ae9a1691e0a73301d98d63100ea8e5c253c4f79525' },
@@ -802,17 +799,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0x8670f828d3b82be680edee8f8cf9823ca9485e54f8728487d0aa0d367f389ab1' },
-        stakedIota: {
-            id: {
-                id: '0xff806527381322c9d016230b9d75f5638346aab72e1f5e291b3eb5499122934c',
+        validatorAddress: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
+        stakingPool: '0x8670f828d3b82be680edee8f8cf9823ca9485e54f8728487d0aa0d367f389ab1',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0xff806527381322c9d016230b9d75f5638346aab72e1f5e291b3eb5499122934c',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '289',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1715464800000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
-            stakeActivationEpoch: 5555,
-            principal: { value: 289 },
-        },
-        expirationTimestampMs: 1715464800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x46e385d485df4581ae373c1ce623b4f513bf0c35ee2cc9d10f8410a3b4ee2cb6' },
@@ -821,17 +822,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0x197ac9f7b5d0acd93159083ec755916ce3e5ade5cbedf7a49107c8603808069f' },
-        stakedIota: {
-            id: {
-                id: '0x69d6a5af46a3bf0bce5a97d6a5c5a120293afe2031df08b787c1e0c89eef54e3',
+        validatorAddress: '0x197ac9f7b5d0acd93159083ec755916ce3e5ade5cbedf7a49107c8603808069f',
+        stakingPool: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x69d6a5af46a3bf0bce5a97d6a5c5a120293afe2031df08b787c1e0c89eef54e3',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '870',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1716674400000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
-            stakeActivationEpoch: 5555,
-            principal: { value: 870 },
-        },
-        expirationTimestampMs: 1716674400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x7c056b2af944745852e505086cc793b72e3325ccf7c3c71ec0544f7d49925621' },
@@ -846,17 +851,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0xdce49e0aae09e8643dc997a99bfa7a927247fa2be4de350a970244a8d91ff672' },
-        stakedIota: {
-            id: {
-                id: '0x8d1fa6d30174054a212edf409026a4c9427987361103f7b74797515f860ed763',
+        validatorAddress: '0xdce49e0aae09e8643dc997a99bfa7a927247fa2be4de350a970244a8d91ff672',
+        stakingPool: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x8d1fa6d30174054a212edf409026a4c9427987361103f7b74797515f860ed763',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '132',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1719093600000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
-            stakeActivationEpoch: 5555,
-            principal: { value: 132 },
-        },
-        expirationTimestampMs: 1719093600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x92bcfa0735940ff8682abe71b0d431712a3ff921b94f1c43b21f51c124e17efd' },
@@ -877,17 +886,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0x1cb238a7c0dddf9ffae6857821518397d68662826ee8361de16d6caece41f1ab' },
-        stakedIota: {
-            id: {
-                id: '0x69dfc02157f9033d71677586fbb78c091a9c885dc93cc6f3b312c0aee94c64d3',
+        validatorAddress: '0x1cb238a7c0dddf9ffae6857821518397d68662826ee8361de16d6caece41f1ab',
+        stakingPool: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x69dfc02157f9033d71677586fbb78c091a9c885dc93cc6f3b312c0aee94c64d3',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '897',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1722722400000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa',
-            stakeActivationEpoch: 5555,
-            principal: { value: 897 },
-        },
-        expirationTimestampMs: 1722722400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x84960f357289ecf9b81ced44bc5d80b1868b6d3816183a3b56b8690425a4bfa3' },
@@ -896,17 +909,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0x53f54d864faa6287d17a53b806bc3f2127d8b32e62303dd6d729c2809f715336' },
-        stakedIota: {
-            id: {
-                id: '0xdc88e1f7c5323a0f7009a1cde781e4e61a375400e7a390c88886d8cd55169d5d',
+        validatorAddress: '0x53f54d864faa6287d17a53b806bc3f2127d8b32e62303dd6d729c2809f715336',
+        stakingPool: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0xdc88e1f7c5323a0f7009a1cde781e4e61a375400e7a390c88886d8cd55169d5d',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '701',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1723932000000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
-            stakeActivationEpoch: 5555,
-            principal: { value: 701 },
-        },
-        expirationTimestampMs: 1723932000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0xba31794b7a1dbf11975b08e571fa07346b546678e8460f88d87d55ddba040478' },
@@ -915,17 +932,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0x17693a56211258fcd5a994a007704fdd9967b52851451b46d6ba330812a5cc3f' },
-        stakedIota: {
-            id: {
-                id: '0xbe72eb343db6325370586436a4dfc5e248bb009fd93651fc574da4879ee7041d',
+        validatorAddress: '0x17693a56211258fcd5a994a007704fdd9967b52851451b46d6ba330812a5cc3f',
+        stakingPool: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0xbe72eb343db6325370586436a4dfc5e248bb009fd93651fc574da4879ee7041d',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '500',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1725141600000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
-            stakeActivationEpoch: 5555,
-            principal: { value: 500 },
-        },
-        expirationTimestampMs: 1725141600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x10e6438bff39079e4518dcb1a87ba95ca65c287b593a0bf9079dabdf77d6233d' },
@@ -952,17 +973,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0x8327bbe04ac8dc866d6f18c98a20ee3137c26ccc72b62effca73402e055a57d7' },
-        stakedIota: {
-            id: {
-                id: '0x993b8db7d52e20e24fee279d0effd380f9731c1d07bea6abac545357ca73d316',
+        validatorAddress: '0x8327bbe04ac8dc866d6f18c98a20ee3137c26ccc72b62effca73402e055a57d7',
+        stakingPool: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x993b8db7d52e20e24fee279d0effd380f9731c1d07bea6abac545357ca73d316',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '653',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1729980000000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
-            stakeActivationEpoch: 5555,
-            principal: { value: 653 },
-        },
-        expirationTimestampMs: 1729980000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x1de6fd9da4de9ac869f728060b659c9fb170669213c476adc6763a03c25809c5' },
@@ -971,17 +996,21 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0xd7ad38945ecb7ca6eeaadbf321703b263b4f6ef714e211d00b2aa8fe241fce0c' },
-        stakedIota: {
-            id: {
-                id: '0x850dc90cacec45a555a05f9be3c1b3a828d43bfd7fcaf7c8789319d1369832af',
+        validatorAddress: '0xd7ad38945ecb7ca6eeaadbf321703b263b4f6ef714e211d00b2aa8fe241fce0c',
+        stakingPool: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0x850dc90cacec45a555a05f9be3c1b3a828d43bfd7fcaf7c8789319d1369832af',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '208',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1731189600000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
-            stakeActivationEpoch: 5555,
-            principal: { value: 208 },
-        },
-        expirationTimestampMs: 1731189600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
     {
         id: { id: '0x900469a81978d06246234dcf508ff1180b1521184373b87b40c83ae42466b2dc' },
@@ -990,16 +1019,20 @@ export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
         label: SUPPLY_INCREASE_VESTING_LABEL,
     },
     {
-        id: { id: '0xfae93493826f45ac789f3319316aa55f1a707c171c9edfae5c12b845713163d1' },
-        stakedIota: {
-            id: {
-                id: '0xd194fa4d9a909baec026d8d67e33a85a9d36921df7a47288ed3e8a5eae9b8b9c',
+        validatorAddress: '0xfae93493826f45ac789f3319316aa55f1a707c171c9edfae5c12b845713163d1',
+        stakingPool: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa',
+        stakes: [
+            {
+                timelockedStakedIotaId:
+                    '0xd194fa4d9a909baec026d8d67e33a85a9d36921df7a47288ed3e8a5eae9b8b9c',
+                stakeRequestEpoch: '873',
+                stakeActiveEpoch: '874',
+                principal: '951',
+                status: 'Active',
+                estimatedReward: '125059068',
+                expirationTimestampMs: '1732399200000',
+                label: SUPPLY_INCREASE_VESTING_LABEL,
             },
-            poolId: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa',
-            stakeActivationEpoch: 5555,
-            principal: { value: 951 },
-        },
-        expirationTimestampMs: 1732399200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
+        ],
     },
 ];
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts
index d1ebc37f1b0..bbdfb62ca26 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts
@@ -150,19 +150,20 @@ describe('vesting overview', () => {
 
     it('should get correct vesting overview data with timelocked staked objects', () => {
         const timelockedStakedObjects = MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS;
-        const lastPayout = timelockedStakedObjects[timelockedStakedObjects.length - 1];
+        const lastPayout = timelockedStakedObjects[timelockedStakedObjects.length - 1].stakes[0];
+        const lastPayoutValue = Number(lastPayout.principal);
         const totalAmount =
             SUPPLY_INCREASE_STAKER_VESTING_DURATION *
             SUPPLY_INCREASE_VESTING_PAYOUTS_IN_1_YEAR *
-            lastPayout.stakedIota.principal.value;
+            lastPayoutValue;
 
         const vestingOverview = getVestingOverview(timelockedStakedObjects, Date.now());
         expect(vestingOverview.totalVested).toEqual(totalAmount);
 
         const vestingPortfolio = buildVestingPortfolio(
             {
-                amount: lastPayout.stakedIota.principal.value,
-                expirationTimestampMs: lastPayout.expirationTimestampMs,
+                amount: lastPayoutValue,
+                expirationTimestampMs: Number(lastPayout.expirationTimestampMs),
             },
             Date.now(),
         );
@@ -176,10 +177,15 @@ describe('vesting overview', () => {
         expect(vestingOverview.totalLocked).toEqual(lockedAmount);
         expect(vestingOverview.totalUnlocked).toEqual(totalAmount - lockedAmount);
 
-        const totalStaked = timelockedStakedObjects.reduce(
-            (acc, current) => acc + current.stakedIota.principal.value,
-            0,
-        );
+        let totalStaked: number = 0;
+        for (const timelockedStakedObject of timelockedStakedObjects) {
+            const stakesAmount = timelockedStakedObject.stakes.reduce(
+                (acc, current) => acc + Number(current.principal),
+                0,
+            );
+            totalStaked += stakesAmount;
+        }
+
         expect(vestingOverview.totalStaked).toEqual(totalStaked);
 
         // In this scenario there are no objects to stake or claim because they are all staked
@@ -215,9 +221,16 @@ describe('vesting overview', () => {
         expect(vestingOverview.totalLocked).toEqual(lockedAmount);
         expect(vestingOverview.totalUnlocked).toEqual(totalAmount - lockedAmount);
 
-        const totalStaked = mixedObjects
-            .filter(isTimelockedStakedIota)
-            .reduce((acc, current) => acc + current.stakedIota.principal.value, 0);
+        const timelockedStakedObjects = mixedObjects.filter(isTimelockedStakedIota);
+        let totalStaked: number = 0;
+        for (const timelockedStakedObject of timelockedStakedObjects) {
+            const stakesAmount = timelockedStakedObject.stakes.reduce(
+                (acc, current) => acc + Number(current.principal),
+                0,
+            );
+            totalStaked += stakesAmount;
+        }
+
         expect(vestingOverview.totalStaked).toEqual(totalStaked);
 
         const timelockObjects = mixedObjects.filter(isTimelockedObject);
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 3ff9789c359..8152e83dd01 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -16,13 +16,12 @@ import {
     SupplyIncreaseVestingPortfolio,
     TimelockedIotaResponse,
     TimelockedObject,
-    TimelockedStakedIota,
     VestingOverview,
 } from '../../interfaces';
 import { isTimelockedObject, isTimelockedStakedIota } from '../timelock';
 
 export function getLastSupplyIncreaseVestingPayout(
-    objects: (TimelockedObject | TimelockedStakedIota)[],
+    objects: (TimelockedObject | DelegatedTimelockedStake)[],
 ): SupplyIncreaseVestingPayout | undefined {
     const vestingObjects = objects.filter(isSupplyIncreaseVestingObject);
 
@@ -37,36 +36,48 @@ export function getLastSupplyIncreaseVestingPayout(
     return payouts.sort((a, b) => b.expirationTimestampMs - a.expirationTimestampMs)[0];
 }
 
+function addVestingPayoutToSupplyIncreaseMap(
+    value: number,
+    expirationTimestampMs: number,
+    supplyIncreaseMap: Map<number, SupplyIncreaseVestingPayout>,
+) {
+    if (!supplyIncreaseMap.has(expirationTimestampMs)) {
+        supplyIncreaseMap.set(expirationTimestampMs, {
+            amount: value,
+            expirationTimestampMs: expirationTimestampMs,
+        });
+    } else {
+        const vestingPayout = supplyIncreaseMap.get(expirationTimestampMs);
+        if (vestingPayout) {
+            vestingPayout.amount += value;
+            supplyIncreaseMap.set(expirationTimestampMs, vestingPayout);
+        }
+    }
+}
+
 function supplyIncreaseVestingObjectsToPayoutMap(
-    vestingObjects: (TimelockedObject | TimelockedStakedIota)[],
+    vestingObjects: (TimelockedObject | DelegatedTimelockedStake)[],
 ): Map<number, SupplyIncreaseVestingPayout> {
     const expirationToVestingPayout = new Map<number, SupplyIncreaseVestingPayout>();
 
     for (const vestingObject of vestingObjects) {
-        let objectValue = 0;
         if (isTimelockedObject(vestingObject)) {
-            objectValue = (vestingObject as TimelockedObject).locked.value;
-        } else if (isTimelockedStakedIota(vestingObject)) {
-            objectValue = (vestingObject as TimelockedStakedIota).stakedIota.principal.value;
-        }
-
-        if (!expirationToVestingPayout.has(vestingObject.expirationTimestampMs)) {
-            expirationToVestingPayout.set(vestingObject.expirationTimestampMs, {
-                amount: objectValue,
-                expirationTimestampMs: vestingObject.expirationTimestampMs,
-            });
-        } else {
-            const vestingPayout = expirationToVestingPayout.get(
+            const objectValue = (vestingObject as TimelockedObject).locked.value;
+            addVestingPayoutToSupplyIncreaseMap(
+                objectValue,
                 vestingObject.expirationTimestampMs,
+                expirationToVestingPayout,
             );
-
-            if (!vestingPayout) {
-                continue;
+        } else if (isTimelockedStakedIota(vestingObject)) {
+            for (const vestingStake of vestingObject.stakes) {
+                const objectValue = Number(vestingStake.principal);
+                const expirationTimestampMs = Number(vestingStake.expirationTimestampMs);
+                addVestingPayoutToSupplyIncreaseMap(
+                    objectValue,
+                    expirationTimestampMs,
+                    expirationToVestingPayout,
+                );
             }
-
-            vestingPayout.amount += objectValue;
-
-            expirationToVestingPayout.set(vestingObject.expirationTimestampMs, vestingPayout);
         }
     }
 
@@ -111,7 +122,7 @@ export function buildSupplyIncreaseVestingSchedule(
 }
 
 export function getVestingOverview(
-    objects: (TimelockedObject | TimelockedStakedIota)[],
+    objects: (TimelockedObject | DelegatedTimelockedStake)[],
     currentEpochTimestamp: number,
 ): VestingOverview {
     const vestingObjects = objects.filter(isSupplyIncreaseVestingObject);
@@ -143,10 +154,14 @@ export function getVestingOverview(
     const totalUnlockedVestedAmount = totalVestedAmount - totalLockedAmount;
 
     const timelockedStakedObjects = vestingObjects.filter(isTimelockedStakedIota);
-    const totalStaked = timelockedStakedObjects.reduce(
-        (acc, current) => acc + current.stakedIota.principal.value,
-        0,
-    );
+    let totalStaked: number = 0;
+    for (const timelockedStakedObject of timelockedStakedObjects) {
+        const stakesAmount = timelockedStakedObject.stakes.reduce(
+            (acc, current) => acc + Number(current.principal),
+            0,
+        );
+        totalStaked += stakesAmount;
+    }
 
     const timelockedObjects = vestingObjects.filter(isTimelockedObject);
 
@@ -204,31 +219,14 @@ export function mapTimelockObjects(iotaObjects: IotaObjectData[]): TimelockedObj
     });
 }
 
-export function timelockObjectsFromIotaObjects(
-    stakedTimelockedObjects: DelegatedTimelockedStake[],
-): TimelockedStakedIota[] {
-    const result: TimelockedStakedIota[] = [];
-    stakedTimelockedObjects.map((stakedTimelockedObject) => {
-        const stakeMapped: TimelockedStakedIota[] = stakedTimelockedObject.stakes.map((stake) => {
-            return {
-                id: { id: stake.timelockedStakedIotaId },
-                expirationTimestampMs: Number(stake.expirationTimestampMs),
-                stakedIota: {
-                    id: { id: stake.timelockedStakedIotaId },
-                    poolId: stakedTimelockedObject.stakingPool,
-                    stakeActivationEpoch: Number(stake.stakeRequestEpoch),
-                    principal: { value: Number(stake.principal) },
-                },
-                label: stake.label,
-            };
-        });
-        result.push(...stakeMapped);
-    });
-    return result;
-}
-
 export function isSupplyIncreaseVestingObject(
-    obj: TimelockedObject | TimelockedStakedIota,
+    obj: TimelockedObject | DelegatedTimelockedStake,
 ): boolean {
-    return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
+    if (isTimelockedObject(obj)) {
+        return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
+    } else if (isTimelockedStakedIota(obj)) {
+        return obj.stakes.some((stake) => stake.label === SUPPLY_INCREASE_VESTING_LABEL);
+    } else {
+        return false;
+    }
 }

From 2647a1498c13b8170e2d05b0afc57d1fdc707733 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 13 Aug 2024 18:49:50 +0200
Subject: [PATCH 33/68] feat(wallet-dashboard): add hook to get validators info

---
 apps/core/src/hooks/index.ts                   |  1 +
 .../src/hooks/useGetActiveValidatorsInfo.ts    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 apps/core/src/hooks/useGetActiveValidatorsInfo.ts

diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index ba5ebd01283..7592478c7e0 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -36,5 +36,6 @@ export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
 export * from './useGetAllOwnedObjects';
 export * from './useGetStakedTimelockedObjects';
+export * from './useGetActiveValidatorsInfo';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useGetActiveValidatorsInfo.ts b/apps/core/src/hooks/useGetActiveValidatorsInfo.ts
new file mode 100644
index 00000000000..02363a5d36c
--- /dev/null
+++ b/apps/core/src/hooks/useGetActiveValidatorsInfo.ts
@@ -0,0 +1,18 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { useIotaClient } from '@iota/dapp-kit';
+import { useQuery } from '@tanstack/react-query';
+
+export function useGetActiveValidatorsInfo() {
+    const client = useIotaClient();
+    return useQuery({
+        // eslint-disable-next-line @tanstack/query/exhaustive-deps
+        queryKey: ['get-active-validators-info'],
+        queryFn: async () => {
+            const iotaSystemState = await client.getLatestIotaSystemState();
+            return iotaSystemState.activeValidators;
+        },
+        staleTime: 10 * 60 * 1000, // 10 minutes
+    });
+}

From c8251c503a9cdd9d9f7728cc3de31c5039d177c2 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 13 Aug 2024 18:50:16 +0200
Subject: [PATCH 34/68] feat(wallet-dashboard): group and display timelocked
 stakes

---
 .../app/dashboard/vesting/page.tsx            | 92 ++++++++++++++-----
 1 file changed, 68 insertions(+), 24 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 724896dff7c..adf9a13a5cb 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -3,18 +3,22 @@
 
 'use client';
 
+import { Button } from '@/components';
 import { useGetCurrentEpochStartTimestamp } from '@/hooks';
 import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
 import {
     TIMELOCK_IOTA_TYPE,
+    useGetActiveValidatorsInfo,
     useGetAllOwnedObjects,
     useGetStakedTimelockedObjects,
 } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
+import { DelegatedTimelockedStake } from '@iota/iota-sdk/client';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
+    const { data: activeValidators } = useGetActiveValidatorsInfo();
     const { data: timelockedObjects } = useGetAllOwnedObjects(account?.address || '', {
         StructType: TIMELOCK_IOTA_TYPE,
     });
@@ -26,35 +30,75 @@ function VestingDashboardPage(): JSX.Element {
         Number(currentEpochMs),
     );
 
+    function getValidatorName(validatorAddress: string): string {
+        return (
+            activeValidators?.find(
+                (activeValidator) => activeValidator.iotaAddress === validatorAddress,
+            )?.name || '-'
+        );
+    }
+
+    function handleUnstake(delegatedTimelocked: DelegatedTimelockedStake): void {
+        // TODO: handle unstake logic
+        console.info('delegatedTimelocked', delegatedTimelocked);
+    }
+
     return (
-        <div className="flex flex-col items-center justify-center space-y-4 pt-12">
-            <h1>VESTING</h1>
-            <div className="flex flex-row space-x-4">
-                <div className="flex flex-col items-center rounded-lg border p-4">
-                    <span>Total Vested</span>
-                    <span>{vestingSchedule.totalVested}</span>
-                </div>
-                <div className="flex flex-col items-center rounded-lg border p-4">
-                    <span>Total Locked</span>
-                    <span>{vestingSchedule.totalLocked}</span>
+        <div className="flex flex-row">
+            <div className="flex w-1/2 flex-col items-center justify-center space-y-4 pt-12">
+                <h1>VESTING</h1>
+                <div className="flex flex-row space-x-4">
+                    <div className="flex flex-col items-center rounded-lg border p-4">
+                        <span>Total Vested</span>
+                        <span>{vestingSchedule.totalVested}</span>
+                    </div>
+                    <div className="flex flex-col items-center rounded-lg border p-4">
+                        <span>Total Locked</span>
+                        <span>{vestingSchedule.totalLocked}</span>
+                    </div>
                 </div>
-                <div className="flex flex-col items-center rounded-lg border p-4">
-                    <span>Total Unlocked</span>
-                    <span>{vestingSchedule.totalUnlocked}</span>
-                </div>
-                <div className="flex flex-col items-center rounded-lg border p-4">
-                    <span>Total Staked</span>
-                    <span>{vestingSchedule.totalStaked}</span>
+                <hr />
+                <div className="flex flex-row space-x-4">
+                    <div className="flex flex-col items-center rounded-lg border p-4">
+                        <span>Available Claiming</span>
+                        <span>{vestingSchedule.availableClaiming}</span>
+                    </div>
+                    <div className="flex flex-col items-center rounded-lg border p-4">
+                        <span>Available Staking</span>
+                        <span>{vestingSchedule.availableStaking}</span>
+                    </div>
                 </div>
             </div>
-            <div className="flex flex-row space-x-4">
-                <div className="flex flex-col items-center rounded-lg border p-4">
-                    <span>Available Claiming</span>
-                    <span>{vestingSchedule.availableClaiming}</span>
+            <div className="flex w-1/2 flex-col items-center justify-center space-y-4 pt-12">
+                <h1>Staked Vesting</h1>
+                <div className="flex flex-row space-x-4">
+                    <div className="flex flex-col items-center rounded-lg border p-4">
+                        <span>Your stake</span>
+                        <span>{vestingSchedule.totalStaked}</span>
+                    </div>
+                    <div className="flex flex-col items-center rounded-lg border p-4">
+                        <span>Total Unlocked</span>
+                        <span>{vestingSchedule.totalUnlocked}</span>
+                    </div>
                 </div>
-                <div className="flex flex-col items-center rounded-lg border p-4">
-                    <span>Available Staking</span>
-                    <span>{vestingSchedule.availableStaking}</span>
+                <div className="flex w-full flex-col items-center justify-center space-y-4 pt-4">
+                    {stakedTimelockedObjects?.map((stakedTimelockedObject) => {
+                        return (
+                            <div
+                                key={stakedTimelockedObject.stakingPool}
+                                className="flex w-full flex-row items-center justify-center space-x-4"
+                            >
+                                <span>
+                                    {getValidatorName(stakedTimelockedObject.validatorAddress)}
+                                </span>
+                                <span>Stakes: {stakedTimelockedObject.stakes.length}</span>
+
+                                <Button onClick={() => handleUnstake(stakedTimelockedObject)}>
+                                    Unstake
+                                </Button>
+                            </div>
+                        );
+                    })}
                 </div>
             </div>
         </div>

From 6194c7423ff8d43f823ae45febd983d93759cc6b Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 13 Aug 2024 19:30:51 +0200
Subject: [PATCH 35/68] feat(wallet-dashboard): hook timelocked unstaking
 feature

---
 .../createTimelockedUnstakeTransaction.ts     | 25 ++++++++
 apps/core/src/utils/stake/index.ts            |  1 +
 .../app/dashboard/vesting/page.tsx            | 36 +++++++----
 .../VestingPopup/TimelockedUnstakePopup.tsx   | 64 +++++++++++++++++++
 .../Popup/Popups/VestingPopup/index.ts        |  4 ++
 .../components/Popup/Popups/index.ts          |  1 +
 apps/wallet-dashboard/hooks/index.ts          |  1 +
 .../hooks/useTimelockedUnstakeTransaction.ts  | 31 +++++++++
 8 files changed, 152 insertions(+), 11 deletions(-)
 create mode 100644 apps/core/src/utils/stake/createTimelockedUnstakeTransaction.ts
 create mode 100644 apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
 create mode 100644 apps/wallet-dashboard/components/Popup/Popups/VestingPopup/index.ts
 create mode 100644 apps/wallet-dashboard/hooks/useTimelockedUnstakeTransaction.ts

diff --git a/apps/core/src/utils/stake/createTimelockedUnstakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedUnstakeTransaction.ts
new file mode 100644
index 00000000000..79e618fef6a
--- /dev/null
+++ b/apps/core/src/utils/stake/createTimelockedUnstakeTransaction.ts
@@ -0,0 +1,25 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { TransactionBlock } from '@iota/iota-sdk/transactions';
+import { IOTA_SYSTEM_STATE_OBJECT_ID } from '@iota/iota-sdk/utils';
+
+export function createTimelockedUnstakeTransaction(timelockedStakedObjectIds: string[]) {
+    const tx = new TransactionBlock();
+    // TODO: check the max tx limit per ptb
+    for (const timelockedStakedObjectId of timelockedStakedObjectIds) {
+        tx.moveCall({
+            target: `0x3::timelocked_staking::request_withdraw_stake`,
+            arguments: [
+                tx.sharedObjectRef({
+                    objectId: IOTA_SYSTEM_STATE_OBJECT_ID,
+                    initialSharedVersion: 1,
+                    mutable: true,
+                }),
+                tx.object(timelockedStakedObjectId),
+            ],
+        });
+    }
+
+    return tx;
+}
diff --git a/apps/core/src/utils/stake/index.ts b/apps/core/src/utils/stake/index.ts
index 7afbfdee3e8..1d03b413bff 100644
--- a/apps/core/src/utils/stake/index.ts
+++ b/apps/core/src/utils/stake/index.ts
@@ -4,3 +4,4 @@
 export * from './createUnstakeTransaction';
 export * from './formatDelegatedStake';
 export * from './createStakeTransaction';
+export * from './createTimelockedUnstakeTransaction';
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index adf9a13a5cb..f7178aec4b8 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -3,9 +3,10 @@
 
 'use client';
 
-import { Button } from '@/components';
-import { useGetCurrentEpochStartTimestamp } from '@/hooks';
+import { Button, TimelockedUnstakePopup } from '@/components';
+import { useGetCurrentEpochStartTimestamp, useNotifications, usePopups } from '@/hooks';
 import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
+import { NotificationType } from '@/stores/notificationStore';
 import {
     TIMELOCK_IOTA_TYPE,
     useGetActiveValidatorsInfo,
@@ -13,10 +14,12 @@ import {
     useGetStakedTimelockedObjects,
 } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
-import { DelegatedTimelockedStake } from '@iota/iota-sdk/client';
+import { DelegatedTimelockedStake, IotaValidatorSummary } from '@iota/iota-sdk/client';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
+    const { addNotification } = useNotifications();
+    const { openPopup, closePopup } = usePopups();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
     const { data: activeValidators } = useGetActiveValidatorsInfo();
     const { data: timelockedObjects } = useGetAllOwnedObjects(account?.address || '', {
@@ -30,17 +33,27 @@ function VestingDashboardPage(): JSX.Element {
         Number(currentEpochMs),
     );
 
-    function getValidatorName(validatorAddress: string): string {
-        return (
-            activeValidators?.find(
-                (activeValidator) => activeValidator.iotaAddress === validatorAddress,
-            )?.name || '-'
+    function getValidatorByAddress(validatorAddress: string): IotaValidatorSummary | undefined {
+        return activeValidators?.find(
+            (activeValidator) => activeValidator.iotaAddress === validatorAddress,
         );
     }
 
     function handleUnstake(delegatedTimelocked: DelegatedTimelockedStake): void {
-        // TODO: handle unstake logic
-        console.info('delegatedTimelocked', delegatedTimelocked);
+        const validatorInfo = getValidatorByAddress(delegatedTimelocked.validatorAddress);
+        if (!account || !validatorInfo) {
+            addNotification('Cannot create transaction', NotificationType.Error);
+            return;
+        }
+
+        openPopup(
+            <TimelockedUnstakePopup
+                accountAddress={account.address}
+                delegatedStake={delegatedTimelocked}
+                validatorInfo={validatorInfo}
+                closePopup={closePopup}
+            />,
+        );
     }
 
     return (
@@ -89,7 +102,8 @@ function VestingDashboardPage(): JSX.Element {
                                 className="flex w-full flex-row items-center justify-center space-x-4"
                             >
                                 <span>
-                                    {getValidatorName(stakedTimelockedObject.validatorAddress)}
+                                    {getValidatorByAddress(stakedTimelockedObject.validatorAddress)
+                                        ?.name || '-'}
                                 </span>
                                 <span>Stakes: {stakedTimelockedObject.stakes.length}</span>
 
diff --git a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
new file mode 100644
index 00000000000..559e6ec9cda
--- /dev/null
+++ b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
@@ -0,0 +1,64 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import React from 'react';
+import { Button } from '@/components';
+import { useTimelockedUnstakeTransaction } from '@/hooks';
+import { useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
+import { DelegatedTimelockedStake, IotaValidatorSummary } from '@iota/iota-sdk/client';
+
+interface UnstakePopupProps {
+    accountAddress: string;
+    delegatedStake: DelegatedTimelockedStake;
+    validatorInfo: IotaValidatorSummary;
+    closePopup: () => void;
+}
+
+function TimelockedUnstakePopup({
+    accountAddress,
+    delegatedStake,
+    validatorInfo,
+    closePopup,
+}: UnstakePopupProps): JSX.Element {
+    const objectIds = delegatedStake.stakes.map((stake) => stake.timelockedStakedIotaId);
+    const { data: timelockedUnstake } = useTimelockedUnstakeTransaction(objectIds, accountAddress);
+    const { mutateAsync: signAndExecuteTransactionBlock, isPending } =
+        useSignAndExecuteTransactionBlock();
+
+    async function handleTimelockedUnstake(): Promise<void> {
+        if (!timelockedUnstake) return;
+        await signAndExecuteTransactionBlock({
+            transactionBlock: timelockedUnstake.transaction,
+        });
+        closePopup();
+    }
+
+    return (
+        <div className="flex min-w-[300px] flex-col gap-2">
+            <p>Validator Name: {validatorInfo.name}</p>
+            <p>Validator Address: {delegatedStake.validatorAddress}</p>
+            <p>Rewards: {validatorInfo.rewardsPool}</p>
+            <p>Total Stakes: {delegatedStake.stakes.length}</p>
+            {delegatedStake.stakes.map((stake, index) => {
+                return (
+                    <div key={stake.timelockedStakedIotaId} className="m-4 flex flex-col">
+                        <span>
+                            Stake {index + 1}: {stake.timelockedStakedIotaId}
+                        </span>
+                        <span>Expiration time: {stake.expirationTimestampMs}</span>
+                        <span>Label: {stake.label}</span>
+                        <span>Status: {stake.status}</span>
+                    </div>
+                );
+            })}
+            <p>Gas Fees: {timelockedUnstake?.gasBudget?.toString() || '--'}</p>
+            {isPending ? (
+                <Button disabled>Loading...</Button>
+            ) : (
+                <Button onClick={handleTimelockedUnstake}>Confirm Unstake</Button>
+            )}
+        </div>
+    );
+}
+
+export default TimelockedUnstakePopup;
diff --git a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/index.ts b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/index.ts
new file mode 100644
index 00000000000..2a8ca3b61df
--- /dev/null
+++ b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/index.ts
@@ -0,0 +1,4 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export { default as TimelockedUnstakePopup } from './TimelockedUnstakePopup';
diff --git a/apps/wallet-dashboard/components/Popup/Popups/index.ts b/apps/wallet-dashboard/components/Popup/Popups/index.ts
index 9388fb78536..095ffa1220a 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/index.ts
+++ b/apps/wallet-dashboard/components/Popup/Popups/index.ts
@@ -9,4 +9,5 @@ export { default as SendCoinPopup } from './SendCoinPopup/SendCoinPopup';
 export { default as SendAssetPopup } from './SendAssetPopup';
 
 export * from './SendCoinPopup';
+export * from './VestingPopup';
 export * from './NewStakePopup';
diff --git a/apps/wallet-dashboard/hooks/index.ts b/apps/wallet-dashboard/hooks/index.ts
index d331f08a80d..07ccfe796f8 100644
--- a/apps/wallet-dashboard/hooks/index.ts
+++ b/apps/wallet-dashboard/hooks/index.ts
@@ -8,3 +8,4 @@ export * from './useNotifications';
 export * from './useSendCoinTransaction';
 export * from './useCreateSendAssetTransaction';
 export * from './useGetCurrentEpochStartTimestamp';
+export * from './useTimelockedUnstakeTransaction';
diff --git a/apps/wallet-dashboard/hooks/useTimelockedUnstakeTransaction.ts b/apps/wallet-dashboard/hooks/useTimelockedUnstakeTransaction.ts
new file mode 100644
index 00000000000..c7d1152e2da
--- /dev/null
+++ b/apps/wallet-dashboard/hooks/useTimelockedUnstakeTransaction.ts
@@ -0,0 +1,31 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { createTimelockedUnstakeTransaction } from '@iota/core';
+import { useIotaClient } from '@iota/dapp-kit';
+import { useQuery } from '@tanstack/react-query';
+
+export function useTimelockedUnstakeTransaction(
+    timelockedStakedObjectIds: string[],
+    senderAddress: string,
+) {
+    const client = useIotaClient();
+    return useQuery({
+        // eslint-disable-next-line @tanstack/query/exhaustive-deps
+        queryKey: ['timelocked-unstake-transaction', timelockedStakedObjectIds, senderAddress],
+        queryFn: async () => {
+            const transaction = createTimelockedUnstakeTransaction(timelockedStakedObjectIds);
+            transaction.setSender(senderAddress);
+            await transaction.build({ client });
+            return transaction;
+        },
+        enabled: !!timelockedStakedObjectIds && !!senderAddress,
+        gcTime: 0,
+        select: (transaction) => {
+            return {
+                transaction,
+                gasBudget: transaction.blockData.gasConfig.budget,
+            };
+        },
+    });
+}

From fb4e48e0eb3850ab7e4da049742e8444942c03a9 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Fri, 16 Aug 2024 08:46:39 +0200
Subject: [PATCH 36/68] fix(wallet-dashboard): invalidate query to fetch staked
 timelocked object after sign the tx

---
 .../Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
index 559e6ec9cda..b808b97f406 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
@@ -6,6 +6,7 @@ import { Button } from '@/components';
 import { useTimelockedUnstakeTransaction } from '@/hooks';
 import { useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
 import { DelegatedTimelockedStake, IotaValidatorSummary } from '@iota/iota-sdk/client';
+import { useQueryClient } from '@tanstack/react-query';
 
 interface UnstakePopupProps {
     accountAddress: string;
@@ -21,6 +22,7 @@ function TimelockedUnstakePopup({
     closePopup,
 }: UnstakePopupProps): JSX.Element {
     const objectIds = delegatedStake.stakes.map((stake) => stake.timelockedStakedIotaId);
+    const queryClient = useQueryClient();
     const { data: timelockedUnstake } = useTimelockedUnstakeTransaction(objectIds, accountAddress);
     const { mutateAsync: signAndExecuteTransactionBlock, isPending } =
         useSignAndExecuteTransactionBlock();
@@ -30,6 +32,9 @@ function TimelockedUnstakePopup({
         await signAndExecuteTransactionBlock({
             transactionBlock: timelockedUnstake.transaction,
         });
+        queryClient.invalidateQueries({
+            queryKey: ['get-staked-timelocked-objects'],
+        });
         closePopup();
     }
 

From fb1a8ee7e845392a8ba172b1c4301bf0e7ecae5e Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 19 Aug 2024 10:41:30 +0200
Subject: [PATCH 37/68] fix(wallet-dashboard): update delegated staked
 timelocked interface

---
 .../app/dashboard/vesting/page.tsx            | 11 ++-
 apps/wallet-dashboard/lib/utils/timelock.ts   | 61 +++++++++++++---
 .../lib/utils/vesting/vesting.ts              | 71 ++++++-------------
 3 files changed, 83 insertions(+), 60 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index fbd95ace6c7..6b4f799e576 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -5,7 +5,12 @@
 
 import { Button } from '@/components';
 import { useGetCurrentEpochStartTimestamp, useNotifications } from '@/hooks';
-import { getVestingOverview, isTimelockedUnlocked, mapTimelockObjects } from '@/lib/utils';
+import {
+    formatDelegatedTimelockedStake,
+    getVestingOverview,
+    isTimelockedUnlocked,
+    mapTimelockObjects,
+} from '@/lib/utils';
 import { NotificationType } from '@/stores/notificationStore';
 import {
     TIMELOCK_IOTA_TYPE,
@@ -29,8 +34,10 @@ function VestingDashboardPage(): JSX.Element {
     const { mutateAsync: signAndExecuteTransactionBlock } = useSignAndExecuteTransactionBlock();
 
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
+    const stakedTimelockedMapped = formatDelegatedTimelockedStake(stakedTimelockedObjects || []);
+
     const vestingSchedule = getVestingOverview(
-        [...timelockedMapped, ...(stakedTimelockedObjects || [])],
+        [...timelockedMapped, ...stakedTimelockedMapped],
         Number(currentEpochMs),
     );
 
diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index b3590368b5b..181e72cd6bc 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -1,26 +1,71 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { DelegatedTimelockedStake } from '@iota/iota-sdk/client';
-import { TimelockedObject } from '../interfaces';
+import { DelegatedTimelockedStake, TimelockedStake, IotaObjectData } from '@iota/iota-sdk/client';
+import { TimelockedIotaResponse, TimelockedObject } from '../interfaces';
+
+export type ExtendedDelegatedTimelockedStake = TimelockedStake & {
+    validatorAddress: string;
+    stakingPool: string;
+};
 
 export function isTimelockedStakedIota(
-    obj: TimelockedObject | DelegatedTimelockedStake,
-): obj is DelegatedTimelockedStake {
-    const referenceProperty: keyof DelegatedTimelockedStake = 'stakes';
+    obj: TimelockedObject | ExtendedDelegatedTimelockedStake,
+): obj is ExtendedDelegatedTimelockedStake {
+    const referenceProperty: keyof ExtendedDelegatedTimelockedStake = 'timelockedStakedIotaId';
     return referenceProperty in obj;
 }
 
 export function isTimelockedObject(
-    obj: TimelockedObject | DelegatedTimelockedStake,
+    obj: TimelockedObject | ExtendedDelegatedTimelockedStake,
 ): obj is TimelockedObject {
     const referenceProperty: keyof TimelockedObject = 'locked';
     return referenceProperty in obj;
 }
 
 export function isTimelockedUnlocked(
-    timelockedObject: TimelockedObject | DelegatedTimelockedStake,
+    timelockedObject: TimelockedObject | ExtendedDelegatedTimelockedStake,
     currentEpochMs: number,
 ): boolean {
-    return timelockedObject.expirationTimestampMs <= currentEpochMs;
+    return Number(timelockedObject.expirationTimestampMs) <= currentEpochMs;
+}
+
+export function mapTimelockObjects(iotaObjects: IotaObjectData[]): TimelockedObject[] {
+    return iotaObjects.map((iotaObject) => {
+        if (!iotaObject?.content?.dataType || iotaObject.content.dataType !== 'moveObject') {
+            return {
+                id: { id: '' },
+                locked: { value: 0 },
+                expirationTimestampMs: 0,
+            };
+        }
+        const fields = iotaObject.content.fields as unknown as TimelockedIotaResponse;
+        return {
+            id: fields.id,
+            locked: { value: Number(fields.locked) },
+            expirationTimestampMs: Number(fields.expiration_timestamp_ms),
+            label: fields.label,
+        };
+    });
+}
+
+export function formatDelegatedTimelockedStake(
+    delegatedTimelockedStakeData: DelegatedTimelockedStake[],
+): ExtendedDelegatedTimelockedStake[] {
+    return delegatedTimelockedStakeData.flatMap((delegatedTimelockedStake) => {
+        return delegatedTimelockedStake.stakes.map((stake) => {
+            return {
+                validatorAddress: delegatedTimelockedStake.validatorAddress,
+                stakingPool: delegatedTimelockedStake.stakingPool,
+                estimatedReward: stake.status === 'Active' ? stake.estimatedReward : '',
+                stakeActiveEpoch: stake.stakeActiveEpoch,
+                stakeRequestEpoch: stake.stakeRequestEpoch,
+                status: stake.status,
+                timelockedStakedIotaId: stake.timelockedStakedIotaId,
+                principal: stake.principal,
+                expirationTimestampMs: stake.expirationTimestampMs,
+                label: stake.label,
+            };
+        });
+    });
 }
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 8152e83dd01..f5bdb3cacb1 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -1,7 +1,6 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { DelegatedTimelockedStake, IotaObjectData } from '@iota/iota-sdk/client';
 import {
     SUPPLY_INCREASE_INVESTOR_VESTING_DURATION,
     SUPPLY_INCREASE_STAKER_VESTING_DURATION,
@@ -14,14 +13,17 @@ import {
     SupplyIncreaseUserType,
     SupplyIncreaseVestingPayout,
     SupplyIncreaseVestingPortfolio,
-    TimelockedIotaResponse,
     TimelockedObject,
     VestingOverview,
 } from '../../interfaces';
-import { isTimelockedObject, isTimelockedStakedIota } from '../timelock';
+import {
+    ExtendedDelegatedTimelockedStake,
+    isTimelockedObject,
+    isTimelockedStakedIota,
+} from '../timelock';
 
 export function getLastSupplyIncreaseVestingPayout(
-    objects: (TimelockedObject | DelegatedTimelockedStake)[],
+    objects: (TimelockedObject | ExtendedDelegatedTimelockedStake)[],
 ): SupplyIncreaseVestingPayout | undefined {
     const vestingObjects = objects.filter(isSupplyIncreaseVestingObject);
 
@@ -56,7 +58,7 @@ function addVestingPayoutToSupplyIncreaseMap(
 }
 
 function supplyIncreaseVestingObjectsToPayoutMap(
-    vestingObjects: (TimelockedObject | DelegatedTimelockedStake)[],
+    vestingObjects: (TimelockedObject | ExtendedDelegatedTimelockedStake)[],
 ): Map<number, SupplyIncreaseVestingPayout> {
     const expirationToVestingPayout = new Map<number, SupplyIncreaseVestingPayout>();
 
@@ -69,15 +71,13 @@ function supplyIncreaseVestingObjectsToPayoutMap(
                 expirationToVestingPayout,
             );
         } else if (isTimelockedStakedIota(vestingObject)) {
-            for (const vestingStake of vestingObject.stakes) {
-                const objectValue = Number(vestingStake.principal);
-                const expirationTimestampMs = Number(vestingStake.expirationTimestampMs);
-                addVestingPayoutToSupplyIncreaseMap(
-                    objectValue,
-                    expirationTimestampMs,
-                    expirationToVestingPayout,
-                );
-            }
+            const objectValue = Number(vestingObject.principal);
+            const expirationTimestampMs = Number(vestingObject.expirationTimestampMs);
+            addVestingPayoutToSupplyIncreaseMap(
+                objectValue,
+                expirationTimestampMs,
+                expirationToVestingPayout,
+            );
         }
     }
 
@@ -122,7 +122,7 @@ export function buildSupplyIncreaseVestingSchedule(
 }
 
 export function getVestingOverview(
-    objects: (TimelockedObject | DelegatedTimelockedStake)[],
+    objects: (TimelockedObject | ExtendedDelegatedTimelockedStake)[],
     currentEpochTimestamp: number,
 ): VestingOverview {
     const vestingObjects = objects.filter(isSupplyIncreaseVestingObject);
@@ -154,14 +154,10 @@ export function getVestingOverview(
     const totalUnlockedVestedAmount = totalVestedAmount - totalLockedAmount;
 
     const timelockedStakedObjects = vestingObjects.filter(isTimelockedStakedIota);
-    let totalStaked: number = 0;
-    for (const timelockedStakedObject of timelockedStakedObjects) {
-        const stakesAmount = timelockedStakedObject.stakes.reduce(
-            (acc, current) => acc + Number(current.principal),
-            0,
-        );
-        totalStaked += stakesAmount;
-    }
+    const totalStaked = timelockedStakedObjects.reduce(
+        (acc, current) => acc + Number(current.principal),
+        0,
+    );
 
     const timelockedObjects = vestingObjects.filter(isTimelockedObject);
 
@@ -200,33 +196,8 @@ export function getSupplyIncreaseVestingPayoutsCount(userType: SupplyIncreaseUse
     return SUPPLY_INCREASE_VESTING_PAYOUTS_IN_1_YEAR * vestingDuration;
 }
 
-export function mapTimelockObjects(iotaObjects: IotaObjectData[]): TimelockedObject[] {
-    return iotaObjects.map((iotaObject) => {
-        if (!iotaObject?.content?.dataType || iotaObject.content.dataType !== 'moveObject') {
-            return {
-                id: { id: '' },
-                locked: { value: 0 },
-                expirationTimestampMs: 0,
-            };
-        }
-        const fields = iotaObject.content.fields as unknown as TimelockedIotaResponse;
-        return {
-            id: fields.id,
-            locked: { value: Number(fields.locked) },
-            expirationTimestampMs: Number(fields.expiration_timestamp_ms),
-            label: fields.label,
-        };
-    });
-}
-
 export function isSupplyIncreaseVestingObject(
-    obj: TimelockedObject | DelegatedTimelockedStake,
+    obj: TimelockedObject | ExtendedDelegatedTimelockedStake,
 ): boolean {
-    if (isTimelockedObject(obj)) {
-        return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
-    } else if (isTimelockedStakedIota(obj)) {
-        return obj.stakes.some((stake) => stake.label === SUPPLY_INCREASE_VESTING_LABEL);
-    } else {
-        return false;
-    }
+    return obj.label === SUPPLY_INCREASE_VESTING_LABEL;
 }

From c3f0c5ad123cbc5046a5b261588aac04a75c748f Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Wed, 21 Aug 2024 17:28:02 +0200
Subject: [PATCH 38/68] feat: add timlocked staking transaction

---
 .../stake/createTimelockedStakeTransaction.ts | 76 ++++++++++++++++
 apps/core/src/utils/stake/index.ts            |  1 +
 .../app/dashboard/vesting/page.tsx            |  7 +-
 .../Popups/NewStakePopup/NewStakePopup.tsx    | 15 ++-
 apps/wallet-dashboard/hooks/index.ts          |  1 +
 .../useCreateTimelockedStakingTransaction.ts  | 91 +++++++++++++++++++
 .../lib/constants/vesting.constants.ts        |  2 +
 .../lib/utils/vesting/vesting.ts              | 88 ++++++++++++++++++
 8 files changed, 278 insertions(+), 3 deletions(-)
 create mode 100644 apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
 create mode 100644 apps/wallet-dashboard/hooks/useCreateTimelockedStakingTransaction.ts

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
new file mode 100644
index 00000000000..455050ea6f5
--- /dev/null
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -0,0 +1,76 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { TransactionBlock, TransactionObjectArgument } from '@iota/iota-sdk/transactions';
+import { IOTA_SYSTEM_STATE_OBJECT_ID, IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
+
+export interface VestingObject {
+    objectId: string;
+    expirationTimestamp: string;
+    totalLockedAmount: bigint;
+    objectIds: string[];
+    label?: string;
+    splitAmount?: bigint;
+}
+
+export function createTimelockedStakeTransaction(
+    vestingObjects: VestingObject[],
+    validatorAddress: string,
+) {
+    const tx = new TransactionBlock();
+    /**
+     * Create tranasctions to merge Vesting Objects that need merging
+     */
+    const mergeObjects = vestingObjects.filter((obj) => obj.objectIds.length > 1);
+
+    for (const mergeObject of mergeObjects) {
+        // create an array of objectIds to be merged without the first element because first element is the principal object and its id is contained in mergeObject.objectId
+        const mergeObjectIds = mergeObject.objectIds
+            .slice(1)
+            .map((objectId) => tx.object(objectId));
+        tx.moveCall({
+            target: `0x02::timelock::join_vec`,
+            typeArguments: [`${IOTA_TYPE_ARG}`],
+            arguments: [
+                tx.object(mergeObject.objectId),
+                tx.makeMoveVec({ objects: mergeObjectIds }),
+            ],
+        });
+    }
+    /**
+     * Create tranasctions to split Vesting Objects that need splitting.
+     */
+    const splitVestingObject: VestingObject[] = vestingObjects.filter(
+        (obj) => obj.splitAmount !== undefined && obj.splitAmount > 0,
+    );
+    const splitVestingTransactions: TransactionObjectArgument[] = [];
+    splitVestingObject.forEach((obj) => {
+        const [splitTx] = tx.moveCall({
+            target: `0x02::timelock::split`,
+            typeArguments: [`${IOTA_TYPE_ARG}`],
+            arguments: [tx.object(obj.objectId), tx.pure.u64(obj.splitAmount!)],
+        });
+        splitVestingTransactions.push(tx.object(splitTx));
+    });
+
+    /**
+     * Create transactions to stake the vesting objects
+     */
+    const stakingReadyObjects = vestingObjects
+        .filter((obj) => obj.splitAmount === undefined || obj.splitAmount === BigInt(0))
+        .map((obj) => tx.object(obj.objectId));
+    tx.moveCall({
+        target: `0x3::timelocked_staking::request_add_stake_mul_bal`,
+        arguments: [
+            tx.sharedObjectRef({
+                objectId: IOTA_SYSTEM_STATE_OBJECT_ID,
+                initialSharedVersion: 1,
+                mutable: true,
+            }),
+            tx.makeMoveVec({ objects: [...splitVestingTransactions, ...stakingReadyObjects] }), // add the split object to the array of timelocked objects
+            tx.pure.address(validatorAddress),
+        ],
+    });
+
+    return tx;
+}
diff --git a/apps/core/src/utils/stake/index.ts b/apps/core/src/utils/stake/index.ts
index 1d03b413bff..5f7d694c839 100644
--- a/apps/core/src/utils/stake/index.ts
+++ b/apps/core/src/utils/stake/index.ts
@@ -5,3 +5,4 @@ export * from './createUnstakeTransaction';
 export * from './formatDelegatedStake';
 export * from './createStakeTransaction';
 export * from './createTimelockedUnstakeTransaction';
+export * from './createTimelockedStakeTransaction';
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index f7178aec4b8..39722148f32 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -3,7 +3,7 @@
 
 'use client';
 
-import { Button, TimelockedUnstakePopup } from '@/components';
+import { Button, NewStakePopup, TimelockedUnstakePopup } from '@/components';
 import { useGetCurrentEpochStartTimestamp, useNotifications, usePopups } from '@/hooks';
 import { getVestingOverview, mapTimelockObjects } from '@/lib/utils';
 import { NotificationType } from '@/stores/notificationStore';
@@ -56,6 +56,10 @@ function VestingDashboardPage(): JSX.Element {
         );
     }
 
+    function handleStake(): void {
+        openPopup(<NewStakePopup onClose={closePopup} />);
+    }
+
     return (
         <div className="flex flex-row">
             <div className="flex w-1/2 flex-col items-center justify-center space-y-4 pt-12">
@@ -79,6 +83,7 @@ function VestingDashboardPage(): JSX.Element {
                     <div className="flex flex-col items-center rounded-lg border p-4">
                         <span>Available Staking</span>
                         <span>{vestingSchedule.availableStaking}</span>
+                        <Button onClick={() => handleStake()}>Stake</Button>
                     </div>
                 </div>
             </div>
diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
index 20aef3ee0b1..ee14d7c3bbb 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
@@ -3,7 +3,11 @@
 
 import React, { useState } from 'react';
 import { EnterAmountView, SelectValidatorView } from './views';
-import { useNotifications, useNewStakeTransaction } from '@/hooks';
+import {
+    useNotifications,
+    useNewStakeTransaction,
+    useCreateTimelockedStakingTransaction,
+} from '@/hooks';
 import { parseAmount, useCoinMetadata, useGetValidatorsApy } from '@iota/core';
 import { useCurrentAccount, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
 import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
@@ -28,11 +32,18 @@ function NewStakePopup({ onClose }: NewStakePopupProps): JSX.Element {
     const coinDecimals = metadata?.decimals ?? 0;
     const amountWithoutDecimals = parseAmount(amount, coinDecimals);
 
-    const { data: newStakeData } = useNewStakeTransaction(
+    let { data: newStakeData } = useNewStakeTransaction(
         selectedValidator,
         amountWithoutDecimals,
         account?.address ?? '',
     );
+    // todo: implement useCreateTimelockedStakingTransaction
+    const timestakedata = useCreateTimelockedStakingTransaction(
+        selectedValidator,
+        amountWithoutDecimals,
+        account?.address ?? '',
+    );
+    newStakeData = timestakedata?.data;
 
     const { mutateAsync: signAndExecuteTransactionBlock } = useSignAndExecuteTransactionBlock();
     const { addNotification } = useNotifications();
diff --git a/apps/wallet-dashboard/hooks/index.ts b/apps/wallet-dashboard/hooks/index.ts
index 07ccfe796f8..2bba6320266 100644
--- a/apps/wallet-dashboard/hooks/index.ts
+++ b/apps/wallet-dashboard/hooks/index.ts
@@ -9,3 +9,4 @@ export * from './useSendCoinTransaction';
 export * from './useCreateSendAssetTransaction';
 export * from './useGetCurrentEpochStartTimestamp';
 export * from './useTimelockedUnstakeTransaction';
+export * from './useCreateTimelockedStakingTransaction';
diff --git a/apps/wallet-dashboard/hooks/useCreateTimelockedStakingTransaction.ts b/apps/wallet-dashboard/hooks/useCreateTimelockedStakingTransaction.ts
new file mode 100644
index 00000000000..bec5ae72c7a
--- /dev/null
+++ b/apps/wallet-dashboard/hooks/useCreateTimelockedStakingTransaction.ts
@@ -0,0 +1,91 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+    createTimelockedStakeTransaction,
+    TIMELOCK_IOTA_TYPE,
+    useGetAllOwnedObjects,
+    VestingObject,
+} from '@iota/core';
+import { useIotaClient } from '@iota/dapp-kit';
+import { useQuery } from '@tanstack/react-query';
+import { useGetCurrentEpochStartTimestamp } from './useGetCurrentEpochStartTimestamp';
+import {
+    adjustSplitAmountsInVestingObjects,
+    getFormattedTimelockedVestingObjects,
+    isSupplyIncreaseVestingObject,
+    mapTimelockObjects,
+} from '@/lib/utils';
+import { TimelockedObject } from '@/lib/interfaces';
+import { MIN_STAKING_THRESHOLD } from '@/lib/constants';
+
+export function useCreateTimelockedStakingTransaction(
+    validator: string,
+    amount: bigint,
+    senderAddress: string,
+) {
+    const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
+    const { data: timelockedObjects } = useGetAllOwnedObjects(senderAddress, {
+        StructType: TIMELOCK_IOTA_TYPE,
+    });
+    const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
+
+    const filteredTimelockedObjects = timelockedMapped
+        ?.filter(isSupplyIncreaseVestingObject)
+        .filter((obj: TimelockedObject) => {
+            return Number(obj.expirationTimestampMs) > Number(currentEpochMs);
+        })
+        .sort((a: TimelockedObject, b: TimelockedObject) => {
+            return Number(b.expirationTimestampMs) - Number(a.expirationTimestampMs);
+        });
+
+    const vestingObjects: VestingObject[] = getFormattedTimelockedVestingObjects(
+        filteredTimelockedObjects,
+    ).filter((obj) => obj.totalLockedAmount >= MIN_STAKING_THRESHOLD);
+
+    /**
+     * Create a subset of objects that meet the stake amount (where total combined locked amount >= STAKE_AMOUNT)
+     */
+    let totalLocked: bigint = BigInt(0);
+    const subsetVestingObjects: VestingObject[] = [];
+
+    for (const obj of vestingObjects) {
+        const lockedAmount: bigint = BigInt(obj.totalLockedAmount);
+        totalLocked += lockedAmount;
+        subsetVestingObjects.push(obj);
+        if (totalLocked >= BigInt(amount)) {
+            break;
+        }
+    }
+
+    /**
+     * Calculate the remaining amount after staking
+     */
+    const remainingAmount = totalLocked - amount;
+    /**
+     * Add splitAmount property to the vesting objects that need to be split
+     */
+    if (remainingAmount > 0) {
+        adjustSplitAmountsInVestingObjects(vestingObjects, remainingAmount);
+    }
+
+    const client = useIotaClient();
+    return useQuery({
+        // eslint-disable-next-line @tanstack/query/exhaustive-deps
+        queryKey: ['stake-transaction', validator, amount.toString(), senderAddress],
+        queryFn: async () => {
+            const transaction = createTimelockedStakeTransaction(vestingObjects, validator);
+            transaction.setSender(senderAddress);
+            await transaction.build({ client });
+            return transaction;
+        },
+        enabled: !!amount && !!validator && !!senderAddress,
+        gcTime: 0,
+        select: (transaction) => {
+            return {
+                transaction,
+                gasBudget: transaction.blockData.gasConfig.budget,
+            };
+        },
+    });
+}
diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index 67ad3687aa6..c164ac8570d 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -15,6 +15,8 @@ export const SUPPLY_INCREASE_STARTING_VESTING_YEAR: number = 2023;
 export const SUPPLY_INCREASE_STAKER_VESTING_DURATION = 2; // Years
 export const SUPPLY_INCREASE_INVESTOR_VESTING_DURATION = 4; // Years
 
+export const MIN_STAKING_THRESHOLD = 1_000_000_000;
+
 // https://github.com/iotaledger/iota/blob/b0db487868fd5d61241a43eb8bc9886d7c1be1c9/crates/iota-types/src/timelock/stardust_upgrade_label.rs#L12
 export const SUPPLY_INCREASE_VESTING_LABEL =
     '000000000000000000000000000000000000000000000000000000000000107a::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 8152e83dd01..ec460f19a6a 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -3,6 +3,7 @@
 
 import { DelegatedTimelockedStake, IotaObjectData } from '@iota/iota-sdk/client';
 import {
+    MIN_STAKING_THRESHOLD,
     SUPPLY_INCREASE_INVESTOR_VESTING_DURATION,
     SUPPLY_INCREASE_STAKER_VESTING_DURATION,
     SUPPLY_INCREASE_STARTING_VESTING_YEAR,
@@ -19,6 +20,7 @@ import {
     VestingOverview,
 } from '../../interfaces';
 import { isTimelockedObject, isTimelockedStakedIota } from '../timelock';
+import { VestingObject } from '@iota/core';
 
 export function getLastSupplyIncreaseVestingPayout(
     objects: (TimelockedObject | DelegatedTimelockedStake)[],
@@ -230,3 +232,89 @@ export function isSupplyIncreaseVestingObject(
         return false;
     }
 }
+
+/**
+ * Create VestingObject array from IotaObjectResponse array
+ * Vesting object is grouped object by expiration time, where objectId holds the id of the first object in the group to which the rest of the objects in the group will be merged.
+ * It also holds the total locked amount of the group.
+ */
+export function getFormattedTimelockedVestingObjects(
+    timelockedObjects: TimelockedObject[],
+): VestingObject[] {
+    const expirationMap = new Map<number, TimelockedObject[]>();
+
+    timelockedObjects.forEach((timelockedObject) => {
+        const expirationTimestamp = timelockedObject.expirationTimestampMs;
+
+        if (!expirationMap.has(expirationTimestamp)) {
+            expirationMap.set(expirationTimestamp, []);
+        }
+        expirationMap.get(expirationTimestamp)!.push(timelockedObject);
+    });
+
+    const result: VestingObject[] = [];
+
+    expirationMap.forEach((objects, expirationTime) => {
+        const totalLockedAmount = objects.reduce((sum, obj) => {
+            return BigInt(sum) + BigInt(obj.locked.value);
+        }, 0n);
+
+        const label = objects[0].label; // Assuming all objects in the group have the same label
+        const objectIds = objects.map((obj) => obj.id.id);
+        result.push({
+            objectId: objectIds[0] || '',
+            expirationTimestamp: expirationTime.toString(),
+            totalLockedAmount,
+            objectIds,
+            label,
+        });
+    });
+
+    return result;
+}
+
+/**
+ * Adjust split amounts in vesting objects to ensure that the stake amout is met and that the split amount is greater than the minimum staking threshold
+ */
+export function adjustSplitAmountsInVestingObjects(
+    vestingObjects: VestingObject[],
+    totalRemainingAmount: bigint,
+) {
+    let objectsToSplit = 1;
+    let splitAchieved = false;
+
+    while (!splitAchieved && objectsToSplit <= vestingObjects.length) {
+        const splitRemainingAmount = BigInt(
+            Math.floor(Number(totalRemainingAmount) / objectsToSplit),
+        );
+        // if the amount is odd value we need to add the remainder to the first object because we floored the division
+        const splitRemainder = BigInt(totalRemainingAmount) % BigInt(objectsToSplit);
+        // counter for objects that have splitAmount > 0
+        let foundObjectsToSplit = 0;
+
+        // Reset splitAmounts to 0
+        vestingObjects.forEach((obj) => (obj.splitAmount = BigInt(0)));
+
+        for (let i = 0; i < vestingObjects.length; i++) {
+            const obj = vestingObjects[i];
+            let remainingAmount = splitRemainingAmount;
+            if (i === 0 && splitRemainder > 0) {
+                remainingAmount += splitRemainder;
+            }
+            const amountToSplit = BigInt(obj.totalLockedAmount) - remainingAmount;
+
+            if (amountToSplit > MIN_STAKING_THRESHOLD) {
+                obj.splitAmount = amountToSplit;
+                foundObjectsToSplit++;
+                if (foundObjectsToSplit === objectsToSplit) {
+                    splitAchieved = true;
+                    break;
+                }
+            }
+        }
+
+        if (!splitAchieved) {
+            objectsToSplit++;
+        }
+    }
+}

From 3246dc92ad7adcb7d2365397bed91717cb19ce89 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Thu, 22 Aug 2024 12:35:36 +0200
Subject: [PATCH 39/68] fix: adjust creation of stake transaction

---
 .../app/dashboard/vesting/page.tsx            | 25 ++++-
 .../Popups/NewStakePopup/NewStakePopup.tsx    | 19 +---
 apps/wallet-dashboard/hooks/index.ts          |  1 -
 .../useCreateTimelockedStakingTransaction.ts  | 91 -------------------
 .../hooks/useNewStakeTransaction.ts           | 33 ++++++-
 .../lib/constants/vesting.constants.ts        |  4 +-
 .../lib/utils/vesting/vesting.ts              | 47 ++++++++++
 7 files changed, 107 insertions(+), 113 deletions(-)
 delete mode 100644 apps/wallet-dashboard/hooks/useCreateTimelockedStakingTransaction.ts

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 39722148f32..72d16a7e99b 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -15,9 +15,11 @@ import {
 } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
 import { DelegatedTimelockedStake, IotaValidatorSummary } from '@iota/iota-sdk/client';
+import { useQueryClient } from '@tanstack/react-query';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
+    const queryClient = useQueryClient();
     const { addNotification } = useNotifications();
     const { openPopup, closePopup } = usePopups();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
@@ -26,7 +28,6 @@ function VestingDashboardPage(): JSX.Element {
         StructType: TIMELOCK_IOTA_TYPE,
     });
     const { data: stakedTimelockedObjects } = useGetStakedTimelockedObjects(account?.address || '');
-
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
     const vestingSchedule = getVestingOverview(
         [...timelockedMapped, ...(stakedTimelockedObjects || [])],
@@ -39,6 +40,24 @@ function VestingDashboardPage(): JSX.Element {
         );
     }
 
+    function handleOnClose(): void {
+        setTimeout(() => {
+            queryClient.invalidateQueries({
+                queryKey: ['get-staked-timelocked-objects', account?.address],
+            });
+            queryClient.invalidateQueries({
+                queryKey: [
+                    'get-all-owned-objects',
+                    account?.address,
+                    {
+                        StructType: TIMELOCK_IOTA_TYPE,
+                    },
+                ],
+            });
+        }, 1500);
+        closePopup();
+    }
+
     function handleUnstake(delegatedTimelocked: DelegatedTimelockedStake): void {
         const validatorInfo = getValidatorByAddress(delegatedTimelocked.validatorAddress);
         if (!account || !validatorInfo) {
@@ -51,13 +70,13 @@ function VestingDashboardPage(): JSX.Element {
                 accountAddress={account.address}
                 delegatedStake={delegatedTimelocked}
                 validatorInfo={validatorInfo}
-                closePopup={closePopup}
+                closePopup={handleOnClose}
             />,
         );
     }
 
     function handleStake(): void {
-        openPopup(<NewStakePopup onClose={closePopup} />);
+        openPopup(<NewStakePopup onClose={handleOnClose} isTimelockedStaking />);
     }
 
     return (
diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
index ee14d7c3bbb..395895ae02f 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
@@ -3,11 +3,7 @@
 
 import React, { useState } from 'react';
 import { EnterAmountView, SelectValidatorView } from './views';
-import {
-    useNotifications,
-    useNewStakeTransaction,
-    useCreateTimelockedStakingTransaction,
-} from '@/hooks';
+import { useNotifications, useNewStakeTransaction } from '@/hooks';
 import { parseAmount, useCoinMetadata, useGetValidatorsApy } from '@iota/core';
 import { useCurrentAccount, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
 import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
@@ -15,6 +11,7 @@ import { NotificationType } from '@/stores/notificationStore';
 
 interface NewStakePopupProps {
     onClose: () => void;
+    isTimelockedStaking?: boolean;
 }
 
 enum Step {
@@ -22,7 +19,7 @@ enum Step {
     EnterAmount,
 }
 
-function NewStakePopup({ onClose }: NewStakePopupProps): JSX.Element {
+function NewStakePopup({ onClose, isTimelockedStaking }: NewStakePopupProps): JSX.Element {
     const [step, setStep] = useState<Step>(Step.SelectValidator);
     const [selectedValidator, setSelectedValidator] = useState<string>('');
     const [amount, setAmount] = useState<string>('');
@@ -32,18 +29,12 @@ function NewStakePopup({ onClose }: NewStakePopupProps): JSX.Element {
     const coinDecimals = metadata?.decimals ?? 0;
     const amountWithoutDecimals = parseAmount(amount, coinDecimals);
 
-    let { data: newStakeData } = useNewStakeTransaction(
+    const { data: newStakeData } = useNewStakeTransaction(
         selectedValidator,
         amountWithoutDecimals,
         account?.address ?? '',
+        isTimelockedStaking,
     );
-    // todo: implement useCreateTimelockedStakingTransaction
-    const timestakedata = useCreateTimelockedStakingTransaction(
-        selectedValidator,
-        amountWithoutDecimals,
-        account?.address ?? '',
-    );
-    newStakeData = timestakedata?.data;
 
     const { mutateAsync: signAndExecuteTransactionBlock } = useSignAndExecuteTransactionBlock();
     const { addNotification } = useNotifications();
diff --git a/apps/wallet-dashboard/hooks/index.ts b/apps/wallet-dashboard/hooks/index.ts
index 2bba6320266..07ccfe796f8 100644
--- a/apps/wallet-dashboard/hooks/index.ts
+++ b/apps/wallet-dashboard/hooks/index.ts
@@ -9,4 +9,3 @@ export * from './useSendCoinTransaction';
 export * from './useCreateSendAssetTransaction';
 export * from './useGetCurrentEpochStartTimestamp';
 export * from './useTimelockedUnstakeTransaction';
-export * from './useCreateTimelockedStakingTransaction';
diff --git a/apps/wallet-dashboard/hooks/useCreateTimelockedStakingTransaction.ts b/apps/wallet-dashboard/hooks/useCreateTimelockedStakingTransaction.ts
deleted file mode 100644
index bec5ae72c7a..00000000000
--- a/apps/wallet-dashboard/hooks/useCreateTimelockedStakingTransaction.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-import {
-    createTimelockedStakeTransaction,
-    TIMELOCK_IOTA_TYPE,
-    useGetAllOwnedObjects,
-    VestingObject,
-} from '@iota/core';
-import { useIotaClient } from '@iota/dapp-kit';
-import { useQuery } from '@tanstack/react-query';
-import { useGetCurrentEpochStartTimestamp } from './useGetCurrentEpochStartTimestamp';
-import {
-    adjustSplitAmountsInVestingObjects,
-    getFormattedTimelockedVestingObjects,
-    isSupplyIncreaseVestingObject,
-    mapTimelockObjects,
-} from '@/lib/utils';
-import { TimelockedObject } from '@/lib/interfaces';
-import { MIN_STAKING_THRESHOLD } from '@/lib/constants';
-
-export function useCreateTimelockedStakingTransaction(
-    validator: string,
-    amount: bigint,
-    senderAddress: string,
-) {
-    const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
-    const { data: timelockedObjects } = useGetAllOwnedObjects(senderAddress, {
-        StructType: TIMELOCK_IOTA_TYPE,
-    });
-    const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
-
-    const filteredTimelockedObjects = timelockedMapped
-        ?.filter(isSupplyIncreaseVestingObject)
-        .filter((obj: TimelockedObject) => {
-            return Number(obj.expirationTimestampMs) > Number(currentEpochMs);
-        })
-        .sort((a: TimelockedObject, b: TimelockedObject) => {
-            return Number(b.expirationTimestampMs) - Number(a.expirationTimestampMs);
-        });
-
-    const vestingObjects: VestingObject[] = getFormattedTimelockedVestingObjects(
-        filteredTimelockedObjects,
-    ).filter((obj) => obj.totalLockedAmount >= MIN_STAKING_THRESHOLD);
-
-    /**
-     * Create a subset of objects that meet the stake amount (where total combined locked amount >= STAKE_AMOUNT)
-     */
-    let totalLocked: bigint = BigInt(0);
-    const subsetVestingObjects: VestingObject[] = [];
-
-    for (const obj of vestingObjects) {
-        const lockedAmount: bigint = BigInt(obj.totalLockedAmount);
-        totalLocked += lockedAmount;
-        subsetVestingObjects.push(obj);
-        if (totalLocked >= BigInt(amount)) {
-            break;
-        }
-    }
-
-    /**
-     * Calculate the remaining amount after staking
-     */
-    const remainingAmount = totalLocked - amount;
-    /**
-     * Add splitAmount property to the vesting objects that need to be split
-     */
-    if (remainingAmount > 0) {
-        adjustSplitAmountsInVestingObjects(vestingObjects, remainingAmount);
-    }
-
-    const client = useIotaClient();
-    return useQuery({
-        // eslint-disable-next-line @tanstack/query/exhaustive-deps
-        queryKey: ['stake-transaction', validator, amount.toString(), senderAddress],
-        queryFn: async () => {
-            const transaction = createTimelockedStakeTransaction(vestingObjects, validator);
-            transaction.setSender(senderAddress);
-            await transaction.build({ client });
-            return transaction;
-        },
-        enabled: !!amount && !!validator && !!senderAddress,
-        gcTime: 0,
-        select: (transaction) => {
-            return {
-                transaction,
-                gasBudget: transaction.blockData.gasConfig.budget,
-            };
-        },
-    });
-}
diff --git a/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts b/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
index 08f8697acc3..627c01b809a 100644
--- a/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
+++ b/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
@@ -1,17 +1,44 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { createStakeTransaction } from '@iota/core';
+import { prepareVestingObjectsForTimelockedStaking } from '@/lib/utils';
+import {
+    createStakeTransaction,
+    createTimelockedStakeTransaction,
+    TIMELOCK_IOTA_TYPE,
+    useGetAllOwnedObjects,
+    VestingObject,
+} from '@iota/core';
 import { useIotaClient } from '@iota/dapp-kit';
 import { useQuery } from '@tanstack/react-query';
+import { useGetCurrentEpochStartTimestamp } from './useGetCurrentEpochStartTimestamp';
 
-export function useNewStakeTransaction(validator: string, amount: bigint, senderAddress: string) {
+export function useNewStakeTransaction(
+    validator: string,
+    amount: bigint,
+    senderAddress: string,
+    isTimelockedStaking?: boolean,
+) {
+    let vestingObjects: VestingObject[] = [];
+    const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
+    const { data: timelockedObjects } = useGetAllOwnedObjects(senderAddress, {
+        StructType: TIMELOCK_IOTA_TYPE,
+    });
+    if (isTimelockedStaking && timelockedObjects && currentEpochMs) {
+        vestingObjects = prepareVestingObjectsForTimelockedStaking(
+            timelockedObjects,
+            amount,
+            currentEpochMs,
+        );
+    }
     const client = useIotaClient();
     return useQuery({
         // eslint-disable-next-line @tanstack/query/exhaustive-deps
         queryKey: ['stake-transaction', validator, amount.toString(), senderAddress],
         queryFn: async () => {
-            const transaction = createStakeTransaction(amount, validator);
+            const transaction = isTimelockedStaking
+                ? createTimelockedStakeTransaction(vestingObjects, validator)
+                : createStakeTransaction(amount, validator);
             transaction.setSender(senderAddress);
             await transaction.build({ client });
             return transaction;
diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index c164ac8570d..67c475a3b44 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -18,8 +18,10 @@ export const SUPPLY_INCREASE_INVESTOR_VESTING_DURATION = 4; // Years
 export const MIN_STAKING_THRESHOLD = 1_000_000_000;
 
 // https://github.com/iotaledger/iota/blob/b0db487868fd5d61241a43eb8bc9886d7c1be1c9/crates/iota-types/src/timelock/stardust_upgrade_label.rs#L12
+// export const SUPPLY_INCREASE_VESTING_LABEL =
+//     '000000000000000000000000000000000000000000000000000000000000107a::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
 export const SUPPLY_INCREASE_VESTING_LABEL =
-    '000000000000000000000000000000000000000000000000000000000000107a::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
+    'eaa22e4cbb1e8b41dca038fc175f147180265a41617c3e4125e54434506df45f::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
 
 export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject[] = [
     {
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index ec460f19a6a..650ac780edb 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -318,3 +318,50 @@ export function adjustSplitAmountsInVestingObjects(
         }
     }
 }
+
+export function prepareVestingObjectsForTimelockedStaking(
+    timelockedObjects: IotaObjectData[],
+    amount: bigint,
+    currentEpochMs: string,
+) {
+    const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
+    const filteredTimelockedObjects = timelockedMapped
+        ?.filter(isSupplyIncreaseVestingObject)
+        .filter((obj: TimelockedObject) => {
+            return Number(obj.expirationTimestampMs) > Number(currentEpochMs);
+        })
+        .sort((a: TimelockedObject, b: TimelockedObject) => {
+            return Number(b.expirationTimestampMs) - Number(a.expirationTimestampMs);
+        });
+
+    const vestingObjects: VestingObject[] = getFormattedTimelockedVestingObjects(
+        filteredTimelockedObjects,
+    ).filter((obj) => obj.totalLockedAmount >= MIN_STAKING_THRESHOLD);
+
+    /**
+     * Create a subset of objects that meet the stake amount (where total combined locked amount >= STAKE_AMOUNT)
+     */
+    let totalLocked: bigint = BigInt(0);
+    const subsetVestingObjects: VestingObject[] = [];
+
+    for (const obj of vestingObjects) {
+        totalLocked += obj.totalLockedAmount;
+        subsetVestingObjects.push(obj);
+        if (totalLocked >= amount) {
+            break;
+        }
+    }
+
+    /**
+     * Calculate the remaining amount after staking
+     */
+    const remainingAmount = totalLocked - amount;
+    /**
+     * Add splitAmount property to the vesting objects that need to be split
+     */
+    if (remainingAmount > 0) {
+        adjustSplitAmountsInVestingObjects(subsetVestingObjects, remainingAmount);
+    }
+
+    return subsetVestingObjects;
+}

From 6d11c5bebff78b368af7749a06d7c7dc8e53d15d Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Thu, 22 Aug 2024 13:27:49 +0200
Subject: [PATCH 40/68] fix: polish util methods

---
 .../stake/createTimelockedStakeTransaction.ts |  2 +-
 .../app/dashboard/vesting/page.tsx            |  1 +
 .../hooks/useNewStakeTransaction.ts           |  4 +-
 .../lib/constants/vesting.constants.ts        |  4 +-
 .../lib/utils/vesting/vesting.ts              | 44 ++++++++++++-------
 5 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index 455050ea6f5..007ee9c82a8 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -38,7 +38,7 @@ export function createTimelockedStakeTransaction(
         });
     }
     /**
-     * Create tranasctions to split Vesting Objects that need splitting.
+     * Create transactions to split Vesting Objects that need splitting.
      */
     const splitVestingObject: VestingObject[] = vestingObjects.filter(
         (obj) => obj.splitAmount !== undefined && obj.splitAmount > 0,
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 72d16a7e99b..6f6a1cad125 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -28,6 +28,7 @@ function VestingDashboardPage(): JSX.Element {
         StructType: TIMELOCK_IOTA_TYPE,
     });
     const { data: stakedTimelockedObjects } = useGetStakedTimelockedObjects(account?.address || '');
+
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
     const vestingSchedule = getVestingOverview(
         [...timelockedMapped, ...(stakedTimelockedObjects || [])],
diff --git a/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts b/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
index 627c01b809a..ed8efdf3d40 100644
--- a/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
+++ b/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { prepareVestingObjectsForTimelockedStaking } from '@/lib/utils';
+import { prepareObjectsForTimelockedStakingTransaction } from '@/lib/utils';
 import {
     createStakeTransaction,
     createTimelockedStakeTransaction,
@@ -25,7 +25,7 @@ export function useNewStakeTransaction(
         StructType: TIMELOCK_IOTA_TYPE,
     });
     if (isTimelockedStaking && timelockedObjects && currentEpochMs) {
-        vestingObjects = prepareVestingObjectsForTimelockedStaking(
+        vestingObjects = prepareObjectsForTimelockedStakingTransaction(
             timelockedObjects,
             amount,
             currentEpochMs,
diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index 67c475a3b44..c164ac8570d 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -18,10 +18,8 @@ export const SUPPLY_INCREASE_INVESTOR_VESTING_DURATION = 4; // Years
 export const MIN_STAKING_THRESHOLD = 1_000_000_000;
 
 // https://github.com/iotaledger/iota/blob/b0db487868fd5d61241a43eb8bc9886d7c1be1c9/crates/iota-types/src/timelock/stardust_upgrade_label.rs#L12
-// export const SUPPLY_INCREASE_VESTING_LABEL =
-//     '000000000000000000000000000000000000000000000000000000000000107a::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
 export const SUPPLY_INCREASE_VESTING_LABEL =
-    'eaa22e4cbb1e8b41dca038fc175f147180265a41617c3e4125e54434506df45f::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
+    '000000000000000000000000000000000000000000000000000000000000107a::stardust_upgrade_label::STARDUST_UPGRADE_LABEL';
 
 export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject[] = [
     {
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 650ac780edb..28b0aea5828 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -234,9 +234,11 @@ export function isSupplyIncreaseVestingObject(
 }
 
 /**
- * Create VestingObject array from IotaObjectResponse array
+ * Formats an array of timelocked objects into an array of vesting objects.
  * Vesting object is grouped object by expiration time, where objectId holds the id of the first object in the group to which the rest of the objects in the group will be merged.
- * It also holds the total locked amount of the group.
+ *
+ * @param timelockedObjects - The array of timelocked objects to be formatted.
+ * @returns An array of vesting objects.
  */
 export function getFormattedTimelockedVestingObjects(
     timelockedObjects: TimelockedObject[],
@@ -274,34 +276,34 @@ export function getFormattedTimelockedVestingObjects(
 }
 
 /**
- * Adjust split amounts in vesting objects to ensure that the stake amout is met and that the split amount is greater than the minimum staking threshold
+ * Adjusts the split amounts in an array of vesting objects based on the total remaining amount.
+ * The function iteratively splits the remaining amount among the vesting objects until the split conditions are met.
+ *
+ * @param vestingObjects - An array of vesting objects.
+ * @param totalRemainingAmount - The total remaining amount to be split among the vesting objects.
  */
 export function adjustSplitAmountsInVestingObjects(
     vestingObjects: VestingObject[],
-    totalRemainingAmount: bigint,
+    totalRemainderAmount: bigint,
 ) {
     let objectsToSplit = 1;
     let splitAchieved = false;
 
     while (!splitAchieved && objectsToSplit <= vestingObjects.length) {
-        const splitRemainingAmount = BigInt(
-            Math.floor(Number(totalRemainingAmount) / objectsToSplit),
-        );
+        const baseRemainderAmount = totalRemainderAmount / BigInt(objectsToSplit);
         // if the amount is odd value we need to add the remainder to the first object because we floored the division
-        const splitRemainder = BigInt(totalRemainingAmount) % BigInt(objectsToSplit);
+        const remainder = totalRemainderAmount % BigInt(objectsToSplit);
+
         // counter for objects that have splitAmount > 0
         let foundObjectsToSplit = 0;
 
-        // Reset splitAmounts to 0
-        vestingObjects.forEach((obj) => (obj.splitAmount = BigInt(0)));
-
         for (let i = 0; i < vestingObjects.length; i++) {
             const obj = vestingObjects[i];
-            let remainingAmount = splitRemainingAmount;
-            if (i === 0 && splitRemainder > 0) {
-                remainingAmount += splitRemainder;
+            let adjustedRemainderAmount = baseRemainderAmount;
+            if (i === 0 && remainder > 0) {
+                adjustedRemainderAmount += remainder;
             }
-            const amountToSplit = BigInt(obj.totalLockedAmount) - remainingAmount;
+            const amountToSplit = obj.totalLockedAmount - adjustedRemainderAmount;
 
             if (amountToSplit > MIN_STAKING_THRESHOLD) {
                 obj.splitAmount = amountToSplit;
@@ -314,12 +316,21 @@ export function adjustSplitAmountsInVestingObjects(
         }
 
         if (!splitAchieved) {
+            vestingObjects.forEach((obj) => (obj.splitAmount = BigInt(0)));
             objectsToSplit++;
         }
     }
 }
 
-export function prepareVestingObjectsForTimelockedStaking(
+/**
+ * Prepares vesting objects for timelocked staking.
+ *
+ * @param timelockedObjects - An array of timelocked objects.
+ * @param amount - The amount to stake.
+ * @param currentEpochMs - The current epoch in milliseconds.
+ * @returns An array of vesting objects that meet the stake amount.
+ */
+export function prepareObjectsForTimelockedStakingTransaction(
     timelockedObjects: IotaObjectData[],
     amount: bigint,
     currentEpochMs: string,
@@ -356,6 +367,7 @@ export function prepareVestingObjectsForTimelockedStaking(
      * Calculate the remaining amount after staking
      */
     const remainingAmount = totalLocked - amount;
+
     /**
      * Add splitAmount property to the vesting objects that need to be split
      */

From 1be97f710b3c4f557610fd1fa4a6458bef550f27 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Fri, 23 Aug 2024 17:44:17 +0200
Subject: [PATCH 41/68] fix(wallet-dashboard): invalidate queries after
 unstaking

---
 .../VestingPopup/TimelockedUnstakePopup.tsx   | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
index b808b97f406..6e247b66a3e 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { Button } from '@/components';
 import { useTimelockedUnstakeTransaction } from '@/hooks';
-import { useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
+import { useIotaClient, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
 import { DelegatedTimelockedStake, IotaValidatorSummary } from '@iota/iota-sdk/client';
 import { useQueryClient } from '@tanstack/react-query';
 
@@ -23,19 +23,35 @@ function TimelockedUnstakePopup({
 }: UnstakePopupProps): JSX.Element {
     const objectIds = delegatedStake.stakes.map((stake) => stake.timelockedStakedIotaId);
     const queryClient = useQueryClient();
+    const iotaClient = useIotaClient();
     const { data: timelockedUnstake } = useTimelockedUnstakeTransaction(objectIds, accountAddress);
     const { mutateAsync: signAndExecuteTransactionBlock, isPending } =
         useSignAndExecuteTransactionBlock();
 
     async function handleTimelockedUnstake(): Promise<void> {
         if (!timelockedUnstake) return;
-        await signAndExecuteTransactionBlock({
-            transactionBlock: timelockedUnstake.transaction,
-        });
-        queryClient.invalidateQueries({
-            queryKey: ['get-staked-timelocked-objects'],
-        });
-        closePopup();
+        await signAndExecuteTransactionBlock(
+            {
+                transactionBlock: timelockedUnstake.transaction,
+            },
+            {
+                onSuccess: (tx) => {
+                    iotaClient
+                        .waitForTransactionBlock({
+                            digest: tx.digest,
+                        })
+                        .then(() => {
+                            queryClient.invalidateQueries({
+                                queryKey: ['get-staked-timelocked-objects'],
+                            });
+                            queryClient.invalidateQueries({
+                                queryKey: ['timelocked-unstake-transaction'],
+                            });
+                            closePopup();
+                        });
+                },
+            },
+        );
     }
 
     return (

From 75fcb9e340ef760a2cc1b14d94c31f2dd7fb897b Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Sun, 25 Aug 2024 17:37:41 +0200
Subject: [PATCH 42/68] fix: handling of unstake transaction query invalidation

---
 .../app/dashboard/vesting/page.tsx            | 27 ++++++++++++-
 .../VestingPopup/TimelockedUnstakePopup.tsx   | 38 +++++++++----------
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index f7178aec4b8..fbcf880ed82 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -13,11 +13,14 @@ import {
     useGetAllOwnedObjects,
     useGetStakedTimelockedObjects,
 } from '@iota/core';
-import { useCurrentAccount } from '@iota/dapp-kit';
+import { useCurrentAccount, useIotaClient } from '@iota/dapp-kit';
 import { DelegatedTimelockedStake, IotaValidatorSummary } from '@iota/iota-sdk/client';
+import { useQueryClient } from '@tanstack/react-query';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
+    const queryClient = useQueryClient();
+    const iotaClient = useIotaClient();
     const { addNotification } = useNotifications();
     const { openPopup, closePopup } = usePopups();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
@@ -39,6 +42,27 @@ function VestingDashboardPage(): JSX.Element {
         );
     }
 
+    function handleOnSuccess(digest: string): void {
+        iotaClient
+            .waitForTransactionBlock({
+                digest,
+            })
+            .then(() => {
+                queryClient.invalidateQueries({
+                    queryKey: ['get-staked-timelocked-objects', account?.address],
+                });
+                queryClient.invalidateQueries({
+                    queryKey: [
+                        'get-all-owned-objects',
+                        account?.address,
+                        {
+                            StructType: TIMELOCK_IOTA_TYPE,
+                        },
+                    ],
+                });
+            });
+    }
+
     function handleUnstake(delegatedTimelocked: DelegatedTimelockedStake): void {
         const validatorInfo = getValidatorByAddress(delegatedTimelocked.validatorAddress);
         if (!account || !validatorInfo) {
@@ -52,6 +76,7 @@ function VestingDashboardPage(): JSX.Element {
                 delegatedStake={delegatedTimelocked}
                 validatorInfo={validatorInfo}
                 closePopup={closePopup}
+                onSuccess={handleOnSuccess}
             />,
         );
     }
diff --git a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
index 6e247b66a3e..6076120da12 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
@@ -3,16 +3,17 @@
 
 import React from 'react';
 import { Button } from '@/components';
-import { useTimelockedUnstakeTransaction } from '@/hooks';
-import { useIotaClient, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
+import { useNotifications, useTimelockedUnstakeTransaction } from '@/hooks';
+import { useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
 import { DelegatedTimelockedStake, IotaValidatorSummary } from '@iota/iota-sdk/client';
-import { useQueryClient } from '@tanstack/react-query';
+import { NotificationType } from '@/stores/notificationStore';
 
 interface UnstakePopupProps {
     accountAddress: string;
     delegatedStake: DelegatedTimelockedStake;
     validatorInfo: IotaValidatorSummary;
     closePopup: () => void;
+    onSuccess?: (digest: string) => void;
 }
 
 function TimelockedUnstakePopup({
@@ -20,38 +21,35 @@ function TimelockedUnstakePopup({
     delegatedStake,
     validatorInfo,
     closePopup,
+    onSuccess,
 }: UnstakePopupProps): JSX.Element {
     const objectIds = delegatedStake.stakes.map((stake) => stake.timelockedStakedIotaId);
-    const queryClient = useQueryClient();
-    const iotaClient = useIotaClient();
     const { data: timelockedUnstake } = useTimelockedUnstakeTransaction(objectIds, accountAddress);
     const { mutateAsync: signAndExecuteTransactionBlock, isPending } =
         useSignAndExecuteTransactionBlock();
+    const { addNotification } = useNotifications();
 
     async function handleTimelockedUnstake(): Promise<void> {
         if (!timelockedUnstake) return;
-        await signAndExecuteTransactionBlock(
+        signAndExecuteTransactionBlock(
             {
                 transactionBlock: timelockedUnstake.transaction,
             },
             {
                 onSuccess: (tx) => {
-                    iotaClient
-                        .waitForTransactionBlock({
-                            digest: tx.digest,
-                        })
-                        .then(() => {
-                            queryClient.invalidateQueries({
-                                queryKey: ['get-staked-timelocked-objects'],
-                            });
-                            queryClient.invalidateQueries({
-                                queryKey: ['timelocked-unstake-transaction'],
-                            });
-                            closePopup();
-                        });
+                    if (onSuccess) {
+                        onSuccess(tx.digest);
+                    }
                 },
             },
-        );
+        )
+            .then(() => {
+                closePopup();
+                addNotification('Unstake transaction has been sent');
+            })
+            .catch(() => {
+                addNotification('Unstake transaction was not sent', NotificationType.Error);
+            });
     }
 
     return (

From 10e843153548ce9af9a4baecfbfecfe468ee027f Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 26 Aug 2024 09:25:08 +0200
Subject: [PATCH 43/68] fix(wallet-dashboard): rename timelocked staked object
 and modify the fall back validator name

---
 apps/core/src/hooks/index.ts                  |  2 +-
 ...ts.ts => useGetTimelockedStakedObjects.ts} |  4 ++--
 .../app/dashboard/vesting/page.tsx            | 22 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename apps/core/src/hooks/{useGetStakedTimelockedObjects.ts => useGetTimelockedStakedObjects.ts} (75%)

diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index 7592478c7e0..97b66748c89 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -35,7 +35,7 @@ export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
 export * from './useGetAllOwnedObjects';
-export * from './useGetStakedTimelockedObjects';
+export * from './useGetTimelockedStakedObjects';
 export * from './useGetActiveValidatorsInfo';
 
 export * from './stake';
diff --git a/apps/core/src/hooks/useGetStakedTimelockedObjects.ts b/apps/core/src/hooks/useGetTimelockedStakedObjects.ts
similarity index 75%
rename from apps/core/src/hooks/useGetStakedTimelockedObjects.ts
rename to apps/core/src/hooks/useGetTimelockedStakedObjects.ts
index e1a5d71a52d..e519a0cb07d 100644
--- a/apps/core/src/hooks/useGetStakedTimelockedObjects.ts
+++ b/apps/core/src/hooks/useGetTimelockedStakedObjects.ts
@@ -4,10 +4,10 @@
 import { useIotaClient } from '@iota/dapp-kit';
 import { useQuery } from '@tanstack/react-query';
 
-export function useGetStakedTimelockedObjects(address: string) {
+export function useGetTimelockedStakedObjects(address: string) {
     const client = useIotaClient();
     return useQuery({
-        queryKey: ['get-staked-timelocked-objects', address],
+        queryKey: ['get-timelocked-staked-objects', address],
         queryFn: () =>
             client.getTimelockedStakes({
                 owner: address,
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index adf9a13a5cb..a9fd3b79b83 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -10,7 +10,7 @@ import {
     TIMELOCK_IOTA_TYPE,
     useGetActiveValidatorsInfo,
     useGetAllOwnedObjects,
-    useGetStakedTimelockedObjects,
+    useGetTimelockedStakedObjects,
 } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
 import { DelegatedTimelockedStake } from '@iota/iota-sdk/client';
@@ -22,11 +22,11 @@ function VestingDashboardPage(): JSX.Element {
     const { data: timelockedObjects } = useGetAllOwnedObjects(account?.address || '', {
         StructType: TIMELOCK_IOTA_TYPE,
     });
-    const { data: stakedTimelockedObjects } = useGetStakedTimelockedObjects(account?.address || '');
+    const { data: timelockedStakedObjects } = useGetTimelockedStakedObjects(account?.address || '');
 
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
     const vestingSchedule = getVestingOverview(
-        [...timelockedMapped, ...(stakedTimelockedObjects || [])],
+        [...timelockedMapped, ...(timelockedStakedObjects || [])],
         Number(currentEpochMs),
     );
 
@@ -34,13 +34,13 @@ function VestingDashboardPage(): JSX.Element {
         return (
             activeValidators?.find(
                 (activeValidator) => activeValidator.iotaAddress === validatorAddress,
-            )?.name || '-'
+            )?.name || validatorAddress
         );
     }
 
-    function handleUnstake(delegatedTimelocked: DelegatedTimelockedStake): void {
+    function handleUnstake(delegatedTimelockedStake: DelegatedTimelockedStake): void {
         // TODO: handle unstake logic
-        console.info('delegatedTimelocked', delegatedTimelocked);
+        console.info('delegatedTimelockedStake', delegatedTimelockedStake);
     }
 
     return (
@@ -82,18 +82,18 @@ function VestingDashboardPage(): JSX.Element {
                     </div>
                 </div>
                 <div className="flex w-full flex-col items-center justify-center space-y-4 pt-4">
-                    {stakedTimelockedObjects?.map((stakedTimelockedObject) => {
+                    {timelockedStakedObjects?.map((timelockedStakedObject) => {
                         return (
                             <div
-                                key={stakedTimelockedObject.stakingPool}
+                                key={timelockedStakedObject.stakingPool}
                                 className="flex w-full flex-row items-center justify-center space-x-4"
                             >
                                 <span>
-                                    {getValidatorName(stakedTimelockedObject.validatorAddress)}
+                                    {getValidatorName(timelockedStakedObject.validatorAddress)}
                                 </span>
-                                <span>Stakes: {stakedTimelockedObject.stakes.length}</span>
+                                <span>Stakes: {timelockedStakedObject.stakes.length}</span>
 
-                                <Button onClick={() => handleUnstake(stakedTimelockedObject)}>
+                                <Button onClick={() => handleUnstake(timelockedStakedObject)}>
                                     Unstake
                                 </Button>
                             </div>

From 3c0bce9c2bf24fe20f6ca1f9e476eb84bd90a2a6 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 26 Aug 2024 11:01:27 +0200
Subject: [PATCH 44/68] fix(wallet-dashboard): group timelocked staked objects

---
 .../app/dashboard/vesting/page.tsx            | 50 +++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index a9fd3b79b83..258580189df 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -13,7 +13,14 @@ import {
     useGetTimelockedStakedObjects,
 } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
-import { DelegatedTimelockedStake } from '@iota/iota-sdk/client';
+import { DelegatedTimelockedStake, TimelockedStake } from '@iota/iota-sdk/client';
+
+type TimelockedStakedObjectsGrouped = {
+    validatorAddress: string;
+    startEpoch: string;
+    label: string | null | undefined;
+    stakes: TimelockedStake[];
+};
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
@@ -24,12 +31,43 @@ function VestingDashboardPage(): JSX.Element {
     });
     const { data: timelockedStakedObjects } = useGetTimelockedStakedObjects(account?.address || '');
 
+    const timelockedStakedObjectsGrouped: TimelockedStakedObjectsGrouped[] = groupByFields(
+        timelockedStakedObjects || [],
+    );
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
     const vestingSchedule = getVestingOverview(
         [...timelockedMapped, ...(timelockedStakedObjects || [])],
         Number(currentEpochMs),
     );
 
+    function groupByFields(myArray: DelegatedTimelockedStake[]): TimelockedStakedObjectsGrouped[] {
+        const groupedArray: TimelockedStakedObjectsGrouped[] = [];
+
+        myArray.forEach((obj) => {
+            obj.stakes.forEach((stake) => {
+                let group = groupedArray.find(
+                    (g) =>
+                        g.validatorAddress === obj.validatorAddress &&
+                        g.startEpoch === stake.stakeRequestEpoch &&
+                        g.label === stake.label,
+                );
+
+                if (!group) {
+                    group = {
+                        validatorAddress: obj.validatorAddress,
+                        startEpoch: stake.stakeRequestEpoch,
+                        label: stake.label,
+                        stakes: [],
+                    };
+                    groupedArray.push(group);
+                }
+                group.stakes.push(stake);
+            });
+        });
+
+        return groupedArray;
+    }
+
     function getValidatorName(validatorAddress: string): string {
         return (
             activeValidators?.find(
@@ -38,7 +76,7 @@ function VestingDashboardPage(): JSX.Element {
         );
     }
 
-    function handleUnstake(delegatedTimelockedStake: DelegatedTimelockedStake): void {
+    function handleUnstake(delegatedTimelockedStake: TimelockedStakedObjectsGrouped): void {
         // TODO: handle unstake logic
         console.info('delegatedTimelockedStake', delegatedTimelockedStake);
     }
@@ -82,10 +120,14 @@ function VestingDashboardPage(): JSX.Element {
                     </div>
                 </div>
                 <div className="flex w-full flex-col items-center justify-center space-y-4 pt-4">
-                    {timelockedStakedObjects?.map((timelockedStakedObject) => {
+                    {timelockedStakedObjectsGrouped?.map((timelockedStakedObject) => {
                         return (
                             <div
-                                key={timelockedStakedObject.stakingPool}
+                                key={
+                                    timelockedStakedObject.validatorAddress +
+                                    timelockedStakedObject.startEpoch +
+                                    timelockedStakedObject.label
+                                }
                                 className="flex w-full flex-row items-center justify-center space-x-4"
                             >
                                 <span>

From d3a4f6914e824ad49370ea5f3e3c0adedc43facb Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 26 Aug 2024 14:26:30 +0200
Subject: [PATCH 45/68] fix(wallet-dashboard): add waitForTransactionBlock to
 collect function

---
 .../app/dashboard/vesting/page.tsx            | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 6b4f799e576..ee02f6ca0ef 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -18,12 +18,17 @@ import {
     useGetStakedTimelockedObjects,
     useUnlockTimelockedObjects,
 } from '@iota/core';
-import { useCurrentAccount, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
+import {
+    useCurrentAccount,
+    useIotaClient,
+    useSignAndExecuteTransactionBlock,
+} from '@iota/dapp-kit';
 import { useQueryClient } from '@tanstack/react-query';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
     const queryClient = useQueryClient();
+    const iotaClient = useIotaClient();
 
     const { addNotification } = useNotifications();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
@@ -51,6 +56,27 @@ function VestingDashboardPage(): JSX.Element {
         unlockedTimelockedObjectIds,
     );
 
+    function handleOnSuccess(digest: string): void {
+        iotaClient
+            .waitForTransactionBlock({
+                digest,
+            })
+            .then(() => {
+                queryClient.invalidateQueries({
+                    queryKey: ['get-staked-timelocked-objects', account?.address],
+                });
+                queryClient.invalidateQueries({
+                    queryKey: [
+                        'get-all-owned-objects',
+                        account?.address,
+                        {
+                            StructType: TIMELOCK_IOTA_TYPE,
+                        },
+                    ],
+                });
+            });
+    }
+
     const handleCollect = () => {
         if (!unlockAllTimelockedObjects?.transactionBlock) {
             addNotification('Failed to create a Transaction', NotificationType.Error);
@@ -61,17 +87,17 @@ function VestingDashboardPage(): JSX.Element {
                 transactionBlock: unlockAllTimelockedObjects.transactionBlock,
             },
             {
-                onSuccess: () => {
-                    queryClient.invalidateQueries({
-                        queryKey: ['get-all-timelocked-objects'],
-                    });
-                    addNotification('Transaction has been sent');
-                },
-                onError: () => {
-                    addNotification('Transaction was not sent', NotificationType.Error);
+                onSuccess: (tx) => {
+                    handleOnSuccess(tx.digest);
                 },
             },
-        );
+        )
+            .then(() => {
+                addNotification('Collect transaction has been sent');
+            })
+            .catch(() => {
+                addNotification('Collect transaction was not sent', NotificationType.Error);
+            });
     };
     const handleStake = () => {
         console.log('Stake');

From 3a7363333168297b8a3ec253d8901163c60f02eb Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Mon, 26 Aug 2024 16:14:15 +0200
Subject: [PATCH 46/68] fix(wallet-dashboard): move
 groupTimelockedStakedObjects to timelock util

---
 .../app/dashboard/vesting/page.tsx            | 38 +------------------
 apps/wallet-dashboard/lib/utils/timelock.ts   | 35 +++++++++++++++++
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index c3e16045709..5f5b2db4535 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -6,11 +6,12 @@
 import { Button } from '@/components';
 import { useGetCurrentEpochStartTimestamp, useNotifications } from '@/hooks';
 import {
-    ExtendedDelegatedTimelockedStake,
     formatDelegatedTimelockedStake,
     getVestingOverview,
+    groupTimelockedStakedObjects,
     isTimelockedUnlocked,
     mapTimelockObjects,
+    TimelockedStakedObjectsGrouped,
 } from '@/lib/utils';
 import { NotificationType } from '@/stores/notificationStore';
 import {
@@ -27,13 +28,6 @@ import {
 } from '@iota/dapp-kit';
 import { useQueryClient } from '@tanstack/react-query';
 
-type TimelockedStakedObjectsGrouped = {
-    validatorAddress: string;
-    startEpoch: string;
-    label: string | null | undefined;
-    stakes: ExtendedDelegatedTimelockedStake[];
-};
-
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
     const queryClient = useQueryClient();
@@ -59,34 +53,6 @@ function VestingDashboardPage(): JSX.Element {
         Number(currentEpochMs),
     );
 
-    function groupTimelockedStakedObjects(
-        extendedDelegatedTimelockedStake: ExtendedDelegatedTimelockedStake[],
-    ): TimelockedStakedObjectsGrouped[] {
-        const groupedArray: TimelockedStakedObjectsGrouped[] = [];
-
-        extendedDelegatedTimelockedStake.forEach((obj) => {
-            let group = groupedArray.find(
-                (g) =>
-                    g.validatorAddress === obj.validatorAddress &&
-                    g.startEpoch === obj.stakeRequestEpoch &&
-                    g.label === obj.label,
-            );
-
-            if (!group) {
-                group = {
-                    validatorAddress: obj.validatorAddress,
-                    startEpoch: obj.stakeRequestEpoch,
-                    label: obj.label,
-                    stakes: [],
-                };
-                groupedArray.push(group);
-            }
-            group.stakes.push(obj);
-        });
-
-        return groupedArray;
-    }
-
     function getValidatorName(validatorAddress: string): string {
         return (
             activeValidators?.find(
diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index 181e72cd6bc..7682531d5dc 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -9,6 +9,13 @@ export type ExtendedDelegatedTimelockedStake = TimelockedStake & {
     stakingPool: string;
 };
 
+export type TimelockedStakedObjectsGrouped = {
+    validatorAddress: string;
+    startEpoch: string;
+    label: string | null | undefined;
+    stakes: ExtendedDelegatedTimelockedStake[];
+};
+
 export function isTimelockedStakedIota(
     obj: TimelockedObject | ExtendedDelegatedTimelockedStake,
 ): obj is ExtendedDelegatedTimelockedStake {
@@ -69,3 +76,31 @@ export function formatDelegatedTimelockedStake(
         });
     });
 }
+
+export function groupTimelockedStakedObjects(
+    extendedDelegatedTimelockedStake: ExtendedDelegatedTimelockedStake[],
+): TimelockedStakedObjectsGrouped[] {
+    const groupedArray: TimelockedStakedObjectsGrouped[] = [];
+
+    extendedDelegatedTimelockedStake.forEach((obj) => {
+        let group = groupedArray.find(
+            (g) =>
+                g.validatorAddress === obj.validatorAddress &&
+                g.startEpoch === obj.stakeRequestEpoch &&
+                g.label === obj.label,
+        );
+
+        if (!group) {
+            group = {
+                validatorAddress: obj.validatorAddress,
+                startEpoch: obj.stakeRequestEpoch,
+                label: obj.label,
+                stakes: [],
+            };
+            groupedArray.push(group);
+        }
+        group.stakes.push(obj);
+    });
+
+    return groupedArray;
+}

From 16ec8ff994e7d2b4985bb60236af7b41a0456672 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 08:31:05 +0200
Subject: [PATCH 47/68] fix(wallet-dashboard): rename
 useUnlockTimelockedObjects hook

---
 apps/core/src/hooks/index.ts                                  | 2 +-
 ...kedObjects.ts => useUnlockTimelockedObjectsTransaction.ts} | 2 +-
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename apps/core/src/hooks/{useUnlockTimelockedObjects.ts => useUnlockTimelockedObjectsTransaction.ts} (90%)

diff --git a/apps/core/src/hooks/index.ts b/apps/core/src/hooks/index.ts
index e44a7687e45..197a14912b4 100644
--- a/apps/core/src/hooks/index.ts
+++ b/apps/core/src/hooks/index.ts
@@ -34,7 +34,7 @@ export * from './useExtendedTransactionSummary';
 export * from './useSortedCoinsByCategories';
 export * from './useGetNFTMeta';
 export * from './useIotaAddressValidation';
-export * from './useUnlockTimelockedObjects';
+export * from './useUnlockTimelockedObjectsTransaction';
 export * from './useGetAllOwnedObjects';
 export * from './useGetStakedTimelockedObjects';
 
diff --git a/apps/core/src/hooks/useUnlockTimelockedObjects.ts b/apps/core/src/hooks/useUnlockTimelockedObjectsTransaction.ts
similarity index 90%
rename from apps/core/src/hooks/useUnlockTimelockedObjects.ts
rename to apps/core/src/hooks/useUnlockTimelockedObjectsTransaction.ts
index 27f2ccc77d7..6e97751de56 100644
--- a/apps/core/src/hooks/useUnlockTimelockedObjects.ts
+++ b/apps/core/src/hooks/useUnlockTimelockedObjectsTransaction.ts
@@ -5,7 +5,7 @@ import { useIotaClient } from '@iota/dapp-kit';
 import { createUnlockTimelockedObjectsTransaction } from '../utils';
 import { useQuery } from '@tanstack/react-query';
 
-export function useUnlockTimelockedObjects(address: string, objectIds: string[]) {
+export function useUnlockTimelockedObjectsTransaction(address: string, objectIds: string[]) {
     const client = useIotaClient();
 
     return useQuery({
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index ee02f6ca0ef..075b782edbe 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -16,7 +16,7 @@ import {
     TIMELOCK_IOTA_TYPE,
     useGetAllOwnedObjects,
     useGetStakedTimelockedObjects,
-    useUnlockTimelockedObjects,
+    useUnlockTimelockedObjectsTransaction,
 } from '@iota/core';
 import {
     useCurrentAccount,
@@ -51,7 +51,7 @@ function VestingDashboardPage(): JSX.Element {
     );
     const unlockedTimelockedObjectIds: string[] =
         unlockedTimelockedObjects.map((timelocked) => timelocked.id.id) || [];
-    const { data: unlockAllTimelockedObjects } = useUnlockTimelockedObjects(
+    const { data: unlockAllTimelockedObjects } = useUnlockTimelockedObjectsTransaction(
         account?.address || '',
         unlockedTimelockedObjectIds,
     );

From 5d6d8b98132cef5664c952d19153363b6a0967d7 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 09:24:20 +0200
Subject: [PATCH 48/68] fix(wallet-dashboard): rename isTimelockedUnlockable
 function

---
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx | 4 ++--
 apps/wallet-dashboard/lib/utils/timelock.ts          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 075b782edbe..2d32eed888c 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -8,7 +8,7 @@ import { useGetCurrentEpochStartTimestamp, useNotifications } from '@/hooks';
 import {
     formatDelegatedTimelockedStake,
     getVestingOverview,
-    isTimelockedUnlocked,
+    isTimelockedUnlockable,
     mapTimelockObjects,
 } from '@/lib/utils';
 import { NotificationType } from '@/stores/notificationStore';
@@ -47,7 +47,7 @@ function VestingDashboardPage(): JSX.Element {
     );
 
     const unlockedTimelockedObjects = timelockedMapped?.filter((timelockedObject) =>
-        isTimelockedUnlocked(timelockedObject, Number(currentEpochMs)),
+        isTimelockedUnlockable(timelockedObject, Number(currentEpochMs)),
     );
     const unlockedTimelockedObjectIds: string[] =
         unlockedTimelockedObjects.map((timelocked) => timelocked.id.id) || [];
diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index 181e72cd6bc..cd1fa17aac6 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -23,7 +23,7 @@ export function isTimelockedObject(
     return referenceProperty in obj;
 }
 
-export function isTimelockedUnlocked(
+export function isTimelockedUnlockable(
     timelockedObject: TimelockedObject | ExtendedDelegatedTimelockedStake,
     currentEpochMs: number,
 ): boolean {

From e40a80d565cf936478e840a5dc1486379bc3827a Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 09:32:28 +0200
Subject: [PATCH 49/68] fix(wallet-dashboard): vesting tests

---
 .../lib/constants/vesting.constants.ts        | 377 ------------------
 .../lib/utils/vesting/vesting.spec.ts         |  44 +-
 2 files changed, 24 insertions(+), 397 deletions(-)

diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index 67ad3687aa6..9de1e522112 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -659,380 +659,3 @@ export const MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS: DelegatedTimelockedStake[
         ],
     },
 ];
-
-export const MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS: (
-    | TimelockedObject
-    | DelegatedTimelockedStake
-)[] = [
-    {
-        id: { id: '0x286b2c0317cc9dcfb8cc571c5f6b92c2f69b4d9666580b454291b0946fc3b37b' },
-        locked: { value: 589 },
-        expirationTimestampMs: 1703368800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0xe574e0d2abb35b96f8b3918f5a1fdb66e71733fd7c02dee71abdd5427e9b3431',
-        stakingPool: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0xb417430c07e03845e58fdde3f187acda86aea1e59c2c1dabd0d1d676b4845a75',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '411',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1703368800000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x38bf384d2dc4b9a5c2584432db3787d3e911231f7115a3b31fa9fd5652220e76' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1704578400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xa4c61f4c58fc899a058916bbbd0e9215b1a88c04c360ca92db50ab313974f6b6' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1705788000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x972452318c6bcf35b6a73757866c66af64e6b0284a3cac676ec70ad7c2c6cabe' },
-        locked: { value: 144 },
-        expirationTimestampMs: 1706997600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0x55fb53235e7f7dea2239f4d5e69c8fc85f35e25fac6b76500f51f2a3ea181532',
-        stakingPool: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fd',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0x7050c4d8a28eb65043c802f603e8c3c5b9af4ad5d061b78c68c914e8b2dfc01e',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '856',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1706997600000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x8be689ee351c1f455e12ea67fe21caf3989a8b029dfe79fa5bf0e47d2eac0f6a' },
-        locked: { value: 7 },
-        expirationTimestampMs: 1708207200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0x09d4bdbd96e33f5c1e1666302483a967d3d4307048c7620512bcdafbc09f6abc',
-        stakingPool: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0x6eec46a3cae99c4398df87cf3e6ebeb3893e4932e6a5dfa69cfdfe7d842258a0',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '993',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1708207200000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0xd77236288ee66f6e8d677a974efe7a0b0b5c7e6d1154da7601d9a95560186965' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1709416800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x99fb87d3a7b37bbe08d2634347ecebf11583e840e6a35c58d440b5ff3ab3c7c1' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1710626400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xcc26159c849a70969fc4b8aa4b3f7caabd8fcad107e6523ddfac6df27edea921' },
-        locked: { value: 494 },
-        expirationTimestampMs: 1711836000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0x4722f43ca6088455583c59051d1831f8ba9749c0ae0fc4e476e7a3362c9db928',
-        stakingPool: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0xdfd86394269a34a4418fcf2095994fb2952bdc59c483e9f7e43f1dc638d28ae7',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '506',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1711836000000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x479517cc209dc504575993ae9a1691e0a73301d98d63100ea8e5c253c4f79525' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1713045600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x16f4cd14e15efc95a35c9bd5e8da118fbc144aa77f1c63387e2ea438736af3fe' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1714255200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xa0924d0c92513ece94b3aa1e827e76d713c8625c1e6c8f0011be6ecfa3df3e76' },
-        locked: { value: 711 },
-        expirationTimestampMs: 1715464800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
-        stakingPool: '0x8670f828d3b82be680edee8f8cf9823ca9485e54f8728487d0aa0d367f389ab1',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0xff806527381322c9d016230b9d75f5638346aab72e1f5e291b3eb5499122934c',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '289',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1715464800000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x46e385d485df4581ae373c1ce623b4f513bf0c35ee2cc9d10f8410a3b4ee2cb6' },
-        locked: { value: 130 },
-        expirationTimestampMs: 1716674400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0x197ac9f7b5d0acd93159083ec755916ce3e5ade5cbedf7a49107c8603808069f',
-        stakingPool: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0x69d6a5af46a3bf0bce5a97d6a5c5a120293afe2031df08b787c1e0c89eef54e3',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '870',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1716674400000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x7c056b2af944745852e505086cc793b72e3325ccf7c3c71ec0544f7d49925621' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1717884000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0xac214e255e243a7e1aceef94ae7709f7200f7fccbefef67497c59aac4b95b6f8' },
-        locked: { value: 868 },
-        expirationTimestampMs: 1719093600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0xdce49e0aae09e8643dc997a99bfa7a927247fa2be4de350a970244a8d91ff672',
-        stakingPool: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0x8d1fa6d30174054a212edf409026a4c9427987361103f7b74797515f860ed763',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '132',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1719093600000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x92bcfa0735940ff8682abe71b0d431712a3ff921b94f1c43b21f51c124e17efd' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1720303200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x15a8796a100bbb71a2fe95d987b3b961f1980293673ea19a320d42ae0dd557c6' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1721512800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x3ddcf7812912bdf7d1c7d015ea418c0734698c6ff5fa0a6d737103709539effc' },
-        locked: { value: 103 },
-        expirationTimestampMs: 1722722400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0x1cb238a7c0dddf9ffae6857821518397d68662826ee8361de16d6caece41f1ab',
-        stakingPool: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0x69dfc02157f9033d71677586fbb78c091a9c885dc93cc6f3b312c0aee94c64d3',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '897',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1722722400000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x84960f357289ecf9b81ced44bc5d80b1868b6d3816183a3b56b8690425a4bfa3' },
-        locked: { value: 299 },
-        expirationTimestampMs: 1723932000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0x53f54d864faa6287d17a53b806bc3f2127d8b32e62303dd6d729c2809f715336',
-        stakingPool: '0x7f61357fa975841cacaa9a5776ea84a8ec8d7d5a7daa0dc7fa8a7c236482af1d',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0xdc88e1f7c5323a0f7009a1cde781e4e61a375400e7a390c88886d8cd55169d5d',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '701',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1723932000000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0xba31794b7a1dbf11975b08e571fa07346b546678e8460f88d87d55ddba040478' },
-        locked: { value: 500 },
-        expirationTimestampMs: 1725141600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0x17693a56211258fcd5a994a007704fdd9967b52851451b46d6ba330812a5cc3f',
-        stakingPool: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0xbe72eb343db6325370586436a4dfc5e248bb009fd93651fc574da4879ee7041d',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '500',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1725141600000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x10e6438bff39079e4518dcb1a87ba95ca65c287b593a0bf9079dabdf77d6233d' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1726351200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x8ab5eff4f36b1ba0d99624ce8285362784e9bcb4ab18e7553ed9f74d1d521fce' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1727560800000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x72d7f86677cf4fcc7397a9f62af722a7290e072150f457f60d0548d7b712c22c' },
-        locked: { value: 1000 },
-        expirationTimestampMs: 1728770400000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        id: { id: '0x1672412d036ad1610f8f8c39b71babfd0a0f0a03d3c8b637635d327842132acd' },
-        locked: { value: 347 },
-        expirationTimestampMs: 1729980000000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0x8327bbe04ac8dc866d6f18c98a20ee3137c26ccc72b62effca73402e055a57d7',
-        stakingPool: '0x2a0abc81a99e44e3dc9ec656f56cc99e1fdbd76137dd882116ab7281298df6fc',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0x993b8db7d52e20e24fee279d0effd380f9731c1d07bea6abac545357ca73d316',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '653',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1729980000000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x1de6fd9da4de9ac869f728060b659c9fb170669213c476adc6763a03c25809c5' },
-        locked: { value: 792 },
-        expirationTimestampMs: 1731189600000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0xd7ad38945ecb7ca6eeaadbf321703b263b4f6ef714e211d00b2aa8fe241fce0c',
-        stakingPool: '0xcd707a1c55ced6a8ed6d3fc1893a4578b5d840e4555200bf154978619b5599a8',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0x850dc90cacec45a555a05f9be3c1b3a828d43bfd7fcaf7c8789319d1369832af',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '208',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1731189600000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-    {
-        id: { id: '0x900469a81978d06246234dcf508ff1180b1521184373b87b40c83ae42466b2dc' },
-        locked: { value: 49 },
-        expirationTimestampMs: 1732399200000,
-        label: SUPPLY_INCREASE_VESTING_LABEL,
-    },
-    {
-        validatorAddress: '0xfae93493826f45ac789f3319316aa55f1a707c171c9edfae5c12b845713163d1',
-        stakingPool: '0x5f71be4051e4c0dc71e97c35e6b76228b3b5ef081eea6ac94eef895c461754aa',
-        stakes: [
-            {
-                timelockedStakedIotaId:
-                    '0xd194fa4d9a909baec026d8d67e33a85a9d36921df7a47288ed3e8a5eae9b8b9c',
-                stakeRequestEpoch: '873',
-                stakeActiveEpoch: '874',
-                principal: '951',
-                status: 'Active',
-                estimatedReward: '125059068',
-                expirationTimestampMs: '1732399200000',
-                label: SUPPLY_INCREASE_VESTING_LABEL,
-            },
-        ],
-    },
-];
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts
index bbdfb62ca26..03f464500a6 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.spec.ts
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import {
-    MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS,
     MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS,
     MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS,
     SUPPLY_INCREASE_STAKER_VESTING_DURATION,
@@ -10,7 +9,7 @@ import {
 } from '../../constants';
 
 import { SupplyIncreaseUserType, SupplyIncreaseVestingPayout } from '../../interfaces';
-import { isTimelockedObject, isTimelockedStakedIota } from '../timelock';
+import { formatDelegatedTimelockedStake, isTimelockedObject } from '../timelock';
 
 import {
     getVestingOverview,
@@ -74,8 +73,9 @@ describe('build supply increase staker vesting portfolio', () => {
 
     it('should build properly with mocked timelocked staked objects', () => {
         const timelockedStakedObjects = MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS;
-
-        const lastPayout = getLastSupplyIncreaseVestingPayout(timelockedStakedObjects);
+        const extendedTimelockedStakedObjects =
+            formatDelegatedTimelockedStake(timelockedStakedObjects);
+        const lastPayout = getLastSupplyIncreaseVestingPayout(extendedTimelockedStakedObjects);
 
         expect(lastPayout).toBeDefined();
 
@@ -87,14 +87,16 @@ describe('build supply increase staker vesting portfolio', () => {
     });
 
     it('should build properly with mix of mocked timelocked and timelocked staked objects', () => {
-        const mixedObjects = MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS;
+        const timelockedObjects = MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS;
+        const timelockedStakedObjects = MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS;
+        const extendedTimelockedStakedObjects =
+            formatDelegatedTimelockedStake(timelockedStakedObjects);
+        const mixedObjects = [...timelockedObjects, ...extendedTimelockedStakedObjects];
 
         const lastPayout = getLastSupplyIncreaseVestingPayout(mixedObjects);
-
         expect(lastPayout).toBeDefined();
 
         const vestingPortfolio = buildVestingPortfolio(lastPayout!, Date.now());
-
         expect(vestingPortfolio.length).toEqual(
             getSupplyIncreaseVestingPayoutsCount(SupplyIncreaseUserType.Staker),
         );
@@ -150,14 +152,16 @@ describe('vesting overview', () => {
 
     it('should get correct vesting overview data with timelocked staked objects', () => {
         const timelockedStakedObjects = MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS;
-        const lastPayout = timelockedStakedObjects[timelockedStakedObjects.length - 1].stakes[0];
+        const extendedTimelockedStakedObjects =
+            formatDelegatedTimelockedStake(timelockedStakedObjects);
+        const lastPayout =
+            extendedTimelockedStakedObjects[extendedTimelockedStakedObjects.length - 1];
         const lastPayoutValue = Number(lastPayout.principal);
         const totalAmount =
             SUPPLY_INCREASE_STAKER_VESTING_DURATION *
             SUPPLY_INCREASE_VESTING_PAYOUTS_IN_1_YEAR *
             lastPayoutValue;
-
-        const vestingOverview = getVestingOverview(timelockedStakedObjects, Date.now());
+        const vestingOverview = getVestingOverview(extendedTimelockedStakedObjects, Date.now());
         expect(vestingOverview.totalVested).toEqual(totalAmount);
 
         const vestingPortfolio = buildVestingPortfolio(
@@ -194,7 +198,12 @@ describe('vesting overview', () => {
     });
 
     it('should get correct vesting overview data with mixed objects', () => {
-        const mixedObjects = MOCKED_VESTING_TIMELOCKED_AND_TIMELOCK_STAKED_OBJECTS;
+        const timelockedObjects = MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS;
+        const timelockedStakedObjects = MOCKED_VESTING_TIMELOCKED_STAKED_OBJECTS;
+        const extendedTimelockedStakedObjects =
+            formatDelegatedTimelockedStake(timelockedStakedObjects);
+        const mixedObjects = [...timelockedObjects, ...extendedTimelockedStakedObjects];
+
         const lastPayout = getLastSupplyIncreaseVestingPayout(mixedObjects)!;
         const totalAmount =
             SUPPLY_INCREASE_STAKER_VESTING_DURATION *
@@ -221,15 +230,10 @@ describe('vesting overview', () => {
         expect(vestingOverview.totalLocked).toEqual(lockedAmount);
         expect(vestingOverview.totalUnlocked).toEqual(totalAmount - lockedAmount);
 
-        const timelockedStakedObjects = mixedObjects.filter(isTimelockedStakedIota);
-        let totalStaked: number = 0;
-        for (const timelockedStakedObject of timelockedStakedObjects) {
-            const stakesAmount = timelockedStakedObject.stakes.reduce(
-                (acc, current) => acc + Number(current.principal),
-                0,
-            );
-            totalStaked += stakesAmount;
-        }
+        const totalStaked = extendedTimelockedStakedObjects.reduce(
+            (acc, current) => acc + Number(current.principal),
+            0,
+        );
 
         expect(vestingOverview.totalStaked).toEqual(totalStaked);
 

From ba3d70002775f028412a2182c131dd6a4283e6bc Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 09:59:11 +0200
Subject: [PATCH 50/68] fix(tooling): linter

---
 .../explorer/src/components/home-metrics/OnTheNetwork.tsx | 8 ++++----
 .../wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/explorer/src/components/home-metrics/OnTheNetwork.tsx b/apps/explorer/src/components/home-metrics/OnTheNetwork.tsx
index 1aa0fdcc483..2b7ee68e7e5 100644
--- a/apps/explorer/src/components/home-metrics/OnTheNetwork.tsx
+++ b/apps/explorer/src/components/home-metrics/OnTheNetwork.tsx
@@ -25,8 +25,8 @@ export function OnTheNetwork(): JSX.Element {
     return (
         <Panel>
             <Title title="Network Activity" size={TitleSize.Medium} />
-            <div className="gap-md p-md--rs flex flex-col">
-                <div className="gap-md flex">
+            <div className="flex flex-col gap-md p-md--rs">
+                <div className="flex gap-md">
                     <div className="flex-1">
                         <LabelText
                             size={LabelTextSize.Large}
@@ -56,7 +56,7 @@ export function OnTheNetwork(): JSX.Element {
 
                 <Divider />
 
-                <div className="gap-x-md flex">
+                <div className="flex gap-x-md">
                     <div className="flex-1">
                         <LabelText
                             size={LabelTextSize.Large}
@@ -75,7 +75,7 @@ export function OnTheNetwork(): JSX.Element {
                     </div>
                 </div>
 
-                <div className="gap-md flex">
+                <div className="flex gap-md">
                     <div className="flex-1">
                         <LabelText
                             size={LabelTextSize.Large}
diff --git a/apps/wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx b/apps/wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx
index ef5dc0c6175..abbdc9e83da 100644
--- a/apps/wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx
+++ b/apps/wallet/src/ui/app/pages/home/tokens/TokensDetails.tsx
@@ -462,8 +462,8 @@ function TokenDetails({ coinType }: TokenDetailsProps) {
                     className="flex h-full flex-1 flex-grow flex-col items-center gap-8"
                     data-testid="coin-page"
                 >
-                    <div className="gap-lg flex w-full items-center justify-between px-sm py-lg">
-                        <div className="gap-xs flex flex-col">
+                    <div className="flex w-full items-center justify-between gap-lg px-sm py-lg">
+                        <div className="flex flex-col gap-xs">
                             <div>
                                 <Address
                                     isExternal={!!explorerHref}
@@ -480,7 +480,7 @@ function TokenDetails({ coinType }: TokenDetailsProps) {
                             </div>
                             <CoinBalance amount={tokenBalance} type={activeCoinType} />
                         </div>
-                        <div className="gap-xs flex [&_svg]:h-5 [&_svg]:w-5">
+                        <div className="flex gap-xs [&_svg]:h-5 [&_svg]:w-5">
                             <Button
                                 onClick={() => setDialogReceiveOpen(true)}
                                 type={ButtonType.Secondary}
@@ -616,7 +616,7 @@ function DialogReceiveTokens({
                             <Address text={address} />
                         </div>
                     </DialogBody>
-                    <div className="px-md--rs pb-md--rs pt-sm--rs flex w-full flex-row justify-center gap-2">
+                    <div className="flex w-full flex-row justify-center gap-2 px-md--rs pb-md--rs pt-sm--rs">
                         <Button onClick={onCopy} fullWidth text="Copy Address" />
                     </div>
                 </DialogContent>

From cb5710c756d74e6ac6993daaafe11e4ebc5e68a7 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 10:18:56 +0200
Subject: [PATCH 51/68] fix(wallet-dashboard): bad merge

---
 apps/wallet-dashboard/lib/utils/timelock.ts | 35 +++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index cd1fa17aac6..aaa829a3eb2 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -9,6 +9,13 @@ export type ExtendedDelegatedTimelockedStake = TimelockedStake & {
     stakingPool: string;
 };
 
+export type TimelockedStakedObjectsGrouped = {
+    validatorAddress: string;
+    startEpoch: string;
+    label: string | null | undefined;
+    stakes: ExtendedDelegatedTimelockedStake[];
+};
+
 export function isTimelockedStakedIota(
     obj: TimelockedObject | ExtendedDelegatedTimelockedStake,
 ): obj is ExtendedDelegatedTimelockedStake {
@@ -69,3 +76,31 @@ export function formatDelegatedTimelockedStake(
         });
     });
 }
+
+export function groupTimelockedStakedObjects(
+    extendedDelegatedTimelockedStake: ExtendedDelegatedTimelockedStake[],
+): TimelockedStakedObjectsGrouped[] {
+    const groupedArray: TimelockedStakedObjectsGrouped[] = [];
+
+    extendedDelegatedTimelockedStake.forEach((obj) => {
+        let group = groupedArray.find(
+            (g) =>
+                g.validatorAddress === obj.validatorAddress &&
+                g.startEpoch === obj.stakeRequestEpoch &&
+                g.label === obj.label,
+        );
+
+        if (!group) {
+            group = {
+                validatorAddress: obj.validatorAddress,
+                startEpoch: obj.stakeRequestEpoch,
+                label: obj.label,
+                stakes: [],
+            };
+            groupedArray.push(group);
+        }
+        group.stakes.push(obj);
+    });
+
+    return groupedArray;
+}

From df1e894ee96919a93c982cc01c6d67fc9775213f Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 11:15:22 +0200
Subject: [PATCH 52/68] fix(wallet-dashboard): improvement startEpoch value

---
 apps/wallet-dashboard/lib/utils/timelock.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index aaa829a3eb2..099a370dcc5 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -83,17 +83,18 @@ export function groupTimelockedStakedObjects(
     const groupedArray: TimelockedStakedObjectsGrouped[] = [];
 
     extendedDelegatedTimelockedStake.forEach((obj) => {
+        const startStakeEpoch = obj.stakeRequestEpoch + 1
         let group = groupedArray.find(
             (g) =>
                 g.validatorAddress === obj.validatorAddress &&
-                g.startEpoch === obj.stakeRequestEpoch &&
+                g.startEpoch === startStakeEpoch &&
                 g.label === obj.label,
         );
 
         if (!group) {
             group = {
                 validatorAddress: obj.validatorAddress,
-                startEpoch: obj.stakeRequestEpoch,
+                startEpoch: startStakeEpoch,
                 label: obj.label,
                 stakes: [],
             };

From da3c5879dbc31bc5df5aa318ff5677d7219e2c01 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 11:25:45 +0200
Subject: [PATCH 53/68] fix(wallet-dashboard): rename startEpoch to
 stakeRequestEpoch in TimelockedStakedObjectsGrouped interface

---
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx | 6 ++++--
 apps/wallet-dashboard/lib/utils/timelock.ts          | 7 +++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index cd687f9c61b..46c39c6c703 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -167,7 +167,7 @@ function VestingDashboardPage(): JSX.Element {
                             <div
                                 key={
                                     timelockedStakedObject.validatorAddress +
-                                    timelockedStakedObject.startEpoch +
+                                    timelockedStakedObject.stakeRequestEpoch +
                                     timelockedStakedObject.label
                                 }
                                 className="flex w-full flex-row items-center justify-center space-x-4"
@@ -176,7 +176,9 @@ function VestingDashboardPage(): JSX.Element {
                                     Validator:{' '}
                                     {getValidatorName(timelockedStakedObject.validatorAddress)}
                                 </span>
-                                <span>Start Epoch: {timelockedStakedObject.startEpoch}</span>
+                                <span>
+                                    Stake Request Epoch: {timelockedStakedObject.stakeRequestEpoch}
+                                </span>
                                 <span>Stakes: {timelockedStakedObject.stakes.length}</span>
 
                                 <Button onClick={() => handleUnstake(timelockedStakedObject)}>
diff --git a/apps/wallet-dashboard/lib/utils/timelock.ts b/apps/wallet-dashboard/lib/utils/timelock.ts
index 099a370dcc5..90c77c0ba9f 100644
--- a/apps/wallet-dashboard/lib/utils/timelock.ts
+++ b/apps/wallet-dashboard/lib/utils/timelock.ts
@@ -11,7 +11,7 @@ export type ExtendedDelegatedTimelockedStake = TimelockedStake & {
 
 export type TimelockedStakedObjectsGrouped = {
     validatorAddress: string;
-    startEpoch: string;
+    stakeRequestEpoch: string;
     label: string | null | undefined;
     stakes: ExtendedDelegatedTimelockedStake[];
 };
@@ -83,18 +83,17 @@ export function groupTimelockedStakedObjects(
     const groupedArray: TimelockedStakedObjectsGrouped[] = [];
 
     extendedDelegatedTimelockedStake.forEach((obj) => {
-        const startStakeEpoch = obj.stakeRequestEpoch + 1
         let group = groupedArray.find(
             (g) =>
                 g.validatorAddress === obj.validatorAddress &&
-                g.startEpoch === startStakeEpoch &&
+                g.stakeRequestEpoch === obj.stakeRequestEpoch &&
                 g.label === obj.label,
         );
 
         if (!group) {
             group = {
                 validatorAddress: obj.validatorAddress,
-                startEpoch: startStakeEpoch,
+                stakeRequestEpoch: obj.stakeRequestEpoch,
                 label: obj.label,
                 stakes: [],
             };

From cf7b0edc4eb9238f80dcdf4c3fe75d64fe6a7330 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 11:27:04 +0200
Subject: [PATCH 54/68] fix(wallet-dashboard): update merge conflicts

---
 .../Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
index f966851a1db..0c965b0b5d5 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/VestingPopup/TimelockedUnstakePopup.tsx
@@ -57,7 +57,7 @@ function TimelockedUnstakePopup({
         <div className="flex min-w-[300px] flex-col gap-2">
             <p>Validator Name: {validatorInfo.name}</p>
             <p>Validator Address: {delegatedStake.validatorAddress}</p>
-            <p>Start Epoch: {delegatedStake.startEpoch}</p>
+            <p>Stake Request Epoch: {delegatedStake.stakeRequestEpoch}</p>
             <p>Rewards: {validatorInfo.rewardsPool}</p>
             <p>Total Stakes: {delegatedStake.stakes.length}</p>
             {delegatedStake.stakes.map((stake, index) => {

From 619c6ac3158fa41f2414b7c42400b43749dff6ab Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 11:54:52 +0200
Subject: [PATCH 55/68] fix(wallet-dashboard): improve styles

---
 .../app/dashboard/vesting/page.tsx            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 2c776fd9f5e..9c741800914 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -201,17 +201,17 @@ function VestingDashboardPage(): JSX.Element {
                         );
                     })}
                 </div>
+                {account?.address && (
+                    <div className="flex flex-row space-x-4">
+                        {vestingSchedule.availableClaiming ? (
+                            <Button onClick={handleCollect}>Collect</Button>
+                        ) : null}
+                        {vestingSchedule.availableStaking ? (
+                            <Button onClick={handleStake}>Stake</Button>
+                        ) : null}
+                    </div>
+                )}
             </div>
-            {account?.address && (
-                <div className="flex flex-row space-x-4">
-                    {vestingSchedule.availableClaiming ? (
-                        <Button onClick={handleCollect}>Collect</Button>
-                    ) : null}
-                    {vestingSchedule.availableStaking ? (
-                        <Button onClick={handleStake}>Stake</Button>
-                    ) : null}
-                </div>
-            )}
         </div>
     );
 }

From c24779c6f06cde02b3dea53980ce0dce23267ca0 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Tue, 27 Aug 2024 12:11:47 +0200
Subject: [PATCH 56/68] fix(wallet-dashboard): rename key to invalidate query

---
 apps/wallet-dashboard/app/dashboard/vesting/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 9c741800914..21c24456449 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -77,7 +77,7 @@ function VestingDashboardPage(): JSX.Element {
             })
             .then(() => {
                 queryClient.invalidateQueries({
-                    queryKey: ['get-staked-timelocked-objects', account?.address],
+                    queryKey: ['get-timelocked-staked-objects', account?.address],
                 });
                 queryClient.invalidateQueries({
                     queryKey: [

From bd1eada3b91acff749426f7a7c2ace62505db54a Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Tue, 27 Aug 2024 17:44:29 +0200
Subject: [PATCH 57/68] fix: polish variable naming and creation of timelocked
 staking tx

---
 .../stake/createTimelockedStakeTransaction.ts | 24 +++++-----
 .../app/dashboard/vesting/page.tsx            |  3 --
 .../Popups/NewStakePopup/NewStakePopup.tsx    | 34 ++++++++++++--
 .../hooks/useNewStakeTransaction.ts           | 25 +++--------
 .../lib/utils/vesting/vesting.ts              | 44 +++++++++----------
 5 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index 007ee9c82a8..4bde7f2fac1 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -4,7 +4,7 @@
 import { TransactionBlock, TransactionObjectArgument } from '@iota/iota-sdk/transactions';
 import { IOTA_SYSTEM_STATE_OBJECT_ID, IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 
-export interface VestingObject {
+export interface ExtendedTimelockObject {
     objectId: string;
     expirationTimestamp: string;
     totalLockedAmount: bigint;
@@ -14,14 +14,14 @@ export interface VestingObject {
 }
 
 export function createTimelockedStakeTransaction(
-    vestingObjects: VestingObject[],
+    timelockedObjects: ExtendedTimelockObject[],
     validatorAddress: string,
 ) {
     const tx = new TransactionBlock();
     /**
-     * Create tranasctions to merge Vesting Objects that need merging
+     * Create tranasctions to merge timelocked objects that need merging
      */
-    const mergeObjects = vestingObjects.filter((obj) => obj.objectIds.length > 1);
+    const mergeObjects = timelockedObjects.filter((obj) => obj.objectIds.length > 1);
 
     for (const mergeObject of mergeObjects) {
         // create an array of objectIds to be merged without the first element because first element is the principal object and its id is contained in mergeObject.objectId
@@ -38,25 +38,25 @@ export function createTimelockedStakeTransaction(
         });
     }
     /**
-     * Create transactions to split Vesting Objects that need splitting.
+     * Create transactions to split timelocked objects that need splitting.
      */
-    const splitVestingObject: VestingObject[] = vestingObjects.filter(
+    const splitTimelockedObjects: ExtendedTimelockObject[] = timelockedObjects.filter(
         (obj) => obj.splitAmount !== undefined && obj.splitAmount > 0,
     );
-    const splitVestingTransactions: TransactionObjectArgument[] = [];
-    splitVestingObject.forEach((obj) => {
+    const splitTimelockedObjectTransactions: TransactionObjectArgument[] = [];
+    splitTimelockedObjects.forEach((obj) => {
         const [splitTx] = tx.moveCall({
             target: `0x02::timelock::split`,
             typeArguments: [`${IOTA_TYPE_ARG}`],
             arguments: [tx.object(obj.objectId), tx.pure.u64(obj.splitAmount!)],
         });
-        splitVestingTransactions.push(tx.object(splitTx));
+        splitTimelockedObjectTransactions.push(tx.object(splitTx));
     });
 
     /**
-     * Create transactions to stake the vesting objects
+     * Create transactions to stake the timelocked objects
      */
-    const stakingReadyObjects = vestingObjects
+    const stakingReadyObjects = timelockedObjects
         .filter((obj) => obj.splitAmount === undefined || obj.splitAmount === BigInt(0))
         .map((obj) => tx.object(obj.objectId));
     tx.moveCall({
@@ -67,7 +67,7 @@ export function createTimelockedStakeTransaction(
                 initialSharedVersion: 1,
                 mutable: true,
             }),
-            tx.makeMoveVec({ objects: [...splitVestingTransactions, ...stakingReadyObjects] }), // add the split object to the array of timelocked objects
+            tx.makeMoveVec({ objects: [...splitTimelockedObjectTransactions, ...stakingReadyObjects] }), // add the split object to the array of timelocked objects
             tx.pure.address(validatorAddress),
         ],
     });
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 426fd1d008c..35ce3c55ea8 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -113,9 +113,6 @@ function VestingDashboardPage(): JSX.Element {
                 addNotification('Collect transaction was not sent', NotificationType.Error);
             });
     };
-    const handleStake = () => {
-        console.log('Stake');
-    };
 
     function handleUnstake(delegatedTimelockedStake: TimelockedStakedObjectsGrouped): void {
         const validatorInfo = getValidatorByAddress(delegatedTimelockedStake.validatorAddress);
diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
index 19e41d96bfc..ff8845e76bb 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
@@ -3,11 +3,23 @@
 
 import React, { useState } from 'react';
 import { EnterAmountView, SelectValidatorView } from './views';
-import { useNotifications, useNewStakeTransaction } from '@/hooks';
-import { parseAmount, useCoinMetadata, useGetValidatorsApy } from '@iota/core';
+import {
+    useNotifications,
+    useNewStakeTransaction,
+    useGetCurrentEpochStartTimestamp,
+} from '@/hooks';
+import {
+    ExtendedTimelockObject,
+    parseAmount,
+    TIMELOCK_IOTA_TYPE,
+    useCoinMetadata,
+    useGetAllOwnedObjects,
+    useGetValidatorsApy,
+} from '@iota/core';
 import { useCurrentAccount, useSignAndExecuteTransactionBlock } from '@iota/dapp-kit';
 import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 import { NotificationType } from '@/stores/notificationStore';
+import { prepareObjectsForTimelockedStakingTransaction } from '@/lib/utils';
 
 interface NewStakePopupProps {
     onClose: () => void;
@@ -29,16 +41,30 @@ function NewStakePopup({
     const [selectedValidator, setSelectedValidator] = useState<string>('');
     const [amount, setAmount] = useState<string>('');
     const account = useCurrentAccount();
+    const senderAddress = account?.address ?? '';
 
     const { data: metadata } = useCoinMetadata(IOTA_TYPE_ARG);
     const coinDecimals = metadata?.decimals ?? 0;
     const amountWithoutDecimals = parseAmount(amount, coinDecimals);
+    const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
+    const { data: timelockedObjects } = useGetAllOwnedObjects(senderAddress, {
+        StructType: TIMELOCK_IOTA_TYPE,
+    });
+
+    let extendedTimelockObjects: ExtendedTimelockObject[] = [];
+    if (isTimelockedStaking && timelockedObjects && currentEpochMs) {
+        extendedTimelockObjects = prepareObjectsForTimelockedStakingTransaction(
+            timelockedObjects,
+            amountWithoutDecimals,
+            currentEpochMs,
+        );
+    }
 
     const { data: newStakeData } = useNewStakeTransaction(
         selectedValidator,
         amountWithoutDecimals,
-        account?.address ?? '',
-        isTimelockedStaking,
+        senderAddress,
+        extendedTimelockObjects,
     );
 
     const { mutateAsync: signAndExecuteTransactionBlock } = useSignAndExecuteTransactionBlock();
diff --git a/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts b/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
index ed8efdf3d40..e45ba0175be 100644
--- a/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
+++ b/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
@@ -1,43 +1,30 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { prepareObjectsForTimelockedStakingTransaction } from '@/lib/utils';
 import {
     createStakeTransaction,
     createTimelockedStakeTransaction,
-    TIMELOCK_IOTA_TYPE,
-    useGetAllOwnedObjects,
-    VestingObject,
+    ExtendedTimelockObject,
 } from '@iota/core';
 import { useIotaClient } from '@iota/dapp-kit';
 import { useQuery } from '@tanstack/react-query';
-import { useGetCurrentEpochStartTimestamp } from './useGetCurrentEpochStartTimestamp';
 
 export function useNewStakeTransaction(
     validator: string,
     amount: bigint,
     senderAddress: string,
-    isTimelockedStaking?: boolean,
+    extendedTimelockObjects?: ExtendedTimelockObject[],
 ) {
-    let vestingObjects: VestingObject[] = [];
-    const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
-    const { data: timelockedObjects } = useGetAllOwnedObjects(senderAddress, {
-        StructType: TIMELOCK_IOTA_TYPE,
-    });
-    if (isTimelockedStaking && timelockedObjects && currentEpochMs) {
-        vestingObjects = prepareObjectsForTimelockedStakingTransaction(
-            timelockedObjects,
-            amount,
-            currentEpochMs,
-        );
-    }
+    const isTimelockedStaking =
+        extendedTimelockObjects?.length && extendedTimelockObjects?.length > 0;
+
     const client = useIotaClient();
     return useQuery({
         // eslint-disable-next-line @tanstack/query/exhaustive-deps
         queryKey: ['stake-transaction', validator, amount.toString(), senderAddress],
         queryFn: async () => {
             const transaction = isTimelockedStaking
-                ? createTimelockedStakeTransaction(vestingObjects, validator)
+                ? createTimelockedStakeTransaction(extendedTimelockObjects, validator)
                 : createStakeTransaction(amount, validator);
             transaction.setSender(senderAddress);
             await transaction.build({ client });
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 11742b8848f..49585bd3f75 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { VestingObject } from '@iota/core';
+import { ExtendedTimelockObject } from '@iota/core';
 import {
     MIN_STAKING_THRESHOLD,
     SUPPLY_INCREASE_INVESTOR_VESTING_DURATION,
@@ -213,9 +213,9 @@ export function isSupplyIncreaseVestingObject(
  * @param timelockedObjects - The array of timelocked objects to be formatted.
  * @returns An array of vesting objects.
  */
-export function getFormattedTimelockedVestingObjects(
+export function getFormattedTimelockedObjects(
     timelockedObjects: TimelockedObject[],
-): VestingObject[] {
+): ExtendedTimelockObject[] {
     const expirationMap = new Map<number, TimelockedObject[]>();
 
     timelockedObjects.forEach((timelockedObject) => {
@@ -227,7 +227,7 @@ export function getFormattedTimelockedVestingObjects(
         expirationMap.get(expirationTimestamp)!.push(timelockedObject);
     });
 
-    const result: VestingObject[] = [];
+    const result: ExtendedTimelockObject[] = [];
 
     expirationMap.forEach((objects, expirationTime) => {
         const totalLockedAmount = objects.reduce((sum, obj) => {
@@ -249,20 +249,20 @@ export function getFormattedTimelockedVestingObjects(
 }
 
 /**
- * Adjusts the split amounts in an array of vesting objects based on the total remaining amount.
- * The function iteratively splits the remaining amount among the vesting objects until the split conditions are met.
+ * Adjusts the split amounts in an array of extended timelocked objects based on the total remaining amount.
+ * The function iteratively splits the remaining amount among the timelocked objects until the split conditions are met.
  *
- * @param vestingObjects - An array of vesting objects.
- * @param totalRemainingAmount - The total remaining amount to be split among the vesting objects.
+ * @param extendedTimelockObjects - An array of extended timelocked objects.
+ * @param totalRemainingAmount - The total remaining amount to be split among the extended timelocked objects.
  */
-export function adjustSplitAmountsInVestingObjects(
-    vestingObjects: VestingObject[],
+export function adjustSplitAmountsInExtendedTimelockObjects(
+    extendedTimelockObjects: ExtendedTimelockObject[],
     totalRemainderAmount: bigint,
 ) {
     let objectsToSplit = 1;
     let splitAchieved = false;
 
-    while (!splitAchieved && objectsToSplit <= vestingObjects.length) {
+    while (!splitAchieved && objectsToSplit <= extendedTimelockObjects.length) {
         const baseRemainderAmount = totalRemainderAmount / BigInt(objectsToSplit);
         // if the amount is odd value we need to add the remainder to the first object because we floored the division
         const remainder = totalRemainderAmount % BigInt(objectsToSplit);
@@ -270,8 +270,8 @@ export function adjustSplitAmountsInVestingObjects(
         // counter for objects that have splitAmount > 0
         let foundObjectsToSplit = 0;
 
-        for (let i = 0; i < vestingObjects.length; i++) {
-            const obj = vestingObjects[i];
+        for (let i = 0; i < extendedTimelockObjects.length; i++) {
+            const obj = extendedTimelockObjects[i];
             let adjustedRemainderAmount = baseRemainderAmount;
             if (i === 0 && remainder > 0) {
                 adjustedRemainderAmount += remainder;
@@ -289,7 +289,7 @@ export function adjustSplitAmountsInVestingObjects(
         }
 
         if (!splitAchieved) {
-            vestingObjects.forEach((obj) => (obj.splitAmount = BigInt(0)));
+            extendedTimelockObjects.forEach((obj) => (obj.splitAmount = BigInt(0)));
             objectsToSplit++;
         }
     }
@@ -307,8 +307,8 @@ export function prepareObjectsForTimelockedStakingTransaction(
     timelockedObjects: IotaObjectData[],
     amount: bigint,
     currentEpochMs: string,
-) {
-    const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
+): ExtendedTimelockObject[] {
+    const timelockedMapped = mapTimelockObjects(timelockedObjects);
     const filteredTimelockedObjects = timelockedMapped
         ?.filter(isSupplyIncreaseVestingObject)
         .filter((obj: TimelockedObject) => {
@@ -318,7 +318,7 @@ export function prepareObjectsForTimelockedStakingTransaction(
             return Number(b.expirationTimestampMs) - Number(a.expirationTimestampMs);
         });
 
-    const vestingObjects: VestingObject[] = getFormattedTimelockedVestingObjects(
+    const extendedTimelockObjects: ExtendedTimelockObject[] = getFormattedTimelockedObjects(
         filteredTimelockedObjects,
     ).filter((obj) => obj.totalLockedAmount >= MIN_STAKING_THRESHOLD);
 
@@ -326,11 +326,11 @@ export function prepareObjectsForTimelockedStakingTransaction(
      * Create a subset of objects that meet the stake amount (where total combined locked amount >= STAKE_AMOUNT)
      */
     let totalLocked: bigint = BigInt(0);
-    const subsetVestingObjects: VestingObject[] = [];
+    const subsetExtendedTimelockObjects: ExtendedTimelockObject[] = [];
 
-    for (const obj of vestingObjects) {
+    for (const obj of extendedTimelockObjects) {
         totalLocked += obj.totalLockedAmount;
-        subsetVestingObjects.push(obj);
+        subsetExtendedTimelockObjects.push(obj);
         if (totalLocked >= amount) {
             break;
         }
@@ -345,8 +345,8 @@ export function prepareObjectsForTimelockedStakingTransaction(
      * Add splitAmount property to the vesting objects that need to be split
      */
     if (remainingAmount > 0) {
-        adjustSplitAmountsInVestingObjects(subsetVestingObjects, remainingAmount);
+        adjustSplitAmountsInExtendedTimelockObjects(subsetExtendedTimelockObjects, remainingAmount);
     }
 
-    return subsetVestingObjects;
+    return subsetExtendedTimelockObjects;
 }

From 0d2b81812ce9d5c949dcf1bbebce2da2aa25ec0e Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Tue, 27 Aug 2024 17:49:42 +0200
Subject: [PATCH 58/68] fix: lint

---
 apps/core/src/utils/stake/createTimelockedStakeTransaction.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index 4bde7f2fac1..9d98fdcd7c9 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -67,7 +67,9 @@ export function createTimelockedStakeTransaction(
                 initialSharedVersion: 1,
                 mutable: true,
             }),
-            tx.makeMoveVec({ objects: [...splitTimelockedObjectTransactions, ...stakingReadyObjects] }), // add the split object to the array of timelocked objects
+            tx.makeMoveVec({
+                objects: [...splitTimelockedObjectTransactions, ...stakingReadyObjects]
+            }),
             tx.pure.address(validatorAddress),
         ],
     });

From 3b22063fe2cdd34b50dcd2572f8387c4ad4b5ee5 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Tue, 27 Aug 2024 17:58:08 +0200
Subject: [PATCH 59/68] fix: lint

---
 apps/core/src/utils/stake/createTimelockedStakeTransaction.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index 9d98fdcd7c9..e07ea174b44 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -68,7 +68,7 @@ export function createTimelockedStakeTransaction(
                 mutable: true,
             }),
             tx.makeMoveVec({
-                objects: [...splitTimelockedObjectTransactions, ...stakingReadyObjects]
+                objects: [...splitTimelockedObjectTransactions, ...stakingReadyObjects],
             }),
             tx.pure.address(validatorAddress),
         ],

From a6d751652307ee5d57dd65f7b50e857ab0b7ce85 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Wed, 28 Aug 2024 15:38:48 +0200
Subject: [PATCH 60/68] fix: add comments for the extended timelock object

---
 .../stake/createTimelockedStakeTransaction.ts | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index e07ea174b44..e3e1ecc979e 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -4,12 +4,41 @@
 import { TransactionBlock, TransactionObjectArgument } from '@iota/iota-sdk/transactions';
 import { IOTA_SYSTEM_STATE_OBJECT_ID, IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 
+/**
+ * The extended timelocked object is used to create a timelocked staking transaction.
+ * The extended object contains objectIds of the objects that need to be merged during staking transaction and the split amount if the object needs to be split.
+ */
 export interface ExtendedTimelockObject {
+    /**
+     * The object id of the extended timelocked object is the first object id in the objectIds array.
+     * The extended timelocked object will first undergo a merging process where all objects in the objectIds array are merged into the first one.
+     */
     objectId: string;
+    /**
+     * The expiration timestamp is the same for all objects in the objectIds array.
+     */
     expirationTimestamp: string;
+    /**
+     * The total locked amount is the sum of all locked amounts in the objectIds array
+     */
     totalLockedAmount: bigint;
+    /**
+     * The array of object ids of the extended timelocked object.
+     * The first element in the objectIds array is the principal object
+     * and the rest are the objects that will be merged into the principal object.
+     */
     objectIds: string[];
+    /**
+     * The label of the extended timelocked object.
+     * The label is the same for all objects in the objectIds array.
+     */
     label?: string;
+    /**
+     * The split amount of the extended timelocked object.
+     * The split amount is the amount that will be split from the principal object.
+     * Indicates if the object needs to be split during timelocked staking transaction.
+     * Splitting occures after merging.
+     */
     splitAmount?: bigint;
 }
 

From 1eeb09c1a3cfeaea18833a82e503fbd2c85a7945 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Wed, 28 Aug 2024 15:47:47 +0200
Subject: [PATCH 61/68] fix: spelling

---
 apps/core/src/utils/stake/createTimelockedStakeTransaction.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index e3e1ecc979e..118c5692c30 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -37,7 +37,7 @@ export interface ExtendedTimelockObject {
      * The split amount of the extended timelocked object.
      * The split amount is the amount that will be split from the principal object.
      * Indicates if the object needs to be split during timelocked staking transaction.
-     * Splitting occures after merging.
+     * Splitting occurs after merging.
      */
     splitAmount?: bigint;
 }

From 1ce314941c4349a32a006c51234e2199f7465d5a Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Wed, 28 Aug 2024 16:29:59 +0200
Subject: [PATCH 62/68] fix: spelling

---
 .../src/utils/stake/createTimelockedStakeTransaction.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index 118c5692c30..7d6f5992b85 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -48,7 +48,7 @@ export function createTimelockedStakeTransaction(
 ) {
     const tx = new TransactionBlock();
     /**
-     * Create tranasctions to merge timelocked objects that need merging
+     * Create the transactions to merge the timelocked objects that need merging
      */
     const mergeObjects = timelockedObjects.filter((obj) => obj.objectIds.length > 1);
 
@@ -67,7 +67,7 @@ export function createTimelockedStakeTransaction(
         });
     }
     /**
-     * Create transactions to split timelocked objects that need splitting.
+     * Create the transactions to split the timelocked objects that need splitting.
      */
     const splitTimelockedObjects: ExtendedTimelockObject[] = timelockedObjects.filter(
         (obj) => obj.splitAmount !== undefined && obj.splitAmount > 0,
@@ -83,7 +83,7 @@ export function createTimelockedStakeTransaction(
     });
 
     /**
-     * Create transactions to stake the timelocked objects
+     * Create the transactions to stake the timelocked objects
      */
     const stakingReadyObjects = timelockedObjects
         .filter((obj) => obj.splitAmount === undefined || obj.splitAmount === BigInt(0))

From 63f707c9e2a6608f5a869cdaeae35f9cd112a3ba Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Thu, 29 Aug 2024 19:09:50 +0200
Subject: [PATCH 63/68] fix: resolve comments

---
 .../stake/createTimelockedStakeTransaction.ts |  58 ++++------
 .../app/dashboard/vesting/page.tsx            |   1 -
 .../Popups/NewStakePopup/NewStakePopup.tsx    |   4 +-
 .../lib/utils/vesting/vesting.ts              | 106 +++++++++---------
 4 files changed, 77 insertions(+), 92 deletions(-)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index 7d6f5992b85..2be9b72f5dd 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -1,62 +1,52 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { TransactionBlock, TransactionObjectArgument } from '@iota/iota-sdk/transactions';
+import { TransactionBlock } from '@iota/iota-sdk/transactions';
 import { IOTA_SYSTEM_STATE_OBJECT_ID, IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 
 /**
- * The extended timelocked object is used to create a timelocked staking transaction.
- * The extended object contains objectIds of the objects that need to be merged during staking transaction and the split amount if the object needs to be split.
+ * The groupe timelocked object is used to create a timelocked staking transaction.
+ * The grouped object contains mergeObjectIds of the objects that need to be merged during staking transaction and the split amount if the object needs to be split.
  */
-export interface ExtendedTimelockObject {
+export interface GroupedTimelockObject {
     /**
-     * The object id of the extended timelocked object is the first object id in the objectIds array.
-     * The extended timelocked object will first undergo a merging process where all objects in the objectIds array are merged into the first one.
+     * The object id of the grouped timelocked object.
      */
     objectId: string;
     /**
-     * The expiration timestamp is the same for all objects in the objectIds array.
+     * The expiration timestamp is the same for all objects in the mergeObjectIds array.
      */
     expirationTimestamp: string;
     /**
-     * The total locked amount is the sum of all locked amounts in the objectIds array
+     * The total locked amount is the sum of all locked amounts in the mergeObjectIds array
      */
     totalLockedAmount: bigint;
     /**
-     * The array of object ids of the extended timelocked object.
-     * The first element in the objectIds array is the principal object
-     * and the rest are the objects that will be merged into the principal object.
+     * The array of object ids of the grouped timelocked object.
      */
-    objectIds: string[];
+    mergeObjectIds: string[];
     /**
-     * The label of the extended timelocked object.
-     * The label is the same for all objects in the objectIds array.
+     * The label of the timelocked objects in mergeObjectIds.
      */
     label?: string;
     /**
-     * The split amount of the extended timelocked object.
-     * The split amount is the amount that will be split from the principal object.
-     * Indicates if the object needs to be split during timelocked staking transaction.
-     * Splitting occurs after merging.
+     * The split amount of the timelocked object.
      */
     splitAmount?: bigint;
 }
 
 export function createTimelockedStakeTransaction(
-    timelockedObjects: ExtendedTimelockObject[],
+    timelockedObjects: GroupedTimelockObject[],
     validatorAddress: string,
 ) {
     const tx = new TransactionBlock();
-    /**
-     * Create the transactions to merge the timelocked objects that need merging
-     */
-    const mergeObjects = timelockedObjects.filter((obj) => obj.objectIds.length > 1);
+
+    // Create the transactions to merge the timelocked objects that need merging
+    const mergeObjects = timelockedObjects.filter((obj) => obj.mergeObjectIds.length > 0);
 
     for (const mergeObject of mergeObjects) {
         // create an array of objectIds to be merged without the first element because first element is the principal object and its id is contained in mergeObject.objectId
-        const mergeObjectIds = mergeObject.objectIds
-            .slice(1)
-            .map((objectId) => tx.object(objectId));
+        const mergeObjectIds = mergeObject.mergeObjectIds.map((objectId) => tx.object(objectId));
         tx.moveCall({
             target: `0x02::timelock::join_vec`,
             typeArguments: [`${IOTA_TYPE_ARG}`],
@@ -66,25 +56,21 @@ export function createTimelockedStakeTransaction(
             ],
         });
     }
-    /**
-     * Create the transactions to split the timelocked objects that need splitting.
-     */
-    const splitTimelockedObjects: ExtendedTimelockObject[] = timelockedObjects.filter(
+
+    // Create the transactions to split the timelocked objects that need splitting.
+    const splitTimelockedObjects: GroupedTimelockObject[] = timelockedObjects.filter(
         (obj) => obj.splitAmount !== undefined && obj.splitAmount > 0,
     );
-    const splitTimelockedObjectTransactions: TransactionObjectArgument[] = [];
-    splitTimelockedObjects.forEach((obj) => {
+    const splitTimelockedObjectTransactions = splitTimelockedObjects.map((obj) => {
         const [splitTx] = tx.moveCall({
             target: `0x02::timelock::split`,
             typeArguments: [`${IOTA_TYPE_ARG}`],
             arguments: [tx.object(obj.objectId), tx.pure.u64(obj.splitAmount!)],
         });
-        splitTimelockedObjectTransactions.push(tx.object(splitTx));
+        return tx.object(splitTx);
     });
 
-    /**
-     * Create the transactions to stake the timelocked objects
-     */
+    // Create the transactions to stake the timelocked objects
     const stakingReadyObjects = timelockedObjects
         .filter((obj) => obj.splitAmount === undefined || obj.splitAmount === BigInt(0))
         .map((obj) => tx.object(obj.objectId));
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
index 35ce3c55ea8..2860f121452 100644
--- a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/dashboard/vesting/page.tsx
@@ -161,7 +161,6 @@ function VestingDashboardPage(): JSX.Element {
                     <div className="flex flex-col items-center rounded-lg border p-4">
                         <span>Available Staking</span>
                         <span>{vestingSchedule.availableStaking}</span>
-                        <Button onClick={() => handleStake()}>Stake</Button>
                     </div>
                 </div>
             </div>
diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
index ff8845e76bb..3644e84def0 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
@@ -9,7 +9,7 @@ import {
     useGetCurrentEpochStartTimestamp,
 } from '@/hooks';
 import {
-    ExtendedTimelockObject,
+    GroupedTimelockObject,
     parseAmount,
     TIMELOCK_IOTA_TYPE,
     useCoinMetadata,
@@ -51,7 +51,7 @@ function NewStakePopup({
         StructType: TIMELOCK_IOTA_TYPE,
     });
 
-    let extendedTimelockObjects: ExtendedTimelockObject[] = [];
+    let extendedTimelockObjects: GroupedTimelockObject[] = [];
     if (isTimelockedStaking && timelockedObjects && currentEpochMs) {
         extendedTimelockObjects = prepareObjectsForTimelockedStakingTransaction(
             timelockedObjects,
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 49585bd3f75..9a2527dd9d4 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { ExtendedTimelockObject } from '@iota/core';
+import { GroupedTimelockObject } from '@iota/core';
 import {
     MIN_STAKING_THRESHOLD,
     SUPPLY_INCREASE_INVESTOR_VESTING_DURATION,
@@ -207,15 +207,14 @@ export function isSupplyIncreaseVestingObject(
 }
 
 /**
- * Formats an array of timelocked objects into an array of vesting objects.
- * Vesting object is grouped object by expiration time, where objectId holds the id of the first object in the group to which the rest of the objects in the group will be merged.
+ * Group an array of timelocked objects into an array of grouped timelocked objects.
  *
- * @param timelockedObjects - The array of timelocked objects to be formatted.
- * @returns An array of vesting objects.
+ * @param timelockedObjects - The array of timelocked objects to be grouped.
+ * @returns An array of grouped timelocked objects.
  */
-export function getFormattedTimelockedObjects(
+export function groupTimelockedObjects(
     timelockedObjects: TimelockedObject[],
-): ExtendedTimelockObject[] {
+): GroupedTimelockObject[] {
     const expirationMap = new Map<number, TimelockedObject[]>();
 
     timelockedObjects.forEach((timelockedObject) => {
@@ -227,42 +226,44 @@ export function getFormattedTimelockedObjects(
         expirationMap.get(expirationTimestamp)!.push(timelockedObject);
     });
 
-    const result: ExtendedTimelockObject[] = [];
-
-    expirationMap.forEach((objects, expirationTime) => {
-        const totalLockedAmount = objects.reduce((sum, obj) => {
-            return BigInt(sum) + BigInt(obj.locked.value);
-        }, 0n);
-
-        const label = objects[0].label; // Assuming all objects in the group have the same label
-        const objectIds = objects.map((obj) => obj.id.id);
-        result.push({
-            objectId: objectIds[0] || '',
-            expirationTimestamp: expirationTime.toString(),
-            totalLockedAmount,
-            objectIds,
-            label,
-        });
-    });
+    const groupedTimelockObjects: GroupedTimelockObject[] = Array.from(
+        expirationMap,
+        ([expirationTime, objects]) => {
+            const totalLockedAmount = objects.reduce((sum, obj) => {
+                return BigInt(sum) + BigInt(obj.locked.value);
+            }, 0n);
+
+            const label = objects[0].label; // Assuming all objects in the group have the same label
+            const objectIds = objects.map((obj) => obj.id.id);
+
+            return {
+                objectId: objectIds[0] || '',
+                expirationTimestamp: expirationTime.toString(),
+                totalLockedAmount,
+                mergeObjectIds: objectIds.slice(1),
+                label,
+            };
+        },
+    );
 
-    return result;
+    return groupedTimelockObjects;
 }
 
 /**
- * Adjusts the split amounts in an array of extended timelocked objects based on the total remaining amount.
+ * Adjusts the split amounts in an array of grouped timelocked objects based on the total remaining amount.
  * The function iteratively splits the remaining amount among the timelocked objects until the split conditions are met.
  *
- * @param extendedTimelockObjects - An array of extended timelocked objects.
- * @param totalRemainingAmount - The total remaining amount to be split among the extended timelocked objects.
+ * @param groupedTimelockObjects - An array of grouped timelocked objects.
+ * @param totalRemainingAmount - The total remaining amount to be split among the grouped timelocked objects.
  */
 export function adjustSplitAmountsInExtendedTimelockObjects(
-    extendedTimelockObjects: ExtendedTimelockObject[],
+    extendedTimelockObjects: GroupedTimelockObject[],
     totalRemainderAmount: bigint,
 ) {
     let objectsToSplit = 1;
-    let splitAchieved = false;
+    let foundSplit = false;
 
-    while (!splitAchieved && objectsToSplit <= extendedTimelockObjects.length) {
+    while (!foundSplit && objectsToSplit <= extendedTimelockObjects.length) {
         const baseRemainderAmount = totalRemainderAmount / BigInt(objectsToSplit);
         // if the amount is odd value we need to add the remainder to the first object because we floored the division
         const remainder = totalRemainderAmount % BigInt(objectsToSplit);
@@ -282,13 +283,13 @@ export function adjustSplitAmountsInExtendedTimelockObjects(
                 obj.splitAmount = amountToSplit;
                 foundObjectsToSplit++;
                 if (foundObjectsToSplit === objectsToSplit) {
-                    splitAchieved = true;
+                    foundSplit = true;
                     break;
                 }
             }
         }
 
-        if (!splitAchieved) {
+        if (!foundSplit) {
             extendedTimelockObjects.forEach((obj) => (obj.splitAmount = BigInt(0)));
             objectsToSplit++;
         }
@@ -296,18 +297,18 @@ export function adjustSplitAmountsInExtendedTimelockObjects(
 }
 
 /**
- * Prepares vesting objects for timelocked staking.
+ * Prepares timelocked objects for timelocked staking.
  *
  * @param timelockedObjects - An array of timelocked objects.
  * @param amount - The amount to stake.
  * @param currentEpochMs - The current epoch in milliseconds.
- * @returns An array of vesting objects that meet the stake amount.
+ * @returns An array of timelocked objects that meet the stake amount.
  */
 export function prepareObjectsForTimelockedStakingTransaction(
     timelockedObjects: IotaObjectData[],
     amount: bigint,
     currentEpochMs: string,
-): ExtendedTimelockObject[] {
+): GroupedTimelockObject[] {
     const timelockedMapped = mapTimelockObjects(timelockedObjects);
     const filteredTimelockedObjects = timelockedMapped
         ?.filter(isSupplyIncreaseVestingObject)
@@ -318,35 +319,34 @@ export function prepareObjectsForTimelockedStakingTransaction(
             return Number(b.expirationTimestampMs) - Number(a.expirationTimestampMs);
         });
 
-    const extendedTimelockObjects: ExtendedTimelockObject[] = getFormattedTimelockedObjects(
+    const groupedTimelockObjects: GroupedTimelockObject[] = groupTimelockedObjects(
         filteredTimelockedObjects,
     ).filter((obj) => obj.totalLockedAmount >= MIN_STAKING_THRESHOLD);
 
-    /**
-     * Create a subset of objects that meet the stake amount (where total combined locked amount >= STAKE_AMOUNT)
-     */
+    // Create a subset of objects that meet the stake amount (where total combined locked amount >= STAKE_AMOUNT)
     let totalLocked: bigint = BigInt(0);
-    const subsetExtendedTimelockObjects: ExtendedTimelockObject[] = [];
+    const subsetGroupedTimelockObjects: GroupedTimelockObject[] = [];
 
-    for (const obj of extendedTimelockObjects) {
-        totalLocked += obj.totalLockedAmount;
-        subsetExtendedTimelockObjects.push(obj);
+    for (const groupedObject of groupedTimelockObjects) {
+        totalLocked += groupedObject.totalLockedAmount;
+        subsetGroupedTimelockObjects.push(groupedObject);
         if (totalLocked >= amount) {
             break;
         }
     }
 
-    /**
-     * Calculate the remaining amount after staking
-     */
+    // If the total locked amount is less than the stake amount, return not enough locked amount
+    if (totalLocked < amount) {
+        return [];
+    }
+
+    // Calculate the remaining amount after staking
     const remainingAmount = totalLocked - amount;
 
-    /**
-     * Add splitAmount property to the vesting objects that need to be split
-     */
+    // Add splitAmount property to the vesting objects that need to be split
     if (remainingAmount > 0) {
-        adjustSplitAmountsInExtendedTimelockObjects(subsetExtendedTimelockObjects, remainingAmount);
+        adjustSplitAmountsInExtendedTimelockObjects(subsetGroupedTimelockObjects, remainingAmount);
     }
-
-    return subsetExtendedTimelockObjects;
+    console.log(subsetGroupedTimelockObjects);
+    return subsetGroupedTimelockObjects;
 }

From 969ae53cfc2e9d75aaeeb01a577cfd096ae373d4 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Fri, 30 Aug 2024 13:45:40 +0200
Subject: [PATCH 64/68] fix: add simple split algorythm

---
 .../Popups/NewStakePopup/NewStakePopup.tsx    | 11 ++-
 .../hooks/useNewStakeTransaction.ts           | 10 ++-
 .../lib/utils/vesting/vesting.ts              | 69 ++++++++-----------
 3 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
index 3644e84def0..7d6e7a8e773 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
@@ -51,9 +51,9 @@ function NewStakePopup({
         StructType: TIMELOCK_IOTA_TYPE,
     });
 
-    let extendedTimelockObjects: GroupedTimelockObject[] = [];
+    let groupedTimelockObjects: GroupedTimelockObject[] = [];
     if (isTimelockedStaking && timelockedObjects && currentEpochMs) {
-        extendedTimelockObjects = prepareObjectsForTimelockedStakingTransaction(
+        groupedTimelockObjects = prepareObjectsForTimelockedStakingTransaction(
             timelockedObjects,
             amountWithoutDecimals,
             currentEpochMs,
@@ -64,7 +64,8 @@ function NewStakePopup({
         selectedValidator,
         amountWithoutDecimals,
         senderAddress,
-        extendedTimelockObjects,
+        isTimelockedStaking,
+        groupedTimelockObjects,
     );
 
     const { mutateAsync: signAndExecuteTransactionBlock } = useSignAndExecuteTransactionBlock();
@@ -87,6 +88,10 @@ function NewStakePopup({
     }
 
     function handleStake(): void {
+        if (isTimelockedStaking && groupedTimelockObjects.length === 0) {
+            addNotification('Invalid stake amount. Please try again.', NotificationType.Error);
+            return;
+        }
         if (!newStakeData?.transaction) {
             addNotification('Stake transaction was not created', NotificationType.Error);
             return;
diff --git a/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts b/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
index e45ba0175be..ae0af238f87 100644
--- a/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
+++ b/apps/wallet-dashboard/hooks/useNewStakeTransaction.ts
@@ -4,7 +4,7 @@
 import {
     createStakeTransaction,
     createTimelockedStakeTransaction,
-    ExtendedTimelockObject,
+    GroupedTimelockObject,
 } from '@iota/core';
 import { useIotaClient } from '@iota/dapp-kit';
 import { useQuery } from '@tanstack/react-query';
@@ -13,18 +13,16 @@ export function useNewStakeTransaction(
     validator: string,
     amount: bigint,
     senderAddress: string,
-    extendedTimelockObjects?: ExtendedTimelockObject[],
+    isTimelockedStaking: boolean = false,
+    groupedTimelockObjects?: GroupedTimelockObject[],
 ) {
-    const isTimelockedStaking =
-        extendedTimelockObjects?.length && extendedTimelockObjects?.length > 0;
-
     const client = useIotaClient();
     return useQuery({
         // eslint-disable-next-line @tanstack/query/exhaustive-deps
         queryKey: ['stake-transaction', validator, amount.toString(), senderAddress],
         queryFn: async () => {
             const transaction = isTimelockedStaking
-                ? createTimelockedStakeTransaction(extendedTimelockObjects, validator)
+                ? createTimelockedStakeTransaction(groupedTimelockObjects || [], validator)
                 : createStakeTransaction(amount, validator);
             transaction.setSender(senderAddress);
             await transaction.build({ client });
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 9a2527dd9d4..2064baeb69e 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -259,41 +259,20 @@ export function groupTimelockedObjects(
 export function adjustSplitAmountsInExtendedTimelockObjects(
     extendedTimelockObjects: GroupedTimelockObject[],
     totalRemainderAmount: bigint,
-) {
-    let objectsToSplit = 1;
+): GroupedTimelockObject[] {
     let foundSplit = false;
+    extendedTimelockObjects.forEach((timelockedObject) => {
+        const amountToSplit = timelockedObject.totalLockedAmount - totalRemainderAmount;
 
-    while (!foundSplit && objectsToSplit <= extendedTimelockObjects.length) {
-        const baseRemainderAmount = totalRemainderAmount / BigInt(objectsToSplit);
-        // if the amount is odd value we need to add the remainder to the first object because we floored the division
-        const remainder = totalRemainderAmount % BigInt(objectsToSplit);
-
-        // counter for objects that have splitAmount > 0
-        let foundObjectsToSplit = 0;
-
-        for (let i = 0; i < extendedTimelockObjects.length; i++) {
-            const obj = extendedTimelockObjects[i];
-            let adjustedRemainderAmount = baseRemainderAmount;
-            if (i === 0 && remainder > 0) {
-                adjustedRemainderAmount += remainder;
-            }
-            const amountToSplit = obj.totalLockedAmount - adjustedRemainderAmount;
-
-            if (amountToSplit > MIN_STAKING_THRESHOLD) {
-                obj.splitAmount = amountToSplit;
-                foundObjectsToSplit++;
-                if (foundObjectsToSplit === objectsToSplit) {
-                    foundSplit = true;
-                    break;
-                }
-            }
-        }
-
-        if (!foundSplit) {
-            extendedTimelockObjects.forEach((obj) => (obj.splitAmount = BigInt(0)));
-            objectsToSplit++;
+        if (amountToSplit >= MIN_STAKING_THRESHOLD) {
+            timelockedObject.splitAmount = amountToSplit;
+            foundSplit = true;
         }
+    });
+    if (!foundSplit) {
+        return [];
     }
+    return extendedTimelockObjects;
 }
 
 /**
@@ -309,23 +288,30 @@ export function prepareObjectsForTimelockedStakingTransaction(
     amount: bigint,
     currentEpochMs: string,
 ): GroupedTimelockObject[] {
+    if (Number(amount) === 0) {
+        return [];
+    }
     const timelockedMapped = mapTimelockObjects(timelockedObjects);
-    const filteredTimelockedObjects = timelockedMapped
+    const filterTimelockedVestingObjects = timelockedMapped
         ?.filter(isSupplyIncreaseVestingObject)
         .filter((obj: TimelockedObject) => {
             return Number(obj.expirationTimestampMs) > Number(currentEpochMs);
-        })
-        .sort((a: TimelockedObject, b: TimelockedObject) => {
-            return Number(b.expirationTimestampMs) - Number(a.expirationTimestampMs);
         });
 
     const groupedTimelockObjects: GroupedTimelockObject[] = groupTimelockedObjects(
-        filteredTimelockedObjects,
-    ).filter((obj) => obj.totalLockedAmount >= MIN_STAKING_THRESHOLD);
+        filterTimelockedVestingObjects,
+    )
+        .filter((obj) => obj.totalLockedAmount >= MIN_STAKING_THRESHOLD)
+        .sort((a: GroupedTimelockObject, b: GroupedTimelockObject) => {
+            if (b.totalLockedAmount !== a.totalLockedAmount) {
+                return Number(b.totalLockedAmount - a.totalLockedAmount); // Descending order for totalLockedAmount
+            }
+            return Number(b.expirationTimestamp) - Number(a.expirationTimestamp); // Descending order for expirationTimestamp
+        });
 
     // Create a subset of objects that meet the stake amount (where total combined locked amount >= STAKE_AMOUNT)
     let totalLocked: bigint = BigInt(0);
-    const subsetGroupedTimelockObjects: GroupedTimelockObject[] = [];
+    let subsetGroupedTimelockObjects: GroupedTimelockObject[] = [];
 
     for (const groupedObject of groupedTimelockObjects) {
         totalLocked += groupedObject.totalLockedAmount;
@@ -345,8 +331,11 @@ export function prepareObjectsForTimelockedStakingTransaction(
 
     // Add splitAmount property to the vesting objects that need to be split
     if (remainingAmount > 0) {
-        adjustSplitAmountsInExtendedTimelockObjects(subsetGroupedTimelockObjects, remainingAmount);
+        subsetGroupedTimelockObjects = adjustSplitAmountsInExtendedTimelockObjects(
+            subsetGroupedTimelockObjects,
+            remainingAmount,
+        );
     }
-    console.log(subsetGroupedTimelockObjects);
+
     return subsetGroupedTimelockObjects;
 }

From f099120172969e922af8139afbfbff906842e19d Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Fri, 30 Aug 2024 13:49:00 +0200
Subject: [PATCH 65/68] fix: spelling

---
 apps/core/src/utils/stake/createTimelockedStakeTransaction.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index 2be9b72f5dd..64eb7ab689d 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -5,7 +5,7 @@ import { TransactionBlock } from '@iota/iota-sdk/transactions';
 import { IOTA_SYSTEM_STATE_OBJECT_ID, IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 
 /**
- * The groupe timelocked object is used to create a timelocked staking transaction.
+ * The grouped timelocked object is used to create a timelocked staking transaction.
  * The grouped object contains mergeObjectIds of the objects that need to be merged during staking transaction and the split amount if the object needs to be split.
  */
 export interface GroupedTimelockObject {

From d9b05e633743da499177a352a43e876b5d1d1059 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Sat, 31 Aug 2024 09:39:58 +0200
Subject: [PATCH 66/68] fix: variable naming

---
 apps/wallet-dashboard/lib/utils/vesting/vesting.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 2064baeb69e..1a80b984b24 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -256,12 +256,12 @@ export function groupTimelockedObjects(
  * @param groupedTimelockObjects - An array of grouped timelocked objects.
  * @param totalRemainingAmount - The total remaining amount to be split among the grouped timelocked objects.
  */
-export function adjustSplitAmountsInExtendedTimelockObjects(
-    extendedTimelockObjects: GroupedTimelockObject[],
+export function adjustSplitAmountsInGroupedTimelockObjects(
+    groupedTimelockObjects: GroupedTimelockObject[],
     totalRemainderAmount: bigint,
 ): GroupedTimelockObject[] {
     let foundSplit = false;
-    extendedTimelockObjects.forEach((timelockedObject) => {
+    groupedTimelockObjects.forEach((timelockedObject) => {
         const amountToSplit = timelockedObject.totalLockedAmount - totalRemainderAmount;
 
         if (amountToSplit >= MIN_STAKING_THRESHOLD) {
@@ -272,7 +272,7 @@ export function adjustSplitAmountsInExtendedTimelockObjects(
     if (!foundSplit) {
         return [];
     }
-    return extendedTimelockObjects;
+    return groupedTimelockObjects;
 }
 
 /**
@@ -331,7 +331,7 @@ export function prepareObjectsForTimelockedStakingTransaction(
 
     // Add splitAmount property to the vesting objects that need to be split
     if (remainingAmount > 0) {
-        subsetGroupedTimelockObjects = adjustSplitAmountsInExtendedTimelockObjects(
+        subsetGroupedTimelockObjects = adjustSplitAmountsInGroupedTimelockObjects(
             subsetGroupedTimelockObjects,
             remainingAmount,
         );

From 4fb84283ea194956f1dcaddb76306af62d997ea7 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Tue, 3 Sep 2024 10:57:55 +0200
Subject: [PATCH 67/68] fix: add missing break in adjusting split amounts

---
 apps/wallet-dashboard/lib/utils/vesting/vesting.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 57b37ef3285..d5901ebff9e 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -262,14 +262,15 @@ export function adjustSplitAmountsInGroupedTimelockObjects(
     totalRemainderAmount: bigint,
 ): GroupedTimelockObject[] {
     let foundSplit = false;
-    groupedTimelockObjects.forEach((timelockedObject) => {
+    for (const timelockedObject of groupedTimelockObjects) {
         const amountToSplit = timelockedObject.totalLockedAmount - totalRemainderAmount;
 
         if (amountToSplit >= MIN_STAKING_THRESHOLD) {
             timelockedObject.splitAmount = amountToSplit;
             foundSplit = true;
+            break;
         }
-    });
+    }
     if (!foundSplit) {
         return [];
     }

From 58419e38f11f64a0532390b2bfcf5c1f6816ffbf Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Wed, 4 Sep 2024 16:07:08 +0200
Subject: [PATCH 68/68] fix: variable naming

---
 .../stake/createTimelockedStakeTransaction.ts | 10 ++++---
 .../lib/utils/vesting/vesting.ts              | 26 +++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
index 64eb7ab689d..48e892f3c9d 100644
--- a/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
+++ b/apps/core/src/utils/stake/createTimelockedStakeTransaction.ts
@@ -42,9 +42,11 @@ export function createTimelockedStakeTransaction(
     const tx = new TransactionBlock();
 
     // Create the transactions to merge the timelocked objects that need merging
-    const mergeObjects = timelockedObjects.filter((obj) => obj.mergeObjectIds.length > 0);
+    const timelockedObjectsForMerge = timelockedObjects.filter(
+        (obj) => obj.mergeObjectIds.length > 0,
+    );
 
-    for (const mergeObject of mergeObjects) {
+    for (const mergeObject of timelockedObjectsForMerge) {
         // create an array of objectIds to be merged without the first element because first element is the principal object and its id is contained in mergeObject.objectId
         const mergeObjectIds = mergeObject.mergeObjectIds.map((objectId) => tx.object(objectId));
         tx.moveCall({
@@ -58,10 +60,10 @@ export function createTimelockedStakeTransaction(
     }
 
     // Create the transactions to split the timelocked objects that need splitting.
-    const splitTimelockedObjects: GroupedTimelockObject[] = timelockedObjects.filter(
+    const timelockedObjectsForSplit: GroupedTimelockObject[] = timelockedObjects.filter(
         (obj) => obj.splitAmount !== undefined && obj.splitAmount > 0,
     );
-    const splitTimelockedObjectTransactions = splitTimelockedObjects.map((obj) => {
+    const splitTimelockedObjectTransactions = timelockedObjectsForSplit.map((obj) => {
         const [splitTx] = tx.moveCall({
             target: `0x02::timelock::split`,
             typeArguments: [`${IOTA_TYPE_ARG}`],
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index d5901ebff9e..1cb3f75eceb 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -231,7 +231,7 @@ export function groupTimelockedObjects(
         expirationMap,
         ([expirationTime, objects]) => {
             const totalLockedAmount = objects.reduce((sum, obj) => {
-                return BigInt(sum) + BigInt(obj.locked.value);
+                return sum + BigInt(obj.locked.value);
             }, 0n);
 
             const label = objects[0].label; // Assuming all objects in the group have the same label
@@ -287,21 +287,21 @@ export function adjustSplitAmountsInGroupedTimelockObjects(
  */
 export function prepareObjectsForTimelockedStakingTransaction(
     timelockedObjects: IotaObjectData[],
-    amount: bigint,
+    targetAmount: bigint,
     currentEpochMs: string,
 ): GroupedTimelockObject[] {
-    if (Number(amount) === 0) {
+    if (Number(targetAmount) === 0) {
         return [];
     }
     const timelockedMapped = mapTimelockObjects(timelockedObjects);
-    const filterTimelockedVestingObjects = timelockedMapped
+    const stakingEligibleTimelockedObjects = timelockedMapped
         ?.filter(isSupplyIncreaseVestingObject)
         .filter((obj: TimelockedObject) => {
             return Number(obj.expirationTimestampMs) > Number(currentEpochMs);
         });
 
     const groupedTimelockObjects: GroupedTimelockObject[] = groupTimelockedObjects(
-        filterTimelockedVestingObjects,
+        stakingEligibleTimelockedObjects,
     )
         .filter((obj) => obj.totalLockedAmount >= MIN_STAKING_THRESHOLD)
         .sort((a: GroupedTimelockObject, b: GroupedTimelockObject) => {
@@ -313,31 +313,31 @@ export function prepareObjectsForTimelockedStakingTransaction(
 
     // Create a subset of objects that meet the stake amount (where total combined locked amount >= STAKE_AMOUNT)
     let totalLocked: bigint = BigInt(0);
-    let subsetGroupedTimelockObjects: GroupedTimelockObject[] = [];
+    let selectedGroupedTimelockObjects: GroupedTimelockObject[] = [];
 
     for (const groupedObject of groupedTimelockObjects) {
         totalLocked += groupedObject.totalLockedAmount;
-        subsetGroupedTimelockObjects.push(groupedObject);
-        if (totalLocked >= amount) {
+        selectedGroupedTimelockObjects.push(groupedObject);
+        if (totalLocked >= targetAmount) {
             break;
         }
     }
 
     // If the total locked amount is less than the stake amount, return not enough locked amount
-    if (totalLocked < amount) {
+    if (totalLocked < targetAmount) {
         return [];
     }
 
     // Calculate the remaining amount after staking
-    const remainingAmount = totalLocked - amount;
+    const remainingAmount = totalLocked - targetAmount;
 
     // Add splitAmount property to the vesting objects that need to be split
     if (remainingAmount > 0) {
-        subsetGroupedTimelockObjects = adjustSplitAmountsInGroupedTimelockObjects(
-            subsetGroupedTimelockObjects,
+        selectedGroupedTimelockObjects = adjustSplitAmountsInGroupedTimelockObjects(
+            selectedGroupedTimelockObjects,
             remainingAmount,
         );
     }
 
-    return subsetGroupedTimelockObjects;
+    return selectedGroupedTimelockObjects;
 }