Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change 101 delegate to status active - Closes #948 #952

Merged
merged 3 commits into from
Jul 3, 2018
Merged

Change 101 delegate to status active - Closes #948 #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7536d8a
:bug: Change 101 delegate to status active
michaeltomasik Jun 25, 2018
cc20dc0
:recycle: Change integer to more descreptive variablein delegate Stat…
michaeltomasik Jun 27, 2018
4010e6f
Make testnet e2e tests pending
slaweet Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/transactions/delegateStatistics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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