Merge branch 'develop' into contextTypes

# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js

1 files changed, 6 insertions, 5 deletions

diff --git a/notices/notices.js b/notices/notices.js
index 4ba925408..6392b6381 100644
--- a/notices/notices.js
+++ b/notices/notices.js
@@ -1,5 +1,6 @@
 // fs.readFileSync is inlined by browserify transform "brfs"
 const fs = require('fs')
+const path = require('path')
 
 module.exports = [
   {
@@ -7,14 +8,14 @@ module.exports = [
     read: false,
     date: 'Thu Feb 09 2017',
     title: 'Terms of Use',
-    body: fs.readFileSync(__dirname + '/archive/notice_0.md', 'utf8'),
+    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_0.md'), 'utf8'),
   },
   {
     id: 2,
     read: false,
     date: 'Mon May 08 2017',
     title: 'Privacy Notice',
-    body: fs.readFileSync(__dirname + '/archive/notice_2.md', 'utf8'),
+    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_2.md'), 'utf8'),
   },
   {
     id: 3,
@@ -22,13 +23,13 @@ module.exports = [
     date: 'Tue Nov 28 2017',
     title: 'Seed Phrase Alert',
     firstVersion: '<=3.12.0',
-    body: fs.readFileSync(__dirname + '/archive/notice_3.md', 'utf8'),
+    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_3.md'), 'utf8'),
   },
   {
     id: 4,
     read: false,
     date: 'Wed Jun 13 2018',
     title: 'Phishing Warning',
-    body: fs.readFileSync(__dirname + '/archive/notice_4.md', 'utf8'),
-  }
+    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_4.md'), 'utf8'),
+  },
 ]