fix(dashboard): associated dApps fix & 400

radixdlt · Jan 23, 2024 · 7f52066 · 7f52066
1 parent bb74528
commit 7f52066
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 32 deletions.
diff --git a/apps/sandbox/src/layouts/Page.tsx b/apps/sandbox/src/layouts/Page.tsx
@@ -36,10 +36,7 @@ export const Page = () => {
           <Link target="_blank" href="https://www.radixdlt.com/privacy-policy">
             Privacy Policy
           </Link>
-          <Link
-            target="_blank"
-            href="http://www.radixdlt.com/terms/sandbox"
-          >
+          <Link target="_blank" href="http://www.radixdlt.com/terms/sandbox">
             Terms and Conditions
           </Link>
         </Layout.SideNav>

diff --git a/packages/ui/src/api/_deprecated/utils/entities/resource.ts b/packages/ui/src/api/_deprecated/utils/entities/resource.ts
@@ -577,27 +577,3 @@ export const getAccountFungibleTokens = (accounts: string) =>
     ),
     andThen((data) => data[0])
   )()
-
-export const getAccountDataNew = (
-  accounts: string[],
-  options?: StateEntityDetailsOptions,
-  ledgerState?: LedgerStateSelector,
-  getNonFungiblesForResources?: string[]
-) =>
-  pipe(
-    () =>
-      callApi(
-        'getEntityDetailsVaultAggregated',
-        accounts,
-        options,
-        ledgerState
-      ).andThen((entities) =>
-        entities.length === 0
-          ? err({ message: 'Entity not found.' })
-          : ok(entities)
-      ),
-    (result) =>
-      result.map(
-        transformResources(options, ledgerState, getNonFungiblesForResources)
-      )
-  )()
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
@@ -59,7 +59,9 @@ const getEntityDetails = (address: string) =>
 export const verifyStakeUnit = async (
   entity: StateEntityDetailsVaultResponseItem
 ) => {
-  const result = await ok(getValidatorMetadataValue(entity))
+  const validatorMetadataValue = getValidatorMetadataValue(entity)
+  if (!validatorMetadataValue) return false
+  const result = await ok(validatorMetadataValue)
     .asyncAndThen(getEntityDetails)
     .map(([entity]) => getPoolUnitMetadataValue(entity))
     .map((poolUnit) => poolUnit === entity.address)

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
@@ -71,7 +71,9 @@ export const resourceToClaimNftCollection = (
 export const verifyClaimNft = async (
   entity: StateEntityDetailsVaultResponseItem
 ) => {
-  const result = await ok(getValidatorMetadataValue(entity))
+  const validatorMetadataValue = getValidatorMetadataValue(entity)
+  if (!validatorMetadataValue) return false
+  const result = await ok(validatorMetadataValue)
     .asyncAndThen(getEntityDetails)
     .map(([entity]) => getClaimNftMetadataValue(entity))
     .map((claimNft) => claimNft === entity.address)

diff --git a/packages/ui/src/api/utils/two-way-linking.ts b/packages/ui/src/api/utils/two-way-linking.ts
@@ -10,12 +10,12 @@ const getDappDefinitions = (metadata: EntityMetadataCollection) => {
 
   const dappDefinition = getStringMetadata('dapp_definition')(metadata)
 
-  if (dappDefinition !== '' || dappDefinition !== undefined)
+  if (dappDefinition !== '' && dappDefinition !== undefined)
     dappDefinitions.push(dappDefinition)
 
   const dappDefinitionsVector = getVectorMetadata('dapp_definitions')(metadata)
 
-  if (dappDefinitionsVector.length > 0 || dappDefinitionsVector !== undefined)
+  if (dappDefinitionsVector.length > 0 && dappDefinitionsVector !== undefined)
     dappDefinitions.push(...dappDefinitionsVector)
 
   return dappDefinitions