Skip to content

Commit

Permalink
Merge pull request #1541 from LiskHQ/1538-migrate-integration-wallet]
Browse files Browse the repository at this point in the history
Migrate integration tests of wallet - Closes #1538
  • Loading branch information
Andrei Klimenok authored Dec 7, 2018
2 parents 4b00e8b + c29b552 commit be37bf5
Show file tree
Hide file tree
Showing 19 changed files with 339 additions and 240 deletions.
85 changes: 39 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"cpx": "=1.5.0",
"css-hot-loader": "=1.3.1",
"css-loader": "0.28.7",
"cypress": "3.1.2",
"cypress": "3.1.3",
"del-cli": "1.1.0",
"electron": "1.8.8",
"electron-builder": "19.32.2",
Expand Down
6 changes: 4 additions & 2 deletions src/components/receive/receiveConfirmation.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ class ReceiveConfirmation extends React.Component {
onReferenceChange={value => this.onInputChange(value, 'reference', false)}
reference={this.state.reference}
/>
<a href={text}>
<a
href={text}
className={'email-link'} >
{this.props.t('Send request via E-mail')}
<FontIcon value='external-link'/>
</a>
Expand All @@ -98,7 +100,7 @@ class ReceiveConfirmation extends React.Component {
</div>
<div className={`${grid['col-xs-5']} ${grid['col-sm-5']} ${grid['col-md-4']} ${grid['col-lg-3']}`}>
<ActionButton
className={'next'}
className={'okay-button'}
disabled={this.isFormComplete()}
onClick={() => this.props.goToTransationPage()}
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/receive/receiveConfirmation.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('ReceiveConfirmation', () => {
wrapper.update();
wrapper.find('.amount input').simulate('change', { target: { value: '1' } });
wrapper.update();
wrapper.find('.next').at(0).simulate('click');
wrapper.find('.okay-button').at(0).simulate('click');
wrapper.update();
expect(props.goToTransationPage).to.have.been.calledWith();
});
Expand Down
6 changes: 4 additions & 2 deletions src/components/receive/receiveDescription.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ const ReceiveDescription = (props) => {
<p>
{props.t('This is your Lisk ID shown as a QR code. You can scan it with our Lisk Mobileapp available on Google Play & the AppStore or any QR code reader.')}
</p>
<a href={text}>
<a
href={text}
className={'email-link'} >
{props.t('Send request via E-mail')}
<FontIcon value='external-link'/>
</a>
Expand All @@ -50,7 +52,7 @@ const ReceiveDescription = (props) => {

<div className={`${grid['col-xs-5']} ${grid['col-sm-5']} ${grid['col-md-4']} ${grid['col-lg-3']}`}>
<ActionButton
className={'next'}
className={'specify-request'}
onClick={() => props.nextStep({ address: props.address, status: 'foward' })}
>
{props.t('Request specific amount')}
Expand Down
Loading

0 comments on commit be37bf5

Please sign in to comment.