diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index fc07c6722..e903bc342 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1204,7 +1204,8 @@
     "description": "Subtitle for beta disclaimer modal"
   },
   "betaDisclaimerDescription": {
-    "message": "While your messages are secured with end-to-end encryption, third parties like your ISP can see who you're talking to while in the beta version. It is also possible that third parties could correlate your public key to your IP address and real identity if they learn your public key.",
+    "message":
+      "While your messages are secured with end-to-end encryption, third parties like your ISP can see who you're talking to while in the beta version. It is also possible that third parties could correlate your public key to your IP address and real identity if they learn your public key.",
     "description": "Description for beta disclaimer modal"
   },
   "quoteThumbnailAlt": {
@@ -2153,33 +2154,27 @@
   },
   "setAccountPasswordTitle": {
     "message": "Set Account Password",
-    "description":
-      "Prompt for user to set account password in settings view"
+    "description": "Prompt for user to set account password in settings view"
   },
   "setAccountPasswordDescription": {
     "message": "Secure your account and public key with a password",
-    "description":
-      "Description for set account password setting view"
+    "description": "Description for set account password setting view"
   },
   "changeAccountPasswordTitle": {
     "message": "Change Account Password",
-    "description":
-      "Prompt for user to change account password in settings view"
+    "description": "Prompt for user to change account password in settings view"
   },
   "changeAccountPasswordDescription": {
     "message": "Change your password",
-    "description":
-      "Description for change account password setting view"
+    "description": "Description for change account password setting view"
   },
   "removeAccountPasswordTitle": {
     "message": "Remove Account Password",
-    "description":
-      "Prompt for user to remove account password in settings view"
+    "description": "Prompt for user to remove account password in settings view"
   },
   "removeAccountPasswordDescription": {
     "message": "Remove the password associated with your account",
-    "description":
-      "Description for remove account password setting view"
+    "description": "Description for remove account password setting view"
   },
   "enterPassword": {
     "message": "Please enter your password"
diff --git a/js/modules/signal.js b/js/modules/signal.js
index 7733af81a..6f48f4704 100644
--- a/js/modules/signal.js
+++ b/js/modules/signal.js
@@ -71,7 +71,8 @@ const {
   SessionSeedModal,
 } = require('../../ts/components/session/SessionSeedModal');
 
-const { SessionPasswordModal,
+const {
+  SessionPasswordModal,
 } = require('../../ts/components/session/SessionPasswordModal');
 
 const {
diff --git a/js/views/beta_release_disclaimer_view.js b/js/views/beta_release_disclaimer_view.js
index e93d9a5be..004d3582c 100644
--- a/js/views/beta_release_disclaimer_view.js
+++ b/js/views/beta_release_disclaimer_view.js
@@ -12,7 +12,7 @@
       this.close = this.close.bind(this);
       this.render();
     },
-    
+
     render() {
       this.dialogView = new Whisper.ReactWrapperView({
         className: 'session-beta-disclaimer',
@@ -25,15 +25,14 @@
           onClickOk: this.close,
         },
       });
-      
+
       this.$el.append(this.dialogView.el);
       return this;
     },
 
-    close () {
+    close() {
       window.storage.put('betaReleaseDisclaimerAccepted', true);
       this.remove();
     },
   });
-
 })();
