Fix "Cannot read property 'url'" for pools that do not have url

vacuumlabs · Feb 21, 2021 · c5767ea · c5767ea
1 parent 550dadc
commit c5767ea
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/app/frontend/wallet/blockchain-explorer.ts b/app/frontend/wallet/blockchain-explorer.ts
@@ -33,6 +33,7 @@ import {
   PoolRecommendationResponse,
   StakingInfoResponse,
   BestSlotResponse,
+  StakePoolInfo,
 } from './explorer-types'
 
 const cacheResults = (maxAge: number, cache_obj: Object = {}) => <T extends Function>(fn: T): T => {
@@ -360,17 +361,29 @@ const blockchainExplorer = (ADALITE_CONFIG) => {
     validStakepools: ValidStakePoolsMapping,
     epochsToRewardDistribution: number
   ): Promise<NextRewardDetailsFormatted> {
+    const getPool = async (
+      poolHash: string
+    ): Promise<StakePoolInfo | HostedPoolMetadata | string> => {
+      // TODO simplify with optional chaining once switching to node 12/eslint v4
+      if (validStakepools[poolHash]) {
+        if (validStakepools[poolHash].name) {
+          return validStakepools[poolHash]
+        } else if (validStakepools[poolHash].url) {
+          return await getPoolInfo(validStakepools[poolHash].url).catch(() => UNKNOWN_POOL_NAME)
+        }
+      }
+
+      return UNKNOWN_POOL_NAME
+    }
+
     const nextRewardDetailsWithMetaData: Array<RewardWithMetadata> = await Promise.all(
       nextRewardDetails.map(async (nextRewardDetail: NextRewardDetail) => {
         const poolHash = nextRewardDetail.poolHash
         if (poolHash) {
           return {
             ...nextRewardDetail,
             distributionEpoch: nextRewardDetail.forEpoch + epochsToRewardDistribution,
-            pool:
-              validStakepools[poolHash] && validStakepools[poolHash].name
-                ? validStakepools[poolHash]
-                : await getPoolInfo(validStakepools[poolHash].url).catch(() => UNKNOWN_POOL_NAME),
+            pool: getPool(poolHash),
           }
         } else {
           return {

diff --git a/app/frontend/wallet/explorer-types.ts b/app/frontend/wallet/explorer-types.ts
@@ -6,7 +6,7 @@ export type HostedPoolMetadata = {
   extended?: string
 }
 
-type StakePoolInfo = {
+export type StakePoolInfo = {
   pledge: string
   margin: number
   fixedCost: string