Skip to content

Commit

Permalink
Merge pull request #952 from LiskHQ/948-rank-101-should-be-active
Browse files Browse the repository at this point in the history
Change 101 delegate to status active - Closes #948
  • Loading branch information
slaweet committed Jul 3, 2018
2 parents 2811c2b + 4010e6f commit 5db7652
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/components/transactions/delegateStatistics.js
Expand Up @@ -3,15 +3,17 @@ import grid from 'flexboxgrid/dist/flexboxgrid.css';
import { translate } from 'react-i18next';
import UserVotes from './userVotes';
import VotedDelegates from './votedDelegates';
import voting from '../../constants/voting';
import styles from './delegateStatistics.css';

class DelegateStatistics extends React.Component {
render() {
const { delegate } = this.props;

let status = '';

if (delegate && delegate.rank) {
status = delegate.rank < 101 ? this.props.t('Active') : this.props.t('Standby');
status = delegate.rank <= voting.maxCountOfVotes ? this.props.t('Active') : this.props.t('Standby');
}

const missed = this.props.t('missed');
Expand Down
4 changes: 3 additions & 1 deletion test/e2e/login.feature
Expand Up @@ -14,6 +14,7 @@ Feature: Login
When I go to "second-passphrase"
And "next" should be disabled

@pending
Scenario: should allow to login to Testnet through network options launch protocol
Given I go to "/"
Then I should see no "network"
Expand All @@ -26,6 +27,7 @@ Feature: Login
When I click "transactions" menu
Then I should see 25 rows

@pending
Scenario: should allow to login to Custom node through network options launch protocol
Given I go to "/"
Then I should see no "network"
Expand All @@ -37,4 +39,4 @@ Feature: Login
Then I should be logged in as "genesis" account
And I should see text "custom node" in "peer network" element
When I click "transactions" menu
Then I should see 25 rows
Then I should see 25 rows

0 comments on commit 5db7652

Please sign in to comment.