Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Update FirstRun for UI-2 #7195

Merged
merged 7 commits into from
Dec 5, 2017
Merged

Update FirstRun for UI-2 #7195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c8f310
Merge branch 'master' into jg-firstrun
jacogr Dec 4, 2017
14c5488
WIP
jacogr Dec 4, 2017
173c106
Update after @parity/ui update
jacogr Dec 4, 2017
d490feb
Update to latest
jacogr Dec 4, 2017
997ee9c
Update semver for @parity
jacogr Dec 4, 2017
9a41be0
Update & -> &
jacogr Dec 4, 2017
e9cb2da
Merge branch 'master' into jg-firstrun
jacogr Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
73 changes: 56 additions & 17 deletions js/package-lock.json
View file
Open in desktop

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

7 changes: 3 additions & 4 deletions js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,13 @@
"yargs": "6.6.0"
},
"dependencies": {
"@parity/api": "2.1.x",
"@parity/dapp-accounts": "paritytech/dapp-accounts",
"@parity/api": "~2.1.1",
"@parity/plugin-signer-account": "paritytech/plugin-signer-account",
"@parity/plugin-signer-default": "paritytech/plugin-signer-default",
"@parity/plugin-signer-hardware": "paritytech/plugin-signer-hardware",
"@parity/plugin-signer-qr": "paritytech/plugin-signer-qr",
"@parity/shared": "2.2.x",
"@parity/ui": "~3.0.4",
"@parity/shared": "~2.2.1",
"@parity/ui": "~3.0.7",
"keythereum": "1.0.2",
"lodash.flatten": "4.4.0",
"lodash.omitby": "4.6.0",
Expand Down
7 changes: 1 addition & 6 deletions js/src/Application/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import Status from '../Status';
import UpgradeParity from '../UpgradeParity';

import { appLogoDark as parityLogo } from '../config';
import Store from './store';
import styles from './application.css';

const inFrame = window.parent !== window && window.parent.frames.length !== 0;
Expand All @@ -54,7 +53,6 @@ class Application extends Component {
pending: PropTypes.array
}

store = new Store(this.context.api);
hwstore = HardwareStore.get(this.context.api);
upgradeStore = UpgradeStore.get(this.context.api);

Expand Down Expand Up @@ -114,10 +112,7 @@ class Application extends Component {
return (
<div className={ styles.container }>
<Extension />
<FirstRun
onClose={ this.store.closeFirstrun }
visible={ this.store.firstrunVisible }
/>
<FirstRun />
<Snackbar />
<UpgradeParity upgradeStore={ this.upgradeStore } />
<Errors />
Expand Down
95 changes: 0 additions & 95 deletions js/src/Application/store.js
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions js/src/FirstRun/TnC/tnc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,16 @@ import ReactMarkdown from 'react-markdown';

import Checkbox from '@parity/ui/lib/Form/Checkbox';

import styles from '../firstRun.css';

let tnc = '';
import tnc from './tnc.md';

if (process.env.NODE_ENV !== 'test') {
tnc = require('./tnc.md');
}
import styles from '../firstRun.css';

export default function TnC ({ hasAccepted, onAccept }) {
return (
<div className={ styles.tnc }>
<ReactMarkdown
className={ styles.markdown }
escapeHtml={ false }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue where react-markdown currently doesn't render properly. From their page -

"Inline HTML is currently broken for any tags that include attributes. A vague idea of how to fix this has been planned, but if you're feeling up to the task, create an issue and let us know!"

source={ tnc }
/>
<Checkbox
Expand Down