docs: Add release notes for v4.0.0.

There were couple of issue solved by this commit:
  - The button had extra 10px margin to right; this comes from .action class
  - The "Delete" text and icon were not aligned
  - The button looks bigger than other buttons

Both of which made the button look broken. We fix first by changing
.css-delete-action to #css-delete-action in css file; git grep shows
this is only used once and is used as id not a class. Then we use
display flex to fix the alinging of icon and text. We add box-sizing border-box
which solves the bigger width issue. We remove extra 10px margin that comes from
.action.

Fixes: #801.

.editorconfig

@@ -2,6 +2,7 @@ root = true
 
 [*]
 indent_style = tab
+indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

.gitattributes

@@ -1 +1,16 @@
-* text=auto
+* text=auto eol=lf
+
+package-lock.json binary
+app/package-lock.json binary
+*.gif binary
+*.jpg binary
+*.jpeg binary
+*.eot binary
+*.woff binary
+*.woff2 binary
+*.svg binary
+*.ttf binary
+*.png binary
+*.otf binary
+*.tif binary
+*.ogg binary

.github/ISSUE_TEMPLATE.md

@@ -2,7 +2,7 @@
 <!-- Please Include: -->
 - **Operating System**:
   - [ ] Windows
-  - [ ] Linux/Ubutnu
+  - [ ] Linux/Ubuntu
   - [ ] macOS
 - **Clear steps to reproduce the issue**:
 - **Relevant error messages and/or screenshots**:

.gitignore

@@ -7,6 +7,13 @@ node_modules/
 # Compiled binary build directory
 dist/
 
+#snap generated files
+snap/parts
+snap/prime
+snap/snap
+snap/stage
+snap/*.snap
+
 # Logs
 logs
 *.log
@@ -26,6 +33,9 @@ yarn-error.log*
 config.gypi
 
 # Test generated files
-tests/package.json
+# tests/package.json
 
 .python-version
+
+# Ignore all the typescript compiled files
+app/**/*.js

.htmlhintrc

@@ -0,0 +1,25 @@
+{
+  "tagname-lowercase": true,
+  "attr-lowercase": true,
+  "attr-value-double-quotes": true,
+  "attr-value-not-empty": false,
+  "attr-no-duplication": true,
+  "doctype-first": true,
+  "tag-pair": true,
+  "empty-tag-not-self-closed": true,
+  "spec-char-escape": true,
+  "id-unique": true,
+  "src-not-empty": true,
+  "title-require": true,
+  "alt-require": false,
+  "doctype-html5": true,
+  "id-class-value": "dash",
+  "style-disabled": false,
+  "inline-style-disabled": false,
+  "inline-script-disabled": false,
+  "space-tab-mixed-disabled": "space4",
+  "id-class-ad-disabled": false,
+  "href-abs-or-rel": false,
+  "attr-unsafe-chars": true,
+  "head-script-disabled": true
+}

.stylelintrc

@@ -0,0 +1,67 @@
+{
+    "rules": {
+        # Stylistic rules for CSS.
+        "function-comma-space-after": "always",
+        "function-comma-space-before": "never",
+        "function-max-empty-lines": 0,
+        "function-whitespace-after": "always",
+
+        "value-keyword-case": "lower",
+        "value-list-comma-newline-after": "always-multi-line",
+        "value-list-comma-space-after": "always-single-line",
+        "value-list-comma-space-before": "never",
+        "value-list-max-empty-lines": 0,
+
+        "unit-case": "lower",
+        "property-case": "lower",
+        "color-hex-case": "lower",
+
+        "declaration-bang-space-before": "always",
+        "declaration-colon-newline-after": "always-multi-line",
+        "declaration-colon-space-after": "always-single-line",
+        "declaration-colon-space-before": "never",
+        "declaration-block-semicolon-newline-after": "always",
+        "declaration-block-semicolon-space-before": "never",
+        "declaration-block-trailing-semicolon": "always",
+
+        "block-closing-brace-empty-line-before": "never",
+        "block-closing-brace-newline-after": "always",
+        "block-closing-brace-newline-before": "always",
+        "block-opening-brace-newline-after": "always",
+        "block-opening-brace-space-before": "always",
+
+        "selector-attribute-brackets-space-inside": "never",
+        "selector-attribute-operator-space-after": "never",
+        "selector-attribute-operator-space-before": "never",
+        "selector-combinator-space-after": "always",
+        "selector-combinator-space-before": "always",
+        "selector-descendant-combinator-no-non-space": true,
+        "selector-pseudo-class-parentheses-space-inside": "never",
+        "selector-pseudo-element-case": "lower",
+        "selector-pseudo-element-colon-notation": "double",
+        "selector-type-case": "lower",
+        "selector-list-comma-newline-after": "always",
+        "selector-list-comma-space-before": "never",
+
+        "media-feature-colon-space-after": "always",
+        "media-feature-colon-space-before": "never",
+        "media-feature-name-case": "lower",
+        "media-feature-parentheses-space-inside": "never",
+        "media-feature-range-operator-space-after": "always",
+        "media-feature-range-operator-space-before": "always",
+        "media-query-list-comma-newline-after": "always",
+        "media-query-list-comma-space-before": "never",
+
+        "at-rule-name-case": "lower",
+        "at-rule-name-space-after": "always",
+        "at-rule-semicolon-newline-after": "always",
+        "at-rule-semicolon-space-before": "never",
+
+        "comment-whitespace-inside": "always",
+        "indentation": 4,
+        
+        # Limit language features
+        "color-no-hex": true,
+        "color-named": "never",
+    }
+}

.travis.yml

@@ -15,7 +15,7 @@ addons:
 
 language: node_js
 node_js:
-- '6'
+- '8'
 
 before_install:
   - ./scripts/travis-xvfb.sh

CONTRIBUTING.md

@@ -2,20 +2,20 @@
 
 Thanks for taking the time to contribute!
 
-The following is a set of guidelines for contributing to Zulip Electron Desktop Client. These are just guidelines, not rules, so use your best judgement and feel free to propose changes to this document in a pull request.
+The following is a set of guidelines for contributing to Zulip's desktop Client. These are just guidelines, not rules, so use your best judgement and feel free to propose changes to this document in a pull request.
 
 ## Getting Started
 
-Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If you are new to Electron, please head over to [this](http://jlord.us/essential-electron/) great article.
+Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If you are new to Electron, please head over to [this](https://jlord.dev/blog/essential-electron) great article.
 
 ## Community
 
 * The whole Zulip documentation, such as setting up a development environment, setting up with the Zulip webapp project, and testing, can be read [here](https://zulip.readthedocs.io).
 
-* If you have any questions regarding zulip-electron, open an [issue](https://github.com/zulip/zulip-electron/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/electron).
+* If you have any questions regarding zulip-desktop, open an [issue](https://github.com/zulip/zulip-desktop/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/16-desktop).
 
 ## Issue
-Ensure the bug was not already reported by searching on GitHub under [issues](https://github.com/zulip/zulip-electron/issues). If you're unable to find an open issue addressing the bug, open a [new issue](https://github.com/zulip/zulip-electron/issues/new).
+Ensure the bug was not already reported by searching on GitHub under [issues](https://github.com/zulip/zulip-desktop/issues). If you're unable to find an open issue addressing the bug, open a [new issue](https://github.com/zulip/zulip-desktop/issues/new).
 
 The [zulipbot](https://github.com/zulip/zulipbot) helps to claim an issue by commenting the following in the comment section: "**@zulipbot** claim". **@zulipbot** will assign you to the issue and label the issue as **in progress**. For more details, check out [**@zulipbot**](https://github.com/zulip/zulipbot).
 
@@ -38,7 +38,7 @@ For example:
 
 
 ## Pull Requests
-Pull Requests are always welcome. 
+Pull Requests are always welcome.
 
 1. When you edit the code, please run `npm run test` to check the formatting of your code before you `git commit`.
 2. Ensure the PR description clearly describes the problem and solution. It should include:

README.md

@@ -1,39 +1,27 @@
 # Zulip Desktop Client
-[![Build Status](https://travis-ci.org/zulip/zulip-electron.svg?branch=master)](https://travis-ci.org/zulip/zulip-electron)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-electron?branch=master&svg=true)](https://ci.appveyor.com/project/akashnimare/zulip-electron/branch/master)
+[![Build Status](https://travis-ci.org/zulip/zulip-desktop.svg?branch=master)](https://travis-ci.org/zulip/zulip-desktop)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-desktop?branch=master&svg=true)](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/master)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
+[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://chat.zulip.org)
 
-Desktop client for Zulip. Available for Mac, Linux and Windows.
+Desktop client for Zulip. Available for Mac, Linux, and Windows.
 
 <img src="http://i.imgur.com/ChzTq4F.png"/>
 
 # Download
-Please see [installation guide](https://zulipchat.com/help/desktop-app-install-guide).
+Please see the [installation guide](https://zulipchat.com/help/desktop-app-install-guide).
 
 # Features
-* Sign in to multiple teams
-* Native desktop Notifications
-* SpellChecker
-* OSX/Win/Linux installers
-* Automatic Updates (macOS/Windows)
-* Keyboard shortcuts
-
-Description            | Keys
------------------------| -----------------------
-Default shortcuts      | <kbd>Cmd/Ctrl</kbd> <kbd>k</kbd>
-Manage Zulip Servers    | <kbd>Cmd/Ctrl</kbd> <kbd>,</kbd>
-Back                   | <kbd>Cmd/Ctrl</kbd> <kbd>[</kbd>
-Forward                | <kbd>Cmd/Ctrl</kbd> <kbd>]</kbd>
-
-# Development
-Please see our [development guide](./development.md) to get started and run app locally.
+* Sign in to multiple organizations
+* Desktop notifications with inline reply
+* Tray/dock integration
+* Multi-language spell checker
+* Automatic updates
 
 # Contribute
 
-If you want to contribute please make sure to read [our documentation about contributing](./CONTRIBUTING.md) first.
-
-* [Issue Tracker](https://github.com/zulip/zulip-electron/issues)
-* [Source Code](https://github.com/zulip/zulip-electron/)
+First, join us on the [Zulip community server](https://zulip.readthedocs.io/en/latest/contributing/chat-zulip-org.html)!
+Also see our [contribution guidelines](./CONTRIBUTING.md) and our [development guide](./development.md).
 
 # License
 Released under the [Apache-2.0](./LICENSE) license.

app/main/autoupdater.js

@@ -1,53 +0,0 @@
-'use strict';
-const { app, dialog } = require('electron');
-const { autoUpdater } = require('electron-updater');
-const isDev = require('electron-is-dev');
-
-const ConfigUtil = require('./../renderer/js/utils/config-util.js');
-
-function appUpdater() {
-	// Don't initiate auto-updates in development
-	if (isDev) {
-		return;
-	}
-
-	// Create Logs directory
-	const LogsDir = `${app.getPath('userData')}/Logs`;
-
-	// Log whats happening
-	const log = require('electron-log');
-
-	log.transports.file.file = `${LogsDir}/updates.log`;
-	log.transports.file.level = 'info';
-	autoUpdater.logger = log;
-
-	// Handle auto updates for beta/pre releases
-	autoUpdater.allowPrerelease = ConfigUtil.getConfigItem('betaUpdate') || false;
-
-	// Ask the user if update is available
-	// eslint-disable-next-line no-unused-vars
-	autoUpdater.on('update-downloaded', event => {
-		// Ask user to update the app
-		dialog.showMessageBox({
-			type: 'question',
-			buttons: ['Install and Relaunch', 'Install Later'],
-			defaultId: 0,
-			message: `A new update ${event.version} has been downloaded`,
-			detail: 'It will be installed the next time you restart the application'
-		}, response => {
-			if (response === 0) {
-				setTimeout(() => {
-					autoUpdater.quitAndInstall();
-					// force app to quit. This is just a workaround, ideally autoUpdater.quitAndInstall() should relaunch the app.
-					app.quit();
-				}, 1000);
-			}
-		});
-	});
-	// Init for updates
-	autoUpdater.checkForUpdates();
-}
-
-module.exports = {
-	appUpdater
-};

app/main/autoupdater.ts

@@ -0,0 +1,106 @@
+'use strict';
+import { app, dialog, shell } from 'electron';
+import { autoUpdater } from 'electron-updater';
+import { linuxUpdateNotification } from './linuxupdater';	// Required only in case of linux
+
+import log = require('electron-log');
+import isDev = require('electron-is-dev');
+import ConfigUtil = require('../renderer/js/utils/config-util');
+
+export function appUpdater(updateFromMenu = false): void {
+	// Don't initiate auto-updates in development
+	if (isDev) {
+		return;
+	}
+
+	if (process.platform === 'linux' && !process.env.APPIMAGE) {
+		linuxUpdateNotification();
+		return;
+	}
+
+	let updateAvailable = false;
+
+	// Create Logs directory
+	const LogsDir = `${app.getPath('userData')}/Logs`;
+
+	// Log whats happening
+	log.transports.file.file = `${LogsDir}/updates.log`;
+	log.transports.file.level = 'info';
+	autoUpdater.logger = log;
+
+	// Handle auto updates for beta/pre releases
+	const isBetaUpdate = ConfigUtil.getConfigItem('betaUpdate');
+
+	autoUpdater.allowPrerelease = isBetaUpdate || false;
+
+	const eventsListenerRemove = ['update-available', 'update-not-available'];
+	autoUpdater.on('update-available', info => {
+		if (updateFromMenu) {
+			dialog.showMessageBox({
+				message: `A new version ${info.version}, of Zulip Desktop is available`,
+				detail: 'The update will be downloaded in the background. You will be notified when it is ready to be installed.'
+			});
+
+			updateAvailable = true;
+
+			// This is to prevent removal of 'update-downloaded' and 'error' event listener.
+			eventsListenerRemove.forEach(event => {
+				autoUpdater.removeAllListeners(event);
+			});
+		}
+	});
+
+	autoUpdater.on('update-not-available', () => {
+		if (updateFromMenu) {
+			dialog.showMessageBox({
+				message: 'No updates available',
+				detail: `You are running the latest version of Zulip Desktop.\nVersion: ${app.getVersion()}`
+			});
+			// Remove all autoUpdator listeners so that next time autoUpdator is manually called these
+			// listeners don't trigger multiple times.
+			autoUpdater.removeAllListeners();
+		}
+	});
+
+	autoUpdater.on('error', error => {
+		if (updateFromMenu) {
+			const messageText = (updateAvailable) ? ('Unable to download the updates') : ('Unable to check for updates');
+			dialog.showMessageBox({
+				type: 'error',
+				buttons: ['Manual Download', 'Cancel'],
+				message: messageText,
+				detail: (error).toString() + `\n\nThe latest version of Zulip Desktop is available at -\nhttps://zulipchat.com/apps/.\n
+Current Version: ${app.getVersion()}`
+			}, response => {
+				if (response === 0) {
+					shell.openExternal('https://zulipchat.com/apps/');
+				}
+			});
+			// Remove all autoUpdator listeners so that next time autoUpdator is manually called these
+			// listeners don't trigger multiple times.
+			autoUpdater.removeAllListeners();
+		}
+	});
+
+	// Ask the user if update is available
+	autoUpdater.on('update-downloaded', event => {
+		// Ask user to update the app
+		dialog.showMessageBox({
+			type: 'question',
+			buttons: ['Install and Relaunch', 'Install Later'],
+			defaultId: 0,
+			message: `A new update ${event.version} has been downloaded`,
+			detail: 'It will be installed the next time you restart the application'
+		}, response => {
+			if (response === 0) {
+				setTimeout(() => {
+					autoUpdater.quitAndInstall();
+					// force app to quit. This is just a workaround, ideally autoUpdater.quitAndInstall() should relaunch the app.
+					app.quit();
+				}, 1000);
+			}
+		});
+	});
+	// Init for updates
+	autoUpdater.checkForUpdates();
+}

app/main/crash-reporter.js

@@ -1,16 +0,0 @@
-'use strict';
-
-const { crashReporter } = require('electron');
-
-const crashHandler = () => {
-	crashReporter.start({
-		productName: 'zulip-electron',
-		companyName: 'Kandra Labs, Inc.',
-		submitURL: 'https://zulip-sentry.herokuapp.com/crashreport',
-		autoSubmit: true
-	});
-};
-
-module.exports = {
-	crashHandler
-};

app/main/index.js

@@ -1,242 +0,0 @@
-'use strict';
-const path = require('path');
-const electron = require('electron');
-const windowStateKeeper = require('electron-window-state');
-const isDev = require('electron-is-dev');
-const appMenu = require('./menu');
-const { appUpdater } = require('./autoupdater');
-const { crashHandler } = require('./crash-reporter');
-
-const { setAutoLaunch } = require('./startup');
-
-const { app, ipcMain } = electron;
-
-const BadgeSettings = require('./../renderer/js/pages/preference/badge-settings.js');
-const ConfigUtil = require('./../renderer/js/utils/config-util.js');
-
-// Adds debug features like hotkeys for triggering dev tools and reload
-// in development mode
-if (isDev) {
-	require('electron-debug')();
-}
-
-// Prevent window being garbage collected
-let mainWindow;
-let badgeCount;
-
-let isQuitting = false;
-
-// Load this url in main window
-const mainURL = 'file://' + path.join(__dirname, '../renderer', 'main.html');
-
-const isAlreadyRunning = app.makeSingleInstance(() => {
-	if (mainWindow) {
-		if (mainWindow.isMinimized()) {
-			mainWindow.restore();
-		}
-
-		mainWindow.show();
-	}
-});
-
-if (isAlreadyRunning) {
-	return app.quit();
-}
-
-const APP_ICON = path.join(__dirname, '../resources', 'Icon');
-
-const iconPath = () => {
-	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
-};
-
-function createMainWindow() {
-	// Load the previous state with fallback to defaults
-	const mainWindowState = windowStateKeeper({
-		defaultWidth: 1000,
-		defaultHeight: 600
-	});
-
-	// Let's keep the window position global so that we can access it in other process
-	global.mainWindowState = mainWindowState;
-
-	const win = new electron.BrowserWindow({
-		// This settings needs to be saved in config
-		title: 'Zulip',
-		icon: iconPath(),
-		x: mainWindowState.x,
-		y: mainWindowState.y,
-		width: mainWindowState.width,
-		height: mainWindowState.height,
-		minWidth: 300,
-		minHeight: 400,
-		webPreferences: {
-			plugins: true,
-			allowDisplayingInsecureContent: true,
-			nodeIntegration: true
-		},
-		show: false
-	});
-
-	win.on('focus', () => {
-		win.webContents.send('focus');
-	});
-
-	win.once('ready-to-show', () => {
-		if (ConfigUtil.getConfigItem('startMinimized')) {
-			win.minimize();
-		} else {
-			win.show();
-		}
-	});
-
-	win.loadURL(mainURL);
-
-	// Keep the app running in background on close event
-	win.on('close', e => {
-		if (!isQuitting) {
-			e.preventDefault();
-
-			if (process.platform === 'darwin') {
-				app.hide();
-			} else {
-				win.hide();
-			}
-		}
-	});
-
-	win.setTitle('Zulip');
-
-	win.on('enter-full-screen', () => {
-		win.webContents.send('enter-fullscreen');
-	});
-
-	win.on('leave-full-screen', () => {
-		win.webContents.send('leave-fullscreen');
-	});
-
-	//  To destroy tray icon when navigate to a new URL
-	win.webContents.on('will-navigate', e => {
-		if (e) {
-			win.webContents.send('destroytray');
-		}
-	});
-
-	// Let us register listeners on the window, so we can update the state
-	// automatically (the listeners will be removed when the window is closed)
-	// and restore the maximized or full screen state
-	mainWindowState.manage(win);
-
-	return win;
-}
-
-// Decrease load on GPU (experimental)
-app.disableHardwareAcceleration();
-
-// eslint-disable-next-line max-params
-app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
-	event.preventDefault();
-	callback(true);
-});
-
-app.on('activate', () => {
-	if (!mainWindow) {
-		mainWindow = createMainWindow();
-	}
-});
-
-app.on('ready', () => {
-	appMenu.setMenu({
-		tabs: []
-	});
-	mainWindow = createMainWindow();
-
-	const page = mainWindow.webContents;
-
-	page.on('dom-ready', () => {
-		if (ConfigUtil.getConfigItem('startMinimized')) {
-			mainWindow.minimize();
-		} else {
-			mainWindow.show();
-		}
-	});
-
-	page.once('did-frame-finish-load', () => {
-		// Initate auto-updates on MacOS and Windows
-		appUpdater();
-		crashHandler();
-	});
-
-	electron.powerMonitor.on('resume', () => {
-		mainWindow.reload();
-		page.send('destroytray');
-	});
-
-	ipcMain.on('focus-app', () => {
-		mainWindow.show();
-	});
-
-	ipcMain.on('quit-app', () => {
-		app.quit();
-	});
-
-	// Reload full app not just webview, useful in debugging
-	ipcMain.on('reload-full-app', () => {
-		mainWindow.reload();
-		page.send('destroytray');
-	});
-
-	ipcMain.on('clear-app-settings', () => {
-		global.mainWindowState.unmanage(mainWindow);
-		app.relaunch();
-		app.exit();
-	});
-
-	ipcMain.on('toggle-app', () => {
-		if (mainWindow.isVisible()) {
-			mainWindow.hide();
-		} else {
-			mainWindow.show();
-		}
-	});
-
-	ipcMain.on('toggle-badge-option', () => {
-		BadgeSettings.updateBadge(badgeCount, mainWindow);
-	});
-
-	ipcMain.on('update-badge', (event, messageCount) => {
-		badgeCount = messageCount;
-		BadgeSettings.updateBadge(badgeCount, mainWindow);
-		page.send('tray', messageCount);
-	});
-
-	ipcMain.on('update-taskbar-icon', (event, data, text) => {
-		BadgeSettings.updateTaskbarIcon(data, text, mainWindow);
-	});
-
-	ipcMain.on('forward-message', (event, listener, ...params) => {
-		page.send(listener, ...params);
-	});
-
-	ipcMain.on('update-menu', (event, props) => {
-		appMenu.setMenu(props);
-	});
-
-	ipcMain.on('register-server-tab-shortcut', (event, index) => {
-		// Array index == Shown index - 1
-		page.send('switch-server-tab', index - 1);
-	});
-
-	ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
-		setAutoLaunch(AutoLaunchValue);
-	});
-});
-
-app.on('before-quit', () => {
-	isQuitting = true;
-});
-
-// Send crash reports
-process.on('uncaughtException', err => {
-	console.error(err);
-	console.error(err.stack);
-});

app/main/index.ts

@@ -0,0 +1,375 @@
+'use strict';
+import { sentryInit } from '../renderer/js/utils/sentry-util';
+import { appUpdater } from './autoupdater';
+import { setAutoLaunch } from './startup';
+
+import windowStateKeeper = require('electron-window-state');
+import path = require('path');
+import fs = require('fs');
+import isDev = require('electron-is-dev');
+import electron = require('electron');
+const { app, ipcMain } = electron;
+
+import AppMenu = require('./menu');
+import BadgeSettings = require('../renderer/js/pages/preference/badge-settings');
+import ConfigUtil = require('../renderer/js/utils/config-util');
+import ProxyUtil = require('../renderer/js/utils/proxy-util');
+
+interface PatchedGlobal extends NodeJS.Global {
+	mainWindowState: windowStateKeeper.State;
+}
+
+const globalPatched = global as PatchedGlobal;
+
+// Adds debug features like hotkeys for triggering dev tools and reload
+// in development mode
+if (isDev) {
+	require('electron-debug')();
+}
+
+// Prevent window being garbage collected
+let mainWindow: Electron.BrowserWindow;
+let badgeCount: number;
+
+let isQuitting = false;
+
+// Load this url in main window
+const mainURL = 'file://' + path.join(__dirname, '../renderer', 'main.html');
+
+const singleInstanceLock = app.requestSingleInstanceLock();
+if (singleInstanceLock) {
+	app.on('second-instance', () => {
+		if (mainWindow) {
+			if (mainWindow.isMinimized()) {
+				mainWindow.restore();
+			}
+
+			mainWindow.show();
+		}
+	});
+} else {
+	app.quit();
+}
+
+const APP_ICON = path.join(__dirname, '../resources', 'Icon');
+
+const iconPath = (): string => {
+	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
+};
+
+function createMainWindow(): Electron.BrowserWindow {
+	// Load the previous state with fallback to defaults
+	const mainWindowState: windowStateKeeper.State = windowStateKeeper({
+		defaultWidth: 1100,
+		defaultHeight: 720,
+		path: `${app.getPath('userData')}/config`
+	});
+
+	// Let's keep the window position global so that we can access it in other process
+	globalPatched.mainWindowState = mainWindowState;
+
+	const win = new electron.BrowserWindow({
+		// This settings needs to be saved in config
+		title: 'Zulip',
+		icon: iconPath(),
+		x: mainWindowState.x,
+		y: mainWindowState.y,
+		width: mainWindowState.width,
+		height: mainWindowState.height,
+		minWidth: 300,
+		minHeight: 400,
+		webPreferences: {
+			plugins: true,
+			nodeIntegration: true,
+			partition: 'persist:webviewsession'
+		},
+		show: false
+	});
+
+	win.on('focus', () => {
+		win.webContents.send('focus');
+	});
+
+	win.loadURL(mainURL);
+
+	// Keep the app running in background on close event
+	win.on('close', e => {
+		if (!isQuitting) {
+			e.preventDefault();
+
+			if (process.platform === 'darwin') {
+				app.hide();
+			} else {
+				win.hide();
+			}
+		}
+	});
+
+	win.setTitle('Zulip');
+
+	win.on('enter-full-screen', () => {
+		win.webContents.send('enter-fullscreen');
+	});
+
+	win.on('leave-full-screen', () => {
+		win.webContents.send('leave-fullscreen');
+	});
+
+	//  To destroy tray icon when navigate to a new URL
+	win.webContents.on('will-navigate', e => {
+		if (e) {
+			win.webContents.send('destroytray');
+		}
+	});
+
+	// Let us register listeners on the window, so we can update the state
+	// automatically (the listeners will be removed when the window is closed)
+	// and restore the maximized or full screen state
+	mainWindowState.manage(win);
+
+	return win;
+}
+
+// Decrease load on GPU (experimental)
+app.disableHardwareAcceleration();
+
+// Temporary fix for Electron render colors differently
+// More info here - https://github.com/electron/electron/issues/10732
+app.commandLine.appendSwitch('force-color-profile', 'srgb');
+
+// eslint-disable-next-line max-params
+app.on('certificate-error', (event: Event, _webContents: Electron.WebContents, _url: string, _error: string, _certificate: any, callback) => {
+	event.preventDefault();
+	callback(true);
+});
+
+app.on('activate', () => {
+	if (!mainWindow) {
+		mainWindow = createMainWindow();
+	}
+});
+
+app.on('ready', () => {
+	AppMenu.setMenu({
+		tabs: []
+	});
+	mainWindow = createMainWindow();
+
+	// Auto-hide menu bar on Windows + Linux
+	if (process.platform !== 'darwin') {
+		const shouldHideMenu = ConfigUtil.getConfigItem('autoHideMenubar') || false;
+		mainWindow.setAutoHideMenuBar(shouldHideMenu);
+		mainWindow.setMenuBarVisibility(!shouldHideMenu);
+	}
+
+	// Initialize sentry for main process
+	const errorReporting = ConfigUtil.getConfigItem('errorReporting');
+	if (errorReporting) {
+		sentryInit();
+	}
+
+	const isSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
+
+	if (isSystemProxy) {
+		ProxyUtil.resolveSystemProxy(mainWindow);
+	}
+
+	const page = mainWindow.webContents;
+
+	page.on('dom-ready', () => {
+		if (ConfigUtil.getConfigItem('startMinimized')) {
+			mainWindow.hide();
+		} else {
+			mainWindow.show();
+		}
+	});
+
+	page.once('did-frame-finish-load', () => {
+		// Initiate auto-updates on MacOS and Windows
+		if (ConfigUtil.getConfigItem('autoUpdate')) {
+			appUpdater();
+		}
+	});
+
+	// Temporarily remove this event
+	// electron.powerMonitor.on('resume', () => {
+	// 	mainWindow.reload();
+	// 	page.send('destroytray');
+	// });
+
+	ipcMain.on('focus-app', () => {
+		mainWindow.show();
+	});
+
+	ipcMain.on('quit-app', () => {
+		app.quit();
+	});
+
+	// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+	// ipcMain.on('pdf-view', (event, url) => {
+	// 	// Paddings for pdfWindow so that it fits into the main browserWindow
+	// 	const paddingWidth = 55;
+	// 	const paddingHeight = 22;
+
+	// 	// Get the config of main browserWindow
+	// 	const mainWindowState = global.mainWindowState;
+
+	// 	// Window to view the pdf file
+	// 	const pdfWindow = new electron.BrowserWindow({
+	// 		x: mainWindowState.x + paddingWidth,
+	// 		y: mainWindowState.y + paddingHeight,
+	// 		width: mainWindowState.width - paddingWidth,
+	// 		height: mainWindowState.height - paddingHeight,
+	// 		webPreferences: {
+	// 			plugins: true,
+	// 			partition: 'persist:webviewsession'
+	// 		}
+	// 	});
+	// 	pdfWindow.loadURL(url);
+
+	// 	// We don't want to have the menu bar in pdf window
+	// 	pdfWindow.setMenu(null);
+	// });
+
+	// Reload full app not just webview, useful in debugging
+	ipcMain.on('reload-full-app', () => {
+		mainWindow.reload();
+		page.send('destroytray');
+	});
+
+	ipcMain.on('clear-app-settings', () => {
+		globalPatched.mainWindowState.unmanage();
+		app.relaunch();
+		app.exit();
+	});
+
+	ipcMain.on('toggle-app', () => {
+		if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
+			mainWindow.show();
+		} else {
+			mainWindow.hide();
+		}
+	});
+
+	ipcMain.on('toggle-badge-option', () => {
+		BadgeSettings.updateBadge(badgeCount, mainWindow);
+	});
+
+	ipcMain.on('toggle-menubar', (_event: Electron.IpcMessageEvent, showMenubar: boolean) => {
+		mainWindow.setAutoHideMenuBar(showMenubar);
+		mainWindow.setMenuBarVisibility(!showMenubar);
+		page.send('toggle-autohide-menubar', showMenubar, true);
+	});
+
+	ipcMain.on('update-badge', (_event: Electron.IpcMessageEvent, messageCount: number) => {
+		badgeCount = messageCount;
+		BadgeSettings.updateBadge(badgeCount, mainWindow);
+		page.send('tray', messageCount);
+	});
+
+	ipcMain.on('update-taskbar-icon', (_event: Electron.IpcMessageEvent, data: any, text: string) => {
+		BadgeSettings.updateTaskbarIcon(data, text, mainWindow);
+	});
+
+	ipcMain.on('forward-message', (_event: Electron.IpcMessageEvent, listener: any, ...params: any[]) => {
+		page.send(listener, ...params);
+	});
+
+	ipcMain.on('update-menu', (_event: Electron.IpcMessageEvent, props: any) => {
+		AppMenu.setMenu(props);
+		const activeTab = props.tabs[props.activeTabIndex];
+		if (activeTab) {
+			mainWindow.setTitle(`Zulip - ${activeTab.webview.props.name}`);
+		}
+	});
+
+	ipcMain.on('toggleAutoLauncher', (_event: Electron.IpcMessageEvent, AutoLaunchValue: boolean) => {
+		setAutoLaunch(AutoLaunchValue);
+	});
+
+	ipcMain.on('downloadFile', (_event: Electron.IpcMessageEvent, url: string, downloadPath: string) => {
+		page.downloadURL(url);
+		page.session.once('will-download', (_event: Event, item) => {
+			const filePath = path.join(downloadPath, item.getFilename());
+
+			const getTimeStamp = (): any => {
+				const date = new Date();
+				return date.getTime();
+			};
+
+			const formatFile = (filePath: string): string => {
+				const fileExtension = path.extname(filePath);
+				const baseName = path.basename(filePath, fileExtension);
+				return `${baseName}-${getTimeStamp()}${fileExtension}`;
+			};
+
+			// Update the name and path of the file if it already exists
+
+			const updatedFilePath = path.join(downloadPath, formatFile(filePath));
+
+			const setFilePath = fs.existsSync(filePath) ? updatedFilePath : filePath;
+
+			item.setSavePath(setFilePath);
+
+			item.on('updated', (_event: Event, state) => {
+				switch (state) {
+					case 'interrupted': {
+						// Can interrupted to due to network error, cancel download then
+						console.log('Download interrupted, cancelling and fallback to dialog download.');
+						item.cancel();
+						break;
+					}
+					case 'progressing': {
+						if (item.isPaused()) {
+							item.cancel();
+						}
+						// This event can also be used to show progress in percentage in future.
+						break;
+					}
+					default: {
+						console.info('Unknown updated state of download item');
+					}
+				}
+			});
+			item.once('done', (_event: Event, state) => {
+				const getFileName = fs.existsSync(filePath) ? formatFile(filePath) : item.getFilename();
+				if (state === 'completed') {
+					page.send('downloadFileCompleted', item.getSavePath(), getFileName);
+				} else {
+					console.log('Download failed state: ', state);
+					page.send('downloadFileFailed');
+				}
+				// To stop item for listening to updated events of this file
+				item.removeAllListeners('updated');
+			});
+		});
+	});
+
+	ipcMain.on('realm-name-changed', (_event: Electron.IpcMessageEvent, serverURL: string, realmName: string) => {
+		page.send('update-realm-name', serverURL, realmName);
+	});
+
+	ipcMain.on('realm-icon-changed', (_event: Electron.IpcMessageEvent, serverURL: string, iconURL: string) => {
+		page.send('update-realm-icon', serverURL, iconURL);
+	});
+
+	// Using event.sender.send instead of page.send here to
+	// make sure the value of errorReporting is sent only once on load.
+	ipcMain.on('error-reporting', (event: Electron.IpcMessageEvent) => {
+		event.sender.send('error-reporting-val', errorReporting);
+	});
+
+	ipcMain.on('save-last-tab', (_event: Electron.IpcMessageEvent, index: number) => {
+		ConfigUtil.setConfigItem('lastActiveTab', index);
+	});
+});
+
+app.on('before-quit', () => {
+	isQuitting = true;
+});
+
+// Send crash reports
+process.on('uncaughtException', err => {
+	console.error(err);
+	console.error(err.stack);
+});

app/main/linuxupdater.ts

@@ -0,0 +1,48 @@
+import { app, Notification } from 'electron';
+
+import request = require('request');
+import semver = require('semver');
+import ConfigUtil = require('../renderer/js/utils/config-util');
+import ProxyUtil = require('../renderer/js/utils/proxy-util');
+import LinuxUpdateUtil = require('../renderer/js/utils/linux-update-util');
+import Logger = require('../renderer/js/utils/logger-util');
+
+const logger = new Logger({
+	file: 'linux-update-util.log',
+	timestamp: true
+});
+
+export function linuxUpdateNotification(): void {
+	let	url = 'https://api.github.com/repos/zulip/zulip-desktop/releases';
+	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
+	const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
+
+	const options = {
+		url,
+		headers: {'User-Agent': 'request'},
+		proxy: proxyEnabled ? ProxyUtil.getProxy(url) : '',
+		ecdhCurve: 'auto'
+	};
+
+	request(options, (error: any, response: any, body: any) => {
+		if (error) {
+			logger.error('Linux update error.');
+			logger.error(error);
+			return;
+		}
+		if (response.statusCode < 400) {
+			const data = JSON.parse(body);
+			const latestVersion = ConfigUtil.getConfigItem('betaUpdate') ? data[0].tag_name : data.tag_name;
+
+			if (semver.gt(latestVersion, app.getVersion())) {
+				const notified = LinuxUpdateUtil.getUpdateItem(latestVersion);
+				if (notified === null) {
+					new Notification({title: 'Zulip Update', body: 'A new version ' + latestVersion + ' is available. Please update using your package manager.'}).show();
+					LinuxUpdateUtil.setUpdateItem(latestVersion, true);
+				}
+			}
+		} else {
+			logger.log('Linux update response status: ', response.statusCode);
+		}
+	});
+}

app/main/menu.js

@@ -1,397 +0,0 @@
-'use strict';
-const os = require('os');
-const path = require('path');
-
-const { app, shell, BrowserWindow, Menu } = require('electron');
-
-const fs = require('fs-extra');
-
-const ConfigUtil = require(__dirname + '/../renderer/js/utils/config-util.js');
-
-const appName = app.getName();
-
-class AppMenu {
-	getHistorySubmenu() {
-		return [{
-			label: 'Back',
-			accelerator: process.platform === 'darwin' ? 'Command+Left' : 'Alt+Left',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('back');
-				}
-			}
-		}, {
-			label: 'Forward',
-			accelerator: process.platform === 'darwin' ? 'Command+Right' : 'Alt+Right',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('forward');
-				}
-			}
-		}];
-	}
-
-	getViewSubmenu() {
-		return [{
-			label: 'Reload',
-			accelerator: 'CommandOrControl+R',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('reload-current-viewer');
-				}
-			}
-		}, {
-			label: 'Hard Reload',
-			accelerator: 'CommandOrControl+Shift+R',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('hard-reload');
-				}
-			}
-		}, {
-			type: 'separator'
-		}, {
-			role: 'togglefullscreen'
-		}, {
-			label: 'Zoom In',
-			accelerator: 'CommandOrControl+Plus',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('zoomIn');
-				}
-			}
-		}, {
-			label: 'Zoom Out',
-			accelerator: 'CommandOrControl+-',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('zoomOut');
-				}
-			}
-		}, {
-			label: 'Actual Size',
-			accelerator: 'CommandOrControl+0',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('zoomActualSize');
-				}
-			}
-		}, {
-			type: 'separator'
-		}, {
-			label: 'Toggle Tray Icon',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					focusedWindow.webContents.send('toggletray');
-				}
-			}
-		}, {
-			label: 'Toggle Sidebar',
-			accelerator: 'CommandOrControl+S',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					const newValue = !ConfigUtil.getConfigItem('showSidebar');
-					focusedWindow.webContents.send('toggle-sidebar', newValue);
-					ConfigUtil.setConfigItem('showSidebar', newValue);
-				}
-			}
-		}, {
-			label: 'Toggle DevTools for Zulip App',
-			accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					focusedWindow.webContents.toggleDevTools();
-				}
-			}
-		}, {
-			label: 'Toggle DevTools for Active Tab',
-			accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('tab-devtools');
-				}
-			}
-		}];
-	}
-
-	getHelpSubmenu() {
-		return [{
-			label: `${appName} Website`,
-			click() {
-				shell.openExternal('https://zulipchat.com/help/');
-			}
-		}, {
-			label: `${appName + 'Desktop'} - ${app.getVersion()}`,
-			enabled: false
-		}, {
-			label: 'Report an Issue...',
-			click() {
-				const body = `
-					<!-- Please succinctly describe your issue and steps to reproduce it. -->
-					-
-					${app.getName()} ${app.getVersion()}
-					Electron ${process.versions.electron}
-					${process.platform} ${process.arch} ${os.release()}`;
-				shell.openExternal(`https://github.com/zulip/zulip-electron/issues/new?body=${encodeURIComponent(body)}`);
-			}
-		}];
-	}
-
-	getWindowSubmenu(tabs, activeTabIndex) {
-		const initialSubmenu = [{
-			role: 'minimize'
-		}, {
-			role: 'close'
-		}];
-
-		if (tabs.length > 0) {
-			const ShortcutKey = process.platform === 'darwin' ? 'Cmd' : 'Ctrl';
-			initialSubmenu.push({
-				type: 'separator'
-			});
-			for (let i = 0; i < tabs.length; i++) {
-				initialSubmenu.push({
-					label: tabs[i].webview.props.name,
-					accelerator: tabs[i].props.role === 'function' ? '' : `${ShortcutKey} + ${tabs[i].props.index + 1}`,
-					checked: tabs[i].props.index === activeTabIndex,
-					click(item, focusedWindow) {
-						if (focusedWindow) {
-							AppMenu.sendAction('switch-server-tab', tabs[i].props.index);
-						}
-					},
-					type: 'radio'
-				});
-			}
-		}
-
-		return initialSubmenu;
-	}
-
-	getDarwinTpl(props) {
-		const { tabs, activeTabIndex } = props;
-
-		return [{
-			label: `${app.getName()}`,
-			submenu: [{
-				label: 'About Zulip',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('open-about');
-					}
-				}
-			}, {
-				type: 'separator'
-			}, {
-				label: 'Settings',
-				accelerator: 'Cmd+,',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('open-settings');
-					}
-				}
-			}, {
-				label: 'Keyboard Shortcuts',
-				accelerator: 'Cmd+K',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('shortcut');
-					}
-				}
-			}, {
-				type: 'separator'
-			}, {
-				label: 'Reset App Settings',
-				accelerator: 'Command+Shift+D',
-				click() {
-					AppMenu.resetAppSettings();
-				}
-			}, {
-				label: 'Log Out',
-				accelerator: 'Cmd+L',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('log-out');
-					}
-				}
-			}, {
-				type: 'separator'
-			}, {
-				role: 'services',
-				submenu: []
-			}, {
-				type: 'separator'
-			}, {
-				role: 'hide'
-			}, {
-				role: 'hideothers'
-			}, {
-				role: 'unhide'
-			}, {
-				type: 'separator'
-			}, {
-				role: 'quit'
-			}]
-		}, {
-			label: 'Edit',
-			submenu: [{
-				role: 'undo'
-			}, {
-				role: 'redo'
-			}, {
-				type: 'separator'
-			}, {
-				role: 'cut'
-			}, {
-				role: 'copy'
-			}, {
-				role: 'paste'
-			}, {
-				role: 'pasteandmatchstyle'
-			}, {
-				role: 'delete'
-			}, {
-				role: 'selectall'
-			}]
-		}, {
-			label: 'View',
-			submenu: this.getViewSubmenu()
-		}, {
-			label: 'History',
-			submenu: this.getHistorySubmenu()
-		}, {
-			label: 'Window',
-			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
-		}, {
-			role: 'help',
-			submenu: this.getHelpSubmenu()
-		}];
-	}
-
-	getOtherTpl(props) {
-		const { tabs, activeTabIndex } = props;
-
-		return [{
-			label: 'File',
-			submenu: [{
-				label: 'About Zulip',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('open-about');
-					}
-				}
-			}, {
-				type: 'separator'
-			}, {
-				label: 'Settings',
-				accelerator: 'Ctrl+,',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('open-settings');
-					}
-				}
-			}, {
-				type: 'separator'
-			}, {
-				label: 'Keyboard Shortcuts',
-				accelerator: 'Ctrl+K',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('shortcut');
-					}
-				}
-			}, {
-				type: 'separator'
-			}, {
-				label: 'Reset App Settings',
-				accelerator: 'Ctrl+Shift+D',
-				click() {
-					AppMenu.resetAppSettings();
-				}
-			}, {
-				label: 'Log Out',
-				accelerator: 'Ctrl+L',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('log-out');
-					}
-				}
-			}, {
-				type: 'separator'
-			}, {
-				role: 'quit',
-				accelerator: 'Ctrl+Q'
-			}]
-		}, {
-			label: 'Edit',
-			submenu: [{
-				role: 'undo'
-			}, {
-				role: 'redo'
-			}, {
-				type: 'separator'
-			}, {
-				role: 'cut'
-			}, {
-				role: 'copy'
-			}, {
-				role: 'paste'
-			}, {
-				role: 'pasteandmatchstyle'
-			}, {
-				role: 'delete'
-			}, {
-				type: 'separator'
-			}, {
-				role: 'selectall'
-			}]
-		}, {
-			label: 'View',
-			submenu: this.getViewSubmenu()
-		}, {
-			label: 'History',
-			submenu: this.getHistorySubmenu()
-		}, {
-			label: 'Window',
-			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
-		}, {
-			role: 'help',
-			submenu: this.getHelpSubmenu()
-		}];
-	}
-
-	static sendAction(action, ...params) {
-		const win = BrowserWindow.getAllWindows()[0];
-
-		if (process.platform === 'darwin') {
-			win.restore();
-		}
-
-		win.webContents.send(action, ...params);
-	}
-
-	static resetAppSettings() {
-		// We save App's settings/configurations in following files
-		const settingFiles = ['window-state.json', 'domain.json', 'settings.json'];
-
-		settingFiles.forEach(settingFileName => {
-			const getSettingFilesPath = path.join(app.getPath('appData'), appName, settingFileName);
-			fs.access(getSettingFilesPath, error => {
-				if (error) {
-					console.log(error);
-				} else {
-					fs.unlink(getSettingFilesPath, () => {
-						AppMenu.sendAction('clear-app-data');
-					});
-				}
-			});
-		});
-	}
-
-	setMenu(props) {
-		const tpl = process.platform === 'darwin' ? this.getDarwinTpl(props) : this.getOtherTpl(props);
-		const menu = Menu.buildFromTemplate(tpl);
-		Menu.setApplicationMenu(menu);
-	}
-}
-
-module.exports = new AppMenu();

app/main/menu.ts

@@ -0,0 +1,601 @@
+'use strict';
+import { app, shell, BrowserWindow, Menu, dialog } from 'electron';
+import { appUpdater } from './autoupdater';
+
+import AdmZip = require('adm-zip');
+import fs = require('fs-extra');
+import path = require('path');
+import DNDUtil = require('../renderer/js/utils/dnd-util');
+import Logger = require('../renderer/js/utils/logger-util');
+import ConfigUtil = require('../renderer/js/utils/config-util');
+import t = require('../renderer/js/utils/translation-util');
+
+const appName = app.getName();
+
+const logger = new Logger({
+	file: 'errors.log',
+	timestamp: true
+});
+
+class AppMenu {
+	getHistorySubmenu(enableMenu: boolean): Electron.MenuItemConstructorOptions[] {
+		return [{
+			label: t.__('Back'),
+			accelerator: process.platform === 'darwin' ? 'Command+Left' : 'Alt+Left',
+			enabled: enableMenu,
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					AppMenu.sendAction('back');
+				}
+			}
+		}, {
+			label: t.__('Forward'),
+			accelerator: process.platform === 'darwin' ? 'Command+Right' : 'Alt+Right',
+			enabled: enableMenu,
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					AppMenu.sendAction('forward');
+				}
+			}
+		}];
+	}
+
+	getToolsSubmenu(): Electron.MenuItemConstructorOptions[] {
+		return [{
+			label: t.__(`Check for Updates`),
+			click() {
+				AppMenu.checkForUpdate();
+			}
+		},
+		{
+			label: t.__(`Release Notes`),
+			click() {
+				shell.openExternal(`https://github.com/zulip/zulip-desktop/releases/tag/v${app.getVersion()}`);
+			}
+		},
+		{
+			type: 'separator'
+		},
+		{
+			label: t.__('Factory Reset'),
+			accelerator: process.platform === 'darwin' ? 'Command+Shift+D' : 'Ctrl+Shift+D',
+			click() {
+				AppMenu.resetAppSettings();
+			}
+		},
+		{
+			label: t.__('Download App Logs'),
+			click() {
+				const zip = new AdmZip();
+				const date = new Date();
+				const dateString = date.toLocaleDateString().replace(/\//g, '-');
+
+				// Create a zip file of all the logs and config data
+				zip.addLocalFolder(`${app.getPath('appData')}/${appName}/Logs`);
+				zip.addLocalFolder(`${app.getPath('appData')}/${appName}/config`);
+
+				// Put the log file in downloads folder
+				const logFilePath = `${app.getPath('downloads')}/Zulip-logs-${dateString}.zip`;
+				zip.writeZip(logFilePath);
+
+				// Open and select the log file
+				shell.showItemInFolder(logFilePath);
+			}
+		},
+		{
+			type: 'separator'
+		},
+		{
+			label: t.__('Toggle DevTools for Zulip App'),
+			accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					focusedWindow.webContents.openDevTools({mode: 'undocked'});
+				}
+			}
+		},
+		{
+			label: t.__('Toggle DevTools for Active Tab'),
+			accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					AppMenu.sendAction('tab-devtools');
+				}
+			}
+		}];
+	}
+
+	getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
+		return [{
+			label: t.__('Reload'),
+			accelerator: 'CommandOrControl+R',
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					AppMenu.sendAction('reload-current-viewer');
+				}
+			}
+		}, {
+			label: t.__('Hard Reload'),
+			accelerator: 'CommandOrControl+Shift+R',
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					AppMenu.sendAction('hard-reload');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Toggle Full Screen'),
+			role: 'togglefullscreen'
+		}, {
+			label: t.__('Zoom In'),
+			role: 'zoomin',
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					AppMenu.sendAction('zoomIn');
+				}
+			}
+		}, {
+			label: t.__('Zoom Out'),
+			accelerator: 'CommandOrControl+-',
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					AppMenu.sendAction('zoomOut');
+				}
+			}
+		}, {
+			label: t.__('Actual Size'),
+			accelerator: 'CommandOrControl+0',
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					AppMenu.sendAction('zoomActualSize');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Toggle Tray Icon'),
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					focusedWindow.webContents.send('toggletray');
+				}
+			}
+		}, {
+			label: t.__('Toggle Sidebar'),
+			accelerator: 'CommandOrControl+Shift+S',
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					const newValue = !ConfigUtil.getConfigItem('showSidebar');
+					focusedWindow.webContents.send('toggle-sidebar', newValue);
+					ConfigUtil.setConfigItem('showSidebar', newValue);
+				}
+			}
+		}, {
+			label: t.__('Auto hide Menu bar'),
+			checked: ConfigUtil.getConfigItem('autoHideMenubar', false),
+			visible: process.platform !== 'darwin',
+			click(_item: any, focusedWindow: any) {
+				if (focusedWindow) {
+					const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
+					focusedWindow.setAutoHideMenuBar(newValue);
+					focusedWindow.setMenuBarVisibility(!newValue);
+					focusedWindow.webContents.send('toggle-autohide-menubar', newValue);
+					ConfigUtil.setConfigItem('autoHideMenubar', newValue);
+				}
+			},
+			type: 'checkbox'
+		}];
+	}
+
+	getHelpSubmenu(): Electron.MenuItemConstructorOptions[] {
+		return [
+			{
+				label: `${appName + ' Desktop'} v${app.getVersion()}`,
+				enabled: false
+			},
+			{
+				label: t.__('About Zulip'),
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-about');
+					}
+				}
+			},
+			{
+				label: t.__(`Help Center`),
+				click(focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-help');
+					}
+				}
+			},
+			{
+				label: t.__('Report an Issue'),
+				click() {
+					// the goal is to notify the main.html BrowserWindow
+					// which may not be the focused window.
+					BrowserWindow.getAllWindows().forEach(window => {
+						window.webContents.send('open-feedback-modal');
+					});
+				}
+			}
+		];
+	}
+
+	getWindowSubmenu(tabs: any[], activeTabIndex: number, enableMenu: boolean): Electron.MenuItemConstructorOptions[] {
+		const initialSubmenu: any[] = [{
+			label: t.__('Minimize'),
+			role: 'minimize'
+		}, {
+			label: t.__('Close'),
+			role: 'close'
+		}];
+
+		if (tabs.length > 0) {
+			const ShortcutKey = process.platform === 'darwin' ? 'Cmd' : 'Ctrl';
+			initialSubmenu.push({
+				type: 'separator'
+			});
+			tabs.forEach(tab => {
+				// Do not add functional tab settings to list of windows in menu bar
+				if (tab.props.role === 'function' && tab.props.name === 'Settings') {
+					return;
+				}
+
+				initialSubmenu.push({
+					label: tab.props.name,
+					accelerator: tab.props.role === 'function' ? '' : `${ShortcutKey} + ${tab.props.index + 1}`,
+					checked: tab.props.index === activeTabIndex,
+					click(_item: any, focusedWindow: any) {
+						if (focusedWindow) {
+							AppMenu.sendAction('switch-server-tab', tab.props.index);
+						}
+					},
+					type: 'checkbox'
+				});
+			});
+			initialSubmenu.push({
+				type: 'separator'
+			});
+			initialSubmenu.push({
+				label: t.__('Switch to Next Organization'),
+				accelerator: `Ctrl+Tab`,
+				enabled: tabs.length > 1,
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('switch-server-tab', AppMenu.getNextServer(tabs, activeTabIndex));
+					}
+				}
+			}, {
+				label: t.__('Switch to Previous Organization'),
+				accelerator: `Ctrl+Shift+Tab`,
+				enabled: tabs.length > 1,
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('switch-server-tab', AppMenu.getPreviousServer(tabs, activeTabIndex));
+					}
+				}
+			});
+		}
+
+		return initialSubmenu;
+	}
+
+	getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
+		const { tabs, activeTabIndex, enableMenu } = props;
+
+		return [{
+			label: `${app.getName()}`,
+			submenu: [{
+				label: t.__('Add Organization'),
+				accelerator: 'Cmd+Shift+N',
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('new-server');
+					}
+				}
+			}, {
+				label: t.__('Toggle Do Not Disturb'),
+				accelerator: 'Cmd+Shift+M',
+				click() {
+					const dndUtil = DNDUtil.toggle();
+					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+				}
+			}, {
+				label: t.__('Desktop Settings'),
+				accelerator: 'Cmd+,',
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-settings');
+					}
+				}
+			}, {
+				label: t.__('Keyboard Shortcuts'),
+				accelerator: 'Cmd+Shift+K',
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('shortcut');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Copy Zulip URL'),
+				accelerator: 'Cmd+Shift+C',
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('copy-zulip-url');
+					}
+				}
+			}, {
+				label: t.__('Log Out of Organization'),
+				accelerator: 'Cmd+L',
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('log-out');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Services'),
+				role: 'services',
+				submenu: []
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Hide'),
+				role: 'hide'
+			}, {
+				label: t.__('Hide Others'),
+				role: 'hideothers'
+			}, {
+				label: t.__('Unhide'),
+				role: 'unhide'
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Minimize'),
+				role: 'minimize'
+			}, {
+				label: t.__('Close'),
+				role: 'close'
+			}, {
+				label: t.__('Quit'),
+				role: 'quit'
+			}]
+		}, {
+			label: t.__('Edit'),
+			submenu: [{
+				label: t.__('Undo'),
+				role: 'undo'
+			}, {
+				label: t.__('Redo'),
+				role: 'redo'
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Cut'),
+				role: 'cut'
+			}, {
+				label: t.__('Copy'),
+				role: 'copy'
+			}, {
+				label: t.__('Paste'),
+				role: 'paste'
+			}, {
+				label: t.__('Paste and Match Style'),
+				role: 'pasteandmatchstyle'
+			}, {
+				label: t.__('Select All'),
+				role: 'selectall'
+			}]
+		}, {
+			label: t.__('View'),
+			submenu: this.getViewSubmenu()
+		}, {
+			label: t.__('History'),
+			submenu: this.getHistorySubmenu(enableMenu)
+		}, {
+			label: t.__('Window'),
+			submenu: this.getWindowSubmenu(tabs, activeTabIndex, enableMenu)
+		}, {
+			label: t.__('Tools'),
+			submenu: this.getToolsSubmenu()
+		}, {
+			label: t.__('Help'),
+			role: 'help',
+			submenu: this.getHelpSubmenu()
+		}];
+	}
+
+	getOtherTpl(props: any): Electron.MenuItemConstructorOptions[] {
+		const { tabs, activeTabIndex, enableMenu } = props;
+		return [{
+			label: t.__('File'),
+			submenu: [{
+				label: t.__('Add Organization'),
+				accelerator: 'Ctrl+Shift+N',
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('new-server');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Toggle Do Not Disturb'),
+				accelerator: 'Ctrl+Shift+M',
+				click() {
+					const dndUtil = DNDUtil.toggle();
+					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+				}
+			}, {
+				label: t.__('Desktop Settings'),
+				accelerator: 'Ctrl+,',
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-settings');
+					}
+				}
+			}, {
+				label: t.__('Keyboard Shortcuts'),
+				accelerator: 'Ctrl+Shift+K',
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('shortcut');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Copy Zulip URL'),
+				accelerator: 'Ctrl+Shift+C',
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('copy-zulip-url');
+					}
+				}
+			}, {
+				label: t.__('Log Out of Organization'),
+				accelerator: 'Ctrl+L',
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
+					if (focusedWindow) {
+						AppMenu.sendAction('log-out');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Minimize'),
+				role: 'minimize'
+			}, {
+				label: t.__('Close'),
+				role: 'close'
+			}, {
+				label: t.__('Quit'),
+				role: 'quit',
+				accelerator: 'Ctrl+Q'
+			}]
+		}, {
+			label: t.__('Edit'),
+			submenu: [{
+				label: t.__('Undo'),
+				role: 'undo'
+			}, {
+				label: t.__('Redo'),
+				role: 'redo'
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Cut'),
+				role: 'cut'
+			}, {
+				label: t.__('Copy'),
+				role: 'copy'
+			}, {
+				label: t.__('Paste'),
+				role: 'paste'
+			}, {
+				label: t.__('Paste and Match Style'),
+				role: 'pasteandmatchstyle'
+			}, {
+				type: 'separator'
+			}, {
+				label: t.__('Select All'),
+				role: 'selectall'
+			}]
+		}, {
+			label: t.__('View'),
+			submenu: this.getViewSubmenu()
+		}, {
+			label: t.__('History'),
+			submenu: this.getHistorySubmenu(enableMenu)
+		}, {
+			label: t.__('Window'),
+			submenu: this.getWindowSubmenu(tabs, activeTabIndex, enableMenu)
+		}, {
+			label: t.__('Tools'),
+			submenu: this.getToolsSubmenu()
+		}, {
+			label: t.__('Help'),
+			role: 'help',
+			submenu: this.getHelpSubmenu()
+		}];
+	}
+
+	static sendAction(action: any, ...params: any[]): void {
+		const win = BrowserWindow.getAllWindows()[0];
+
+		if (process.platform === 'darwin') {
+			win.restore();
+		}
+
+		win.webContents.send(action, ...params);
+	}
+
+	static checkForUpdate(): void {
+		appUpdater(true);
+	}
+
+	static getNextServer(tabs: any[], activeTabIndex: number): number {
+		do {
+			activeTabIndex = (activeTabIndex + 1) % tabs.length;
+		}
+		while (tabs[activeTabIndex].props.role !== 'server');
+		return activeTabIndex;
+	}
+
+	static getPreviousServer(tabs: any[], activeTabIndex: number): number {
+		do {
+			activeTabIndex = (activeTabIndex - 1 + tabs.length) % tabs.length;
+		}
+		while (tabs[activeTabIndex].props.role !== 'server');
+		return activeTabIndex;
+	}
+
+	static resetAppSettings(): void {
+		const resetAppSettingsMessage = 'By proceeding you will be removing all connected organizations and preferences from Zulip.';
+
+		// We save App's settings/configurations in following files
+		const settingFiles = ['config/window-state.json', 'config/domain.json', 'config/settings.json', 'config/certificates.json'];
+
+		dialog.showMessageBox({
+			type: 'warning',
+			buttons: ['YES', 'NO'],
+			defaultId: 0,
+			message: 'Are you sure?',
+			detail: resetAppSettingsMessage
+		}, response => {
+			if (response === 0) {
+				settingFiles.forEach(settingFileName => {
+					const getSettingFilesPath = path.join(app.getPath('appData'), appName, settingFileName);
+					fs.access(getSettingFilesPath, (error: any) => {
+						if (error) {
+							logger.error('Error while resetting app settings.');
+							logger.error(error);
+						} else {
+							fs.unlink(getSettingFilesPath, () => {
+								AppMenu.sendAction('clear-app-data');
+							});
+						}
+					});
+				});
+			}
+		});
+	}
+
+	setMenu(props: any): void {
+		const tpl = process.platform === 'darwin' ? this.getDarwinTpl(props) : this.getOtherTpl(props);
+		const menu = Menu.buildFromTemplate(tpl);
+		Menu.setApplicationMenu(menu);
+	}
+}
+
+export = new AppMenu();

app/main/startup.ts

@@ -1,10 +1,11 @@
 'use strict';
-const { app } = require('electron');
-const AutoLaunch = require('auto-launch');
-const isDev = require('electron-is-dev');
-const ConfigUtil = require('./../renderer/js/utils/config-util.js');
+import { app } from 'electron';
 
-const setAutoLaunch = AutoLaunchValue => {
+import AutoLaunch = require('auto-launch');
+import isDev = require('electron-is-dev');
+import ConfigUtil = require('../renderer/js/utils/config-util');
+
+export const setAutoLaunch = (AutoLaunchValue: boolean): void => {
 	// Don't run this in development
 	if (isDev) {
 		return;
@@ -28,7 +29,3 @@ const setAutoLaunch = AutoLaunchValue => {
 		ZulipAutoLauncher.disable();
 	}
 };
-
-module.exports = {
-	setAutoLaunch
-};

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "1.7.0",
+  "version": "4.0.0",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
   "copyright": "Kandra Labs, Inc.",
@@ -11,10 +11,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/zulip/zulip-electron.git"
+    "url": "https://github.com/zulip/zulip-desktop.git"
   },
   "bugs": {
-    "url": "https://github.com/zulip/zulip-electron/issues"
+    "url": "https://github.com/zulip/zulip-desktop/issues"
   },
   "main": "main/index.js",
   "keywords": [
@@ -26,14 +26,25 @@
     "InstantMessaging"
   ],
   "dependencies": {
-    "auto-launch": "5.0.1",
+    "@electron-elements/send-feedback": "1.0.8",
+    "@sentry/electron": "0.14.0",
+    "adm-zip": "0.4.11",
+    "auto-launch": "5.0.5",
+    "dotenv": "8.0.0",
     "electron-is-dev": "0.3.0",
-    "electron-log": "2.2.7",
+    "electron-log": "2.2.14",
     "electron-spellchecker": "1.1.2",
-    "electron-window-state": "4.1.1",
-    "electron-updater": "2.16.2",
-    "node-json-db": "0.7.3",
-    "request": "2.81.0",
+    "electron-updater": "4.0.6",
+    "electron-window-state": "5.0.3",
+    "escape-html": "1.0.3",
+    "i18n": "0.8.3",
+    "is-online": "7.0.0",
+    "node-json-db": "0.9.2",
+    "request": "2.85.0",
+    "semver": "5.4.1",
     "wurl": "2.5.0"
+  },
+  "optionalDependencies": {
+    "node-mac-notifier": "1.1.0"
   }
 }

app/renderer/about.html

@@ -1,45 +1,47 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<meta charset="UTF-8">
-		<link rel="stylesheet" href="css/about.css">
-	</head>
-	<body>
-	<div class="about">
-		<img class="logo" src="../resources/zulip.png" />
-		<p class="detail" id="version">v?.?.?</p>
-		<div class="maintenance-info">
-			<p class="detail maintainer">
-				Maintained by <a onclick="linkInBrowser('website')">Zulip</a>
-			</p>
-			<p class="detail license">
-				Available under the <a onclick="linkInBrowser('license')">Apache 2.0 License</a>
-			</p>
-			<a class="bug" onclick="linkInBrowser('bug')" href="#">Found bug?</a>
-		</div>
-	</div>
-	<script>
 
-	const { app } = require('electron').remote;
-	const { shell } = require('electron');
-	const version_tag = document.querySelector('#version');
-	version_tag.innerHTML = 'v' + app.getVersion();
+    <head>
+        <meta charset="UTF-8">
+        <link rel="stylesheet" href="css/about.css">
+        <title>Zulip - About</title>
+    </head>
 
-	function linkInBrowser(type) {
-		let url;
-		switch (type) {
-			case 'website': 
-				url = "https://zulipchat.com";
-				break;
-			case 'license': 
-				url = "https://github.com/zulip/zulip-electron/blob/master/LICENSE";
-				break;
-			default:
-				url = 'https://github.com/zulip/zulip-electron/issues/new?body=' + 
-				      '%3C!--Please%20describe%20your%20issue%20and%20steps%20to%20reproduce%20it.--%3E';
-		}
-		shell.openExternal(url);
-	}
-	</script>
-	</body>
+    <body>
+        <div class="about">
+            <img class="logo" src="../resources/zulip.png" />
+            <p class="detail" id="version">v?.?.?</p>
+            <div class="maintenance-info">
+                <p class="detail maintainer">
+                    Maintained by
+                    <a onclick="linkInBrowser('website')">Zulip</a>
+                </p>
+                <p class="detail license">
+                    Available under the
+                    <a onclick="linkInBrowser('license')">Apache 2.0 License</a>
+                </p>
+            </div>
+        </div>
+        <script>
+
+            const { app } = require('electron').remote;
+            const { shell } = require('electron');
+            const version_tag = document.querySelector('#version');
+            version_tag.innerHTML = 'v' + app.getVersion();
+
+            function linkInBrowser(type) {
+                let url;
+                switch (type) {
+                    case 'website':
+                        url = "https://zulipchat.com";
+                        break;
+                    case 'license':
+                        url = "https://github.com/zulip/zulip-desktop/blob/master/LICENSE";
+                        break;
+                }
+                shell.openExternal(url);
+            }
+        </script>
+        <script>require('./js/shared/preventdrag.js')</script>
+    </body>
 </html>

app/renderer/css/about.css

@@ -1,82 +1,66 @@
 body {
-	background: #fafafa;
-	font-family: menu, "Helvetica Neue", sans-serif;
-	-webkit-font-smoothing: subpixel-antialiased;
+    background: rgba(250, 250, 250, 1.000);
+    font-family: menu, "Helvetica Neue", sans-serif;
+    -webkit-font-smoothing: subpixel-antialiased;
 }
 
 .logo {
-	display: block;
-	margin: -40px auto;
+    display: block;
+    margin: -40px auto;
 }
 
 #version {
-	color: #444343;
-	font-size: 1.3em;
-	padding-top: 40px;
+    color: rgba(68, 67, 67, 1.000);
+    font-size: 1.3em;
+    padding-top: 40px;
 }
 
 .about {
-	margin: 25vh auto;
-	height: 25vh;
-	text-align: center;
+    margin: 25vh auto;
+    height: 25vh;
+    text-align: center;
 }
 
 .about p {
-	font-size: 20px;
-	color: rgba(0, 0, 0, 0.62);
+    font-size: 20px;
+    color: rgba(0, 0, 0, 0.62);
 }
 
 .about img {
-	width: 150px;
+    width: 150px;
 }
 
 .detail {
-	text-align: center;
+    text-align: center;
 }
 
 .detail.maintainer {
-	font-size: 1.2em;
-	font-weight: 500;
+    font-size: 1.2em;
+    font-weight: 500;
 }
 
 .detail.license {
-	font-size: 0.8em;
+    font-size: 0.8em;
 }
 
 .maintenance-info {
-	cursor: pointer;
-	position: absolute;
-	width: 100%;
-	left: 0px;
-	color: #444;
+    cursor: pointer;
+    position: absolute;
+    width: 100%;
+    left: 0px;
+    color: rgba(68, 68, 68, 1.000);
 }
 
 .maintenance-info p {
-	margin: 0;
-	font-size: 1em;
-	width: 100%;
-}
-
-.maintenance-info .bug {
-	display: inline-block;
-	padding: 8px 15px;
-	margin-top: 30px;
-	text-decoration: none;
-	background-color: #52c2af;
-	color: #fff;
-	border-radius: 4px;
-
-	transition: background-color 0.2s ease;
-}
-
-.maintenance-info .bug:hover {
-	background-color: #32a692;
+    margin: 0;
+    font-size: 1em;
+    width: 100%;
 }
 
 p.detail a {
-	color: #355f4c;
+    color: rgba(53, 95, 76, 1.000);
 }
 
 p.detail a:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }

app/renderer/css/main.css

@@ -13,13 +13,10 @@ body {
 #content {
     display: flex;
     height: 100%;
-    background: #eee url(../img/ic_loading.gif) no-repeat;
-    background-size: 60px 60px;
-    background-position: center;
 }
 
 .toggle-sidebar {
-    background: #222c31;
+    background: rgba(34, 44, 49, 1.000);
     width: 54px;
     padding: 27px 0 20px 0;
     justify-content: space-between;
@@ -28,6 +25,7 @@ body {
     -webkit-app-region: drag;
     overflow: hidden;
     transition: all 0.5s ease;
+    z-index: 2;
 }
 
 .toggle-sidebar div {
@@ -44,6 +42,28 @@ body {
     transition: all 0.6s ease-out;
 }
 
+#view-controls-container {
+    height: calc(100% - 208px);
+    overflow-y: hidden;
+}
+
+#view-controls-container:hover {
+    overflow-y: overlay;
+}
+
+#view-controls-container::-webkit-scrollbar {
+    width: 4px;
+}
+
+#view-controls-container::-webkit-scrollbar-track {
+    box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+}
+
+#view-controls-container::-webkit-scrollbar-thumb {
+    background-color: rgba(169, 169, 169, 1.000);
+    outline: 1px solid rgba(169, 169, 169, 1.000);
+}
+
 @font-face {
     font-family: 'Material Icons';
     font-style: normal;
@@ -81,11 +101,17 @@ body {
     text-rendering: optimizeLegibility;
 }
 
+#actions-container {
+    display: flex;
+    flex-direction: column;
+    position: fixed;
+    bottom: 0;
+}
+
 .action-button {
     display: flex;
     flex-direction: column;
-    align-items: center;
-    padding: 10px;
+    padding: 12px;
 }
 
 .action-button:hover {
@@ -93,16 +119,39 @@ body {
 }
 
 .action-button i {
-    color: #6c8592;
+    color: rgba(108, 133, 146, 1.000);
     font-size: 28px;
 }
 
 .action-button:hover i {
-    color: #98a9b3;
+    color: rgba(152, 169, 179, 1.000);
+}
+
+.action-button.disable {
+    opacity: 0.6;
+}
+
+.action-button.disable:hover {
+    cursor: not-allowed;
+}
+
+.action-button.disable:hover i {
+    color: rgba(108, 133, 146, 1.000);
+}
+
+.action-button.active {
+    /* background-color: rgba(255, 255, 255, 0.25); */
+    background-color: rgba(239, 239, 239, 1.000);
+    opacity: 0.9;
+    padding-right: 14px;
+}
+
+.action-button.active i {
+    color: rgba(28, 38, 43, 1.000);
 }
 
 .tab:first-child {
-    margin-top: 8px;
+    margin-top: 9px;
 }
 
 .tab {
@@ -116,25 +165,33 @@ body {
 }
 
 .tab .server-icons {
-    border-radius: 50%;
-    width: 30px;
-    padding: 3px;
-    height: 30px;
+    width: 35px;
     vertical-align: top;
+    border-radius: 4px;
 }
 
 .tab .server-tab {
     width: 100%;
     height: 35px;
     position: relative;
-    margin: 5px 0 2px 0;
+    margin-top: 5px;
     z-index: 11;
     line-height: 31px;
-    color: #eee;
+    color: rgba(238, 238, 238, 1.000);
     text-align: center;
     overflow: hidden;
     opacity: 0.6;
-    padding: 2px 0;
+    padding: 6px 0;
+}
+
+.server-tab .alt-icon {
+    font-family: Verdana;
+    font-weight: 600;
+    font-size: 22px;
+    border: 2px solid rgba(34, 44, 49, 1.000);
+    margin-left: 17%;
+    width: 35px;
+    border-radius: 4px;
 }
 
 .tab .server-tab:hover {
@@ -159,7 +216,7 @@ body {
 
 .tab.active .server-tab {
     opacity: 1;
-    background-color: #648478;
+    background-color: rgba(100, 132, 120, 1.000);
 }
 
 .tab .server-tab-badge.active {
@@ -167,7 +224,7 @@ body {
     min-width: 11px;
     padding: 0 3px;
     height: 17px;
-    background-color: #f44336;
+    background-color: rgba(244, 67, 54, 1.000);
     font-size: 10px;
     font-family: sans-serif;
     position: absolute;
@@ -175,7 +232,7 @@ body {
     z-index: 15;
     top: 6px;
     float: right;
-    color: #fff;
+    color: rgba(255, 255, 255, 1.000);
     text-align: center;
     line-height: 17px;
     display: block;
@@ -203,13 +260,25 @@ body {
 }
 
 .tab .server-tab-shortcut {
-    color: #648478;
+    color: rgba(100, 132, 120, 1.000);
     font-size: 12px;
     text-align: center;
     font-family: sans-serif;
     margin-bottom: 5px;
 }
 
+.refresh {
+    animation: rotate-loader 1s linear infinite;
+}
+
+@keyframes rotate-loader {
+    from {
+        transform: rotate(0);
+    }
+    to {
+        transform: rotate(-360deg);
+    }
+}
 
 /*******************
   *   Webview Area  *
@@ -221,53 +290,84 @@ body {
     width: 100%;
 }
 
+/* Pseudo element for loading indicator */
+#webviews-container::before {
+    content: "";
+    position: absolute;
+    z-index: 1;
+    background: rgba(255, 255, 255, 1.000) url(../img/ic_loading.gif) no-repeat;
+    background-size: 60px 60px;
+    background-position: center;
+    width: 100%;
+    height: 100%;
+}
+
+/* When the active webview is loaded */
+#webviews-container.loaded::before {
+    opacity: 0;
+    z-index: -1;
+    visibility: hidden;
+}
+
 webview {
-    opacity: 1;
-    transition: opacity 0.3s ease-in;
+    /* transition: opacity 0.3s ease-in; */
     flex-grow: 1;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
 }
 
 webview.onload {
     transition: opacity 1s cubic-bezier(0.95, 0.05, 0.795, 0.035);
 }
 
-webview.disabled {
-    flex: 0 1;
-    height: 0;
-    width: 0;
-    opacity: 0;
-    transition: opacity 0.3s ease-out;
+webview.active {
+    opacity: 1;
+    z-index: 1;
+    visibility: visible;
 }
 
-webview:focus {
+webview.disabled {
+    opacity: 0;
+}
+
+webview.focus {
     outline: 0px solid transparent;
 }
 
-
 /* Tooltip styling */
 
+#loading-tooltip,
+#dnd-tooltip,
+#back-tooltip,
 #reload-tooltip,
 #setting-tooltip {
     font-family: sans-serif;
-    background: #222c31;
-    margin-left: 68px;
+    background: rgba(34, 44, 49, 1.000);
+    margin-left: 48px;
     padding: 6px 8px;
     position: absolute;
     margin-top: 0px;
     z-index: 1000;
-    color: white;
+    color: rgba(255, 255, 255, 1.000);
     border-radius: 4px;
     text-align: center;
     width: 55px;
     font-size: 14px;
 }
 
-#reload-tooltip:after,
-#setting-tooltip:after {
+#loading-tooltip::after,
+#dnd-tooltip::after,
+#back-tooltip::after,
+#reload-tooltip::after,
+#setting-tooltip::after {
     content: " ";
     border-top: 8px solid transparent;
     border-bottom: 8px solid transparent;
-    border-right: 8px solid #222c31;
+    border-right: 8px solid rgba(34, 44, 49, 1.000);
     position: absolute;
     top: 7px;
     right: 68px;
@@ -276,25 +376,25 @@ webview:focus {
 #add-server-tooltip,
 .server-tooltip {
     font-family: 'arial';
-    background: #222c31;
+    background: rgba(34, 44, 49, 1.000);
     left: 56px;
     padding: 10px 20px;
     position: fixed;
-    margin-top: 8px;
+    margin-top: 11px;
     z-index: 5000 !important;
-    color: #fff;
+    color: rgba(255, 255, 255, 1.000);
     border-radius: 4px;
     text-align: center;
     width: max-content;
     font-size: 14px;
 }
 
-#add-server-tooltip:after,
-.server-tooltip:after {
+#add-server-tooltip::after,
+.server-tooltip::after {
     content: " ";
     border-top: 8px solid transparent;
     border-bottom: 8px solid transparent;
-    border-right: 8px solid #222c31;
+    border-right: 8px solid rgba(34, 44, 49, 1.000);
     position: absolute;
     top: 10px;
     left: -5px;
@@ -306,14 +406,14 @@ webview:focus {
     position: absolute;
     width: 24px;
     height: 24px;
-    background: #222c31;
+    background: rgba(34, 44, 49, 1.000);
     border-radius: 20px;
     cursor: pointer;
-    box-shadow: #999 1px 1px;
+    box-shadow: rgba(153, 153, 153, 1.000) 1px 1px;
 }
 
 #collapse-button i {
-    color: #efefef;
+    color: rgba(239, 239, 239, 1.000);
 }
 
 #main-container {
@@ -321,6 +421,8 @@ webview:focus {
     height: 100%;
     width: 100%;
     position: relative;
+    flex-grow: 1;
+    flex-basis: 0px;
 }
 
 .hidden {
@@ -332,8 +434,8 @@ webview:focus {
 
 .popup .popuptext {
     visibility: hidden;
-    background-color: #555;
-    color: #fff;
+    background-color: rgba(85, 85, 85, 1.000);
+    color: rgba(255, 255, 255, 1.000);
     text-align: center;
     border-radius: 6px;
     padding: 9px 0;
@@ -362,4 +464,27 @@ webview:focus {
         overflow: hidden;
         opacity: 1;
     }
-}
+}
+
+send-feedback {
+    width: 60%;
+    height: 85%;
+}
+
+#feedback-modal {
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(68, 67, 67, 0.81);
+    align-items: center;
+    justify-content: center;
+    z-index: 2;
+    transition: all 1s ease-out;
+}
+
+#feedback-modal.show {
+    display: flex;
+}

app/renderer/css/network.css

@@ -1,10 +1,11 @@
-html, body {
+html,
+body {
     margin: 0;
     cursor: default;
     font-size: 14px;
-    color: #333;
-    background: #fff;
-    user-select:none;
+    color: rgba(51, 51, 51, 1.000);
+    background: rgba(255, 255, 255, 1.000);
+    user-select: none;
 }
 
 #content {
@@ -27,8 +28,8 @@ html, body {
 
 #reconnect {
     font-size: 16px;
-    background: #009688;
-    color: #fff;
+    background: rgba(0, 150, 136, 1.000);
+    color: rgba(255, 255, 255, 1.000);
     width: 84px;
     height: 32px;
     border-radius: 5px;

app/renderer/css/preference.css

@@ -7,28 +7,33 @@ body {
     font-family: menu, "Helvetica Neue", sans-serif;
     -webkit-font-smoothing: antialiased;
     font-size: 14px;
-    color: #333;
-    background: #efefef;
+    background: rgba(239, 239, 239, 1.000);
+    letter-spacing: -.08px;
+    line-height: 18px;
+    color: rgba(139, 142, 143, 1.000);
 }
 
 kbd {
-    padding: 0.3em 0.8em;
-    border: 1px solid #ccc;
+    display: inline-block;
+    border: 1px solid rgba(204, 204, 204, 1.000);
+    border-radius: 4px;
     font-size: 15px;
     font-family: Courier New, Courier, monospace;
-    background-color: #383430;
-    color: #ededed;
-    display: inline-block;
-    margin: 0 0.1em;
     font-weight: bold;
     white-space: nowrap;
+    background-color: rgba(247, 247, 247, 1.000);
+    color: rgba(51, 51, 51, 1.000);
+    margin: 0 0.1em;
+    padding: 0.3em 0.8em;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 1.000);
+    line-height: 1.4;
 }
 
 table,
 th,
 td {
     border-collapse: collapse;
-    color: #383430;
+    color: rgba(56, 52, 48, 1.000);
 }
 
 table {
@@ -38,11 +43,11 @@ table {
 }
 
 table tr:nth-child(even) {
-    background-color: #f7eee6;
+    background-color: rgba(250, 250, 250, 1.000);
 }
 
 table tr:nth-child(odd) {
-    background-color: #fff8ef;
+    background-color: rgba(255, 255, 255, 1.000);
 }
 
 td {
@@ -92,11 +97,13 @@ td:nth-child(odd) {
 }
 
 #sidebar {
-    width: 80px;
-    padding: 30px;
+    width: 150px;
+    min-width: 100px;
+    padding: 30px 30px 30px 35px;
     display: flex;
     flex-direction: column;
     font-size: 16px;
+    background: rgba(242, 242, 242, 1.000);
 }
 
 #nav-container {
@@ -104,29 +111,35 @@ td:nth-child(odd) {
 }
 
 .nav {
-    padding: 5px 0;
-    color: #999;
+    padding: 7px 0;
+    color: rgba(153, 153, 153, 1.000);
     cursor: pointer;
 }
 
 .nav.active {
-    color: #464e5a;
+    color: rgba(78, 191, 172, 1.000);
     cursor: default;
     position: relative;
 }
 
 .nav.active::before {
-    background: #464e5a;
+    background: rgba(70, 78, 90, 1.000);
     width: 3px;
-    height: 16px;
+    height: 18px;
     position: absolute;
     left: -8px;
     content: '';
 }
 
+/* We don't want to show this in nav item since we have the + button for adding an Organization */
+
+#nav-AddServer {
+    display: none;
+}
+
 #settings-header {
     font-size: 22px;
-    color: #222c31;
+    color: rgba(34, 44, 49, 1.000);
     font-weight: bold;
     text-transform: uppercase;
 }
@@ -139,47 +152,77 @@ td:nth-child(odd) {
 }
 
 #new-server-container {
-    opacity: 1;
-    transition: opacity 0.3s;
+    padding-left: 42px;
+    padding-top: 25px;
+    margin-right: 16px;
 }
 
 .title {
-    padding: 4px 0 6px 0;
     font-weight: 500;
-    color: #222c31;
+    color: rgba(34, 44, 49, 1.000);
 }
 
 .page-title {
-    color: #222c31;
+    color: rgba(34, 44, 49, 1.000);
     font-size: 15px;
     font-weight: bold;
     padding: 4px 0 6px 0;
 }
 
+.add-server-info-row {
+    display: flex;
+    margin: 8px 0 0 0;
+}
+
+.add-server-info-right {
+    flex-grow: 1;
+    margin-top: 10px;
+}
+
 .sub-title {
     padding: 4px 0 6px 0;
     font-weight: bold;
-    color: #616161;
+    color: rgba(97, 97, 97, 1.000);
 }
 
 img.server-info-icon {
     width: 36px;
     height: 36px;
-    padding: 4px;
+    padding: 4px 4px 4px 10px;
+    cursor: pointer;
+    vertical-align: middle;
 }
 
 .server-info-left {
-    margin: 10px 20px 0 0;
+    margin: 4px 20px 0 0;
+    min-width: 40%;
 }
 
 .server-info-right {
+    margin-top: 4px;
+    width: 55%;
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
     flex-grow: 1;
-    margin-right: 10px;
 }
 
 .server-info-row {
-    display: flex;
-    margin: 8px 0 0 0;
+    display: inline-block;
+    margin: 5px 0 0 0;
+}
+
+.server-info-left .server-info-row {
+    display: inline-flex;
+    align-items: inherit;
+    vertical-align: -2px;
+    position: relative;
+}
+
+.server-url {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
 .server-info-alias {
@@ -187,6 +230,10 @@ img.server-info-icon {
     cursor: pointer;
 }
 
+.server-url-info {
+    margin-right: 10px;
+}
+
 .setting-input-key {
     font-size: 14px;
     height: 27px;
@@ -200,28 +247,30 @@ img.server-info-icon {
 .setting-input-value {
     flex-grow: 1;
     font-size: 14px;
-    height: 22px;
-    border-radius: 3px;
-    padding: 7px;
-    border: #ededed 2px solid;
+    border-radius: 4px;
+    padding: 13px;
+    border: rgba(237, 237, 237, 1.000) 2px solid;
     outline-width: 0;
     background: transparent;
-    max-width: 500px;
+    max-width: 450px;
 }
 
 .setting-input-value:focus {
-    border: #7cb980 2px solid;
-    border-radius: 3px;
+    border: rgba(78, 191, 172, 1.000) 2px solid;
 }
 
-.setting-block {
-    width: 100%;
+.invalid-input-value:focus {
+    border: rgba(239, 83, 80, 1) 2px solid;
+}
+
+.manual-proxy-block {
+    width: 96%;
 }
 
 .actions-container {
     display: flex;
     font-size: 14px;
-    color: #235d3a;
+    color: rgba(35, 93, 58, 1.000);
     vertical-align: middle;
     margin: 10px 0;
     flex-wrap: wrap;
@@ -242,6 +291,7 @@ img.server-info-icon {
 
 .settings-pane {
     flex-grow: 1;
+    min-width: 550px;
 }
 
 .action:hover {
@@ -253,7 +303,7 @@ img.server-info-icon {
 }
 
 .action.disabled {
-    color: #999;
+    color: rgba(153, 153, 153, 1.000);
 }
 
 .settings-card {
@@ -261,9 +311,13 @@ img.server-info-icon {
     flex-wrap: wrap;
     padding: 12px 30px;
     margin: 10px 0 20px 0;
-    background: #fff;
-    width: 70%;
-    border-left: 8px solid #bcbcbc;
+    background: rgba(255, 255, 255, 1.000);
+    width: 80%;
+    transition: all 0.2s;
+}
+
+.settings-card:hover {
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 0px 0px rgba(0, 0, 0, 0.12);
 }
 
 .hidden {
@@ -272,25 +326,59 @@ img.server-info-icon {
 }
 
 .red {
-    color: #ffffff;
-    background: #ef5350;
-    padding: 3px;
-    padding-right: 10px;
-    padding-left: 10px;
+    color: rgb(240, 148, 148);
+    background: rgba(255, 255, 255, 1.000);
+    border-radius: 4px;
+    display: inline-block;
+    border: 2px solid rgb(240, 148, 148);
+    padding: 10px;
+    width: 100px;
+    cursor: pointer;
+    font-size: 1rem;
+    font-weight: bold;
+    transition: background-color 0.2s ease;
+    text-decoration: none;
+    text-align: center;
 }
 
-.blue {
-    color: #ffffff;
-    background: #4EBFAC;
-    padding: 3px;
-    padding-right: 10px;
-    padding-left: 10px;
+.red:hover {
+    background-color: rgb(240, 148, 148);
+    color: rgba(255, 255, 255, 1.000);
+}
+
+.green {
+    color: rgba(255, 255, 255, 1.000);
+    background: rgba(78, 191, 172, 1.000);
+    border-radius: 4px;
+    display: inline-block;
+    border: none;
+    padding: 10px;
+    width: 100px;
+    cursor: pointer;
+    font-size: 1rem;
+    font-weight: bold;
+    transition: background-color 0.2s ease;
+    text-decoration: none;
+    text-align: center;
+}
+
+.green:hover {
+    background-color: rgba(60, 159, 141, 1.000);
+    color: rgba(255, 255, 255, 1.000);
+}
+
+.w-150 {
+    width: 150px;
+}
+
+.w-250 {
+    width: 250px;
 }
 
 .grey {
-    color: #9E9E9E;
-    background: #FAFAFA;
-    border: 1px solid #9E9E9E;
+    color: rgba(158, 158, 158, 1.000);
+    background: rgba(250, 250, 250, 1.000);
+    border: 1px solid rgba(158, 158, 158, 1.000);
 }
 
 .setting-row {
@@ -306,35 +394,48 @@ img.server-info-icon {
 }
 
 i.open-tab-button {
-    padding: 0 5px;
-    font-size: 18px;
+    padding-left: 5px;
+    font-size: 19px;
     cursor: pointer;
 }
 
-.reset-data-button {
-    display: inline-block;
-    border: none;
-    padding: 10px;
-    width: 120px;
-    cursor: pointer;
-    font-size: 13px;
-    transition: background-color 0.2s ease;
-    text-decoration: none;
+#css-delete-action {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+
+    /*
+        .action class will add extra margin to right which
+        we don't want for a button; the extra margin is intended for radio buttons
+    */
+    margin-right: 0px;
 }
 
-.reset-data-button:hover {
-    background-color: #3c9f8d;
-    color: #fff;
+.selected-css-path,
+.download-folder-path {
+    background: rgba(238, 238, 238, 1.000);
+    padding: 5px 10px;
+    margin-right: 10px;
+    display: flex;
+    width: 90%;
+    justify-content: space-between;
+}
+
+#remove-custom-css {
+    align-items: flex-end;
 }
 
 #server-info-container {
-    min-height: calc(100% - 235px);
+    /* min-height: calc(100% - 260px); */
+}
+
+#new-org-button {
+    margin: 30px 0px 30px 0px;
 }
 
 #create-organization-container {
     font-size: 1.15em;
-    position: fixed;
-    bottom: 15px;
 }
 
 #create-organization-container i {
@@ -343,24 +444,17 @@ i.open-tab-button {
 }
 
 #open-create-org-link {
-    color: #666;
     cursor: pointer;
     text-decoration: none;
 }
 
-#open-create-org-link:hover {
-    color: #005580;
-    ;
-    text-decoration: underline;
-}
-
 .toggle {
     position: absolute;
     margin-left: -9999px;
     visibility: hidden;
 }
 
-.toggle+label {
+.toggle + label {
     display: block;
     position: relative;
     cursor: pointer;
@@ -368,16 +462,21 @@ i.open-tab-button {
     user-select: none;
 }
 
-input.toggle-round+label {
+.disallowed:hover {
+    background-color: rgba(241, 241, 241, 1.000);
+    cursor: not-allowed;
+}
+
+input.toggle-round + label {
     padding: 2px;
     width: 50px;
     height: 25px;
-    background-color: #dddddd;
+    background-color: rgba(221, 221, 221, 1.000);
     border-radius: 25px;
 }
 
-input.toggle-round+label:before,
-input.toggle-round+label:after {
+input.toggle-round + label::before,
+input.toggle-round + label::after {
     display: block;
     position: absolute;
     top: 2px;
@@ -386,25 +485,222 @@ input.toggle-round+label:after {
     content: "";
 }
 
-input.toggle-round+label:before {
-    right: 2px;
-    background-color: #f1f1f1;
+input.toggle-round + label::before {
+    background-color: rgba(241, 241, 241, 1.000);
     border-radius: 25px;
-    transition: background 0.4s;
+    top: 0;
+    right: 0px;
+    left: 0px;
+    bottom: 0px;
 }
 
-input.toggle-round+label:after {
+input.toggle-round + label::after {
     width: 25px;
     height: 25px;
-    background-color: #fff;
+    background-color: rgba(255, 255, 255, 1.000);
     border-radius: 100%;
-    transition: margin 0.4s;
 }
 
-input.toggle-round:checked+label:before {
-    background-color: #4EBFAC;
+input.toggle-round:checked + label::before {
+    background-color: rgba(78, 191, 172, 1.000);
+    top: 0;
+    right: 0px;
+    left: 0px;
+    bottom: 0px;
 }
 
-input.toggle-round:checked+label:after {
+input.toggle-round:checked + label::after {
     margin-left: 25px;
-}
+}
+
+/*  Add new server modal */
+
+.add-server-modal {
+    display: block;
+    position: fixed;
+    z-index: 1;
+    padding-top: 15vh;
+    left: 0;
+    top: 0;
+    margin: auto;
+    width: 100%;
+    height: 100%;
+    /* background: rgba(61, 64, 67, 15); */
+    background: linear-gradient(35deg, rgba(0, 59, 82, 1.000), rgba(69, 181, 155, 1.000));
+    overflow: auto;
+}
+
+/* Modal Content */
+
+.modal-container {
+    background-color: rgba(244, 247, 248, 1.000);
+    margin: auto;
+    padding: 57px;
+    border: rgba(218, 225, 227, 1.000) 1px solid;
+    width: 550px;
+    height: 370px;
+    border-radius: 4px;
+}
+
+.add-server-modal .page-title {
+    text-align: center;
+    font-size: 1.6rem;
+}
+
+.divider {
+    margin-bottom: 30px;
+    margin-top: 30px;
+    color: rgba(125, 135, 138, 1.000);
+}
+
+.divider hr {
+    margin-left: 8px;
+    margin-right: 8px;
+    width: 44%;
+}
+
+.left {
+    float: left;
+}
+
+.right {
+    float: right;
+}
+
+.server-center {
+    width: 100%;
+    text-align: center;
+    align-items: center;
+    padding-top: 13px;
+    margin-left: -5px;
+}
+
+.server-center button {
+    font-weight: bold;
+    font-size: 1.1rem;
+    margin: auto;
+    align-items: center;
+    text-align: center;
+    color: rgba(255, 255, 255, 1.000);
+    background: rgba(78, 191, 172, 1.000);
+    border-color: none;
+    border: none;
+    width: 98%;
+    height: 46px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+
+.server-center button:hover {
+    background: rgba(50, 149, 136, 1.000);
+}
+
+.server-center button:focus {
+    background: rgba(50, 149, 136, 1.000);
+}
+
+.certificates-card {
+    width: 80%;
+}
+
+.certificate-input {
+    width: 100%;
+    margin-top: 10px;
+    display: inline-flex;
+}
+
+.certificate-input div {
+    align-self: center;
+}
+
+.certificate-input .setting-input-value {
+    margin-left: 10px;
+    max-width: 100%;
+}
+
+#add-certificate-button {
+    margin: 10px 10px 10px 37px;
+}
+
+.tip {
+    background: none;
+    padding: 0;
+}
+
+.tip:hover {
+    box-shadow: none;
+}
+
+.md-14 {
+    font-size: 14px;
+    vertical-align: middle;
+    padding-right: 6px;
+}
+
+#open-hotkeys-link {
+    text-decoration: underline;
+    cursor: pointer;
+}
+
+/* responsive grid */
+
+@media (max-width: 650px) {
+    .selected-css-path,
+    .download-folder-path {
+        margin-right: 15px;
+    }
+    #css-delete-action {
+        margin-left: 10px;
+    }
+    #css-delete-action span {
+        display: none;
+    }
+}
+
+@media (max-width: 720px) {
+    .modal-container {
+        width: 60vw;
+        padding: 40px;
+        min-width: 300px;
+    }
+    .server-center button {
+        margin-right: -12px;
+        width: 100%;
+    }
+    .divider {
+        margin-right: -8px;
+    }
+    .divider hr {
+        margin-left: 6px;
+        margin-right: 6px;
+        width: 43%;
+    }
+    #new-server-container {
+        padding-left: 0px;
+    }
+}
+
+@media (max-width: 600px) {
+    .divider {
+        margin-left: 4%;
+    }
+    .divider hr {
+        margin-left: 2px;
+        margin-right: 2px;
+        width: 40%;
+    }
+}
+
+@media (max-width: 900px) {
+    .settings-card {
+        flex-direction: column;
+        align-items: center;
+    }
+    .server-info-right {
+        flex-direction: column;
+        align-items: center;
+    }
+    .action {
+        margin-top: 10px;
+    }
+}

app/renderer/css/preload.css

@@ -1,9 +1,9 @@
 /* Override css rules */
 
-.portico-wrap>.header {
+.portico-wrap > .header {
     display: none;
 }
 
-.portico-container>.footer {
+.portico-container > .footer {
     display: none;
 }

app/renderer/js/components/base.ts

@@ -1,11 +1,11 @@
 'use strict';
 
 class BaseComponent {
-	generateNodeFromTemplate(template) {
+	generateNodeFromTemplate(template: string): Element | null {
 		const wrapper = document.createElement('div');
 		wrapper.innerHTML = template;
 		return wrapper.firstElementChild;
 	}
 }
 
-module.exports = BaseComponent;
+export = BaseComponent;

app/renderer/js/components/functional-tab.ts

@@ -1,10 +1,11 @@
 'use strict';
 
-const Tab = require(__dirname + '/../components/tab.js');
+import Tab = require('./tab');
 
 class FunctionalTab extends Tab {
-	template() {
-		return `<div class="tab functional-tab">
+	$closeButton: Element;
+	template(): string {
+		return `<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
 					<div class="server-tab-badge close-button">
 						<i class="material-icons">close</i>
 					</div>
@@ -14,15 +15,22 @@ class FunctionalTab extends Tab {
 				</div>`;
 	}
 
-	init() {
-		this.$el = this.generateNodeFromTemplate(this.template());
-		this.props.$root.appendChild(this.$el);
-
-		this.$closeButton = this.$el.getElementsByClassName('server-tab-badge')[0];
-		this.registerListeners();
+	// TODO: Typescript - This type for props should be TabProps
+	constructor(props: any) {
+		super(props);
+		this.init();
 	}
 
-	registerListeners() {
+	init(): void {
+		this.$el = this.generateNodeFromTemplate(this.template());
+		if (this.props.name !== 'Settings') {
+			this.props.$root.append(this.$el);
+			this.$closeButton = this.$el.querySelectorAll('.server-tab-badge')[0];
+			this.registerListeners();
+		}
+	}
+
+	registerListeners(): void {
 		super.registerListeners();
 
 		this.$el.addEventListener('mouseover', () => {
@@ -33,11 +41,11 @@ class FunctionalTab extends Tab {
 			this.$closeButton.classList.remove('active');
 		});
 
-		this.$closeButton.addEventListener('click', e => {
+		this.$closeButton.addEventListener('click', (e: Event) => {
 			this.props.onDestroy();
 			e.stopPropagation();
 		});
 	}
 }
 
-module.exports = FunctionalTab;
+export = FunctionalTab;

app/renderer/js/components/handle-external-link.ts

@@ -0,0 +1,83 @@
+import { ipcRenderer, remote } from 'electron';
+
+import LinkUtil = require('../utils/link-util');
+import DomainUtil = require('../utils/domain-util');
+import ConfigUtil = require('../utils/config-util');
+
+const { shell, app } = remote;
+
+const dingSound = new Audio('../resources/sounds/ding.ogg');
+
+// TODO: TypeScript - Figure out a way to pass correct type here.
+function handleExternalLink(this: any, event: any): void {
+	const { url } = event;
+	const domainPrefix = DomainUtil.getDomain(this.props.index).url;
+	const downloadPath = ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`);
+	const shouldShowInFolder = ConfigUtil.getConfigItem('showDownloadFolder', false);
+
+	// Whitelist URLs which are allowed to be opened in the app
+	const {
+		isInternalUrl: isWhiteListURL,
+		isUploadsUrl: isUploadsURL
+	} = LinkUtil.isInternal(domainPrefix, url);
+
+	if (isWhiteListURL) {
+		event.preventDefault();
+
+		// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+		// Show pdf attachments in a new window
+		// if (LinkUtil.isPDF(url) && isUploadsURL) {
+		// 	ipcRenderer.send('pdf-view', url);
+		// 	return;
+		// }
+
+		// download txt, mp3, mp4 etc.. by using downloadURL in the
+		// main process which allows the user to save the files to their desktop
+		// and not trigger webview reload while image in webview will
+		// do nothing and will not save it
+
+		// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+		// if (!LinkUtil.isImage(url) && !LinkUtil.isPDF(url) && isUploadsURL) {
+		if (!LinkUtil.isImage(url) && isUploadsURL) {
+			ipcRenderer.send('downloadFile', url, downloadPath);
+			ipcRenderer.once('downloadFileCompleted', (_event: Event, filePath: string, fileName: string) => {
+				const downloadNotification = new Notification('Download Complete', {
+					body: shouldShowInFolder ? `Click to show ${fileName} in folder` : `Click to open ${fileName}`,
+					silent: true // We'll play our own sound - ding.ogg
+				});
+
+				// Play sound to indicate download complete
+				if (!ConfigUtil.getConfigItem('silent')) {
+					dingSound.play();
+				}
+
+				downloadNotification.addEventListener('click', () => {
+					if (shouldShowInFolder) {
+						// Reveal file in download folder
+						shell.showItemInFolder(filePath);
+					} else {
+						// Open file in the default native app
+						shell.openItem(filePath);
+					}
+				});
+				ipcRenderer.removeAllListeners('downloadFileFailed');
+			});
+
+			ipcRenderer.once('downloadFileFailed', () => {
+				// Automatic download failed, so show save dialog prompt and download
+				// through webview
+				this.$el.downloadURL(url);
+				ipcRenderer.removeAllListeners('downloadFileCompleted');
+			});
+			return;
+		}
+
+		// open internal urls inside the current webview.
+		this.$el.loadURL(url);
+	} else {
+		event.preventDefault();
+		shell.openExternal(url);
+	}
+}
+
+export = handleExternalLink;

app/renderer/js/components/server-tab.js

@@ -1,59 +0,0 @@
-'use strict';
-
-const Tab = require(__dirname + '/../components/tab.js');
-const SystemUtil = require(__dirname + '/../utils/system-util.js');
-
-const {ipcRenderer} = require('electron');
-
-class ServerTab extends Tab {
-	template() {
-		return `<div class="tab">
-					<div class="server-tooltip" style="display:none"></div>
-					<div class="server-tab-badge"></div>
-					<div class="server-tab">
-					<img class="server-icons" src='${this.props.icon}'/>
-					</div>
-					<div class="server-tab-shortcut">${this.generateShortcutText()}</div>
-				</div>`;
-	}
-
-	init() {
-		super.init();
-
-		this.$badge = this.$el.getElementsByClassName('server-tab-badge')[0];
-	}
-
-	updateBadge(count) {
-		if (count > 0) {
-			const formattedCount = count > 999 ? '1K+' : count;
-
-			this.$badge.innerHTML = formattedCount;
-			this.$badge.classList.add('active');
-		} else {
-			this.$badge.classList.remove('active');
-		}
-	}
-
-	generateShortcutText() {
-		// Only provide shortcuts for server [0..10]
-		if (this.props.index >= 10) {
-			return '';
-		}
-
-		const shownIndex = this.props.index + 1;
-
-		let shortcutText = '';
-
-		if (SystemUtil.getOS() === 'Mac') {
-			shortcutText = `⌘ ${shownIndex}`;
-		} else {
-			shortcutText = `Ctrl+${shownIndex}`;
-		}
-
-		ipcRenderer.send('register-server-tab-shortcut', shownIndex);
-
-		return shortcutText;
-	}
-}
-
-module.exports = ServerTab;

app/renderer/js/components/server-tab.ts

@@ -0,0 +1,68 @@
+'use strict';
+
+import { ipcRenderer } from 'electron';
+
+import Tab = require('./tab');
+import SystemUtil = require('../utils/system-util');
+
+class ServerTab extends Tab {
+	$badge: Element;
+
+	template(): string {
+		return `<div class="tab" data-tab-id="${this.props.tabIndex}">
+					<div class="server-tooltip" style="display:none">${this.props.name}</div>
+					<div class="server-tab-badge"></div>
+					<div class="server-tab">
+					<img class="server-icons" src='${this.props.icon}'/>
+					</div>
+					<div class="server-tab-shortcut">${this.generateShortcutText()}</div>
+				</div>`;
+	}
+
+	// TODO: Typescript - This type for props should be TabProps
+	constructor(props: any) {
+		super(props);
+		this.init();
+	}
+
+	init(): void {
+		this.$el = this.generateNodeFromTemplate(this.template());
+		this.props.$root.append(this.$el);
+		this.registerListeners();
+		this.$badge = this.$el.querySelectorAll('.server-tab-badge')[0];
+	}
+
+	updateBadge(count: number): void {
+		if (count > 0) {
+			const formattedCount = count > 999 ? '1K+' : count.toString();
+			this.$badge.innerHTML = formattedCount;
+			this.$badge.classList.add('active');
+		} else {
+			this.$badge.classList.remove('active');
+		}
+	}
+
+	generateShortcutText(): string {
+		// Only provide shortcuts for server [0..10]
+		if (this.props.index >= 10) {
+			return '';
+		}
+
+		const shownIndex = this.props.index + 1;
+
+		let shortcutText = '';
+
+		if (SystemUtil.getOS() === 'Mac') {
+			shortcutText = `⌘ ${shownIndex}`;
+		} else {
+			shortcutText = `Ctrl+${shownIndex}`;
+		}
+
+		// Array index == Shown index - 1
+		ipcRenderer.send('switch-server-tab', shownIndex - 1);
+
+		return shortcutText;
+	}
+}
+
+export = ServerTab;

app/renderer/js/components/tab.ts

@@ -1,48 +1,44 @@
 'use strict';
 
-const BaseComponent = require(__dirname + '/../components/base.js');
+import WebView = require('./webview');
+import BaseComponent = require('./base');
+
+// TODO: TypeScript - Type annotate props
+interface TabProps {
+	[key: string]: any;
+}
 
 class Tab extends BaseComponent {
-	constructor(props) {
+	props: TabProps;
+	webview: WebView;
+	$el: Element;
+	constructor(props: TabProps) {
 		super();
 
 		this.props = props;
 		this.webview = this.props.webview;
-
-		this.init();
 	}
 
-	init() {
-		this.$el = this.generateNodeFromTemplate(this.template());
-		this.props.$root.appendChild(this.$el);
-
-		this.registerListeners();
-	}
-
-	registerListeners() {
+	registerListeners(): void {
 		this.$el.addEventListener('click', this.props.onClick);
 		this.$el.addEventListener('mouseover', this.props.onHover);
 		this.$el.addEventListener('mouseout', this.props.onHoverOut);
 	}
 
-	isLoading() {
-		return this.webview.isLoading;
-	}
-
-	activate() {
+	activate(): void {
 		this.$el.classList.add('active');
 		this.webview.load();
 	}
 
-	deactivate() {
+	deactivate(): void {
 		this.$el.classList.remove('active');
 		this.webview.hide();
 	}
 
-	destroy() {
+	destroy(): void {
 		this.$el.parentNode.removeChild(this.$el);
 		this.webview.$el.parentNode.removeChild(this.webview.$el);
 	}
 }
 
-module.exports = Tab;
+export = Tab;

app/renderer/js/components/webview.js

@@ -1,201 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-
-const DomainUtil = require(__dirname + '/../utils/domain-util.js');
-const ConfigUtil = require(__dirname + '/../utils/config-util.js');
-const SystemUtil = require(__dirname + '/../utils/system-util.js');
-const LinkUtil = require(__dirname + '/../utils/link-util.js');
-const { shell, app } = require('electron').remote;
-
-const BaseComponent = require(__dirname + '/../components/base.js');
-
-const shouldSilentWebview = ConfigUtil.getConfigItem('silent');
-class WebView extends BaseComponent {
-	constructor(props) {
-		super();
-
-		this.props = props;
-
-		this.zoomFactor = 1.0;
-		this.loading = false;
-		this.badgeCount = 0;
-	}
-
-	template() {
-		return `<webview
-					class="disabled"
-					src="${this.props.url}"
-					${this.props.nodeIntegration ? 'nodeIntegration' : ''}
-					disablewebsecurity
-					${this.props.preload ? 'preload="js/preload.js"' : ''}
-					partition="persist:webviewsession"
-					webpreferences="allowRunningInsecureContent, javascript=yes">
-				</webview>`;
-	}
-
-	init() {
-		this.$el = this.generateNodeFromTemplate(this.template());
-		this.props.$root.appendChild(this.$el);
-
-		this.registerListeners();
-	}
-
-	registerListeners() {
-		this.$el.addEventListener('new-window', event => {
-			const { url } = event;
-			const domainPrefix = DomainUtil.getDomain(this.props.index).url;
-
-			if (LinkUtil.isInternal(domainPrefix, url) || url === (domainPrefix + '/')) {
-				event.preventDefault();
-				this.$el.loadURL(url);
-			} else {
-				event.preventDefault();
-				shell.openExternal(url);
-			}
-		});
-
-		if (shouldSilentWebview) {
-			this.$el.addEventListener('dom-ready', () => {
-				this.$el.setAudioMuted(true);
-			});
-		}
-
-		this.$el.addEventListener('page-title-updated', event => {
-			const { title } = event;
-			this.badgeCount = this.getBadgeCount(title);
-			this.props.onTitleChange();
-		});
-
-		this.$el.addEventListener('page-favicon-updated', event => {
-			const { favicons } = event;
-			// This returns a string of favicons URL. If there is a PM counts in unread messages then the URL would be like
-			// https://chat.zulip.org/static/images/favicon/favicon-pms.png
-			if (favicons[0].indexOf('favicon-pms') > 0 && process.platform === 'darwin') {
-				// This api is only supported on macOS
-				app.dock.setBadge('●');
-			}
-		});
-
-		this.$el.addEventListener('dom-ready', () => {
-			if (this.props.role === 'server') {
-				this.$el.classList.add('onload');
-			}
-			this.show();
-		});
-
-		this.$el.addEventListener('did-fail-load', event => {
-			const { errorDescription } = event;
-			const hasConnectivityErr = (SystemUtil.connectivityERR.indexOf(errorDescription) >= 0);
-			if (hasConnectivityErr) {
-				console.error('error', errorDescription);
-				this.props.onNetworkError();
-			}
-		});
-
-		this.$el.addEventListener('did-start-loading', () => {
-			let userAgent = SystemUtil.getUserAgent();
-			if (!userAgent) {
-				SystemUtil.setUserAgent(this.$el.getUserAgent());
-				userAgent = SystemUtil.getUserAgent();
-			}
-			this.$el.setUserAgent(userAgent);
-		});
-	}
-
-	getBadgeCount(title) {
-		const messageCountInTitle = (/\(([0-9]+)\)/).exec(title);
-		return messageCountInTitle ? Number(messageCountInTitle[1]) : 0;
-	}
-
-	show() {
-		// Do not show WebView if another tab was selected and this tab should be in background.
-		if (!this.props.isActive()) {
-			return;
-		}
-
-		this.$el.classList.remove('disabled');
-		setTimeout(() => {
-			if (this.props.role === 'server') {
-				this.$el.classList.remove('onload');
-			}
-		}, 1000);
-		this.focus();
-		this.loading = false;
-		this.props.onTitleChange();
-		// Injecting preload css in webview to override some css rules
-		this.$el.insertCSS(fs.readFileSync(path.join(__dirname, '/../../css/preload.css'), 'utf8'));
-	}
-
-	focus() {
-		// focus Webview and it's contents when Window regain focus.
-		const webContents = this.$el.getWebContents();
-		if (webContents && !webContents.isFocused()) {
-			this.$el.focus();
-			webContents.focus();
-		}
-	}
-
-	hide() {
-		this.$el.classList.add('disabled');
-	}
-
-	load() {
-		if (this.$el) {
-			this.show();
-		} else {
-			this.init();
-		}
-	}
-
-	zoomIn() {
-		this.zoomFactor += 0.1;
-		this.$el.setZoomFactor(this.zoomFactor);
-	}
-
-	zoomOut() {
-		this.zoomFactor -= 0.1;
-		this.$el.setZoomFactor(this.zoomFactor);
-	}
-
-	zoomActualSize() {
-		this.zoomFactor = 1.0;
-		this.$el.setZoomFactor(this.zoomFactor);
-	}
-
-	logOut() {
-		this.$el.executeJavaScript('logout()');
-	}
-
-	showShortcut() {
-		this.$el.executeJavaScript('shortcut()');
-	}
-
-	openDevTools() {
-		this.$el.openDevTools();
-	}
-
-	back() {
-		if (this.$el.canGoBack()) {
-			this.$el.goBack();
-		}
-	}
-
-	forward() {
-		if (this.$el.canGoForward()) {
-			this.$el.goForward();
-		}
-	}
-
-	reload() {
-		this.hide();
-		this.$el.reload();
-	}
-
-	send(...param) {
-		this.$el.send(...param);
-	}
-}
-
-module.exports = WebView;

app/renderer/js/components/webview.ts

@@ -0,0 +1,287 @@
+'use strict';
+import { remote } from 'electron';
+
+import path = require('path');
+import fs = require('fs');
+import ConfigUtil = require('../utils/config-util');
+import SystemUtil = require('../utils/system-util');
+import BaseComponent = require('../components/base');
+import handleExternalLink = require('../components/handle-external-link');
+
+const { app, dialog } = remote;
+
+const shouldSilentWebview = ConfigUtil.getConfigItem('silent');
+
+// TODO: TypeScript - Type annotate WebViewProps.
+interface WebViewProps {
+	[key: string]: any;
+}
+
+class WebView extends BaseComponent {
+	props: any;
+	zoomFactor: number;
+	badgeCount: number;
+	loading: boolean;
+	customCSS: string;
+	$webviewsContainer: DOMTokenList;
+	$el: Electron.WebviewTag;
+
+	// This is required because in main.js we access WebView.method as
+	// webview[method].
+	[key: string]: any;
+
+	constructor(props: WebViewProps) {
+		super();
+
+		this.props = props;
+		this.zoomFactor = 1.0;
+		this.loading = true;
+		this.badgeCount = 0;
+		this.customCSS = ConfigUtil.getConfigItem('customCSS');
+		this.$webviewsContainer = document.querySelector('#webviews-container').classList;
+	}
+
+	template(): string {
+		return `<webview
+					class="disabled"
+					data-tab-id="${this.props.tabIndex}"
+					src="${this.props.url}"
+					${this.props.nodeIntegration ? 'nodeIntegration' : ''}
+					disablewebsecurity
+					${this.props.preload ? 'preload="js/preload.js"' : ''}
+					partition="persist:webviewsession"
+					name="${this.props.name}"
+					webpreferences="allowRunningInsecureContent, javascript=yes">
+				</webview>`;
+	}
+
+	init(): void {
+		this.$el = this.generateNodeFromTemplate(this.template()) as Electron.WebviewTag;
+		this.props.$root.append(this.$el);
+
+		this.registerListeners();
+	}
+
+	registerListeners(): void {
+		this.$el.addEventListener('new-window', event => {
+			handleExternalLink.call(this, event);
+		});
+
+		if (shouldSilentWebview) {
+			this.$el.addEventListener('dom-ready', () => {
+				this.$el.setAudioMuted(true);
+			});
+		}
+
+		this.$el.addEventListener('page-title-updated', event => {
+			const { title } = event;
+			this.badgeCount = this.getBadgeCount(title);
+			this.props.onTitleChange();
+		});
+
+		this.$el.addEventListener('did-navigate-in-page', event => {
+			const isSettingPage = event.url.includes('renderer/preference.html');
+			if (isSettingPage) {
+				return;
+			}
+			this.canGoBackButton();
+		});
+
+		this.$el.addEventListener('did-navigate', () => {
+			this.canGoBackButton();
+		});
+
+		this.$el.addEventListener('page-favicon-updated', event => {
+			const { favicons } = event;
+
+			// This returns a string of favicons URL. If there is a PM counts in unread messages then the URL would be like
+			// https://chat.zulip.org/static/images/favicon/favicon-pms.png
+			if (favicons[0].indexOf('favicon-pms') > 0 && process.platform === 'darwin') {
+				// This api is only supported on macOS
+				app.dock.setBadge('●');
+				// bounce the dock
+				if (ConfigUtil.getConfigItem('dockBouncing')) {
+					app.dock.bounce();
+				}
+			}
+		});
+
+		this.$el.addEventListener('dom-ready', () => {
+			if (this.props.role === 'server') {
+				this.$el.classList.add('onload');
+			}
+			this.loading = false;
+			this.props.switchLoading(false, this.props.url);
+			this.show();
+
+			// Refocus text boxes after reload
+			// Remove when upstream issue https://github.com/electron/electron/issues/14474 is fixed
+			this.$el.blur();
+			this.$el.focus();
+		});
+
+		this.$el.addEventListener('did-fail-load', event => {
+			const { errorDescription } = event;
+			const hasConnectivityErr = SystemUtil.connectivityERR.includes(errorDescription);
+			if (hasConnectivityErr) {
+				console.error('error', errorDescription);
+				this.props.onNetworkError();
+			}
+		});
+
+		this.$el.addEventListener('did-start-loading', () => {
+			const isSettingPage = this.props.url.includes('renderer/preference.html');
+			if (!isSettingPage) {
+				this.props.switchLoading(true, this.props.url);
+			}
+			let userAgent = SystemUtil.getUserAgent();
+			if (!userAgent) {
+				SystemUtil.setUserAgent(this.$el.getUserAgent());
+				userAgent = SystemUtil.getUserAgent();
+			}
+			this.$el.setUserAgent(userAgent);
+		});
+
+		this.$el.addEventListener('did-stop-loading', () => {
+			this.props.switchLoading(false, this.props.url);
+		});
+	}
+
+	getBadgeCount(title: string): number {
+		const messageCountInTitle = (/\((\d+)\)/).exec(title);
+		return messageCountInTitle ? Number(messageCountInTitle[1]) : 0;
+	}
+
+	show(): void {
+		// Do not show WebView if another tab was selected and this tab should be in background.
+		if (!this.props.isActive()) {
+			return;
+		}
+
+		// To show or hide the loading indicator in the the active tab
+		if (this.loading) {
+			this.$webviewsContainer.remove('loaded');
+		} else {
+			this.$webviewsContainer.add('loaded');
+		}
+
+		this.$el.classList.remove('disabled');
+		this.$el.classList.add('active');
+		setTimeout(() => {
+			if (this.props.role === 'server') {
+				this.$el.classList.remove('onload');
+			}
+		}, 1000);
+		this.focus();
+		this.props.onTitleChange();
+		// Injecting preload css in webview to override some css rules
+		this.$el.insertCSS(fs.readFileSync(path.join(__dirname, '/../../css/preload.css'), 'utf8'));
+
+		// get customCSS again from config util to avoid warning user again
+		this.customCSS = ConfigUtil.getConfigItem('customCSS');
+		if (this.customCSS) {
+			if (!fs.existsSync(this.customCSS)) {
+				this.customCSS = null;
+				ConfigUtil.setConfigItem('customCSS', null);
+
+				const errMsg = 'The custom css previously set is deleted!';
+				dialog.showErrorBox('custom css file deleted!', errMsg);
+				return;
+			}
+
+			this.$el.insertCSS(fs.readFileSync(path.resolve(__dirname, this.customCSS), 'utf8'));
+		}
+	}
+
+	focus(): void {
+		// focus Webview and it's contents when Window regain focus.
+		const webContents = this.$el.getWebContents();
+		// HACK: webContents.isFocused() seems to be true even without the element
+		// being in focus. So, we check against `document.activeElement`.
+		if (webContents && this.$el !== document.activeElement) {
+			// HACK: Looks like blur needs to be called on the previously focused
+			// element to transfer focus correctly, in Electron v3.0.10
+			// See https://github.com/electron/electron/issues/15718
+			(document.activeElement as HTMLElement).blur();
+			this.$el.focus();
+			webContents.focus();
+		}
+	}
+
+	hide(): void {
+		this.$el.classList.add('disabled');
+		this.$el.classList.remove('active');
+	}
+
+	load(): void {
+		if (this.$el) {
+			this.show();
+		} else {
+			this.init();
+		}
+	}
+
+	zoomIn(): void {
+		this.zoomFactor += 0.1;
+		this.$el.setZoomFactor(this.zoomFactor);
+	}
+
+	zoomOut(): void {
+		this.zoomFactor -= 0.1;
+		this.$el.setZoomFactor(this.zoomFactor);
+	}
+
+	zoomActualSize(): void {
+		this.zoomFactor = 1.0;
+		this.$el.setZoomFactor(this.zoomFactor);
+	}
+
+	logOut(): void {
+		this.$el.executeJavaScript('logout()');
+	}
+
+	showShortcut(): void {
+		this.$el.executeJavaScript('shortcut()');
+	}
+
+	openDevTools(): void {
+		this.$el.openDevTools();
+	}
+
+	back(): void {
+		if (this.$el.canGoBack()) {
+			this.$el.goBack();
+			this.focus();
+		}
+	}
+
+	canGoBackButton(): void {
+		const $backButton = document.querySelector('#actions-container #back-action');
+		if (this.$el.canGoBack()) {
+			$backButton.classList.remove('disable');
+		} else {
+			$backButton.classList.add('disable');
+		}
+	}
+
+	forward(): void {
+		if (this.$el.canGoForward()) {
+			this.$el.goForward();
+		}
+	}
+
+	reload(): void {
+		this.hide();
+		// Shows the loading indicator till the webview is reloaded
+		this.$webviewsContainer.remove('loaded');
+		this.loading = true;
+		this.props.switchLoading(true, this.props.url);
+		this.$el.reload();
+	}
+
+	send(channel: string, ...param: any[]): void {
+		this.$el.send(channel, ...param);
+	}
+}
+
+export = WebView;

app/renderer/js/electron-bridge.ts

@@ -0,0 +1,46 @@
+import { ipcRenderer } from 'electron';
+
+import events = require('events');
+
+type ListenerType = ((...args: any[]) => void);
+
+// we have and will have some non camelcase stuff
+// while working with zulip so just turning the rule off
+// for the whole file.
+/* eslint-disable @typescript-eslint/camelcase */
+class ElectronBridge extends events {
+	send_notification_reply_message_supported = false;
+	send_event(eventName: string | symbol, ...args: any[]): void {
+		this.emit(eventName, ...args);
+	}
+
+	on_event(eventName: string, listener: ListenerType): void {
+		this.on(eventName, listener);
+	}
+}
+
+const electron_bridge = new ElectronBridge();
+
+electron_bridge.on('total_unread_count', (...args) => {
+	ipcRenderer.send('unread-count', ...args);
+});
+
+electron_bridge.on('realm_name', realmName => {
+	const serverURL = location.origin;
+	ipcRenderer.send('realm-name-changed', serverURL, realmName);
+});
+
+electron_bridge.on('realm_icon_url', iconURL => {
+	const serverURL = location.origin;
+	iconURL = iconURL.includes('http') ? iconURL : `${serverURL}${iconURL}`;
+	ipcRenderer.send('realm-icon-changed', serverURL, iconURL);
+});
+
+// this follows node's idiomatic implementation of event
+// emitters to make event handling more simpler instead of using
+// functions zulip side will emit event using ElectronBrigde.send_event
+// which is alias of .emit and on this side we can handle the data by adding
+// a listener for the event.
+export = electron_bridge;
+
+/* eslint-enable @typescript-eslint/camelcase */

app/renderer/js/feedback.ts

@@ -0,0 +1,66 @@
+import { remote } from 'electron';
+import SendFeedback from '@electron-elements/send-feedback';
+
+import path = require('path');
+import fs = require('fs');
+
+const { app } = remote;
+
+interface SendFeedback extends HTMLElement {
+	[key: string]: any;
+}
+
+type SendFeedbackType = SendFeedback;
+
+// make the button color match zulip app's theme
+SendFeedback.customStyles = `
+button:hover, button:focus {
+  border-color: #4EBFAC;
+  color: #4EBFAC;
+}
+
+button:active {
+  background-color: #f1f1f1;
+  color: #4EBFAC;
+}
+
+button {
+  background-color: #4EBFAC;
+  border-color: #4EBFAC;
+}
+`;
+
+customElements.define('send-feedback', SendFeedback);
+export const sendFeedback: SendFeedbackType = document.querySelector('send-feedback');
+export const feedbackHolder = sendFeedback.parentElement;
+
+// customize the fields of custom elements
+sendFeedback.title = 'Report Issue';
+sendFeedback.titleLabel = 'Issue title:';
+sendFeedback.titlePlaceholder = 'Enter issue title';
+sendFeedback.textareaLabel = 'Describe the issue:';
+sendFeedback.textareaPlaceholder = 'Succinctly describe your issue and steps to reproduce it...';
+sendFeedback.buttonLabel = 'Report Issue';
+sendFeedback.loaderSuccessText = '';
+
+sendFeedback.useReporter('emailReporter', {
+	email: 'akash@zulipchat.com'
+});
+
+feedbackHolder.addEventListener('click', (e: Event) => {
+	// only remove the class if the grey out faded
+	// part is clicked and not the feedback element itself
+	if (e.target === e.currentTarget) {
+		feedbackHolder.classList.remove('show');
+	}
+});
+
+sendFeedback.addEventListener('feedback-submitted', () => {
+	setTimeout(() => {
+		feedbackHolder.classList.remove('show');
+	}, 1000);
+});
+
+const dataDir = app.getPath('userData');
+const logsDir = path.join(dataDir, '/Logs');
+sendFeedback.logs.push(...fs.readdirSync(logsDir).map(file => path.join(logsDir, file)));

app/renderer/js/main.js

@@ -1,464 +0,0 @@
-'use strict';
-
-const { ipcRenderer, remote } = require('electron');
-
-const { session } = remote;
-
-require(__dirname + '/js/tray.js');
-const DomainUtil = require(__dirname + '/js/utils/domain-util.js');
-const WebView = require(__dirname + '/js/components/webview.js');
-const ServerTab = require(__dirname + '/js/components/server-tab.js');
-const FunctionalTab = require(__dirname + '/js/components/functional-tab.js');
-const ConfigUtil = require(__dirname + '/js/utils/config-util.js');
-
-class ServerManagerView {
-	constructor() {
-		this.$addServerButton = document.getElementById('add-tab');
-		this.$tabsContainer = document.getElementById('tabs-container');
-
-		const $actionsContainer = document.getElementById('actions-container');
-		this.$reloadButton = $actionsContainer.querySelector('#reload-action');
-		this.$settingsButton = $actionsContainer.querySelector('#settings-action');
-		this.$webviewsContainer = document.getElementById('webviews-container');
-
-		this.$addServerTooltip = document.getElementById('add-server-tooltip');
-		this.$reloadTooltip = $actionsContainer.querySelector('#reload-tooltip');
-		this.$settingsTooltip = $actionsContainer.querySelector('#setting-tooltip');
-		this.$serverIconTooltip = document.getElementsByClassName('server-tooltip');
-
-		this.$sidebar = document.getElementById('sidebar');
-
-		this.$fullscreenPopup = document.getElementById('fullscreen-popup');
-		this.$fullscreenEscapeKey = process.platform === 'darwin' ? '^⌘F' : 'F11';
-		this.$fullscreenPopup.innerHTML = `Press ${this.$fullscreenEscapeKey} to exit full screen`;
-
-		this.activeTabIndex = -1;
-		this.tabs = [];
-		this.functionalTabs = {};
-	}
-
-	init() {
-		this.loadProxy().then(() => {
-			this.initSidebar();
-			this.initTabs();
-			this.initActions();
-			this.registerIpcs();
-			this.initDefaultSettings();
-		});
-	}
-
-	loadProxy() {
-		return new Promise(resolve => {
-			const proxyEnabled = ConfigUtil.getConfigItem('useProxy', false);
-			if (proxyEnabled) {
-				session.fromPartition('persist:webviewsession').setProxy({
-					pacScript: ConfigUtil.getConfigItem('proxyPAC', ''),
-					proxyRules: ConfigUtil.getConfigItem('proxyRules', ''),
-					proxyBypassRules: ConfigUtil.getConfigItem('proxyBypass', '')
-				}, resolve);
-			} else {
-				session.fromPartition('persist:webviewsession').setProxy({
-					pacScript: '',
-					proxyRules: '',
-					proxyBypassRules: ''
-				}, resolve);
-			}
-		});
-	}
-
-	// Settings are initialized only when user clicks on General/Server/Network section settings
-	// In case, user doesn't visit these section, those values set to be null automatically
-	// This will make sure the default settings are correctly set to either true or false
-	initDefaultSettings() {
-		// Default settings which should be respected
-		const settingOptions = {
-			trayIcon: true,
-			useProxy: false,
-			showSidebar: true,
-			badgeOption: true,
-			startAtLogin: false,
-			startMinimized: false,
-			enableSpellchecker: true,
-			showNotification: true,
-			betaUpdate: false,
-			silent: false,
-			lastActiveTab: 0
-		};
-
-		// Platform specific settings
-
-		if (process.platform === 'win32') {
-			// Only available on Windows
-			settingOptions.flashTaskbarOnMessage = true;
-		}
-
-		for (const i in settingOptions) {
-			if (ConfigUtil.getConfigItem(i) === null) {
-				ConfigUtil.setConfigItem(i, settingOptions[i]);
-			}
-		}
-	}
-
-	initSidebar() {
-		const showSidebar = ConfigUtil.getConfigItem('showSidebar', true);
-		this.toggleSidebar(showSidebar);
-	}
-
-	initTabs() {
-		const servers = DomainUtil.getDomains();
-		if (servers.length > 0) {
-			for (let i = 0; i < servers.length; i++) {
-				this.initServer(servers[i], i);
-				DomainUtil.updateSavedServer(servers[i].url, i);
-				this.activateTab(i);
-			}
-			// Open last active tab
-			this.activateTab(ConfigUtil.getConfigItem('lastActiveTab'));
-		} else {
-			this.openSettings('Servers');
-		}
-	}
-
-	initServer(server, index) {
-		this.tabs.push(new ServerTab({
-			role: 'server',
-			icon: server.icon,
-			$root: this.$tabsContainer,
-			onClick: this.activateLastTab.bind(this, index),
-			index,
-			onHover: this.onHover.bind(this, index, server.alias),
-			onHoverOut: this.onHoverOut.bind(this, index),
-			webview: new WebView({
-				$root: this.$webviewsContainer,
-				index,
-				url: server.url,
-				name: server.alias,
-				isActive: () => {
-					return index === this.activeTabIndex;
-				},
-				onNetworkError: this.openNetworkTroubleshooting.bind(this),
-				onTitleChange: this.updateBadge.bind(this),
-				nodeIntegration: false,
-				preload: true
-			})
-		}));
-	}
-
-	initActions() {
-		this.$reloadButton.addEventListener('click', () => {
-			this.tabs[this.activeTabIndex].webview.reload();
-		});
-		this.$addServerButton.addEventListener('click', () => {
-			this.openSettings('Servers');
-		});
-		this.$settingsButton.addEventListener('click', () => {
-			this.openSettings('General');
-		});
-
-		const $serverImgs = document.querySelectorAll('.server-icons');
-		$serverImgs.forEach($serverImg => {
-			$serverImg.addEventListener('error', () => {
-				$serverImg.src = 'img/icon.png';
-			});
-		});
-
-		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip);
-		this.sidebarHoverEvent(this.$settingsButton, this.$settingsTooltip);
-		this.sidebarHoverEvent(this.$reloadButton, this.$reloadTooltip);
-	}
-
-	sidebarHoverEvent(SidebarButton, SidebarTooltip) {
-		SidebarButton.addEventListener('mouseover', () => {
-			SidebarTooltip.removeAttribute('style');
-		});
-		SidebarButton.addEventListener('mouseout', () => {
-			SidebarTooltip.style.display = 'none';
-		});
-	}
-
-	onHover(index, serverName) {
-		this.$serverIconTooltip[index].innerHTML = serverName;
-		this.$serverIconTooltip[index].removeAttribute('style');
-	}
-
-	onHoverOut(index) {
-		this.$serverIconTooltip[index].style.display = 'none';
-	}
-
-	openFunctionalTab(tabProps) {
-		if (this.functionalTabs[tabProps.name] !== undefined) {
-			this.activateTab(this.functionalTabs[tabProps.name]);
-			return;
-		}
-
-		this.functionalTabs[tabProps.name] = this.tabs.length;
-
-		this.tabs.push(new FunctionalTab({
-			role: 'function',
-			materialIcon: tabProps.materialIcon,
-			$root: this.$tabsContainer,
-			index: this.functionalTabs[tabProps.name],
-			onClick: this.activateTab.bind(this, this.functionalTabs[tabProps.name]),
-			onDestroy: this.destroyTab.bind(this, tabProps.name, this.functionalTabs[tabProps.name]),
-			webview: new WebView({
-				$root: this.$webviewsContainer,
-				index: this.functionalTabs[tabProps.name],
-				url: tabProps.url,
-				name: tabProps.name,
-				isActive: () => {
-					return this.functionalTabs[tabProps.name] === this.activeTabIndex;
-				},
-				onNetworkError: this.openNetworkTroubleshooting.bind(this),
-				onTitleChange: this.updateBadge.bind(this),
-				nodeIntegration: true,
-				preload: false
-			})
-		}));
-
-		this.activateTab(this.functionalTabs[tabProps.name]);
-	}
-
-	openSettings(nav = 'General') {
-		this.openFunctionalTab({
-			name: 'Settings',
-			materialIcon: 'settings',
-			url: `file://${__dirname}/preference.html#${nav}`
-		});
-		this.tabs[this.functionalTabs.Settings].webview.send('switch-settings-nav', nav);
-	}
-
-	openAbout() {
-		this.openFunctionalTab({
-			name: 'About',
-			materialIcon: 'sentiment_very_satisfied',
-			url: `file://${__dirname}/about.html`
-		});
-	}
-
-	openNetworkTroubleshooting() {
-		this.openFunctionalTab({
-			name: 'Network Troubleshooting',
-			materialIcon: 'network_check',
-			url: `file://${__dirname}/network.html`
-		});
-	}
-
-	activateLastTab(index) {
-		// Open last active tab
-		ConfigUtil.setConfigItem('lastActiveTab', index);
-		// Open all the tabs in background
-		this.activateTab(index);
-	}
-
-	activateTab(index, hideOldTab = true) {
-		if (!this.tabs[index]) {
-			return;
-		}
-
-		if (this.activeTabIndex !== -1) {
-			if (this.activeTabIndex === index) {
-				return;
-			} else if (hideOldTab) {
-				this.tabs[this.activeTabIndex].deactivate();
-			}
-		}
-
-		this.activeTabIndex = index;
-		this.tabs[index].activate();
-
-		ipcRenderer.send('update-menu', {
-			tabs: this.tabs,
-			activeTabIndex: this.activeTabIndex
-		});
-
-		ipcRenderer.on('toggle-sidebar', (event, state) => {
-			const selector = 'webview:not([class*=disabled])';
-			const webview = document.querySelector(selector);
-			const webContents = webview.getWebContents();
-			webContents.send('toggle-sidebar', state);
-		});
-
-		ipcRenderer.on('toogle-silent', (event, state) => {
-			const webviews = document.querySelectorAll('webview');
-			webviews.forEach(webview => {
-				try {
-					webview.setAudioMuted(state);
-				} catch (err) {
-					// webview is not ready yet
-					webview.addEventListener('dom-ready', () => {
-						webview.isAudioMuted();
-					});
-				}
-			});
-		});
-	}
-
-	destroyTab(name, index) {
-		if (this.tabs[index].webview.loading) {
-			return;
-		}
-
-		this.tabs[index].destroy();
-
-		delete this.tabs[index];
-		delete this.functionalTabs[name];
-
-		// Issue #188: If the functional tab was not focused, do not activate another tab.
-		if (this.activeTabIndex === index) {
-			this.activateTab(0, false);
-		}
-	}
-
-	destroyView() {
-		// Clear global variables
-		this.activeTabIndex = -1;
-		this.tabs = [];
-		this.functionalTabs = {};
-
-		// Clear DOM elements
-		this.$tabsContainer.innerHTML = '';
-		this.$webviewsContainer.innerHTML = '';
-	}
-
-	reloadView() {
-		// Save and remember the index of last active tab so that we can use it later
-		const lastActiveTab = this.tabs[this.activeTabIndex].props.index;
-		ConfigUtil.setConfigItem('lastActiveTab', lastActiveTab);
-
-		// Destroy the current view and re-initiate it
-		this.destroyView();
-		this.initTabs();
-	}
-
-	// This will trigger when pressed CTRL/CMD + R [WIP]
-	// It won't reload the current view properly when you add/delete a server.
-	reloadCurrentView() {
-		this.$reloadButton.click();
-	}
-
-	updateBadge() {
-		let messageCountAll = 0;
-		for (let i = 0; i < this.tabs.length; i++) {
-			if (this.tabs[i] && this.tabs[i].updateBadge) {
-				const count = this.tabs[i].webview.badgeCount;
-				messageCountAll += count;
-				this.tabs[i].updateBadge(count);
-			}
-		}
-
-		ipcRenderer.send('update-badge', messageCountAll);
-	}
-
-	toggleSidebar(show) {
-		if (show) {
-			this.$sidebar.classList.remove('sidebar-hide');
-		} else {
-			this.$sidebar.classList.add('sidebar-hide');
-		}
-	}
-
-	registerIpcs() {
-		const webviewListeners = {
-			'webview-reload': 'reload',
-			back: 'back',
-			focus: 'focus',
-			forward: 'forward',
-			zoomIn: 'zoomIn',
-			zoomOut: 'zoomOut',
-			zoomActualSize: 'zoomActualSize',
-			'log-out': 'logOut',
-			shortcut: 'showShortcut',
-			'tab-devtools': 'openDevTools'
-		};
-
-		for (const key in webviewListeners) {
-			ipcRenderer.on(key, () => {
-				const activeWebview = this.tabs[this.activeTabIndex].webview;
-				if (activeWebview) {
-					activeWebview[webviewListeners[key]]();
-				}
-			});
-		}
-
-		ipcRenderer.on('open-settings', (event, settingNav) => {
-			this.openSettings(settingNav);
-		});
-
-		ipcRenderer.on('open-about', this.openAbout.bind(this));
-
-		ipcRenderer.on('reload-viewer', this.reloadView.bind(this, this.tabs[this.activeTabIndex].props.index));
-
-		ipcRenderer.on('reload-current-viewer', this.reloadCurrentView.bind(this));
-
-		ipcRenderer.on('hard-reload', () => {
-			ipcRenderer.send('reload-full-app');
-		});
-
-		ipcRenderer.on('clear-app-data', () => {
-			ipcRenderer.send('clear-app-settings');
-		});
-
-		ipcRenderer.on('switch-server-tab', (event, index) => {
-			this.activateTab(index);
-		});
-
-		ipcRenderer.on('reload-proxy', (event, showAlert) => {
-			this.loadProxy().then(() => {
-				if (showAlert) {
-					alert('Proxy settings saved!');
-				}
-			});
-		});
-
-		ipcRenderer.on('toggle-sidebar', (event, show) => {
-			this.toggleSidebar(show);
-		});
-
-		ipcRenderer.on('enter-fullscreen', () => {
-			this.$fullscreenPopup.classList.add('show');
-			this.$fullscreenPopup.classList.remove('hidden');
-		});
-
-		ipcRenderer.on('leave-fullscreen', () => {
-			this.$fullscreenPopup.classList.remove('show');
-		});
-
-		ipcRenderer.on('render-taskbar-icon', (event, messageCount) => {
-			// Create a canvas from unread messagecounts
-			function createOverlayIcon(messageCount) {
-				const canvas = document.createElement('canvas');
-				canvas.height = 128;
-				canvas.width = 128;
-				canvas.style.letterSpacing = '-5px';
-				const ctx = canvas.getContext('2d');
-				ctx.fillStyle = '#f42020';
-				ctx.beginPath();
-				ctx.ellipse(64, 64, 64, 64, 0, 0, 2 * Math.PI);
-				ctx.fill();
-				ctx.textAlign = 'center';
-				ctx.fillStyle = 'white';
-				if (messageCount > 99) {
-					ctx.font = '65px Helvetica';
-					ctx.fillText('99+', 64, 85);
-				} else if (messageCount < 10) {
-					ctx.font = '90px Helvetica';
-					ctx.fillText(String(Math.min(99, messageCount)), 64, 96);
-				} else {
-					ctx.font = '85px Helvetica';
-					ctx.fillText(String(Math.min(99, messageCount)), 64, 90);
-				}
-				return canvas;
-			}
-			ipcRenderer.send('update-taskbar-icon', createOverlayIcon(messageCount).toDataURL(), String(messageCount));
-		});
-	}
-}
-
-window.onload = () => {
-	const serverManagerView = new ServerManagerView();
-	serverManagerView.init();
-
-	window.addEventListener('online', () => {
-		serverManagerView.reloadView();
-	});
-};

app/renderer/js/main.ts

@@ -0,0 +1,990 @@
+'use strict';
+
+import { ipcRenderer, remote, clipboard, shell } from 'electron';
+import { feedbackHolder } from './feedback';
+
+import path = require('path');
+import escape = require('escape-html');
+import isDev = require('electron-is-dev');
+const { session, app, Menu, dialog } = remote;
+
+// eslint-disable-next-line import/no-unassigned-import
+require('./tray');
+
+import DomainUtil = require('./utils/domain-util');
+import WebView = require('./components/webview');
+import ServerTab = require('./components/server-tab');
+import FunctionalTab = require('./components/functional-tab');
+import ConfigUtil = require('./utils/config-util');
+import DNDUtil = require('./utils/dnd-util');
+import ReconnectUtil = require('./utils/reconnect-util');
+import Logger = require('./utils/logger-util');
+import CommonUtil = require('./utils/common-util');
+import EnterpriseUtil = require('./utils/enterprise-util');
+import Messages = require('./../../resources/messages');
+
+const logger = new Logger({
+	file: 'errors.log',
+	timestamp: true
+});
+
+interface FunctionalTabProps {
+	name: string;
+	materialIcon: string;
+	url: string;
+}
+
+interface AnyObject {
+	[key: string]: any;
+}
+
+interface SettingsOptions {
+	autoHideMenubar: boolean;
+	trayIcon: boolean;
+	useManualProxy: boolean;
+	useSystemProxy: boolean;
+	showSidebar: boolean;
+	badgeOption: boolean;
+	startAtLogin: boolean;
+	startMinimized: boolean;
+	enableSpellchecker: boolean;
+	showNotification: boolean;
+	autoUpdate: boolean;
+	betaUpdate: boolean;
+	errorReporting: boolean;
+	customCSS: boolean;
+	silent: boolean;
+	lastActiveTab: number;
+	dnd: boolean;
+	dndPreviousSettings: {
+		showNotification: boolean;
+		silent: boolean;
+		flashTaskbarOnMessage?: boolean;
+	};
+	downloadsPath: string;
+	showDownloadFolder: boolean;
+	flashTaskbarOnMessage?: boolean;
+	dockBouncing?: boolean;
+	loading?: AnyObject;
+}
+
+const rendererDirectory = path.resolve(__dirname, '..');
+type ServerOrFunctionalTab = ServerTab | FunctionalTab;
+
+class ServerManagerView {
+	$addServerButton: HTMLButtonElement;
+	$tabsContainer: Element;
+	$reloadButton: HTMLButtonElement;
+	$loadingIndicator: HTMLButtonElement;
+	$settingsButton: HTMLButtonElement;
+	$webviewsContainer: Element;
+	$backButton: HTMLButtonElement;
+	$dndButton: HTMLButtonElement;
+	$addServerTooltip: HTMLElement;
+	$reloadTooltip: HTMLElement;
+	$loadingTooltip: HTMLElement;
+	$settingsTooltip: HTMLElement;
+	$serverIconTooltip: HTMLCollectionOf<HTMLElement>;
+	$backTooltip: HTMLElement;
+	$dndTooltip: HTMLElement;
+	$sidebar: Element;
+	$fullscreenPopup: Element;
+	$fullscreenEscapeKey: string;
+	loading: AnyObject;
+	activeTabIndex: number;
+	tabs: ServerOrFunctionalTab[];
+	functionalTabs: AnyObject;
+	tabIndex: number;
+	presetOrgs: string[];
+	constructor() {
+		this.$addServerButton = document.querySelector('#add-tab');
+		this.$tabsContainer = document.querySelector('#tabs-container');
+
+		const $actionsContainer = document.querySelector('#actions-container');
+		this.$reloadButton = $actionsContainer.querySelector('#reload-action');
+		this.$loadingIndicator = $actionsContainer.querySelector('#loading-action');
+		this.$settingsButton = $actionsContainer.querySelector('#settings-action');
+		this.$webviewsContainer = document.querySelector('#webviews-container');
+		this.$backButton = $actionsContainer.querySelector('#back-action');
+		this.$dndButton = $actionsContainer.querySelector('#dnd-action');
+
+		this.$addServerTooltip = document.querySelector('#add-server-tooltip');
+		this.$reloadTooltip = $actionsContainer.querySelector('#reload-tooltip');
+		this.$loadingTooltip = $actionsContainer.querySelector('#loading-tooltip');
+		this.$settingsTooltip = $actionsContainer.querySelector('#setting-tooltip');
+
+		// TODO: This should have been querySelector but the problem is that
+		// querySelector doesn't return elements not present in dom whereas somehow
+		// getElementsByClassName does. To fix this we need to call this after this.initTabs
+		// is called in this.init.
+		// eslint-disable-next-line unicorn/prefer-query-selector
+		this.$serverIconTooltip = document.getElementsByClassName('server-tooltip') as HTMLCollectionOf<HTMLElement>;
+		this.$backTooltip = $actionsContainer.querySelector('#back-tooltip');
+		this.$dndTooltip = $actionsContainer.querySelector('#dnd-tooltip');
+
+		this.$sidebar = document.querySelector('#sidebar');
+
+		this.$fullscreenPopup = document.querySelector('#fullscreen-popup');
+		this.$fullscreenEscapeKey = process.platform === 'darwin' ? '^⌘F' : 'F11';
+		this.$fullscreenPopup.innerHTML = `Press ${this.$fullscreenEscapeKey} to exit full screen`;
+
+		this.loading = {};
+		this.activeTabIndex = -1;
+		this.tabs = [];
+		this.presetOrgs = [];
+		this.functionalTabs = {};
+		this.tabIndex = 0;
+	}
+
+	init(): void {
+		this.loadProxy().then(() => {
+			this.initDefaultSettings();
+			this.initSidebar();
+			if (EnterpriseUtil.configFile) {
+				this.initPresetOrgs();
+			}
+			this.initTabs();
+			this.initActions();
+			this.registerIpcs();
+		});
+	}
+
+	loadProxy(): Promise<boolean> {
+		return new Promise(resolve => {
+			// To change proxyEnable to useManualProxy in older versions
+			const proxyEnabledOld = ConfigUtil.isConfigItemExists('useProxy');
+			if (proxyEnabledOld) {
+				const proxyEnableOldState = ConfigUtil.getConfigItem('useProxy');
+				if (proxyEnableOldState) {
+					ConfigUtil.setConfigItem('useManualProxy', true);
+				}
+				ConfigUtil.removeConfigItem('useProxy');
+			}
+
+			const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
+			if (proxyEnabled) {
+				session.fromPartition('persist:webviewsession').setProxy({
+					pacScript: ConfigUtil.getConfigItem('proxyPAC', ''),
+					proxyRules: ConfigUtil.getConfigItem('proxyRules', ''),
+					proxyBypassRules: ConfigUtil.getConfigItem('proxyBypass', '')
+				}, resolve);
+			} else {
+				session.fromPartition('persist:webviewsession').setProxy({
+					pacScript: '',
+					proxyRules: '',
+					proxyBypassRules: ''
+				}, resolve);
+			}
+		});
+	}
+
+	// Settings are initialized only when user clicks on General/Server/Network section settings
+	// In case, user doesn't visit these section, those values set to be null automatically
+	// This will make sure the default settings are correctly set to either true or false
+	initDefaultSettings(): void {
+		// Default settings which should be respected
+		const settingOptions: SettingsOptions = {
+			autoHideMenubar: false,
+			trayIcon: true,
+			useManualProxy: false,
+			useSystemProxy: false,
+			showSidebar: true,
+			badgeOption: true,
+			startAtLogin: true,
+			startMinimized: false,
+			enableSpellchecker: true,
+			showNotification: true,
+			autoUpdate: true,
+			betaUpdate: false,
+			errorReporting: true,
+			customCSS: false,
+			silent: false,
+			lastActiveTab: 0,
+			dnd: false,
+			dndPreviousSettings: {
+				showNotification: true,
+				silent: false
+			},
+			downloadsPath: `${app.getPath('downloads')}`,
+			showDownloadFolder: false
+		};
+
+		// Platform specific settings
+
+		if (process.platform === 'win32') {
+			// Only available on Windows
+			settingOptions.flashTaskbarOnMessage = true;
+			settingOptions.dndPreviousSettings.flashTaskbarOnMessage = true;
+		}
+
+		if (process.platform === 'darwin') {
+			// Only available on macOS
+			settingOptions.dockBouncing = true;
+		}
+
+		if (process.platform !== 'darwin') {
+			settingOptions.autoHideMenubar = false;
+		}
+
+		for (const i in settingOptions) {
+			const setting = i as keyof SettingsOptions;
+			// give preference to defaults defined in global_config.json
+			if (EnterpriseUtil.configItemExists(setting)) {
+				ConfigUtil.setConfigItem(setting, EnterpriseUtil.getConfigItem(setting), true);
+			} else if (ConfigUtil.getConfigItem(setting) === null) {
+				ConfigUtil.setConfigItem(setting, settingOptions[setting]);
+			}
+		}
+	}
+
+	initSidebar(): void {
+		const showSidebar = ConfigUtil.getConfigItem('showSidebar', true);
+		this.toggleSidebar(showSidebar);
+	}
+
+	async queueDomain(domain: any): Promise<boolean> {
+		// allows us to start adding multiple domains to the app simultaneously
+		// promise of addition resolves in both cases, but we consider it rejected
+		// if the resolved value is false
+		try {
+			const serverConf = await DomainUtil.checkDomain(domain);
+			await DomainUtil.addDomain(serverConf);
+			return true;
+		} catch (err) {
+			logger.error(err);
+			logger.error('Could not add ' + domain + '. Please contact your system administrator.');
+			return false;
+		}
+	}
+
+	async initPresetOrgs(): Promise<void> {
+		// read preset organizations from global_config.json and queues them
+		// for addition to the app's domains
+		const preAddedDomains = DomainUtil.getDomains();
+		this.presetOrgs = EnterpriseUtil.getConfigItem('presetOrganizations', []);
+		// set to true if at least one new domain is added
+		const domainPromises = [];
+		for (const url of this.presetOrgs) {
+			if (DomainUtil.duplicateDomain(url)) {
+				continue;
+			}
+			domainPromises.push(this.queueDomain(url));
+		}
+		const domainsAdded = await Promise.all(domainPromises);
+		if (domainsAdded.includes(true)) {
+			// at least one domain was resolved
+			if (preAddedDomains.length > 0) {
+				// user already has servers added
+				// ask them before reloading the app
+				dialog.showMessageBox({
+					type: 'question',
+					buttons: ['Yes', 'Later'],
+					defaultId: 0,
+					message: 'New server' + (domainsAdded.length > 1 ? 's' : '') + ' added. Reload app now?'
+				}, response => {
+					if (response === 0) {
+						ipcRenderer.send('reload-full-app');
+					}
+				});
+			} else {
+				ipcRenderer.send('reload-full-app');
+			}
+		} else if (domainsAdded.length > 0) {
+			// find all orgs that failed
+			const failedDomains: string[] = [];
+			for (const org of this.presetOrgs) {
+				if (DomainUtil.duplicateDomain(org)) {
+					continue;
+				}
+				failedDomains.push(org);
+			}
+			const { title, content } = Messages.enterpriseOrgError(domainsAdded.length, failedDomains);
+			dialog.showErrorBox(title, content);
+			if (DomainUtil.getDomains().length === 0) {
+				// no orgs present, stop showing loading gif
+				this.openSettings('AddServer');
+			}
+		}
+	}
+
+	initTabs(): void {
+		const servers = DomainUtil.getDomains();
+		if (servers.length > 0) {
+			for (let i = 0; i < servers.length; i++) {
+				this.initServer(servers[i], i);
+				DomainUtil.updateSavedServer(servers[i].url, i);
+				this.activateTab(i);
+			}
+			// Open last active tab
+			this.activateTab(ConfigUtil.getConfigItem('lastActiveTab'));
+			// Remove focus from the settings icon at sidebar bottom
+			this.$settingsButton.classList.remove('active');
+		} else if (this.presetOrgs.length === 0) {
+			// not attempting to add organisations in the background
+			this.openSettings('AddServer');
+		} else {
+			this.showLoading(true);
+		}
+	}
+
+	initServer(server: any, index: number): void {
+		const tabIndex = this.getTabIndex();
+		this.tabs.push(new ServerTab({
+			role: 'server',
+			icon: server.icon,
+			name: server.alias,
+			$root: this.$tabsContainer,
+			onClick: this.activateLastTab.bind(this, index),
+			index,
+			tabIndex,
+			onHover: this.onHover.bind(this, index),
+			onHoverOut: this.onHoverOut.bind(this, index),
+			webview: new WebView({
+				$root: this.$webviewsContainer,
+				index,
+				tabIndex,
+				url: server.url,
+				role: 'server',
+				name: CommonUtil.decodeString(server.alias),
+				isActive: () => {
+					return index === this.activeTabIndex;
+				},
+				switchLoading: (loading: boolean, url: string) => {
+					if (!loading && this.loading[url]) {
+						this.loading[url] = false;
+					} else if (loading && !this.loading[url]) {
+						this.loading[url] = true;
+					}
+					this.showLoading(this.loading[this.tabs[this.activeTabIndex].webview.props.url]);
+				},
+				onNetworkError: this.openNetworkTroubleshooting.bind(this),
+				onTitleChange: this.updateBadge.bind(this),
+				nodeIntegration: false,
+				preload: true
+			})
+		}));
+		this.loading[server.url] = true;
+	}
+
+	initActions(): void {
+		this.initDNDButton();
+		this.initServerActions();
+		this.initLeftSidebarEvents();
+	}
+
+	initServerActions(): void {
+		const $serverImgs: NodeListOf<HTMLImageElement> = document.querySelectorAll('.server-icons');
+		$serverImgs.forEach(($serverImg, index) => {
+			this.addContextMenu($serverImg, index);
+			if ($serverImg.src.includes('img/icon.png')) {
+				this.displayInitialCharLogo($serverImg, index);
+			}
+			$serverImg.addEventListener('error', () => {
+				this.displayInitialCharLogo($serverImg, index);
+			});
+		});
+	}
+
+	initLeftSidebarEvents(): void {
+		this.$dndButton.addEventListener('click', () => {
+			const dndUtil = DNDUtil.toggle();
+			ipcRenderer.send('forward-message', 'toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+		});
+		this.$reloadButton.addEventListener('click', () => {
+			this.tabs[this.activeTabIndex].webview.reload();
+		});
+		this.$addServerButton.addEventListener('click', () => {
+			this.openSettings('AddServer');
+		});
+		this.$settingsButton.addEventListener('click', () => {
+			this.openSettings('General');
+		});
+		this.$backButton.addEventListener('click', () => {
+			this.tabs[this.activeTabIndex].webview.back();
+		});
+
+		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip, true);
+		this.sidebarHoverEvent(this.$loadingIndicator, this.$loadingTooltip);
+		this.sidebarHoverEvent(this.$settingsButton, this.$settingsTooltip);
+		this.sidebarHoverEvent(this.$reloadButton, this.$reloadTooltip);
+		this.sidebarHoverEvent(this.$backButton, this.$backTooltip);
+		this.sidebarHoverEvent(this.$dndButton, this.$dndTooltip);
+	}
+
+	initDNDButton(): void {
+		const dnd = ConfigUtil.getConfigItem('dnd', false);
+		this.toggleDNDButton(dnd);
+	}
+
+	getTabIndex(): number {
+		const currentIndex = this.tabIndex;
+		this.tabIndex++;
+		return currentIndex;
+	}
+
+	getCurrentActiveServer(): string {
+		return this.tabs[this.activeTabIndex].webview.props.url;
+	}
+
+	displayInitialCharLogo($img: HTMLImageElement, index: number): void {
+		/*
+			index parameter needed because webview[data-tab-id] can increment
+			beyond size of sidebar org array and throw error
+		*/
+
+		const $altIcon = document.createElement('div');
+		const $parent = $img.parentElement;
+		const $container = $parent.parentElement;
+		const webviewId = $container.dataset.tabId;
+		const $webview = document.querySelector(`webview[data-tab-id="${webviewId}"]`);
+		const realmName = $webview.getAttribute('name');
+
+		if (realmName === null) {
+			$img.src = '/img/icon.png';
+			return;
+		}
+
+		$altIcon.textContent = realmName.charAt(0) || 'Z';
+		$altIcon.classList.add('server-icon');
+		$altIcon.classList.add('alt-icon');
+
+		$parent.removeChild($img);
+		$parent.append($altIcon);
+
+		this.addContextMenu($altIcon as HTMLImageElement, index);
+	}
+
+	sidebarHoverEvent(SidebarButton: HTMLButtonElement, SidebarTooltip: HTMLElement, addServer = false): void {
+		SidebarButton.addEventListener('mouseover', () => {
+			SidebarTooltip.removeAttribute('style');
+			// To handle position of add server tooltip due to scrolling of list of organizations
+			// This could not be handled using CSS, hence the top of the tooltip is made same
+			// as that of its parent element.
+			// This needs to handled only for the add server tooltip and not others.
+			if (addServer) {
+				const { top } = SidebarButton.getBoundingClientRect();
+				SidebarTooltip.style.top = top + 'px';
+			}
+		});
+		SidebarButton.addEventListener('mouseout', () => {
+			SidebarTooltip.style.display = 'none';
+		});
+	}
+
+	onHover(index: number): void {
+		// this.$serverIconTooltip[index].innerHTML already has realm name, so we are just
+		// removing the style.
+		this.$serverIconTooltip[index].removeAttribute('style');
+		// To handle position of servers' tooltip due to scrolling of list of organizations
+		// This could not be handled using CSS, hence the top of the tooltip is made same
+		// as that of its parent element.
+		const { top } = this.$serverIconTooltip[index].parentElement.getBoundingClientRect();
+		this.$serverIconTooltip[index].style.top = top + 'px';
+	}
+
+	onHoverOut(index: number): void {
+		this.$serverIconTooltip[index].style.display = 'none';
+	}
+
+	openFunctionalTab(tabProps: FunctionalTabProps): void {
+		if (this.functionalTabs[tabProps.name] !== undefined) {
+			this.activateTab(this.functionalTabs[tabProps.name]);
+			return;
+		}
+
+		this.functionalTabs[tabProps.name] = this.tabs.length;
+
+		const tabIndex = this.getTabIndex();
+
+		this.tabs.push(new FunctionalTab({
+			role: 'function',
+			materialIcon: tabProps.materialIcon,
+			name: tabProps.name,
+			$root: this.$tabsContainer,
+			index: this.functionalTabs[tabProps.name],
+			tabIndex,
+			onClick: this.activateTab.bind(this, this.functionalTabs[tabProps.name]),
+			onDestroy: this.destroyTab.bind(this, tabProps.name, this.functionalTabs[tabProps.name]),
+			webview: new WebView({
+				$root: this.$webviewsContainer,
+				index: this.functionalTabs[tabProps.name],
+				tabIndex,
+				url: tabProps.url,
+				role: 'function',
+				name: tabProps.name,
+				isActive: () => {
+					return this.functionalTabs[tabProps.name] === this.activeTabIndex;
+				},
+				switchLoading: (loading: AnyObject, url: string) => {
+					if (!loading && this.loading[url]) {
+						this.loading[url] = false;
+					} else if (loading && !this.loading[url]) {
+						this.loading[url] = true;
+					}
+					this.showLoading(this.loading[this.tabs[this.activeTabIndex].webview.props.url]);
+				},
+				onNetworkError: this.openNetworkTroubleshooting.bind(this),
+				onTitleChange: this.updateBadge.bind(this),
+				nodeIntegration: true,
+				preload: false
+			})
+		}));
+
+		// To show loading indicator the first time a functional tab is opened, indicator is
+		// closed when the functional tab DOM is ready, handled in webview.js
+		this.$webviewsContainer.classList.remove('loaded');
+
+		this.activateTab(this.functionalTabs[tabProps.name]);
+	}
+
+	openSettings(nav = 'General'): void {
+		this.openFunctionalTab({
+			name: 'Settings',
+			materialIcon: 'settings',
+			url: `file://${rendererDirectory}/preference.html#${nav}`
+		});
+		this.$settingsButton.classList.add('active');
+		this.tabs[this.functionalTabs.Settings].webview.send('switch-settings-nav', nav);
+	}
+
+	openAbout(): void {
+		this.openFunctionalTab({
+			name: 'About',
+			materialIcon: 'sentiment_very_satisfied',
+			url: `file://${rendererDirectory}/about.html`
+		});
+	}
+
+	openNetworkTroubleshooting(): void {
+		this.openFunctionalTab({
+			name: 'Network Troubleshooting',
+			materialIcon: 'network_check',
+			url: `file://${rendererDirectory}/network.html`
+		});
+	}
+
+	activateLastTab(index: number): void {
+		// Open all the tabs in background, also activate the tab based on the index
+		this.activateTab(index);
+		// Save last active tab via main process to avoid JSON DB errors
+		ipcRenderer.send('save-last-tab', index);
+	}
+
+	// returns this.tabs in an way that does
+	// not crash app when this.tabs is passed into
+	// ipcRenderer. Something about webview, and props.webview
+	// properties in ServerTab causes the app to crash.
+	get tabsForIpc(): ServerOrFunctionalTab[] {
+		const tabs: ServerOrFunctionalTab[] = [];
+		this.tabs.forEach((tab: ServerOrFunctionalTab) => {
+			const proto = Object.create(Object.getPrototypeOf(tab));
+			const tabClone = Object.assign(proto, tab);
+
+			tabClone.webview = { props: {} };
+			tabClone.webview.props.name = tab.webview.props.name;
+			delete tabClone.props.webview;
+			tabs.push(tabClone);
+		});
+
+		return tabs;
+	}
+
+	activateTab(index: number, hideOldTab = true): void {
+		if (!this.tabs[index]) {
+			return;
+		}
+
+		if (this.activeTabIndex !== -1) {
+			if (this.activeTabIndex === index) {
+				return;
+			} else if (hideOldTab) {
+				// If old tab is functional tab Settings, remove focus from the settings icon at sidebar bottom
+				if (this.tabs[this.activeTabIndex].props.role === 'function' && this.tabs[this.activeTabIndex].props.name === 'Settings') {
+					this.$settingsButton.classList.remove('active');
+				}
+				this.tabs[this.activeTabIndex].deactivate();
+			}
+		}
+
+		try {
+			this.tabs[index].webview.canGoBackButton();
+		} catch (err) {
+		}
+
+		this.activeTabIndex = index;
+		this.tabs[index].activate();
+
+		this.showLoading(this.loading[this.tabs[this.activeTabIndex].webview.props.url]);
+
+		ipcRenderer.send('update-menu', {
+			// JSON stringify this.tabs to avoid a crash
+			// util.inspect is being used to handle circular references
+			tabs: this.tabsForIpc,
+			activeTabIndex: this.activeTabIndex,
+			// Following flag controls whether a menu item should be enabled or not
+			enableMenu: this.tabs[index].props.role === 'server'
+		});
+	}
+
+	showLoading(loading: boolean): void {
+		if (!loading) {
+			this.$reloadButton.removeAttribute('style');
+			this.$loadingIndicator.style.display = 'none';
+		} else if (loading) {
+			this.$reloadButton.style.display = 'none';
+			this.$loadingIndicator.removeAttribute('style');
+		}
+	}
+
+	destroyTab(name: string, index: number): void {
+		if (this.tabs[index].webview.loading) {
+			return;
+		}
+
+		this.tabs[index].destroy();
+
+		delete this.tabs[index];
+		delete this.functionalTabs[name];
+
+		// Issue #188: If the functional tab was not focused, do not activate another tab.
+		if (this.activeTabIndex === index) {
+			this.activateTab(0, false);
+		}
+	}
+
+	destroyView(): void {
+		// Show loading indicator
+		this.$webviewsContainer.classList.remove('loaded');
+
+		// Clear global variables
+		this.activeTabIndex = -1;
+		this.tabs = [];
+		this.functionalTabs = {};
+
+		// Clear DOM elements
+		this.$tabsContainer.innerHTML = '';
+		this.$webviewsContainer.innerHTML = '';
+	}
+
+	reloadView(): void {
+		// Save and remember the index of last active tab so that we can use it later
+		const lastActiveTab = this.tabs[this.activeTabIndex].props.index;
+		ConfigUtil.setConfigItem('lastActiveTab', lastActiveTab);
+
+		// Destroy the current view and re-initiate it
+		this.destroyView();
+		this.initTabs();
+		this.initServerActions();
+	}
+
+	// This will trigger when pressed CTRL/CMD + R [WIP]
+	// It won't reload the current view properly when you add/delete a server.
+	reloadCurrentView(): void {
+		this.$reloadButton.click();
+	}
+
+	updateBadge(): void {
+		let messageCountAll = 0;
+		for (const tab of this.tabs) {
+			if (tab && tab instanceof ServerTab && tab.updateBadge) {
+				const count = tab.webview.badgeCount;
+				messageCountAll += count;
+				tab.updateBadge(count);
+			}
+		}
+
+		ipcRenderer.send('update-badge', messageCountAll);
+	}
+
+	updateGeneralSettings(setting: string, value: any): void {
+		const selector = 'webview:not([class*=disabled])';
+		const webview: Electron.WebviewTag = document.querySelector(selector);
+		if (webview) {
+			const webContents = webview.getWebContents();
+			webContents.send(setting, value);
+		}
+	}
+
+	toggleSidebar(show: boolean): void {
+		if (show) {
+			this.$sidebar.classList.remove('sidebar-hide');
+		} else {
+			this.$sidebar.classList.add('sidebar-hide');
+		}
+	}
+
+	// Toggles the dnd button icon.
+	toggleDNDButton(alert: boolean): void {
+		this.$dndTooltip.textContent = (alert ? 'Disable' : 'Enable') + ' Do Not Disturb';
+		this.$dndButton.querySelector('i').textContent = alert ? 'notifications_off' : 'notifications';
+	}
+
+	addContextMenu($serverImg: HTMLImageElement, index: number): void {
+		$serverImg.addEventListener('contextmenu', e => {
+			e.preventDefault();
+			const template = [
+				{
+					label: 'Disconnect organization',
+					click: () => {
+						dialog.showMessageBox({
+							type: 'warning',
+							buttons: ['YES', 'NO'],
+							defaultId: 0,
+							message: 'Are you sure you want to disconnect this organization?'
+						}, response => {
+							if (response === 0) {
+								if (DomainUtil.removeDomain(index)) {
+									ipcRenderer.send('reload-full-app');
+								} else {
+									const { title, content } = Messages.orgRemovalError(DomainUtil.getDomain(index).url);
+									dialog.showErrorBox(title, content);
+								}
+							}
+						});
+					}
+				},
+				{
+					label: 'Copy Zulip URL',
+					click: () => {
+						clipboard.writeText(DomainUtil.getDomain(index).url);
+					}
+				}
+			];
+			const contextMenu = Menu.buildFromTemplate(template);
+			contextMenu.popup({ window: remote.getCurrentWindow() });
+		});
+	}
+
+	registerIpcs(): void {
+		const webviewListeners: AnyObject = {
+			'webview-reload': 'reload',
+			back: 'back',
+			focus: 'focus',
+			forward: 'forward',
+			zoomIn: 'zoomIn',
+			zoomOut: 'zoomOut',
+			zoomActualSize: 'zoomActualSize',
+			'log-out': 'logOut',
+			shortcut: 'showShortcut',
+			'tab-devtools': 'openDevTools'
+		};
+
+		for (const key in webviewListeners) {
+			ipcRenderer.on(key, () => {
+				const activeWebview = this.tabs[this.activeTabIndex].webview;
+				if (activeWebview) {
+					activeWebview[webviewListeners[key] as string]();
+				}
+			});
+		}
+
+		ipcRenderer.on('open-settings', (event: Event, settingNav: string) => {
+			this.openSettings(settingNav);
+		});
+
+		ipcRenderer.on('open-about', this.openAbout.bind(this));
+
+		ipcRenderer.on('open-help', () => {
+			// Open help page of current active server
+			const helpPage = this.getCurrentActiveServer() + '/help';
+			shell.openExternal(helpPage);
+		});
+
+		ipcRenderer.on('reload-viewer', this.reloadView.bind(this, this.tabs[this.activeTabIndex].props.index));
+
+		ipcRenderer.on('reload-current-viewer', this.reloadCurrentView.bind(this));
+
+		ipcRenderer.on('hard-reload', () => {
+			ipcRenderer.send('reload-full-app');
+		});
+
+		ipcRenderer.on('clear-app-data', () => {
+			ipcRenderer.send('clear-app-settings');
+		});
+
+		ipcRenderer.on('switch-server-tab', (event: Event, index: number) => {
+			this.activateLastTab(index);
+		});
+
+		ipcRenderer.on('open-org-tab', () => {
+			this.openSettings('AddServer');
+		});
+
+		ipcRenderer.on('reload-proxy', (event: Event, showAlert: boolean) => {
+			this.loadProxy().then(() => {
+				if (showAlert) {
+					alert('Proxy settings saved!');
+					ipcRenderer.send('reload-full-app');
+				}
+			});
+		});
+
+		ipcRenderer.on('toggle-sidebar', (event: Event, show: boolean) => {
+			// Toggle the left sidebar
+			this.toggleSidebar(show);
+
+			// Toggle sidebar switch in the general settings
+			this.updateGeneralSettings('toggle-sidebar-setting', show);
+		});
+
+		ipcRenderer.on('toggle-silent', (event: Event, state: boolean) => {
+			const webviews: NodeListOf<Electron.WebviewTag> = document.querySelectorAll('webview');
+			webviews.forEach(webview => {
+				try {
+					webview.setAudioMuted(state);
+				} catch (err) {
+					// webview is not ready yet
+					webview.addEventListener('dom-ready', () => {
+						webview.setAudioMuted(state);
+					});
+				}
+			});
+		});
+
+		ipcRenderer.on('toggle-autohide-menubar', (event: Event, autoHideMenubar: boolean, updateMenu: boolean) => {
+			if (updateMenu) {
+				ipcRenderer.send('update-menu', {
+					tabs: this.tabsForIpc,
+					activeTabIndex: this.activeTabIndex
+				});
+				return;
+			}
+			this.updateGeneralSettings('toggle-menubar-setting', autoHideMenubar);
+		});
+
+		ipcRenderer.on('toggle-dnd', (event: Event, state: boolean, newSettings: SettingsOptions) => {
+			this.toggleDNDButton(state);
+			ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent);
+			const selector = 'webview:not([class*=disabled])';
+			const webview: Electron.WebviewTag = document.querySelector(selector);
+			const webContents = webview.getWebContents();
+			webContents.send('toggle-dnd', state, newSettings);
+		});
+
+		ipcRenderer.on('update-realm-name', (event: Event, serverURL: string, realmName: string) => {
+			// TODO: TypeScript - Type annotate getDomains() or this domain paramter.
+			DomainUtil.getDomains().forEach((domain: any, index: number) => {
+				if (domain.url.includes(serverURL)) {
+					const serverTooltipSelector = `.tab .server-tooltip`;
+					const serverTooltips = document.querySelectorAll(serverTooltipSelector);
+					serverTooltips[index].innerHTML = escape(realmName);
+					this.tabs[index].props.name = escape(realmName);
+					this.tabs[index].webview.props.name = realmName;
+
+					domain.alias = escape(realmName);
+					DomainUtil.db.push(`/domains[${index}]`, domain, true);
+					DomainUtil.reloadDB();
+					// Update the realm name also on the Window menu
+					ipcRenderer.send('update-menu', {
+						tabs: this.tabsForIpc,
+						activeTabIndex: this.activeTabIndex
+					});
+				}
+			});
+		});
+
+		ipcRenderer.on('update-realm-icon', (event: Event, serverURL: string, iconURL: string) => {
+			// TODO: TypeScript - Type annotate getDomains() or this domain paramter.
+			DomainUtil.getDomains().forEach((domain: any, index: number) => {
+				if (domain.url.includes(serverURL)) {
+					DomainUtil.saveServerIcon(iconURL).then((localIconUrl: string) => {
+						const serverImgsSelector = `.tab .server-icons`;
+						const serverImgs: NodeListOf<HTMLImageElement> = document.querySelectorAll(serverImgsSelector);
+						serverImgs[index].src = localIconUrl;
+
+						domain.icon = localIconUrl;
+						DomainUtil.db.push(`/domains[${index}]`, domain, true);
+						DomainUtil.reloadDB();
+					});
+				}
+			});
+		});
+
+		ipcRenderer.on('enter-fullscreen', () => {
+			this.$fullscreenPopup.classList.add('show');
+			this.$fullscreenPopup.classList.remove('hidden');
+		});
+
+		ipcRenderer.on('leave-fullscreen', () => {
+			this.$fullscreenPopup.classList.remove('show');
+		});
+
+		ipcRenderer.on('focus-webview-with-id', (event: Event, webviewId: number) => {
+			const webviews: NodeListOf<Electron.WebviewTag> = document.querySelectorAll('webview');
+			webviews.forEach(webview => {
+				const currentId = webview.getWebContents().id;
+				const tabId = webview.getAttribute('data-tab-id');
+				const concurrentTab: HTMLButtonElement = document.querySelector(`div[data-tab-id="${tabId}"]`);
+				if (currentId === webviewId) {
+					concurrentTab.click();
+				}
+			});
+		});
+
+		ipcRenderer.on('render-taskbar-icon', (event: Event, messageCount: number) => {
+			// Create a canvas from unread messagecounts
+			function createOverlayIcon(messageCount: number): HTMLCanvasElement {
+				const canvas = document.createElement('canvas');
+				canvas.height = 128;
+				canvas.width = 128;
+				canvas.style.letterSpacing = '-5px';
+				const ctx = canvas.getContext('2d');
+				ctx.fillStyle = '#f42020';
+				ctx.beginPath();
+				ctx.ellipse(64, 64, 64, 64, 0, 0, 2 * Math.PI);
+				ctx.fill();
+				ctx.textAlign = 'center';
+				ctx.fillStyle = 'white';
+				if (messageCount > 99) {
+					ctx.font = '65px Helvetica';
+					ctx.fillText('99+', 64, 85);
+				} else if (messageCount < 10) {
+					ctx.font = '90px Helvetica';
+					ctx.fillText(String(Math.min(99, messageCount)), 64, 96);
+				} else {
+					ctx.font = '85px Helvetica';
+					ctx.fillText(String(Math.min(99, messageCount)), 64, 90);
+				}
+				return canvas;
+			}
+			ipcRenderer.send('update-taskbar-icon', createOverlayIcon(messageCount).toDataURL(), String(messageCount));
+		});
+
+		ipcRenderer.on('open-feedback-modal', () => {
+			feedbackHolder.classList.add('show');
+		});
+
+		ipcRenderer.on('copy-zulip-url', () => {
+			clipboard.writeText(this.getCurrentActiveServer());
+		});
+
+		ipcRenderer.on('new-server', () => {
+			this.openSettings('AddServer');
+		});
+	}
+}
+
+window.addEventListener('load', () => {
+	const serverManagerView = new ServerManagerView();
+	const reconnectUtil = new ReconnectUtil(serverManagerView);
+	serverManagerView.init();
+	window.addEventListener('online', () => {
+		reconnectUtil.pollInternetAndReload();
+	});
+
+	window.addEventListener('offline', () => {
+		reconnectUtil.clearState();
+		logger.log('No internet connection, you are offline.');
+	});
+
+	// only start electron-connect (auto reload on change) when its ran
+	// from `npm run dev` or `gulp dev` and not from `npm start` when
+	// app is started `npm start` main process's proces.argv will have
+	// `--no-electron-connect`
+	const mainProcessArgv = remote.getGlobal('process').argv;
+	if (isDev && !mainProcessArgv.includes('--no-electron-connect')) {
+		require('electron-connect').client.create();
+	}
+});
+
+export = new ServerManagerView();

app/renderer/js/notification.js

@@ -1,34 +0,0 @@
-'use strict';
-
-const { remote, ipcRenderer } = require('electron');
-
-const ConfigUtil = require(__dirname + '/utils/config-util.js');
-
-const { app } = remote;
-
-// From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid
-// On windows 8 we have to explicitly set the appUserModelId otherwise notification won't work.
-app.setAppUserModelId('org.zulip.zulip-electron');
-
-const NativeNotification = window.Notification;
-
-class baseNotification extends NativeNotification {
-	constructor(title, opts) {
-		opts.silent = ConfigUtil.getConfigItem('silent') || false;
-		super(title, opts);
-
-		this.addEventListener('click', () => {
-			ipcRenderer.send('focus-app');
-		});
-	}
-	static requestPermission() {
-		return; // eslint-disable-line no-useless-return
-	}
-	// Override default Notification permission
-	static get permission() {
-		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
-	}
-}
-
-window.Notification = baseNotification;
-

app/renderer/js/notification/darwin-notifications.ts

@@ -0,0 +1,114 @@
+'use strict';
+import { ipcRenderer } from 'electron';
+import {
+	appId, customReply, focusCurrentServer, parseReply, setupReply
+} from './helpers';
+
+import url = require('url');
+import MacNotifier = require('node-mac-notifier');
+import ConfigUtil = require('../utils/config-util');
+
+type ReplyHandler = (response: string) => void;
+type ClickHandler = () => void;
+let replyHandler: ReplyHandler;
+let clickHandler: ClickHandler;
+
+declare const window: ZulipWebWindow;
+interface NotificationHandlerArgs {
+	response: string;
+}
+
+class DarwinNotification {
+	tag: string;
+
+	constructor(title: string, opts: NotificationOptions) {
+		const silent: boolean = ConfigUtil.getConfigItem('silent') || false;
+		const { host, protocol } = location;
+		const { icon } = opts;
+		const profilePic = url.resolve(`${protocol}//${host}`, icon);
+
+		this.tag = opts.tag;
+		const notification = new MacNotifier(title, Object.assign(opts, {
+			bundleId: appId,
+			canReply: true,
+			silent,
+			icon: profilePic
+		}));
+
+		notification.addEventListener('click', () => {
+			// focus to the server who sent the
+			// notification if not focused already
+			if (clickHandler) {
+				clickHandler();
+			}
+
+			focusCurrentServer();
+			ipcRenderer.send('focus-app');
+		});
+
+		notification.addEventListener('reply', this.notificationHandler);
+	}
+
+	static requestPermission(): void {
+		return; // eslint-disable-line no-useless-return
+	}
+
+	// Override default Notification permission
+	static get permission(): NotificationPermission {
+		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
+	}
+
+	set onreply(handler: ReplyHandler) {
+		replyHandler = handler;
+	}
+
+	get onreply(): ReplyHandler {
+		return replyHandler;
+	}
+
+	set onclick(handler: ClickHandler) {
+		clickHandler = handler;
+	}
+
+	get onclick(): ClickHandler {
+		return clickHandler;
+	}
+
+	// not something that is common or
+	// used by zulip server but added to be
+	// future proff.
+	addEventListener(event: string, handler: ClickHandler | ReplyHandler): void {
+		if (event === 'click') {
+			clickHandler = handler as ClickHandler;
+		}
+
+		if (event === 'reply') {
+			replyHandler = handler as ReplyHandler;
+		}
+	}
+
+	notificationHandler({ response }: NotificationHandlerArgs): void {
+		response = parseReply(response);
+		focusCurrentServer();
+		if (window.electron_bridge.send_notification_reply_message_supported) {
+			window.electron_bridge.send_event('send_notification_reply_message', this.tag, response);
+			return;
+		}
+
+		setupReply(this.tag);
+		if (replyHandler) {
+			replyHandler(response);
+			return;
+		}
+
+		customReply(response);
+	}
+
+	// method specific to notification api
+	// used by zulip
+	close(): void {
+		return; // eslint-disable-line no-useless-return
+	}
+}
+
+module.exports = DarwinNotification;

app/renderer/js/notification/default-notification.ts

@@ -0,0 +1,32 @@
+'use strict';
+
+import { ipcRenderer } from 'electron';
+import { focusCurrentServer } from './helpers';
+
+import ConfigUtil = require('../utils/config-util');
+
+const NativeNotification = window.Notification;
+class BaseNotification extends NativeNotification {
+	constructor(title: string, opts: NotificationOptions) {
+		opts.silent = true;
+		super(title, opts);
+
+		this.addEventListener('click', () => {
+			// focus to the server who sent the
+			// notification if not focused already
+			focusCurrentServer();
+			ipcRenderer.send('focus-app');
+		});
+	}
+
+	static requestPermission(): void {
+		return; // eslint-disable-line no-useless-return
+	}
+
+	// Override default Notification permission
+	static get permission(): NotificationPermission {
+		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
+	}
+}
+
+export = BaseNotification;

app/renderer/js/notification/helpers.ts

@@ -0,0 +1,153 @@
+import { remote } from 'electron';
+
+import Logger = require('../utils/logger-util');
+
+const logger = new Logger({
+	file: 'errors.log',
+	timestamp: true
+});
+
+// Do not change this
+export const appId = 'org.zulip.zulip-electron';
+
+export type BotListItem = [string, string];
+const botsList: BotListItem[] = [];
+let botsListLoaded = false;
+
+// this function load list of bots from the server
+// sync=True for a synchronous getJSON request
+// in case botsList isn't already completely loaded when required in parseRely
+export function loadBots(sync = false): void {
+	const { $ } = window;
+	botsList.length = 0;
+	if (sync) {
+		$.ajaxSetup({async: false});
+	}
+	$.getJSON('/json/users')
+		.done((data: any) => {
+			const { members } = data;
+			members.forEach((membersRow: any) => {
+				if (membersRow.is_bot) {
+					const bot = `@${membersRow.full_name}`;
+					const mention = `@**${bot.replace(/^@/, '')}**`;
+					botsList.push([bot, mention]);
+				}
+			});
+			botsListLoaded = true;
+		})
+		.fail((error: any) => {
+			logger.log('Load bots request failed: ', error.responseText);
+			logger.log('Load bots request status: ', error.statusText);
+		});
+	if (sync) {
+		$.ajaxSetup({async: true});
+	}
+}
+
+export function checkElements(...elements: any[]): boolean {
+	let status = true;
+	elements.forEach(element => {
+		if (element === null || element === undefined) {
+			status = false;
+		}
+	});
+	return status;
+}
+
+export function customReply(reply: string): void {
+	// server does not support notification reply yet.
+	const buttonSelector = '.messagebox #send_controls button[type=submit]';
+	const messageboxSelector = '.selected_message .messagebox .messagebox-border .messagebox-content';
+	const textarea: HTMLInputElement = document.querySelector('#compose-textarea');
+	const messagebox: HTMLButtonElement = document.querySelector(messageboxSelector);
+	const sendButton: HTMLButtonElement = document.querySelector(buttonSelector);
+
+	// sanity check for old server versions
+	const elementsExists = checkElements(textarea, messagebox, sendButton);
+	if (!elementsExists) {
+		return;
+	}
+
+	textarea.value = reply;
+	messagebox.click();
+	sendButton.click();
+}
+
+const currentWindow = remote.getCurrentWindow();
+const webContents = remote.getCurrentWebContents();
+const webContentsId = webContents.id;
+
+// this function will focus the server that sent
+// the notification. Main function implemented in main.js
+export function focusCurrentServer(): void {
+	// TODO: TypeScript: currentWindow of type BrowserWindow doesn't
+	// have a .send() property per typescript.
+	(currentWindow as any).send('focus-webview-with-id', webContentsId);
+}
+// this function parses the reply from to notification
+// making it easier to reply from notification eg
+// @username in reply will be converted to @**username**
+// #stream in reply will be converted to #**stream**
+// bot mentions are not yet supported
+export function parseReply(reply: string): string {
+	const usersDiv = document.querySelectorAll('#user_presences li');
+	const streamHolder = document.querySelectorAll('#stream_filters li');
+
+	type UsersItem = BotListItem;
+	type StreamsItem = BotListItem;
+	const users: UsersItem[] = [];
+	const streams: StreamsItem[] = [];
+
+	usersDiv.forEach(userRow => {
+		const anchor = userRow.querySelector('span a');
+		if (anchor !== null) {
+			const user = `@${anchor.textContent.trim()}`;
+			const mention = `@**${user.replace(/^@/, '')}**`;
+			users.push([user, mention]);
+		}
+	});
+
+	streamHolder.forEach(stream => {
+		const streamAnchor = stream.querySelector('div a');
+		if (streamAnchor !== null) {
+			const streamName = `#${streamAnchor.textContent.trim()}`;
+			const streamMention = `#**${streamName.replace(/^#/, '')}**`;
+			streams.push([streamName, streamMention]);
+		}
+	});
+
+	users.forEach(([user, mention]) => {
+		if (reply.includes(user)) {
+			const regex = new RegExp(user, 'g');
+			reply = reply.replace(regex, mention);
+		}
+	});
+
+	streams.forEach(([stream, streamMention]) => {
+		const regex = new RegExp(stream, 'g');
+		reply = reply.replace(regex, streamMention);
+	});
+
+	// If botsList isn't completely loaded yet, make a synchronous getJSON request for list
+	if (botsListLoaded === false) {
+		loadBots(true);
+	}
+
+	// Iterate for every bot name and replace in reply
+	// @botname with @**botname**
+	botsList.forEach(([bot, mention]) => {
+		if (reply.includes(bot)) {
+			const regex = new RegExp(bot, 'g');
+			reply = reply.replace(regex, mention);
+		}
+	});
+
+	reply = reply.replace(/\\n/, '\n');
+	return reply;
+}
+
+export function setupReply(id: string): void {
+	const { narrow } = window;
+	const narrowByTopic = narrow.by_topic || narrow.by_subject;
+	narrowByTopic(id, { trigger: 'notification' });
+}

app/renderer/js/notification/index.ts

@@ -0,0 +1,25 @@
+'use strict';
+
+import { remote } from 'electron';
+import * as params from '../utils/params-util';
+import { appId, loadBots } from './helpers';
+
+import DefaultNotification = require('./default-notification');
+const { app } = remote;
+
+// From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid
+// On windows 8 we have to explicitly set the appUserModelId otherwise notification won't work.
+app.setAppUserModelId(appId);
+
+window.Notification = DefaultNotification;
+
+if (process.platform === 'darwin') {
+	window.Notification = require('./darwin-notifications');
+}
+
+window.addEventListener('load', () => {
+	// eslint-disable-next-line no-undef, @typescript-eslint/camelcase
+	if (params.isPageParams() && page_params.realm_uri) {
+		loadBots();
+	}
+});

app/renderer/js/pages/network.ts

@@ -1,20 +1,21 @@
 'use strict';
 
-const {ipcRenderer} = require('electron');
+import { ipcRenderer } from 'electron';
 
 class NetworkTroubleshootingView {
+	$reconnectButton: Element;
 	constructor() {
-		this.$reconnectButton = document.getElementById('reconnect');
+		this.$reconnectButton = document.querySelector('#reconnect');
 	}
 
-	init() {
+	init(): void {
 		this.$reconnectButton.addEventListener('click', () => {
 			ipcRenderer.send('forward-message', 'reload-viewer');
 		});
 	}
 }
 
-window.onload = () => {
+window.addEventListener('load', () => {
 	const networkTroubleshootingView = new NetworkTroubleshootingView();
 	networkTroubleshootingView.init();
-};
+});

app/renderer/js/pages/preference/add-certificate.ts

@@ -0,0 +1,100 @@
+'use-strict';
+
+import { remote, OpenDialogOptions } from 'electron';
+
+import path = require('path');
+import BaseComponent = require('../../components/base');
+import CertificateUtil = require('../../utils/certificate-util');
+import DomainUtil = require('../../utils/domain-util');
+import t = require('../../utils/translation-util');
+
+const { dialog } = remote;
+
+class AddCertificate extends BaseComponent {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	_certFile: string;
+	$addCertificate: Element | null;
+	addCertificateButton: Element | null;
+	serverUrl: HTMLInputElement | null;
+	constructor(props: any) {
+		super();
+		this.props = props;
+		this._certFile = '';
+	}
+
+	template(): string {
+		return `
+			<div class="settings-card certificates-card">
+				<div class="certificate-input">
+					<div>${t.__('Organization URL')}</div>
+					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
+				</div>
+				<div class="certificate-input">
+					<div>${t.__('Certificate file')}</div>
+					<button class="green" id="add-certificate-button">${t.__('Upload')}</button>
+				</div>
+			</div>
+		`;
+	}
+
+	init(): void {
+		this.$addCertificate = this.generateNodeFromTemplate(this.template());
+		this.props.$root.append(this.$addCertificate);
+		this.addCertificateButton = this.$addCertificate.querySelector('#add-certificate-button');
+		this.serverUrl = this.$addCertificate.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
+		this.initListeners();
+	}
+
+	validateAndAdd(): void {
+		const certificate = this._certFile;
+		const serverUrl = this.serverUrl.value;
+		if (certificate !== '' && serverUrl !== '') {
+			const server = encodeURIComponent(DomainUtil.formatUrl(serverUrl));
+			const fileName = path.basename(certificate);
+			const copy = CertificateUtil.copyCertificate(server, certificate, fileName);
+			if (!copy) {
+				return;
+			}
+			CertificateUtil.setCertificate(server, fileName);
+			dialog.showMessageBox({
+				title: 'Success',
+				message: `Certificate saved!`
+			});
+			this.serverUrl.value = '';
+		} else {
+			dialog.showErrorBox('Error', `Please, ${serverUrl === '' ?
+				'Enter an Organization URL' : 'Choose certificate file'}`);
+		}
+	}
+
+	addHandler(): void {
+		const showDialogOptions: OpenDialogOptions = {
+			title: 'Select file',
+			properties: ['openFile'],
+			filters: [{ name: 'crt, pem', extensions: ['crt', 'pem'] }]
+		};
+		dialog.showOpenDialog(showDialogOptions, selectedFile => {
+			if (selectedFile) {
+				this._certFile = selectedFile[0] || '';
+				this.validateAndAdd();
+			}
+		});
+	}
+
+	initListeners(): void {
+		this.addCertificateButton.addEventListener('click', () => {
+			this.addHandler();
+		});
+
+		this.serverUrl.addEventListener('keypress', event => {
+			const EnterkeyCode = event.keyCode;
+
+			if (EnterkeyCode === 13) {
+				this.addHandler();
+			}
+		});
+	}
+}
+
+export = AddCertificate;

app/renderer/js/pages/preference/badge-settings.ts

@@ -1,10 +1,10 @@
 'use strict';
-const electron = require('electron');
-const { app } = require('electron');
+import { app } from 'electron';
 
-const ConfigUtil = require(__dirname + '/../../utils/config-util.js');
+import electron = require('electron');
+import ConfigUtil = require('../../utils/config-util');
 
-let instance = null;
+let instance: BadgeSettings | any = null;
 
 class BadgeSettings {
 	constructor() {
@@ -17,7 +17,7 @@ class BadgeSettings {
 		return instance;
 	}
 
-	showBadgeCount(messageCount, mainWindow) {
+	showBadgeCount(messageCount: number, mainWindow: electron.BrowserWindow): void {
 		if (process.platform === 'darwin') {
 			app.setBadgeCount(messageCount);
 		}
@@ -26,7 +26,7 @@ class BadgeSettings {
 		}
 	}
 
-	hideBadgeCount(mainWindow) {
+	hideBadgeCount(mainWindow: electron.BrowserWindow): void {
 		if (process.platform === 'darwin') {
 			app.setBadgeCount(0);
 		}
@@ -35,7 +35,7 @@ class BadgeSettings {
 		}
 	}
 
-	updateBadge(badgeCount, mainWindow) {
+	updateBadge(badgeCount: number, mainWindow: electron.BrowserWindow): void {
 		if (ConfigUtil.getConfigItem('badgeOption', true)) {
 			this.showBadgeCount(badgeCount, mainWindow);
 		} else {
@@ -43,7 +43,7 @@ class BadgeSettings {
 		}
 	}
 
-	updateOverlayIcon(messageCount, mainWindow) {
+	updateOverlayIcon(messageCount: number, mainWindow: electron.BrowserWindow): void {
 		if (!mainWindow.isFocused()) {
 			mainWindow.flashFrame(ConfigUtil.getConfigItem('flashTaskbarOnMessage'));
 		}
@@ -54,10 +54,10 @@ class BadgeSettings {
 		}
 	}
 
-	updateTaskbarIcon(data, text, mainWindow) {
+	updateTaskbarIcon(data: string, text: string, mainWindow: electron.BrowserWindow): void {
 		const img = electron.nativeImage.createFromDataURL(data);
 		mainWindow.setOverlayIcon(img, text);
 	}
 }
 
-module.exports = new BadgeSettings();
+export = new BadgeSettings();

app/renderer/js/pages/preference/base-section.js

@@ -1,46 +0,0 @@
-'use strict';
-
-const {ipcRenderer} = require('electron');
-
-const BaseComponent = require(__dirname + '/../../components/base.js');
-
-class BaseSection extends BaseComponent {
-	generateSettingOption(props) {
-		const {$element, value, clickHandler} = props;
-
-		$element.innerHTML = '';
-
-		const $optionControl = this.generateNodeFromTemplate(this.generateOptionTemplate(value));
-		$element.appendChild($optionControl);
-
-		$optionControl.addEventListener('click', clickHandler);
-	}
-
-	generateOptionTemplate(settingOption) {
-		if (settingOption) {
-			return `
-				<div class="action">
-					<div class="switch">
-					  <input class="toggle toggle-round" type="checkbox" checked>
-					  <label></label>
-					</div>
-				</div>
-			`;
-		} else {
-			return `
-				<div class="action">
-					<div class="switch">
-					  <input class="toggle toggle-round" type="checkbox">
-					  <label></label>
-					</div>
-				</div>
-			`;
-		}
-	}
-
-	reloadApp() {
-		ipcRenderer.send('forward-message', 'reload-viewer');
-	}
-}
-
-module.exports = BaseSection;

app/renderer/js/pages/preference/base-section.ts

@@ -0,0 +1,50 @@
+'use strict';
+
+import { ipcRenderer } from 'electron';
+
+import BaseComponent = require('../../components/base');
+
+class BaseSection extends BaseComponent {
+	// TODO: TypeScript - Here props should be object type
+	generateSettingOption(props: any): void {
+		const {$element, disabled, value, clickHandler} = props;
+
+		$element.innerHTML = '';
+
+		const $optionControl = this.generateNodeFromTemplate(this.generateOptionTemplate(value, disabled));
+		$element.append($optionControl);
+
+		if (!disabled) {
+			$optionControl.addEventListener('click', clickHandler);
+		}
+	}
+
+	generateOptionTemplate(settingOption: boolean, disabled: boolean): string {
+		const label = disabled ? `<label class="disallowed" title="Setting locked by system administrator."/>` : `<label/>`;
+		if (settingOption) {
+			return `
+				<div class="action">
+					<div class="switch">
+					  <input class="toggle toggle-round" type="checkbox" checked disabled>
+					  ${label}
+					</div>
+				</div>
+			`;
+		} else {
+			return `
+				<div class="action">
+					<div class="switch">
+					  <input class="toggle toggle-round" type="checkbox">
+					  ${label}
+					</div>
+				</div>
+			`;
+		}
+	}
+
+	reloadApp(): void {
+		ipcRenderer.send('forward-message', 'reload-viewer');
+	}
+}
+
+export = BaseSection;

app/renderer/js/pages/preference/connected-org-section.ts

@@ -0,0 +1,90 @@
+'use strict';
+
+import { ipcRenderer } from 'electron';
+
+import BaseSection = require('./base-section');
+import DomainUtil = require('../../utils/domain-util');
+import ServerInfoForm = require('./server-info-form');
+import AddCertificate = require('./add-certificate');
+import FindAccounts = require('./find-accounts');
+import t = require('../../utils/translation-util');
+
+class ConnectedOrgSection extends BaseSection {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	$serverInfoContainer: Element | null;
+	$existingServers: Element | null;
+	$newOrgButton: HTMLButtonElement | null;
+	$addCertificateContainer: Element | null;
+	$findAccountsContainer: Element | null;
+	constructor(props: any) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+			<div class="settings-pane" id="server-settings-pane">
+				<div class="page-title">${t.__('Connected organizations')}</div>
+				<div class="title" id="existing-servers">${t.__('All the connected orgnizations will appear here.')}</div>
+				<div id="server-info-container"></div>
+				<div id="new-org-button"><button class="green sea w-250">${t.__('Connect to another organization')}</button></div>
+				<div class="page-title">${t.__('Add Custom Certificates')}</div>
+				<div id="add-certificate-container"></div>
+				<div class="page-title">${t.__('Find accounts by email')}</div>
+				<div id="find-accounts-container"></div>
+			</div>
+		`;
+	}
+
+	init(): void {
+		this.initServers();
+	}
+
+	initServers(): void {
+		this.props.$root.innerHTML = '';
+
+		const servers = DomainUtil.getDomains();
+		this.props.$root.innerHTML = this.template();
+
+		this.$serverInfoContainer = document.querySelector('#server-info-container');
+		this.$existingServers = document.querySelector('#existing-servers');
+		this.$newOrgButton = document.querySelector('#new-org-button');
+		this.$addCertificateContainer = document.querySelector('#add-certificate-container');
+		this.$findAccountsContainer = document.querySelector('#find-accounts-container');
+
+		const noServerText = t.__('All the connected orgnizations will appear here');
+		// Show noServerText if no servers are there otherwise hide it
+		this.$existingServers.innerHTML = servers.length === 0 ? noServerText : '';
+
+		for (let i = 0; i < servers.length; i++) {
+			new ServerInfoForm({
+				$root: this.$serverInfoContainer,
+				server: servers[i],
+				index: i,
+				onChange: this.reloadApp
+			}).init();
+		}
+
+		this.$newOrgButton.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'open-org-tab');
+		});
+
+		this.initAddCertificate();
+		this.initFindAccounts();
+	}
+
+	initAddCertificate(): void {
+		new AddCertificate({
+			$root: this.$addCertificateContainer
+		}).init();
+	}
+
+	initFindAccounts(): void {
+		new FindAccounts({
+			$root: this.$findAccountsContainer
+		}).init();
+	}
+}
+
+export = ConnectedOrgSection;

app/renderer/js/pages/preference/create-new-org.js

@@ -1,37 +0,0 @@
-'use strict';
-
-const BaseComponent = require(__dirname + '/../../components/base.js');
-const shell = require('electron').shell;
-
-class CreateOrganziation extends BaseComponent {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-			<div class="setting-row">
-				<div class="setting-description">
-					<span id="open-create-org-link">Or create a new organization on zulipchat.com<i class="material-icons open-tab-button">open_in_new</i></span>
-				</div>
-				<div class="setting-control"></div>
-			</div>
-		`;
-	}
-
-	init() {
-		this.props.$root.innerHTML = this.template();
-		this.openCreateNewOrgExternalLink();
-	}
-
-	openCreateNewOrgExternalLink() {
-		const link = 'https://zulipchat.com/beta/';
-		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
-		externalCreateNewOrgEl.addEventListener('click', () => {
-			shell.openExternal(link);
-		});
-	}
-}
-
-module.exports = CreateOrganziation;

app/renderer/js/pages/preference/find-accounts.ts

@@ -0,0 +1,78 @@
+'use-strict';
+
+import { shell } from 'electron';
+
+import BaseComponent = require('../../components/base');
+import t = require('../../utils/translation-util');
+
+class FindAccounts extends BaseComponent {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	$findAccounts: Element | null;
+	$findAccountsButton: Element | null;
+	$serverUrlField: HTMLInputElement | null;
+	constructor(props: any) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+			<div class="settings-card certificate-card">
+				<div class="certificate-input">
+					<div>${t.__('Organization URL')}</div>
+					<input class="setting-input-value" value="zulipchat.com"/>
+				</div>
+				<div class="certificate-input">
+					<button class="green w-150" id="find-accounts-button">${t.__('Find accounts')}</button>
+				</div>
+			</div>
+		`;
+	}
+
+	init(): void {
+		this.$findAccounts = this.generateNodeFromTemplate(this.template());
+		this.props.$root.append(this.$findAccounts);
+		this.$findAccountsButton = this.$findAccounts.querySelector('#find-accounts-button');
+		this.$serverUrlField = this.$findAccounts.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
+		this.initListeners();
+	}
+
+	findAccounts(url: string): void {
+		if (!url) {
+			return;
+		}
+		if (!url.startsWith('http')) {
+			url = 'https://' + url;
+		}
+		shell.openExternal(url + '/accounts/find');
+	}
+
+	initListeners(): void {
+		this.$findAccountsButton.addEventListener('click', () => {
+			this.findAccounts(this.$serverUrlField.value);
+		});
+
+		this.$serverUrlField.addEventListener('click', () => {
+			if (this.$serverUrlField.value === 'zulipchat.com') {
+				this.$serverUrlField.setSelectionRange(0, 0);
+			}
+		});
+
+		this.$serverUrlField.addEventListener('keypress', event => {
+			if (event.keyCode === 13) {
+				this.findAccounts(this.$serverUrlField.value);
+			}
+		});
+
+		this.$serverUrlField.addEventListener('input', () => {
+			if (this.$serverUrlField.value) {
+				this.$serverUrlField.classList.remove('invalid-input-value');
+			} else {
+				this.$serverUrlField.classList.add('invalid-input-value');
+			}
+		});
+	}
+}
+
+export = FindAccounts;

app/renderer/js/pages/preference/general-section.js

@@ -1,256 +0,0 @@
-'use strict';
-const path = require('path');
-const { ipcRenderer, remote } = require('electron');
-const fs = require('fs-extra');
-
-const { app, dialog } = remote;
-const currentBrowserWindow = remote.getCurrentWindow();
-const BaseSection = require(__dirname + '/base-section.js');
-const ConfigUtil = require(__dirname + '/../../utils/config-util.js');
-
-class GeneralSection extends BaseSection {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-            <div class="settings-pane">
-                <div class="title">Appearance</div>
-                <div id="appearance-option-settings" class="settings-card">
-					<div class="setting-row" id="tray-option">
-						<div class="setting-description">Show app icon in system tray</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="sidebar-option">
-						<div class="setting-description">Show sidebar (<span class="code">Cmd Or Ctrl+S</span>)</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="badge-option">
-						<div class="setting-description">Show app unread badge</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="flash-taskbar-option" style= "display:${process.platform === 'win32' ? '' : 'none'}">
-						<div class="setting-description">Flash taskbar on new message</div>
-						<div class="setting-control"></div>
-					</div>
-				</div>
-				<div class="title">Desktop Notification</div>
-				<div class="settings-card">
-					<div class="setting-row" id="show-notification-option">
-						<div class="setting-description">Show Desktop Notifications</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="silent-option">
-						<div class="setting-description">Mute all sounds from Zulip</div>
-						<div class="setting-control"></div>
-					</div>
-				</div>
-				<div class="title">App Updates</div>
-                <div class="settings-card">
-					<div class="setting-row" id="betaupdate-option">
-						<div class="setting-description">Get beta updates</div>
-						<div class="setting-control"></div>
-					</div>
-				</div>
-				<div class="title">Functionality</div>
-                <div class="settings-card">
-					<div class="setting-row" id="startAtLogin-option">
-						<div class="setting-description">Start app at login</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="start-minimize-option">
-						<div class="setting-description">Always start minimized</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-row" id="enable-spellchecker-option">
-						<div class="setting-description">Enable Spellchecker (requires restart)</div>
-						<div class="setting-control"></div>
-					</div>
-				</div>
-				<div class="title">Reset Application Data</div>
-                <div class="settings-card">
-					<div class="setting-row" id="resetdata-option">
-						<div class="setting-description">This will delete all application data including all added accounts and preferences
-						</div>
-						<button class="reset-data-button blue">Reset App Data</button>
-					</div>
-				</div>
-            </div>
-		`;
-	}
-
-	init() {
-		this.props.$root.innerHTML = this.template();
-		this.updateTrayOption();
-		this.updateBadgeOption();
-		this.updateSilentOption();
-		this.updateUpdateOption();
-		this.updateSidebarOption();
-		this.updateStartAtLoginOption();
-		this.updateResetDataOption();
-		this.showDesktopNotification();
-		this.enableSpellchecker();
-		this.minimizeOnStart();
-
-		// Platform specific settings
-		// Flashing taskbar on Windows
-		if (process.platform === 'win32') {
-			this.updateFlashTaskbar();
-		}
-	}
-
-	updateTrayOption() {
-		this.generateSettingOption({
-			$element: document.querySelector('#tray-option .setting-control'),
-			value: ConfigUtil.getConfigItem('trayIcon', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('trayIcon');
-				ConfigUtil.setConfigItem('trayIcon', newValue);
-				ipcRenderer.send('forward-message', 'toggletray');
-				this.updateTrayOption();
-			}
-		});
-	}
-
-	updateBadgeOption() {
-		this.generateSettingOption({
-			$element: document.querySelector('#badge-option .setting-control'),
-			value: ConfigUtil.getConfigItem('badgeOption', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('badgeOption');
-				ConfigUtil.setConfigItem('badgeOption', newValue);
-				ipcRenderer.send('toggle-badge-option', newValue);
-				this.updateBadgeOption();
-			}
-		});
-	}
-
-	updateFlashTaskbar() {
-		this.generateSettingOption({
-			$element: document.querySelector('#flash-taskbar-option .setting-control'),
-			value: ConfigUtil.getConfigItem('flashTaskbarOnMessage', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('flashTaskbarOnMessage');
-				ConfigUtil.setConfigItem('flashTaskbarOnMessage', newValue);
-				this.updateFlashTaskbar();
-			}
-		});
-	}
-
-	updateUpdateOption() {
-		this.generateSettingOption({
-			$element: document.querySelector('#betaupdate-option .setting-control'),
-			value: ConfigUtil.getConfigItem('betaUpdate', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('betaUpdate');
-				ConfigUtil.setConfigItem('betaUpdate', newValue);
-				this.updateUpdateOption();
-			}
-		});
-	}
-
-	updateSilentOption() {
-		this.generateSettingOption({
-			$element: document.querySelector('#silent-option .setting-control'),
-			value: ConfigUtil.getConfigItem('silent', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('silent', true);
-				ConfigUtil.setConfigItem('silent', newValue);
-				this.updateSilentOption();
-				currentBrowserWindow.send('toogle-silent', newValue);
-			}
-		});
-	}
-
-	showDesktopNotification() {
-		this.generateSettingOption({
-			$element: document.querySelector('#show-notification-option .setting-control'),
-			value: ConfigUtil.getConfigItem('showNotification', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('showNotification', true);
-				ConfigUtil.setConfigItem('showNotification', newValue);
-				this.showDesktopNotification();
-			}
-		});
-	}
-
-	updateSidebarOption() {
-		this.generateSettingOption({
-			$element: document.querySelector('#sidebar-option .setting-control'),
-			value: ConfigUtil.getConfigItem('showSidebar', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('showSidebar');
-				ConfigUtil.setConfigItem('showSidebar', newValue);
-				ipcRenderer.send('forward-message', 'toggle-sidebar', newValue);
-				this.updateSidebarOption();
-			}
-		});
-	}
-
-	updateStartAtLoginOption() {
-		this.generateSettingOption({
-			$element: document.querySelector('#startAtLogin-option .setting-control'),
-			value: ConfigUtil.getConfigItem('startAtLogin', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('startAtLogin');
-				ConfigUtil.setConfigItem('startAtLogin', newValue);
-				ipcRenderer.send('toggleAutoLauncher', newValue);
-				this.updateStartAtLoginOption();
-			}
-		});
-	}
-
-	enableSpellchecker() {
-		this.generateSettingOption({
-			$element: document.querySelector('#enable-spellchecker-option .setting-control'),
-			value: ConfigUtil.getConfigItem('enableSpellchecker', true),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('enableSpellchecker');
-				ConfigUtil.setConfigItem('enableSpellchecker', newValue);
-				this.enableSpellchecker();
-			}
-		});
-	}
-
-	clearAppDataDialog() {
-		const clearAppDataMessage = 'By clicking proceed you will be removing all added accounts and preferences from Zulip. When the application restarts, it will be as if you are starting Zulip for the first time.';
-		const getAppPath = path.join(app.getPath('appData'), app.getName());
-
-		dialog.showMessageBox({
-			type: 'warning',
-			buttons: ['YES', 'NO'],
-			defaultId: 0,
-			message: 'Are you sure',
-			detail: clearAppDataMessage
-		}, response => {
-			if (response === 0) {
-				fs.remove(getAppPath);
-				setTimeout(() => ipcRenderer.send('forward-message', 'hard-reload'), 1000);
-			}
-		});
-	}
-
-	updateResetDataOption() {
-		const resetDataButton = document.querySelector('#resetdata-option .reset-data-button');
-		resetDataButton.addEventListener('click', () => {
-			this.clearAppDataDialog();
-		});
-	}
-
-	minimizeOnStart() {
-		this.generateSettingOption({
-			$element: document.querySelector('#start-minimize-option .setting-control'),
-			value: ConfigUtil.getConfigItem('startMinimized', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('startMinimized');
-				ConfigUtil.setConfigItem('startMinimized', newValue);
-				this.minimizeOnStart();
-			}
-		});
-	}
-
-}
-
-module.exports = GeneralSection;

app/renderer/js/pages/preference/general-section.ts

@@ -0,0 +1,456 @@
+'use strict';
+import { ipcRenderer, remote, OpenDialogOptions } from 'electron';
+
+import path = require('path');
+import fs = require('fs-extra');
+
+const { app, dialog } = remote;
+const currentBrowserWindow = remote.getCurrentWindow();
+
+import BaseSection = require('./base-section');
+import ConfigUtil = require('../../utils/config-util');
+import EnterpriseUtil = require('./../../utils/enterprise-util');
+import t = require('../../utils/translation-util');
+
+class GeneralSection extends BaseSection {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	constructor(props: any) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+            <div class="settings-pane">
+                <div class="title">${t.__('Appearance')}</div>
+                <div id="appearance-option-settings" class="settings-card">
+					<div class="setting-row" id="tray-option">
+						<div class="setting-description">${t.__('Show app icon in system tray')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="menubar-option" style= "display:${process.platform === 'darwin' ? 'none' : ''}">
+						<div class="setting-description">${t.__('Auto hide menu bar (Press Alt key to display)')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="sidebar-option">
+						<div class="setting-description">${t.__('Show sidebar')} (<span class="code">${process.platform === 'darwin' ? 'Cmd+Shift+S' : 'Ctrl+Shift+S'}</span>)</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="badge-option">
+						<div class="setting-description">${t.__('Show app unread badge')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="dock-bounce-option" style= "display:${process.platform === 'darwin' ? '' : 'none'}">
+						<div class="setting-description">${t.__('Bounce dock on new private message')})}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="flash-taskbar-option" style= "display:${process.platform === 'win32' ? '' : 'none'}">
+						<div class="setting-description">${t.__('Flash taskbar on new message')}</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">${t.__('Desktop Notifications')}</div>
+				<div class="settings-card">
+					<div class="setting-row" id="show-notification-option">
+						<div class="setting-description">${t.__('Show desktop notifications')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="silent-option">
+						<div class="setting-description">${t.__('Mute all sounds from Zulip')}</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">${t.__('App Updates')}</div>
+				<div class="settings-card">
+				<div class="setting-row" id="autoupdate-option">
+						<div class="setting-description">${t.__('Enable auto updates')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="betaupdate-option">
+						<div class="setting-description">${t.__('Get beta updates')}</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">${t.__('Functionality')}</div>
+                <div class="settings-card">
+					<div class="setting-row" id="startAtLogin-option">
+						<div class="setting-description">${t.__('Start app at login')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="start-minimize-option">
+						<div class="setting-description">${t.__('Always start minimized')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="enable-spellchecker-option">
+						<div class="setting-description">${t.__('Enable spellchecker (requires restart)')}</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">${t.__('Advanced')}</div>
+				<div class="settings-card">
+				<div class="setting-row" id="enable-error-reporting">
+					<div class="setting-description">${t.__('Enable error reporting (requires restart)')}</div>
+					<div class="setting-control"></div>
+				</div>
+				<div class="setting-row" id="show-download-folder">
+					<div class="setting-description">${t.__('Show downloaded files in file manager')}</div>
+					<div class="setting-control"></div>
+				</div>
+				<div class="setting-row" id="add-custom-css">
+				<div class="setting-description">
+					${t.__('Add custom CSS')}
+				</div>
+				<button class="custom-css-button green">${t.__('Upload')}</button>
+			</div>
+			<div class="setting-row" id="remove-custom-css">
+				<div class="setting-description">
+					<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigItem('customCSS')}</div>
+				</div>
+				<div class="action red" id="css-delete-action">
+					<i class="material-icons">indeterminate_check_box</i>
+					<span>${t.__('Delete')}</span>
+				</div>
+			</div>
+					<div class="setting-row" id="download-folder">
+						<div class="setting-description">
+							${t.__('Default download location')}
+						</div>
+						<button class="download-folder-button green">${t.__('Change')}</button>
+					</div>
+					<div class="setting-row">
+						<div class="setting-description">
+							<div class="download-folder-path">${ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`)}</div>
+						</div>
+					</div>
+
+				</div>
+				<div class="title">${t.__('Reset Application Data')}</div>
+                <div class="settings-card">
+					<div class="setting-row" id="resetdata-option">
+						<div class="setting-description">${t.__('This will delete all application data including all added accounts and preferences')}
+						</div>
+						<button class="reset-data-button red w-150">${t.__('Reset App Data')}</button>
+					</div>
+				</div>
+            </div>
+		`;
+	}
+
+	init(): void {
+		this.props.$root.innerHTML = this.template();
+		this.updateTrayOption();
+		this.updateBadgeOption();
+		this.updateSilentOption();
+		this.autoUpdateOption();
+		this.betaUpdateOption();
+		this.updateSidebarOption();
+		this.updateStartAtLoginOption();
+		this.updateResetDataOption();
+		this.showDesktopNotification();
+		this.enableSpellchecker();
+		this.minimizeOnStart();
+		this.addCustomCSS();
+		this.showCustomCSSPath();
+		this.removeCustomCSS();
+		this.downloadFolder();
+		this.showDownloadFolder();
+		this.enableErrorReporting();
+
+		// Platform specific settings
+
+		// Flashing taskbar on Windows
+		if (process.platform === 'win32') {
+			this.updateFlashTaskbar();
+		}
+		// Dock bounce on macOS
+		if (process.platform === 'darwin') {
+			this.updateDockBouncing();
+		}
+
+		// Auto hide menubar on Windows and Linux
+		if (process.platform !== 'darwin') {
+			this.updateMenubarOption();
+		}
+	}
+
+	updateTrayOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#tray-option .setting-control'),
+			value: ConfigUtil.getConfigItem('trayIcon', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('trayIcon');
+				ConfigUtil.setConfigItem('trayIcon', newValue);
+				ipcRenderer.send('forward-message', 'toggletray');
+				this.updateTrayOption();
+			}
+		});
+	}
+
+	updateMenubarOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#menubar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('autoHideMenubar', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
+				ConfigUtil.setConfigItem('autoHideMenubar', newValue);
+				ipcRenderer.send('toggle-menubar', newValue);
+				this.updateMenubarOption();
+			}
+		});
+	}
+
+	updateBadgeOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#badge-option .setting-control'),
+			value: ConfigUtil.getConfigItem('badgeOption', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('badgeOption');
+				ConfigUtil.setConfigItem('badgeOption', newValue);
+				ipcRenderer.send('toggle-badge-option', newValue);
+				this.updateBadgeOption();
+			}
+		});
+	}
+
+	updateDockBouncing(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#dock-bounce-option .setting-control'),
+			value: ConfigUtil.getConfigItem('dockBouncing', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('dockBouncing');
+				ConfigUtil.setConfigItem('dockBouncing', newValue);
+				this.updateDockBouncing();
+			}
+		});
+	}
+
+	updateFlashTaskbar(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#flash-taskbar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('flashTaskbarOnMessage', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('flashTaskbarOnMessage');
+				ConfigUtil.setConfigItem('flashTaskbarOnMessage', newValue);
+				this.updateFlashTaskbar();
+			}
+		});
+	}
+
+	autoUpdateOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#autoupdate-option .setting-control'),
+			disabled: EnterpriseUtil.configItemExists('autoUpdate'),
+			value: ConfigUtil.getConfigItem('autoUpdate', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('autoUpdate');
+				ConfigUtil.setConfigItem('autoUpdate', newValue);
+				if (!newValue) {
+					ConfigUtil.setConfigItem('betaUpdate', false);
+					this.betaUpdateOption();
+				}
+				this.autoUpdateOption();
+			}
+		});
+	}
+
+	betaUpdateOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#betaupdate-option .setting-control'),
+			value: ConfigUtil.getConfigItem('betaUpdate', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('betaUpdate');
+				if (ConfigUtil.getConfigItem('autoUpdate')) {
+					ConfigUtil.setConfigItem('betaUpdate', newValue);
+					this.betaUpdateOption();
+				}
+			}
+		});
+	}
+
+	updateSilentOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#silent-option .setting-control'),
+			value: ConfigUtil.getConfigItem('silent', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('silent', true);
+				ConfigUtil.setConfigItem('silent', newValue);
+				this.updateSilentOption();
+				// TODO: TypeScript: currentWindow of type BrowserWindow doesn't
+				// have a .send() property per typescript.
+				(currentBrowserWindow as any).send('toggle-silent', newValue);
+			}
+		});
+	}
+
+	showDesktopNotification(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#show-notification-option .setting-control'),
+			value: ConfigUtil.getConfigItem('showNotification', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('showNotification', true);
+				ConfigUtil.setConfigItem('showNotification', newValue);
+				this.showDesktopNotification();
+			}
+		});
+	}
+
+	updateSidebarOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#sidebar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('showSidebar', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('showSidebar');
+				ConfigUtil.setConfigItem('showSidebar', newValue);
+				ipcRenderer.send('forward-message', 'toggle-sidebar', newValue);
+				this.updateSidebarOption();
+			}
+		});
+	}
+
+	updateStartAtLoginOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#startAtLogin-option .setting-control'),
+			value: ConfigUtil.getConfigItem('startAtLogin', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('startAtLogin');
+				ConfigUtil.setConfigItem('startAtLogin', newValue);
+				ipcRenderer.send('toggleAutoLauncher', newValue);
+				this.updateStartAtLoginOption();
+			}
+		});
+	}
+
+	enableSpellchecker(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#enable-spellchecker-option .setting-control'),
+			value: ConfigUtil.getConfigItem('enableSpellchecker', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('enableSpellchecker');
+				ConfigUtil.setConfigItem('enableSpellchecker', newValue);
+				this.enableSpellchecker();
+			}
+		});
+	}
+
+	enableErrorReporting(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#enable-error-reporting .setting-control'),
+			value: ConfigUtil.getConfigItem('errorReporting', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('errorReporting');
+				ConfigUtil.setConfigItem('errorReporting', newValue);
+				this.enableErrorReporting();
+			}
+		});
+	}
+
+	clearAppDataDialog(): void {
+		const clearAppDataMessage = 'By clicking proceed you will be removing all added accounts and preferences from Zulip. When the application restarts, it will be as if you are starting Zulip for the first time.';
+		const getAppPath = path.join(app.getPath('appData'), app.getName());
+
+		dialog.showMessageBox({
+			type: 'warning',
+			buttons: ['YES', 'NO'],
+			defaultId: 0,
+			message: 'Are you sure',
+			detail: clearAppDataMessage
+		}, response => {
+			if (response === 0) {
+				fs.remove(getAppPath);
+				setTimeout(() => ipcRenderer.send('forward-message', 'hard-reload'), 1000);
+			}
+		});
+	}
+
+	customCssDialog(): void {
+		const showDialogOptions: OpenDialogOptions = {
+			title: 'Select file',
+			properties: ['openFile'],
+			filters: [{ name: 'CSS file', extensions: ['css'] }]
+		};
+
+		dialog.showOpenDialog(showDialogOptions, selectedFile => {
+			if (selectedFile) {
+				ConfigUtil.setConfigItem('customCSS', selectedFile[0]);
+				ipcRenderer.send('forward-message', 'hard-reload');
+			}
+		});
+	}
+
+	updateResetDataOption(): void {
+		const resetDataButton = document.querySelector('#resetdata-option .reset-data-button');
+		resetDataButton.addEventListener('click', () => {
+			this.clearAppDataDialog();
+		});
+	}
+
+	minimizeOnStart(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#start-minimize-option .setting-control'),
+			value: ConfigUtil.getConfigItem('startMinimized', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('startMinimized');
+				ConfigUtil.setConfigItem('startMinimized', newValue);
+				this.minimizeOnStart();
+			}
+		});
+	}
+
+	addCustomCSS(): void {
+		const customCSSButton = document.querySelector('#add-custom-css .custom-css-button');
+		customCSSButton.addEventListener('click', () => {
+			this.customCssDialog();
+		});
+	}
+
+	showCustomCSSPath(): void {
+		if (!ConfigUtil.getConfigItem('customCSS')) {
+			const cssPATH: HTMLElement = document.querySelector('#remove-custom-css');
+			cssPATH.style.display = 'none';
+		}
+	}
+
+	removeCustomCSS(): void {
+		const removeCSSButton = document.querySelector('#css-delete-action');
+		removeCSSButton.addEventListener('click', () => {
+			ConfigUtil.setConfigItem('customCSS', "");
+			ipcRenderer.send('forward-message', 'hard-reload');
+		});
+	}
+
+	downloadFolderDialog(): void {
+		const showDialogOptions: OpenDialogOptions = {
+			title: 'Select Download Location',
+			properties: ['openDirectory']
+		};
+
+		dialog.showOpenDialog(showDialogOptions, selectedFolder => {
+			if (selectedFolder) {
+				ConfigUtil.setConfigItem('downloadsPath', selectedFolder[0]);
+				const downloadFolderPath: HTMLElement = document.querySelector('.download-folder-path');
+				downloadFolderPath.innerText = selectedFolder[0];
+			}
+		});
+	}
+	downloadFolder(): void {
+		const downloadFolder = document.querySelector('#download-folder .download-folder-button');
+		downloadFolder.addEventListener('click', () => {
+			this.downloadFolderDialog();
+		});
+	}
+
+	showDownloadFolder(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#show-download-folder .setting-control'),
+			value: ConfigUtil.getConfigItem('showDownloadFolder', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('showDownloadFolder');
+				ConfigUtil.setConfigItem('showDownloadFolder', newValue);
+				this.showDownloadFolder();
+			}
+		});
+	}
+}
+
+export = GeneralSection;

app/renderer/js/pages/preference/nav.js

@@ -1,67 +0,0 @@
-'use strict';
-
-const BaseComponent = require(__dirname + '/../../components/base.js');
-
-class PreferenceNav extends BaseComponent {
-	constructor(props) {
-		super();
-
-		this.props = props;
-
-		this.navItems = ['General', 'Network', 'Servers', 'Shortcuts'];
-
-		this.init();
-	}
-
-	template() {
-		let navItemsTemplate = '';
-		for (const navItem of this.navItems) {
-			navItemsTemplate += `<div class="nav" id="nav-${navItem}">${navItem}</div>`;
-		}
-
-		return `
-			<div>
-				<div id="settings-header">Settings</div>
-				<div id="nav-container">${navItemsTemplate}</div>
-			</div>
-		`;
-	}
-
-	init() {
-		this.$el = this.generateNodeFromTemplate(this.template());
-		this.props.$root.appendChild(this.$el);
-
-		this.registerListeners();
-	}
-
-	registerListeners() {
-		for (const navItem of this.navItems) {
-			const $item = document.getElementById(`nav-${navItem}`);
-			$item.addEventListener('click', () => {
-				this.props.onItemSelected(navItem);
-			});
-		}
-	}
-
-	select(navItemToSelect) {
-		for (const navItem of this.navItems) {
-			if (navItem === navItemToSelect) {
-				this.activate(navItem);
-			} else {
-				this.deactivate(navItem);
-			}
-		}
-	}
-
-	activate(navItem) {
-		const $item = document.getElementById(`nav-${navItem}`);
-		$item.classList.add('active');
-	}
-
-	deactivate(navItem) {
-		const $item = document.getElementById(`nav-${navItem}`);
-		$item.classList.remove('active');
-	}
-}
-
-module.exports = PreferenceNav;

app/renderer/js/pages/preference/nav.ts

@@ -0,0 +1,68 @@
+'use strict';
+
+import BaseComponent = require('../../components/base');
+import t = require('../../utils/translation-util');
+
+class PreferenceNav extends BaseComponent {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	navItems: string[];
+	$el: Element;
+	constructor(props: any) {
+		super();
+		this.props = props;
+		this.navItems = ['General', 'Network', 'AddServer', 'Organizations', 'Shortcuts'];
+		this.init();
+	}
+
+	template(): string {
+		let navItemsTemplate = '';
+		for (const navItem of this.navItems) {
+			navItemsTemplate += `<div class="nav" id="nav-${navItem}">${t.__(navItem)}</div>`;
+		}
+
+		return `
+			<div>
+				<div id="settings-header">${t.__('Settings')}</div>
+				<div id="nav-container">${navItemsTemplate}</div>
+			</div>
+		`;
+	}
+
+	init(): void {
+		this.$el = this.generateNodeFromTemplate(this.template());
+		this.props.$root.append(this.$el);
+		this.registerListeners();
+	}
+
+	registerListeners(): void {
+		for (const navItem of this.navItems) {
+			const $item = document.querySelector(`#nav-${navItem}`);
+			$item.addEventListener('click', () => {
+				this.props.onItemSelected(navItem);
+			});
+		}
+	}
+
+	select(navItemToSelect: string): void {
+		for (const navItem of this.navItems) {
+			if (navItem === navItemToSelect) {
+				this.activate(navItem);
+			} else {
+				this.deactivate(navItem);
+			}
+		}
+	}
+
+	activate(navItem: string): void {
+		const $item = document.querySelector(`#nav-${navItem}`);
+		$item.classList.add('active');
+	}
+
+	deactivate(navItem: string): void {
+		const $item = document.querySelector(`#nav-${navItem}`);
+		$item.classList.remove('active');
+	}
+}
+
+export = PreferenceNav;

app/renderer/js/pages/preference/network-section.js

@@ -1,102 +0,0 @@
-'use strict';
-
-const {ipcRenderer} = require('electron');
-
-const BaseSection = require(__dirname + '/base-section.js');
-const ConfigUtil = require(__dirname + '/../../utils/config-util.js');
-
-class NetworkSection extends BaseSection {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-            <div class="settings-pane">
-                <div class="title">Proxy</div>
-                <div id="appearance-option-settings" class="settings-card">
-					<div class="setting-row" id="use-proxy-option">
-						<div class="setting-description">Connect servers through a proxy</div>
-						<div class="setting-control"></div>
-					</div>
-					<div class="setting-block">
-						<div class="setting-row" id="proxy-pac-option">
-							<span class="setting-input-key">PAC script</span>
-							<input class="setting-input-value" placeholder="e.g. foobar.com/pacfile.js"/>
-						</div>
-						<div class="setting-row" id="proxy-rules-option">
-							<span class="setting-input-key">Proxy rules</span>
-							<input class="setting-input-value" placeholder="e.g. http=foopy:80;ftp=foopy2"/>
-						</div>
-						<div class="setting-row" id="proxy-bypass-option">
-							<span class="setting-input-key">Proxy bypass rules</span>
-							<input class="setting-input-value" placeholder="e.g. foobar.com"/>
-						</div>
-						<div class="setting-row">
-							<div class="action blue" id="proxy-save-action">
-								<i class="material-icons">check_box</i>
-								<span>Save</span>
-							</div>
-						</div>
-					</div>
-				</div>
-            </div>
-		`;
-	}
-
-	init() {
-		this.props.$root.innerHTML = this.template();
-		this.$proxyPAC = document.querySelector('#proxy-pac-option .setting-input-value');
-		this.$proxyRules = document.querySelector('#proxy-rules-option .setting-input-value');
-		this.$proxyBypass = document.querySelector('#proxy-bypass-option .setting-input-value');
-		this.$proxySaveAction = document.getElementById('proxy-save-action');
-		this.$settingBlock = this.props.$root.querySelector('.setting-block');
-		this.initProxyOption();
-
-		this.$proxyPAC.value = ConfigUtil.getConfigItem('proxyPAC', '');
-		this.$proxyRules.value = ConfigUtil.getConfigItem('proxyRules', '');
-		this.$proxyBypass.value = ConfigUtil.getConfigItem('proxyBypass', '');
-
-		this.$proxySaveAction.addEventListener('click', () => {
-			ConfigUtil.setConfigItem('proxyPAC', this.$proxyPAC.value);
-			ConfigUtil.setConfigItem('proxyRules', this.$proxyRules.value);
-			ConfigUtil.setConfigItem('proxyBypass', this.$proxyBypass.value);
-
-			ipcRenderer.send('forward-message', 'reload-proxy', true);
-		});
-	}
-
-	initProxyOption() {
-		const proxyEnabled = ConfigUtil.getConfigItem('useProxy', false);
-		this.toggleProxySettings(proxyEnabled);
-		this.updateProxyOption();
-	}
-
-	toggleProxySettings(option) {
-		if (option) {
-			this.$settingBlock.classList.remove('hidden');
-		} else {
-			this.$settingBlock.classList.add('hidden');
-		}
-	}
-
-	updateProxyOption() {
-		this.generateSettingOption({
-			$element: document.querySelector('#use-proxy-option .setting-control'),
-			value: ConfigUtil.getConfigItem('useProxy', false),
-			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('useProxy');
-				ConfigUtil.setConfigItem('useProxy', newValue);
-				this.toggleProxySettings(newValue);
-				if (newValue === false) {
-					// Reload proxy if the proxy is turned off
-					ipcRenderer.send('forward-message', 'reload-proxy', false);
-				}
-				this.updateProxyOption();
-			}
-		});
-	}
-}
-
-module.exports = NetworkSection;

app/renderer/js/pages/preference/network-section.ts

@@ -0,0 +1,136 @@
+'use strict';
+
+import { ipcRenderer } from 'electron';
+
+import BaseSection = require('./base-section');
+import ConfigUtil = require('../../utils/config-util');
+import t = require('../../utils/translation-util');
+
+class NetworkSection extends BaseSection {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	$proxyPAC: HTMLInputElement;
+	$proxyRules: HTMLInputElement;
+	$proxyBypass: HTMLInputElement;
+	$proxySaveAction: Element;
+	$manualProxyBlock: Element;
+	constructor(props: any) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+            <div class="settings-pane">
+                <div class="title">${t.__('Proxy')}</div>
+                <div id="appearance-option-settings" class="settings-card">
+					<div class="setting-row" id="use-system-settings">
+						<div class="setting-description">${t.__('Use system proxy settings (requires restart)')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="use-manual-settings">
+						<div class="setting-description">${t.__('Manual proxy configuration')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="manual-proxy-block">
+						<div class="setting-row" id="proxy-pac-option">
+							<span class="setting-input-key">PAC ${t.__('script')}</span>
+							<input class="setting-input-value" placeholder="e.g. foobar.com/pacfile.js"/>
+						</div>
+						<div class="setting-row" id="proxy-rules-option">
+							<span class="setting-input-key">${t.__('Proxy rules')}</span>
+							<input class="setting-input-value" placeholder="e.g. http=foopy:80;ftp=foopy2"/>
+						</div>
+						<div class="setting-row" id="proxy-bypass-option">
+							<span class="setting-input-key">${t.__('Proxy bypass rules')}</span>
+							<input class="setting-input-value" placeholder="e.g. foobar.com"/>
+						</div>
+						<div class="setting-row">
+							<div class="action green" id="proxy-save-action">
+								<span>${t.__('Save')}</span>
+							</div>
+						</div>
+					</div>
+				</div>
+            </div>
+		`;
+	}
+
+	init(): void {
+		this.props.$root.innerHTML = this.template();
+		this.$proxyPAC = document.querySelector('#proxy-pac-option .setting-input-value');
+		this.$proxyRules = document.querySelector('#proxy-rules-option .setting-input-value');
+		this.$proxyBypass = document.querySelector('#proxy-bypass-option .setting-input-value');
+		this.$proxySaveAction = document.querySelector('#proxy-save-action');
+		this.$manualProxyBlock = this.props.$root.querySelector('.manual-proxy-block');
+		this.initProxyOption();
+
+		this.$proxyPAC.value = ConfigUtil.getConfigItem('proxyPAC', '');
+		this.$proxyRules.value = ConfigUtil.getConfigItem('proxyRules', '');
+		this.$proxyBypass.value = ConfigUtil.getConfigItem('proxyBypass', '');
+
+		this.$proxySaveAction.addEventListener('click', () => {
+			ConfigUtil.setConfigItem('proxyPAC', this.$proxyPAC.value);
+			ConfigUtil.setConfigItem('proxyRules', this.$proxyRules.value);
+			ConfigUtil.setConfigItem('proxyBypass', this.$proxyBypass.value);
+
+			ipcRenderer.send('forward-message', 'reload-proxy', true);
+		});
+	}
+
+	initProxyOption(): void {
+		const manualProxyEnabled = ConfigUtil.getConfigItem('useManualProxy', false);
+		this.toggleManualProxySettings(manualProxyEnabled);
+
+		this.updateProxyOption();
+	}
+
+	toggleManualProxySettings(option: boolean): void {
+		if (option) {
+			this.$manualProxyBlock.classList.remove('hidden');
+		} else {
+			this.$manualProxyBlock.classList.add('hidden');
+		}
+	}
+
+	updateProxyOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#use-system-settings .setting-control'),
+			value: ConfigUtil.getConfigItem('useSystemProxy', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('useSystemProxy');
+				const manualProxyValue = ConfigUtil.getConfigItem('useManualProxy');
+				if (manualProxyValue && newValue) {
+					ConfigUtil.setConfigItem('useManualProxy', !manualProxyValue);
+					this.toggleManualProxySettings(!manualProxyValue);
+				}
+				if (newValue === false) {
+					// Remove proxy system proxy settings
+					ConfigUtil.setConfigItem('proxyRules', '');
+					ipcRenderer.send('forward-message', 'reload-proxy', false);
+				}
+				ConfigUtil.setConfigItem('useSystemProxy', newValue);
+				this.updateProxyOption();
+			}
+		});
+		this.generateSettingOption({
+			$element: document.querySelector('#use-manual-settings .setting-control'),
+			value: ConfigUtil.getConfigItem('useManualProxy', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('useManualProxy');
+				const systemProxyValue = ConfigUtil.getConfigItem('useSystemProxy');
+				this.toggleManualProxySettings(newValue);
+				if (systemProxyValue && newValue) {
+					ConfigUtil.setConfigItem('useSystemProxy', !systemProxyValue);
+				}
+				ConfigUtil.setConfigItem('proxyRules', '');
+				ConfigUtil.setConfigItem('useManualProxy', newValue);
+				// Reload app only when turning manual proxy off, hence !newValue
+				ipcRenderer.send('forward-message', 'reload-proxy', !newValue);
+				this.updateProxyOption();
+			}
+		});
+	}
+}
+
+export = NetworkSection;

app/renderer/js/pages/preference/new-server-form.js

@@ -1,69 +0,0 @@
-'use strict';
-
-const BaseComponent = require(__dirname + '/../../components/base.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-
-class NewServerForm extends BaseComponent {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-			<div class="settings-card">
-				<div class="server-info-right">
-					<div class="title">URL of Zulip organization</div>
-					<div class="server-info-row">
-						<input class="setting-input-value" autofocus placeholder="acme.zulipchat.com or chat.acme.com"/>
-					</div>
-					<div class="server-info-row">
-						<div class="action blue server-save-action">
-							<i class="material-icons">add_box</i>
-							<span>Add</span>
-						</div>
-					</div>
-				</div>
-			</div>
-		`;
-	}
-
-	init() {
-		this.initForm();
-		this.initActions();
-	}
-
-	initForm() {
-		this.$newServerForm = this.generateNodeFromTemplate(this.template());
-		this.$saveServerButton = this.$newServerForm.getElementsByClassName('server-save-action')[0];
-		this.props.$root.innerHTML = '';
-		this.props.$root.appendChild(this.$newServerForm);
-
-		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0];
-	}
-
-	submitFormHandler() {
-		DomainUtil.checkDomain(this.$newServerUrl.value).then(serverConf => {
-			DomainUtil.addDomain(serverConf).then(() => {
-				this.props.onChange(this.props.index);
-			});
-		}, errorMessage => {
-			alert(errorMessage);
-		});
-	}
-
-	initActions() {
-		this.$saveServerButton.addEventListener('click', () => {
-			this.submitFormHandler();
-		});
-		this.$newServerUrl.addEventListener('keypress', event => {
-			const EnterkeyCode = event.keyCode;
-			// Submit form when Enter key is pressed
-			if (EnterkeyCode === 13) {
-				this.submitFormHandler();
-			}
-		});
-	}
-}
-
-module.exports = NewServerForm;

app/renderer/js/pages/preference/new-server-form.ts

@@ -0,0 +1,95 @@
+'use strict';
+
+import { shell } from 'electron';
+
+import BaseComponent = require('../../components/base');
+import DomainUtil = require('../../utils/domain-util');
+import t = require('../../utils/translation-util');
+
+class NewServerForm extends BaseComponent {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	$newServerForm: Element;
+	$saveServerButton: HTMLButtonElement;
+	$newServerUrl: HTMLInputElement;
+	constructor(props: any) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+			<div class="server-input-container">
+				<div class="title">${t.__('Organization URL')}</div>
+				<div class="add-server-info-row">
+					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
+				</div>
+				<div class="server-center">
+					<div class="server-save-action">
+						<button id="connect">${t.__('Connect')}</button>
+					</div>
+				</div>
+				<div class="server-center">
+				<div class="divider">
+					<hr class="left"/>${t.__('OR')}<hr class="right" />
+				</div>
+				</div>
+				<div class="server-center">
+				<div class="server-save-action">
+					<button id="open-create-org-link">${t.__('Create a new organization')}</button>
+			</div>
+					</div>
+			</div>
+		`;
+	}
+
+	init(): void {
+		this.initForm();
+		this.initActions();
+	}
+
+	initForm(): void {
+		this.$newServerForm = this.generateNodeFromTemplate(this.template());
+		this.$saveServerButton = this.$newServerForm.querySelectorAll('.server-save-action')[0] as HTMLButtonElement;
+		this.props.$root.innerHTML = '';
+		this.props.$root.append(this.$newServerForm);
+		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
+	}
+
+	submitFormHandler(): void {
+		this.$saveServerButton.children[0].innerHTML = 'Connecting...';
+		DomainUtil.checkDomain(this.$newServerUrl.value).then(serverConf => {
+			DomainUtil.addDomain(serverConf).then(() => {
+				this.props.onChange(this.props.index);
+			});
+		}, errorMessage => {
+			this.$saveServerButton.children[0].innerHTML = 'Connect';
+			alert(errorMessage);
+		});
+	}
+
+	openCreateNewOrgExternalLink(): void {
+		const link = 'https://zulipchat.com/new/';
+		const externalCreateNewOrgEl = document.querySelector('#open-create-org-link');
+		externalCreateNewOrgEl.addEventListener('click', () => {
+			shell.openExternal(link);
+		});
+	}
+
+	initActions(): void {
+		this.$saveServerButton.addEventListener('click', () => {
+			this.submitFormHandler();
+		});
+		this.$newServerUrl.addEventListener('keypress', event => {
+			const EnterkeyCode = event.keyCode;
+			// Submit form when Enter key is pressed
+			if (EnterkeyCode === 13) {
+				this.submitFormHandler();
+			}
+		});
+		// open create new org link in default browser
+		this.openCreateNewOrgExternalLink();
+	}
+}
+
+export = NewServerForm;

app/renderer/js/pages/preference/preference.js

@@ -1,94 +0,0 @@
-'use strict';
-
-const BaseComponent = require(__dirname + '/js/components/base.js');
-const { ipcRenderer } = require('electron');
-
-const Nav = require(__dirname + '/js/pages/preference/nav.js');
-const ServersSection = require(__dirname + '/js/pages/preference/servers-section.js');
-const GeneralSection = require(__dirname + '/js/pages/preference/general-section.js');
-const NetworkSection = require(__dirname + '/js/pages/preference/network-section.js');
-const ShortcutsSection = require(__dirname + '/js/pages/preference/shortcuts-section.js');
-
-class PreferenceView extends BaseComponent {
-	constructor() {
-		super();
-
-		this.$sidebarContainer = document.getElementById('sidebar');
-		this.$settingsContainer = document.getElementById('settings-container');
-	}
-
-	init() {
-		this.nav = new Nav({
-			$root: this.$sidebarContainer,
-			onItemSelected: this.handleNavigation.bind(this)
-		});
-
-		this.setDefaultView();
-		this.registerIpcs();
-	}
-
-	setDefaultView() {
-		let nav = 'General';
-		const hasTag = window.location.hash;
-		if (hasTag) {
-			nav = hasTag.substring(1);
-		}
-		this.handleNavigation(nav);
-	}
-
-	handleNavigation(navItem) {
-		this.nav.select(navItem);
-		switch (navItem) {
-			case 'Servers': {
-				this.section = new ServersSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
-			case 'General': {
-				this.section = new GeneralSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
-			case 'Network': {
-				this.section = new NetworkSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
-			case 'Shortcuts': {
-				this.section = new ShortcutsSection({
-					$root: this.$settingsContainer
-				});
-				break;
-			}
-			default: break;
-		}
-		this.section.init();
-		window.location.hash = `#${navItem}`;
-	}
-
-	registerIpcs() {
-		ipcRenderer.on('switch-settings-nav', (event, navItem) => {
-			this.handleNavigation(navItem);
-		});
-
-		ipcRenderer.on('toggle-sidebar', (event, state) => {
-			const inputSelector = '#sidebar-option .action .switch input';
-			const input = document.querySelector(inputSelector);
-			input.checked = state;
-		});
-
-		ipcRenderer.on('toggletray', (event, state) => {
-			const inputSelector = '#tray-option .action .switch input';
-			const input = document.querySelector(inputSelector);
-			input.checked = state;
-		});
-	}
-}
-
-window.onload = () => {
-	const preferenceView = new PreferenceView();
-	preferenceView.init();
-};

app/renderer/js/pages/preference/preference.ts

@@ -0,0 +1,126 @@
+'use strict';
+
+import { ipcRenderer } from 'electron';
+
+import BaseComponent = require('../../components/base');
+import Nav = require('./nav');
+import ServersSection = require('./servers-section');
+import GeneralSection = require('./general-section');
+import NetworkSection = require('./network-section');
+import ConnectedOrgSection = require('./connected-org-section');
+import ShortcutsSection = require('./shortcuts-section');
+
+type Section = ServersSection | GeneralSection | NetworkSection | ConnectedOrgSection | ShortcutsSection;
+
+class PreferenceView extends BaseComponent {
+	$sidebarContainer: Element;
+	$settingsContainer: Element;
+	nav: Nav;
+	section: Section;
+	constructor() {
+		super();
+		this.$sidebarContainer = document.querySelector('#sidebar');
+		this.$settingsContainer = document.querySelector('#settings-container');
+	}
+
+	init(): void {
+		this.nav = new Nav({
+			$root: this.$sidebarContainer,
+			onItemSelected: this.handleNavigation.bind(this)
+		});
+
+		this.setDefaultView();
+		this.registerIpcs();
+	}
+
+	setDefaultView(): void {
+		let nav = 'General';
+		const hasTag = window.location.hash;
+		if (hasTag) {
+			nav = hasTag.substring(1);
+		}
+		this.handleNavigation(nav);
+	}
+
+	handleNavigation(navItem: string): void {
+		this.nav.select(navItem);
+		switch (navItem) {
+			case 'AddServer': {
+				this.section = new ServersSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			case 'General': {
+				this.section = new GeneralSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			case 'Organizations': {
+				this.section = new ConnectedOrgSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			case 'Network': {
+				this.section = new NetworkSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			case 'Shortcuts': {
+				this.section = new ShortcutsSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
+			default: break;
+		}
+		this.section.init();
+		window.location.hash = `#${navItem}`;
+	}
+
+	// Handle toggling and reflect changes in preference page
+	handleToggle(elementName: string, state: boolean): void {
+		const inputSelector = `#${elementName} .action .switch input`;
+		const input: HTMLInputElement = document.querySelector(inputSelector);
+		if (input) {
+			input.checked = state;
+		}
+	}
+
+	registerIpcs(): void {
+		ipcRenderer.on('switch-settings-nav', (_event: Event, navItem: string) => {
+			this.handleNavigation(navItem);
+		});
+
+		ipcRenderer.on('toggle-sidebar-setting', (_event: Event, state: boolean) => {
+			this.handleToggle('sidebar-option', state);
+		});
+
+		ipcRenderer.on('toggle-menubar-setting', (_event: Event, state: boolean) => {
+			this.handleToggle('menubar-option', state);
+		});
+
+		ipcRenderer.on('toggletray', (_event: Event, state: boolean) => {
+			this.handleToggle('tray-option', state);
+		});
+
+		ipcRenderer.on('toggle-dnd', (_event: Event, _state: boolean, newSettings: any) => {
+			this.handleToggle('show-notification-option', newSettings.showNotification);
+			this.handleToggle('silent-option', newSettings.silent);
+
+			if (process.platform === 'win32') {
+				this.handleToggle('flash-taskbar-option', newSettings.flashTaskbarOnMessage);
+			}
+		});
+	}
+}
+
+window.addEventListener('load', () => {
+	const preferenceView = new PreferenceView();
+	preferenceView.init();
+});
+
+export = PreferenceView;

app/renderer/js/pages/preference/server-info-form.js

@@ -1,77 +0,0 @@
-'use strict';
-const {dialog} = require('electron').remote;
-const {ipcRenderer} = require('electron');
-
-const BaseComponent = require(__dirname + '/../../components/base.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-
-class ServerInfoForm extends BaseComponent {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-			<div class="settings-card">
-				<div class="server-info-left">
-					<img class="server-info-icon" src="${this.props.server.icon}"/>
-				</div>
-				<div class="server-info-right">
-					<div class="server-info-row">
-						<span class="server-info-alias">${this.props.server.alias}</span>
-						<i class="material-icons open-tab-button">open_in_new</i>
-					</div>
-					<div class="server-info-row">
-						<input class="setting-input-value" disabled value="${this.props.server.url}"/>
-					</div>
-					<div class="server-info-row">
-						<div class="action red server-delete-action">
-							<i class="material-icons">indeterminate_check_box</i>
-							<span>Delete</span>
-						</div>
-					</div>
-				</div>
-			</div>
-		`;
-	}
-
-	init() {
-		this.initForm();
-		this.initActions();
-	}
-
-	initForm() {
-		this.$serverInfoForm = this.generateNodeFromTemplate(this.template());
-		this.$serverInfoAlias = this.$serverInfoForm.getElementsByClassName('server-info-alias')[0];
-		this.$deleteServerButton = this.$serverInfoForm.getElementsByClassName('server-delete-action')[0];
-		this.$openServerButton = this.$serverInfoForm.getElementsByClassName('open-tab-button')[0];
-		this.props.$root.appendChild(this.$serverInfoForm);
-	}
-
-	initActions() {
-		this.$deleteServerButton.addEventListener('click', () => {
-			dialog.showMessageBox({
-				type: 'warning',
-				buttons: ['YES', 'NO'],
-				defaultId: 0,
-				message: 'Are you sure you want to delete this server?'
-			}, response => {
-				if (response === 0) {
-					DomainUtil.removeDomain(this.props.index);
-					this.props.onChange(this.props.index);
-				}
-			});
-		});
-
-		this.$openServerButton.addEventListener('click', () => {
-			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
-		});
-
-		this.$serverInfoAlias.addEventListener('click', () => {
-			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
-		});
-	}
-}
-
-module.exports = ServerInfoForm;

app/renderer/js/pages/preference/server-info-form.ts

@@ -0,0 +1,96 @@
+'use strict';
+
+import { remote, ipcRenderer } from 'electron';
+
+import BaseComponent = require('../../components/base');
+import DomainUtil = require('../../utils/domain-util');
+import Messages = require('./../../../../resources/messages');
+import t = require('../../utils/translation-util');
+
+const { dialog } = remote;
+
+class ServerInfoForm extends BaseComponent {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	$serverInfoForm: Element;
+	$serverInfoAlias: Element;
+	$serverIcon: Element;
+	$deleteServerButton: Element;
+	$openServerButton: Element;
+	constructor(props: any) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+			<div class="settings-card">
+				<div class="server-info-left">
+					<img class="server-info-icon" src="${this.props.server.icon}"/>
+					<div class="server-info-row">
+						<span class="server-info-alias">${this.props.server.alias}</span>
+						<i class="material-icons open-tab-button">open_in_new</i>
+					</div>
+				</div>
+				<div class="server-info-right">
+					<div class="server-info-row server-url">
+						<span class="server-url-info" title="${this.props.server.url}">${this.props.server.url}</span>
+					</div>
+					<div class="server-info-row">
+						<div class="action red server-delete-action">
+							<span>${t.__('Disconnect')}</span>
+						</div>
+					</div>
+				</div>
+			</div>
+		`;
+	}
+
+	init(): void {
+		this.initForm();
+		this.initActions();
+	}
+
+	initForm(): void {
+		this.$serverInfoForm = this.generateNodeFromTemplate(this.template());
+		this.$serverInfoAlias = this.$serverInfoForm.querySelectorAll('.server-info-alias')[0];
+		this.$serverIcon = this.$serverInfoForm.querySelectorAll('.server-info-icon')[0];
+		this.$deleteServerButton = this.$serverInfoForm.querySelectorAll('.server-delete-action')[0];
+		this.$openServerButton = this.$serverInfoForm.querySelectorAll('.open-tab-button')[0];
+		this.props.$root.append(this.$serverInfoForm);
+	}
+
+	initActions(): void {
+		this.$deleteServerButton.addEventListener('click', () => {
+			dialog.showMessageBox({
+				type: 'warning',
+				buttons: [t.__('YES'), t.__('NO')],
+				defaultId: 0,
+				message: t.__('Are you sure you want to disconnect this organization?')
+			}, response => {
+				if (response === 0) {
+					if (DomainUtil.removeDomain(this.props.index)) {
+						ipcRenderer.send('reload-full-app');
+					} else {
+						const { title, content } = Messages.orgRemovalError(DomainUtil.getDomain(this.props.index).url);
+						dialog.showErrorBox(title, content);
+					}
+				}
+			});
+		});
+
+		this.$openServerButton.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
+		});
+
+		this.$serverInfoAlias.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
+		});
+
+		this.$serverIcon.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
+		});
+	}
+}
+
+export = ServerInfoForm;

app/renderer/js/pages/preference/servers-section.js

@@ -1,73 +0,0 @@
-'use strict';
-
-const BaseSection = require(__dirname + '/base-section.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-const ServerInfoForm = require(__dirname + '/server-info-form.js');
-const NewServerForm = require(__dirname + '/new-server-form.js');
-const CreateOrganziation = require(__dirname + '/create-new-org.js');
-
-class ServersSection extends BaseSection {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-			<div class="settings-pane" id="server-settings-pane">
-				<div class="page-title">Register or login to a Zulip organization to get started</div>
-				<div id="new-server-container"></div>
-				<div class="title" id="existing-servers"></div>
-				<div id="server-info-container"></div>
-				<div id="create-organization-container"></div>
-			</div>
-		`;
-	}
-
-	init() {
-		this.initServers();
-	}
-
-	initServers() {
-		this.props.$root.innerHTML = '';
-
-		const servers = DomainUtil.getDomains();
-		this.props.$root.innerHTML = this.template();
-		this.$serverInfoContainer = document.getElementById('server-info-container');
-		this.$existingServers = document.getElementById('existing-servers');
-		this.$newServerContainer = document.getElementById('new-server-container');
-		this.$newServerButton = document.getElementById('new-server-action');
-
-		this.$serverInfoContainer.innerHTML = servers.length ? '' : '';
-		// Show Existing servers if servers are there otherwise hide it
-		this.$existingServers.innerHTML = servers.length === 0 ? '' : 'Existing organizations';
-		this.initNewServerForm();
-
-		this.$createOrganizationContainer = document.getElementById('create-organization-container');
-		this.initCreateNewOrganization();
-
-		for (let i = 0; i < servers.length; i++) {
-			new ServerInfoForm({
-				$root: this.$serverInfoContainer,
-				server: servers[i],
-				index: i,
-				onChange: this.reloadApp
-			}).init();
-		}
-	}
-
-	initCreateNewOrganization() {
-		new CreateOrganziation({
-			$root: this.$createOrganizationContainer
-		}).init();
-	}
-
-	initNewServerForm() {
-		new NewServerForm({
-			$root: this.$newServerContainer,
-			onChange: this.reloadApp
-		}).init();
-	}
-}
-
-module.exports = ServersSection;

app/renderer/js/pages/preference/servers-section.ts

@@ -0,0 +1,50 @@
+'use strict';
+
+import BaseSection = require('./base-section');
+import NewServerForm = require('./new-server-form');
+import t = require('../../utils/translation-util');
+
+class ServersSection extends BaseSection {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	$newServerContainer: Element;
+	constructor(props: any) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+		<div class="add-server-modal">
+			<div class="modal-container">
+				<div class="settings-pane" id="server-settings-pane">
+					<div class="page-title">${t.__('Add a Zulip organization')}</div>
+					<div id="new-server-container"></div>
+				</div>
+			</div>
+		</div>
+		`;
+	}
+
+	init(): void {
+		this.initServers();
+	}
+
+	initServers(): void {
+		this.props.$root.innerHTML = '';
+
+		this.props.$root.innerHTML = this.template();
+		this.$newServerContainer = document.querySelector('#new-server-container');
+
+		this.initNewServerForm();
+	}
+
+	initNewServerForm(): void {
+		new NewServerForm({
+			$root: this.$newServerContainer,
+			onChange: this.reloadApp
+		}).init();
+	}
+}
+
+export = ServersSection;

app/renderer/js/pages/preference/shortcuts-section.js

@@ -1,311 +0,0 @@
-'use strict';
-
-const BaseSection = require(__dirname + '/base-section.js');
-
-class ShortcutsSection extends BaseSection {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	templateMac() {
-		const userOSKey = '⌘';
-
-		return `
-            <div class="settings-pane">
-              <div class="title">Application Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>,</kbd></td>
-                    <td>Settings</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>K</kbd></td>
-                    <td>Keyboard Shortcuts</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>D</kbd></td>
-                    <td>Reset App Settings</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>L</kbd></td>
-                    <td>Log Out</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>H</kbd></td>
-                    <td>Hide Zulip</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>H</kbd></td>
-                    <td>Hide Others</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>Q</kbd></td>
-                    <td>Quit Zulip</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">Edit Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>Z</kbd></td>
-                    <td>Undo</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>Z</kbd></td>
-                    <td>Redo</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>X</kbd></td>
-                    <td>Cut</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>C</kbd></td>
-                    <td>Copy</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>V</kbd></td>
-                    <td>Paste</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>V</kbd></td>
-                    <td>Paste and Match Style</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>A</kbd></td>
-                    <td>Select All</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>F</kbd></td>
-                    <td>Find</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>G</kbd></td>
-                    <td>Find Next</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Control</kbd><kbd>${userOSKey}</kbd><kbd>Space</kbd></td>
-                    <td>Emoji & Symbols</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">View Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>R</kbd></td>
-                    <td>Reload</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>R</kbd></td>
-                    <td>Hard Reload</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Control</kbd><kbd>${userOSKey}</kbd><kbd>F</kbd></td>
-                    <td>Enter Full Screen</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>=</kbd></td>
-                    <td>Zoom In</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>-</kbd></td>
-                    <td>Zoom Out</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>0</kbd></td>
-                    <td>Actual Size</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>S</kbd></td>
-                    <td>Toggle Sidebar</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>I</kbd></td>
-                    <td>Toggle DevTools for Zulip App</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>U</kbd></td>
-                    <td>Toggle DevTools for Active Tab</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">History Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>←</kbd></td>
-                    <td>Back</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>→</kbd></td>
-                    <td>Forward</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">Window Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>M</kbd></td>
-                    <td>Minimize</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>W</kbd></td>
-                    <td>Close</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-            </div>
-		`;
-	}
-
-	templateWinLin() {
-		const userOSKey = 'Ctrl';
-
-		return `
-            <div class="settings-pane">
-              <div class="title">Application Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>,</kbd></td>
-                    <td>Settings</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>K</kbd></td>
-                    <td>Keyboard Shortcuts</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>L</kbd></td>
-                    <td>Log Out</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Q</kbd></td>
-                    <td>Quit Zulip</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">Edit Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Z</kbd></td>
-                    <td>Undo</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Y</kbd></td>
-                    <td>Redo</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>X</kbd></td>
-                    <td>Cut</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>C</kbd></td>
-                    <td>Copy</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>V</kbd></td>
-                    <td>Paste</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>V</kbd></td>
-                    <td>Paste and Match Style</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>A</kbd></td>
-                    <td>Select All</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">View Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>R</kbd></td>
-                    <td>Reload</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>R</kbd></td>
-                    <td>Hard Reload</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>F11</kbd></td>
-                    <td>Toggle Full Screen</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>=</kbd></td>
-                    <td>Zoom In</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>-</kbd></td>
-                    <td>Zoom Out</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>0</kbd></td>
-                    <td>Actual Size</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>S</kbd></td>
-                    <td>Toggle Sidebar</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>I</kbd></td>
-                    <td>Toggle DevTools for Zulip App</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>U</kbd></td>
-                    <td>Toggle DevTools for Active Tab</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">History Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>Alt</kbd> + <kbd>←</kbd></td>
-                    <td>Back</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Alt</kbd> + <kbd>→</kbd></td>
-                    <td>Forward</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">Window Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>M</kbd></td>
-                    <td>Minimize</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>W</kbd></td>
-                    <td>Close</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-            </div>
-		`;
-	}
-
-	init() {
-		this.props.$root.innerHTML = (process.platform === 'darwin') ?
-			this.templateMac() : this.templateWinLin();
-	}
-}
-
-module.exports = ShortcutsSection;

app/renderer/js/pages/preference/shortcuts-section.ts

@@ -0,0 +1,345 @@
+'use strict';
+
+import { shell } from 'electron';
+
+import BaseSection = require('./base-section');
+import t = require('../../utils/translation-util');
+
+class ShortcutsSection extends BaseSection {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	constructor(props: any) {
+		super();
+		this.props = props;
+	}
+	// TODO - Deduplicate templateMac and templateWinLin functions. In theory
+	// they both should be the same the only thing different should be the userOSKey
+	// variable but there seems to be inconsistences between both function, one has more
+	// lines though one may just be using more new lines and other thing is the use of +.
+	templateMac(): string {
+		const userOSKey = '⌘';
+
+		return `
+						<div class="settings-pane">
+						<div class="settings-card tip"><p><b><i class="material-icons md-14">settings</i>${t.__('Tip')}:  </b>${t.__('These desktop app shortcuts extend the Zulip webapp\'s')} <span id="open-hotkeys-link"> ${t.__('keyboard shortcuts')}</span>.</p></div>
+							<div class="title">${t.__('Application Shortcuts')}</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>,</kbd></td>
+										<td>${t.__('Settings')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>K</kbd></td>
+										<td>${t.__('Keyboard Shortcuts')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>M</kbd></td>
+										<td>${t.__('Toggle Do Not Disturb')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>D</kbd></td>
+										<td>${t.__('Reset App Settings')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>L</kbd></td>
+										<td>${t.__('Log Out')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>H</kbd></td>
+										<td>${t.__('Hide Zulip')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>H</kbd></td>
+										<td>${t.__('Hide Others')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>Q</kbd></td>
+										<td>${t.__('Quit Zulip')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">${t.__('Edit Shortcuts')}</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>Z</kbd></td>
+										<td>${t.__('Undo')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>Z</kbd></td>
+										<td>${t.__('Redo')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>X</kbd></td>
+										<td>${t.__('Cut')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>C</kbd></td>
+										<td>${t.__('Copy')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>V</kbd></td>
+										<td>${t.__('Paste')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>V</kbd></td>
+										<td>${t.__('Paste and Match Style')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>A</kbd></td>
+										<td>${t.__('Select All')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Control</kbd><kbd>${userOSKey}</kbd><kbd>Space</kbd></td>
+										<td>${t.__('Emoji & Symbols')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">${t.__('View Shortcuts')}</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>R</kbd></td>
+										<td>${t.__('Reload')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>R</kbd></td>
+										<td>${t.__('Hard Reload')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Control</kbd><kbd>${userOSKey}</kbd><kbd>F</kbd></td>
+										<td>${t.__('Enter Full Screen')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>+</kbd></td>
+										<td>${t.__('Zoom In')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>-</kbd></td>
+										<td>${t.__('Zoom Out')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>0</kbd></td>
+										<td>${t.__('Actual Size')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd></td>
+										<td>${t.__('Toggle Sidebar')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>I</kbd></td>
+										<td>${t.__('Toggle DevTools for Zulip App')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>U</kbd></td>
+										<td>${t.__('Toggle DevTools for Active Tab')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Ctrl</kbd> + <kbd>Tab</kbd></td>
+										<td>${t.__('Switch to Next Organization')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd></td>
+										<td>${t.__('Switch to Previous Organization')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">${t.__('History Shortcuts')}</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>←</kbd></td>
+										<td>${t.__('Back')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>→</kbd></td>
+										<td>${t.__('Forward')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">Window Shortcuts</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>M</kbd></td>
+										<td>${t.__('Minimize')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>W</kbd></td>
+										<td>${t.__('Close')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+						</div>
+		`;
+	}
+
+	templateWinLin(): string {
+		const userOSKey = 'Ctrl';
+
+		return `
+						<div class="settings-pane">
+						<div class="settings-card tip"><p><b><i class="material-icons md-14">settings</i>${t.__('Tip')}:  </b>${t.__('These desktop app shortcuts extend the Zulip webapp\'s')} <span id="open-hotkeys-link"> ${t.__('keyboard shortcuts')}</span>.</p></div>
+							<div class="title">${t.__('Application Shortcuts')}</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>,</kbd></td>
+										<td>${t.__('Settings')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>K</kbd></td>
+										<td>${t.__('Keyboard Shortcuts')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>M</kbd></td>
+										<td>${t.__('Toggle Do Not Disturb')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>L</kbd></td>
+										<td>${t.__('Log Out')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Q</kbd></td>
+										<td>${t.__('Quit Zulip')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">${t.__('Edit Shortcuts')}</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Z</kbd></td>
+										<td>${t.__('Undo')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Y</kbd></td>
+										<td>${t.__('Redo')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>X</kbd></td>
+										<td>${t.__('Cut')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>C</kbd></td>
+										<td>${t.__('Copy')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>V</kbd></td>
+										<td>${t.__('Paste')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>V</kbd></td>
+										<td>${t.__('Paste and Match Style')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>A</kbd></td>
+										<td>${t.__('Select All')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">${t.__('View Shortcuts')}</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>R</kbd></td>
+										<td>${t.__('Reload')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>R</kbd></td>
+										<td>${t.__('Hard Reload')}</td>
+									</tr>
+									<tr>
+										<td><kbd>F11</kbd></td>
+										<td>${t.__('Toggle Full Screen')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>=</kbd></td>
+										<td>${t.__('Zoom In')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>-</kbd></td>
+										<td>${t.__('Zoom Out')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>0</kbd></td>
+										<td>${t.__('Actual Size')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd></td>
+										<td>${t.__('Toggle Sidebar')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>I</kbd></td>
+										<td>${t.__('Toggle DevTools for Zulip App')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>U</kbd></td>
+										<td>${t.__('Toggle DevTools for Active Tab')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Tab</kbd></td>
+										<td>${t.__('Switch to Next Organization')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd></td>
+										<td>${t.__('Switch to Previous Organization')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">${t.__('History Shortcuts')}</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>Alt</kbd> + <kbd>←</kbd></td>
+										<td>${t.__('Back')}</td>
+									</tr>
+									<tr>
+										<td><kbd>Alt</kbd> + <kbd>→</kbd></td>
+										<td>${t.__('Forward')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">${t.__('Window Shortcuts')}</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>M</kbd></td>
+										<td>${t.__('Minimize')}</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>W</kbd></td>
+										<td>${t.__('Close')}</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+						</div>
+		`;
+	}
+
+	openHotkeysExternalLink(): void {
+		const link = 'https://zulipchat.com/help/keyboard-shortcuts';
+		const externalCreateNewOrgEl = document.querySelector('#open-hotkeys-link');
+		externalCreateNewOrgEl.addEventListener('click', () => {
+			shell.openExternal(link);
+		});
+	}
+	init(): void {
+		this.props.$root.innerHTML = (process.platform === 'darwin') ?
+			this.templateMac() : this.templateWinLin();
+		this.openHotkeysExternalLink();
+	}
+}
+
+export = ShortcutsSection;

app/renderer/js/preload.js

@@ -1,62 +0,0 @@
-'use strict';
-
-const { ipcRenderer } = require('electron');
-const SetupSpellChecker = require('./spellchecker');
-
-const ConfigUtil = require(__dirname + '/utils/config-util.js');
-
-// eslint-disable-next-line import/no-unassigned-import
-require('./notification');
-
-const logout = () => {
-	// Create the menu for the below
-	document.querySelector('.dropdown-toggle').click();
-
-	const nodes = document.querySelectorAll('.dropdown-menu li:last-child a');
-	nodes[nodes.length - 1].click();
-};
-
-const shortcut = () => {
-	// Create the menu for the below
-	const node = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
-	// Additional check
-	if (node.text.trim().toLowerCase() === 'keyboard shortcuts') {
-		node.click();
-	} else {
-		// Atleast click the dropdown
-		document.querySelector('.dropdown-toggle').click();
-	}
-};
-
-process.once('loaded', () => {
-	global.logout = logout;
-	global.shortcut = shortcut;
-});
-
-// To prevent failing this script on linux we need to load it after the document loaded
-document.addEventListener('DOMContentLoaded', () => {
-	// Get the default language of the server
-	const serverLanguage = page_params.default_language; // eslint-disable-line no-undef, camelcase
-
-	if (serverLanguage) {
-		// Set spellcheker language
-		ConfigUtil.setConfigItem('spellcheckerLanguage', serverLanguage);
-		// Init spellchecker
-		SetupSpellChecker.init();
-	}
-
-	// redirect users to network troubleshooting page
-	const getRestartButton = document.querySelector('.restart_get_events_button');
-	if (getRestartButton) {
-		getRestartButton.addEventListener('click', () => {
-			ipcRenderer.send('forward-message', 'reload-viewer');
-		});
-	}
-});
-
-// Clean up spellchecker events after you navigate away from this page;
-// otherwise, you may experience errors
-window.addEventListener('beforeunload', () => {
-	SetupSpellChecker.unsubscribeSpellChecker();
-});
-

app/renderer/js/preload.ts

@@ -0,0 +1,114 @@
+'use strict';
+
+import { ipcRenderer, shell } from 'electron';
+import SetupSpellChecker from './spellchecker';
+
+import LinkUtil = require('./utils/link-util');
+import params = require('./utils/params-util');
+
+interface PatchedGlobal extends NodeJS.Global {
+	logout: () => void;
+	shortcut: () => void;
+}
+
+const globalPatched = global as PatchedGlobal;
+
+// eslint-disable-next-line import/no-unassigned-import
+require('./notification');
+
+// Prevent drag and drop event in main process which prevents remote code executaion
+require(__dirname + '/shared/preventdrag.js');
+
+declare let window: ZulipWebWindow;
+
+// eslint-disable-next-line @typescript-eslint/camelcase
+window.electron_bridge = require('./electron-bridge');
+
+const logout = (): void => {
+	// Create the menu for the below
+	const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
+	dropdown.click();
+
+	const nodes: NodeListOf<HTMLElement> = document.querySelectorAll('.dropdown-menu li:last-child a');
+	nodes[nodes.length - 1].click();
+};
+
+const shortcut = (): void => {
+	// Create the menu for the below
+	const node: HTMLElement = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
+	// Additional check
+	if (node.textContent.trim().toLowerCase() === 'keyboard shortcuts (?)') {
+		node.click();
+	} else {
+		// Atleast click the dropdown
+		const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
+		dropdown.click();
+	}
+};
+
+process.once('loaded', (): void => {
+	globalPatched.logout = logout;
+	globalPatched.shortcut = shortcut;
+});
+
+// To prevent failing this script on linux we need to load it after the document loaded
+document.addEventListener('DOMContentLoaded', (): void => {
+	if (params.isPageParams()) {
+	// Get the default language of the server
+		const serverLanguage = page_params.default_language; // eslint-disable-line no-undef, @typescript-eslint/camelcase
+		if (serverLanguage) {
+			// Init spellchecker
+			SetupSpellChecker.init(serverLanguage);
+		}
+		// redirect users to network troubleshooting page
+		const getRestartButton = document.querySelector('.restart_get_events_button');
+		if (getRestartButton) {
+			getRestartButton.addEventListener('click', () => {
+				ipcRenderer.send('forward-message', 'reload-viewer');
+			});
+		}
+		// Open image attachment link in the lightbox instead of opening in the default browser
+		const { $, lightbox } = window;
+		$('#main_div').on('click', '.message_content p a', function (this: HTMLElement, e: Event) {
+			const url = $(this).attr('href');
+
+			if (LinkUtil.isImage(url)) {
+				const $img = $(this).parent().siblings('.message_inline_image').find('img');
+
+				// prevent the image link from opening in a new page.
+				e.preventDefault();
+				// prevent the message compose dialog from happening.
+				e.stopPropagation();
+
+				// Open image in the default browser if image preview is unavailable
+				if (!$img[0]) {
+					shell.openExternal(window.location.origin + url);
+				}
+				// Open image in lightbox
+				lightbox.open($img);
+			}
+		});
+	}
+});
+
+// Clean up spellchecker events after you navigate away from this page;
+// otherwise, you may experience errors
+window.addEventListener('beforeunload', (): void => {
+	SetupSpellChecker.unsubscribeSpellChecker();
+});
+
+// electron's globalShortcut can cause unexpected results
+// so adding the reload shortcut in the old-school way
+// Zoom from numpad keys is not supported by electron, so adding it through listeners.
+document.addEventListener('keydown', event => {
+	const cmdOrCtrl = event.ctrlKey || event.metaKey;
+	if (event.code === 'F5') {
+		ipcRenderer.send('forward-message', 'hard-reload');
+	} else if (cmdOrCtrl && (event.code === 'NumpadAdd' || event.code === 'Equal')) {
+		ipcRenderer.send('forward-message', 'zoomIn');
+	} else if (cmdOrCtrl && event.code === 'NumpadSubtract') {
+		ipcRenderer.send('forward-message', 'zoomOut');
+	} else if (cmdOrCtrl && event.code === 'Numpad0') {
+		ipcRenderer.send('forward-message', 'zoomActualSize');
+	}
+});

app/renderer/js/shared/preventdrag.ts

@@ -0,0 +1,17 @@
+'use strict';
+
+// This is a security fix. Following function prevents drag and drop event in the app
+// so that attackers can't execute any remote code within the app
+// It doesn't affect the compose box so that users can still
+// use drag and drop event to share files etc
+
+const preventDragAndDrop = (): void => {
+	const preventEvents = ['dragover', 'drop'];
+	preventEvents.forEach(dragEvents => {
+		document.addEventListener(dragEvents, event => {
+			event.preventDefault();
+		});
+	});
+};
+
+preventDragAndDrop();

app/renderer/js/spellchecker.js

@@ -1,56 +0,0 @@
-'use strict';
-
-const { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } = require('electron-spellchecker');
-
-const ConfigUtil = require(__dirname + '/utils/config-util.js');
-
-class SetupSpellChecker {
-	init() {
-		if (ConfigUtil.getConfigItem('enableSpellchecker')) {
-			this.enableSpellChecker();
-		}
-		this.enableContextMenu();
-	}
-
-	enableSpellChecker() {
-		try {
-			this.SpellCheckHandler = new SpellCheckHandler();
-		} catch (err) {
-			console.log(err);
-		}
-	}
-
-	enableContextMenu() {
-		if (this.SpellCheckHandler) {
-			this.SpellCheckHandler.attachToInput();
-
-			const userLanguage = ConfigUtil.getConfigItem('spellcheckerLanguage');
-
-			// eslint-disable-next-line no-unused-expressions
-			process.platform === 'darwin' ?
-				// On macOS, spellchecker fails to auto-detect the lanugage user is typing in
-				// that's why we need to mention it explicitly
-				this.SpellCheckHandler.switchLanguage(userLanguage) :
-				// On Linux and Windows, spellchecker can automatically detects the language the user is typing in
-				// and silently switches on the fly; thus we can start off as US English
-				this.SpellCheckHandler.switchLanguage('en-US');
-		}
-
-		const contextMenuBuilder = new ContextMenuBuilder(this.SpellCheckHandler);
-		this.contextMenuListener = new ContextMenuListener(info => {
-			contextMenuBuilder.showPopupMenu(info);
-		});
-	}
-
-	unsubscribeSpellChecker() {
-		// eslint-disable-next-line no-undef
-		if (this.SpellCheckHandler) {
-			this.SpellCheckHandler.unsubscribe();
-		}
-		if (this.contextMenuListener) {
-			this.contextMenuListener.unsubscribe();
-		}
-	}
-}
-
-module.exports = new SetupSpellChecker();

app/renderer/js/spellchecker.ts

@@ -0,0 +1,56 @@
+'use strict';
+
+import { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
+
+import ConfigUtil = require('./utils/config-util');
+import Logger = require('./utils/logger-util');
+
+const logger = new Logger({
+	file: 'errors.log',
+	timestamp: true
+});
+
+class SetupSpellChecker {
+	SpellCheckHandler: typeof SpellCheckHandler;
+	contextMenuListener: typeof ContextMenuListener;
+	init(serverLanguage: string): void {
+		if (ConfigUtil.getConfigItem('enableSpellchecker')) {
+			this.enableSpellChecker();
+		}
+		this.enableContextMenu(serverLanguage);
+	}
+
+	enableSpellChecker(): void {
+		try {
+			this.SpellCheckHandler = new SpellCheckHandler();
+		} catch (err) {
+			logger.error(err);
+		}
+	}
+
+	enableContextMenu(serverLanguage: string): void {
+		if (this.SpellCheckHandler) {
+			this.SpellCheckHandler.attachToInput();
+			this.SpellCheckHandler.switchLanguage(serverLanguage);
+			this.SpellCheckHandler.currentSpellcheckerChanged.subscribe(() => {
+				this.SpellCheckHandler.switchLanguage(this.SpellCheckHandler.currentSpellcheckerLanguage);
+			});
+		}
+
+		const contextMenuBuilder = new ContextMenuBuilder(this.SpellCheckHandler);
+		this.contextMenuListener = new ContextMenuListener((info: object) => {
+			contextMenuBuilder.showPopupMenu(info);
+		});
+	}
+
+	unsubscribeSpellChecker(): void {
+		if (this.SpellCheckHandler) {
+			this.SpellCheckHandler.unsubscribe();
+		}
+		if (this.contextMenuListener) {
+			this.contextMenuListener.unsubscribe();
+		}
+	}
+}
+
+export = new SetupSpellChecker();

app/renderer/js/tray.ts

@@ -1,17 +1,15 @@
 'use strict';
-const path = require('path');
+import { ipcRenderer, remote, WebviewTag, NativeImage } from 'electron';
 
-const electron = require('electron');
-
-const {ipcRenderer, remote} = electron;
-
-const {Tray, Menu, nativeImage, BrowserWindow} = remote;
+import path = require('path');
+import ConfigUtil = require('./utils/config-util.js');
+const { Tray, Menu, nativeImage, BrowserWindow } = remote;
 
 const APP_ICON = path.join(__dirname, '../../resources/tray', 'tray');
 
-const ConfigUtil = require(__dirname + '/utils/config-util.js');
+declare let window: ZulipWebWindow;
 
-const iconPath = () => {
+const iconPath = (): string => {
 	if (process.platform === 'linux') {
 		return APP_ICON + 'linux.png';
 	}
@@ -20,7 +18,7 @@ const iconPath = () => {
 
 let unread = 0;
 
-const trayIconSize = () => {
+const trayIconSize = (): number => {
 	switch (process.platform) {
 		case 'darwin':
 			return 20;
@@ -45,7 +43,7 @@ const config = {
 	thick: process.platform === 'win32'
 };
 
-const renderCanvas = function (arg) {
+const renderCanvas = function (arg: number): Promise<HTMLCanvasElement> {
 	config.unreadCount = arg;
 
 	return new Promise(resolve => {
@@ -79,10 +77,10 @@ const renderCanvas = function (arg) {
 				ctx.fillText('99+', CENTER, CENTER + (SIZE * 0.15));
 			} else if (config.unreadCount < 10) {
 				ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.5}px Helvetica`;
-				ctx.fillText(config.unreadCount, CENTER, CENTER + (SIZE * 0.20));
+				ctx.fillText(String(config.unreadCount), CENTER, CENTER + (SIZE * 0.20));
 			} else {
 				ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.5}px Helvetica`;
-				ctx.fillText(config.unreadCount, CENTER, CENTER + (SIZE * 0.15));
+				ctx.fillText(String(config.unreadCount), CENTER, CENTER + (SIZE * 0.15));
 			}
 
 			resolve(canvas);
@@ -94,16 +92,23 @@ const renderCanvas = function (arg) {
  * @param arg: Unread count
  * @return the native image
  */
-const renderNativeImage = function (arg) {
+const renderNativeImage = function (arg: number): Promise<NativeImage> {
 	return Promise.resolve()
 		.then(() => renderCanvas(arg))
 		.then(canvas => {
-			const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPng();
-			return Promise.resolve(nativeImage.createFromBuffer(pngData, config.pixelRatio));
+			const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPNG();
+
+			// TODO: Fix the function to correctly use Promise correctly.
+			// the Promise.resolve().then(...) above is useless we should
+			// start with renderCanvas(arg).then
+			// eslint-disable-next-line promise/no-return-wrap
+			return Promise.resolve(nativeImage.createFromBuffer(pngData, {
+				scaleFactor: config.pixelRatio
+			}));
 		});
 };
 
-function sendAction(action) {
+function sendAction(action: string): void {
 	const win = BrowserWindow.getAllWindows()[0];
 
 	if (process.platform === 'darwin') {
@@ -113,57 +118,43 @@ function sendAction(action) {
 	win.webContents.send(action);
 }
 
-const createTray = function () {
+const createTray = function (): void {
 	window.tray = new Tray(iconPath());
-	const contextMenu = Menu.buildFromTemplate([{
-		label: 'About',
-		click() {
-			// We need to focus the main window first
-			ipcRenderer.send('focus-app');
-			sendAction('open-about');
+	const contextMenu = Menu.buildFromTemplate([
+		{
+			label: 'Zulip',
+			click() {
+				ipcRenderer.send('focus-app');
+			}
+		},
+		{
+			label: 'Settings',
+			click() {
+				ipcRenderer.send('focus-app');
+				sendAction('open-settings');
+			}
+		},
+		{
+			type: 'separator'
+		},
+		{
+			label: 'Quit',
+			click() {
+				ipcRenderer.send('quit-app');
+			}
 		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Focus',
-		click() {
-			ipcRenderer.send('focus-app');
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Settings',
-		click() {
-			ipcRenderer.send('focus-app');
-			sendAction('open-settings');
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Quit',
-		click() {
-			ipcRenderer.send('quit-app');
-		}
-	}
 	]);
 	window.tray.setContextMenu(contextMenu);
-	window.tray.on('click', () => {
-		// Click event only works on Windows
-		if (process.platform === 'win32') {
+	if (process.platform === 'linux' || process.platform === 'win32') {
+		window.tray.on('click', () => {
 			ipcRenderer.send('toggle-app');
-		}
-	});
+		});
+	}
 };
 
-ipcRenderer.on('destroytray', event => {
+ipcRenderer.on('destroytray', (event: Event): Event => {
 	if (!window.tray) {
-		return;
+		return undefined;
 	}
 
 	window.tray.destroy();
@@ -176,7 +167,7 @@ ipcRenderer.on('destroytray', event => {
 	return event;
 });
 
-ipcRenderer.on('tray', (event, arg) => {
+ipcRenderer.on('tray', (_event: Event, arg: number): void => {
 	if (!window.tray) {
 		return;
 	}
@@ -196,7 +187,7 @@ ipcRenderer.on('tray', (event, arg) => {
 	}
 });
 
-function toggleTray() {
+function toggleTray(): void {
 	let state;
 	if (window.tray) {
 		state = false;
@@ -217,7 +208,7 @@ function toggleTray() {
 		ConfigUtil.setConfigItem('trayIcon', true);
 	}
 	const selector = 'webview:not([class*=disabled])';
-	const webview = document.querySelector(selector);
+	const webview: WebviewTag = document.querySelector(selector);
 	const webContents = webview.getWebContents();
 	webContents.send('toggletray', state);
 }

app/renderer/js/utils/certificate-util.ts

@@ -0,0 +1,96 @@
+'use strict';
+
+import { remote } from 'electron';
+import JsonDB from 'node-json-db';
+import { initSetUp } from './default-util';
+
+import fs = require('fs');
+import path = require('path');
+import Logger = require('./logger-util');
+
+const { app, dialog } = remote;
+
+initSetUp();
+
+const logger = new Logger({
+	file: `certificate-util.log`,
+	timestamp: true
+});
+
+let instance: null | CertificateUtil = null;
+const certificatesDir = `${app.getPath('userData')}/certificates`;
+
+class CertificateUtil {
+	db: JsonDB;
+
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		this.reloadDB();
+		return instance;
+	}
+
+	getCertificate(server: string, defaultValue: any = null): any {
+		this.reloadDB();
+		const value = this.db.getData('/')[server];
+		if (value === undefined) {
+			return defaultValue;
+		} else {
+			return value;
+		}
+	}
+
+	// Function to copy the certificate to userData folder
+	copyCertificate(_server: string, location: string, fileName: string): boolean {
+		let copied = false;
+		const filePath = `${certificatesDir}/${fileName}`;
+		try {
+			fs.copyFileSync(location, filePath);
+			copied = true;
+		} catch (err) {
+			dialog.showErrorBox(
+				'Error saving certificate',
+				'We encountered error while saving the certificate.'
+			);
+			logger.error('Error while copying the certificate to certificates folder.');
+			logger.error(err);
+		}
+		return copied;
+	}
+
+	setCertificate(server: string, fileName: string): void {
+		const filePath = `${certificatesDir}/${fileName}`;
+		this.db.push(`/${server}`, filePath, true);
+		this.reloadDB();
+	}
+
+	removeCertificate(server: string): void {
+		this.db.delete(`/${server}`);
+		this.reloadDB();
+	}
+
+	reloadDB(): void {
+		const settingsJsonPath = path.join(app.getPath('userData'), '/config/certificates.json');
+		try {
+			const file = fs.readFileSync(settingsJsonPath, 'utf8');
+			JSON.parse(file);
+		} catch (err) {
+			if (fs.existsSync(settingsJsonPath)) {
+				fs.unlinkSync(settingsJsonPath);
+				dialog.showErrorBox(
+					'Error saving settings',
+					'We encountered error while saving the certificate.'
+				);
+				logger.error('Error while JSON parsing certificates.json: ');
+				logger.error(err);
+			}
+		}
+		this.db = new JsonDB(settingsJsonPath, true, true);
+	}
+}
+
+export = new CertificateUtil();

app/renderer/js/utils/common-util.ts

@@ -0,0 +1,25 @@
+'use strict';
+
+let instance: null | CommonUtil = null;
+
+class CommonUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+		return instance;
+	}
+
+	// unescape already encoded/escaped strings
+	decodeString(stringInput: string): string {
+		const parser = new DOMParser();
+		const dom = parser.parseFromString(
+			'<!doctype html><body>' + stringInput,
+			'text/html');
+		return dom.body.textContent;
+	}
+}
+
+export = new CommonUtil();

app/renderer/js/utils/config-util.js

@@ -1,82 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const process = require('process');
-const JsonDB = require('node-json-db');
-const Logger = require('./logger-util');
-
-const logger = new Logger({
-	file: 'config-util.log',
-	timestamp: true
-});
-
-let instance = null;
-let dialog = null;
-let app = null;
-
-/* To make the util runnable in both main and renderer process */
-if (process.type === 'renderer') {
-	const remote = require('electron').remote;
-	dialog = remote.dialog;
-	app = remote.app;
-} else {
-	const electron = require('electron');
-	dialog = electron.dialog;
-	app = electron.app;
-}
-
-class ConfigUtil {
-	constructor() {
-		if (instance) {
-			return instance;
-		} else {
-			instance = this;
-		}
-
-		this.reloadDB();
-		return instance;
-	}
-
-	getConfigItem(key, defaultValue = null) {
-		this.reloadDB();
-		const value = this.db.getData('/')[key];
-		if (value === undefined) {
-			this.setConfigItem(key, defaultValue);
-			return defaultValue;
-		} else {
-			return value;
-		}
-	}
-
-	setConfigItem(key, value) {
-		this.db.push(`/${key}`, value, true);
-		this.reloadDB();
-	}
-
-	removeConfigItem(key) {
-		this.db.delete(`/${key}`);
-		this.reloadDB();
-	}
-
-	reloadDB() {
-		const settingsJsonPath = path.join(app.getPath('userData'), '/settings.json');
-		try {
-			const file = fs.readFileSync(settingsJsonPath, 'utf8');
-			JSON.parse(file);
-		} catch (err) {
-			if (fs.existsSync(settingsJsonPath)) {
-				fs.unlinkSync(settingsJsonPath);
-				dialog.showErrorBox(
-					'Error saving settings',
-					'We encountered error while saving current settings.'
-				);
-				logger.error('Error while JSON parsing settings.json: ');
-				logger.error(err);
-			}
-		}
-		this.db = new JsonDB(settingsJsonPath, true, true);
-	}
-}
-
-module.exports = new ConfigUtil();

app/renderer/js/utils/config-util.ts

@@ -0,0 +1,106 @@
+'use strict';
+import JsonDB from 'node-json-db';
+
+import fs = require('fs');
+import path = require('path');
+import electron = require('electron');
+import Logger = require('./logger-util');
+import EnterpriseUtil = require('./enterprise-util');
+
+const logger = new Logger({
+	file: 'config-util.log',
+	timestamp: true
+});
+
+let instance: null | ConfigUtil = null;
+let dialog: Electron.Dialog = null;
+let app: Electron.App = null;
+
+/* To make the util runnable in both main and renderer process */
+if (process.type === 'renderer') {
+	const { remote } = electron;
+	dialog = remote.dialog;
+	app = remote.app;
+} else {
+	dialog = electron.dialog;
+	app = electron.app;
+}
+
+class ConfigUtil {
+	db: JsonDB;
+
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		this.reloadDB();
+		return instance;
+	}
+
+	getConfigItem(key: string, defaultValue: any = null): any {
+		try {
+			this.db.reload();
+		} catch (err) {
+			logger.error('Error while reloading settings.json: ');
+			logger.error(err);
+		}
+		const value = this.db.getData('/')[key];
+		if (value === undefined) {
+			this.setConfigItem(key, defaultValue);
+			return defaultValue;
+		} else {
+			return value;
+		}
+	}
+
+	// This function returns whether a key exists in the configuration file (settings.json)
+	isConfigItemExists(key: string): boolean {
+		try {
+			this.db.reload();
+		} catch (err) {
+			logger.error('Error while reloading settings.json: ');
+			logger.error(err);
+		}
+		const value = this.db.getData('/')[key];
+		return (value !== undefined);
+	}
+
+	setConfigItem(key: string, value: any, override? : boolean): void {
+		if (EnterpriseUtil.configItemExists(key) && !override) {
+			// if item is in global config and we're not trying to override
+			return;
+		}
+		this.db.push(`/${key}`, value, true);
+		this.db.save();
+	}
+
+	removeConfigItem(key: string): void {
+		this.db.delete(`/${key}`);
+		this.db.save();
+	}
+
+	reloadDB(): void {
+		const settingsJsonPath = path.join(app.getPath('userData'), '/config/settings.json');
+		try {
+			const file = fs.readFileSync(settingsJsonPath, 'utf8');
+			JSON.parse(file);
+		} catch (err) {
+			if (fs.existsSync(settingsJsonPath)) {
+				fs.unlinkSync(settingsJsonPath);
+				dialog.showErrorBox(
+					'Error saving settings',
+					'We encountered an error while saving the settings.'
+				);
+				logger.error('Error while JSON parsing settings.json: ');
+				logger.error(err);
+				logger.reportSentry(err);
+			}
+		}
+		this.db = new JsonDB(settingsJsonPath, true, true);
+	}
+}
+
+export = new ConfigUtil();

app/renderer/js/utils/default-util.js

@@ -1,31 +0,0 @@
-const fs = require('fs');
-
-let app = null;
-let setupCompleted = false;
-if (process.type === 'renderer') {
-	app = require('electron').remote.app;
-} else {
-	app = require('electron').app;
-}
-
-const zulipDir = app.getPath('userData');
-const logDir = `${zulipDir}/Logs/`;
-const initSetUp = () => {
-	// if it is the first time the app is running
-	// create zulip dir in userData folder to
-	// avoid errors
-	if (!setupCompleted) {
-		if (!fs.existsSync(zulipDir)) {
-			fs.mkdirSync(zulipDir);
-		}
-
-		if (!fs.existsSync(logDir)) {
-			fs.mkdirSync(logDir);
-		}
-		setupCompleted = true;
-	}
-};
-
-module.exports = {
-	initSetUp
-};

app/renderer/js/utils/default-util.ts

@@ -0,0 +1,74 @@
+import fs = require('fs');
+
+let app: Electron.App = null;
+let setupCompleted = false;
+if (process.type === 'renderer') {
+	app = require('electron').remote.app;
+} else {
+	app = require('electron').app;
+}
+
+const zulipDir = app.getPath('userData');
+const logDir = `${zulipDir}/Logs/`;
+const certificatesDir = `${zulipDir}/certificates/`;
+const configDir = `${zulipDir}/config/`;
+export const initSetUp = (): void => {
+	// if it is the first time the app is running
+	// create zulip dir in userData folder to
+	// avoid errors
+	if (!setupCompleted) {
+		if (!fs.existsSync(zulipDir)) {
+			fs.mkdirSync(zulipDir);
+		}
+
+		if (!fs.existsSync(logDir)) {
+			fs.mkdirSync(logDir);
+		}
+
+		if (!fs.existsSync(certificatesDir)) {
+			fs.mkdirSync(certificatesDir);
+		}
+
+		// Migrate config files from app data folder to config folder inside app
+		// data folder. This will be done once when a user updates to the new version.
+		if (!fs.existsSync(configDir)) {
+			fs.mkdirSync(configDir);
+			const domainJson = `${zulipDir}/domain.json`;
+			const certificatesJson = `${zulipDir}/certificates.json`;
+			const settingsJson = `${zulipDir}/settings.json`;
+			const updatesJson = `${zulipDir}/updates.json`;
+			const windowStateJson = `${zulipDir}/window-state.json`;
+			const configData = [
+				{
+					path: domainJson,
+					fileName: `domain.json`
+				},
+				{
+					path: certificatesJson,
+					fileName: `certificates.json`
+				},
+				{
+					path: settingsJson,
+					fileName: `settings.json`
+				},
+				{
+					path: updatesJson,
+					fileName: `updates.json`
+				}
+			];
+			configData.forEach(data => {
+				if (fs.existsSync(data.path)) {
+					fs.copyFileSync(data.path, configDir + data.fileName);
+					fs.unlinkSync(data.path);
+				}
+			});
+			// window-state.json is only deleted not moved, as the electron-window-state
+			// package will recreate the file in the config folder.
+			if (fs.existsSync(windowStateJson)) {
+				fs.unlinkSync(windowStateJson);
+			}
+		}
+
+		setupCompleted = true;
+	}
+};

app/renderer/js/utils/dnd-util.ts

@@ -0,0 +1,50 @@
+'use strict';
+
+import ConfigUtil = require('./config-util');
+
+// TODO: TypeScript - add to Setting interface
+// the list of settings since we have fixed amount of them
+// We want to do this by creating a new module that exports
+// this interface
+interface Setting {
+	[key: string]: any;
+}
+
+interface Toggle {
+	dnd: boolean;
+	newSettings: Setting;
+}
+
+export function toggle(): Toggle {
+	const dnd = !ConfigUtil.getConfigItem('dnd', false);
+	const dndSettingList = ['showNotification', 'silent'];
+	if (process.platform === 'win32') {
+		dndSettingList.push('flashTaskbarOnMessage');
+	}
+
+	let newSettings: Setting;
+	if (dnd) {
+		const oldSettings: Setting = {};
+		newSettings = {};
+
+		// Iterate through the dndSettingList.
+		for (const settingName of dndSettingList) {
+			// Store the current value of setting.
+			oldSettings[settingName] = ConfigUtil.getConfigItem(settingName);
+			// New value of setting.
+			newSettings[settingName] = (settingName === 'silent');
+		}
+
+		// Store old value in oldSettings.
+		ConfigUtil.setConfigItem('dndPreviousSettings', oldSettings);
+	} else {
+		newSettings = ConfigUtil.getConfigItem('dndPreviousSettings');
+	}
+
+	for (const settingName of dndSettingList) {
+		ConfigUtil.setConfigItem(settingName, newSettings[settingName]);
+	}
+
+	ConfigUtil.setConfigItem('dnd', dnd);
+	return {dnd, newSettings};
+}

app/renderer/js/utils/domain-util.js

@@ -1,287 +0,0 @@
-'use strict';
-
-const { app, dialog } = require('electron').remote;
-const fs = require('fs');
-const path = require('path');
-const JsonDB = require('node-json-db');
-const request = require('request');
-const Logger = require('./logger-util');
-
-const logger = new Logger({
-	file: `domain-util.log`,
-	timestamp: true
-});
-
-let instance = null;
-
-const defaultIconUrl = '../renderer/img/icon.png';
-
-class DomainUtil {
-	constructor() {
-		if (instance) {
-			return instance;
-		} else {
-			instance = this;
-		}
-
-		this.reloadDB();
-		// Migrate from old schema
-		if (this.db.getData('/').domain) {
-			this.addDomain({
-				alias: 'Zulip',
-				url: this.db.getData('/domain')
-			});
-			this.db.delete('/domain');
-		}
-
-		return instance;
-	}
-
-	getDomains() {
-		this.reloadDB();
-		if (this.db.getData('/').domains === undefined) {
-			return [];
-		} else {
-			return this.db.getData('/domains');
-		}
-	}
-
-	getDomain(index) {
-		this.reloadDB();
-		return this.db.getData(`/domains[${index}]`);
-	}
-
-	updateDomain(index, server) {
-		this.reloadDB();
-		this.db.push(`/domains[${index}]`, server, true);
-	}
-
-	addDomain(server) {
-		return new Promise(resolve => {
-			if (server.icon) {
-				this.saveServerIcon(server.icon).then(localIconUrl => {
-					server.icon = localIconUrl;
-					this.db.push('/domains[]', server, true);
-					this.reloadDB();
-					resolve();
-				});
-			} else {
-				server.icon = defaultIconUrl;
-				this.db.push('/domains[]', server, true);
-				this.reloadDB();
-				resolve();
-			}
-		});
-	}
-
-	removeDomains() {
-		this.db.delete('/domains');
-		this.reloadDB();
-	}
-
-	removeDomain(index) {
-		this.db.delete(`/domains[${index}]`);
-		this.reloadDB();
-	}
-
-	// Check if domain is already added
-	duplicateDomain(domain) {
-		domain = this.formatUrl(domain);
-		const servers = this.getDomains();
-		for (const i in servers) {
-			if (servers[i].url === domain) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	checkDomain(domain, silent = false) {
-		if (!silent && this.duplicateDomain(domain)) {
-			// Do not check duplicate in silent mode
-			alert('This server has been added.');
-			return;
-		}
-
-		domain = this.formatUrl(domain);
-
-		const checkDomain = domain + '/static/audio/zulip.ogg';
-
-		const serverConf = {
-			icon: defaultIconUrl,
-			url: domain,
-			alias: domain
-		};
-
-		return new Promise((resolve, reject) => {
-			request(checkDomain, (error, response) => {
-				const certsError =
-					[
-						'Error: self signed certificate',
-						'Error: unable to verify the first certificate',
-						'Error: unable to get local issuer certificate'
-					];
-
-				// If the domain contains following strings we just bypass the server
-				const whitelistDomains = [
-					'zulipdev.org'
-				];
-
-				// make sure that error is a error or string not undefined
-				// so validation does not throw error.
-				error = error || '';
-				if (!error && response.statusCode < 400) {
-					// Correct
-					this.getServerSettings(domain).then(serverSettings => {
-						resolve(serverSettings);
-					}, () => {
-						resolve(serverConf);
-					});
-				} else if (domain.indexOf(whitelistDomains) >= 0 || certsError.indexOf(error.toString()) >= 0) {
-					if (silent) {
-						this.getServerSettings(domain).then(serverSettings => {
-							resolve(serverSettings);
-						}, () => {
-							resolve(serverConf);
-						});
-					} else {
-						const certErrorMessage = `Do you trust certificate from ${domain}? \n ${error}`;
-						const certErrorDetail = `The server you're connecting to is either someone impersonating the Zulip server you entered, or the server you're trying to connect to is configured in an insecure way.
-						\n Unless you have a good reason to believe otherwise, you should not proceed.
-						\n You can click here if you'd like to proceed with the connection.`;
-
-						dialog.showMessageBox({
-							type: 'warning',
-							buttons: ['Yes', 'No'],
-							defaultId: 0,
-							message: certErrorMessage,
-							detail: certErrorDetail
-						}, response => {
-							if (response === 0) {
-								this.getServerSettings(domain).then(serverSettings => {
-									resolve(serverSettings);
-								}, () => {
-									resolve(serverConf);
-								});
-							} else {
-								reject('Untrusted Certificate.');
-							}
-						});
-					}
-				} else {
-					const invalidZulipServerError = `${domain} does not appear to be a valid Zulip server. Make sure that \
-					\n(1) you can connect to that URL in a web browser and \n (2) if you need a proxy to connect to the Internet, that you've configured your proxy in the Network settings \n (3) its a zulip server`;
-					reject(invalidZulipServerError);
-				}
-			});
-		});
-	}
-
-	getServerSettings(domain) {
-		const serverSettingsUrl = domain + '/api/v1/server_settings';
-		return new Promise((resolve, reject) => {
-			request(serverSettingsUrl, (error, response) => {
-				if (!error && response.statusCode === 200) {
-					const data = JSON.parse(response.body);
-					if (data.hasOwnProperty('realm_icon') && data.realm_icon) {
-						resolve({
-							// Some Zulip Servers use absolute URL for server icon whereas others use relative URL
-							// Following check handles both the cases
-							icon: data.realm_icon.startsWith('/') ? data.realm_uri + data.realm_icon : data.realm_icon,
-							url: data.realm_uri,
-							alias: data.realm_name
-						});
-					}
-				} else {
-					reject('Zulip server version < 1.6.');
-				}
-			});
-		});
-	}
-
-	saveServerIcon(url) {
-		// The save will always succeed. If url is invalid, downgrade to default icon.
-		return new Promise(resolve => {
-			const filePath = this.generateFilePath(url);
-			const file = fs.createWriteStream(filePath);
-			try {
-				request(url).on('response', response => {
-					response.on('error', err => {
-						console.log(err);
-						resolve(defaultIconUrl);
-					});
-					response.pipe(file).on('finish', () => {
-						resolve(filePath);
-					});
-				}).on('error', err => {
-					console.log(err);
-					resolve(defaultIconUrl);
-				});
-			} catch (err) {
-				console.log(err);
-				resolve(defaultIconUrl);
-			}
-		});
-	}
-
-	updateSavedServer(url, index) {
-		// Does not promise successful update
-		this.checkDomain(url, true).then(newServerConf => {
-			this.saveServerIcon(newServerConf.icon).then(localIconUrl => {
-				newServerConf.icon = localIconUrl;
-				this.updateDomain(index, newServerConf);
-				this.reloadDB();
-			});
-		});
-	}
-
-	reloadDB() {
-		const domainJsonPath = path.join(app.getPath('userData'), '/domain.json');
-		try {
-			const file = fs.readFileSync(domainJsonPath, 'utf8');
-			JSON.parse(file);
-		} catch (err) {
-			if (fs.existsSync(domainJsonPath)) {
-				fs.unlinkSync(domainJsonPath);
-				dialog.showErrorBox(
-					'Error saving new organization',
-					'There seems to be error while saving new organization, ' +
-					'you may have to re-add your previous organizations back.'
-				);
-				logger.error('Error while JSON parsing domain.json: ');
-				logger.error(err);
-			}
-		}
-		this.db = new JsonDB(domainJsonPath, true, true);
-	}
-
-	generateFilePath(url) {
-		const dir = `${app.getPath('userData')}/server-icons`;
-		const extension = path.extname(url).split('?')[0];
-
-		let hash = 5381;
-		let len = url.length;
-
-		while (len) {
-			hash = (hash * 33) ^ url.charCodeAt(--len);
-		}
-
-		// Create 'server-icons' directory if not existed
-		if (!fs.existsSync(dir)) {
-			fs.mkdirSync(dir);
-		}
-
-		return `${dir}/${hash >>> 0}${extension}`;
-	}
-
-	formatUrl(domain) {
-		const hasPrefix = (domain.indexOf('http') === 0);
-		if (hasPrefix) {
-			return domain;
-		} else {
-			return (domain.indexOf('localhost:') >= 0) ? `http://${domain}` : `https://${domain}`;
-		}
-	}
-}
-
-module.exports = new DomainUtil();

app/renderer/js/utils/domain-util.ts

@@ -0,0 +1,318 @@
+'use strict';
+import JsonDB from 'node-json-db';
+
+import escape = require('escape-html');
+import request = require('request');
+import fs = require('fs');
+import path = require('path');
+import Logger = require('./logger-util');
+import electron = require('electron');
+
+import RequestUtil = require('./request-util');
+import EnterpriseUtil = require('./enterprise-util');
+import Messages = require('../../../resources/messages');
+
+const { app, dialog } = electron.remote;
+
+const logger = new Logger({
+	file: `domain-util.log`,
+	timestamp: true
+});
+
+let instance: null | DomainUtil = null;
+
+const defaultIconUrl = '../renderer/img/icon.png';
+
+class DomainUtil {
+	db: JsonDB;
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		this.reloadDB();
+		// Migrate from old schema
+		if (this.db.getData('/').domain) {
+			this.addDomain({
+				alias: 'Zulip',
+				url: this.db.getData('/domain')
+			});
+			this.db.delete('/domain');
+		}
+
+		return instance;
+	}
+
+	getDomains(): any {
+		this.reloadDB();
+		if (this.db.getData('/').domains === undefined) {
+			return [];
+		} else {
+			return this.db.getData('/domains');
+		}
+	}
+
+	getDomain(index: number): any {
+		this.reloadDB();
+		return this.db.getData(`/domains[${index}]`);
+	}
+
+	updateDomain(index: number, server: object): void {
+		this.reloadDB();
+		this.db.push(`/domains[${index}]`, server, true);
+	}
+
+	addDomain(server: any): Promise<void> {
+		const { ignoreCerts } = server;
+		return new Promise(resolve => {
+			if (server.icon) {
+				this.saveServerIcon(server, ignoreCerts).then(localIconUrl => {
+					server.icon = localIconUrl;
+					this.db.push('/domains[]', server, true);
+					this.reloadDB();
+					resolve();
+				});
+			} else {
+				server.icon = defaultIconUrl;
+				this.db.push('/domains[]', server, true);
+				this.reloadDB();
+				resolve();
+			}
+		});
+	}
+
+	removeDomains(): void {
+		this.db.delete('/domains');
+		this.reloadDB();
+	}
+
+	removeDomain(index: number): boolean {
+		if (EnterpriseUtil.isPresetOrg(this.getDomain(index).url)) {
+			return false;
+		}
+		this.db.delete(`/domains[${index}]`);
+		this.reloadDB();
+		return true;
+	}
+
+	// Check if domain is already added
+	duplicateDomain(domain: any): boolean {
+		domain = this.formatUrl(domain);
+		const servers = this.getDomains();
+		for (const i in servers) {
+			if (servers[i].url === domain) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	async checkCertError(domain: any, serverConf: any, error: string, silent: boolean): Promise<string | object> {
+		if (silent) {
+			// since getting server settings has already failed
+			return serverConf;
+		} else {
+			// Report error to sentry to get idea of possible certificate errors
+			// users get when adding the servers
+			logger.reportSentry(new Error(error).toString());
+			const certErrorMessage = Messages.certErrorMessage(domain, error);
+			const certErrorDetail = Messages.certErrorDetail();
+
+			const response = await (dialog.showMessageBox({
+				type: 'warning',
+				buttons: ['Yes', 'No'],
+				defaultId: 1,
+				message: certErrorMessage,
+				detail: certErrorDetail
+			}) as any); // TODO: TypeScript - Figure this out
+			if (response === 0) {
+				// set ignoreCerts parameter to true in case user responds with yes
+				serverConf.ignoreCerts = true;
+				try {
+					return await this.getServerSettings(domain, serverConf.ignoreCerts);
+				} catch (_) {
+					if (error === Messages.noOrgsError(domain)) {
+						throw new Error(error);
+					}
+					return serverConf;
+				}
+			} else {
+				throw new Error('Untrusted certificate.');
+			}
+		}
+	}
+
+	// ignoreCerts parameter helps in fetching server icon and
+	// other server details when user chooses to ignore certificate warnings
+	async checkDomain(domain: any, ignoreCerts = false, silent = false): Promise<any> {
+		if (!silent && this.duplicateDomain(domain)) {
+			// Do not check duplicate in silent mode
+			throw new Error('This server has been added.');
+		}
+
+		domain = this.formatUrl(domain);
+
+		const serverConf = {
+			icon: defaultIconUrl,
+			url: domain,
+			alias: domain,
+			ignoreCerts
+		};
+
+		try {
+			return await this.getServerSettings(domain, serverConf.ignoreCerts);
+		} catch (err) {
+			// If the domain contains following strings we just bypass the server
+			const whitelistDomains = [
+				'zulipdev.org'
+			];
+
+			// make sure that error is an error or string not undefined
+			// so validation does not throw error.
+			const error = err || '';
+
+			const certsError = error.toString().includes('certificate');
+			if (domain.indexOf(whitelistDomains) >= 0 || certsError) {
+				return this.checkCertError(domain, serverConf, error, silent);
+			} else {
+				throw Messages.invalidZulipServerError(domain);
+			}
+		}
+	}
+
+	getServerSettings(domain: any, ignoreCerts = false): Promise<object | string> {
+		const serverSettingsOptions = {
+			url: domain + '/api/v1/server_settings',
+			...RequestUtil.requestOptions(domain, ignoreCerts)
+		};
+
+		return new Promise((resolve, reject) => {
+			request(serverSettingsOptions, (error: string, response: any) => {
+				if (!error && response.statusCode === 200) {
+					const data = JSON.parse(response.body);
+					if (data.hasOwnProperty('realm_icon') && data.realm_icon) {
+						resolve({
+							// Some Zulip Servers use absolute URL for server icon whereas others use relative URL
+							// Following check handles both the cases
+							icon: data.realm_icon.startsWith('/') ? data.realm_uri + data.realm_icon : data.realm_icon,
+							url: data.realm_uri,
+							alias: escape(data.realm_name),
+							ignoreCerts
+						});
+					} else {
+						reject(Messages.noOrgsError(domain));
+					}
+				} else {
+					reject(response);
+				}
+			});
+		});
+	}
+
+	saveServerIcon(server: any, ignoreCerts = false): Promise<string> {
+		const url = server.icon;
+		const domain = server.url;
+
+		const serverIconOptions = {
+			url,
+			...RequestUtil.requestOptions(domain, ignoreCerts)
+		};
+
+		// The save will always succeed. If url is invalid, downgrade to default icon.
+		return new Promise(resolve => {
+			const filePath = this.generateFilePath(url);
+			const file = fs.createWriteStream(filePath);
+			try {
+				request(serverIconOptions).on('response', (response: any) => {
+					response.on('error', (err: string) => {
+						logger.log('Could not get server icon.');
+						logger.log(err);
+						logger.reportSentry(err);
+						resolve(defaultIconUrl);
+					});
+					response.pipe(file).on('finish', () => {
+						resolve(filePath);
+					});
+				}).on('error', (err: string) => {
+					logger.log('Could not get server icon.');
+					logger.log(err);
+					logger.reportSentry(err);
+					resolve(defaultIconUrl);
+				});
+			} catch (err) {
+				logger.log('Could not get server icon.');
+				logger.log(err);
+				logger.reportSentry(err);
+				resolve(defaultIconUrl);
+			}
+		});
+	}
+
+	updateSavedServer(url: string, index: number): void {
+		// Does not promise successful update
+		const oldIcon = this.getDomain(index).icon;
+		const { ignoreCerts } = this.getDomain(index);
+		this.checkDomain(url, ignoreCerts, true).then(newServerConf => {
+			this.saveServerIcon(newServerConf, ignoreCerts).then(localIconUrl => {
+				if (!oldIcon || localIconUrl !== '../renderer/img/icon.png') {
+					newServerConf.icon = localIconUrl;
+					this.updateDomain(index, newServerConf);
+					this.reloadDB();
+				}
+			});
+		});
+	}
+
+	reloadDB(): void {
+		const domainJsonPath = path.join(app.getPath('userData'), 'config/domain.json');
+		try {
+			const file = fs.readFileSync(domainJsonPath, 'utf8');
+			JSON.parse(file);
+		} catch (err) {
+			if (fs.existsSync(domainJsonPath)) {
+				fs.unlinkSync(domainJsonPath);
+				dialog.showErrorBox(
+					'Error saving new organization',
+					'There seems to be error while saving new organization, ' +
+					'you may have to re-add your previous organizations back.'
+				);
+				logger.error('Error while JSON parsing domain.json: ');
+				logger.error(err);
+				logger.reportSentry(err);
+			}
+		}
+		this.db = new JsonDB(domainJsonPath, true, true);
+	}
+
+	generateFilePath(url: string): string {
+		const dir = `${app.getPath('userData')}/server-icons`;
+		const extension = path.extname(url).split('?')[0];
+
+		let hash = 5381;
+		let len = url.length;
+
+		while (len) {
+			hash = (hash * 33) ^ url.charCodeAt(--len);
+		}
+
+		// Create 'server-icons' directory if not existed
+		if (!fs.existsSync(dir)) {
+			fs.mkdirSync(dir);
+		}
+
+		return `${dir}/${hash >>> 0}${extension}`;
+	}
+
+	formatUrl(domain: any): string {
+		const hasPrefix = (domain.indexOf('http') === 0);
+		if (hasPrefix) {
+			return domain;
+		} else {
+			return (domain.indexOf('localhost:') >= 0) ? `http://${domain}` : `https://${domain}`;
+		}
+	}
+}
+
+export = new DomainUtil();

app/renderer/js/utils/enterprise-util.ts

@@ -0,0 +1,80 @@
+import fs = require('fs');
+import path = require('path');
+
+import Logger = require('./logger-util');
+
+const logger = new Logger({
+	file: 'enterprise-util.log',
+	timestamp: true
+});
+
+let instance: null | EnterpriseUtil = null;
+
+class EnterpriseUtil {
+	// todo: replace enterpriseSettings type with an interface once settings are final
+	enterpriseSettings: any;
+	configFile: boolean;
+	constructor() {
+		if (instance) {
+			return instance;
+		}
+		instance = this;
+
+		this.reloadDB();
+	}
+
+	reloadDB(): void {
+		let enterpriseFile = '/etc/zulip-desktop-config/global_config.json';
+		if (process.platform === 'win32') {
+			enterpriseFile = 'C:\\Program Files\\Zulip-Desktop-Config\\global_config.json';
+		}
+
+		enterpriseFile = path.resolve(enterpriseFile);
+		if (fs.existsSync(enterpriseFile)) {
+			this.configFile = true;
+			try {
+				const file = fs.readFileSync(enterpriseFile, 'utf8');
+				this.enterpriseSettings = JSON.parse(file);
+			} catch (err) {
+				logger.log('Error while JSON parsing global_config.json: ');
+				logger.log(err);
+			}
+		} else {
+			this.configFile = false;
+		}
+	}
+
+	getConfigItem(key: string, defaultValue?: any): any {
+		this.reloadDB();
+		if (!this.configFile) {
+			return defaultValue;
+		}
+		if (defaultValue === undefined) {
+			defaultValue = null;
+		}
+		return this.configItemExists(key) ? this.enterpriseSettings[key] : defaultValue;
+	}
+
+	configItemExists(key: string): boolean {
+		this.reloadDB();
+		if (!this.configFile) {
+			return false;
+		}
+		return (this.enterpriseSettings[key] !== undefined);
+	}
+
+	isPresetOrg(url: string): boolean {
+		if (!this.configFile || !this.configItemExists('presetOrganizations')) {
+			return false;
+		}
+		const presetOrgs = this.enterpriseSettings.presetOrganizations;
+		for (const org of presetOrgs) {
+			if (url.includes(org)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
+
+export = new EnterpriseUtil();

app/renderer/js/utils/link-util.js

@@ -1,26 +0,0 @@
-'use strict';
-
-const wurl = require('wurl');
-
-let instance = null;
-
-class LinkUtil {
-	constructor() {
-		if (instance) {
-			return instance;
-		} else {
-			instance = this;
-		}
-
-		return instance;
-	}
-
-	isInternal(currentUrl, newUrl) {
-		const currentDomain = wurl('hostname', currentUrl);
-		const newDomain = wurl('hostname', newUrl);
-
-		return (currentDomain === newDomain) && newUrl.includes('/#narrow');
-	}
-}
-
-module.exports = new LinkUtil();

app/renderer/js/utils/link-util.ts

@@ -0,0 +1,51 @@
+'use strict';
+
+// TODO: TypeScript - Add @types/
+import wurl = require('wurl');
+
+let instance: null | LinkUtil = null;
+
+interface IsInternalResponse {
+	isInternalUrl: boolean;
+	isUploadsUrl: boolean;
+}
+
+class LinkUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		return instance;
+	}
+
+	isInternal(currentUrl: string, newUrl: string): IsInternalResponse {
+		const currentDomain = wurl('hostname', currentUrl);
+		const newDomain = wurl('hostname', newUrl);
+
+		const sameDomainUrl = (currentDomain === newDomain || newUrl === currentUrl + '/');
+		const isUploadsUrl = newUrl.includes(currentUrl + '/user_uploads/');
+		const isInternalUrl = newUrl.includes('/#narrow') || isUploadsUrl;
+
+		return {
+			isInternalUrl: sameDomainUrl && isInternalUrl,
+			isUploadsUrl
+		};
+	}
+
+	isImage(url: string): boolean {
+		// test for images extension as well as urls like .png?s=100
+		const isImageUrl = /\.(bmp|gif|jpg|jpeg|png|webp)\?*.*$/i;
+		return isImageUrl.test(url);
+	}
+
+	isPDF(url: string): boolean {
+		// test for pdf extension
+		const isPDFUrl = /\.(pdf)\?*.*$/i;
+		return isPDFUrl.test(url);
+	}
+}
+
+export = new LinkUtil();

app/renderer/js/utils/linux-update-util.ts

@@ -0,0 +1,76 @@
+'use strict';
+import JsonDB from 'node-json-db';
+
+import fs = require('fs');
+import path = require('path');
+import electron = require('electron');
+import Logger = require('./logger-util');
+
+const remote =
+	process.type === 'renderer' ? electron.remote : electron;
+
+const logger = new Logger({
+	file: 'linux-update-util.log',
+	timestamp: true
+});
+
+/* To make the util runnable in both main and renderer process */
+const { dialog, app } = remote;
+let instance: null | LinuxUpdateUtil = null;
+
+class LinuxUpdateUtil {
+	db: JsonDB;
+
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		this.reloadDB();
+		return instance;
+	}
+
+	getUpdateItem(key: string, defaultValue: any = null): any {
+		this.reloadDB();
+		const value = this.db.getData('/')[key];
+		if (value === undefined) {
+			this.setUpdateItem(key, defaultValue);
+			return defaultValue;
+		} else {
+			return value;
+		}
+	}
+
+	setUpdateItem(key: string, value: any): void {
+		this.db.push(`/${key}`, value, true);
+		this.reloadDB();
+	}
+
+	removeUpdateItem(key: string): void {
+		this.db.delete(`/${key}`);
+		this.reloadDB();
+	}
+
+	reloadDB(): void {
+		const linuxUpdateJsonPath = path.join(app.getPath('userData'), '/config/updates.json');
+		try {
+			const file = fs.readFileSync(linuxUpdateJsonPath, 'utf8');
+			JSON.parse(file);
+		} catch (err) {
+			if (fs.existsSync(linuxUpdateJsonPath)) {
+				fs.unlinkSync(linuxUpdateJsonPath);
+				dialog.showErrorBox(
+					'Error saving update notifications.',
+					'We encountered an error while saving the update notifications.'
+				);
+				logger.error('Error while JSON parsing updates.json: ');
+				logger.error(err);
+			}
+		}
+		this.db = new JsonDB(linuxUpdateJsonPath, true, true);
+	}
+}
+
+export = new LinuxUpdateUtil();

app/renderer/js/utils/logger-util.js

@@ -1,87 +0,0 @@
-const NodeConsole = require('console').Console;
-const fs = require('fs');
-const isDev = require('electron-is-dev');
-const { initSetUp } = require('./default-util');
-
-initSetUp();
-let app = null;
-if (process.type === 'renderer') {
-	app = require('electron').remote.app;
-} else {
-	app = require('electron').app;
-}
-
-const browserConsole = console;
-const logDir = `${app.getPath('userData')}/Logs`;
-
-class Logger {
-	constructor(opts = {}) {
-		let {
-			timestamp = true,
-			file = 'console.log',
-			level = true,
-			logInDevMode = false
-		} = opts;
-
-		file = `${logDir}/${file}`;
-		if (timestamp === true) {
-			timestamp = this.getTimestamp;
-		}
-
-		const fileStream = fs.createWriteStream(file, { flags: 'a' });
-		const nodeConsole = new NodeConsole(fileStream);
-
-		this.nodeConsole = nodeConsole;
-		this.timestamp = timestamp;
-		this.level = level;
-		this.logInDevMode = logInDevMode;
-		this.setUpConsole();
-	}
-
-	_log(type, ...args) {
-		const {
-			nodeConsole, timestamp, level, logInDevMode
-		} = this;
-		let nodeConsoleLog;
-
-		/* eslint-disable no-fallthrough */
-		switch (true) {
-			case typeof timestamp === 'function':
-				args.unshift(timestamp() + ' |\t');
-
-			case (level !== false):
-				args.unshift(type.toUpperCase() + ' |');
-
-			case isDev || logInDevMode:
-				nodeConsoleLog = nodeConsole[type] || nodeConsole.log;
-				nodeConsoleLog.apply(null, args);
-
-			default: break;
-		}
-		/* eslint-enable no-fallthrough */
-
-		browserConsole[type].apply(null, args);
-	}
-
-	setUpConsole() {
-		for (const type in browserConsole) {
-			this.setupConsoleMethod(type);
-		}
-	}
-
-	setupConsoleMethod(type) {
-		this[type] = (...args) => {
-			this._log(type, ...args);
-		};
-	}
-
-	getTimestamp() {
-		const date = new Date();
-		const timestamp =
-			`${date.getMonth()}/${date.getDate()} ` +
-			`${date.getMinutes()}:${date.getSeconds()}`;
-		return timestamp;
-	}
-}
-
-module.exports = Logger;

app/renderer/js/utils/logger-util.ts

@@ -0,0 +1,155 @@
+import { Console as NodeConsole } from 'console'; // eslint-disable-line node/prefer-global/console
+import { initSetUp } from './default-util';
+import { sentryInit, captureException } from './sentry-util';
+
+import fs = require('fs');
+import os = require('os');
+import isDev = require('electron-is-dev');
+import electron = require('electron');
+// this interface adds [key: string]: any so
+// we can do console[type] later on in the code
+interface PatchedConsole extends Console {
+	[key: string]: any;
+}
+
+interface LoggerOptions {
+	timestamp?: any;
+	file?: string;
+	level?: boolean;
+	logInDevMode?: boolean;
+}
+
+initSetUp();
+
+let app: Electron.App = null;
+let reportErrors = true;
+if (process.type === 'renderer') {
+	app = electron.remote.app;
+
+	// Report Errors to Sentry only if it is enabled in settings
+	// Gets the value of reportErrors from config-util for renderer process
+	// For main process, sentryInit() is handled in index.js
+	const { ipcRenderer } = electron;
+	ipcRenderer.send('error-reporting');
+	ipcRenderer.on('error-reporting-val', (_event: any, errorReporting: boolean) => {
+		reportErrors = errorReporting;
+		if (reportErrors) {
+			sentryInit();
+		}
+	});
+} else {
+	app = electron.app;
+}
+
+const browserConsole: PatchedConsole = console;
+const logDir = `${app.getPath('userData')}/Logs`;
+
+class Logger {
+	nodeConsole: PatchedConsole;
+	timestamp: any; // TODO: TypeScript - Figure out how to make this work with string | Function.
+	level: boolean;
+	logInDevMode: boolean;
+	[key: string]: any;
+
+	constructor(opts: LoggerOptions = {}) {
+		let {
+			timestamp = true,
+			file = 'console.log',
+			level = true,
+			logInDevMode = false
+		} = opts;
+
+		file = `${logDir}/${file}`;
+		if (timestamp === true) {
+			timestamp = this.getTimestamp;
+		}
+
+		// Trim log according to type of process
+		if (process.type === 'renderer') {
+			requestIdleCallback(() => this.trimLog(file));
+		} else {
+			process.nextTick(() => this.trimLog(file));
+		}
+
+		const fileStream = fs.createWriteStream(file, { flags: 'a' });
+		const nodeConsole = new NodeConsole(fileStream);
+
+		this.nodeConsole = nodeConsole;
+		this.timestamp = timestamp;
+		this.level = level;
+		this.logInDevMode = logInDevMode;
+		this.setUpConsole();
+	}
+
+	_log(type: string, ...args: any[]): void {
+		const {
+			nodeConsole, timestamp, level, logInDevMode
+		} = this;
+		let nodeConsoleLog;
+
+		/* eslint-disable no-fallthrough */
+		switch (true) {
+			case typeof timestamp === 'function':
+				args.unshift(timestamp() + ' |\t');
+
+			case (level !== false):
+				args.unshift(type.toUpperCase() + ' |');
+
+			case isDev || logInDevMode:
+				nodeConsoleLog = nodeConsole[type] || nodeConsole.log;
+				nodeConsoleLog.apply(null, args); // eslint-disable-line prefer-spread
+
+			default: break;
+		}
+		/* eslint-enable no-fallthrough */
+
+		browserConsole[type].apply(null, args);
+	}
+
+	setUpConsole(): void {
+		for (const type in browserConsole) {
+			this.setupConsoleMethod(type);
+		}
+	}
+
+	setupConsoleMethod(type: string): void {
+		this[type] = (...args: any[]) => {
+			const log = this._log.bind(this, type, ...args);
+			log();
+		};
+	}
+
+	getTimestamp(): string {
+		const date = new Date();
+		const timestamp =
+			`${date.getMonth()}/${date.getDate()} ` +
+			`${date.getMinutes()}:${date.getSeconds()}`;
+		return timestamp;
+	}
+
+	reportSentry(err: string): void {
+		if (reportErrors) {
+			captureException(err);
+		}
+	}
+
+	trimLog(file: string): void{
+		fs.readFile(file, 'utf8', (err, data) => {
+			if (err) {
+				throw err;
+			}
+			const MAX_LOG_FILE_LINES = 500;
+			const logs = data.split(os.EOL);
+			const logLength = logs.length - 1;
+
+			// Keep bottom MAX_LOG_FILE_LINES of each log instance
+			if (logLength > MAX_LOG_FILE_LINES) {
+				const trimmedLogs = logs.slice(logLength - MAX_LOG_FILE_LINES);
+				const toWrite = trimmedLogs.join(os.EOL);
+				fs.writeFileSync(file, toWrite);
+			}
+		});
+	}
+}
+
+export = Logger;

app/renderer/js/utils/params-util.ts

@@ -0,0 +1,11 @@
+// This util function returns the page params if they're present else returns null
+export function isPageParams(): null | object {
+	let webpageParams = null;
+	try {
+		// eslint-disable-next-line no-undef, @typescript-eslint/camelcase
+		webpageParams = page_params;
+	} catch (_) {
+		webpageParams = null;
+	}
+	return webpageParams;
+}

app/renderer/js/utils/proxy-util.ts

@@ -0,0 +1,142 @@
+'use strict';
+
+import url = require('url');
+
+import ConfigUtil = require('./config-util');
+
+let instance: null | ProxyUtil = null;
+
+interface ProxyRule {
+	hostname?: string;
+	port?: number;
+}
+
+class ProxyUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		return instance;
+	}
+
+	// Return proxy to be used for a particular uri, to be used for request
+	getProxy(_uri: string): ProxyRule | void {
+		const parsedUri = url.parse(_uri);
+		if (parsedUri === null) {
+			return;
+		}
+
+		const uri = parsedUri;
+		const proxyRules = ConfigUtil.getConfigItem('proxyRules', '').split(';');
+		// If SPS is on and system uses no proxy then request should not try to use proxy from
+		// environment. NO_PROXY = '*' makes request ignore all environment proxy variables.
+		if (proxyRules[0] === '') {
+			process.env.NO_PROXY = '*';
+			return;
+		}
+
+		const proxyRule: any = {};
+		if (uri.protocol === 'http:') {
+			proxyRules.forEach((proxy: string) => {
+				if (proxy.includes('http=')) {
+					proxyRule.hostname = proxy.split('http=')[1].trim().split(':')[0];
+					proxyRule.port = proxy.split('http=')[1].trim().split(':')[1];
+				}
+			});
+			return proxyRule;
+		}
+
+		if (uri.protocol === 'https:') {
+			proxyRules.forEach((proxy: string) => {
+				if (proxy.includes('https=')) {
+					proxyRule.hostname = proxy.split('https=')[1].trim().split(':')[0];
+					proxyRule.port = proxy.split('https=')[1].trim().split(':')[1];
+				}
+			});
+			return proxyRule;
+		}
+	}
+
+	// TODO: Refactor to async function
+	resolveSystemProxy(mainWindow: Electron.BrowserWindow): void {
+		const page = mainWindow.webContents;
+		const ses = page.session;
+		const resolveProxyUrl = 'www.example.com';
+
+		// Check HTTP Proxy
+		const httpProxy = new Promise(resolve => {
+			ses.resolveProxy('http://' + resolveProxyUrl, (proxy: string) => {
+				let httpString = '';
+				if (proxy !== 'DIRECT') {
+					// in case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
+					// for all other HTTP or direct url:port both uses PROXY
+					if (proxy.includes('PROXY') || proxy.includes('HTTPS')) {
+						httpString = 'http=' + proxy.split('PROXY')[1] + ';';
+					}
+				}
+				resolve(httpString);
+			});
+		});
+		// Check HTTPS Proxy
+		const httpsProxy = new Promise(resolve => {
+			ses.resolveProxy('https://' + resolveProxyUrl, (proxy: string) => {
+				let httpsString = '';
+				if (proxy !== 'DIRECT' || proxy.includes('HTTPS')) {
+					// in case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
+					// for all other HTTP or direct url:port both uses PROXY
+					if (proxy.includes('PROXY') || proxy.includes('HTTPS')) {
+						httpsString += 'https=' + proxy.split('PROXY')[1] + ';';
+					}
+				}
+				resolve(httpsString);
+			});
+		});
+
+		// Check FTP Proxy
+		const ftpProxy = new Promise(resolve => {
+			ses.resolveProxy('ftp://' + resolveProxyUrl, (proxy: string) => {
+				let ftpString = '';
+				if (proxy !== 'DIRECT') {
+					if (proxy.includes('PROXY')) {
+						ftpString += 'ftp=' + proxy.split('PROXY')[1] + ';';
+					}
+				}
+				resolve(ftpString);
+			});
+		});
+
+		// Check SOCKS Proxy
+		const socksProxy = new Promise(resolve => {
+			ses.resolveProxy('socks4://' + resolveProxyUrl, (proxy: string) => {
+				let socksString = '';
+				if (proxy !== 'DIRECT') {
+					if (proxy.includes('SOCKS5')) {
+						socksString += 'socks=' + proxy.split('SOCKS5')[1] + ';';
+					} else if (proxy.includes('SOCKS4')) {
+						socksString += 'socks=' + proxy.split('SOCKS4')[1] + ';';
+					} else if (proxy.includes('PROXY')) {
+						socksString += 'socks=' + proxy.split('PROXY')[1] + ';';
+					}
+				}
+				resolve(socksString);
+			});
+		});
+
+		Promise.all([httpProxy, httpsProxy, ftpProxy, socksProxy]).then(values => {
+			let proxyString = '';
+			values.forEach(proxy => {
+				proxyString += proxy;
+			});
+			ConfigUtil.setConfigItem('systemProxyRules', proxyString);
+			const useSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
+			if (useSystemProxy) {
+				ConfigUtil.setConfigItem('proxyRules', proxyString);
+			}
+		});
+	}
+}
+
+export = new ProxyUtil();

app/renderer/js/utils/reconnect-util.ts

@@ -0,0 +1,67 @@
+import isOnline = require('is-online');
+import Logger = require('./logger-util');
+
+const logger = new Logger({
+	file: `domain-util.log`,
+	timestamp: true
+});
+
+class ReconnectUtil {
+	// TODO: TypeScript - Figure out how to annotate serverManagerView
+	// it should be ServerManagerView; maybe make it a generic so we can
+	// pass the class from main.js
+	serverManagerView: any;
+	alreadyReloaded: boolean;
+
+	constructor(serverManagerView: any) {
+		this.serverManagerView = serverManagerView;
+		this.alreadyReloaded = false;
+	}
+
+	clearState(): void {
+		this.alreadyReloaded = false;
+	}
+
+	pollInternetAndReload(): void {
+		const pollInterval = setInterval(() => {
+			this._checkAndReload()
+				.then(status => {
+					if (status) {
+						this.alreadyReloaded = true;
+						clearInterval(pollInterval);
+					}
+				});
+		}, 1500);
+	}
+
+	// TODO: Make this a async function
+	_checkAndReload(): Promise<boolean> {
+		return new Promise(resolve => {
+			if (!this.alreadyReloaded) { // eslint-disable-line no-negated-condition
+				isOnline()
+					.then((online: boolean) => {
+						if (online) {
+							if (!this.alreadyReloaded) {
+								this.serverManagerView.reloadCurrentView();
+							}
+							logger.log('You\'re back online.');
+							return resolve(true);
+						}
+
+						logger.log('There is no internet connection, try checking network cables, modem and router.');
+						const errMsgHolder = document.querySelector('#description');
+						if (errMsgHolder) {
+							errMsgHolder.innerHTML = `
+										<div>Your internet connection doesn't seem to work properly!</div>
+										<div>Verify that it works and then click try again.</div>`;
+						}
+						return resolve(false);
+					});
+			} else {
+				return resolve(true);
+			}
+		});
+	}
+}
+
+export = ReconnectUtil;

app/renderer/js/utils/request-util.ts

@@ -0,0 +1,73 @@
+import fs = require('fs');
+import ConfigUtil = require('./config-util');
+import Logger = require('./logger-util');
+import ProxyUtil = require('./proxy-util');
+import CertificateUtil = require('./certificate-util');
+import SystemUtil = require('./system-util');
+
+const logger = new Logger({
+	file: `request-util.log`,
+	timestamp: true
+});
+
+let instance: null | RequestUtil = null;
+
+// TODO: TypeScript - Use ProxyRule for the proxy property
+// we can do this now since we use export = ProxyUtil syntax
+interface RequestUtilResponse {
+	ca: string;
+	proxy: string | void | object;
+	ecdhCurve: 'auto';
+	headers: { 'User-Agent': string };
+	rejectUnauthorized: boolean;
+}
+
+class RequestUtil {
+	constructor() {
+		if (!instance) {
+			instance = this;
+		}
+
+		return instance;
+	}
+
+	// ignoreCerts parameter helps in fetching server icon and
+	// other server details when user chooses to ignore certificate warnings
+	requestOptions(domain: string, ignoreCerts: boolean): RequestUtilResponse {
+		domain = this.formatUrl(domain);
+		const certificate = CertificateUtil.getCertificate(
+			encodeURIComponent(domain)
+		);
+		let certificateLocation = '';
+		if (certificate) {
+			// To handle case where certificate has been moved from the location in certificates.json
+			try {
+				certificateLocation = fs.readFileSync(certificate, 'utf8');
+			} catch (err) {
+				logger.warn(`Error while trying to get certificate: ${err}`);
+			}
+		}
+		const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
+		// If certificate for the domain exists add it as a ca key in the request's parameter else consider only domain as the parameter for request
+		// Add proxy as a parameter if it is being used.
+		return {
+			ca: certificateLocation ? certificateLocation : '',
+			proxy: proxyEnabled ? ProxyUtil.getProxy(domain) : '',
+			ecdhCurve: 'auto',
+			headers: { 'User-Agent': SystemUtil.getUserAgent() },
+			rejectUnauthorized: !ignoreCerts
+		};
+	}
+
+	formatUrl(domain: string): string {
+		const hasPrefix = domain.startsWith('http', 0);
+		if (hasPrefix) {
+			return domain;
+		} else {
+			return domain.includes('localhost:') ? `http://${domain}` : `https://${domain}`;
+		}
+	}
+}
+
+const requestUtil = new RequestUtil();
+export = requestUtil;

app/renderer/js/utils/sentry-util.ts

@@ -0,0 +1,21 @@
+import { init } from '@sentry/electron';
+
+import isDev = require('electron-is-dev');
+import path = require('path');
+import dotenv = require('dotenv');
+dotenv.config({ path: path.resolve(__dirname, '/../../../../.env') });
+
+export const sentryInit = (): void => {
+	if (!isDev) {
+		init({
+			dsn: process.env.SENTRY_DSN,
+			// We should ignore this error since it's harmless and we know the reason behind this
+			// This error mainly comes from the console logs.
+			// This is a temp solution until Sentry supports disabling the console logs
+			ignoreErrors: ['does not appear to be a valid Zulip server']
+			// sendTimeout: 30 // wait 30 seconds before considering the sending capture to have failed, default is 1 second
+		});
+	}
+};
+
+export { captureException } from '@sentry/electron';

app/renderer/js/utils/system-util.ts

@@ -1,12 +1,16 @@
 'use strict';
+import { remote } from 'electron';
 
-const {app} = require('electron').remote;
+import os = require('os');
 
-const os = require('os');
-
-let instance = null;
+const { app } = remote;
+let instance: null | SystemUtil = null;
 
 class SystemUtil {
+	connectivityERR: string[];
+
+	userAgent: string | null;
+
 	constructor() {
 		if (instance) {
 			return instance;
@@ -27,29 +31,30 @@ class SystemUtil {
 		return instance;
 	}
 
-	getOS() {
-		if (os.platform() === 'darwin') {
+	getOS(): string {
+		const platform = os.platform();
+		if (platform === 'darwin') {
 			return 'Mac';
-		}
-		if (os.platform() === 'linux') {
+		} else if (platform === 'linux') {
 			return 'Linux';
-		}
-		if (os.platform() === 'win32' || os.platform() === 'win64') {
+		} else if (platform === 'win32') {
 			if (parseFloat(os.release()) < 6.2) {
 				return 'Windows 7';
 			} else {
 				return 'Windows 10';
 			}
+		} else {
+			return '';
 		}
 	}
 
-	setUserAgent(webViewUserAgent) {
-		this.userAgent = 'ZulipElectron/' + app.getVersion() + ' ' + webViewUserAgent;
+	setUserAgent(webViewUserAgent: string): void {
+		this.userAgent = `ZulipElectron/${app.getVersion()} ${webViewUserAgent}`;
 	}
 
-	getUserAgent() {
+	getUserAgent(): string | null {
 		return this.userAgent;
 	}
 }
 
-module.exports = new SystemUtil();
+export = new SystemUtil();

app/renderer/js/utils/translation-util.js

@@ -0,0 +1,29 @@
+'use strict';
+const path = require("path");
+const electron = require("electron");
+const i18n = require("i18n");
+let instance = null;
+let app = null;
+/* To make the util runnable in both main and renderer process */
+if (process.type === 'renderer') {
+    app = electron.remote.app;
+}
+else {
+    app = electron.app;
+}
+class TranslationUtil {
+    constructor() {
+        if (instance) {
+            return this;
+        }
+        instance = this;
+        i18n.configure({
+            directory: path.join(__dirname, '../../../translations/'),
+            register: this
+        });
+    }
+    __(phrase) {
+        return i18n.__({ phrase, locale: app.getLocale() });
+    }
+}
+module.exports = new TranslationUtil();

app/renderer/js/utils/translation-util.ts

@@ -0,0 +1,35 @@
+'use strict';
+
+import path = require('path');
+import electron = require('electron');
+import i18n = require('i18n');
+
+let instance: TranslationUtil = null;
+let app: Electron.App = null;
+
+/* To make the util runnable in both main and renderer process */
+if (process.type === 'renderer') {
+	app = electron.remote.app;
+} else {
+	app = electron.app;
+}
+
+class TranslationUtil {
+	constructor() {
+		if (instance) {
+			return this;
+		}
+
+		instance = this;
+		i18n.configure({
+			directory: path.join(__dirname, '../../../translations/'),
+			register: this
+		});
+	}
+
+	__(phrase: string): string {
+		return i18n.__({ phrase, locale: app.getLocale() ? app.getLocale() : 'en' });
+	}
+}
+
+export = new TranslationUtil();

app/renderer/main.html

@@ -1,44 +1,65 @@
 <!DOCTYPE html>
 <html lang="en" class="responsive desktop">
 
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width">
-  <title>Zulip</title>
-  <link rel="stylesheet" href="css/main.css" type="text/css" media="screen">
-</head>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+        <title>Zulip</title>
+        <link rel="stylesheet" href="css/main.css" type="text/css" media="screen">
+    </head>
 
-<body>
-  <div id="content">
-    <div class="popup">
-      <span class="popuptext hidden" id="fullscreen-popup"></span>
-  </div>
-  <div id="sidebar" class="toggle-sidebar">
-    <div id="view-controls-container">
-      <div id="tabs-container"></div>
-      <div id="add-tab" class="tab functional-tab">
-        <div class="server-tab" id="add-action">
-          <i class="material-icons">add</i>
+    <body>
+        <div id="content">
+            <div class="popup">
+                <span class="popuptext hidden" id="fullscreen-popup"></span>
+            </div>
+            <div id="sidebar" class="toggle-sidebar">
+                <div id="view-controls-container">
+                    <div id="tabs-container"></div>
+                    <div id="add-tab" class="tab functional-tab">
+                        <div class="server-tab" id="add-action">
+                        <i class="material-icons">add</i>
+                        </div>
+                        <span id="add-server-tooltip" style="display:none">Add organization</span>
+                    </div>
+                </div>
+                <div id="actions-container">
+                    <div class="action-button" id="dnd-action">
+                        <i class="material-icons md-48">notifications</i>
+                        <span id="dnd-tooltip" style="display:none">Do Not Disturb</span>
+                    </div>
+                    <div class="action-button" id="reload-action">
+                        <i class="material-icons md-48">refresh</i>
+                        <span id="reload-tooltip" style="display:none">Reload</span>
+                    </div>
+                    <div class="action-button disable" id="loading-action">
+                        <i class="refresh material-icons md-48">loop</i>
+                        <span id="loading-tooltip" style="display:none">Loading</span>
+                    </div>
+                    <div class="action-button disable" id="back-action">
+                        <i class="material-icons md-48">arrow_back</i>
+                        <span id="back-tooltip" style="display:none">Go Back</span>
+                    </div>
+                    <div class="action-button" id="settings-action">
+                        <i class="material-icons md-48">settings</i>
+                        <span id="setting-tooltip" style="display:none">Settings</span>
+                    </div>
+                </div>
+            </div>
+            <div id="main-container">
+                <div id="webviews-container"></div>
+            </div>
         </div>
-        <span id="add-server-tooltip" style="display:none">Add organization</span>
-      </div>
-    </div>
-    <div id="actions-container">
-      <div class="action-button" id="reload-action">
-        <i class="material-icons md-48">refresh</i>
-        <span id="reload-tooltip" style="display:none">Reload</span>
-      </div>
-      <div class="action-button" id="settings-action">
-        <i class="material-icons md-48">settings</i>
-        <span id="setting-tooltip" style="display:none">Settings</span>
-      </div>
-    </div>
-  </div>
-  <div id="main-container">
-    <div id="webviews-container"></div>
-  </div>
-  </div>
-</body>
-<script src="js/main.js"></script>
 
+        <div id="feedback-modal">
+            <send-feedback></send-feedback>
+        </div>
+    </body>
+    
+    <script>
+        // we don't use src='./js/main' in the script tag because
+        // it messes up require module path resolution
+        require('./js/main');
+    </script>
+    <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/renderer/network.html

@@ -1,21 +1,22 @@
 <!DOCTYPE html>
 <html lang="en" class="responsive desktop">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width">
-    <title>Zulip - Network Troubleshooting</title>
-    <link rel="stylesheet" href="css/network.css" type="text/css" media="screen">
-  </head>
-  <body>
-    <div id="content">
-      <div id="picture"><img src="img/zulip_network.png"></div>
-      <div id="title">Zulip can't connect</div>
-      <div id="description">
-        <div>Your computer seems to be offline.</div>
-        <div>We will keep trying to reconnect, or you can try now.</div>
-      </div>
-      <div id="reconnect">Try now</div>
-    </div>
-  </body>
-  <script src="js/pages/network.js"></script>  
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+        <title>Zulip - Network Troubleshooting</title>
+        <link rel="stylesheet" href="css/network.css" type="text/css" media="screen">
+    </head>
+    <body>
+        <div id="content">
+            <div id="picture"><img src="img/zulip_network.png"></div>
+            <div id="title">Zulip can't connect</div>
+            <div id="description">
+                <div>Your computer seems to be offline.</div>
+                <div>We will keep trying to reconnect, or you can try now.</div>
+            </div>
+            <div id="reconnect">Try now</div>
+        </div>
+    </body>
+    <script src="js/pages/network.js"></script>
+    <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/renderer/preference.html

@@ -1,16 +1,19 @@
 <!DOCTYPE html>
 <html lang="en" class="responsive desktop">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width">
-    <title>Zulip - Settings</title>
-    <link rel="stylesheet" href="css/preference.css" type="text/css" media="screen">
-  </head>
-  <body>
-    <div id="content">
-      <div id="sidebar"></div>
-      <div id="settings-container"></div>
-    </div>
-  </body>
-  <script src="js/pages/preference/preference.js"></script>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+        <title>Zulip - Settings</title>
+        <link rel="stylesheet" href="css/preference.css" type="text/css" media="screen">
+    </head>
+    <body>
+        <div id="content">
+            <div id="sidebar"></div>
+            <div id="settings-container"></div>
+        </div>
+    </body>
+    <script>
+        require('./js/pages/preference/preference.js');
+        require('./js/shared/preventdrag.js')
+    </script>
 </html>

app/resources/messages.ts

@@ -0,0 +1,50 @@
+interface DialogBoxError {
+	title: string;
+	content: string;
+}
+
+class Messages {
+	invalidZulipServerError(domain: string): string {
+		return `${domain} does not appear to be a valid Zulip server. Make sure that
+			\n • You can connect to that URL in a web browser.\
+			\n • If you need a proxy to connect to the Internet, that you've configured your proxy in the Network settings.\
+			\n • It's a Zulip server. (The oldest supported version is 1.6).\
+			\n • The server has a valid certificate. (You can add custom certificates in Settings > Organizations).`;
+	}
+
+	noOrgsError(domain: string): string {
+		return `${domain} does not have any organizations added.\
+		\nPlease contact your server administrator.`;
+	}
+
+	certErrorMessage(domain: string, error: string): string {
+		return `Do you trust certificate from ${domain}? \n ${error}`;
+	}
+
+	certErrorDetail(): string {
+		return `The organization you're connecting to is either someone impersonating the Zulip server you entered, or the server you're trying to connect to is configured in an insecure way.
+		\nIf you have a valid certificate please add it from Settings>Organizations and try to add the organization again.
+		\nUnless you have a good reason to believe otherwise, you should not proceed.
+		\nYou can click here if you'd like to proceed with the connection.`;
+	}
+
+	enterpriseOrgError(length: number, domains: string[]): DialogBoxError {
+		let domainList = '';
+		for (const domain of domains) {
+			domainList += `• ${domain}\n`;
+		}
+		return {
+			title: `Could not add the following ${length === 1 ? `organization` : `organizations`}`,
+			content: `${domainList}\nPlease contact your system administrator.`
+		};
+	}
+
+	orgRemovalError(url: string): DialogBoxError {
+		return {
+			title: `Removing ${url} is a restricted operation.`,
+			content: `Please contact your system administrator.`
+		};
+	}
+}
+
+export = new Messages();