Finalising pr

js/background.js

@@ -907,22 +907,22 @@
     };
 
     window.toggleMenuBar = () => {
-      const newValue = !window.getSettingValue('hide-menu-bar');
+      const newValue = ! window.getSettingValue('hide-menu-bar');
       window.Events.setHideMenuBar(newValue);
     };
 
     window.toggleSpellCheck = () => {
-      const newValue = !window.getSettingValue('spell-check');
+      const newValue = ! window.getSettingValue('spell-check');
       window.Events.setSpellCheck(newValue);
     };
 
     window.toggleLinkPreview = () => {
-      const newValue = !window.getSettingValue('link-preview-setting');
+      const newValue = ! window.getSettingValue('link-preview-setting');
       window.Events.setLinkPreviewSetting(newValue);
     };
 
-    window.toggleMediaPermissions = async () => {
+    window.toggleMediaPermissions = () => {
-      const mediaPermissions = await window.getMediaPermissions();
+      const mediaPermissions = window.getMediaPermissions();
       window.setMediaPermissions(!mediaPermissions);
     };
 

js/views/beta_release_disclaimer_view_old.js

@@ -1,44 +0,0 @@
-/* global Whisper, i18n, window */
-
-// eslint-disable-next-line func-names
-(function() {
-  'use strict';
-
-  window.Whisper = window.Whisper || {};
-
-  Whisper.BetaReleaseDisclaimer = Whisper.View.extend({
-    className: 'loki-dialog beta-disclaimer-dialog modal',
-    templateName: 'beta-disclaimer-dialog',
-    initialize(options = {}) {
-      this.okText = options.okText || i18n('ok');
-      this.render();
-      this.$('.betaDisclaimerView').show();
-      this.$('.beta-disclaimer-dialog').bind('keyup', event =>
-        this.onKeyup(event)
-      );
-    },
-    events: {
-      'click .ok': 'close',
-    },
-    render_attributes() {
-      return {
-        ok: this.okText,
-      };
-    },
-    close() {
-      window.storage.put('betaReleaseDisclaimerAccepted', true);
-      this.remove();
-    },
-    onKeyup(event) {
-      switch (event.key) {
-        case 'Enter':
-        case 'Escape':
-        case 'Esc':
-          this.close();
-          break;
-        default:
-          break;
-      }
-    },
-  });
-})();

package.json

@@ -37,7 +37,7 @@
     "test-electron": "yarn grunt test",
     "test-node": "mocha --recursive --exit test/app test/modules ts/test libloki/test/node",
     "test-node-coverage": "nyc --reporter=lcov --reporter=text mocha --recursive test/app test/modules ts/test libloki/test/node",
-    "test-node-coverage-html": "nyc --reporter=lcov --reporter=html mocha --recursive test/app test/modules ts/test libloki/test/node",
+    "test-node-coverage-html": "nyc --reporter=lcov --reporter=html mocha --recursive test/a/*  */pp test/modules ts/test libloki/test/node",
     "eslint": "eslint .",
     "lint": "yarn format --list-different && yarn lint-windows",
     "dev-lint": "yarn format --list-different; yarn lint-windows",

ts/components/session/settings/SessionSettings.tsx

@@ -104,7 +104,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
         content: {
           options: {
             group: 'notification-setting',
-            initalItem: window.getSettingValue('notification-setting'),
+            initalItem: window.getSettingValue('notification-setting') || 'message',
             items: [
               {
                 label: window.i18n('nameAndMessage'),
@@ -214,7 +214,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
             const description = setting.description || '';
 
             const comparisonValue = setting.comparisonValue || null;
-            const value =
+            const value = 
               window.getSettingValue(setting.id, comparisonValue) ||
               setting.content.defaultValue;
 
@@ -283,7 +283,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
       if (item.type === SessionSettingType.Toggle) {
         // If no custom afterClick function given, alter values in storage here
         // Switch to opposite state
-        const newValue = !window.getSettingValue(item.id);
+        const newValue = ! window.getSettingValue(item.id);
         window.setSettingValue(item.id, newValue);
       }
     }