-
Notifications
You must be signed in to change notification settings - Fork 96
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '0.3.0' into development
- Loading branch information
Showing
40 changed files
with
539 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| @import '../app/variables.css'; | ||
|
|
||
| :root { | ||
| --font-size-L: 16px; | ||
| --font-size-XS: 14px; | ||
| } | ||
|
|
||
| .wrapper { | ||
| padding: 45px; | ||
| line-height: 30px; | ||
| height: 100%; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: space-between; | ||
|
|
||
| & header { | ||
| & h2 { | ||
| margin-top: 0; | ||
| font-weight: var(--font-weight-semi-bold); | ||
| } | ||
| } | ||
|
|
||
| & p { | ||
| font-size: var(--font-size-L); | ||
| } | ||
|
|
||
| & a { | ||
| font-weight: var(--font-weight-bold); | ||
| color: var(--color-link); | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| & footer { | ||
| padding: 0px; | ||
| } | ||
|
|
||
| & .button { | ||
| font-weight: var(--font-weight-bold); | ||
| font-size: var(--font-size-L); | ||
| letter-spacing: 0; | ||
| line-height: 18px; | ||
| text-transform: none; | ||
| min-width: 0; | ||
| width: 100%; | ||
| } | ||
| } | ||
|
|
||
| @media (--xSmall-viewport) { | ||
| .wrapper { | ||
| padding: 20px 19px; | ||
|
|
||
| & p { | ||
| font-size: var(--font-size-XS); | ||
| } | ||
|
|
||
| & .button { | ||
| font-size: var(--font-size-XS); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import React from 'react'; | ||
| import { connect } from 'react-redux'; | ||
| import { translate } from 'react-i18next'; | ||
| import grid from 'flexboxgrid/dist/flexboxgrid.css'; | ||
| import { Button } from './../toolbox/buttons/button'; | ||
| import { FontIcon } from '../fontIcon'; | ||
| import Box from '../box'; | ||
| import styles from './accountInit.css'; | ||
| import fees from './../../constants/fees'; | ||
| import { fromRawLsk } from '../../utils/lsk'; | ||
|
|
||
| class AccountInitialization extends React.Component { | ||
| closeInfo() { | ||
| this.props.nextStep(); | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| const { account, transactions } = this.props; | ||
| const needsNoAccountInit = account.serverPublicKey | ||
| || account.balance === 0 | ||
| || transactions.pending.length > 0; | ||
| if (needsNoAccountInit) { | ||
| this.props.nextStep(); | ||
| } | ||
| } | ||
|
|
||
| render() { | ||
| const { account, t, nextStep } = this.props; | ||
|
|
||
| return (<Box className={`${styles.wrapper} ${grid.row} account-initialization`}> | ||
| <header> | ||
| <h2>{t('Initialize Lisk ID')}</h2> | ||
| </header> | ||
| <div> | ||
| <p>{t('It is recommended that you initialize your Lisk ID.')}</p> | ||
| <p>{t('The easiest way to do this is to send LSK to yourself. It will cost you only the usual {{fee}} LSK transaction fee.', { fee: fromRawLsk(fees.send) })}</p> | ||
| <p> | ||
| <a target='_blank' href='https://help.lisk.io/account-security/should-i-initialize-my-lisk-account' rel='noopener noreferrer'> | ||
| {t('Learn more about Lisk ID initialization')} <FontIcon>arrow-right</FontIcon> | ||
| </a> | ||
| </p> | ||
| </div> | ||
| <footer> | ||
| <div className={grid.row} > | ||
| <div className={grid['col-xs-4']}> | ||
| <Button | ||
| label={t('Discard')} | ||
| onClick={this.closeInfo.bind(this)} | ||
| className={`account-init-discard-button ${styles.button}`} | ||
| /> | ||
| </div> | ||
| <div className={grid['col-xs-8']}> | ||
| <Button | ||
| label={t('Next')} | ||
| onClick={() => nextStep({ account, accountInit: true }, 2)} | ||
| className={`account-init-button ${styles.button}`}/> | ||
| </div> | ||
| </div> | ||
| <div className='subTitle'>{t('Confirmation in the next step')}</div> | ||
| </footer> | ||
| </Box> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| const mapStateToProps = state => ({ | ||
| account: state.account, | ||
| transactions: state.transactions, | ||
| }); | ||
|
|
||
| export default connect(mapStateToProps)(translate()(AccountInitialization)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.