m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

disclaimer - render via react-markdown

Browse Source
This commit is contained in:
kumavis 2016-06-30 21:46:19 -07:00
parent cd21a4b699
commit 5a917431d8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -54,6 +54,7 @@
"react-addons-css-transition-group": "^15.0.2", "react-addons-css-transition-group": "^15.0.2",
"react-dom": "^15.0.2", "react-dom": "^15.0.2",
"react-hyperscript": "^2.2.2", "react-hyperscript": "^2.2.2",
"react-markdown": "^2.3.0",
"react-redux": "^4.4.5", "react-redux": "^4.4.5",
"react-tooltip-component": "^0.3.0", "react-tooltip-component": "^0.3.0",
"readable-stream": "^2.1.2", "readable-stream": "^2.1.2",

12
ui/app/first-time/disclaimer.js
View File

@ -3,6 +3,7 @@ const Component = require('react').Component
const h = require('react-hyperscript') const h = require('react-hyperscript')
const connect = require('react-redux').connect const connect = require('react-redux').connect
const actions = require('../actions') const actions = require('../actions')
const ReactMarkdown = require('react-markdown')
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
const disclaimer = fs.readFileSync(path.join(__dirname, '..', '..', '..', 'USER_AGREEMENT.md')).toString() const disclaimer = fs.readFileSync(path.join(__dirname, '..', '..', '..', 'USER_AGREEMENT.md')).toString()
@ -36,14 +37,21 @@ DisclaimerScreen.prototype.render = function () {
h('div', { h('div', {
style: { style: {
whiteSpace: 'pre-line', // whiteSpace: 'pre-line',
background: 'rgb(235, 235, 235)', background: 'rgb(235, 235, 235)',
height: '310px', height: '310px',
padding: '6px', padding: '6px',
width: '80%', width: '80%',
overflowY: 'scroll', overflowY: 'scroll',
}, },
}, disclaimer), }, [
h(ReactMarkdown, {
source: disclaimer,
skipHtml: true,
}),
]),
h('button', { h('button', {
style: { marginTop: '18px' }, style: { marginTop: '18px' },