Fabo/minor fixes (#51)

* gracefully handle no rewards * always return balance * prevent error when no rewards * fix wrong delegation amount showing
luniehq · Oct 29, 2019 · f0a78d4 · f0a78d4
1 parent e308020
commit f0a78d4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/lib/cosmosV0-source.js b/lib/cosmosV0-source.js
@@ -337,9 +337,11 @@ class CosmosV0API extends RESTDataSource {
           )) || []
       }))
     )
-    return rewards.map(({ rewards, validator }) =>
-      this.reducers.rewardReducer(rewards[0], validator)
-    )
+    return rewards
+      .filter(({ rewards }) => rewards.length > 0)
+      .map(({ rewards, validator }) =>
+        this.reducers.rewardReducer(rewards[0], validator)
+      )
   }
 
   async getOverview(delegatorAddress) {

diff --git a/lib/cosmosV2-source.js b/lib/cosmosV2-source.js
@@ -73,8 +73,8 @@ class CosmosV2API extends CosmosV0API {
       `distribution/delegators/${delegatorAddress}/rewards`
     )
     const validators = await this.getAllValidators()
-    return rewards
-      .filter(({ rewards }) => !!rewards)
+    return (rewards || [])
+      .filter(({ rewards }) => rewards.length > 0)
       .map(({ rewards, validator_address }) =>
         this.reducers.rewardReducer(
           rewards[0],

diff --git a/lib/reducers/cosmosV0-reducers.js b/lib/reducers/cosmosV0-reducers.js
@@ -251,7 +251,7 @@ function delegationReducer(delegation, validator) {
     validatorAddress: delegation.validator_address,
     delegatorAddress: delegation.delegator_address,
     validator,
-    amount: atoms(balance)
+    amount: balance
   }
 }
 

diff --git a/lib/resolvers.js b/lib/resolvers.js
@@ -145,10 +145,12 @@ const resolvers = {
     balances: async (_, { networkId, address }, { dataSources }) =>
       selectFrom(dataSources, networkId).getBalancesFromAddress(address),
     balance: async (_, { networkId, address, denom }, { dataSources }) => {
-      const balances = await selectFrom(dataSources, networkId)
-        .getBalancesFromAddress(address)
-        .then(result => result.find(balance => balance.denom === denom))
-      return balances
+      const balances = await selectFrom(
+        dataSources,
+        networkId
+      ).getBalancesFromAddress(address)
+      const balance = balances.find(balance => balance.denom === denom)
+      return balance || { denom, amount: 0 }
     },
     delegations,
     undelegations,