Maintenance and fixes

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [Unreleased]
+
+* [392] Fixed account page not rendering when the account is empty
+* [413] Fixed validator page error after logging in with Ledger
+
 ## v0.39.x-1
 
 * [#425] Fixed `commission_rates` might not exists in `validator.commission` object

both/utils/coins.js

@@ -19,7 +19,7 @@ const coinList = Meteor.settings.public.coins;
 for (let i in coinList) {
 	const coin = coinList[i];
 	if (!coin.displayNamePlural) {
-		coin.displayNamePlural = coin.displayName + 's';
+		coin.displayNamePlural = coin.displayName;
 	}
 }
 

imports/api/accounts/server/methods.js

@@ -9,7 +9,6 @@ const fetchFromUrl = (url) => {
         };
     }
     catch (e){
-        console.log(res);
         console.log(e);
     }
 }

imports/ui/accounts/Account.jsx

@@ -19,22 +19,28 @@ const cloneDeep = require('lodash/cloneDeep');
 export default class AccountDetails extends Component{
     constructor(props){
         super(props);
+        const defaultCoin = Meteor.settings.public.coins.map(coin => {
+            return {
+                denom: coin.denom,
+                amount: 0
+            }
+        })
         this.state = {
             address: props.match.params.address,
             loading: true,
             accountExists: false,
-            available: [],
+            available: [defaultCoin],
             delegated: 0,
             unbonding: 0,
-            rewards: [],
-            reward: [],
-            total: [],
+            rewards: [defaultCoin],
+            reward: [defaultCoin],
+            total: [defaultCoin],
             price: 0,
             user: localStorage.getItem(CURRENTUSERADDR),
-            commission: [],
+            commission: [defaultCoin],
             denom: '',
-            rewardsForEachDel: [],
-            rewardDenomType: [],
+            rewardsForEachDel: [defaultCoin],
+            rewardDenomType: [defaultCoin],
         }
     }
 
@@ -66,13 +72,12 @@ export default class AccountDetails extends Component{
 
             if (result){
 
-                if (result.available){
+                if (result.available && (result.available.length > 0)){
 
                     this.setState({
                         available: cloneDeep(result.available),
                         denom: Coin.StakingCoin.denom,
                         total: cloneDeep(result.available)
-
                     })
                 }
 
@@ -125,7 +130,7 @@ export default class AccountDetails extends Component{
                     const totalRewards  = cloneDeep(result.total_rewards);
 
                     totalRewards.forEach((rewardNum, i) => {
-                        if(rewardNum.denom === this.state.total[i].denom)
+                        if(this.state.total[i] && (rewardNum.denom === this.state.total[i].denom))
                             this.state.total[i].amount = parseFloat(this.state.total[i].amount) + parseFloat(rewardNum.amount);                       
                     }, this)
 
@@ -162,7 +167,7 @@ export default class AccountDetails extends Component{
                 if (result.commission){
                     result.commission.forEach((commissions, i) => {
                         const commissionAmount = commissions;
-                        if(commissions.denom === this.state.total[i].denom)
+                        if(this.state.total[i] && (commissions.denom === this.state.total[i].denom))
                             this.state.total[i].amount = parseFloat(this.state.total[i].amount) + parseFloat(commissions.amount);
 
                         this.setState({

imports/ui/accounts/Delegations.jsx

@@ -34,7 +34,6 @@ export default class AccountDelegations extends Component{
                         {this.props.delegations.sort((b, a) => (a.balance - b.balance)).map((d, i) => {
                             let reward = this.props.rewardsForEachDel[d.validator_address];
                             rewardDenom =(reward)?reward.find(({denom}) => denom === denomType): null;
-
                             return <Row key={i} className="delegation-info">
                                 <Col xs={7} md={4} className="text-nowrap overflow-auto"><AccountTooltip address={d.validator_address} /></Col>
                                 <Col xs={2} md={5} className="overflow-auto">{new Coin(d.balance.amount, denomType).stakeString()}</Col>

imports/ui/ledger/LedgerActions.jsx

@@ -527,7 +527,7 @@ class LedgerButton extends Component {
             {"sort":{"description.moniker":1}}
         );
         let redelegations = this.state.redelegations || {};
-        let maxEntries = this.props.stakingParams.max_entries;
+        let maxEntries = (this.props.stakingParams&&this.props.stakingParams.max_entries)?this.props.stakingParams.max_entries:7;
         return <UncontrolledDropdown direction='down' size='sm' className='redelegate-validators'>
             <DropdownToggle caret={true}>
                 {this.state.targetValidator?this.state.targetValidator.moniker:'Select a Validator'}
@@ -712,7 +712,7 @@ class DelegationButtons extends LedgerButton {
         if (!delegation) return null;
         let completionTime = delegation.redelegationCompletionTime;
         let isCompleted = !completionTime || new Date() >= completionTime;
-        let maxEntries = this.props.stakingParams.max_entries;
+        let maxEntries = this.props.stakingParams?this.props.stakingParams.max_entries:7;
         let canUnbond = !delegation.unbonding || maxEntries > delegation.unbonding;
         return <span>
             <div id='redelegate-button' className={`disabled-btn-wrapper${isCompleted?'':' disabled'}`}>

imports/ui/validators/Validator.jsx

@@ -242,7 +242,7 @@ export default class Validator extends Component{
                             <CardBody className="voting-power-card">
                                 {this.state.user?<DelegationButtons validator={this.props.validator}
                                     currentDelegation={this.state.currentUserDelegation}
-                                    history={this.props.history} stakingParams={this.props.chainStatus.staking.params}/>:''}
+                                    history={this.props.history} stakingParams={this.props.chainStatus.staking?this.props.chainStatus.staking.params:null}/>:''}
                                 <Row>
                                     {this.props.validator.voting_power?<Col xs={12}><h1 className="display-4 voting-power"><Badge color="primary" >{numbro(this.props.validator.voting_power).format('0,0')}</Badge></h1><span>(~{numbro(this.props.validator.voting_power/this.props.chainStatus.activeVotingPower).format('0.00%')})</span></Col>:''}
                                     <Col sm={4} className="label"><T>validators.selfDelegationRatio</T></Col>