diff --git a/package.json b/package.json
index 9645dd6014891a1a25eb4c22cb49e214bd2e6472..5a3e2fa2e8b5f42c8dd3ebfb43f292c0cd2eb9a3 100644
--- a/package.json
+++ b/package.json
@@ -37,25 +37,19 @@
"yarn": "^1.4.2"
},
"scripts": {
- "build": "npm-run-all -l build-hoc build-react build-electron",
- "build-electron": "cd packages/light-electron && npm run build",
- "build-hoc": "cd packages/light-hoc && npm run build",
- "build-react": "cd packages/light-react && npm run build",
- "preelectron": "npm run build",
- "electron": "cd packages/light-electron && npm run electron --",
- "lint": "npm-run-all -l lint-*",
- "lint-electron": "cd packages/light-electron && npm run lint",
- "lint-hoc": "cd packages/light-hoc && npm run lint",
- "lint-react": "cd packages/light-react && npm run lint",
- "prepackage": "npm run build",
- "package": "cd packages/light-electron && npm run package",
- "release": "cd packages/light-electron && npm run release --",
- "start": "npm-run-all -l -s build-hoc -p start-*",
- "start-electron": "cd packages/light-electron && npm start",
- "start-react": "cd packages/light-react && npm start",
- "test": "npm-run-all -l test-*",
- "test-electron": "cd packages/light-electron && npm test",
- "test-react": "cd packages/light-react && npm test"
+ "build": "lerna run build",
+ "preelectron": "yarn build",
+ "electron": "cd packages/light-electron && yarn electron",
+ "lint": "lerna run lint --parallel",
+ "prepackage": "yarn build",
+ "package": "cd packages/light-electron && yarn package",
+ "release": "cd packages/light-electron && yarn release",
+ "start": "npm-run-all -l -p start-*",
+ "start-electron": "cd packages/light-electron && yarn start",
+ "start-hoc": "cd packages/light-hoc && yarn start",
+ "start-react": "cd packages/light-react && yarn start",
+ "start-ui": "cd packages/light-ui && yarn start",
+ "test": "lerna run test --parallel"
},
"devDependencies": {
"lerna": "^2.11.0",
diff --git a/packages/light-electron/package.json b/packages/light-electron/package.json
index 237d35bd58da253493c3a97e9d0a5e7cf1b2c8dc..d09b3d11522eafc7d470918402db3549e55ed4ac 100644
--- a/packages/light-electron/package.json
+++ b/packages/light-electron/package.json
@@ -28,7 +28,7 @@
"channel": "beta"
},
"scripts": {
- "prebuild": "cp -r ../light-react/build static/build && ./scripts/fixElectronBug.sh",
+ "prebuild": "copyfiles ../light-react/build static/build && ./scripts/fixElectronBug.sh",
"build": "electron-webpack",
"electron": "electron dist/main/main.js --light",
"lint": "semistandard 'src/**/*.js' --parser babel-eslint",
@@ -44,7 +44,7 @@
"command-exists": "^1.2.6",
"commander": "^2.15.1",
"electron-dl": "^1.11.0",
- "light-hoc": "^0.1.0",
+ "light-react": "^0.1.0",
"pino": "^4.16.1",
"pino-multi-stream": "^3.1.2",
"promise-any": "^0.2.0",
@@ -52,6 +52,7 @@
},
"devDependencies": {
"babel-eslint": "^8.2.3",
+ "copyfiles": "^2.0.0",
"cross-env": "^5.1.4",
"electron": "^2.0.2",
"electron-builder": "^20.15.1",
diff --git a/packages/light-hoc/package.json b/packages/light-hoc/package.json
index 928b1f1121e00b893aabd907e87849042f692851..b2f8e3a7a9dce5715b90adec63fb8df16b4a18ee 100644
--- a/packages/light-hoc/package.json
+++ b/packages/light-hoc/package.json
@@ -26,8 +26,10 @@
"homepage": "https://github.com/parity-js/light",
"main": "lib/index.js",
"scripts": {
- "build": "rimraf lib && babel src --out-dir lib",
- "lint": "semistandard 'src/**/*.js' --parser babel-eslint"
+ "prebuild": "rimraf lib",
+ "build": "babel src --out-dir lib",
+ "lint": "semistandard 'src/**/*.js' --parser babel-eslint",
+ "start": "yarn build --watch"
},
"peerDependencies": {
"@parity/light.js": "https://github.com/parity-js/light.js#6f6c93920bb41486a8b22fe8a40151704fd8f83a",
diff --git a/packages/light-react/package.json b/packages/light-react/package.json
index 3a8a8b61bd53b6f5395229d943591e808644543a..e23fccba45f45a3fe5acd262752993b684f5d659 100644
--- a/packages/light-react/package.json
+++ b/packages/light-react/package.json
@@ -40,11 +40,13 @@
"@parity/shared": "^3.0.1",
"is-electron": "^2.1.0",
"light-hoc": "^0.1.0",
+ "light-ui": "^0.1.0",
"lodash": "^4.17.10",
"mobx": "^4.2.0",
"mobx-react": "^5.1.2",
"react": "^16.3.2",
"react-blockies": "^1.3.0",
+ "react-copy-to-clipboard": "^5.0.1",
"react-dom": "^16.3.2",
"react-router-dom": "^4.2.2",
"react-scripts": "1.1.4",
diff --git a/packages/light-react/src/Accounts/AccountsList/AccountsList.js b/packages/light-react/src/Accounts/AccountsList/AccountsList.js
index 1cb732e8623b5ce435a93fb583aab39b210cd0b8..2216ad7d91e6f62c147963657ef83712a7a45ed7 100644
--- a/packages/light-react/src/Accounts/AccountsList/AccountsList.js
+++ b/packages/light-react/src/Accounts/AccountsList/AccountsList.js
@@ -6,6 +6,7 @@
import React, { Component } from 'react';
import { accountsInfo$ } from '@parity/light.js';
import Blockies from 'react-blockies';
+import { Header } from 'light-ui';
import { inject, observer } from 'mobx-react';
import light from 'light-hoc';
@@ -31,7 +32,8 @@ class AccountsList extends Component {
// component.
api.parity
.setNewDappsDefaultAddress(address)
- .then(() => history.push('/tokens'));
+ .then(() => history.push('/tokens'))
+ .catch(() => {}); // TODO do what?
};
handleCreateAccount = () => {
@@ -44,17 +46,14 @@ class AccountsList extends Component {
return (
-
+ }
+ />
@@ -68,7 +67,7 @@ class AccountsList extends Component {
>
-
+
diff --git a/packages/light-react/src/Accounts/CreateAccount/AccountName/AccountName.js b/packages/light-react/src/Accounts/CreateAccount/AccountName/AccountName.js
index fe20e3bac5a6c2b250d25b1cd3082aaf4542850e..0956a9aa2452b437150958d73cdacc824421235c 100644
--- a/packages/light-react/src/Accounts/CreateAccount/AccountName/AccountName.js
+++ b/packages/light-react/src/Accounts/CreateAccount/AccountName/AccountName.js
@@ -4,6 +4,7 @@
// SPDX-License-Identifier: MIT
import React, { Component } from 'react';
+import { FormField } from 'light-ui';
import { inject, observer } from 'mobx-react';
import { Link } from 'react-router-dom';
@@ -50,15 +51,14 @@ class AccountName extends Component {
Please give this account a name:
-
-
-
-
+
+
-
-
-
-
+
-
-
-
-
+
-
-
-
-
+
@@ -57,7 +65,9 @@ class AccountWritePhrase extends Component {
}
renderButton = () => {
- const { createAccountStore: { isImport, phrase } } = this.props;
+ const {
+ createAccountStore: { isImport, phrase }
+ } = this.props;
const { value } = this.state;
// If we are creating a new account, the button just checks the phrase has
diff --git a/packages/light-react/src/Accounts/CreateAccount/CreateAccount.js b/packages/light-react/src/Accounts/CreateAccount/CreateAccount.js
index 2bc9fd81a780be0d6cc4498703fe93565b61b063..ac823f30896d5fe797015ee9b52a0776ecf622e0 100644
--- a/packages/light-react/src/Accounts/CreateAccount/CreateAccount.js
+++ b/packages/light-react/src/Accounts/CreateAccount/CreateAccount.js
@@ -4,9 +4,10 @@
// SPDX-License-Identifier: MIT
import React, { Component } from 'react';
-import { Route } from 'react-router-dom';
+import { Header } from 'light-ui';
import { inject, observer } from 'mobx-react';
import memoize from 'lodash/memoize';
+import { Route } from 'react-router-dom';
import AccountConfirm from './AccountConfirm';
import AccountCopyPhrase from './AccountCopyPhrase';
@@ -35,14 +36,12 @@ class CreateAccount extends Component {
handleCreateAccount = () => {
this.props.createAccountStore.setIsImporting(false);
- this.props.history.push('/accounts/new');
};
handleGoBack = () => this.props.history.goBack();
handleImportAccount = () => {
this.props.createAccountStore.setIsImporting(true);
- this.props.history.push('/accounts/new');
};
render () {
@@ -58,16 +57,16 @@ class CreateAccount extends Component {
return (
-
+ }
+ />
{Steps.map((StepComponent, index) => (
diff --git a/packages/light-react/src/App/App.js b/packages/light-react/src/App/App.js
index c1043dcdc744641d82ad22f3ea33597e8ab2d5bb..3a779ef4b00554f202b468bd8bacf587418102f6 100644
--- a/packages/light-react/src/App/App.js
+++ b/packages/light-react/src/App/App.js
@@ -21,7 +21,6 @@ import Send from '../Send';
import Settings from '../Settings';
import { STATUS } from '../stores/healthStore';
import Tokens from '../Tokens';
-import './App.css';
// Use MemoryRouter for production viewing in file:// protocol
// https://github.com/facebook/create-react-app/issues/3591
diff --git a/packages/light-react/src/App/App.sass b/packages/light-react/src/App/App.sass
deleted file mode 100644
index ff220653a038b1e4cd43a28cdc6d114ea2655008..0000000000000000000000000000000000000000
--- a/packages/light-react/src/App/App.sass
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2015-2018 Parity Technologies (UK) Ltd. */
-/* This file is part of Parity. */
-
-/* SPDX-License-Identifier: MIT */
-
-@import '../assets/sass/modules/grid'
-@import '../assets/sass/modules/modular-scale'
-@import '../assets/sass/modules/variables'
-@import '../assets/sass/modules/reset'
-
-+reset
-
-@import '../assets/sass/shared/basics'
-@import '../assets/sass/shared/box'
-@import '../assets/sass/shared/button'
-@import '../assets/sass/shared/form'
-@import '../assets/sass/shared/list'
-@import '../assets/sass/shared/text'
-
-@import '../assets/sass/layouts/wrapper'
-
-@import '../assets/sass/components/logo'
-@import '../assets/sass/components/token'
-@import '../assets/sass/components/account'
-@import '../assets/sass/components/status'
-@import '../assets/sass/components/header-nav'
-@import '../assets/sass/components/footer-nav'
-@import '../assets/sass/components/progress-indicator'
-@import '../assets/sass/components/form-nav'
-@import '../assets/sass/components/alert-screen'
-@import '../assets/sass/components/search-form'
-
diff --git a/packages/light-react/src/Overlay/Overlay.js b/packages/light-react/src/Overlay/Overlay.js
index 665d2908dd60ee71bb537df819f177aa89c11ac5..735675243a3c96d909de04222299dfa6a58a94e5 100644
--- a/packages/light-react/src/Overlay/Overlay.js
+++ b/packages/light-react/src/Overlay/Overlay.js
@@ -15,7 +15,7 @@ import loading from '../assets/img/icons/loading.svg';
class Overlays extends Component {
render () {
return (
-
+
diff --git a/packages/light-react/src/Receive/Receive.js b/packages/light-react/src/Receive/Receive.js
index c7a5e22a6b8d87415da5804d599e7e2ba08ecca2..c8183e285d49af49730833b3a8a81f09aadb315f 100644
--- a/packages/light-react/src/Receive/Receive.js
+++ b/packages/light-react/src/Receive/Receive.js
@@ -5,7 +5,9 @@
import React, { PureComponent } from 'react';
import { accountsInfo$, defaultAccount$ } from '@parity/light.js';
-import Blockie from 'react-blockies';
+import Blockies from 'react-blockies';
+import { CopyToClipboard } from 'react-copy-to-clipboard';
+import { Header } from 'light-ui';
import light from 'light-hoc';
import { Link } from 'react-router-dom';
@@ -17,53 +19,45 @@ class Receive extends PureComponent {
render () {
const { accountsInfo, defaultAccount } = this.props;
- if (!defaultAccount) return
Loading...
;
-
return (
-
+ }
+ title={
+ accountsInfo && defaultAccount && accountsInfo[defaultAccount] ? (
+
+ {' '}
+ {accountsInfo[defaultAccount].name}
+
+ ) : (
+
Loading...
+ )
+ }
+ />
-
-
-
-
-
-
- {accountsInfo &&
- defaultAccount &&
- accountsInfo[defaultAccount]
- ? accountsInfo[defaultAccount].name
- : 'Loading...'}
-
-
{defaultAccount}
-
+
-
-
-
{defaultAccount}
-
-
diff --git a/packages/light-react/src/Send/Sent/Sent.js b/packages/light-react/src/Send/Sent/Sent.js
index d3cc163f620847e73b5a176bff705bb7bda708b9..88374559e716a43dc51dc9da4116d1fc20a83290 100644
--- a/packages/light-react/src/Send/Sent/Sent.js
+++ b/packages/light-react/src/Send/Sent/Sent.js
@@ -23,36 +23,28 @@ const MIN_CONFIRMATIONS = 6;
class Sent extends Component {
render () {
const {
- sendStore: { confirmations, token }
+ sendStore: { confirmations }
} = this.props;
return (
-
-