From 482875acbe0438d864c827422e50dfbd192bbc7d Mon Sep 17 00:00:00 2001
From: Dawid Sowa <dawid.sowa@rdx.works>
Date: Tue, 1 Oct 2024 13:12:47 +0200
Subject: [PATCH 1/7] refactor: use native_resource_details for summary
 creation part 1

---
 apps/dashboard/src/lib/summary/summary.ts     | 79 +++++++++++--------
 .../resource/[resource]/+layout.ts            |  5 +-
 .../src/routes/(search-pages)/utils.ts        |  5 +-
 .../utils/entities/resource/fungible/index.ts |  3 +-
 .../src/api/utils/entities/resource/index.ts  |  3 +-
 .../non-fungible/claim-nft-collection.ts      | 11 +--
 .../entities/resource/non-fungible/index.ts   | 19 +++--
 .../package-owner-badge-collection.ts         | 32 ++------
 packages/ui/src/api/utils/staking.ts          | 45 +++++++----
 9 files changed, 109 insertions(+), 93 deletions(-)

diff --git a/apps/dashboard/src/lib/summary/summary.ts b/apps/dashboard/src/lib/summary/summary.ts
index 798208dc8..962d36c06 100644
--- a/apps/dashboard/src/lib/summary/summary.ts
+++ b/apps/dashboard/src/lib/summary/summary.ts
@@ -58,9 +58,17 @@ const getEntityTypes = async (
 const getEntityDetailsFn = (stateVersion: number) => (addresses: string[]) =>
   pipe(
     () =>
-      callApi('getEntityDetailsVaultAggregated', addresses, undefined, {
-        state_version: stateVersion
-      }),
+      callApi(
+        'getEntityDetailsVaultAggregated',
+        addresses,
+        {
+          dappTwoWayLinks: true,
+          nativeResourceDetails: true
+        },
+        {
+          state_version: stateVersion
+        }
+      ),
     handleGatewayResult((_) => ERROR_MSG)
   )()
 
@@ -87,7 +95,10 @@ const getPoolUnitData =
         callApi(
           'getEntityDetailsVaultAggregated',
           poolAddresses as string[],
-          undefined,
+          {
+            dappTwoWayLinks: true,
+            nativeResourceDetails: true
+          },
           { state_version: stateVersion }
         ),
       handleGatewayResult((_) => ERROR_MSG)
@@ -102,7 +113,10 @@ const getPoolUnitData =
           pools.flatMap(
             (pool) => pool.metadata.expected.pool_resources.typed.values
           ),
-          undefined,
+          {
+            dappTwoWayLinks: true,
+            nativeResourceDetails: true
+          },
           { state_version: stateVersion }
         ),
       handleGatewayResult((_) => ERROR_MSG)
@@ -165,29 +179,31 @@ export const produceSummary = (
       () =>
         callApi(
           'getEntityDetailsVaultAggregated',
-          acc.resources.fungible.map((token) => token.address)
+          acc.resources.fungible.map((token) => token.address),
+          {
+            dappTwoWayLinks: true,
+            nativeResourceDetails: true
+          }
         ),
       handleGatewayResult((_) => ERROR_MSG),
       andThen(map(transformFungibleResource))
     )()
   )
 
