From e89f82399f1c732c40dc644c496795833691cff0 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 28 Nov 2017 11:14:57 -0800
Subject: Add optional version field to notices

Allows notices to only show to users who are on a certain version.
---
 app/scripts/metamask-controller.js | 11 +++++++++++
 app/scripts/notice-controller.js   | 10 +++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a4c77e468..c1b63449a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -44,6 +44,7 @@ module.exports = class MetamaskController extends EventEmitter {
 
     this.opts = opts
     const initState = opts.initState || {}
+    this.recordFirstTimeInfo(initState)
 
     // platform-specific api
     this.platform = opts.platform
@@ -149,6 +150,7 @@ module.exports = class MetamaskController extends EventEmitter {
     // notices
     this.noticeController = new NoticeController({
       initState: initState.NoticeController,
+      version,
     })
     this.noticeController.updateNoticesList()
     // to be uncommented when retrieving notices from a remote server.
@@ -797,4 +799,13 @@ module.exports = class MetamaskController extends EventEmitter {
     return rpcTarget
   }
 
+  recordFirstTimeInfo (initState) {
+    if (!('firstTimeInfo' in initState)) {
+      initState.firstTimeInfo = {
+        version,
+        date: Date.now(),
+      }
+    }
+  }
+
 }
diff --git a/app/scripts/notice-controller.js b/app/scripts/notice-controller.js
index 57aad40c5..bc545127e 100644
--- a/app/scripts/notice-controller.js
+++ b/app/scripts/notice-controller.js
@@ -1,4 +1,5 @@
 const EventEmitter = require('events').EventEmitter
+const semver = require('semver')
 const extend = require('xtend')
 const ObservableStore = require('obs-store')
 const hardCodedNotices = require('../../notices/notices.json')
@@ -8,6 +9,7 @@ module.exports = class NoticeController extends EventEmitter {
   constructor (opts) {
     super()
     this.noticePoller = null
+    this.version = opts.version
     const initState = extend({
       noticesList: [],
     }, opts.initState)
@@ -51,7 +53,13 @@ module.exports = class NoticeController extends EventEmitter {
   }
 
   updateNoticesList () {
-    return this._retrieveNoticeData().then((newNotices) => {
+    return this._retrieveNoticeData().then((hardNotices) => {
+      const newNotices = hardNotices.filter((newNotice) => {
+        if ('version' in newNotice) {
+          return semver.satisfies(this.version, newNotice.version)
+        }
+        return true
+      })
       var oldNotices = this.getNoticesList()
       var combinedNotices = this._mergeNotices(oldNotices, newNotices)
       return Promise.resolve(this.setNoticesList(combinedNotices))
-- 
cgit v1.2.3