diff --git a/README.md b/README.md index 86bf1b38e..3bf730a21 100644 --- a/README.md +++ b/README.md @@ -1,45 +1,36 @@

- + +

nOS Client

+

+ nOS is a blockchain powered virtual operating system that serves as the gateway to Decentralized Applications. +

+

+ + + + + platforms + + + + + + + + + + +

+

+ The nOS Client (Developer MVP Release) allows for the development of Decentralized Applications that interact with Smart Contracts in the back-end. +

-

nOS

-

- - - - - - - - - - - - - - - - - - - - - -

-

- nOS is a blockchain powered virtual operating system that serves as the gateway to Decentralized Applications. -

-

- The nOS Client (Developer MVP Release) allows for the development of Decentralized Applications that interact with Smart Contracts in the back-end. -

- ---- - # Getting Started with nOS The standalone client installers can be found [here](https://github.com/nos/client/releases). To build manually, the client can be cloned from GitHub and run using the development steps below. -### Commands +> Commands ```bash # Cloning from Github diff --git a/src/renderer/shared/components/NewWallet/Mnemonic/Mnemonic.js b/src/renderer/shared/components/NewWallet/Mnemonic/Mnemonic.js index 02a8b4dc4..9f9b91d50 100644 --- a/src/renderer/shared/components/NewWallet/Mnemonic/Mnemonic.js +++ b/src/renderer/shared/components/NewWallet/Mnemonic/Mnemonic.js @@ -22,7 +22,9 @@ export default class Mnemonic extends React.PureComponent { setPassphrase: func.isRequired, coinType: number.isRequired, setCoinType: func.isRequired, - addAccount: func.isRequired + addAccount: func.isRequired, + walletLabel: string.isRequired, + setWalletLabel: func.isRequired }; static defaultProps = { @@ -30,17 +32,26 @@ export default class Mnemonic extends React.PureComponent { }; render() { - const { className, account, coinType } = this.props; + const { className, account, coinType, passphrase, walletLabel } = this.props; const { secretWord } = account; return (
{secretWord} + { + this.props.setWalletLabel(event.target.value); + }; + handleChangeCoinType = (coinId) => { this.props.setCoinType(coinId); }; cancel = () => { - const { onCancel, setPassphrase } = this.props; + const { onCancel, setPassphrase, setWalletLabel } = this.props; setPassphrase(''); + setWalletLabel(''); onCancel(); }; confirm = () => { - const { account, passphrase, coinType, setPassphrase, addAccount } = this.props; + const { + account, + passphrase, + coinType, + setPassphrase, + setWalletLabel, + addAccount, + walletLabel + } = this.props; + const options = { coinType, + walletLabel, isHardware: account.isHardware }; addAccount({ account, passphrase, options }); setPassphrase(''); + setWalletLabel(''); }; getCoinTypes = () => { diff --git a/src/renderer/shared/components/NewWallet/Mnemonic/index.js b/src/renderer/shared/components/NewWallet/Mnemonic/index.js index ec4aef7bf..226811922 100644 --- a/src/renderer/shared/components/NewWallet/Mnemonic/index.js +++ b/src/renderer/shared/components/NewWallet/Mnemonic/index.js @@ -17,6 +17,7 @@ const mapAddAccountActionsToProps = (actions) => ({ export default compose( withErrorToast(), withState('passphrase', 'setPassphrase', ''), + withState('walletLabel', 'setWalletLabel', ''), withState('coinType', 'setCoinType', ({ coinType }) => coinType || DEFAULT_COIN), withActions(addWalletActions, mapAddAccountActionsToProps), withProgressChange(addWalletActions, FAILED, (state, props) => { diff --git a/src/renderer/shared/wallet/WalletHelpers.js b/src/renderer/shared/wallet/WalletHelpers.js index 066cd6d0d..2fc9a9371 100644 --- a/src/renderer/shared/wallet/WalletHelpers.js +++ b/src/renderer/shared/wallet/WalletHelpers.js @@ -14,6 +14,7 @@ const walletFilterProps = ['signingFunction', 'wif', 'privateKey']; const config = { length: 2, separator: ' ', + style: 'capital', dictionaries: [colors, animals] }; @@ -25,7 +26,7 @@ const newStorageWallet = ({ net = DEFAULT_NET, account = 0, change = 0, - walletLabel = uniqueNamesGenerator(config), + walletLabel, publicKey, isImport = false }) => { @@ -34,7 +35,7 @@ const newStorageWallet = ({ } const storageWallet = { walletId: uuid(), - walletLabel, + walletLabel: walletLabel || uniqueNamesGenerator(config), canDelete, isHardware, index,