From ec4b7de962d0c4913f8f65a21a6cbef9f2ebc261 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 28 Nov 2017 11:22:09 -0800 Subject: [PATCH] Add firstVersion field to notices selector --- app/scripts/metamask-controller.js | 1 + app/scripts/notice-controller.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index c1b63449a..0c759010b 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -151,6 +151,7 @@ module.exports = class MetamaskController extends EventEmitter { this.noticeController = new NoticeController({ initState: initState.NoticeController, version, + firstVersion: initState.firstTimeInfo.version, }) this.noticeController.updateNoticesList() // to be uncommented when retrieving notices from a remote server. diff --git a/app/scripts/notice-controller.js b/app/scripts/notice-controller.js index bc545127e..457161ccb 100644 --- a/app/scripts/notice-controller.js +++ b/app/scripts/notice-controller.js @@ -9,7 +9,7 @@ module.exports = class NoticeController extends EventEmitter { constructor (opts) { super() this.noticePoller = null - this.version = opts.version + this.firstVersion = opts.firstVersion const initState = extend({ noticesList: [], }, opts.initState) @@ -58,6 +58,9 @@ module.exports = class NoticeController extends EventEmitter { if ('version' in newNotice) { return semver.satisfies(this.version, newNotice.version) } + if ('firstVersion' in newNotice) { + return semver.satisfies(this.firstVersion, newNotice.firstVersion) + } return true }) var oldNotices = this.getNoticesList()