diff --git a/js/views/password_dialog_view copy.js b/js/views/password_dialog_view copy.js
deleted file mode 100644
index 57d2afa00..000000000
--- a/js/views/password_dialog_view copy.js	
+++ /dev/null
@@ -1,228 +0,0 @@
-/* global Whisper, i18n, _, Signal, passwordUtil */
-
-// eslint-disable-next-line func-names
-(function() {
-  'use strict';
-
-  window.Whisper = window.Whisper || {};
-
-  const PasswordDialogView = Whisper.View.extend({
-    className: 'loki-dialog password-dialog modal',
-    templateName: 'password-dialog',
-    initialize(options) {
-      this.type = options.type;
-      this.resolve = options.resolve;
-      this.okText = options.okText || i18n('ok');
-
-      this.reject = options.reject;
-      this.cancelText = options.cancelText || i18n('cancel');
-
-      this.title = options.title;
-
-      this.render();
-      this.updateUI();
-    },
-    events: {
-      keyup: 'onKeyup',
-      'click .ok': 'ok',
-      'click .cancel': 'cancel',
-    },
-    render_attributes() {
-      return {
-        showCancel: !this.hideCancel,
-        cancel: this.cancelText,
-        ok: this.okText,
-        title: this.title,
-      };
-    },
-    async updateUI() {
-      if (this.disableOkButton()) {
-        this.$('.ok').prop('disabled', true);
-      } else {
-        this.$('.ok').prop('disabled', false);
-      }
-    },
-    disableOkButton() {
-      const password = this.$('#password').val();
-      return _.isEmpty(password);
-    },
-    async validate() {
-      const password = this.$('#password').val();
-      const passwordConfirmation = this.$('#password-confirmation').val();
-
-      const pairValidation = this.validatePasswordPair(
-        password,
-        passwordConfirmation
-      );
-      const hashValidation = await this.validatePasswordHash(password);
-
-      return pairValidation || hashValidation;
-    },
-    async validatePasswordHash(password) {
-      // Check if the password matches the hash we have stored
-      const hash = await Signal.Data.getPasswordHash();
-      if (hash && !passwordUtil.matchesHash(password, hash)) {
-        return i18n('invalidPassword');
-      }
-      return null;
-    },
-    validatePasswordPair(password, passwordConfirmation) {
-      if (!_.isEmpty(password)) {
-        // Check if the password is first valid
-        const passwordValidation = passwordUtil.validatePassword(
-          password,
-          i18n
-        );
-        if (passwordValidation) {
-          return passwordValidation;
-        }
-
-        // Check if the confirmation password is the same
-        if (
-          !passwordConfirmation ||
-          password.trim() !== passwordConfirmation.trim()
-        ) {
-          return i18n('passwordsDoNotMatch');
-        }
-      }
-      return null;
-    },
-    okPressed() {
-      const password = this.$('#password').val();
-      if (this.type === 'set') {
-        window.setPassword(password.trim());
-      } else if (this.type === 'remove') {
-        window.setPassword(null, password.trim());
-      }
-    },
-    okErrored() {
-      if (this.type === 'set') {
-        this.showError(i18n('setPasswordFail'));
-      } else if (this.type === 'remove') {
-        this.showError(i18n('removePasswordFail'));
-      }
-    },
-    async ok() {
-      const error = await this.validate();
-      if (error) {
-        this.showError(error);
-        return;
-      }
-
-      // Clear any errors
-      this.showError(null);
-
-      try {
-        this.okPressed();
-
-        this.remove();
-        if (this.resolve) {
-          this.resolve();
-        }
-      } catch (e) {
-        this.okErrored();
-      }
-    },
-    cancel() {
-      this.remove();
-      if (this.reject) {
-        this.reject();
-      }
-    },
-    onKeyup(event) {
-      this.updateUI();
-      switch (event.key) {
-        case 'Enter':
-          this.ok();
-          break;
-        case 'Escape':
-        case 'Esc':
-          this.cancel();
-          break;
-        default:
-          return;
-      }
-      event.preventDefault();
-    },
-    focusCancel() {
-      this.$('.cancel').focus();
-    },
-    showError(message) {
-      if (_.isEmpty(message)) {
-        this.$('.error').text('');
-        this.$('.error').hide();
-      } else {
-        this.$('.error').text(`Error: ${message}`);
-        this.$('.error').show();
-      }
-    },
-  });
-
-  const ChangePasswordDialogView = PasswordDialogView.extend({
-    templateName: 'password-change-dialog',
-    disableOkButton() {
-      const oldPassword = this.$('#old-password').val();
-      const newPassword = this.$('#new-password').val();
-      return _.isEmpty(oldPassword) || _.isEmpty(newPassword);
-    },
-    async validate() {
-      const oldPassword = this.$('#old-password').val();
-
-      // Validate the old password
-      if (!_.isEmpty(oldPassword)) {
-        const oldPasswordValidation = passwordUtil.validatePassword(
-          oldPassword,
-          i18n
-        );
-        if (oldPasswordValidation) {
-          return oldPasswordValidation;
-        }
-      } else {
-        return i18n('typeInOldPassword');
-      }
-
-      const password = this.$('#new-password').val();
-      const passwordConfirmation = this.$('#new-password-confirmation').val();
-
-      const pairValidation = this.validatePasswordPair(
-        password,
-        passwordConfirmation
-      );
-      const hashValidation = await this.validatePasswordHash(oldPassword);
-
-      return pairValidation || hashValidation;
-    },
-    okPressed() {
-      const oldPassword = this.$('#old-password').val();
-      const newPassword = this.$('#new-password').val();
-      window.setPassword(newPassword.trim(), oldPassword.trim());
-    },
-    okErrored() {
-      this.showError(i18n('changePasswordFail'));
-    },
-  });
-
-  Whisper.getPasswordDialogView = (type, resolve, reject) => {
-    // This is a differently styled dialog
-    if (type === 'change') {
-      return new ChangePasswordDialogView({
-        title: i18n('changePassword'),
-        okTitle: i18n('change'),
-        resolve,
-        reject,
-      });
-    }
-
-    // Set and Remove is basically the same UI
-    const title =
-      type === 'remove' ? i18n('removePassword') : i18n('setPassword');
-    const okTitle = type === 'remove' ? i18n('remove') : i18n('set');
-    return new PasswordDialogView({
-      title,
-      okTitle,
-      type,
-      resolve,
-      reject,
-    });
-  };
-})();
diff --git a/js/views/password_dialog_view.js b/js/views/password_dialog_view.js
index 646e617ee..d73f433f2 100644
--- a/js/views/password_dialog_view.js
+++ b/js/views/password_dialog_view.js
@@ -17,7 +17,6 @@
     },
 
     render() {
-
       this.dialogView = new Whisper.ReactWrapperView({
         className: 'password-dialog-wrapper',
         Component: window.Signal.Components.SessionPasswordModal,
@@ -26,8 +25,7 @@
           onOk: this.onOk,
           ...this.props,
         },
-      });     
-
+      });
 
       this.$el.append(this.dialogView.el);
       return this;
