diff --git a/js/background.js b/js/background.js index 65ad3e24aa..f1bf083ac7 100644 --- a/js/background.js +++ b/js/background.js @@ -447,17 +447,7 @@ const themeSetting = window.Events.getThemeSetting(); const newThemeSetting = mapOldThemeToNew(themeSetting); - if ( - window.isBeforeVersion(lastVersion, 'v1.25.0') && - window.platform === 'darwin' && - newThemeSetting === window.systemTheme - ) { - window.Events.setThemeSetting('system'); - } else { - window.Events.setThemeSetting(newThemeSetting); - } - - if (window.isBeforeVersion(lastVersion, 'v1.25.0')) { + if (window.isBeforeVersion(lastVersion, 'v1.29.2-beta.1')) { // Stickers flags await Promise.all([ storage.put('showStickersIntroduction', true), @@ -473,6 +463,16 @@ ); } + if ( + window.isBeforeVersion(lastVersion, 'v1.25.0') && + window.platform === 'darwin' && + newThemeSetting === window.systemTheme + ) { + window.Events.setThemeSetting('system'); + } else { + window.Events.setThemeSetting(newThemeSetting); + } + // This one should always be last - it could restart the app if (window.isBeforeVersion(lastVersion, 'v1.15.0-beta.5')) { await window.Signal.Logs.deleteAll(); diff --git a/js/modules/stickers.js b/js/modules/stickers.js index d76300bb5d..50544aecbd 100644 --- a/js/modules/stickers.js +++ b/js/modules/stickers.js @@ -8,7 +8,16 @@ URL */ -const BLESSED_PACKS = {}; +const BLESSED_PACKS = { + '9acc9e8aba563d26a4994e69263e3b25': { + key: 'Wm3/OUjCjvubeq+T7MN1xp/DFueAd+0mhnoU0QoPahI=', + status: 'installed', + }, + fb535407d2f6497ec074df8b9c51dd1d: { + key: 'F+lxwTQDViJ4HS7iSeZHO3dFg3ULaMEbuCt1CcaLbf0=', + status: 'installed', + }, +}; const { isNumber, pick, reject, groupBy, values } = require('lodash'); const pMap = require('p-map'); diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json index bf1f7b2a78..eacefb316d 100644 --- a/ts/util/lint/exceptions.json +++ b/ts/util/lint/exceptions.json @@ -239,7 +239,7 @@ "rule": "jQuery-load(", "path": "js/modules/stickers.js", "line": "async function load() {", - "lineNumber": 57, + "lineNumber": 66, "reasonCategory": "falseMatch", "updated": "2019-04-26T17:48:30.675Z" },