1 files changed, 27 insertions, 5 deletions
diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js
index 7f615cfb0..c6174a220 100644
--- a/ui/app/first-time/disclaimer.js
+++ b/ui/app/first-time/disclaimer.js
@@ -3,9 +3,10 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
 const actions = require('../actions')
+const ReactMarkdown = require('react-markdown')
 const fs = require('fs')
 const path = require('path')
-const disclaimer = fs.readFileSync(path.join(__dirname, 'disclaimer.txt')).toString()
+const disclaimer = fs.readFileSync(path.join(__dirname, '..', '..', '..', 'USER_AGREEMENT.md')).toString()
 module.exports = connect(mapStateToProps)(DisclaimerScreen)
 
 function mapStateToProps (state) {
@@ -21,29 +22,50 @@ DisclaimerScreen.prototype.render = function () {
   return (
     h('.flex-column.flex-center.flex-grow', [
 
-      h('h3.flex-center.text-transform-uppercase', {
+      h('h3.flex-center.text-transform-uppercase.terms-header', {
         style: {
           background: '#EBEBEB',
           color: '#AEAEAE',
           marginBottom: 24,
           width: '100%',
           fontSize: '20px',
+          textAlign: 'center',
           padding: 6,
         },
       }, [
         'MetaMask Terms & Conditions',
       ]),
 
-      h('div', {
+      h('style', `
+
+        .markdown {
+          font-family: Times New Roman;
+        }
+        .markdown h1, .markdown h2, .markdown h3 {
+          margin: 10px 0;
+          font-family: arial sans-serif;
+          font-weight: bold;
+        }
+
+      `),
+
+      h('div.markdown', {
         style: {
-          whiteSpace: 'pre-line',
+          // whiteSpace: 'pre-line',
           background: 'rgb(235, 235, 235)',
           height: '310px',
           padding: '6px',
           width: '80%',
           overflowY: 'scroll',
         },
-      }, disclaimer),
+      }, [
+
+        h(ReactMarkdown, {
+          source: disclaimer,
+          skipHtml: true,
+        }),
+
+      ]),
 
       h('button', {
         style: { marginTop: '18px' },