@@ -42,7 +40,5 @@
     close() {
       this.remove();
     },
-
   });
 })();
-
diff --git a/main.js b/main.js
index 3cb82f9c4..490b3eccb 100644
--- a/main.js
+++ b/main.js
@@ -53,7 +53,6 @@ const config = require('./app/config');
 const userConfig = require('./app/user_config');
 const passwordUtil = require('./app/password_util');
 
-
 const importMode =
   process.argv.some(arg => arg === '--import') || config.get('import');
 
diff --git a/password_preload.js b/password_preload.js
index f1673ce80..8d8a5b7de 100644
--- a/password_preload.js
+++ b/password_preload.js
@@ -26,7 +26,6 @@ window.Signal = Signal.setup({
 
 window.passwordUtil = require('./app/password_util');
 
-
 window.resetDatabase = () => {
   window.log.info('reset database');
   ipcRenderer.send('resetDatabase');
diff --git a/preload.js b/preload.js
index 858c5442a..074afd14c 100644
--- a/preload.js
+++ b/preload.js
@@ -467,11 +467,6 @@ contextMenu({
   },
 });
 
-// User config for managing password DB entries etc.
-const thisfaw = require('./app/password_util');
-console.log(thisfaw);
-
-
 // We pull this in last, because the native module involved appears to be sensitive to
 //   /tmp mounted as noexec on Linux.
 require('./js/spell_check');
diff --git a/stylesheets/_mentions.scss b/stylesheets/_mentions.scss
index 625c2a9e2..3871345f7 100644
--- a/stylesheets/_mentions.scss
+++ b/stylesheets/_mentions.scss
@@ -170,7 +170,6 @@
   background-color: rgba(255, 197, 50, 0.2);
 }
 
-
 .module-conversation-list-item--mentioned-us {
   border-left: 4px solid #ffb000 !important;
 }
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 7ed4e579c..679086753 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -340,7 +340,7 @@ $session_message-container-border-radius: 5px;
     border-radius: 0px;
   }
 
-  & > *:not(svg):hover{
+  & > *:not(svg):hover {
     filter: brightness(80%);
   }
 }