-  const nonFungibleResources = Promise.all([account, validatorResponse]).then(
-    ([acc, { validators }]) =>
-      pipe(
-        () =>
-          callApi(
-            'getEntityDetailsVaultAggregated',
-            acc.resources.nonFungible.map((token) => token.address)
-          ),
-        handleGatewayResult((_) => ERROR_MSG),
-        andThen(
-          pipe(
-            map((entity) => transformNonFungibleResource(entity, validators)),
-            (x) => Promise.all(x)
-          )
-        )
-      )()
+  const nonFungibleResources = account.then((acc) =>
+    pipe(
+      () =>
+        callApi(
+          'getEntityDetailsVaultAggregated',
+          acc.resources.nonFungible.map((token) => token.address),
+          {
+            dappTwoWayLinks: true,
+            nativeResourceDetails: true
+          }
+        ),
+      handleGatewayResult((_) => ERROR_MSG),
+      andThen(map(transformNonFungibleResource))
+    )()
   )
 
   const nfts = Promise.all([account, nonFungibleResources]).then(
@@ -228,16 +244,15 @@ export const produceSummary = (
     fungibleResources,
     nfts
   ])
-    .then(
-      ([response, accountData, fungibles, nonFungibles]) =>
-        [
-          getStakedInfo(response.validators, fungibles)(accountData),
-          getUnstakeAndClaimInfo(response.validators)(nonFungibles)(
-            accountData,
-            response.ledger_state.epoch
-          )
-        ] as const
-    )
+    .then(([response, accountData, fungibles, nonFungibles]) => {
+      return [
+        getStakedInfo(response.validators, fungibles)(accountData),
+        getUnstakeAndClaimInfo(response.validators)(nonFungibles)(
+          accountData,
+          response.ledger_state.epoch
+        )
+      ] as const
+    })
     .then(([staked, unstakeAndClaim]) => {
       let totalStaked = BigNumber(0)
       let totalUnstaking = BigNumber(0)
diff --git a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
index 70df5147a..30f7d872a 100644
--- a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
+++ b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
@@ -33,7 +33,10 @@ const getEntityDetails = (stateVersion?: number) => (addresses: string[]) =>
       callApi(
         'getEntityDetailsVaultAggregated',
         addresses,
-        undefined,
+        {
+          dappTwoWayLinks: true,
+          nativeResourceDetails: true
+        },
         stateVersion
           ? {
               state_version: stateVersion
diff --git a/apps/dashboard/src/routes/(search-pages)/utils.ts b/apps/dashboard/src/routes/(search-pages)/utils.ts
index d9923d1cf..0b718d0ce 100644
--- a/apps/dashboard/src/routes/(search-pages)/utils.ts
+++ b/apps/dashboard/src/routes/(search-pages)/utils.ts
@@ -40,7 +40,10 @@ export const getLookupEntity = (
       callApi(
         'getEntityDetailsVaultAggregated',
         [address],
-        options,
+        options || {
+          dappTwoWayLinks: true,
+          nativeResourceDetails: true,
+        },
         ledgerState
       ).andThen((entities) =>
         entities.length === 0
diff --git a/packages/ui/src/api/utils/entities/resource/fungible/index.ts b/packages/ui/src/api/utils/entities/resource/fungible/index.ts
index 411fa9772..1bc4c260c 100644
--- a/packages/ui/src/api/utils/entities/resource/fungible/index.ts
+++ b/packages/ui/src/api/utils/entities/resource/fungible/index.ts
@@ -20,6 +20,7 @@ export const transformFungibleResource = (
         resourceType: 'fungible',
         divisibility: (
           entity.details as StateEntityDetailsResponseFungibleResourceDetails
-        ).divisibility
+        ).divisibility,
+        nativeResourceDetails: entity.details.native_resource_details
       } as const)
   )()
diff --git a/packages/ui/src/api/utils/entities/resource/index.ts b/packages/ui/src/api/utils/entities/resource/index.ts
index b9b589799..b839052c2 100644
--- a/packages/ui/src/api/utils/entities/resource/index.ts
+++ b/packages/ui/src/api/utils/entities/resource/index.ts
@@ -1,5 +1,6 @@
 import type {
   EntityMetadataItem,
+  NativeResourceDetails,
   StateEntityDetailsVaultResponseItem
 } from '@common/gateway-sdk'
 import { transformEntity, type _Entity } from '..'
@@ -21,7 +22,6 @@ import { transformNonFungibleResource } from './non-fungible'
 import {
   createStandardMetadata,
   type ExpectedMetadata,
-  type SystemMetadata
 } from '@api/utils/metadata'
 
 type ResourceType = 'fungible' | 'non-fungible'
@@ -37,6 +37,7 @@ export type Resource<
   }
   behaviors: 'simple' | Behavior[]
   displayName: string
+  nativeResourceDetails?: NativeResourceDetails
 }
 
 export const standardMetadata = createStandardMetadata({
diff --git a/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts b/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
index ed3e81056..98da1ddf7 100644
--- a/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
+++ b/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
@@ -34,16 +34,11 @@ const getEntityDetails = (address: string) =>
 
 export const isClaimNftCollection = (
   resourceEntity: StateEntityDetailsVaultResponseItem,
-  validators: (ValidatorListItem | Validator)[]
 ) => {
-  const validator = validators.find(
-    (validator) =>
-      validator.address ===
-        getStringMetadata('validator')(resourceEntity.metadata) &&
-      validator.unstakeClaimResourceAddress === resourceEntity.address
+  return (
+    resourceEntity.details?.type === 'NonFungibleResource' &&
+    resourceEntity.details.native_resource_details?.kind === 'ValidatorClaimNft'
   )
-
-  return validator !== undefined
 }
 
 export const resourceToClaimNftCollection = (
diff --git a/packages/ui/src/api/utils/entities/resource/non-fungible/index.ts b/packages/ui/src/api/utils/entities/resource/non-fungible/index.ts
index 7fc871c19..fd2284ac8 100644
--- a/packages/ui/src/api/utils/entities/resource/non-fungible/index.ts
+++ b/packages/ui/src/api/utils/entities/resource/non-fungible/index.ts
@@ -1,6 +1,5 @@
 import { transformResource, type Resource } from '..'
 import type { StateEntityDetailsVaultResponseItem } from '@common/gateway-sdk'
-import type { Validator, ValidatorListItem } from '../../component/validator'
 import {
   systemMetadata as claimNftSystemMetadata,
   type ClaimNftCollection,
@@ -21,22 +20,27 @@ export type NonFungibleResource =
   | ClaimNftCollection
   | PackageOwnerBadgeCollection
 
-export const transformNonFungibleResource = async (
-  entity: StateEntityDetailsVaultResponseItem,
-  validators?: (ValidatorListItem | Validator)[]
-): Promise<NonFungibleResource> => {
-  if (validators && isClaimNftCollection(entity, validators)) {
+export const transformNonFungibleResource = (
+  entity: StateEntityDetailsVaultResponseItem
+): NonFungibleResource => {
+  if (entity.details?.type !== 'NonFungibleResource') {
+    throw new Error('Invalid resource type')
+  }
+
+  if (isClaimNftCollection(entity)) {
     return {
       ...transformResource(entity, claimNftSystemMetadata),
       resourceType: 'non-fungible',
+      nativeResourceDetails: entity.details.native_resource_details,
       nonFungibleType: 'claim-nft-collection'
     } as const
   }
 
-  if (await isPackageOwnerBadgeCollection(entity.address)) {
+  if (isPackageOwnerBadgeCollection(entity)) {
     return {
       ...transformResource(entity, PackageOwnerSystemMetadata),
       resourceType: 'non-fungible',
+      nativeResourceDetails: entity.details.native_resource_details,
       nonFungibleType: 'package-owner-badge-collection'
     } as const
   }
@@ -44,6 +48,7 @@ export const transformNonFungibleResource = async (
   return {
     ...transformResource(entity),
     resourceType: 'non-fungible',
+    nativeResourceDetails: entity.details.native_resource_details,
     nonFungibleType: 'default'
   } as const
 }
diff --git a/packages/ui/src/api/utils/entities/resource/non-fungible/package-owner-badge-collection.ts b/packages/ui/src/api/utils/entities/resource/non-fungible/package-owner-badge-collection.ts
index d520ae28a..3eadc3d75 100644
--- a/packages/ui/src/api/utils/entities/resource/non-fungible/package-owner-badge-collection.ts
+++ b/packages/ui/src/api/utils/entities/resource/non-fungible/package-owner-badge-collection.ts
@@ -1,6 +1,6 @@
 import { createSystemMetadata } from '@api/utils/metadata'
 import type { Resource, standardMetadata } from '..'
-import { networkConfiguration } from '@stores'
+import type { StateEntityDetailsResponseItem } from '@common/gateway-sdk'
 
 export const systemMetadata = createSystemMetadata({
   name: 'String',
@@ -17,29 +17,7 @@ export type PackageOwnerBadgeCollection = Resource<
 }
 
 export const isPackageOwnerBadgeCollection = (
-  nonFungibleResourceAddress: string
-) => {
-  let resolve: (value: boolean) => void
-
-  const promise = new Promise<boolean>((res) => {
-    resolve = res
-  })
-
-  let unsub = networkConfiguration.subscribe((config) => {
-    if (config) {
-      if (
-        config?.well_known_addresses.package_owner_badge ===
-        nonFungibleResourceAddress
-      ) {
-        resolve(true)
-      } else {
-        resolve(false)
-      }
-    }
-  })
-
-  return promise.then((result) => {
-    unsub()
-    return result
-  })
-}
+  entity: StateEntityDetailsResponseItem
+) =>
+  entity.details?.type === 'NonFungibleResource' &&
+  entity.details.native_resource_details?.kind === 'PackageOwnerBadge'
diff --git a/packages/ui/src/api/utils/staking.ts b/packages/ui/src/api/utils/staking.ts
index d59a60d94..71413d918 100644
--- a/packages/ui/src/api/utils/staking.ts
+++ b/packages/ui/src/api/utils/staking.ts
@@ -5,9 +5,9 @@ import type { ClaimNft } from './nfts/claim-nft'
 import type { Account } from './entities/component/account'
 import type { NonFungible } from './nfts'
 import type { FungibleResource } from './entities/resource/fungible'
-import { isNil } from 'ramda'
 import type { Component } from './entities/component'
 import type { standardMetadata } from './metadata'
+import type { NativeResourceValidatorLiquidStakeUnitValue } from '@common/gateway-sdk'
 
 type CommonStakeInfo<T extends string> = {
   type: T
@@ -89,27 +89,41 @@ export const getUnstakeAndClaimInfo =
 
 export const getStakedInfo =
   (validators: ValidatorListItem[], fungibles: FungibleResource[]) =>
-  (account: Account | Component<unknown, typeof standardMetadata>) =>
-    account.resources.fungible
-      .filter((token) =>
-        validators.some(
-          (validator) => validator.stakeUnitResourceAddress === token.address
-        )
+  (account: Account | Component<unknown, typeof standardMetadata>) => {
+    const stakeUnits: Map<string, NativeResourceValidatorLiquidStakeUnitValue> =
+      new Map(
+        fungibles
+          .filter(
+            (token) =>
+              token.nativeResourceDetails &&
+              token.nativeResourceDetails.kind === 'ValidatorLiquidStakeUnit'
+          )
+          .map((token) => {
+            return [
+              token.address,
+              token.nativeResourceDetails as NativeResourceValidatorLiquidStakeUnitValue
+            ]
+          })
       )
+
+    return account.resources.fungible
+      .filter((token) => stakeUnits.has(token.address))
       .map((stakeUnitToken) => {
+        const stakeUnitNativeResourceDetails = stakeUnits.get(
+          stakeUnitToken.address
+        )!
+        const multiplier =
+          stakeUnitNativeResourceDetails.unit_redemption_value[0].amount
+
+        const xrdAmount = new BigNumber(stakeUnitToken.value)
+          .multipliedBy(new BigNumber(multiplier!))
+          .toFixed(RET_DECIMAL_PRECISION)
+
         const validator = validators.find(
           (validator) =>
             validator.stakeUnitResourceAddress === stakeUnitToken.address
         )!
 
-        const xrdAmount = validator.totalStakeInXRD
-          .multipliedBy(stakeUnitToken.value)
-          .dividedBy(
-            fungibles.find((token) => token.address === stakeUnitToken.address)!
-              .totalSupply
-          )
-          .toFixed(RET_DECIMAL_PRECISION)
-
         return {
           type: 'staked',
           account: account.address,
@@ -119,3 +133,4 @@ export const getStakedInfo =
         } as StakedInfo
       })
       .filter((stakeInfo) => !new BigNumber(stakeInfo.xrdAmount).eq(0))
+  }

From b953b0bf678e76710551cbad3b0ba87720f35a8d Mon Sep 17 00:00:00 2001
From: Dawid Sowa <dawid.sowa@rdx.works>
Date: Tue, 1 Oct 2024 14:24:00 +0200
Subject: [PATCH 2/7] refactor: remove `/validators/list` call from preview
 pages

---
 .../staking-card/StakedValidatorCard.svelte   | 169 ++++++++++--------
 apps/dashboard/src/lib/summary/summary.ts     |  46 ++---
 .../lib/token-pages/StakingPageWrapper.svelte |  11 ++
 .../src/routes/(search-pages)/utils.ts        |   2 +-
 .../[validator]/staking/+page.svelte          |  11 ++
 .../src/api/utils/entities/resource/index.ts  |   2 +-
 .../non-fungible/claim-nft-collection.ts      |   2 +-
 packages/ui/src/api/utils/nfts/claim-nft.ts   |   4 +-
 packages/ui/src/api/utils/nfts/index.ts       |   9 +
 .../ui/src/api/utils/resource-cache-client.ts |   1 -
 packages/ui/src/api/utils/staking.ts          |  22 +--
 .../src/api/utils/validators-cache-module.ts  |  51 ++++++
 12 files changed, 206 insertions(+), 124 deletions(-)
 create mode 100644 packages/ui/src/api/utils/validators-cache-module.ts

diff --git a/apps/dashboard/src/lib/staking-card/StakedValidatorCard.svelte b/apps/dashboard/src/lib/staking-card/StakedValidatorCard.svelte
index 451caf074..f0733a8ce 100644
--- a/apps/dashboard/src/lib/staking-card/StakedValidatorCard.svelte
+++ b/apps/dashboard/src/lib/staking-card/StakedValidatorCard.svelte
@@ -6,89 +6,110 @@
   import { formatXRDValue, formatTokenValue } from '@utils'
   import BigNumber from 'bignumber.js'
   import ValueBox from './ValueBox.svelte'
-
   import ValidatorPlaceholder from '@icons/validator-placeholder.svg'
-  export let validatorStakes: any
-</script>
+  import type { AccumulatedStakeInfo } from '../summary/summary'
+  import { onMount } from 'svelte'
+  import { validatorsCacheModule } from '@api/utils/validators-cache-module'
 
-<div class="card validator-card">
-  <Accordion>
-    <div class="validator-header" slot="header">
-      <NftImage
-        url={validatorStakes.validator.metadata.expected.icon_url?.typed.value}
-        defaultImageUrl={ValidatorPlaceholder}
-        width={64}
-        height={64}
-      />
-      <div class="validator-header-info">
-        <div class="validator-header-name">
-          <h4>
-            {validatorStakes.validator.metadata.expected.name?.typed.value ||
-              ''}
-          </h4>
-          <Address
-            value={validatorStakes.validator.address}
-            autoShorten
-            --background="var(--theme-surface-3)"
-          />
-        </div>
+  export let validatorStakes: AccumulatedStakeInfo
 
-        <div class="staked-header-info">
-          Staked {formatXRDValue(validatorStakes.accumulatedStakes)}
-        </div>
-      </div>
-    </div>
-    <svelte:fragment slot="content">
-      <div class="units-section">
-        <div class="content-section-header">
-          <TokenIcon
-            iconUrl="https://assets.radixdlt.com/icons/icon-liquid_stake_units.png"
-          />
-          <span class="text">Liquid Stake Units</span>
-          <span class="value"
-            >{formatTokenValue(validatorStakes.accumulatedLiquidStakeUnits)
-              .displayValue}</span
-          >
-        </div>
+  let isLoading: boolean
 
-        <ValueBox
-          header="Worth"
-          address={validatorStakes.validator.stakeUnitResourceAddress}
-          value={validatorStakes.accumulatedStakes}
-        />
-      </div>
-
-      {#if validatorStakes.unstaking.length || validatorStakes.readyToClaim.length}
-        <div class="units-section">
-          <div class="content-section-header">
-            <NftImage
-              url="https://assets.radixdlt.com/icons/icon-stake_claim_NFTs.png"
-              width={44}
-              height={44}
-            />
+  onMount(() => {
+    const subscription = validatorsCacheModule.isLoading$.subscribe((data) => {
+      isLoading = data
+    })
+
+    return () => {
+      subscription.unsubscribe()
+    }
+  })
+</script>
 
-            <span class="text">Stake Claims</span>
+{#key isLoading}
+  {#if validatorsCacheModule}
+    {@const validator = validatorsCacheModule.validators.get(
+      validatorStakes.validatorAddress
+    )}
+    <div class="card validator-card">
+      <Accordion>
+        <div class="validator-header" slot="header">
+          <NftImage
+            url={validator?.iconUrl}
+            defaultImageUrl={ValidatorPlaceholder}
+            width={64}
+            height={64}
+          />
+          <div class="validator-header-info">
+            <div class="validator-header-name">
+              <h4>
+                {validator?.name || ''}
+              </h4>
+              <Address
+                value={validatorStakes.validatorAddress}
+                autoShorten
+                --background="var(--theme-surface-3)"
+              />
+            </div>
+
+            <div class="staked-header-info">
+              Staked {formatXRDValue(validatorStakes.accumulatedStakes)}
+            </div>
           </div>
-          {#each validatorStakes.unstaking as stakeEntry}
-            <ValueBox
-              header="Unstaking"
-              address={validatorStakes.validator.stakeUnitResourceAddress}
-              value={BigNumber(stakeEntry.xrdAmount)}
-            />
-          {/each}
+        </div>
+        <svelte:fragment slot="content">
+          <div class="units-section">
+            <div class="content-section-header">
+              <TokenIcon
+                iconUrl="https://assets.radixdlt.com/icons/icon-liquid_stake_units.png"
+              />
+              <span class="text">Liquid Stake Units</span>
+              <span class="value"
+                >{formatTokenValue(validatorStakes.accumulatedLiquidStakeUnits)
+                  .displayValue}</span
+              >
+            </div>
 
-          {#each validatorStakes.readyToClaim as stakeEntry}
             <ValueBox
-              header="Ready to Claim"
-              address={stakeEntry.claimNft.address.nonFungibleAddress}
-              value={BigNumber(stakeEntry.xrdAmount)}
+              header="Worth"
+              address={validator?.poolUnitResourceAddress || ''}
+              value={validatorStakes.accumulatedStakes}
             />
-          {/each}
-        </div>
-      {/if}
-    </svelte:fragment>
-  </Accordion>
-</div>
+          </div>
+
+          {#if validatorStakes.unstaking.length || validatorStakes.readyToClaim.length}
+            <div class="units-section">
+              <div class="content-section-header">
+                <NftImage
+                  url="https://assets.radixdlt.com/icons/icon-stake_claim_NFTs.png"
+                  width={44}
+                  height={44}
+                />
+
+                <span class="text">Stake Claims</span>
+              </div>
+              {#each validatorStakes.unstaking as stakeEntry}
+                <ValueBox
+                  header="Unstaking"
+                  address={validator?.poolUnitResourceAddress || ''}
+                  value={BigNumber(stakeEntry.xrdAmount)}
+                />
+              {/each}
+
+              {#each validatorStakes.readyToClaim as stakeEntry}
+                <ValueBox
+                  header="Ready to Claim"
+                  address={stakeEntry.claimNft.address.nonFungibleAddress}
+                  value={BigNumber(stakeEntry.xrdAmount)}
+                />
+              {/each}
+            </div>
+          {/if}
+        </svelte:fragment>
+      </Accordion>
+    </div>
+  {/if}
+{/key}
 
 <style lang="scss">
   .validator-card {
diff --git a/apps/dashboard/src/lib/summary/summary.ts b/apps/dashboard/src/lib/summary/summary.ts
index 962d36c06..1f6afb297 100644
--- a/apps/dashboard/src/lib/summary/summary.ts
+++ b/apps/dashboard/src/lib/summary/summary.ts
@@ -1,7 +1,6 @@
 import { callApi } from '@api/gateway'
 import type { Component } from '@api/utils/entities/component'
 import type { Account } from '@api/utils/entities/component/account'
-import { getValidators } from '@api/utils/entities/component/validator'
 import { transformFungibleResource } from '@api/utils/entities/resource/fungible'
 import { getPoolUnits } from '@api/utils/entities/resource/fungible/pool-unit'
 import { transformNonFungibleResource } from '@api/utils/entities/resource/non-fungible'
@@ -9,7 +8,7 @@ import { handleGatewayResult } from '@dashboard/utils'
 import { andThen, flatten, map, pipe } from 'ramda'
 import {
   getStakedInfo,
-  getUnstakeAndClaimInfo,
+  getUnstakeAndClaimInfoV2,
   type ReadyToClaimInfo,
   type StakedInfo,
   type StakeInfo,
@@ -20,7 +19,6 @@ import {
   transformPool
 } from '@api/utils/entities/component/pool'
 
-import { type ValidatorListItem } from '@api/utils/entities/component/validator'
 import { ResultAsync } from 'neverthrow'
 import { transformNft } from '@api/utils/nfts'
 
@@ -33,7 +31,7 @@ import { errorPage } from '@dashboard/stores'
 const ERROR_MSG = 'Failed to load entity data.'
 
 export type AccumulatedStakeInfo = {
-  validator: ValidatorListItem
+  validatorAddress: string
   staked: StakedInfo[]
   unstaking: UnstakingInfo[]
   readyToClaim: ReadyToClaimInfo[]
@@ -165,13 +163,13 @@ const getPoolUnitData =
 export const produceSummary = (
   account: Promise<Account | Component<unknown, typeof standardMetadata>>
 ) => {
-  const validatorResponse = pipe(
-    () => getValidators(undefined, false, false),
-    (result) => handleGatewayResult((_) => ERROR_MSG)(result)
-  )()
-
-  const stateVersion = validatorResponse.then(
-    (response) => response.ledger_state.state_version
+  const ledgerState = handleGatewayResult(
+    () => "Couldn't fetch current ledger state"
+  )(
+    callApi('getCurrent').map((result) => ({
+      stateVersion: result.ledger_state.state_version,
+      epoch: result.ledger_state.epoch
+    }))
   )
 
   const fungibleResources = account.then((acc) =>
@@ -238,19 +236,11 @@ export const produceSummary = (
       )()
   )
 
-  const stakeInfo = Promise.all([
-    validatorResponse,
-    account,
-    fungibleResources,
-    nfts
-  ])
-    .then(([response, accountData, fungibles, nonFungibles]) => {
+  const stakeInfo = Promise.all([ledgerState, account, fungibleResources, nfts])
+    .then(([ledgerState, accountData, fungibles, nonFungibles]) => {
       return [
-        getStakedInfo(response.validators, fungibles)(accountData),
-        getUnstakeAndClaimInfo(response.validators)(nonFungibles)(
-          accountData,
-          response.ledger_state.epoch
-        )
+        getStakedInfo(fungibles)(accountData),
+        getUnstakeAndClaimInfoV2(nonFungibles)(accountData, ledgerState.epoch)
       ] as const
     })
     .then(([staked, unstakeAndClaim]) => {
@@ -266,11 +256,11 @@ export const produceSummary = (
       ]
 
       for (const stake of stakeInfo) {
-        const validator = stake.validator.address
+        const validator = stake.validatorAddress
 
         if (!accumulatedStakes[validator]) {
           accumulatedStakes[validator] = {
-            validator: stake.validator,
+            validatorAddress: stake.validatorAddress,
             staked: [],
             unstaking: [],
             readyToClaim: [],
@@ -311,8 +301,8 @@ export const produceSummary = (
     })
 
   const poolData = pipe(
-    () => Promise.all([account, fungibleResources, stateVersion]),
-    andThen(([account, fungibles, stateVersion]) =>
+    () => Promise.all([account, fungibleResources, ledgerState]),
+    andThen(([account, fungibles, { stateVersion }]) =>
       pipe(() => {
         return getPoolUnits(
           fungibles,
@@ -329,6 +319,6 @@ export const produceSummary = (
     fungibleResources,
     nonFungibleResources,
     nfts,
-    stateVersion
+    stateVersion: ledgerState.then((ledgerState) => ledgerState.stateVersion)
   }
 }
diff --git a/apps/dashboard/src/lib/token-pages/StakingPageWrapper.svelte b/apps/dashboard/src/lib/token-pages/StakingPageWrapper.svelte
index aab81bc03..f91198600 100644
--- a/apps/dashboard/src/lib/token-pages/StakingPageWrapper.svelte
+++ b/apps/dashboard/src/lib/token-pages/StakingPageWrapper.svelte
@@ -9,6 +9,7 @@
   import StakedValidatorCard from '@dashboard/lib/staking-card/StakedValidatorCard.svelte'
   import type { LayoutDataStakeInfo } from '../summary/summary'
   import NoTokens from './NoTokens.svelte'
+  import { validatorsCacheModule } from '@api/utils/validators-cache-module'
 
   export let stakeInfo: Promise<LayoutDataStakeInfo>
   export let withSummary: boolean
@@ -21,6 +22,16 @@
       values.slice(splitPoint, values.length)
     ] as const
   })
+
+  $: {
+    stakeInfo.then((data) => {
+      validatorsCacheModule.queryValidators(
+        Object.values(data.accumulatedStakes).map(
+          (stake) => stake.validatorAddress
+        )
+      )
+    })
+  }
 </script>
 
 {#if withSummary}
diff --git a/apps/dashboard/src/routes/(search-pages)/utils.ts b/apps/dashboard/src/routes/(search-pages)/utils.ts
index 0b718d0ce..25e1c465d 100644
--- a/apps/dashboard/src/routes/(search-pages)/utils.ts
+++ b/apps/dashboard/src/routes/(search-pages)/utils.ts
@@ -42,7 +42,7 @@ export const getLookupEntity = (
         [address],
         options || {
           dappTwoWayLinks: true,
-          nativeResourceDetails: true,
+          nativeResourceDetails: true
         },
         ledgerState
       ).andThen((entities) =>
diff --git a/apps/dashboard/src/routes/(search-pages)/validator/[validator]/staking/+page.svelte b/apps/dashboard/src/routes/(search-pages)/validator/[validator]/staking/+page.svelte
index 23522a124..eb371fab9 100644
--- a/apps/dashboard/src/routes/(search-pages)/validator/[validator]/staking/+page.svelte
+++ b/apps/dashboard/src/routes/(search-pages)/validator/[validator]/staking/+page.svelte
@@ -1,10 +1,21 @@
 <script lang="ts">
+  import { validatorsCacheModule } from '@api/utils/validators-cache-module'
   import type { PageData } from './$types'
 
   import SkeletonLoader from '@components/_base/skeleton-loader/SkeletonLoader.svelte'
   import StakedValidatorCard from '@dashboard/lib/staking-card/StakedValidatorCard.svelte'
 
   export let data: PageData
+
+  $: {
+    data.promises.stakeInfo.then((data) => {
+      validatorsCacheModule.queryValidators(
+        Object.values(data.accumulatedStakes).map(
+          (stake) => stake.validatorAddress
+        )
+      )
+    })
+  }
 </script>
 
 <div class="validators">
diff --git a/packages/ui/src/api/utils/entities/resource/index.ts b/packages/ui/src/api/utils/entities/resource/index.ts
index b839052c2..0e6943033 100644
--- a/packages/ui/src/api/utils/entities/resource/index.ts
+++ b/packages/ui/src/api/utils/entities/resource/index.ts
@@ -21,7 +21,7 @@ import {
 import { transformNonFungibleResource } from './non-fungible'
 import {
   createStandardMetadata,
-  type ExpectedMetadata,
+  type ExpectedMetadata
 } from '@api/utils/metadata'
 
 type ResourceType = 'fungible' | 'non-fungible'
diff --git a/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts b/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
index 98da1ddf7..eb65f63ab 100644
--- a/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
+++ b/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
@@ -33,7 +33,7 @@ const getEntityDetails = (address: string) =>
   callApi('getEntityDetailsVaultAggregated', [address])
 
 export const isClaimNftCollection = (
-  resourceEntity: StateEntityDetailsVaultResponseItem,
+  resourceEntity: StateEntityDetailsVaultResponseItem
 ) => {
   return (
     resourceEntity.details?.type === 'NonFungibleResource' &&
diff --git a/packages/ui/src/api/utils/nfts/claim-nft.ts b/packages/ui/src/api/utils/nfts/claim-nft.ts
index 1d70acec9..4e7839cfa 100644
--- a/packages/ui/src/api/utils/nfts/claim-nft.ts
+++ b/packages/ui/src/api/utils/nfts/claim-nft.ts
@@ -9,7 +9,9 @@ export const systemNftData = createSystemNftData({
   claim_epoch: 'String'
 })
 
-export type ClaimNft = _NonFungible<'claimNft', typeof systemNftData>
+export type ClaimNft = _NonFungible<'claimNft', typeof systemNftData> & {
+  validatorAddress: string
+}
 
 export const isUnstakeData = (
   data: StateNonFungibleDetailsResponseItem['data']
diff --git a/packages/ui/src/api/utils/nfts/index.ts b/packages/ui/src/api/utils/nfts/index.ts
index b81d5f1cd..1de4a3f0b 100644
--- a/packages/ui/src/api/utils/nfts/index.ts
+++ b/packages/ui/src/api/utils/nfts/index.ts
@@ -69,6 +69,14 @@ export const transformNft = (
       ? 'packageOwnerBadge'
       : 'generalNft'
 
+  let validatorAddress = undefined
+  if (
+    typeof resource !== 'string' &&
+    resource.nativeResourceDetails?.kind === 'ValidatorClaimNft'
+  ) {
+    validatorAddress = resource.nativeResourceDetails.validator_address
+  }
+
   const resourceAddress =
     typeof resource === 'string' ? resource : resource.address
 
@@ -90,6 +98,7 @@ export const transformNft = (
     : type === 'claimNft'
     ? ({
         ...partial,
+        validatorAddress,
         nftData: transformNftData(data, {}, claimNftSystemData)
       } as ClaimNft)
     : ({
diff --git a/packages/ui/src/api/utils/resource-cache-client.ts b/packages/ui/src/api/utils/resource-cache-client.ts
index 3a642c36e..30c3a6b98 100644
--- a/packages/ui/src/api/utils/resource-cache-client.ts
+++ b/packages/ui/src/api/utils/resource-cache-client.ts
@@ -3,7 +3,6 @@ import { BehaviorSubject, combineLatest, map, distinctUntilChanged } from 'rxjs'
 import { callApi } from '@api/gateway'
 import {
   transformFungibleResource,
-  transformNonFungibleResource,
   type FungibleResource,
   type NftGlobalId,
   type NonFungibleResource
diff --git a/packages/ui/src/api/utils/staking.ts b/packages/ui/src/api/utils/staking.ts
index 71413d918..0da0dd270 100644
--- a/packages/ui/src/api/utils/staking.ts
+++ b/packages/ui/src/api/utils/staking.ts
@@ -12,7 +12,7 @@ import type { NativeResourceValidatorLiquidStakeUnitValue } from '@common/gatewa
 type CommonStakeInfo<T extends string> = {
   type: T
   account: string
-  validator: ValidatorListItem
+  validatorAddress: string
   xrdAmount: string
 }
 
@@ -31,8 +31,7 @@ export type ReadyToClaimInfo = CommonStakeInfo<'readyToClaim'> & {
 
 export type StakeInfo = StakedInfo | UnstakingInfo | ReadyToClaimInfo
 
-export const getUnstakeAndClaimInfo =
-  (validators: ValidatorListItem[]) =>
+export const getUnstakeAndClaimInfoV2 =
   (nfts: NonFungible[]) =>
   (
     account: Account | Component<unknown, typeof standardMetadata>,
@@ -50,12 +49,6 @@ export const getUnstakeAndClaimInfo =
         claimNft.nftData.expected['claim_epoch']!.value
       ).lte(currentEpoch)
 
-      const validator = validators.find(
-        (validator) =>
-          validator.unstakeClaimResourceAddress ===
-          claimNft.address.resourceAddress
-      )!
-
       const xrdAmount = new BigNumber(
         claimNft.nftData.expected['claim_amount']!.value
       ).toFixed(RET_DECIMAL_PRECISION)
@@ -64,7 +57,7 @@ export const getUnstakeAndClaimInfo =
 
       const unstakeInfo = {
         account: account.address,
-        validator,
+        validatorAddress: claimNft.validatorAddress,
         xrdAmount,
         claimNft,
         claimEpoch: claimNft.nftData.expected['claim_epoch']!.value
@@ -88,7 +81,7 @@ export const getUnstakeAndClaimInfo =
   }
 
 export const getStakedInfo =
-  (validators: ValidatorListItem[], fungibles: FungibleResource[]) =>
+  (fungibles: FungibleResource[]) =>
   (account: Account | Component<unknown, typeof standardMetadata>) => {
     const stakeUnits: Map<string, NativeResourceValidatorLiquidStakeUnitValue> =
       new Map(
@@ -119,15 +112,10 @@ export const getStakedInfo =
           .multipliedBy(new BigNumber(multiplier!))
           .toFixed(RET_DECIMAL_PRECISION)
 
-        const validator = validators.find(
-          (validator) =>
-            validator.stakeUnitResourceAddress === stakeUnitToken.address
-        )!
-
         return {
           type: 'staked',
           account: account.address,
-          validator,
+          validatorAddress: stakeUnitNativeResourceDetails.validator_address,
           stakeUnitsAmount: stakeUnitToken.value,
           xrdAmount
         } as StakedInfo
diff --git a/packages/ui/src/api/utils/validators-cache-module.ts b/packages/ui/src/api/utils/validators-cache-module.ts
new file mode 100644
index 000000000..c3a420fe6
--- /dev/null
+++ b/packages/ui/src/api/utils/validators-cache-module.ts
@@ -0,0 +1,51 @@
+import { BehaviorSubject } from 'rxjs'
+import { callApi } from '@api/gateway'
+import { getStringMetadata } from './metadata'
+
+export const ValidatorsCacheModule = () => {
+  const isLoading = new BehaviorSubject<boolean>(false)
+  const validators = new Map<
+    string,
+    {
+      address: string
+      poolUnitResourceAddress: string
+      iconUrl: string
+      name: string
+    }
+  >()
+  const queriedValidators = new Set<string>()
+
+  const queryValidators = (addresses: string[]) => {
+    const addressesToQuery = addresses.filter(
+      (address) => !queriedValidators.has(address)
+    )
+    addressesToQuery.forEach((address) => queriedValidators.add(address))
+    isLoading.next(true)
+
+    return callApi('getEntityDetailsVaultAggregated', addressesToQuery, {
+      explicitMetadata: ['icon_url', 'pool_unit', 'name']
+    })
+      .map((entities) => {
+        entities.forEach((entity) => {
+          validators.set(entity.address, {
+            address: entity.address,
+            poolUnitResourceAddress:
+              getStringMetadata('pool_unit')(entity.metadata) || '',
+            iconUrl: getStringMetadata('icon_url')(entity.metadata) || '',
+            name: getStringMetadata('name')(entity.metadata) || ''
+          })
+        })
+      })
+      .map(() => {
+        isLoading.next(false)
+      })
+  }
+
+  return {
+    validators,
+    isLoading$: isLoading.asObservable(),
+    queryValidators
+  }
+}
+
+export const validatorsCacheModule = ValidatorsCacheModule()

From baebc019caffcc5652b955d1b483f959e5bf93ef Mon Sep 17 00:00:00 2001
From: Dawid Sowa <dawid.sowa@rdx.works>
Date: Tue, 1 Oct 2024 15:05:53 +0200
Subject: [PATCH 3/7] refactor: recognize pool_units based on native resource
 details

---
 apps/dashboard/src/lib/summary/summary.ts     | 35 ++--------
 .../resource/[resource]/+layout.ts            |  6 +-
 .../_deprecated/utils/entities/resource.ts    |  1 -
 .../entities/resource/fungible/pool-unit.ts   | 68 ++++---------------
 .../src/api/utils/entities/resource/index.ts  | 17 +----
 5 files changed, 20 insertions(+), 107 deletions(-)

diff --git a/apps/dashboard/src/lib/summary/summary.ts b/apps/dashboard/src/lib/summary/summary.ts
index 1f6afb297..e9ddb9e1e 100644
--- a/apps/dashboard/src/lib/summary/summary.ts
+++ b/apps/dashboard/src/lib/summary/summary.ts
@@ -46,30 +46,6 @@ export type LayoutDataStakeInfo = {
   totalReadyToClaim: BigNumber
 }
 
-const getEntityTypes = async (
-  addresses: string[]
-): Promise<{ [address: string]: EntityType }> =>
-  http.post('/api/ret/entity-type', {
-    addresses
-  })
-
-const getEntityDetailsFn = (stateVersion: number) => (addresses: string[]) =>
-  pipe(
-    () =>
-      callApi(
-        'getEntityDetailsVaultAggregated',
-        addresses,
-        {
-          dappTwoWayLinks: true,
-          nativeResourceDetails: true
-        },
-        {
-          state_version: stateVersion
-        }
-      ),
-    handleGatewayResult((_) => ERROR_MSG)
-  )()
-
 const getPoolUnitData =
   (
     stateVersion: number,
@@ -303,13 +279,10 @@ export const produceSummary = (
   const poolData = pipe(
     () => Promise.all([account, fungibleResources, ledgerState]),
     andThen(([account, fungibles, { stateVersion }]) =>
-      pipe(() => {
-        return getPoolUnits(
-          fungibles,
-          getEntityTypes,
-          getEntityDetailsFn(stateVersion)
-        )
-      }, andThen(getPoolUnitData(stateVersion, account)))()
+      pipe(
+        () => getPoolUnits(fungibles),
+        andThen(getPoolUnitData(stateVersion, account))
+      )()
     )
   )()
 
diff --git a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
index 30f7d872a..90ee1b4b5 100644
--- a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
+++ b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
@@ -81,11 +81,7 @@ export const load: LayoutLoad = async ({ params }) => {
       throw redirect(308, `/claim_nft/${encodeURIComponent(params.resource)}`)
     }
   }
-  const transformedResource = await transformUnknownResource(
-    resource,
-    getEntityTypes,
-    getEntityDetails()
-  )
+  const transformedResource = await transformUnknownResource(resource)
 
   const redeemableTokens =
     transformedResource.type === 'poolUnit'
diff --git a/packages/ui/src/api/_deprecated/utils/entities/resource.ts b/packages/ui/src/api/_deprecated/utils/entities/resource.ts
index 2932c73e0..47c25e420 100644
--- a/packages/ui/src/api/_deprecated/utils/entities/resource.ts
+++ b/packages/ui/src/api/_deprecated/utils/entities/resource.ts
@@ -26,7 +26,6 @@ import {
   type GetEntityDetailsFn
 } from './pool-unit'
 import { type AuthInfo, isAllowed } from '../../../utils/auth'
-import { err, ok } from 'neverthrow'
 
 type _Resource<T extends 'fungible' | 'non-fungible'> = _Entity<
   'resource',
diff --git a/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts b/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts
index 8baa1768f..d5fd5df05 100644
--- a/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts
+++ b/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts
@@ -54,14 +54,6 @@ export const resourceToPoolUnit = (resource: FungibleResource): PoolUnit => ({
   }
 })
 
-const getPoolAddress = (resource: FungibleResource) => {
-  const poolMetadataEntry = getMetadataItem('pool')({
-    items: resource.metadata.all
-  })
-  if (poolMetadataEntry?.value.typed.type === 'GlobalAddress')
-    return poolMetadataEntry?.value.typed.value
-}
-
 export const hasPoolMetadataSet = (resource: FungibleResource) => {
   const poolMetadataEntry = getMetadataItem('pool')({
     items: resource.metadata.all
@@ -111,55 +103,19 @@ export const verify2WayLinking =
 const getPoolAddresses = (resources: FungibleResourceWithPoolAddress[]) =>
   resources.map(({ poolAddress }) => poolAddress)
 
-const filterByEntityType =
-  (validEntityTypes: Set<string>, getEntityTypesFn: GetEntityTypesFn) =>
-  async (resources: FungibleResourceWithPoolAddress[]) =>
-    pipe(
-      getPoolAddresses,
-      getEntityTypesFn,
-      andThen((entityTypes) =>
-        resources.filter(({ poolAddress }) => {
-          const poolEntityType = entityTypes[poolAddress]
-          return poolEntityType && validEntityTypes.has(poolEntityType)
-        })
+export const getPoolUnits = (resources: FungibleResource[]) => {
+  return Promise.resolve(
+    resources
+      .filter((resource) =>
+        [
+          'TwoResourcePoolUnit',
+          'OneResourcePoolUnit',
+          'MultiResourcePoolUnit'
+        ].includes(resource.nativeResourceDetails?.kind || '')
       )
-    )(resources)
-
-const extendWithPoolAddress = (resources: FungibleResource[]) =>
-  resources.map((resource) => ({
-    ...resource,
-    poolAddress: getPoolAddress(resource)!
-  }))
-
-export const verifyPoolUnit =
-  (
-    getEntityTypesFn: GetEntityTypesFn,
-    getEntityDetailsFn: GetEntityDetailsFn
-  ) =>
-  (resources: FungibleResource[]) =>
-    pipe(
-      (resources: FungibleResource[]) => resources.filter(hasPoolMetadataSet),
-      extendWithPoolAddress,
-      filterByEntityType(
-        new Set([
-          'GlobalOneResourcePool',
-          'GlobalTwoResourcePool',
-          'GlobalMultiResourcePool'
-        ]),
-        getEntityTypesFn
-      ),
-      andThen(verify2WayLinking(getEntityDetailsFn))
-    )(resources)
-
-export const getPoolUnits = (
-  resources: FungibleResource[],
-  getEntityTypesFn: GetEntityTypesFn,
-  getEntityDetailsFn: GetEntityDetailsFn
-) =>
-  pipe(
-    verifyPoolUnit(getEntityTypesFn, getEntityDetailsFn),
-    andThen((resources) => resources.map(resourceToPoolUnit))
-  )(resources)
+      .map((resource) => resourceToPoolUnit(resource))
+  )
+}
 
 export const getPoolUnitMetadataValue = (
   entity: StateEntityDetailsVaultResponseItem
diff --git a/packages/ui/src/api/utils/entities/resource/index.ts b/packages/ui/src/api/utils/entities/resource/index.ts
index 0e6943033..cbe5bd5fb 100644
--- a/packages/ui/src/api/utils/entities/resource/index.ts
+++ b/packages/ui/src/api/utils/entities/resource/index.ts
@@ -12,12 +12,7 @@ import type {
 import { getBehaviors, type Behavior } from './behaviors'
 import { getAuthInfo } from '@api/utils/auth'
 import { transformFungibleResource } from './fungible'
-import {
-  getPoolUnits,
-  hasPoolMetadataSet,
-  type GetEntityTypesFn,
-  type GetEntityDetailsFn
-} from './fungible/pool-unit'
+import { getPoolUnits, hasPoolMetadataSet } from './fungible/pool-unit'
 import { transformNonFungibleResource } from './non-fungible'
 import {
   createStandardMetadata,
@@ -80,18 +75,12 @@ export const transformResource = <Metadata extends ExpectedMetadata>(
   )()
 
 export const transformUnknownResource = async (
-  entity: StateEntityDetailsVaultResponseItem,
-  getEntityTypesFn: GetEntityTypesFn,
-  getEntityDetailsFn: GetEntityDetailsFn
+  entity: StateEntityDetailsVaultResponseItem
 ) => {
   if (entity.details?.type === 'FungibleResource') {
     const fungible = transformFungibleResource(entity)
     if (hasPoolMetadataSet(fungible)) {
-      return getPoolUnits(
-        [fungible],
-        getEntityTypesFn,
-        getEntityDetailsFn
-      ).then((res) => res[0] ?? fungible)
+      return getPoolUnits([fungible]).then((res) => res[0] ?? fungible)
     }
     return fungible
   }

From d74a3817dd9e561d08105424e2db2f1467005d79 Mon Sep 17 00:00:00 2001
From: Dawid Sowa <dawid.sowa@rdx.works>
Date: Tue, 1 Oct 2024 15:20:16 +0200
Subject: [PATCH 4/7] refactor: use `native_resource_details` to find LSUs and
 Claim NFTs

---
 .../resource/[resource]/+layout.ts            | 45 +++----------------
 .../api/utils/entities/component/validator.ts | 14 ------
 .../entities/resource/fungible/stake-unit.ts  | 44 ++----------------
 .../non-fungible/claim-nft-collection.ts      | 25 ++---------
 4 files changed, 14 insertions(+), 114 deletions(-)

diff --git a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
index 90ee1b4b5..69fd730b4 100644
--- a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
+++ b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
@@ -10,42 +10,11 @@ import { callApi } from '@api/_deprecated/gateway'
 import { andThen, pipe } from 'ramda'
 import { handleGatewayResult } from '../../../../utils'
 import { getStringMetadata } from '@api/utils/metadata'
-import type { EntityType } from '@common/ret'
-import { http } from '@common/http'
-import { hasValidatorMetadataSet } from '@api/utils/entities/component/validator'
 import { verifyStakeUnit } from '@api/utils/entities/resource/fungible/stake-unit'
 import { verifyClaimNft } from '@api/utils/entities/resource/non-fungible/claim-nft-collection'
 import { transformUnknownResource } from '@api/utils/entities/resource'
 import type { PoolUnit } from '@api/utils/entities/resource/fungible/pool-unit'
 
-const ERROR_MSG = 'Failed to load resource data.'
-
-const getEntityTypes = async (
-  addresses: string[]
-): Promise<{ [address: string]: EntityType }> =>
-  http.post('/api/ret/entity-type', {
-    addresses
-  })
-
-const getEntityDetails = (stateVersion?: number) => (addresses: string[]) =>
-  pipe(
-    () =>
-      callApi(
-        'getEntityDetailsVaultAggregated',
-        addresses,
-        {
-          dappTwoWayLinks: true,
-          nativeResourceDetails: true
-        },
-        stateVersion
-          ? {
-              state_version: stateVersion
-            }
-          : undefined
-      ),
-    handleGatewayResult((_) => ERROR_MSG)
-  )()
-
 const getRedeemableTokens = async (poolUnit: PoolUnit) => {
   const pool = poolUnit.metadata.expected.pool!.typed.value
 
@@ -71,15 +40,13 @@ export const load: LayoutLoad = async ({ params }) => {
 
   const resource = await getLookupEntity(params.resource)
 
-  const isValidStakeUnit = await verifyStakeUnit(resource)
-  const isValidClaimNft = await verifyClaimNft(resource)
+  const isValidStakeUnit = verifyStakeUnit(resource)
+  const isValidClaimNft = verifyClaimNft(resource)
 
-  if (hasValidatorMetadataSet(resource)) {
-    if (isValidStakeUnit) {
-      throw redirect(308, `/stake_unit/${encodeURIComponent(params.resource)}`)
-    } else if (isValidClaimNft) {
-      throw redirect(308, `/claim_nft/${encodeURIComponent(params.resource)}`)
-    }
+  if (isValidStakeUnit) {
+    throw redirect(308, `/stake_unit/${encodeURIComponent(params.resource)}`)
+  } else if (isValidClaimNft) {
+    throw redirect(308, `/claim_nft/${encodeURIComponent(params.resource)}`)
   }
   const transformedResource = await transformUnknownResource(resource)
 
diff --git a/packages/ui/src/api/utils/entities/component/validator.ts b/packages/ui/src/api/utils/entities/component/validator.ts
index 8225832de..8c69828d9 100644
--- a/packages/ui/src/api/utils/entities/component/validator.ts
+++ b/packages/ui/src/api/utils/entities/component/validator.ts
@@ -9,7 +9,6 @@ import type {
 import {
   getEnumStringMetadata,
   transformMetadata,
-  getStringMetadata,
   createSystemMetadata,
   createStandardMetadata
 } from '../../metadata'
@@ -515,16 +514,3 @@ export const getValidators = <
       withStakeUnits
     )
   )
-
-export const getValidatorMetadataValue = (
-  entity: StateEntityDetailsVaultResponseItem
-) => getStringMetadata('validator')(entity.metadata)
-
-export const hasValidatorMetadataSet = (
-  entity: StateEntityDetailsVaultResponseItem
-) => {
-  const validatorAddress = getValidatorMetadataValue(entity)
-  const isValidatorAddress = validatorAddress.startsWith('validator_')
-
-  return isValidatorAddress
-}
diff --git a/packages/ui/src/api/utils/entities/resource/fungible/stake-unit.ts b/packages/ui/src/api/utils/entities/resource/fungible/stake-unit.ts
index 57e37b49b..1906c1c0b 100644
--- a/packages/ui/src/api/utils/entities/resource/fungible/stake-unit.ts
+++ b/packages/ui/src/api/utils/entities/resource/fungible/stake-unit.ts
@@ -1,15 +1,7 @@
-import { callApi } from '@api/_deprecated/gateway'
 import type { _Entity } from '../..'
-import {
-  getStringMetadata,
-  transformMetadata,
-  createSystemMetadata
-} from '../../../metadata'
+import { transformMetadata, createSystemMetadata } from '../../../metadata'
 import type { StateEntityDetailsVaultResponseItem } from '@common/gateway-sdk'
 import type { FungibleResource } from '.'
-import { ok } from 'neverthrow'
-import { getValidatorMetadataValue } from '../../component/validator'
-import { getPoolUnitMetadataValue } from './pool-unit'
 
 const systemMetadata = createSystemMetadata({
   validator: 'GlobalAddress'
@@ -41,34 +33,6 @@ export const resourceToStakeUnit = (resource: FungibleResource): StakeUnit => {
   }
 }
 
-export const isStakeUnit = async (
-  entity: StateEntityDetailsVaultResponseItem
-) => {
-  const validator = await getStringMetadata('validator')(entity.metadata)
-  if (!validator) return false
-  const validatorEntityResult = await callApi(
-    'getEntityDetailsVaultAggregated',
-    [validator]
-  )
-  return validatorEntityResult.match(
-    (validatorEntity) =>
-      !!getStringMetadata('pool_unit')(validatorEntity[0].metadata),
-    () => false
-  )
-}
-
-const getEntityDetails = (address: string) =>
-  callApi('getEntityDetailsVaultAggregated', [address])
-
-export const verifyStakeUnit = async (
-  entity: StateEntityDetailsVaultResponseItem
-) => {
-  const validatorMetadataValue = getValidatorMetadataValue(entity)
-  if (!validatorMetadataValue) return false
-  const result = await ok(validatorMetadataValue)
-    .asyncAndThen(getEntityDetails)
-    .map(([entity]) => getPoolUnitMetadataValue(entity))
-    .map((poolUnit) => poolUnit === entity.address)
-
-  return result.isOk() && result.value === true
-}
+export const verifyStakeUnit = (entity: StateEntityDetailsVaultResponseItem) =>
+  entity.details?.type === 'FungibleResource' &&
+  entity.details.native_resource_details?.kind === 'ValidatorLiquidStakeUnit'
diff --git a/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts b/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
index eb65f63ab..c0cdda6d5 100644
--- a/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
+++ b/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
@@ -2,12 +2,7 @@ import { createSystemMetadata, getStringMetadata } from '@api/utils/metadata'
 import type { Resource, standardMetadata } from '..'
 import type { StateEntityDetailsVaultResponseItem } from '@common/gateway-sdk'
 import { callApi } from '@api/gateway'
-import { ok } from 'neverthrow'
-import {
-  getValidatorMetadataValue,
-  type Validator,
-  type ValidatorListItem
-} from '../../component/validator'
+
 import type { DefaultNonFungibleResource } from '.'
 import { transformMetadata } from '@api/utils/metadata'
 
@@ -29,9 +24,6 @@ export const getClaimNftMetadataValue = (
   entity: StateEntityDetailsVaultResponseItem
 ) => getStringMetadata('claim_nft')(entity.metadata)
 
-const getEntityDetails = (address: string) =>
-  callApi('getEntityDetailsVaultAggregated', [address])
-
 export const isClaimNftCollection = (
   resourceEntity: StateEntityDetailsVaultResponseItem
 ) => {
@@ -63,15 +55,6 @@ export const resourceToClaimNftCollection = (
   }
 })
 
-export const verifyClaimNft = async (
-  entity: StateEntityDetailsVaultResponseItem
-) => {
-  const validatorMetadataValue = getValidatorMetadataValue(entity)
-  if (!validatorMetadataValue) return false
-  const result = await ok(validatorMetadataValue)
-    .asyncAndThen(getEntityDetails)
-    .map(([entity]) => getClaimNftMetadataValue(entity))
-    .map((claimNft) => claimNft === entity.address)
-
-  return result.isOk() && result.value === true
-}
+export const verifyClaimNft = (entity: StateEntityDetailsVaultResponseItem) =>
+  entity.details?.type === 'NonFungibleResource' &&
+  entity.details.native_resource_details?.kind === 'ValidatorClaimNft'

From 072ac7226df4b36860a678747e9fcd47fe2f0ade Mon Sep 17 00:00:00 2001
From: Dawid Sowa <dawid.sowa@rdx.works>
Date: Tue, 1 Oct 2024 15:29:14 +0200
Subject: [PATCH 5/7] refactor: remove artificial, not needed promise wrapping

---
 apps/dashboard/src/lib/summary/summary.ts     | 15 +++++-------
 .../resource/[resource]/+layout.ts            |  2 +-
 .../entities/resource/fungible/pool-unit.ts   | 24 +++++++++----------
 .../src/api/utils/entities/resource/index.ts  | 14 ++++++-----
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/apps/dashboard/src/lib/summary/summary.ts b/apps/dashboard/src/lib/summary/summary.ts
index e9ddb9e1e..378b47d41 100644
--- a/apps/dashboard/src/lib/summary/summary.ts
+++ b/apps/dashboard/src/lib/summary/summary.ts
@@ -276,15 +276,12 @@ export const produceSummary = (
       }
     })
 
-  const poolData = pipe(
-    () => Promise.all([account, fungibleResources, ledgerState]),
-    andThen(([account, fungibles, { stateVersion }]) =>
-      pipe(
-        () => getPoolUnits(fungibles),
-        andThen(getPoolUnitData(stateVersion, account))
-      )()
-    )
-  )()
+  const poolData = Promise.all([account, fungibleResources, ledgerState]).then(
+    ([account, fungibles, { stateVersion }]) => {
+      const poolUnits = getPoolUnits(fungibles)
+      return getPoolUnitData(stateVersion, account)(poolUnits)
+    }
+  )
 
   return {
     poolData,
diff --git a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
index 69fd730b4..d9bb6de59 100644
--- a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
+++ b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
@@ -48,7 +48,7 @@ export const load: LayoutLoad = async ({ params }) => {
   } else if (isValidClaimNft) {
     throw redirect(308, `/claim_nft/${encodeURIComponent(params.resource)}`)
   }
-  const transformedResource = await transformUnknownResource(resource)
+  const transformedResource = transformUnknownResource(resource)
 
   const redeemableTokens =
     transformedResource.type === 'poolUnit'
diff --git a/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts b/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts
index d5fd5df05..0c0be8e31 100644
--- a/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts
+++ b/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts
@@ -103,19 +103,17 @@ export const verify2WayLinking =
 const getPoolAddresses = (resources: FungibleResourceWithPoolAddress[]) =>
   resources.map(({ poolAddress }) => poolAddress)
 
-export const getPoolUnits = (resources: FungibleResource[]) => {
-  return Promise.resolve(
-    resources
-      .filter((resource) =>
-        [
-          'TwoResourcePoolUnit',
-          'OneResourcePoolUnit',
-          'MultiResourcePoolUnit'
-        ].includes(resource.nativeResourceDetails?.kind || '')
-      )
-      .map((resource) => resourceToPoolUnit(resource))
-  )
-}
+export const getPoolUnits = (resources: FungibleResource[]) =>
+  resources
+    .filter((resource) => isPoolUnit(resource))
+    .map((resource) => resourceToPoolUnit(resource))
+
+export const isPoolUnit = (resource: FungibleResource) =>
+  [
+    'TwoResourcePoolUnit',
+    'OneResourcePoolUnit',
+    'MultiResourcePoolUnit'
+  ].includes(resource.nativeResourceDetails?.kind || '')
 
 export const getPoolUnitMetadataValue = (
   entity: StateEntityDetailsVaultResponseItem
diff --git a/packages/ui/src/api/utils/entities/resource/index.ts b/packages/ui/src/api/utils/entities/resource/index.ts
index cbe5bd5fb..b4d97e9fc 100644
--- a/packages/ui/src/api/utils/entities/resource/index.ts
+++ b/packages/ui/src/api/utils/entities/resource/index.ts
@@ -12,7 +12,12 @@ import type {
 import { getBehaviors, type Behavior } from './behaviors'
 import { getAuthInfo } from '@api/utils/auth'
 import { transformFungibleResource } from './fungible'
-import { getPoolUnits, hasPoolMetadataSet } from './fungible/pool-unit'
+import {
+  getPoolUnits,
+  hasPoolMetadataSet,
+  isPoolUnit,
+  resourceToPoolUnit
+} from './fungible/pool-unit'
 import { transformNonFungibleResource } from './non-fungible'
 import {
   createStandardMetadata,
@@ -74,15 +79,12 @@ export const transformResource = <Metadata extends ExpectedMetadata>(
       } as const)
   )()
 
-export const transformUnknownResource = async (
+export const transformUnknownResource = (
   entity: StateEntityDetailsVaultResponseItem
 ) => {
   if (entity.details?.type === 'FungibleResource') {
     const fungible = transformFungibleResource(entity)
-    if (hasPoolMetadataSet(fungible)) {
-      return getPoolUnits([fungible]).then((res) => res[0] ?? fungible)
-    }
-    return fungible
+    return isPoolUnit(fungible) ? resourceToPoolUnit(fungible) : fungible
   }
 
   return transformNonFungibleResource(entity)

From be1ae9e3beba77f10c8b3723f2b468479368c06d Mon Sep 17 00:00:00 2001
From: Dawid Sowa <dawid.sowa@rdx.works>
Date: Tue, 1 Oct 2024 17:17:49 +0200
Subject: [PATCH 6/7] refactor: use `native_resource_details` to calculate pool
 units redeem value

---
 apps/dashboard/src/lib/summary/summary.ts     | 81 +++++--------------
 .../src/api/utils/entities/component/pool.ts  | 20 -----
 .../entities/resource/fungible/pool-unit.ts   | 19 ++++-
 3 files changed, 38 insertions(+), 82 deletions(-)

diff --git a/apps/dashboard/src/lib/summary/summary.ts b/apps/dashboard/src/lib/summary/summary.ts
index 378b47d41..8ce0b03ed 100644
--- a/apps/dashboard/src/lib/summary/summary.ts
+++ b/apps/dashboard/src/lib/summary/summary.ts
@@ -14,20 +14,12 @@ import {
   type StakeInfo,
   type UnstakingInfo
 } from '@api/utils/staking'
-import {
-  getRedeemablePoolTokenAmount,
-  transformPool
-} from '@api/utils/entities/component/pool'
 
 import { ResultAsync } from 'neverthrow'
 import { transformNft } from '@api/utils/nfts'
-
-import type { EntityType } from '@api/utils/entities/component'
-import { http } from '@common/http'
 import { type PoolUnit } from '@api/utils/entities/resource/fungible/pool-unit'
 import BigNumber from 'bignumber.js'
 import type { standardMetadata } from '@api/utils/metadata'
-import { errorPage } from '@dashboard/stores'
 const ERROR_MSG = 'Failed to load entity data.'
 
 export type AccumulatedStakeInfo = {
@@ -52,55 +44,25 @@ const getPoolUnitData =
     account: Account | Component<unknown, typeof standardMetadata>
   ) =>
   async (poolUnits: PoolUnit[]) => {
-    const poolAddresses = poolUnits.map(
-      (unit) => unit.metadata.expected.pool.typed.value
-    )
-
-    if (poolAddresses.some((a) => a === undefined)) {
-      errorPage.set({
-        message: ERROR_MSG
-      })
-
-      throw 'Pool not found.'
-    }
-
-    const poolEntities = await pipe(
-      () =>
-        callApi(
-          'getEntityDetailsVaultAggregated',
-          poolAddresses as string[],
-          {
-            dappTwoWayLinks: true,
-            nativeResourceDetails: true
-          },
-          { state_version: stateVersion }
-        ),
-      handleGatewayResult((_) => ERROR_MSG)
-    )()
-
-    const pools = poolEntities.map(transformPool)
+    const poolResources = [
+      ...new Set(
+        poolUnits.flatMap((unit) =>
+          unit.nativeResourceDetails.unit_redemption_value.map(
+            (value) => value.resource_address
+          )
+        )
+      )
+    ]
 
     const poolTokens = await pipe(
       () =>
-        callApi(
-          'getEntityDetailsVaultAggregated',
-          pools.flatMap(
-            (pool) => pool.metadata.expected.pool_resources.typed.values
-          ),
-          {
-            dappTwoWayLinks: true,
-            nativeResourceDetails: true
-          },
-          { state_version: stateVersion }
-        ),
+        callApi('getEntityDetailsVaultAggregated', poolResources, undefined, {
+          state_version: stateVersion
+        }),
       handleGatewayResult((_) => ERROR_MSG)
     )()
 
     return poolUnits.map((unit) => {
-      const pool = pools.find(
-        (pool) => pool.address === unit.metadata.expected.pool.typed.value
-      )!
-
       const poolUnitsBalance = account.resources.fungible.find(
         (resource) => resource.address === unit.address
       )!.value
@@ -113,22 +75,23 @@ const getPoolUnitData =
           icon: unit.metadata.expected.icon_url?.typed.value,
           accountAmount: poolUnitsBalance
         },
-        poolTokens: pool.metadata.expected.pool_resources.typed.values.map(
+        poolTokens: unit.nativeResourceDetails.unit_redemption_value.map(
           (poolToken) => {
             const token = transformFungibleResource(
-              poolTokens.find((token) => token.address === poolToken)!
+              poolTokens.find(
+                (token) => token.address === poolToken.resource_address
+              )!
             )
 
+            const redeemableAmount = new BigNumber(
+              poolToken.amount || '0'
+            ).multipliedBy(new BigNumber(poolUnitsBalance))
+
             return {
               name: token.metadata.expected.name?.typed.value,
               icon: token.metadata.expected.icon_url?.typed.value,
               address: token.address,
-              redeemableAmount: getRedeemablePoolTokenAmount(
-                token,
-                unit,
-                pool,
-                poolUnitsBalance
-              )
+              redeemableAmount
             }
           }
         )
@@ -155,7 +118,6 @@ export const produceSummary = (
           'getEntityDetailsVaultAggregated',
           acc.resources.fungible.map((token) => token.address),
           {
-            dappTwoWayLinks: true,
             nativeResourceDetails: true
           }
         ),
@@ -171,7 +133,6 @@ export const produceSummary = (
           'getEntityDetailsVaultAggregated',
           acc.resources.nonFungible.map((token) => token.address),
           {
-            dappTwoWayLinks: true,
             nativeResourceDetails: true
           }
         ),
diff --git a/packages/ui/src/api/utils/entities/component/pool.ts b/packages/ui/src/api/utils/entities/component/pool.ts
index c5bcfb64d..17d01a824 100644
--- a/packages/ui/src/api/utils/entities/component/pool.ts
+++ b/packages/ui/src/api/utils/entities/component/pool.ts
@@ -55,23 +55,3 @@ export const transformPool = (
       componentType: 'pool' as const
     })
   )()
-
-export const getRedeemablePoolTokenAmount = (
-  poolToken: FungibleResource,
-  poolUnitResource: PoolUnit,
-  pool: Pool,
-  poolUnitsBalance: string
-) => {
-  const poolVaultBalance = pool.resources.fungible.find(
-    (resource) => resource.address === poolToken.address
-  )!.value
-
-  const totalSupplyOfPoolUnits = poolUnitResource.totalSupply
-
-  return new BigNumber(
-    new BigNumber(poolUnitsBalance)
-      .dividedBy(totalSupplyOfPoolUnits)
-      .multipliedBy(poolVaultBalance)
-      .toFixed(poolToken.divisibility)
-  )
-}
diff --git a/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts b/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts
index 0c0be8e31..874a23231 100644
--- a/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts
+++ b/packages/ui/src/api/utils/entities/resource/fungible/pool-unit.ts
@@ -9,6 +9,9 @@ import {
 import type { FungibleResource } from '.'
 import type {
   EntityMetadataCollection,
+  NativeResourceMultiResourcePoolUnitValue,
+  NativeResourceOneResourcePoolUnitValue,
+  NativeResourceTwoResourcePoolUnitValue,
   StateEntityDetailsVaultResponseItem
 } from '@common/gateway-sdk'
 import { andThen, pipe } from 'ramda'
@@ -17,8 +20,18 @@ const systemMetadata = createSystemMetadata({
   pool: 'GlobalAddress'
 })
 
-export type PoolUnit = Omit<FungibleResource, 'type'> &
-  _Entity<'poolUnit', typeof systemMetadata>
+type PoolUnitNativeResourceDetails =
+  | NativeResourceOneResourcePoolUnitValue
+  | NativeResourceTwoResourcePoolUnitValue
+  | NativeResourceMultiResourcePoolUnitValue
+
+export type PoolUnit = Omit<
+  FungibleResource,
+  'type' | 'nativeResourceDetails'
+> &
+  _Entity<'poolUnit', typeof systemMetadata> & {
+    nativeResourceDetails: PoolUnitNativeResourceDetails
+  }
 export type GetEntityTypesFn = (
   address: string[]
 ) => Promise<{ [address: string]: string }>
@@ -37,6 +50,8 @@ type PoolResource = Record<PoolAddress, ResourceAddress>
 
 export const resourceToPoolUnit = (resource: FungibleResource): PoolUnit => ({
   ...resource,
+  nativeResourceDetails:
+    resource.nativeResourceDetails as PoolUnitNativeResourceDetails,
   type: 'poolUnit',
   metadata: {
     ...resource.metadata,

From 63d70d5c1baf81ec2a3586c2628af712126ef4f4 Mon Sep 17 00:00:00 2001
From: Dawid Sowa <dawid.sowa@rdx.works>
Date: Tue, 1 Oct 2024 17:26:45 +0200
Subject: [PATCH 7/7] refactor: remove duplicated/obsolete code and rename
 functions

---
 .../resource/[resource]/+layout.ts            |  8 +++----
 .../entities/resource/fungible/stake-unit.ts  |  2 +-
 .../non-fungible/claim-nft-collection.ts      | 22 +++++--------------
 .../entities/resource/non-fungible/index.ts   |  4 ++--
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
index d9bb6de59..8256c103c 100644
--- a/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
+++ b/apps/dashboard/src/routes/(search-pages)/resource/[resource]/+layout.ts
@@ -10,8 +10,8 @@ import { callApi } from '@api/_deprecated/gateway'
 import { andThen, pipe } from 'ramda'
 import { handleGatewayResult } from '../../../../utils'
 import { getStringMetadata } from '@api/utils/metadata'
-import { verifyStakeUnit } from '@api/utils/entities/resource/fungible/stake-unit'
-import { verifyClaimNft } from '@api/utils/entities/resource/non-fungible/claim-nft-collection'
+import { isStakeUnit } from '@api/utils/entities/resource/fungible/stake-unit'
+import { isClaimNft } from '@api/utils/entities/resource/non-fungible/claim-nft-collection'
 import { transformUnknownResource } from '@api/utils/entities/resource'
 import type { PoolUnit } from '@api/utils/entities/resource/fungible/pool-unit'
 
@@ -40,8 +40,8 @@ export const load: LayoutLoad = async ({ params }) => {
 
   const resource = await getLookupEntity(params.resource)
 
-  const isValidStakeUnit = verifyStakeUnit(resource)
-  const isValidClaimNft = verifyClaimNft(resource)
+  const isValidStakeUnit = isStakeUnit(resource)
+  const isValidClaimNft = isClaimNft(resource)
 
   if (isValidStakeUnit) {
     throw redirect(308, `/stake_unit/${encodeURIComponent(params.resource)}`)
diff --git a/packages/ui/src/api/utils/entities/resource/fungible/stake-unit.ts b/packages/ui/src/api/utils/entities/resource/fungible/stake-unit.ts
index 1906c1c0b..a94d91b4f 100644
--- a/packages/ui/src/api/utils/entities/resource/fungible/stake-unit.ts
+++ b/packages/ui/src/api/utils/entities/resource/fungible/stake-unit.ts
@@ -33,6 +33,6 @@ export const resourceToStakeUnit = (resource: FungibleResource): StakeUnit => {
   }
 }
 
-export const verifyStakeUnit = (entity: StateEntityDetailsVaultResponseItem) =>
+export const isStakeUnit = (entity: StateEntityDetailsVaultResponseItem) =>
   entity.details?.type === 'FungibleResource' &&
   entity.details.native_resource_details?.kind === 'ValidatorLiquidStakeUnit'
diff --git a/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts b/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
index c0cdda6d5..d36beb429 100644
--- a/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
+++ b/packages/ui/src/api/utils/entities/resource/non-fungible/claim-nft-collection.ts
@@ -1,7 +1,6 @@
-import { createSystemMetadata, getStringMetadata } from '@api/utils/metadata'
+import { createSystemMetadata } from '@api/utils/metadata'
 import type { Resource, standardMetadata } from '..'
 import type { StateEntityDetailsVaultResponseItem } from '@common/gateway-sdk'
-import { callApi } from '@api/gateway'
 
 import type { DefaultNonFungibleResource } from '.'
 import { transformMetadata } from '@api/utils/metadata'
@@ -20,18 +19,11 @@ export type ClaimNftCollection = Resource<
   nonFungibleType: 'claim-nft-collection'
 }
 
-export const getClaimNftMetadataValue = (
-  entity: StateEntityDetailsVaultResponseItem
-) => getStringMetadata('claim_nft')(entity.metadata)
-
-export const isClaimNftCollection = (
+export const isClaimNft = (
   resourceEntity: StateEntityDetailsVaultResponseItem
-) => {
-  return (
-    resourceEntity.details?.type === 'NonFungibleResource' &&
-    resourceEntity.details.native_resource_details?.kind === 'ValidatorClaimNft'
-  )
-}
+) =>
+  resourceEntity.details?.type === 'NonFungibleResource' &&
+  resourceEntity.details.native_resource_details?.kind === 'ValidatorClaimNft'
 
 export const resourceToClaimNftCollection = (
   resource: DefaultNonFungibleResource
@@ -54,7 +46,3 @@ export const resourceToClaimNftCollection = (
     }
   }
 })
-
-export const verifyClaimNft = (entity: StateEntityDetailsVaultResponseItem) =>
-  entity.details?.type === 'NonFungibleResource' &&
-  entity.details.native_resource_details?.kind === 'ValidatorClaimNft'
diff --git a/packages/ui/src/api/utils/entities/resource/non-fungible/index.ts b/packages/ui/src/api/utils/entities/resource/non-fungible/index.ts
index fd2284ac8..c66d63334 100644
--- a/packages/ui/src/api/utils/entities/resource/non-fungible/index.ts
+++ b/packages/ui/src/api/utils/entities/resource/non-fungible/index.ts
@@ -3,7 +3,7 @@ import type { StateEntityDetailsVaultResponseItem } from '@common/gateway-sdk'
 import {
   systemMetadata as claimNftSystemMetadata,
   type ClaimNftCollection,
-  isClaimNftCollection
+  isClaimNft
 } from './claim-nft-collection'
 import {
   isPackageOwnerBadgeCollection,
@@ -27,7 +27,7 @@ export const transformNonFungibleResource = (
     throw new Error('Invalid resource type')
   }
 
-  if (isClaimNftCollection(entity)) {
+  if (isClaimNft(entity)) {
     return {
       ...transformResource(entity, claimNftSystemMetadata),
       resourceType: 'non-fungible',