Merge branch 'development' into 0.4.0

Jenkinsfile

@@ -103,6 +103,8 @@ node('lisk-hub') {
         rsync -axl --delete --rsync-path="mkdir -p /var/www/test/${JOB_NAME%/*}/$BRANCH_NAME/ && rsync" $WORKSPACE/app/build/ jenkins@master-01:/var/www/test/${JOB_NAME%/*}/$BRANCH_NAME/
         npm run --silent bundlesize
         '''
+        archiveArtifacts artifacts: 'app/build/'
+        archiveArtifacts artifacts: 'app/build-testnet/'
         githubNotify context: 'Jenkins test deployment', description: 'Commit was deployed to test', status: 'SUCCESS', targetUrl: "${HUDSON_URL}test/" + "${JOB_NAME}".tokenize('/')[0] + "/${BRANCH_NAME}"
       } catch (err) {
         echo "Error: ${err}"

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lisk-hub",
-  "version": "0.3.0-rc.1",
+  "version": "0.3.0-rc.2",
   "description": "Lisk Hub",
   "main": "./build/main.js",
   "author": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lisk-hub",
-  "version": "0.3.0-rc.1",
+  "version": "0.3.0-rc.2",
   "description": "Lisk Hub",
   "homepage": "https://github.com/LiskHQ/lisk-hub",
   "bugs": "https://github.com/LiskHQ/lisk-hub/issues",

src/components/dashboard/index.js

@@ -23,7 +23,7 @@ class Dashboard extends React.Component {
           <header>
             <h2 className={styles.title}>
               {t('Latest activity')}
-              <Link to={`${routes.main.path}${routes.dashboard.path}`} className={styles.seeAllLink}>
+              <Link to={`${routes.main.path}${routes.transaction.path}`} className={`${styles.seeAllLink} seeAllLink`}>
                 {t('See all transactions')}
                 <FontIcon value='arrow-right'/>
               </Link>

src/components/delegateList/delegateList.js

@@ -47,6 +47,7 @@ class DelegateList extends React.Component {
 
     if (this.props.showChangeSummery !== nextProps.showChangeSummery) {
       this.setState({
+        activeFilter: voteFilters.all,
         showChangeSummery: nextProps.showChangeSummery,
       });
     }
@@ -159,7 +160,6 @@ class DelegateList extends React.Component {
           setActiveFilter={this.setActiveFilter.bind(this)}
           showChangeSummery={this.state.showChangeSummery}
           voteToggled={this.props.voteToggled}
-          addTransaction={this.props.addTransaction}
           search={ value => this.search(value) }
         />
         <section className={`${styles.delegatesList} delegate-list`}>

src/components/delegateList/votingRow.js

@@ -11,7 +11,7 @@ const setRowClass = (voteStatus) => {
   if (pending) {
     return styles.pendingRow;
   } else if (confirmed !== unconfirmed) {
-    return confirmed ? styles.downVoteRow : styles.upVoteRow;
+    return confirmed ? `${styles.downVoteRow} selected-row` : `${styles.upVoteRow} selected-row`;
   }
   return confirmed ? styles.votedRow : '';
 };

src/components/transactions/transactionDetailView.js

@@ -25,7 +25,7 @@ const TransactionsDetailView = props => (
         </header> : null
     }
     <div>
-      <div className={`${grid.row} ${grid['between-md']} ${grid['between-sm']} ${styles.row}`}>
+      <div className={`transactions-detail-view ${grid.row} ${grid['between-md']} ${grid['between-sm']} ${styles.row}`}>
         <div className={`${grid['col-xs-12']} ${grid['col-sm-4']} ${grid['col-md-4']} ${styles.column}`}>
           <div className={styles.label}>{props.t('Sender')}</div>
           {

src/components/transactions/transactionRow.js

@@ -16,9 +16,10 @@ class TransactionRow extends React.Component {
 
   render() {
     const { props } = this;
-    const nextStep = props.nextStep || (() => {});
+    const nextStep = !props.nextStep ? (() => {}) : () => (props.nextStep({ value: props.value }));
+
     return (
-      <div className={`${grid.row} ${styles.rows} ${styles.clickable} transactionsRow`} onClick={nextStep.bind(this, { ...props })}>
+      <div className={`${grid.row} ${styles.rows} ${styles.clickable} transactionsRow`} onClick={nextStep}>
         <div className={`${styles.leftText} ${grid['col-xs-6']} ${grid['col-sm-6']} transactions-cell`}>
           <div className={`${styles.address}`}>
             <TransactionType {...props.value} address={props.address}></TransactionType>

src/components/transactions/transactions.js

@@ -11,7 +11,7 @@ class Transactions extends React.Component {
       <Box>
         <MultiStep className={styles.transactions}>
           <TransactionOverview {...this.props} />
-          <TransactionDetailView />
+          <TransactionDetailView {...this.props} />
         </MultiStep>
       </Box>
     );

test/e2e/transactions.feature

@@ -5,6 +5,14 @@ Feature: Transactions page
     Then I should see 25 rows
     When I scroll to the bottom of "transaction results"
     Then I should see 50 rows
+
+  Scenario: should open all transactions
+    Given I'm logged in as "genesis"
+    When I click "dashboard" menu
+    And I should see 3 rows
+    When I click "seeAllLink"
+    Then I should be on url "/main/transactions"
+    And I should see 25 rows
 
   @integration
   Scenario: should provide a message if there are "No transactions" 

test/integration/accountTransactions.test.js

@@ -109,6 +109,8 @@ describe('@integration: Account Transactions', () => {
   describe('Scenario: should allow to view transactions of any account', () => {
     step('Given I\'m on "accounts/123L" as "genesis" account', () => setupStep({ accountType: 'genesis', address: '123L' }));
     step('Then I should see 20 transaction rows as result of the address 123L', () => helper.shouldSeeCountInstancesOf(20, 'TransactionRow'));
+    step('When I click on a transaction row', () => helper.clickOnElement('.transactionsRow'));
+    step('Then I should be able to see the details of that transaction', () => helper.shouldSeeCountInstancesOf(1, '.transactions-detail-view'));
   });
 
   describe('Scenario: should allow to filter transactions', () => {

test/integration/voting.test.js

@@ -194,4 +194,17 @@ describe('@integration test of Voting', () => {
     step('Then I should see result box', () => helper.haveTextOf('h2.result-box-header', 'Votes submitted'));
     step('Then I restore Api mocks', restoreApiMocks);
   });
+
+  describe('Scenario: should allow to see all selected delegates in confirm step', () => {
+    step('I\'m logged in as "genesis"', () => loginProcess([delegates[0]]));
+    step('And next button should be disabled', () => helper.checkDisableInput('button.next'));
+    step('And I click filter-voted', () => helper.clickOnElement('li.filter-voted'));
+    step('And I click checkbox on list item no. 0', () => helper.voteToDelegates(0, false));
+    step('And I click filter-not-voted', () => helper.clickOnElement('li.filter-not-voted'));
+    step('And I click checkbox on list item no. 0', () => helper.voteToDelegates(0, true));
+    step('Then next button should be enabled', () => helper.checkDisableInput('button.next', 'not'));
+    step('When I go to confirmation step', () => helper.goToConfirmation());
+    step('Then I should see all votes on confirmation step', () => helper.haveLengthOf('ul.selected-row', 2));
+    step('Then I restore Api mocks', restoreApiMocks);
+  });
 });