@@ -494,7 +494,7 @@ label {
 
 .module-conversation-header {
   position: relative;
-  padding: 0px $session-margin-lg 0px $session-margin-sm
+  padding: 0px $session-margin-lg 0px $session-margin-sm;
 }
 
 .title-wrapper {
@@ -1121,9 +1121,7 @@ input {
   width: 40vh;
 }
 
-
 .session-beta-disclaimer {
-
   .session-modal {
     width: 600px;
 
@@ -1131,7 +1129,7 @@ input {
       font-size: 17px;
     }
 
-    &__body > div:first-child{
+    &__body > div:first-child {
       padding: $session-margin-lg;
     }
 
@@ -1151,7 +1149,7 @@ button.module-scroll-down {
     background-color: $session-shade-6;
   }
 
-  &__button:hover{
+  &__button:hover {
     &__icon {
       transition: $session-transition-duration;
       @include color-svg('../images/down.svg', $session-color-white);
@@ -1161,13 +1159,11 @@ button.module-scroll-down {
   &__icon {
     @include color-svg('../images/down.svg', rgba($session-color-white, 0.6));
   }
-  
 }
 
 /* Memberlist */
 .member-list-container .member {
-
-  &-item{
+  &-item {
     padding: $session-margin-sm;
     background-color: $session-shade-5;
 
@@ -1180,4 +1176,3 @@ button.module-scroll-down {
     background-color: $session-shade-8;
   }
 }
-
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 6cdec0461..77b1f99ed 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -381,7 +381,6 @@ $session-compose-margin: 20px;
       border: 1px solid $session-shade-7;
     }
   }
-
 }
 
 .contacts-dropdown {
diff --git a/ts/components/MainViewController.tsx b/ts/components/MainViewController.tsx
index 2696ded0c..8bc446c54 100644
--- a/ts/components/MainViewController.tsx
+++ b/ts/components/MainViewController.tsx
@@ -8,7 +8,7 @@ import {
 
 export const MainViewController = {
   renderMessageView: () => {
-    if(document.getElementById('main-view')) {
+    if (document.getElementById('main-view')) {
       ReactDOM.render(<MessageView />, document.getElementById('main-view'));
     }
   },
@@ -29,7 +29,11 @@ export class MessageView extends React.Component {
           <div className="conversation-header" />
           <div className="container">
             <div className="content">
-              <img src="images/session/full-logo.svg" className="session-full-logo" alt="full-brand-logo"/>
+              <img
+                src="images/session/full-logo.svg"
+                className="session-full-logo"
+                alt="full-brand-logo"
+              />
             </div>
           </div>
         </div>
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 1af9db8b8..ac8dadc01 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -2,7 +2,12 @@ import React from 'react';
 
 import { Avatar } from '../Avatar';
 import { Colors, LocalizerType } from '../../types/Util';
-import { ContextMenu, ContextMenuTrigger, MenuItem, SubMenu } from 'react-contextmenu';
+import {
+  ContextMenu,
+  ContextMenuTrigger,
+  MenuItem,
+  SubMenu,
+} from 'react-contextmenu';
 
 import {
   SessionIconButton,
@@ -251,12 +256,16 @@ export class ConversationHeader extends React.Component<Props> {
     }
 
     return (
-      <ContextMenuTrigger id={triggerId} ref={this.menuTriggerRef} holdToDisplay={1}>
-          <SessionIconButton
-            iconType={SessionIconType.Ellipses}
-            iconSize={SessionIconSize.Large}
-            onClick={this.showMenuBound}
-          />
+      <ContextMenuTrigger
+        id={triggerId}
+        ref={this.menuTriggerRef}
+        holdToDisplay={1}
+      >
+        <SessionIconButton
+          iconType={SessionIconType.Ellipses}
+          iconSize={SessionIconSize.Large}
+          onClick={this.showMenuBound}
+        />
       </ContextMenuTrigger>
     );
   }
@@ -278,7 +287,7 @@ export class ConversationHeader extends React.Component<Props> {
 
     const isPrivateGroup = isGroup && !isPublic;
 
-    const copyIdLabel = isGroup ? i18n('copyChatId') : i18n('copyPublicKey');   
+    const copyIdLabel = isGroup ? i18n('copyChatId') : i18n('copyPublicKey');
 
     return (
       <ContextMenu id={triggerId}>
diff --git a/ts/components/session/LeftPaneSettingSection.tsx b/ts/components/session/LeftPaneSettingSection.tsx
index 595383e15..2bfd52710 100644
--- a/ts/components/session/LeftPaneSettingSection.tsx
+++ b/ts/components/session/LeftPaneSettingSection.tsx
@@ -73,7 +73,9 @@ export class LeftPaneSettingSection extends React.Component<any, State> {
                   item.id === this.state.settingCategory ? 'active' : ''
                 )}
                 role="link"
-                onClick={(): void => this.setCategory(item.id)}
+                onClick={() => {
+                  this.setCategory(item.id);
+                }}
               >
                 <div>
                   <strong>{item.title}</strong>
diff --git a/ts/components/session/SessionPasswordModal.tsx b/ts/components/session/SessionPasswordModal.tsx
index 293287d92..62e89e40e 100644
--- a/ts/components/session/SessionPasswordModal.tsx
+++ b/ts/components/session/SessionPasswordModal.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 
 import { SessionModal } from './SessionModal';
-import { SessionButton, SessionButtonType, SessionButtonColor } from './SessionButton';
+import { SessionButton, SessionButtonColor } from './SessionButton';
 
 export enum PasswordAction {
   Set = 'set',
   Change = 'change',
-  Remove = 'remove'
+  Remove = 'remove',
 }
 
 interface Props {
@@ -25,7 +25,7 @@ export class SessionPasswordModal extends React.Component<Props, State> {
 
     this.state = {
       error: null,
-    }
+    };
 
     this.showError = this.showError.bind(this);
 
@@ -36,148 +36,155 @@ export class SessionPasswordModal extends React.Component<Props, State> {
 
   public render() {
     const { action, onOk } = this.props;
-    const placeholders = this.props.action === PasswordAction.Change
-      ? [window.i18n('typeInOldPassword'), window.i18n('enterPassword')]
-      : [window.i18n('enterPassword'), window.i18n('confirmPassword')]
+    const placeholders =
+      this.props.action === PasswordAction.Change
+        ? [window.i18n('typeInOldPassword'), window.i18n('enterPassword')]
+        : [window.i18n('enterPassword'), window.i18n('confirmPassword')];
 
-    const confirmButtonColor = this.props.action === PasswordAction.Remove
-      ? SessionButtonColor.Danger
-      : SessionButtonColor.Primary
+    const confirmButtonColor =
+      this.props.action === PasswordAction.Remove
+        ? SessionButtonColor.Danger
+        : SessionButtonColor.Primary;
 
     return (
-        <SessionModal
-            title={window.i18n(`${action}Password`)}
-            onOk={() => null}
-            onClose={this.closeDialog}
-        >
-          <div className="spacer-sm"></div>
-
-          <div className="session-modal__input-group">
+      <SessionModal
+        title={window.i18n(`${action}Password`)}
+        onOk={() => null}
+        onClose={this.closeDialog}
+      >
+        <div className="spacer-sm" />
+
+        <div className="session-modal__input-group">
+          <input
+            type="password"
+            id="password-modal-input"
+            placeholder={placeholders[0]}
+          />
+          {action !== PasswordAction.Remove && (
             <input
               type="password"
-              id="password-modal-input"
-              placeholder={placeholders[0]}
-            />
-            { action !== PasswordAction.Remove && (
-              <input
-                type="password"
-                id="password-modal-input-confirm"
-                placeholder={placeholders[1]}
-              />
-            )}
-          </div>
-
-          <div className="spacer-sm" />
-          {this.showError()}
-
-          <div className="session-modal__button-group">
-            <SessionButton
-              text={window.i18n('ok')}
-              buttonColor={confirmButtonColor}
-              onClick={() => this.setPassword(onOk)}
+              id="password-modal-input-confirm"
+              placeholder={placeholders[1]}
             />
+          )}
+        </div>
+
+        <div className="spacer-sm" />
+        {this.showError()}
+
+        <div className="session-modal__button-group">
+          <SessionButton
+            text={window.i18n('ok')}
+            buttonColor={confirmButtonColor}
+            onClick={async () => this.setPassword(onOk)}
+          />
+
+          <SessionButton
+            text={window.i18n('cancel')}
+            onClick={this.closeDialog}
+          />
+        </div>
+      </SessionModal>
+    );
+  }
 
-            <SessionButton text={window.i18n('cancel')} onClick={this.closeDialog} />
-          </div>
+  public async validatePasswordHash(password: string | null) {
+    // Check if the password matches the hash we have stored
+    const hash = await window.Signal.Data.getPasswordHash();
+    if (hash && !window.passwordUtil.matchesHash(password, hash)) {
+      return false;
+    }
 
-        </SessionModal>
-    );
+    return true;
+  }
+
+  private showError() {
+    const message = this.state.error;
 
+    return (
+      <>
+        {message && (
+          <>
+            <div className="session-label warning">{message}</div>
+            <div className="spacer-lg" />
+          </>
+        )}
+      </>
+    );
   }
 
   private async setPassword(onSuccess: any) {
     const enteredPassword = String($('#password-modal-input').val());
-    const enteredPasswordConfirm = String($('#password-modal-input-confirm').val());
+    const enteredPasswordConfirm = String(
+      $('#password-modal-input-confirm').val()
+    );
 
     // Check passwords enntered
-    if ((enteredPassword.length === 0) ||
-      ((this.props.action === PasswordAction.Change) &&
-      (enteredPasswordConfirm.length === 0))){
+    if (
+      enteredPassword.length === 0 ||
+      (this.props.action === PasswordAction.Change &&
+        enteredPasswordConfirm.length === 0)
+    ) {
       this.setState({
         error: window.i18n('noGivenPassword'),
       });
 
       return;
     }
-    
-    // Passwords match or remove password successful
-    const newPassword = this.props.action === PasswordAction.Remove
-    ? null
-    : enteredPasswordConfirm;
-    const oldPassword = this.props.action === PasswordAction.Set 
-      ? null
-      : enteredPassword;
 
+    // Passwords match or remove password successful
+    const newPassword =
+      this.props.action === PasswordAction.Remove
+        ? null
+        : enteredPasswordConfirm;
+    const oldPassword =
+      this.props.action === PasswordAction.Set ? null : enteredPassword;
 
     // Check if password match, when setting, changing or removing
-    const valid = this.props.action !== PasswordAction.Set
-      ? !! await this.validatePasswordHash(oldPassword)
-      : (enteredPassword === enteredPasswordConfirm);
-        
-    if (!valid){
+    const valid =
+      this.props.action !== PasswordAction.Set
+        ? !!await this.validatePasswordHash(oldPassword)
+        : enteredPassword === enteredPasswordConfirm;
+
+    if (!valid) {
       this.setState({
         error: window.i18n(`${this.props.action}PasswordInvalid`),
       });
 
       return;
     }
-    
+
     await window.setPassword(newPassword, oldPassword);
-    
 
     const toastParams = {
       title: window.i18n(`${this.props.action}PasswordTitle`),
       description: window.i18n(`${this.props.action}PasswordToastDescription`),
       type: this.props.action !== PasswordAction.Remove ? 'success' : 'warning',
       icon: this.props.action !== PasswordAction.Remove ? 'lock' : undefined,
-    }
+    };
 
     window.pushToast({
-      id: "set-password-success-toast",
-      ...toastParams
+      id: 'set-password-success-toast',
+      ...toastParams,
     });
 
     onSuccess(this.props.action);
     this.closeDialog();
-
-  }
-
-  public async validatePasswordHash(password: string | null) {
-    // Check if the password matches the hash we have stored
-    const hash = await window.Signal.Data.getPasswordHash();
-    if (hash && !window.passwordUtil.matchesHash(password, hash)) {
-      return false;
-    }
-    
-    return true;
-  }
-
-  private showError() {
-    const message = this.state.error;
-
-    return (
-      <>
-        {message && (
-          <>
-            <div className="session-label warning">{message}</div>
-            <div className="spacer-lg" />
-          </>
-        )}
-      </>
-    );
   }
 
   private onEnter(event: any) {
     if (event.key === 'Enter') {
       //if ($('#server-url').is(':focus')) {
-        //this.showView('connecting');
+      //this.showView('connecting');
       //}
     }
   }
 
   private closeDialog() {
     window.removeEventListener('keyup', this.onEnter);
-    this.props.onClose && this.props.onClose();
-  }
 
+    if (this.props.onClose) {
+      this.props.onClose();
+    }
+  }
 }
diff --git a/ts/components/session/SessionToast.tsx b/ts/components/session/SessionToast.tsx
index 531f93451..cb3b6d2d3 100644
--- a/ts/components/session/SessionToast.tsx
+++ b/ts/components/session/SessionToast.tsx
@@ -38,10 +38,9 @@ export class SessionToast extends React.PureComponent<Props> {
       ? SessionIconSize.Large
       : SessionIconSize.Medium;
 
-
     // Set a custom icon or allow the theme to define the icon
     let toastIcon = icon || undefined;
-    if (! toastIcon ){
+    if (!toastIcon) {
       switch (type) {
         case SessionToastType.Info:
           toastIcon = SessionIconType.Info;
@@ -58,7 +57,7 @@ export class SessionToast extends React.PureComponent<Props> {
         default:
           toastIcon = SessionIconType.Info;
       }
-  }
+    }
 
     return (
       <div className={classNames('session-toast', toastType)}>
diff --git a/ts/components/session/settings/SessionSettingListItem.tsx b/ts/components/session/settings/SessionSettingListItem.tsx
index 70c71e711..61df69626 100644
--- a/ts/components/session/settings/SessionSettingListItem.tsx
+++ b/ts/components/session/settings/SessionSettingListItem.tsx
@@ -90,12 +90,14 @@ export class SessionSettingListItem extends React.Component<Props, State> {
           {type === SessionSettingType.Slider && (
             <div className="slider-wrapper">
               <Slider
-                dots
+                dots={true}
                 step={6}
                 min={12}
                 max={96}
                 defaultValue={currentSliderValue}
-                onAfterChange={value => this.handleSlider(value)}
+                onAfterChange={sliderValue => {
+                  this.handleSlider(sliderValue);
+                }}
               />
               <div className="slider-info">
                 <p>{`${currentSliderValue} Hours`}</p>
@@ -114,7 +116,9 @@ export class SessionSettingListItem extends React.Component<Props, State> {
   }
 
   private handleSlider(value: any) {
-    this.props.onSliderChange && this.props.onSliderChange(value);
+    if (this.props.onSliderChange) {
+      this.props.onSliderChange(value);
+    }
 
     this.setState({
       sliderValue: value,
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index e29917429..8f4aab7aa 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -26,8 +26,6 @@ export interface SettingsViewProps {
 
 interface State {
   hasPassword: boolean | null;
-  changedPassword: boolean | null;
-  removedPassword: 
 }
 
 export class SettingsView extends React.Component<SettingsViewProps, State> {
@@ -38,14 +36,15 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
 
     this.state = {
       hasPassword: null,
-    }
-    
+    };
+
     this.settingsViewRef = React.createRef();
     this.onPasswordUpdated = this.onPasswordUpdated.bind(this);
 
     this.hasPassword();
   }
 
+  /* tslint:disable-next-line:max-func-body-length */
   public renderSettingInCategory() {
     const { Settings } = window.Signal.Types;
 
@@ -137,7 +136,6 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
         setFn: window.toggleMediaPermissions,
         content: {},
       },
-
       {
         id: 'message-ttl',
         title: window.i18n('messageTTL'),
@@ -147,7 +145,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
         category: SessionSettingCategory.Privacy,
         setFn: undefined,
         content: {
-          defaultValue: 24
+          defaultValue: 24,
         },
       },
       {
@@ -162,10 +160,11 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
           buttonText: window.i18n('setPassword'),
           buttonColor: SessionButtonColor.Primary,
         },
-        onClick: () => window.showPasswordDialog({
-          action: 'set',
-          onSuccess: this.onPasswordUpdated,
-        }),
+        onClick: () =>
+          window.showPasswordDialog({
+            action: 'set',
+            onSuccess: this.onPasswordUpdated,
+          }),
       },
       {
         id: 'change-password',
@@ -176,13 +175,14 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
         category: SessionSettingCategory.Privacy,
         setFn: undefined,
         content: {
-           buttonText: window.i18n('changePassword'),
+          buttonText: window.i18n('changePassword'),
           buttonColor: SessionButtonColor.Primary,
         },
-        onClick: () => window.showPasswordDialog({
-          action: 'change',
-          onSuccess: this.onPasswordUpdated,
-        }),
+        onClick: () =>
+          window.showPasswordDialog({
+            action: 'change',
+            onSuccess: this.onPasswordUpdated,
+          }),
       },
       {
         id: 'remove-password',
@@ -196,47 +196,57 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
           buttonText: window.i18n('removePassword'),
           buttonColor: SessionButtonColor.Danger,
         },
-        onClick: () => window.showPasswordDialog({
-          action: 'remove',
-          onSuccess: this.onPasswordUpdated,
-        }),
+        onClick: () =>
+          window.showPasswordDialog({
+            action: 'remove',
+            onSuccess: this.onPasswordUpdated,
+          }),
       },
     ];
 
     return (
       <>
-        {(this.state.hasPassword !== null) && localSettings.map(setting => {    
-          const { category } = this.props;
-          const shouldRenderSettings = setting.category === category;
-          const description = setting.description || '';
-          
-          const comparisonValue = setting.comparisonValue || null;
-          const value = window.getSettingValue(setting.id, comparisonValue) || setting.content.defaultValue;
+        {this.state.hasPassword !== null &&
+          localSettings.map(setting => {
+            const { category } = this.props;
+            const content = setting.content || undefined;
+            const shouldRenderSettings = setting.category === category;
+            const description = setting.description || '';
 
-          const sliderFn =
-            setting.type === SessionSettingType.Slider
-              ? (value: any) => window.setSettingValue(setting.id, value)
-              : () => null;
+            const comparisonValue = setting.comparisonValue || null;
+            const value =
+              window.getSettingValue(setting.id, comparisonValue) ||
+              setting.content.defaultValue;
 
-          const onClickFn = setting.onClick || (() => this.updateSetting(setting));
+            const sliderFn =
+              setting.type === SessionSettingType.Slider
+                ? (settingValue: any) =>
+                    window.setSettingValue(setting.id, settingValue)
+                : () => null;
 
-          return (
-            <div key={setting.id}>
-              {shouldRenderSettings &&
-                !setting.hidden && (
-                  <SessionSettingListItem
-                    title={setting.title}
-                    description={description}
-                    type={setting.type}
-                    value={value}
-                    onClick={onClickFn}
-                    onSliderChange={sliderFn}
-                    content={setting.content || undefined}
-                  />
-                )}
-            </div>
-          );
-        })}
+            const onClickFn =
+              setting.onClick ||
+              (() => {
+                this.updateSetting(setting);
+              });
+
+            return (
+              <div key={setting.id}>
+                {shouldRenderSettings &&
+                  !setting.hidden && (
+                    <SessionSettingListItem
+                      title={setting.title}
+                      description={description}
+                      type={setting.type}
+                      value={value}
+                      onClick={onClickFn}
+                      onSliderChange={sliderFn}
+                      content={content}
+                    />
+                  )}
+              </div>
+            );
+          })}
       </>
     );
   }
@@ -285,14 +295,13 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
   }
 
   public onPasswordUpdated(action: string) {
-
-    if (action === 'set'){
+    if (action === 'set') {
       this.setState({
         hasPassword: true,
       });
     }
 
-    if (action === 'remove'){
+    if (action === 'remove') {
       this.setState({
         hasPassword: false,
       });
diff --git a/ts/global.d.ts b/ts/global.d.ts
index 0e8f0f2fb..7bb9e1922 100644
--- a/ts/global.d.ts
+++ b/ts/global.d.ts
@@ -16,7 +16,7 @@ interface Window {
   Signal: any;
   Whisper: any;
   ConversationController: any;
-  
+
   setPassword: any;
   textsecure: any;
   Session: any;