electron: Fix app not rendering colors properly.

There is a bug in v2 of electron which causes
pale colors. Resetting the color profile to srgb
fixes this problem. This is a temporary solution
until electron officially fixes this.

Fixes: #497.

.editorconfig

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

.gitattributes

@@ -1,16 +1 @@
-* 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
+* text=auto

.github/ISSUE_TEMPLATE.md

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

.gitignore

@@ -33,9 +33,6 @@ 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

@@ -1,25 +0,0 @@
-{
-  "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

@@ -1,67 +0,0 @@
-{
-    "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",
-    }
-}

CONTRIBUTING.md

@@ -2,20 +2,20 @@
 
 Thanks for taking the time to contribute!
 
-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.
+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.
 
 ## 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](https://jlord.dev/blog/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](http://jlord.us/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-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).
+* 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).
 
 ## Issue
-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).
+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).
 
 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,27 +1,32 @@
 # Zulip Desktop Client
-[![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)
+[![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)
 [![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 the [installation guide](https://zulipchat.com/help/desktop-app-install-guide).
+Please see [installation guide](https://zulipchat.com/help/desktop-app-install-guide).
 
 # Features
-* Sign in to multiple organizations
-* Desktop notifications with inline reply
-* Tray/dock integration
-* Multi-language spell checker
-* Automatic updates
+* Sign in to multiple teams
+* Desktop Notifications with inline reply support
+* Multilanguage SpellChecker
+* OSX/Win/Linux installers
+* Automatic Updates (macOS/Windows/Linux)
+* Keyboard shortcuts
+
+# Development
+Please see our [development guide](./development.md) to get started and run app locally.
 
 # Contribute
 
-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).
+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/)
 
 # License
 Released under the [Apache-2.0](./LICENSE) license.

app/main/autoupdater.js

@@ -1,19 +1,18 @@
 'use strict';
-import { app, dialog, shell } from 'electron';
-import { autoUpdater } from 'electron-updater';
-import { linuxUpdateNotification } from './linuxupdater';	// Required only in case of linux
+const { app, dialog, shell } = require('electron');
+const { autoUpdater } = require('electron-updater');
+const isDev = require('electron-is-dev');
 
-import log = require('electron-log');
-import isDev = require('electron-is-dev');
-import ConfigUtil = require('../renderer/js/utils/config-util');
+const ConfigUtil = require('./../renderer/js/utils/config-util.js');
 
-export function appUpdater(updateFromMenu = false): void {
+function appUpdater(updateFromMenu = false) {
 	// Don't initiate auto-updates in development
 	if (isDev) {
 		return;
 	}
 
 	if (process.platform === 'linux' && !process.env.APPIMAGE) {
+		const { linuxUpdateNotification } = require('./linuxupdater');
 		linuxUpdateNotification();
 		return;
 	}
@@ -24,6 +23,8 @@ export function appUpdater(updateFromMenu = false): void {
 	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;
@@ -83,6 +84,7 @@ Current Version: ${app.getVersion()}`
 	});
 
 	// 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({
@@ -104,3 +106,7 @@ Current Version: ${app.getVersion()}`
 	// Init for updates
 	autoUpdater.checkForUpdates();
 }
+
+module.exports = {
+	appUpdater
+};

app/main/crash-reporter.js

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

app/main/index.js

@@ -0,0 +1,242 @@
+'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: 1100,
+		defaultHeight: 720
+	});
+
+	// 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,
+			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();
+
+// Temporary fix for Electron render colors differently
+app.commandLine.appendSwitch('force-color-profile', 'srgb');
+
+// 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
+		if (ConfigUtil.getConfigItem('autoUpdate')) {
+			appUpdater();
+		}
+		crashHandler();
+	});
+
+	// 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();
+	});
+
+	// 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('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

@@ -1,375 +0,0 @@
-'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.js

@@ -0,0 +1,42 @@
+const { app } = require('electron');
+const { Notification } = require('electron');
+
+const request = require('request');
+const semver = require('semver');
+const ConfigUtil = require('../renderer/js/utils/config-util');
+const LinuxUpdateUtil = require('../renderer/js/utils/linux-update-util');
+
+function linuxUpdateNotification() {
+	let	url = 'https://api.github.com/repos/zulip/zulip-electron/releases';
+	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
+
+	const options = {
+		url,
+		headers: {'User-Agent': 'request'}
+	};
+
+	request(options, (error, response, body) => {
+		if (error) {
+			console.log('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 {
+			console.log('Status:', response.statusCode);
+		}
+	});
+}
+
+module.exports = {
+	linuxUpdateNotification
+};

app/main/linuxupdater.ts

@@ -1,48 +0,0 @@
-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

@@ -0,0 +1,453 @@
+'use strict';
+const path = require('path');
+
+const { app, shell, BrowserWindow, Menu, dialog } = require('electron');
+
+const fs = require('fs-extra');
+const { appUpdater } = require('./autoupdater');
+
+const ConfigUtil = require(__dirname + '/../renderer/js/utils/config-util.js');
+const DNDUtil = require(__dirname + '/../renderer/js/utils/dnd-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: process.platform === 'darwin' ? 'Command+Plus' : 'Control+=',
+			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+Shift+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 + ' Desktop-'} v${app.getVersion()}`,
+				enabled: false
+			},
+			{
+				label: `What's New...`,
+				click() {
+					shell.openExternal(`https://github.com/zulip/zulip-electron/releases/tag/v${app.getVersion()}`);
+				}
+			},
+			{
+				label: `${appName} Help`,
+				click() {
+					shell.openExternal('https://zulipchat.com/help/');
+				}
+			}, {
+				label: 'Show App Logs',
+				click() {
+					shell.openItem(app.getPath('userData'));
+				}
+			}, {
+				label: '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, 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++) {
+				// Do not add functional tab settings to list of windows in menu bar
+				if (tabs[i].props.role === 'function' && tabs[i].webview.props.name === 'Settings') {
+					continue;
+				}
+
+				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: 'checkbox'
+				});
+			}
+		}
+
+		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');
+					}
+				}
+			},	{
+				label: `Check for Update`,
+				click() {
+					AppMenu.checkForUpdate();
+				}
+			},	{
+				type: 'separator'
+			}, {
+				label: 'Desktop App Settings',
+				accelerator: 'Cmd+,',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-settings');
+					}
+				}
+			}, {
+				label: 'Keyboard Shortcuts',
+				accelerator: 'Cmd+Shift+K',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('shortcut');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Toggle Do Not Disturb',
+				accelerator: 'Command+Shift+M',
+				click() {
+					const dndUtil = DNDUtil.toggle();
+					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+				}
+			}, {
+				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');
+					}
+				}
+			}, 	{
+				label: `Check for Update`,
+				click() {
+					AppMenu.checkForUpdate();
+				}
+			},	{
+				type: 'separator'
+			}, {
+				label: 'Desktop App Settings',
+				accelerator: 'Ctrl+,',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-settings');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Keyboard Shortcuts',
+				accelerator: 'Ctrl+Shift+K',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('shortcut');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Toggle Do Not Disturb',
+				accelerator: 'Ctrl+Shift+M',
+				click() {
+					const dndUtil = DNDUtil.toggle();
+					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+				}
+			}, {
+				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 checkForUpdate() {
+		appUpdater(true);
+	}
+	static resetAppSettings() {
+		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 = ['window-state.json', 'domain.json', 'settings.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 => {
+						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

@@ -1,601 +0,0 @@
-'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.js

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

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "4.0.0",
+  "version": "2.3.1",
   "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-desktop.git"
+    "url": "https://github.com/zulip/zulip-electron.git"
   },
   "bugs": {
-    "url": "https://github.com/zulip/zulip-desktop/issues"
+    "url": "https://github.com/zulip/zulip-electron/issues"
   },
   "main": "main/index.js",
   "keywords": [
@@ -26,25 +26,21 @@
     "InstantMessaging"
   ],
   "dependencies": {
-    "@electron-elements/send-feedback": "1.0.8",
-    "@sentry/electron": "0.14.0",
-    "adm-zip": "0.4.11",
+    "@electron-elements/send-feedback": "1.0.7",
+    "escape-html": "1.0.3",
     "auto-launch": "5.0.5",
-    "dotenv": "8.0.0",
     "electron-is-dev": "0.3.0",
     "electron-log": "2.2.14",
     "electron-spellchecker": "1.1.2",
-    "electron-updater": "4.0.6",
-    "electron-window-state": "5.0.3",
-    "escape-html": "1.0.3",
-    "i18n": "0.8.3",
+    "electron-updater": "2.21.10",
+    "electron-window-state": "4.1.1",
     "is-online": "7.0.0",
-    "node-json-db": "0.9.2",
+    "node-json-db": "0.7.3",
     "request": "2.85.0",
     "semver": "5.4.1",
     "wurl": "2.5.0"
   },
   "optionalDependencies": {
-    "node-mac-notifier": "1.1.0"
+    "node-mac-notifier": "0.1.0"
   }
 }

app/renderer/about.html

@@ -1,47 +1,50 @@
 <!DOCTYPE html>
 <html lang="en">
 
-    <head>
-        <meta charset="UTF-8">
-        <link rel="stylesheet" href="css/about.css">
-        <title>Zulip - About</title>
-    </head>
+<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>
-            </div>
-        </div>
-        <script>
+<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();
+		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>
+		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>
+	<script>require('./js/shared/preventdrag.js')</script>
+</body>
 </html>

app/renderer/css/about.css

@@ -1,66 +1,82 @@
 body {
-    background: rgba(250, 250, 250, 1.000);
-    font-family: menu, "Helvetica Neue", sans-serif;
-    -webkit-font-smoothing: subpixel-antialiased;
+	background: #fafafa;
+	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: rgba(68, 67, 67, 1.000);
-    font-size: 1.3em;
-    padding-top: 40px;
+	color: #444343;
+	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: rgba(68, 68, 68, 1.000);
+	cursor: pointer;
+	position: absolute;
+	width: 100%;
+	left: 0px;
+	color: #444;
 }
 
 .maintenance-info p {
-    margin: 0;
-    font-size: 1em;
-    width: 100%;
+	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;
 }
 
 p.detail a {
-    color: rgba(53, 95, 76, 1.000);
+	color: #355f4c;
 }
 
 p.detail a:hover {
-    text-decoration: underline;
+	text-decoration: underline;
 }

app/renderer/css/main.css

@@ -16,7 +16,7 @@ body {
 }
 
 .toggle-sidebar {
-    background: rgba(34, 44, 49, 1.000);
+    background: #222c31;
     width: 54px;
     padding: 27px 0 20px 0;
     justify-content: space-between;
@@ -43,25 +43,25 @@ body {
 }
 
 #view-controls-container {
-    height: calc(100% - 208px);
-    overflow-y: hidden;
+	height: calc(100% - 208px);
+	overflow-y: hidden;
 }
 
 #view-controls-container:hover {
-    overflow-y: overlay;
+	overflow-y: overlay;
 }
 
 #view-controls-container::-webkit-scrollbar {
-    width: 4px;
+	width: 4px;
 }
 
 #view-controls-container::-webkit-scrollbar-track {
-    box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    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);
+  background-color: darkgrey;
+  outline: 1px solid slategrey;
 }
 
 @font-face {
@@ -119,12 +119,12 @@ body {
 }
 
 .action-button i {
-    color: rgba(108, 133, 146, 1.000);
+    color: #6c8592;
     font-size: 28px;
 }
 
 .action-button:hover i {
-    color: rgba(152, 169, 179, 1.000);
+    color: #98a9b3;
 }
 
 .action-button.disable {
@@ -136,22 +136,22 @@ body {
 }
 
 .action-button.disable:hover i {
-    color: rgba(108, 133, 146, 1.000);
+    color: #6c8592;
 }
 
 .action-button.active {
     /* background-color: rgba(255, 255, 255, 0.25); */
-    background-color: rgba(239, 239, 239, 1.000);
+    background-color: #efefef;
     opacity: 0.9;
     padding-right: 14px;
 }
 
 .action-button.active i {
-    color: rgba(28, 38, 43, 1.000);
+    color: #1c262b;
 }
 
 .tab:first-child {
-    margin-top: 9px;
+    margin-top: 8px;
 }
 
 .tab {
@@ -165,33 +165,25 @@ body {
 }
 
 .tab .server-icons {
-    width: 35px;
+    border-radius: 50%;
+    width: 30px;
+    padding: 3px;
+    height: 30px;
     vertical-align: top;
-    border-radius: 4px;
 }
 
 .tab .server-tab {
     width: 100%;
     height: 35px;
     position: relative;
-    margin-top: 5px;
+    margin: 5px 0 2px 0;
     z-index: 11;
     line-height: 31px;
-    color: rgba(238, 238, 238, 1.000);
+    color: #eee;
     text-align: center;
     overflow: hidden;
     opacity: 0.6;
-    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;
+    padding: 2px 0;
 }
 
 .tab .server-tab:hover {
@@ -216,7 +208,7 @@ body {
 
 .tab.active .server-tab {
     opacity: 1;
-    background-color: rgba(100, 132, 120, 1.000);
+    background-color: #648478;
 }
 
 .tab .server-tab-badge.active {
@@ -224,7 +216,7 @@ body {
     min-width: 11px;
     padding: 0 3px;
     height: 17px;
-    background-color: rgba(244, 67, 54, 1.000);
+    background-color: #f44336;
     font-size: 10px;
     font-family: sans-serif;
     position: absolute;
@@ -232,7 +224,7 @@ body {
     z-index: 15;
     top: 6px;
     float: right;
-    color: rgba(255, 255, 255, 1.000);
+    color: #fff;
     text-align: center;
     line-height: 17px;
     display: block;
@@ -260,25 +252,13 @@ body {
 }
 
 .tab .server-tab-shortcut {
-    color: rgba(100, 132, 120, 1.000);
+    color: #648478;
     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  *
@@ -290,19 +270,19 @@ body {
     width: 100%;
 }
 
-/* Pseudo element for loading indicator */
+/*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: #fff url(../img/ic_loading.gif) no-repeat;
     background-size: 60px 60px;
     background-position: center;
     width: 100%;
     height: 100%;
 }
 
-/* When the active webview is loaded */
+/*When the active webview is loaded*/
 #webviews-container.loaded::before {
     opacity: 0;
     z-index: -1;
@@ -340,34 +320,32 @@ webview.focus {
 
 /* Tooltip styling */
 
-#loading-tooltip,
 #dnd-tooltip,
 #back-tooltip,
 #reload-tooltip,
 #setting-tooltip {
     font-family: sans-serif;
-    background: rgba(34, 44, 49, 1.000);
+    background: #222c31;
     margin-left: 48px;
     padding: 6px 8px;
     position: absolute;
     margin-top: 0px;
     z-index: 1000;
-    color: rgba(255, 255, 255, 1.000);
+    color: white;
     border-radius: 4px;
     text-align: center;
     width: 55px;
     font-size: 14px;
 }
 
-#loading-tooltip::after,
-#dnd-tooltip::after,
-#back-tooltip::after,
-#reload-tooltip::after,
-#setting-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 rgba(34, 44, 49, 1.000);
+    border-right: 8px solid #222c31;
     position: absolute;
     top: 7px;
     right: 68px;
@@ -376,25 +354,25 @@ webview.focus {
 #add-server-tooltip,
 .server-tooltip {
     font-family: 'arial';
-    background: rgba(34, 44, 49, 1.000);
+    background: #222c31;
     left: 56px;
     padding: 10px 20px;
     position: fixed;
-    margin-top: 11px;
+    margin-top: 8px;
     z-index: 5000 !important;
-    color: rgba(255, 255, 255, 1.000);
+    color: #fff;
     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 rgba(34, 44, 49, 1.000);
+    border-right: 8px solid #222c31;
     position: absolute;
     top: 10px;
     left: -5px;
@@ -406,14 +384,14 @@ webview.focus {
     position: absolute;
     width: 24px;
     height: 24px;
-    background: rgba(34, 44, 49, 1.000);
+    background: #222c31;
     border-radius: 20px;
     cursor: pointer;
-    box-shadow: rgba(153, 153, 153, 1.000) 1px 1px;
+    box-shadow: #999 1px 1px;
 }
 
 #collapse-button i {
-    color: rgba(239, 239, 239, 1.000);
+    color: #efefef;
 }
 
 #main-container {
@@ -434,8 +412,8 @@ webview.focus {
 
 .popup .popuptext {
     visibility: hidden;
-    background-color: rgba(85, 85, 85, 1.000);
-    color: rgba(255, 255, 255, 1.000);
+    background-color: #555;
+    color: #fff;
     text-align: center;
     border-radius: 6px;
     padding: 9px 0;
@@ -467,24 +445,24 @@ webview.focus {
 }
 
 send-feedback {
-    width: 60%;
-    height: 85%;
+  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;
+  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;
+  display: flex;
 }

app/renderer/css/network.css

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

app/renderer/css/preference.css

@@ -7,25 +7,23 @@ body {
     font-family: menu, "Helvetica Neue", sans-serif;
     -webkit-font-smoothing: antialiased;
     font-size: 14px;
-    background: rgba(239, 239, 239, 1.000);
-    letter-spacing: -.08px;
-    line-height: 18px;
-    color: rgba(139, 142, 143, 1.000);
+    color: #333;
+    background: #efefef;
 }
 
 kbd {
     display: inline-block;
-    border: 1px solid rgba(204, 204, 204, 1.000);
-    border-radius: 4px;
+    border: 1px solid #ccc;
+    border-radius: 3px;
     font-size: 15px;
     font-family: Courier New, Courier, monospace;
     font-weight: bold;
     white-space: nowrap;
-    background-color: rgba(247, 247, 247, 1.000);
-    color: rgba(51, 51, 51, 1.000);
+    background-color: #f7f7f7;
+    color: #333;
     margin: 0 0.1em;
     padding: 0.3em 0.8em;
-    text-shadow: 0 1px 0 rgba(255, 255, 255, 1.000);
+    text-shadow: 0 1px 0 #fff;
     line-height: 1.4;
 }
 
@@ -33,7 +31,7 @@ table,
 th,
 td {
     border-collapse: collapse;
-    color: rgba(56, 52, 48, 1.000);
+    color: #383430;
 }
 
 table {
@@ -43,11 +41,11 @@ table {
 }
 
 table tr:nth-child(even) {
-    background-color: rgba(250, 250, 250, 1.000);
+    background-color: #fafafa;
 }
 
 table tr:nth-child(odd) {
-    background-color: rgba(255, 255, 255, 1.000);
+    background-color: #fff;
 }
 
 td {
@@ -103,7 +101,7 @@ td:nth-child(odd) {
     display: flex;
     flex-direction: column;
     font-size: 16px;
-    background: rgba(242, 242, 242, 1.000);
+    background: #f2f2f2;
 }
 
 #nav-container {
@@ -111,19 +109,19 @@ td:nth-child(odd) {
 }
 
 .nav {
-    padding: 7px 0;
-    color: rgba(153, 153, 153, 1.000);
+    padding: 5px 0;
+    color: #999;
     cursor: pointer;
 }
 
 .nav.active {
-    color: rgba(78, 191, 172, 1.000);
+    color: #4ebfac;
     cursor: default;
     position: relative;
 }
 
 .nav.active::before {
-    background: rgba(70, 78, 90, 1.000);
+    background: #464e5a;
     width: 3px;
     height: 18px;
     position: absolute;
@@ -131,6 +129,7 @@ td:nth-child(odd) {
     content: '';
 }
 
+
 /* We don't want to show this in nav item since we have the + button for adding an Organization */
 
 #nav-AddServer {
@@ -139,7 +138,7 @@ td:nth-child(odd) {
 
 #settings-header {
     font-size: 22px;
-    color: rgba(34, 44, 49, 1.000);
+    color: #222c31;
     font-weight: bold;
     text-transform: uppercase;
 }
@@ -159,11 +158,11 @@ td:nth-child(odd) {
 
 .title {
     font-weight: 500;
-    color: rgba(34, 44, 49, 1.000);
+    color: #222c31;
 }
 
 .page-title {
-    color: rgba(34, 44, 49, 1.000);
+    color: #222c31;
     font-size: 15px;
     font-weight: bold;
     padding: 4px 0 6px 0;
@@ -182,13 +181,13 @@ td:nth-child(odd) {
 .sub-title {
     padding: 4px 0 6px 0;
     font-weight: bold;
-    color: rgba(97, 97, 97, 1.000);
+    color: #616161;
 }
 
 img.server-info-icon {
     width: 36px;
     height: 36px;
-    padding: 4px 4px 4px 10px;
+    padding: 4px;
     cursor: pointer;
     vertical-align: middle;
 }
@@ -247,30 +246,26 @@ img.server-info-icon {
 .setting-input-value {
     flex-grow: 1;
     font-size: 14px;
-    border-radius: 4px;
+    border-radius: 3px;
     padding: 13px;
-    border: rgba(237, 237, 237, 1.000) 2px solid;
+    border: #ededed 2px solid;
     outline-width: 0;
     background: transparent;
     max-width: 450px;
 }
 
 .setting-input-value:focus {
-    border: rgba(78, 191, 172, 1.000) 2px solid;
+    border: #4EBFAC 2px solid;
 }
 
-.invalid-input-value:focus {
-    border: rgba(239, 83, 80, 1) 2px solid;
-}
-
-.manual-proxy-block {
-    width: 96%;
+.setting-block {
+    width: 100%;
 }
 
 .actions-container {
     display: flex;
     font-size: 14px;
-    color: rgba(35, 93, 58, 1.000);
+    color: #235d3a;
     vertical-align: middle;
     margin: 10px 0;
     flex-wrap: wrap;
@@ -291,7 +286,6 @@ img.server-info-icon {
 
 .settings-pane {
     flex-grow: 1;
-    min-width: 550px;
 }
 
 .action:hover {
@@ -303,7 +297,7 @@ img.server-info-icon {
 }
 
 .action.disabled {
-    color: rgba(153, 153, 153, 1.000);
+    color: #999;
 }
 
 .settings-card {
@@ -311,8 +305,8 @@ img.server-info-icon {
     flex-wrap: wrap;
     padding: 12px 30px;
     margin: 10px 0 20px 0;
-    background: rgba(255, 255, 255, 1.000);
-    width: 80%;
+    background: #fff;
+    width: 70%;
     transition: all 0.2s;
 }
 
@@ -326,59 +320,29 @@ img.server-info-icon {
 }
 
 .red {
-    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;
+    color: #ef5350;
+    padding: 8px;
+    border: rgba(239, 83, 80, 0.5) solid 1px;
 }
 
 .red:hover {
-    background-color: rgb(240, 148, 148);
-    color: rgba(255, 255, 255, 1.000);
+    color: #e63431;
+    border: rgba(239, 83, 80, 0.7) solid 1px;
+    ;
 }
 
-.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;
+.blue {
+    color: #ffffff;
+    background: #4EBFAC;
+    padding: 3px;
+    padding-right: 10px;
+    padding-left: 10px;
 }
 
 .grey {
-    color: rgba(158, 158, 158, 1.000);
-    background: rgba(250, 250, 250, 1.000);
-    border: 1px solid rgba(158, 158, 158, 1.000);
+    color: #9E9E9E;
+    background: #FAFAFA;
+    border: 1px solid #9E9E9E;
 }
 
 .setting-row {
@@ -394,28 +358,36 @@ img.server-info-icon {
 }
 
 i.open-tab-button {
-    padding-left: 5px;
+    padding-left: 2px;
     font-size: 19px;
     cursor: pointer;
 }
 
-#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,
+.custom-css-button {
+    display: inline-block;
+    border: none;
+    padding: 10px;
+    width: 120px;
+    cursor: pointer;
+    font-size: 13px;
+    transition: background-color 0.2s ease;
+    text-decoration: none;
 }
 
-.selected-css-path,
-.download-folder-path {
-    background: rgba(238, 238, 238, 1.000);
-    padding: 5px 10px;
+.css-delete-action {
+    margin-bottom: 10px;
+}
+
+.reset-data-button:hover {
+    background-color: #3c9f8d;
+    color: #fff;
+}
+
+.selected-css-path {
+    background: #eeeeee;
+    padding: 10px;
+    margin-top: 10px;
     margin-right: 10px;
     display: flex;
     width: 90%;
@@ -427,11 +399,7 @@ i.open-tab-button {
 }
 
 #server-info-container {
-    /* min-height: calc(100% - 260px); */
-}
-
-#new-org-button {
-    margin: 30px 0px 30px 0px;
+    min-height: calc(100% - 260px);
 }
 
 #create-organization-container {
@@ -454,7 +422,7 @@ i.open-tab-button {
     visibility: hidden;
 }
 
-.toggle + label {
+.toggle+label {
     display: block;
     position: relative;
     cursor: pointer;
@@ -462,21 +430,16 @@ i.open-tab-button {
     user-select: none;
 }
 
-.disallowed:hover {
-    background-color: rgba(241, 241, 241, 1.000);
-    cursor: not-allowed;
-}
-
-input.toggle-round + label {
+input.toggle-round+label {
     padding: 2px;
     width: 50px;
     height: 25px;
-    background-color: rgba(221, 221, 221, 1.000);
+    background-color: #dddddd;
     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;
@@ -485,34 +448,28 @@ input.toggle-round + label::after {
     content: "";
 }
 
-input.toggle-round + label::before {
-    background-color: rgba(241, 241, 241, 1.000);
+input.toggle-round+label:before {
+    right: 2px;
+    background-color: #f1f1f1;
     border-radius: 25px;
-    top: 0;
-    right: 0px;
-    left: 0px;
-    bottom: 0px;
 }
 
-input.toggle-round + label::after {
+input.toggle-round+label:after {
     width: 25px;
     height: 25px;
-    background-color: rgba(255, 255, 255, 1.000);
+    background-color: #fff;
     border-radius: 100%;
 }
 
-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:before {
+    background-color: #4EBFAC;
 }
 
-input.toggle-round:checked + label::after {
+input.toggle-round:checked+label:after {
     margin-left: 25px;
 }
 
+
 /*  Add new server modal */
 
 .add-server-modal {
@@ -526,17 +483,18 @@ input.toggle-round:checked + label::after {
     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));
+    background: linear-gradient(35deg, #003b52, #45b59b);
     overflow: auto;
 }
 
+
 /* Modal Content */
 
 .modal-container {
-    background-color: rgba(244, 247, 248, 1.000);
+    background-color: #f4f7f8;
     margin: auto;
     padding: 57px;
-    border: rgba(218, 225, 227, 1.000) 1px solid;
+    border: #dae1e3 1px solid;
     width: 550px;
     height: 370px;
     border-radius: 4px;
@@ -550,7 +508,7 @@ input.toggle-round:checked + label::after {
 .divider {
     margin-bottom: 30px;
     margin-top: 30px;
-    color: rgba(125, 135, 138, 1.000);
+    color: #7d878a;
 }
 
 .divider hr {
@@ -581,54 +539,28 @@ input.toggle-round:checked + label::after {
     margin: auto;
     align-items: center;
     text-align: center;
-    color: rgba(255, 255, 255, 1.000);
-    background: rgba(78, 191, 172, 1.000);
+    color: #fff;
+    background: #4EBFAC;
     border-color: none;
     border: none;
     width: 98%;
     height: 46px;
-    border-radius: 4px;
+    border-radius: 3px;
     cursor: pointer;
 }
 
 .server-center button:hover {
-    background: rgba(50, 149, 136, 1.000);
+    background: #329588;
 }
 
 .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;
+    background: #329588;
 }
 
 .tip {
-    background: none;
-    padding: 0;
-}
-
-.tip:hover {
-    box-shadow: none;
+    background-color: hsl(46,63%,95%);
+    border: 1px solid hsl(46,63%,84%);
+    border-radius: 4px;
 }
 
 .md-14 {
@@ -645,8 +577,7 @@ input.toggle-round:checked + label::after {
 /* responsive grid */
 
 @media (max-width: 650px) {
-    .selected-css-path,
-    .download-folder-path {
+    .selected-css-path {
         margin-right: 15px;
     }
     #css-delete-action {
@@ -696,10 +627,12 @@ input.toggle-round:checked + label::after {
         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.js

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

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

@@ -1,10 +1,9 @@
 'use strict';
 
-import Tab = require('./tab');
+const Tab = require(__dirname + '/../components/tab.js');
 
 class FunctionalTab extends Tab {
-	$closeButton: Element;
-	template(): string {
+	template() {
 		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>
@@ -15,22 +14,16 @@ class FunctionalTab extends Tab {
 				</div>`;
 	}
 
-	// TODO: Typescript - This type for props should be TabProps
-	constructor(props: any) {
-		super(props);
-		this.init();
-	}
-
-	init(): void {
+	init() {
 		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.props.$root.appendChild(this.$el);
+			this.$closeButton = this.$el.getElementsByClassName('server-tab-badge')[0];
 			this.registerListeners();
 		}
 	}
 
-	registerListeners(): void {
+	registerListeners() {
 		super.registerListeners();
 
 		this.$el.addEventListener('mouseover', () => {
@@ -41,11 +34,11 @@ class FunctionalTab extends Tab {
 			this.$closeButton.classList.remove('active');
 		});
 
-		this.$closeButton.addEventListener('click', (e: Event) => {
+		this.$closeButton.addEventListener('click', e => {
 			this.props.onDestroy();
 			e.stopPropagation();
 		});
 	}
 }
 
-export = FunctionalTab;
+module.exports = FunctionalTab;

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

@@ -0,0 +1,35 @@
+const { shell } = require('electron').remote;
+const LinkUtil = require('../utils/link-util');
+const DomainUtil = require('../utils/domain-util');
+
+function handleExternalLink(event) {
+	const { url } = event;
+	const domainPrefix = DomainUtil.getDomain(this.props.index).url;
+
+  // Whitelist URLs which are allowed to be opened in the app
+	const {
+    isInternalUrl: isWhiteListURL,
+    isUploadsUrl: isUploadsURL
+  } = LinkUtil.isInternal(domainPrefix, url);
+
+	if (isWhiteListURL) {
+		event.preventDefault();
+
+    // download txt, pdf, 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
+		if (!LinkUtil.isImage(url) && isUploadsURL) {
+			this.$el.downloadURL(url);
+			return;
+		}
+
+    // open internal urls inside the current webview.
+		this.$el.loadURL(url);
+	} else {
+		event.preventDefault();
+		shell.openExternal(url);
+	}
+}
+
+module.exports = handleExternalLink;

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

@@ -1,83 +0,0 @@
-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,16 +1,14 @@
 'use strict';
 
-import { ipcRenderer } from 'electron';
+const Tab = require(__dirname + '/../components/tab.js');
+const SystemUtil = require(__dirname + '/../utils/system-util.js');
 
-import Tab = require('./tab');
-import SystemUtil = require('../utils/system-util');
+const {ipcRenderer} = require('electron');
 
 class ServerTab extends Tab {
-	$badge: Element;
-
-	template(): string {
+	template() {
 		return `<div class="tab" data-tab-id="${this.props.tabIndex}">
-					<div class="server-tooltip" style="display:none">${this.props.name}</div>
+					<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}'/>
@@ -19,22 +17,16 @@ class ServerTab extends Tab {
 				</div>`;
 	}
 
-	// TODO: Typescript - This type for props should be TabProps
-	constructor(props: any) {
-		super(props);
-		this.init();
+	init() {
+		super.init();
+
+		this.$badge = this.$el.getElementsByClassName('server-tab-badge')[0];
 	}
 
-	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 {
+	updateBadge(count) {
 		if (count > 0) {
-			const formattedCount = count > 999 ? '1K+' : count.toString();
+			const formattedCount = count > 999 ? '1K+' : count;
+
 			this.$badge.innerHTML = formattedCount;
 			this.$badge.classList.add('active');
 		} else {
@@ -42,7 +34,7 @@ class ServerTab extends Tab {
 		}
 	}
 
-	generateShortcutText(): string {
+	generateShortcutText() {
 		// Only provide shortcuts for server [0..10]
 		if (this.props.index >= 10) {
 			return '';
@@ -65,4 +57,4 @@ class ServerTab extends Tab {
 	}
 }
 
-export = ServerTab;
+module.exports = ServerTab;

app/renderer/js/components/tab.js

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

app/renderer/js/components/webview.js

@@ -1,39 +1,22 @@
 '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 path = require('path');
+const fs = require('fs');
 
-const { app, dialog } = remote;
+const ConfigUtil = require(__dirname + '/../utils/config-util.js');
+const SystemUtil = require(__dirname + '/../utils/system-util.js');
+const { app, dialog } = require('electron').remote;
+
+const BaseComponent = require(__dirname + '/../components/base.js');
+const handleExternalLink = require(__dirname + '/../components/handle-external-link.js');
 
 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) {
+	constructor(props) {
 		super();
 
 		this.props = props;
+
 		this.zoomFactor = 1.0;
 		this.loading = true;
 		this.badgeCount = 0;
@@ -41,7 +24,7 @@ class WebView extends BaseComponent {
 		this.$webviewsContainer = document.querySelector('#webviews-container').classList;
 	}
 
-	template(): string {
+	template() {
 		return `<webview
 					class="disabled"
 					data-tab-id="${this.props.tabIndex}"
@@ -50,19 +33,18 @@ class WebView extends BaseComponent {
 					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);
+	init() {
+		this.$el = this.generateNodeFromTemplate(this.template());
+		this.props.$root.appendChild(this.$el);
 
 		this.registerListeners();
 	}
 
-	registerListeners(): void {
+	registerListeners() {
 		this.$el.addEventListener('new-window', event => {
 			handleExternalLink.call(this, event);
 		});
@@ -93,16 +75,11 @@ class WebView extends BaseComponent {
 
 		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();
-				}
 			}
 		});
 
@@ -111,18 +88,12 @@ class WebView extends BaseComponent {
 				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);
+			const hasConnectivityErr = (SystemUtil.connectivityERR.indexOf(errorDescription) >= 0);
 			if (hasConnectivityErr) {
 				console.error('error', errorDescription);
 				this.props.onNetworkError();
@@ -130,10 +101,6 @@ class WebView extends BaseComponent {
 		});
 
 		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());
@@ -141,18 +108,14 @@ class WebView extends BaseComponent {
 			}
 			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);
+	getBadgeCount(title) {
+		const messageCountInTitle = (/\(([0-9]+)\)/).exec(title);
 		return messageCountInTitle ? Number(messageCountInTitle[1]) : 0;
 	}
 
-	show(): void {
+	show() {
 		// Do not show WebView if another tab was selected and this tab should be in background.
 		if (!this.props.isActive()) {
 			return;
@@ -193,27 +156,21 @@ class WebView extends BaseComponent {
 		}
 	}
 
-	focus(): void {
+	focus() {
 		// 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();
+		if (webContents && !webContents.isFocused()) {
 			this.$el.focus();
 			webContents.focus();
 		}
 	}
 
-	hide(): void {
+	hide() {
 		this.$el.classList.add('disabled');
 		this.$el.classList.remove('active');
 	}
 
-	load(): void {
+	load() {
 		if (this.$el) {
 			this.show();
 		} else {
@@ -221,41 +178,40 @@ class WebView extends BaseComponent {
 		}
 	}
 
-	zoomIn(): void {
+	zoomIn() {
 		this.zoomFactor += 0.1;
 		this.$el.setZoomFactor(this.zoomFactor);
 	}
 
-	zoomOut(): void {
+	zoomOut() {
 		this.zoomFactor -= 0.1;
 		this.$el.setZoomFactor(this.zoomFactor);
 	}
 
-	zoomActualSize(): void {
+	zoomActualSize() {
 		this.zoomFactor = 1.0;
 		this.$el.setZoomFactor(this.zoomFactor);
 	}
 
-	logOut(): void {
+	logOut() {
 		this.$el.executeJavaScript('logout()');
 	}
 
-	showShortcut(): void {
+	showShortcut() {
 		this.$el.executeJavaScript('shortcut()');
 	}
 
-	openDevTools(): void {
+	openDevTools() {
 		this.$el.openDevTools();
 	}
 
-	back(): void {
+	back() {
 		if (this.$el.canGoBack()) {
 			this.$el.goBack();
-			this.focus();
 		}
 	}
 
-	canGoBackButton(): void {
+	canGoBackButton() {
 		const $backButton = document.querySelector('#actions-container #back-action');
 		if (this.$el.canGoBack()) {
 			$backButton.classList.remove('disable');
@@ -264,24 +220,23 @@ class WebView extends BaseComponent {
 		}
 	}
 
-	forward(): void {
+	forward() {
 		if (this.$el.canGoForward()) {
 			this.$el.goForward();
 		}
 	}
 
-	reload(): void {
+	reload() {
 		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);
+	send(...param) {
+		this.$el.send(...param);
 	}
 }
 
-export = WebView;
+module.exports = WebView;

app/renderer/js/electron-bridge.ts

@@ -1,46 +0,0 @@
-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.js

@@ -1,16 +1,7 @@
-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;
+const { app } = require('electron').remote;
+const path = require('path');
+const fs = require('fs');
+const SendFeedback = require('@electron-elements/send-feedback');
 
 // make the button color match zulip app's theme
 SendFeedback.customStyles = `
@@ -31,8 +22,8 @@ button {
 `;
 
 customElements.define('send-feedback', SendFeedback);
-export const sendFeedback: SendFeedbackType = document.querySelector('send-feedback');
-export const feedbackHolder = sendFeedback.parentElement;
+const sendFeedback = document.querySelector('send-feedback');
+const feedbackHolder = sendFeedback.parentElement;
 
 // customize the fields of custom elements
 sendFeedback.title = 'Report Issue';
@@ -47,9 +38,9 @@ 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
+feedbackHolder.addEventListener('click', e => {
+  // 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');
 	}
@@ -64,3 +55,8 @@ sendFeedback.addEventListener('feedback-submitted', () => {
 const dataDir = app.getPath('userData');
 const logsDir = path.join(dataDir, '/Logs');
 sendFeedback.logs.push(...fs.readdirSync(logsDir).map(file => path.join(logsDir, file)));
+
+module.exports = {
+	feedbackHolder,
+	sendFeedback
+};

app/renderer/js/main.js

@@ -0,0 +1,584 @@
+'use strict';
+
+const { ipcRenderer, remote } = require('electron');
+const isDev = require('electron-is-dev');
+
+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');
+const DNDUtil = require(__dirname + '/js/utils/dnd-util.js');
+const ReconnectUtil = require(__dirname + '/js/utils/reconnect-util.js');
+const { feedbackHolder } = require(__dirname + '/js/feedback.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.$backButton = $actionsContainer.querySelector('#back-action');
+		this.$dndButton = $actionsContainer.querySelector('#dnd-action');
+
+		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.$backTooltip = $actionsContainer.querySelector('#back-tooltip');
+		this.$dndTooltip = $actionsContainer.querySelector('#dnd-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 = {};
+		this.tabIndex = 0;
+	}
+
+	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,
+			autoUpdate: true,
+			betaUpdate: false,
+			silent: false,
+			lastActiveTab: 0,
+			dnd: false,
+			dndPreviousSettings: {
+				showNotification: true,
+				silent: false
+			}
+		};
+
+		// Platform specific settings
+
+		if (process.platform === 'win32') {
+			// Only available on Windows
+			settingOptions.flashTaskbarOnMessage = true;
+			settingOptions.dndPreviousSettings.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'));
+			// Remove focus from the settings icon at sidebar bottom
+			this.$settingsButton.classList.remove('active');
+		} else {
+			this.openSettings('AddServer');
+		}
+	}
+
+	initServer(server, index) {
+		const tabIndex = this.getTabIndex();
+		this.tabs.push(new ServerTab({
+			role: 'server',
+			icon: server.icon,
+			$root: this.$tabsContainer,
+			onClick: this.activateLastTab.bind(this, index),
+			index,
+			tabIndex,
+			onHover: this.onHover.bind(this, index, server.alias),
+			onHoverOut: this.onHoverOut.bind(this, index),
+			webview: new WebView({
+				$root: this.$webviewsContainer,
+				index,
+				tabIndex,
+				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.initDNDButton();
+		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();
+		});
+
+		const $serverImgs = document.querySelectorAll('.server-icons');
+		$serverImgs.forEach($serverImg => {
+			$serverImg.addEventListener('error', () => {
+				$serverImg.src = 'img/icon.png';
+			});
+		});
+
+		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip, true);
+		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() {
+		const dnd = ConfigUtil.getConfigItem('dnd', false);
+		this.toggleDNDButton(dnd);
+	}
+
+	getTabIndex() {
+		const currentIndex = this.tabIndex;
+		this.tabIndex++;
+		return currentIndex;
+	}
+
+	sidebarHoverEvent(SidebarButton, SidebarTooltip, addServer = false) {
+		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, serverName) {
+		this.$serverIconTooltip[index].innerText = serverName;
+		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) {
+		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;
+
+		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,
+				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
+			})
+		}));
+		// 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') {
+		this.openFunctionalTab({
+			name: 'Settings',
+			materialIcon: 'settings',
+			url: `file://${__dirname}/preference.html#${nav}`
+		});
+		this.$settingsButton.classList.add('active');
+		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 all the tabs in background, also activate the tab based on the index
+		this.activateTab(index);
+		// Save last active tab
+		ConfigUtil.setConfigItem('lastActiveTab', index);
+	}
+
+	activateTab(index, hideOldTab = true) {
+		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();
+
+		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('toggle-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();
+					});
+				}
+			});
+		});
+
+		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
+			this.toggleDNDButton(state);
+			ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent);
+			const selector = 'webview:not([class*=disabled])';
+			const webview = document.querySelector(selector);
+			const webContents = webview.getWebContents();
+			webContents.send('toggle-dnd', state, newSettings);
+		});
+	}
+
+	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() {
+		// 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() {
+		// 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');
+		}
+	}
+
+	// Toggles the dnd button icon.
+	toggleDNDButton(alert) {
+		this.$dndTooltip.textContent = (alert ? 'Turn Off' : 'Enable') + ' Do Not Disturb';
+		this.$dndButton.querySelector('i').textContent = alert ? 'notifications_off' : 'notifications';
+	}
+
+	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.activateLastTab(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('focus-webview-with-id', (event, webviewId) => {
+			const webviews = document.querySelectorAll('webview');
+			webviews.forEach(webview => {
+				const currentId = webview.getWebContents().id;
+				const tabId = webview.getAttribute('data-tab-id');
+				const concurrentTab = document.querySelector(`div[data-tab-id="${tabId}"]`);
+				if (currentId === webviewId) {
+					concurrentTab.click();
+				}
+			});
+		});
+
+		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));
+		});
+
+		ipcRenderer.on('open-feedback-modal', () => {
+			feedbackHolder.classList.add('show');
+		});
+	}
+}
+
+window.onload = () => {
+	const serverManagerView = new ServerManagerView();
+	const reconnectUtil = new ReconnectUtil(serverManagerView);
+	serverManagerView.init();
+	window.addEventListener('online', () => {
+		reconnectUtil.pollInternetAndReload();
+	});
+
+	window.addEventListener('offline', () => {
+		reconnectUtil.clearState();
+		console.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')) {
+		const electronConnect = require('electron-connect');
+		electronConnect.client.create();
+	}
+};

app/renderer/js/main.ts

@@ -1,990 +0,0 @@
-'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/darwin-notifications.js

@@ -1,28 +1,18 @@
 'use strict';
-import { ipcRenderer } from 'electron';
-import {
+
+const { ipcRenderer } = require('electron');
+const url = require('url');
+const MacNotifier = require('node-mac-notifier');
+const ConfigUtil = require('../utils/config-util');
+const {
 	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;
-}
+} = require('./helpers');
 
+let replyHandler;
+let clickHandler;
 class DarwinNotification {
-	tag: string;
-
-	constructor(title: string, opts: NotificationOptions) {
-		const silent: boolean = ConfigUtil.getConfigItem('silent') || false;
+	constructor(title, opts) {
+		const silent = ConfigUtil.getConfigItem('silent') || false;
 		const { host, protocol } = location;
 		const { icon } = opts;
 		const profilePic = url.resolve(`${protocol}//${host}`, icon);
@@ -49,53 +39,49 @@ class DarwinNotification {
 		notification.addEventListener('reply', this.notificationHandler);
 	}
 
-	static requestPermission(): void {
+	static requestPermission() {
 		return; // eslint-disable-line no-useless-return
 	}
 
 	// Override default Notification permission
-	static get permission(): NotificationPermission {
+	static get permission() {
 		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
 	}
 
-	set onreply(handler: ReplyHandler) {
+	set onreply(handler) {
 		replyHandler = handler;
 	}
 
-	get onreply(): ReplyHandler {
+	get onreply() {
 		return replyHandler;
 	}
 
-	set onclick(handler: ClickHandler) {
+	set onclick(handler) {
 		clickHandler = handler;
 	}
 
-	get onclick(): ClickHandler {
+	get onclick() {
 		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 {
+	addEventListener(event, handler) {
 		if (event === 'click') {
-			clickHandler = handler as ClickHandler;
+			clickHandler = handler;
 		}
 
 		if (event === 'reply') {
-			replyHandler = handler as ReplyHandler;
+			replyHandler = handler;
 		}
 	}
 
-	notificationHandler({ response }: NotificationHandlerArgs): void {
+	notificationHandler({ response }) {
 		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;
@@ -106,7 +92,7 @@ class DarwinNotification {
 
 	// method specific to notification api
 	// used by zulip
-	close(): void {
+	close() {
 		return; // eslint-disable-line no-useless-return
 	}
 }

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

@@ -1,13 +1,12 @@
 'use strict';
 
-import { ipcRenderer } from 'electron';
-import { focusCurrentServer } from './helpers';
-
-import ConfigUtil = require('../utils/config-util');
+const { ipcRenderer } = require('electron');
+const ConfigUtil = require('../utils/config-util');
+const { focusCurrentServer } = require('./helpers');
 
 const NativeNotification = window.Notification;
 class BaseNotification extends NativeNotification {
-	constructor(title: string, opts: NotificationOptions) {
+	constructor(title, opts) {
 		opts.silent = true;
 		super(title, opts);
 
@@ -19,14 +18,14 @@ class BaseNotification extends NativeNotification {
 		});
 	}
 
-	static requestPermission(): void {
+	static requestPermission() {
 		return; // eslint-disable-line no-useless-return
 	}
 
 	// Override default Notification permission
-	static get permission(): NotificationPermission {
+	static get permission() {
 		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
 	}
 }
 
-export = BaseNotification;
+module.exports = BaseNotification;

app/renderer/js/notification/helpers.js

@@ -1,32 +1,24 @@
-import { remote } from 'electron';
-
-import Logger = require('../utils/logger-util');
-
-const logger = new Logger({
-	file: 'errors.log',
-	timestamp: true
-});
+const { remote } = require('electron');
 
 // Do not change this
-export const appId = 'org.zulip.zulip-electron';
+const appId = 'org.zulip.zulip-electron';
 
-export type BotListItem = [string, string];
-const botsList: BotListItem[] = [];
+const botsList = [];
 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 {
+function loadBots(sync = false) {
 	const { $ } = window;
 	botsList.length = 0;
 	if (sync) {
 		$.ajaxSetup({async: false});
 	}
 	$.getJSON('/json/users')
-		.done((data: any) => {
-			const { members } = data;
-			members.forEach((membersRow: any) => {
+		.done(data => {
+			const members = data.members;
+			members.forEach(membersRow => {
 				if (membersRow.is_bot) {
 					const bot = `@${membersRow.full_name}`;
 					const mention = `@**${bot.replace(/^@/, '')}**`;
@@ -35,16 +27,16 @@ export function loadBots(sync = false): void {
 			});
 			botsListLoaded = true;
 		})
-		.fail((error: any) => {
-			logger.log('Load bots request failed: ', error.responseText);
-			logger.log('Load bots request status: ', error.statusText);
+		.fail(error => {
+			console.log('Request failed: ', error.responseText);
+			console.log('Request status: ', error.statusText);
 		});
 	if (sync) {
 		$.ajaxSetup({async: true});
 	}
 }
 
-export function checkElements(...elements: any[]): boolean {
+function checkElements(...elements) {
 	let status = true;
 	elements.forEach(element => {
 		if (element === null || element === undefined) {
@@ -54,13 +46,13 @@ export function checkElements(...elements: any[]): boolean {
 	return status;
 }
 
-export function customReply(reply: string): void {
+function customReply(reply) {
 	// 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);
+	const textarea = document.querySelector('#compose-textarea');
+	const messagebox = document.querySelector(messageboxSelector);
+	const sendButton = document.querySelector(buttonSelector);
 
 	// sanity check for old server versions
 	const elementsExists = checkElements(textarea, messagebox, sendButton);
@@ -79,24 +71,19 @@ 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);
+function focusCurrentServer() {
+	currentWindow.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 {
+function parseReply(reply) {
 	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[] = [];
+	const users = [];
+	const streams = [];
 
 	usersDiv.forEach(userRow => {
 		const anchor = userRow.querySelector('span a');
@@ -146,8 +133,17 @@ export function parseReply(reply: string): string {
 	return reply;
 }
 
-export function setupReply(id: string): void {
+function setupReply(id) {
 	const { narrow } = window;
-	const narrowByTopic = narrow.by_topic || narrow.by_subject;
-	narrowByTopic(id, { trigger: 'notification' });
+	narrow.by_subject(id, { trigger: 'notification' });
 }
+
+module.exports = {
+	appId,
+	checkElements,
+	customReply,
+	parseReply,
+	setupReply,
+	focusCurrentServer,
+	loadBots
+};

app/renderer/js/notification/index.js

@@ -0,0 +1,27 @@
+'use strict';
+
+const {
+  remote: { app }
+} = require('electron');
+
+const DefaultNotification = require('./default-notification');
+const { appId, loadBots } = require('./helpers');
+
+// 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') {
+	const DarwinNotification = require('./darwin-notifications');
+	window.Notification = DarwinNotification;
+}
+
+window.addEventListener('load', () => {
+	// Call this function only when user is logged in
+	// eslint-disable-next-line no-undef, camelcase
+	if (page_params.realm_uri) {
+		loadBots();
+	}
+});

app/renderer/js/notification/index.ts

@@ -1,25 +0,0 @@
-'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.js

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

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

@@ -1,100 +0,0 @@
-'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.js

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

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

@@ -0,0 +1,46 @@
+'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

@@ -1,50 +0,0 @@
-'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.js

@@ -0,0 +1,51 @@
+'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');
+
+class ConnectedOrgSection extends BaseSection {
+	constructor(props) {
+		super();
+		this.props = props;
+	}
+
+	template() {
+		return `
+			<div class="settings-pane" id="server-settings-pane">
+				<div class="page-title">Connected organizations</div>
+				<div class="title" id="existing-servers">All the connected orgnizations will appear here.</div>
+				<div id="server-info-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');
+
+		const noServerText = '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();
+		}
+	}
+
+}
+
+module.exports = ConnectedOrgSection;

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

@@ -1,90 +0,0 @@
-'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/find-accounts.ts

@@ -1,78 +0,0 @@
-'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,143 +1,109 @@
 'use strict';
-import { ipcRenderer, remote, OpenDialogOptions } from 'electron';
-
-import path = require('path');
-import fs = require('fs-extra');
+const path = require('path');
+const { ipcRenderer, remote } = require('electron');
+const 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');
+const BaseSection = require(__dirname + '/base-section.js');
+const ConfigUtil = require(__dirname + '/../../utils/config-util.js');
 
 class GeneralSection extends BaseSection {
-	// TODO: TypeScript - Here props should be object type
-	props: any;
-	constructor(props: any) {
+	constructor(props) {
 		super();
 		this.props = props;
 	}
 
-	template(): string {
+	template() {
 		return `
             <div class="settings-pane">
-                <div class="title">${t.__('Appearance')}</div>
+                <div class="title">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-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">${t.__('Show sidebar')} (<span class="code">${process.platform === 'darwin' ? 'Cmd+Shift+S' : 'Ctrl+Shift+S'}</span>)</div>
+						<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">${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-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">${t.__('Flash taskbar on new message')}</div>
+						<div class="setting-description">Flash taskbar on new message</div>
 						<div class="setting-control"></div>
 					</div>
 				</div>
-				<div class="title">${t.__('Desktop Notifications')}</div>
+				<div class="title">Desktop Notification</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-description">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-description">Mute all sounds from Zulip</div>
 						<div class="setting-control"></div>
 					</div>
 				</div>
-				<div class="title">${t.__('App Updates')}</div>
+				<div class="title">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-description">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-description">Get beta updates</div>
 						<div class="setting-control"></div>
 					</div>
 				</div>
-				<div class="title">${t.__('Functionality')}</div>
+				<div class="title">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-description">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-description">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-description">Enable Spellchecker (requires restart)</div>
 						<div class="setting-control"></div>
 					</div>
 				</div>
-				<div class="title">${t.__('Advanced')}</div>
+				<div class="title">Add custom CSS</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-row" id="add-custom-css">
 						<div class="setting-description">
-							${t.__('Default download location')}
+							This will inject the selected css stylesheet in all the added accounts
 						</div>
-						<button class="download-folder-button green">${t.__('Change')}</button>
+						<button class="custom-css-button blue">Add</button>
 					</div>
-					<div class="setting-row">
+					<div class="setting-row" id="remove-custom-css">
 						<div class="setting-description">
-							<div class="download-folder-path">${ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`)}</div>
+							<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>Delete</span>
 						</div>
 					</div>
-
 				</div>
-				<div class="title">${t.__('Reset Application Data')}</div>
+				<div class="title">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 class="setting-description">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>
+						<button class="reset-data-button blue">Reset App Data</button>
 					</div>
 				</div>
             </div>
 		`;
 	}
 
-	init(): void {
+	init() {
 		this.props.$root.innerHTML = this.template();
 		this.updateTrayOption();
 		this.updateBadgeOption();
@@ -153,28 +119,15 @@ class GeneralSection extends BaseSection {
 		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 {
+	updateTrayOption() {
 		this.generateSettingOption({
 			$element: document.querySelector('#tray-option .setting-control'),
 			value: ConfigUtil.getConfigItem('trayIcon', true),
@@ -187,20 +140,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	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 {
+	updateBadgeOption() {
 		this.generateSettingOption({
 			$element: document.querySelector('#badge-option .setting-control'),
 			value: ConfigUtil.getConfigItem('badgeOption', true),
@@ -213,19 +153,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	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 {
+	updateFlashTaskbar() {
 		this.generateSettingOption({
 			$element: document.querySelector('#flash-taskbar-option .setting-control'),
 			value: ConfigUtil.getConfigItem('flashTaskbarOnMessage', true),
@@ -237,38 +165,31 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	autoUpdateOption(): void {
+	autoUpdateOption() {
 		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 {
+	betaUpdateOption() {
 		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();
-				}
+				ConfigUtil.setConfigItem('betaUpdate', newValue);
+				this.betaUpdateOption();
 			}
 		});
 	}
 
-	updateSilentOption(): void {
+	updateSilentOption() {
 		this.generateSettingOption({
 			$element: document.querySelector('#silent-option .setting-control'),
 			value: ConfigUtil.getConfigItem('silent', false),
@@ -276,14 +197,12 @@ class GeneralSection extends BaseSection {
 				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);
+				currentBrowserWindow.send('toggle-silent', newValue);
 			}
 		});
 	}
 
-	showDesktopNotification(): void {
+	showDesktopNotification() {
 		this.generateSettingOption({
 			$element: document.querySelector('#show-notification-option .setting-control'),
 			value: ConfigUtil.getConfigItem('showNotification', true),
@@ -295,7 +214,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateSidebarOption(): void {
+	updateSidebarOption() {
 		this.generateSettingOption({
 			$element: document.querySelector('#sidebar-option .setting-control'),
 			value: ConfigUtil.getConfigItem('showSidebar', true),
@@ -308,7 +227,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateStartAtLoginOption(): void {
+	updateStartAtLoginOption() {
 		this.generateSettingOption({
 			$element: document.querySelector('#startAtLogin-option .setting-control'),
 			value: ConfigUtil.getConfigItem('startAtLogin', false),
@@ -321,7 +240,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	enableSpellchecker(): void {
+	enableSpellchecker() {
 		this.generateSettingOption({
 			$element: document.querySelector('#enable-spellchecker-option .setting-control'),
 			value: ConfigUtil.getConfigItem('enableSpellchecker', true),
@@ -333,19 +252,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	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 {
+	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());
 
@@ -363,9 +270,10 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	customCssDialog(): void {
-		const showDialogOptions: OpenDialogOptions = {
+	customCssDialog() {
+		const showDialogOptions = {
 			title: 'Select file',
+			defaultId: 1,
 			properties: ['openFile'],
 			filters: [{ name: 'CSS file', extensions: ['css'] }]
 		};
@@ -378,14 +286,14 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateResetDataOption(): void {
+	updateResetDataOption() {
 		const resetDataButton = document.querySelector('#resetdata-option .reset-data-button');
 		resetDataButton.addEventListener('click', () => {
 			this.clearAppDataDialog();
 		});
 	}
 
-	minimizeOnStart(): void {
+	minimizeOnStart() {
 		this.generateSettingOption({
 			$element: document.querySelector('#start-minimize-option .setting-control'),
 			value: ConfigUtil.getConfigItem('startMinimized', false),
@@ -397,60 +305,28 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	addCustomCSS(): void {
+	addCustomCSS() {
 		const customCSSButton = document.querySelector('#add-custom-css .custom-css-button');
 		customCSSButton.addEventListener('click', () => {
 			this.customCssDialog();
 		});
 	}
 
-	showCustomCSSPath(): void {
+	showCustomCSSPath() {
 		if (!ConfigUtil.getConfigItem('customCSS')) {
-			const cssPATH: HTMLElement = document.querySelector('#remove-custom-css');
+			const cssPATH = document.getElementById('remove-custom-css');
 			cssPATH.style.display = 'none';
 		}
 	}
 
-	removeCustomCSS(): void {
-		const removeCSSButton = document.querySelector('#css-delete-action');
+	removeCustomCSS() {
+		const removeCSSButton = document.getElementById('css-delete-action');
 		removeCSSButton.addEventListener('click', () => {
-			ConfigUtil.setConfigItem('customCSS', "");
+			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;
+module.exports = GeneralSection;

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

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

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

@@ -0,0 +1,102 @@
+'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

@@ -1,136 +0,0 @@
-'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,62 +1,56 @@
 'use strict';
 
-import { shell } from 'electron';
-
-import BaseComponent = require('../../components/base');
-import DomainUtil = require('../../utils/domain-util');
-import t = require('../../utils/translation-util');
+const BaseComponent = require(__dirname + '/../../components/base.js');
+const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+const shell = require('electron').shell;
 
 class NewServerForm extends BaseComponent {
-	// TODO: TypeScript - Here props should be object type
-	props: any;
-	$newServerForm: Element;
-	$saveServerButton: HTMLButtonElement;
-	$newServerUrl: HTMLInputElement;
-	constructor(props: any) {
+	constructor(props) {
 		super();
 		this.props = props;
 	}
 
-	template(): string {
+	template() {
 		return `
 			<div class="server-input-container">
-				<div class="title">${t.__('Organization URL')}</div>
+				<div class="title">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>
+						<button id="connect">Connect</button>
 					</div>
 				</div>
 				<div class="server-center">
 				<div class="divider">
-					<hr class="left"/>${t.__('OR')}<hr class="right" />
+					<hr class="left"/>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>
+					<button id="open-create-org-link">Create a new organization</button>
 			</div>
 					</div>
 			</div>
 		`;
 	}
 
-	init(): void {
+	init() {
 		this.initForm();
 		this.initActions();
 	}
 
-	initForm(): void {
+	initForm() {
 		this.$newServerForm = this.generateNodeFromTemplate(this.template());
-		this.$saveServerButton = this.$newServerForm.querySelectorAll('.server-save-action')[0] as HTMLButtonElement;
+		this.$saveServerButton = this.$newServerForm.getElementsByClassName('server-save-action')[0];
 		this.props.$root.innerHTML = '';
-		this.props.$root.append(this.$newServerForm);
-		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
+		this.props.$root.appendChild(this.$newServerForm);
+
+		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0];
 	}
 
-	submitFormHandler(): void {
+	submitFormHandler() {
 		this.$saveServerButton.children[0].innerHTML = 'Connecting...';
 		DomainUtil.checkDomain(this.$newServerUrl.value).then(serverConf => {
 			DomainUtil.addDomain(serverConf).then(() => {
@@ -68,15 +62,15 @@ class NewServerForm extends BaseComponent {
 		});
 	}
 
-	openCreateNewOrgExternalLink(): void {
+	openCreateNewOrgExternalLink() {
 		const link = 'https://zulipchat.com/new/';
-		const externalCreateNewOrgEl = document.querySelector('#open-create-org-link');
+		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
 		externalCreateNewOrgEl.addEventListener('click', () => {
 			shell.openExternal(link);
 		});
 	}
 
-	initActions(): void {
+	initActions() {
 		this.$saveServerButton.addEventListener('click', () => {
 			this.submitFormHandler();
 		});
@@ -92,4 +86,4 @@ class NewServerForm extends BaseComponent {
 	}
 }
 
-export = NewServerForm;
+module.exports = NewServerForm;

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

@@ -1,29 +1,24 @@
 'use strict';
 
-import { ipcRenderer } from 'electron';
+const BaseComponent = require(__dirname + '/js/components/base.js');
+const { ipcRenderer } = require('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;
+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 ConnectedOrgSection = require(__dirname + '/js/pages/preference/connected-org-section.js');
+const ShortcutsSection = require(__dirname + '/js/pages/preference/shortcuts-section.js');
 
 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');
+
+		this.$sidebarContainer = document.getElementById('sidebar');
+		this.$settingsContainer = document.getElementById('settings-container');
 	}
 
-	init(): void {
+	init() {
 		this.nav = new Nav({
 			$root: this.$sidebarContainer,
 			onItemSelected: this.handleNavigation.bind(this)
@@ -33,7 +28,7 @@ class PreferenceView extends BaseComponent {
 		this.registerIpcs();
 	}
 
-	setDefaultView(): void {
+	setDefaultView() {
 		let nav = 'General';
 		const hasTag = window.location.hash;
 		if (hasTag) {
@@ -42,7 +37,7 @@ class PreferenceView extends BaseComponent {
 		this.handleNavigation(nav);
 	}
 
-	handleNavigation(navItem: string): void {
+	handleNavigation(navItem) {
 		this.nav.select(navItem);
 		switch (navItem) {
 			case 'AddServer': {
@@ -82,32 +77,28 @@ class PreferenceView extends BaseComponent {
 	}
 
 	// Handle toggling and reflect changes in preference page
-	handleToggle(elementName: string, state: boolean): void {
+	handleToggle(elementName, state) {
 		const inputSelector = `#${elementName} .action .switch input`;
-		const input: HTMLInputElement = document.querySelector(inputSelector);
+		const input = document.querySelector(inputSelector);
 		if (input) {
 			input.checked = state;
 		}
 	}
 
-	registerIpcs(): void {
-		ipcRenderer.on('switch-settings-nav', (_event: Event, navItem: string) => {
+	registerIpcs() {
+		ipcRenderer.on('switch-settings-nav', (event, navItem) => {
 			this.handleNavigation(navItem);
 		});
 
-		ipcRenderer.on('toggle-sidebar-setting', (_event: Event, state: boolean) => {
+		ipcRenderer.on('toggle-sidebar', (event, state) => {
 			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) => {
+		ipcRenderer.on('toggletray', (event, state) => {
 			this.handleToggle('tray-option', state);
 		});
 
-		ipcRenderer.on('toggle-dnd', (_event: Event, _state: boolean, newSettings: any) => {
+		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
 			this.handleToggle('show-notification-option', newSettings.showNotification);
 			this.handleToggle('silent-option', newSettings.silent);
 
@@ -118,9 +109,7 @@ class PreferenceView extends BaseComponent {
 	}
 }
 
-window.addEventListener('load', () => {
+window.onload = () => {
 	const preferenceView = new PreferenceView();
 	preferenceView.init();
-});
-
-export = PreferenceView;
+};

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

@@ -1,28 +1,17 @@
 'use strict';
+const { dialog } = require('electron').remote;
+const { ipcRenderer } = require('electron');
 
-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;
+const BaseComponent = require(__dirname + '/../../components/base.js');
+const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
 
 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) {
+	constructor(props) {
 		super();
 		this.props = props;
 	}
 
-	template(): string {
+	template() {
 		return `
 			<div class="settings-card">
 				<div class="server-info-left">
@@ -38,7 +27,7 @@ class ServerInfoForm extends BaseComponent {
 					</div>
 					<div class="server-info-row">
 						<div class="action red server-delete-action">
-							<span>${t.__('Disconnect')}</span>
+							<span>Disconnect</span>
 						</div>
 					</div>
 				</div>
@@ -46,35 +35,31 @@ class ServerInfoForm extends BaseComponent {
 		`;
 	}
 
-	init(): void {
+	init() {
 		this.initForm();
 		this.initActions();
 	}
 
-	initForm(): void {
+	initForm() {
 		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);
+		this.$serverInfoAlias = this.$serverInfoForm.getElementsByClassName('server-info-alias')[0];
+		this.$serverIcon = this.$serverInfoForm.getElementsByClassName('server-info-icon')[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(): void {
+	initActions() {
 		this.$deleteServerButton.addEventListener('click', () => {
 			dialog.showMessageBox({
 				type: 'warning',
-				buttons: [t.__('YES'), t.__('NO')],
+				buttons: ['YES', 'NO'],
 				defaultId: 0,
-				message: t.__('Are you sure you want to disconnect this organization?')
+				message: '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);
-					}
+					DomainUtil.removeDomain(this.props.index);
+					this.props.onChange(this.props.index);
 				}
 			});
 		});
@@ -91,6 +76,7 @@ class ServerInfoForm extends BaseComponent {
 			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
 		});
 	}
+
 }
 
-export = ServerInfoForm;
+module.exports = ServerInfoForm;

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

@@ -1,24 +1,20 @@
 'use strict';
 
-import BaseSection = require('./base-section');
-import NewServerForm = require('./new-server-form');
-import t = require('../../utils/translation-util');
+const BaseSection = require(__dirname + '/base-section.js');
+const NewServerForm = require(__dirname + '/new-server-form.js');
 
 class ServersSection extends BaseSection {
-	// TODO: TypeScript - Here props should be object type
-	props: any;
-	$newServerContainer: Element;
-	constructor(props: any) {
+	constructor(props) {
 		super();
 		this.props = props;
 	}
 
-	template(): string {
+	template() {
 		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 class="page-title">Add a Zulip organization</div>
 					<div id="new-server-container"></div>
 				</div>
 			</div>
@@ -26,20 +22,20 @@ class ServersSection extends BaseSection {
 		`;
 	}
 
-	init(): void {
+	init() {
 		this.initServers();
 	}
 
-	initServers(): void {
+	initServers() {
 		this.props.$root.innerHTML = '';
 
 		this.props.$root.innerHTML = this.template();
-		this.$newServerContainer = document.querySelector('#new-server-container');
+		this.$newServerContainer = document.getElementById('new-server-container');
 
 		this.initNewServerForm();
 	}
 
-	initNewServerForm(): void {
+	initNewServerForm() {
 		new NewServerForm({
 			$root: this.$newServerContainer,
 			onChange: this.reloadApp
@@ -47,4 +43,4 @@ class ServersSection extends BaseSection {
 	}
 }
 
-export = ServersSection;
+module.exports = ServersSection;

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

@@ -0,0 +1,322 @@
+'use strict';
+
+const BaseSection = require(__dirname + '/base-section.js');
+const shell = require('electron').shell;
+
+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>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>M</kbd></td>
+                    <td>Toggle Do Not Disturb</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>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>Shift</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 class="settings-card tip"><b><i class="material-icons md-14">settings</i>Tip: </b>These desktop app shortcuts extend the Zulip webapp's <span id="open-hotkeys-link">keyboard shortcuts</span>.</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>Shift</kbd> + <kbd>M</kbd></td>
+                    <td>Toggle Do Not Disturb</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>Shift</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 class="tip"><b><i class="material-icons md-14">lightbulb_outline</i>Tip: </b>These desktop app shortcuts extend the Zulip webapp's <span id="open-hotkeys-link">keyboard shortcuts</span>.</div>
+            </div>
+		`;
+	}
+
+	openHotkeysExternalLink() {
+		const link = 'https://zulipchat.com/help/keyboard-shortcuts';
+		const externalCreateNewOrgEl = document.getElementById('open-hotkeys-link');
+		externalCreateNewOrgEl.addEventListener('click', () => {
+			shell.openExternal(link);
+		});
+	}
+	init() {
+		this.props.$root.innerHTML = (process.platform === 'darwin') ?
+			this.templateMac() : this.templateWinLin();
+		this.openHotkeysExternalLink();
+	}
+}
+
+module.exports = ShortcutsSection;

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

@@ -1,345 +0,0 @@
-'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

@@ -0,0 +1,91 @@
+'use strict';
+
+const { ipcRenderer } = require('electron');
+const SetupSpellChecker = require('./spellchecker');
+
+const ConfigUtil = require(__dirname + '/utils/config-util.js');
+const LinkUtil = require(__dirname + '/utils/link-util.js');
+
+// 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');
+
+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');
+		});
+	}
+
+	// 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 (e) {
+		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();
+
+			lightbox.open($img);
+		}
+	});
+});
+
+// Clean up spellchecker events after you navigate away from this page;
+// otherwise, you may experience errors
+window.addEventListener('beforeunload', () => {
+	SetupSpellChecker.unsubscribeSpellChecker();
+});
+
+// electron's globalShortcut can cause unexpected results
+// so adding the reload shortcut in the old-school way
+document.addEventListener('keydown', event => {
+	if (event.code === 'F5') {
+		ipcRenderer.send('forward-message', 'hard-reload');
+	}
+});

app/renderer/js/preload.ts

@@ -1,114 +0,0 @@
-'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.js

@@ -5,7 +5,7 @@
 // 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 preventDragAndDrop = () => {
 	const preventEvents = ['dragover', 'drop'];
 	preventEvents.forEach(dragEvents => {
 		document.addEventListener(dragEvents, event => {

app/renderer/js/spellchecker.js

@@ -0,0 +1,56 @@
+'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

@@ -1,56 +0,0 @@
-'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.js

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

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

@@ -1,96 +0,0 @@
-'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

@@ -1,25 +0,0 @@
-'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

@@ -0,0 +1,82 @@
+'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

@@ -1,106 +0,0 @@
-'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

@@ -0,0 +1,31 @@
+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

@@ -1,74 +0,0 @@
-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.js

@@ -1,30 +1,17 @@
 'use strict';
 
-import ConfigUtil = require('./config-util');
+const ConfigUtil = require(__dirname + '/config-util.js');
 
-// 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 {
+function toggle() {
 	const dnd = !ConfigUtil.getConfigItem('dnd', false);
 	const dndSettingList = ['showNotification', 'silent'];
 	if (process.platform === 'win32') {
 		dndSettingList.push('flashTaskbarOnMessage');
 	}
 
-	let newSettings: Setting;
+	let newSettings;
 	if (dnd) {
-		const oldSettings: Setting = {};
+		const oldSettings = {};
 		newSettings = {};
 
 		// Iterate through the dndSettingList.
@@ -48,3 +35,7 @@ export function toggle(): Toggle {
 	ConfigUtil.setConfigItem('dnd', dnd);
 	return {dnd, newSettings};
 }
+
+module.exports = {
+	toggle
+};

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

@@ -0,0 +1,288 @@
+'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 escape = require('escape-html');
+
+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
+			return Promise.reject('This server has been added.');
+		}
+
+		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: escape(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

@@ -1,318 +0,0 @@
-'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

@@ -1,80 +0,0 @@
-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,14 +1,8 @@
 'use strict';
 
-// TODO: TypeScript - Add @types/
-import wurl = require('wurl');
+const wurl = require('wurl');
 
-let instance: null | LinkUtil = null;
-
-interface IsInternalResponse {
-	isInternalUrl: boolean;
-	isUploadsUrl: boolean;
-}
+let instance = null;
 
 class LinkUtil {
 	constructor() {
@@ -21,7 +15,7 @@ class LinkUtil {
 		return instance;
 	}
 
-	isInternal(currentUrl: string, newUrl: string): IsInternalResponse {
+	isInternal(currentUrl, newUrl) {
 		const currentDomain = wurl('hostname', currentUrl);
 		const newDomain = wurl('hostname', newUrl);
 
@@ -35,17 +29,11 @@ class LinkUtil {
 		};
 	}
 
-	isImage(url: string): boolean {
+	isImage(url) {
 		// 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();
+module.exports = new LinkUtil();

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

@@ -1,13 +1,12 @@
 '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 fs = require('fs');
+const path = require('path');
+const process = require('process');
 const remote =
-	process.type === 'renderer' ? electron.remote : electron;
+	process.type === 'renderer' ? require('electron').remote : require('electron');
+const JsonDB = require('node-json-db');
+const Logger = require('./logger-util');
 
 const logger = new Logger({
 	file: 'linux-update-util.log',
@@ -16,11 +15,10 @@ const logger = new Logger({
 
 /* To make the util runnable in both main and renderer process */
 const { dialog, app } = remote;
-let instance: null | LinuxUpdateUtil = null;
+
+let instance = null;
 
 class LinuxUpdateUtil {
-	db: JsonDB;
-
 	constructor() {
 		if (instance) {
 			return instance;
@@ -32,7 +30,7 @@ class LinuxUpdateUtil {
 		return instance;
 	}
 
-	getUpdateItem(key: string, defaultValue: any = null): any {
+	getUpdateItem(key, defaultValue = null) {
 		this.reloadDB();
 		const value = this.db.getData('/')[key];
 		if (value === undefined) {
@@ -43,18 +41,18 @@ class LinuxUpdateUtil {
 		}
 	}
 
-	setUpdateItem(key: string, value: any): void {
+	setUpdateItem(key, value) {
 		this.db.push(`/${key}`, value, true);
 		this.reloadDB();
 	}
 
-	removeUpdateItem(key: string): void {
+	removeUpdateItem(key) {
 		this.db.delete(`/${key}`);
 		this.reloadDB();
 	}
 
-	reloadDB(): void {
-		const linuxUpdateJsonPath = path.join(app.getPath('userData'), '/config/updates.json');
+	reloadDB() {
+		const linuxUpdateJsonPath = path.join(app.getPath('userData'), '/updates.json');
 		try {
 			const file = fs.readFileSync(linuxUpdateJsonPath, 'utf8');
 			JSON.parse(file);
@@ -63,7 +61,7 @@ class LinuxUpdateUtil {
 				fs.unlinkSync(linuxUpdateJsonPath);
 				dialog.showErrorBox(
 					'Error saving update notifications.',
-					'We encountered an error while saving the update notifications.'
+					'We encountered error while saving update notifications.'
 				);
 				logger.error('Error while JSON parsing updates.json: ');
 				logger.error(err);
@@ -73,4 +71,4 @@ class LinuxUpdateUtil {
 	}
 }
 
-export = new LinuxUpdateUtil();
+module.exports = new LinuxUpdateUtil();

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

@@ -0,0 +1,87 @@
+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

@@ -1,155 +0,0 @@
-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

@@ -1,11 +0,0 @@
-// 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

@@ -1,142 +0,0 @@
-'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.js

@@ -0,0 +1,54 @@
+const isOnline = require('is-online');
+
+class ReconnectUtil {
+	constructor(serverManagerView) {
+		this.serverManagerView = serverManagerView;
+		this.alreadyReloaded = false;
+	}
+
+	clearState() {
+		this.alreadyReloaded = false;
+	}
+
+	pollInternetAndReload() {
+		const pollInterval = setInterval(() => {
+			this._checkAndReload()
+				.then(status => {
+					if (status) {
+						this.alreadyReloaded = true;
+						clearInterval(pollInterval);
+					}
+				});
+		}, 1500);
+	}
+
+	_checkAndReload() {
+		return new Promise(resolve => {
+			if (!this.alreadyReloaded) { // eslint-disable-line no-negated-condition
+				isOnline()
+					.then(online => {
+						if (online) {
+							if (!this.alreadyReloaded) {
+								this.serverManagerView.reloadView();
+							}
+							console.log('You\'re back online.');
+							return resolve(true);
+						}
+
+						console.log('There is no internet connection, try checking network cables, modem and router.');
+						const errMsgHolder = document.querySelector('#description');
+						if (errMsgHolder) {
+							errMsgHolder.innerHTML = `
+										<div>You internet connection does't seem to work properly!</div>
+										</div>Verify that it works and then click try again.</div>`;
+						}
+						return resolve(false);
+					});
+			} else {
+				return resolve(true);
+			}
+		});
+	}
+}
+
+module.exports = ReconnectUtil;

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

@@ -1,67 +0,0 @@
-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

@@ -1,73 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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.js

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

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

@@ -1,29 +0,0 @@
-'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

@@ -1,35 +0,0 @@
-'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,65 +1,56 @@
 <!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>
-                        </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>
+<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="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>
 
-        <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>
+  <div id="feedback-modal">
+    <send-feedback></send-feedback>
+  </div>
+</body>
+<script src="js/main.js"></script>
+<script>require('./js/shared/preventdrag.js')</script>
+</html>

app/renderer/network.html

@@ -1,22 +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>
-    <script>require('./js/shared/preventdrag.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,19 +1,17 @@
 <!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>
-        require('./js/pages/preference/preference.js');
-        require('./js/shared/preventdrag.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 src="js/pages/preference/preference.js"></script>
+  <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/resources/messages.ts

@@ -1,50 +0,0 @@
-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();

app/translations/bg.json

@@ -1,117 +1,39 @@
 {
-	"About Zulip": "За Zulip",
-	"Actual Size": "Действителен размер",
-	"Add Custom Certificates": "Добавяне на персонализирани сертификати",
-	"Add Organization": "Добавяне на организация",
-	"Add a Zulip organization": "Добавете организация Zulip",
-	"Add custom CSS": "Добавете персонализиран CSS",
-	"Advanced": "напреднал",
-	"All the connected organizations will appear here": "Всички свързани организации ще се появят тук",
-	"Always start minimized": "Винаги започвайте да минимизирате",
-	"App Updates": "Актуализации на приложения",
-	"Appearance": "Външен вид",
-	"Application Shortcuts": "Клавишни комбинации за приложения",
-	"Are you sure you want to disconnect this organization?": "Наистина ли искате да прекъснете връзката с тази организация?",
-	"Auto hide Menu bar": "Автоматично скриване на лентата с менюта",
-	"Auto hide menu bar (Press Alt key to display)": "Автоматично скриване на лентата с менюта (натиснете клавиша Alt за показване)",
+	"About Zulip": "За Зулип",
+	"Actual Size": "Реален размер",
 	"Back": "обратно",
-	"Bounce dock on new private message": "Прескочи док в новото лично съобщение",
-	"Certificate file": "Файл за сертификат",
-	"Change": "промяна",
-	"Check for Updates": "Провери за обновления",
 	"Close": "Близо",
-	"Connect": "Свържете",
-	"Connect to another organization": "Свържете се с друга организация",
-	"Connected organizations": "Свързани организации",
 	"Copy": "копие",
-	"Copy Zulip URL": "Копирайте URL адреса на Zulip",
-	"Create a new organization": "Създайте нова организация",
 	"Cut": "Разрез",
-	"Default download location": "Място на изтегляне по подразбиране",
 	"Delete": "Изтрий",
-	"Desktop App Settings": "Настройки на приложението за работния плот",
-	"Desktop Notifications": "Известия за работния плот",
-	"Desktop Settings": "Настройки на работния плот",
-	"Disconnect": "Прекъсване на връзката",
-	"Download App Logs": "Изтеглете регистрационни файлове на приложенията",
+	"Desktop App Settings": "Настройки за настолни приложения",
 	"Edit": "редактиране",
-	"Edit Shortcuts": "Редактиране на преки пътища",
-	"Enable auto updates": "Активиране на автоматичните актуализации",
-	"Enable error reporting (requires restart)": "Активиране на отчитането за грешки (изисква се рестартиране)",
-	"Enable spellchecker (requires restart)": "Активиране на проверката на правописа (изисква се рестартиране)",
-	"Factory Reset": "Фабрично нулиране",
 	"File": "досие",
-	"Find accounts": "Намерете профили",
-	"Find accounts by email": "Намерете профили по имейл",
-	"Flash taskbar on new message": "Flash лентата на задачите в новото съобщение",
 	"Forward": "напред",
-	"Functionality": "Функционалност",
-	"General": "Общ",
-	"Get beta updates": "Изтеглете бета актуализации",
-	"Hard Reload": "Hard Reload",
+	"Hard Reload": "Трудно презареждане",
 	"Help": "Помогне",
-	"Help Center": "Помощен център",
 	"History": "история",
-	"History Shortcuts": "Преки пътища в историята",
 	"Keyboard Shortcuts": "Комбинация от клавиши",
 	"Log Out": "Излез от профила си",
-	"Log Out of Organization": "Излезте от организацията",
-	"Manual proxy configuration": "Ръчна конфигурация на прокси",
 	"Minimize": "Минимизиране",
-	"Mute all sounds from Zulip": "Заглуши всички звуци от Zulip",
-	"NO": "НЕ",
-	"Network": "мрежа",
-	"OR": "ИЛИ",
-	"Organization URL": "URL адрес на организацията",
-	"Organizations": "организации",
 	"Paste": "паста",
-	"Paste and Match Style": "Поставяне и стил на съвпадение",
-	"Proxy": "пълномощник",
-	"Proxy bypass rules": "Правила за заобикаляне на прокси",
-	"Proxy rules": "Прокси правила",
+	"Paste and Match Style": "Поставяне и съвпадение на стила",
 	"Quit": "напускам",
-	"Quit Zulip": "Прекрати Zulip",
 	"Redo": "ремонтирам",
-	"Release Notes": "Бележки към изданието",
 	"Reload": "Презареди",
-	"Report an Issue": "Подаване на сигнал за проблем",
-	"Reset App Data": "Нулиране на данни за приложения",
-	"Reset App Settings": "Нулиране на настройките на приложението",
-	"Reset Application Data": "Нулиране на данните на приложението",
-	"Save": "Запази",
+	"Report an issue...": "Подаване на сигнал за проблем ...",
+	"Reset App Settings": "Нулирайте настройките на приложението",
 	"Select All": "Избери всички",
-	"Settings": "Настройки",
-	"Shortcuts": "Shortcuts",
-	"Show App Logs": "Показване на регистрационните файлове на приложенията",
-	"Show app icon in system tray": "Показване на иконата на приложението в системната област",
-	"Show app unread badge": "Показване на непрочетената значка на приложението",
-	"Show desktop notifications": "Показване на известията на работния плот",
-	"Show downloaded files in file manager": "Показване на изтеглените файлове във файловия мениджър",
-	"Show sidebar": "Показване на страничната лента",
-	"Start app at login": "Стартирайте приложението при влизане",
-	"Switch to Next Organization": "Превключване към следваща организация",
-	"Switch to Previous Organization": "Превключване към предишна организация",
-	"These desktop app shortcuts extend the Zulip webapp's": "Тези клавишни комбинации за настолни приложения разширяват webapp на Zulip",
-	"This will delete all application data including all added accounts and preferences": "Това ще изтрие всички данни за приложения, включително всички добавени акаунти и предпочитания",
-	"Tip": "Бакшиш",
-	"Toggle DevTools for Active Tab": "Превключете DevTools за Active Tab",
+	"Show App Logs": "Показване на регистрационните файлове на приложения",
+	"Toggle DevTools for Active Tab": "Превключете DevTools за активен раздел",
 	"Toggle DevTools for Zulip App": "Превключете DevTools за Zulip App",
-	"Toggle Do Not Disturb": "Превключване Не безпокойте",
 	"Toggle Full Screen": "Превключване на цял екран",
 	"Toggle Sidebar": "Превключване на страничната лента",
-	"Toggle Tray Icon": "Превключете иконата на тава",
-	"Tools": "Инструменти",
+	"Toggle Tray Icon": "Превключване на иконата на тавата",
 	"Undo": "премахвам",
-	"Upload": "Качи",
-	"Use system proxy settings (requires restart)": "Използване на системните прокси настройки (изисква рестартиране)",
 	"View": "изглед",
-	"View Shortcuts": "Преглед на преки пътища",
 	"Window": "прозорец",
-	"Window Shortcuts": "Клавишни комбинации",
-	"YES": "ДА",
 	"Zoom In": "Увеличавам",
 	"Zoom Out": "Отдалечавам",
-	"Zulip Help": "Помощ за Zulip",
-	"keyboard shortcuts": "комбинация от клавиши",
-	"script": "писменост"
+	"Zulip Help": "Помощ за Zulip"
 }

app/translations/cs.json

@@ -1,117 +1,39 @@
 {
-	"About Zulip": "O uživateli Zulip",
+	"About Zulip": "O společnosti Zulip",
 	"Actual Size": "Aktuální velikost",
-	"Add Custom Certificates": "Přidat vlastní certifikáty",
-	"Add Organization": "Přidat organizaci",
-	"Add a Zulip organization": "Přidejte organizaci Zulip",
-	"Add custom CSS": "Přidat vlastní CSS",
-	"Advanced": "Pokročilý",
-	"All the connected organizations will appear here": "Zde se zobrazí všechny připojené organizace",
-	"Always start minimized": "Vždy začněte minimalizovat",
-	"App Updates": "Aktualizace aplikací",
-	"Appearance": "Vzhled",
-	"Application Shortcuts": "Zkratky aplikací",
-	"Are you sure you want to disconnect this organization?": "Opravdu chcete tuto organizaci odpojit?",
-	"Auto hide Menu bar": "Auto hide Menu bar",
-	"Auto hide menu bar (Press Alt key to display)": "Automaticky skrýt lištu menu (stiskněte klávesu Alt pro zobrazení)",
 	"Back": "Zadní",
-	"Bounce dock on new private message": "Bounce dock na nové soukromé zprávy",
-	"Certificate file": "Soubor certifikátu",
-	"Change": "Změna",
-	"Check for Updates": "Kontrola aktualizací",
 	"Close": "Zavřít",
-	"Connect": "Připojit",
-	"Connect to another organization": "Připojte se k jiné organizaci",
-	"Connected organizations": "Připojené organizace",
 	"Copy": "kopírovat",
-	"Copy Zulip URL": "Kopírovat adresu URL aplikace Zulip",
-	"Create a new organization": "Vytvořit novou organizaci",
 	"Cut": "Střih",
-	"Default download location": "Výchozí umístění stahování",
-	"Delete": "Smazat",
+	"Delete": "Vymazat",
 	"Desktop App Settings": "Nastavení aplikace Desktop",
-	"Desktop Notifications": "Oznámení o pracovní ploše",
-	"Desktop Settings": "Nastavení plochy",
-	"Disconnect": "Odpojit",
-	"Download App Logs": "Stáhnout App Logs",
 	"Edit": "Upravit",
-	"Edit Shortcuts": "Upravit zkratky",
-	"Enable auto updates": "Povolit automatické aktualizace",
-	"Enable error reporting (requires restart)": "Povolit hlášení chyb (vyžaduje restart)",
-	"Enable spellchecker (requires restart)": "Povolit kontrolu pravopisu (vyžaduje restartování)",
-	"Factory Reset": "Tovární nastavení",
 	"File": "Soubor",
-	"Find accounts": "Najít účty",
-	"Find accounts by email": "Najít účty e-mailem",
-	"Flash taskbar on new message": "Hlavní panel Flash na nové zprávě",
 	"Forward": "Vpřed",
-	"Functionality": "Funkčnost",
-	"General": "Všeobecné",
-	"Get beta updates": "Získejte aktualizace beta",
 	"Hard Reload": "Hard Reload",
 	"Help": "Pomoc",
-	"Help Center": "Centrum nápovědy",
 	"History": "Dějiny",
-	"History Shortcuts": "Zkratky historie",
 	"Keyboard Shortcuts": "Klávesové zkratky",
 	"Log Out": "Odhlásit se",
-	"Log Out of Organization": "Odhlásit se z organizace",
-	"Manual proxy configuration": "Ruční konfigurace proxy",
-	"Minimize": "Minimalizovat",
-	"Mute all sounds from Zulip": "Vypněte všechny zvuky ze Zulipu",
-	"NO": "NE",
-	"Network": "Síť",
-	"OR": "NEBO",
-	"Organization URL": "URL organizace",
-	"Organizations": "Organizace",
+	"Minimize": "Minimalizujte",
 	"Paste": "Vložit",
-	"Paste and Match Style": "Vložit a shodit styl",
-	"Proxy": "Proxy",
-	"Proxy bypass rules": "Proxy bypass pravidla",
-	"Proxy rules": "Proxy pravidla",
+	"Paste and Match Style": "Vložit a přizpůsobit styl",
 	"Quit": "Přestat",
-	"Quit Zulip": "Ukončete Zulip",
 	"Redo": "Předělat",
-	"Release Notes": "Poznámky k vydání",
 	"Reload": "Znovu načíst",
-	"Report an Issue": "Nahlásit problém",
-	"Reset App Data": "Resetovat data aplikace",
+	"Report an issue...": "Nahlásit problém...",
 	"Reset App Settings": "Obnovit nastavení aplikace",
-	"Reset Application Data": "Resetovat data aplikace",
-	"Save": "Uložit",
 	"Select All": "Vybrat vše",
-	"Settings": "Nastavení",
-	"Shortcuts": "Zkratky",
-	"Show App Logs": "Zobrazit protokoly aplikací",
-	"Show app icon in system tray": "Zobrazit ikonu aplikace v systémové liště",
-	"Show app unread badge": "Zobrazit nepřečtený odznak aplikace",
-	"Show desktop notifications": "Zobrazit oznámení na ploše",
-	"Show downloaded files in file manager": "Zobrazit stažené soubory ve správci souborů",
-	"Show sidebar": "Zobrazit postranní panel",
-	"Start app at login": "Spuštění aplikace při přihlášení",
-	"Switch to Next Organization": "Přepnout na další organizaci",
-	"Switch to Previous Organization": "Přepněte na předchozí organizaci",
-	"These desktop app shortcuts extend the Zulip webapp's": "Tyto klávesové zkratky pro aplikaci na ploše rozšiřují aplikaci Zulip webapp",
-	"This will delete all application data including all added accounts and preferences": "Tím odstraníte všechna data aplikace včetně všech přidaných účtů a předvoleb",
-	"Tip": "Tip",
-	"Toggle DevTools for Active Tab": "Přepnout DevTools pro Active Tab",
-	"Toggle DevTools for Zulip App": "Přepnout DevTools pro Zulip App",
-	"Toggle Do Not Disturb": "Přepnout Do Nerušit",
+	"Show App Logs": "Zobrazit protokoly aplikace",
+	"Toggle DevTools for Active Tab": "Přepínač DevTools pro aktivní kartu",
+	"Toggle DevTools for Zulip App": "Přepnout nástroj DevTools pro aplikaci Zulip App",
 	"Toggle Full Screen": "Přepnout na celou obrazovku",
 	"Toggle Sidebar": "Přepnout postranní panel",
 	"Toggle Tray Icon": "Přepnout ikonu zásobníku",
-	"Tools": "Nástroje",
 	"Undo": "vrátit",
-	"Upload": "nahrát",
-	"Use system proxy settings (requires restart)": "Použít nastavení proxy serveru (vyžaduje restart)",
 	"View": "Pohled",
-	"View Shortcuts": "Zobrazit zástupce",
 	"Window": "Okno",
-	"Window Shortcuts": "Klávesové zkratky",
-	"YES": "ANO",
 	"Zoom In": "Přiblížit",
 	"Zoom Out": "Oddálit",
-	"Zulip Help": "Nápověda Zulip",
-	"keyboard shortcuts": "klávesové zkratky",
-	"script": "skript"
+	"Zulip Help": "Zulip Nápověda"
 }

app/translations/de.json

@@ -1,117 +1,39 @@
 {
 	"About Zulip": "Über Zulip",
 	"Actual Size": "Tatsächliche Größe",
-	"Add Custom Certificates": "Benutzerdefinierte Zertifikate hinzufügen",
-	"Add Organization": "Organisation hinzufügen",
-	"Add a Zulip organization": "Fügen Sie eine Zulip-Organisation hinzu",
-	"Add custom CSS": "Fügen Sie benutzerdefiniertes CSS hinzu",
-	"Advanced": "Fortgeschritten",
-	"All the connected organizations will appear here": "Alle verbundenen Organisationen werden hier angezeigt",
-	"Always start minimized": "Immer minimiert anfangen",
-	"App Updates": "App-Updates",
-	"Appearance": "Aussehen",
-	"Application Shortcuts": "Anwendungsverknüpfungen",
-	"Are you sure you want to disconnect this organization?": "Möchten Sie diese Organisation wirklich trennen?",
-	"Auto hide Menu bar": "Menüleiste automatisch ausblenden",
-	"Auto hide menu bar (Press Alt key to display)": "Menüleiste automatisch ausblenden (Drücken Sie die Alt-Taste, um anzuzeigen)",
 	"Back": "Zurück",
-	"Bounce dock on new private message": "Bounce-Dock für neue private Nachricht",
-	"Certificate file": "Zertifikatsdatei",
-	"Change": "Veränderung",
-	"Check for Updates": "Auf Updates prüfen",
 	"Close": "Schließen",
-	"Connect": "Verbinden",
-	"Connect to another organization": "Stellen Sie eine Verbindung zu einer anderen Organisation her",
-	"Connected organizations": "Verbundene Organisationen",
 	"Copy": "Kopieren",
-	"Copy Zulip URL": "Zulip-URL kopieren",
-	"Create a new organization": "Erstellen Sie eine neue Organisation",
 	"Cut": "Schnitt",
-	"Default download location": "Standard-Download-Speicherort",
 	"Delete": "Löschen",
-	"Desktop App Settings": "Desktop App-Einstellungen",
-	"Desktop Notifications": "Desktop-Benachrichtigungen",
-	"Desktop Settings": "Desktop-Einstellungen",
-	"Disconnect": "Trennen",
-	"Download App Logs": "App-Protokolle herunterladen",
+	"Desktop App Settings": "Desktop App Einstellungen",
 	"Edit": "Bearbeiten",
-	"Edit Shortcuts": "Verknüpfungen bearbeiten",
-	"Enable auto updates": "Automatische Updates aktivieren",
-	"Enable error reporting (requires restart)": "Fehlerberichterstattung aktivieren (Neustart erforderlich)",
-	"Enable spellchecker (requires restart)": "Rechtschreibprüfung aktivieren (Neustart erforderlich)",
-	"Factory Reset": "Werkseinstellungen zurückgesetzt",
 	"File": "Datei",
-	"Find accounts": "Konten suchen",
-	"Find accounts by email": "Finden Sie Konten per E-Mail",
-	"Flash taskbar on new message": "Flash-Taskleiste bei neuer Nachricht",
 	"Forward": "Nach vorne",
-	"Functionality": "Funktionalität",
-	"General": "Allgemeines",
-	"Get beta updates": "Erhalten Sie Beta-Updates",
-	"Hard Reload": "Festes Nachladen",
+	"Hard Reload": "Hard Reload",
 	"Help": "Hilfe",
-	"Help Center": "Hilfezentrum",
 	"History": "Geschichte",
-	"History Shortcuts": "Verlaufsverknüpfungen",
 	"Keyboard Shortcuts": "Tastatürkürzel",
 	"Log Out": "Ausloggen",
-	"Log Out of Organization": "Aus Organisation ausloggen",
-	"Manual proxy configuration": "Manuelle Proxy-Konfiguration",
 	"Minimize": "Minimieren",
-	"Mute all sounds from Zulip": "Schaltet alle Sounds von Zulip stumm",
-	"NO": "NEIN",
-	"Network": "Netzwerk",
-	"OR": "ODER",
-	"Organization URL": "Organisations-URL",
-	"Organizations": "Organisationen",
 	"Paste": "Einfügen",
-	"Paste and Match Style": "Einfügen und Format anpassen",
-	"Proxy": "Proxy",
-	"Proxy bypass rules": "Proxy-Umgehungsregeln",
-	"Proxy rules": "Proxy-Regeln",
+	"Paste and Match Style": "Einfügen und Anpassen von Stilen",
 	"Quit": "Verlassen",
-	"Quit Zulip": "Beenden Sie Zulip",
-	"Redo": "Redo",
-	"Release Notes": "Versionshinweise",
+	"Redo": "Wiederholen",
 	"Reload": "Neu laden",
-	"Report an Issue": "Ein Problem melden",
-	"Reset App Data": "App-Daten zurücksetzen",
+	"Report an issue...": "Ein Problem melden...",
 	"Reset App Settings": "App-Einstellungen zurücksetzen",
-	"Reset Application Data": "Anwendungsdaten zurücksetzen",
-	"Save": "sparen",
 	"Select All": "Wählen Sie Alle",
-	"Settings": "die Einstellungen",
-	"Shortcuts": "Verknüpfungen",
-	"Show App Logs": "App-Protokolle anzeigen",
-	"Show app icon in system tray": "App-Symbol in der Taskleiste anzeigen",
-	"Show app unread badge": "Zeige App ungelesenen Badge",
-	"Show desktop notifications": "Desktop-Benachrichtigungen anzeigen",
-	"Show downloaded files in file manager": "Heruntergeladene Dateien im Dateimanager anzeigen",
-	"Show sidebar": "Seitenleiste anzeigen",
-	"Start app at login": "App beim Login starten",
-	"Switch to Next Organization": "Wechseln Sie zur nächsten Organisation",
-	"Switch to Previous Organization": "Zur vorherigen Organisation wechseln",
-	"These desktop app shortcuts extend the Zulip webapp's": "Diese Desktop-App-Verknüpfungen erweitern die Zulip-Webanwendungen",
-	"This will delete all application data including all added accounts and preferences": "Dadurch werden alle Anwendungsdaten einschließlich aller hinzugefügten Konten und Einstellungen gelöscht",
-	"Tip": "Spitze",
-	"Toggle DevTools for Active Tab": "DevTools für aktive Registerkarte umschalten",
-	"Toggle DevTools for Zulip App": "DevTools für Zulip App umschalten",
-	"Toggle Do Not Disturb": "Nicht stören umschalten",
+	"Show App Logs": "App-Logs anzeigen",
+	"Toggle DevTools for Active Tab": "Schalten Sie DevTools für Active Tab ein",
+	"Toggle DevTools for Zulip App": "Umschalt DevTools für Zulip App",
 	"Toggle Full Screen": "Vollbild umschalten",
-	"Toggle Sidebar": "Seitenleiste umschalten",
-	"Toggle Tray Icon": "Taskleistensymbol umschalten",
-	"Tools": "Werkzeuge",
+	"Toggle Sidebar": "Toggle Seitenleiste",
+	"Toggle Tray Icon": "Toggle Tray-Symbol",
 	"Undo": "Rückgängig machen",
-	"Upload": "Hochladen",
-	"Use system proxy settings (requires restart)": "System-Proxy-Einstellungen verwenden (Neustart erforderlich)",
 	"View": "Aussicht",
-	"View Shortcuts": "Verknüpfungen anzeigen",
 	"Window": "Fenster",
-	"Window Shortcuts": "Fensterverknüpfungen",
-	"YES": "JA",
 	"Zoom In": "Hineinzoomen",
 	"Zoom Out": "Rauszoomen",
-	"Zulip Help": "Zulip-Hilfe",
-	"keyboard shortcuts": "Tastatürkürzel",
-	"script": "Skript"
+	"Zulip Help": "Zulip Hilfe"
 }

app/translations/en-US.json

@@ -1,108 +0,0 @@
-{
-	"File": "File",
-	"Add Organization": "Add Organization",
-	"Toggle Do Not Disturb": "Toggle Do Not Disturb",
-	"Desktop Settings": "Desktop Settings",
-	"Keyboard Shortcuts": "Keyboard Shortcuts",
-	"Copy Zulip URL": "Copy Zulip URL",
-	"Log Out of Organization": "Log Out of Organization",
-	"Minimize": "Minimize",
-	"Close": "Close",
-	"Quit": "Quit",
-	"Edit": "Edit",
-	"Undo": "Undo",
-	"Redo": "Redo",
-	"Cut": "Cut",
-	"Copy": "Copy",
-	"Paste": "Paste",
-	"Paste and Match Style": "Paste and Match Style",
-	"Select All": "Select All",
-	"View": "View",
-	"Reload": "Reload",
-	"Hard Reload": "Hard Reload",
-	"Toggle Full Screen": "Toggle Full Screen",
-	"Zoom In": "Zoom In",
-	"Zoom Out": "Zoom Out",
-	"Actual Size": "Actual Size",
-	"Toggle Tray Icon": "Toggle Tray Icon",
-	"Toggle Sidebar": "Toggle Sidebar",
-	"Auto hide Menu bar": "Auto hide Menu bar",
-	"History": "History",
-	"Back": "Back",
-	"Forward": "Forward",
-	"Window": "Window",
-	"Tools": "Tools",
-	"Check for Updates": "Check for Updates",
-	"Release Notes": "Release Notes",
-	"Factory Reset": "Factory Reset",
-	"Download App Logs": "Download App Logs",
-	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
-	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
-	"Help": "Help",
-	"About Zulip": "About Zulip",
-	"Help Center": "Help Center",
-	"Report an Issue": "Report an Issue",
-	"Switch to Next Organization": "Switch to Next Organization",
-	"Switch to Previous Organization": "Switch to Previous Organization",
-	"General": "General",
-	"Network": "Network",
-	"AddServer": "AddServer",
-	"Organizations": "Organizations",
-	"Shortcuts": "Shortcuts",
-	"Appearance": "Appearance",
-	"Show app icon in system tray": "Show app icon in system tray",
-	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)",
-	"Show sidebar": "Show sidebar",
-	"Show app unread badge": "Show app unread badge",
-	"Bounce dock on new private message": "Bounce dock on new private message",
-	"Flash taskbar on new message": "Flash taskbar on new message",
-	"Desktop Notifications": "Desktop Notifications",
-	"Show desktop notifications": "Show desktop notifications",
-	"Mute all sounds from Zulip": "Mute all sounds from Zulip",
-	"App Updates": "App Updates",
-	"Enable auto updates": "Enable auto updates",
-	"Get beta updates": "Get beta updates",
-	"Functionality": "Functionality",
-	"Start app at login": "Start app at login",
-	"Always start minimized": "Always start minimized",
-	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)",
-	"Advanced": "Advanced",
-	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)",
-	"Show downloaded files in file manager": "Show downloaded files in file manager",
-	"Add custom CSS": "Add custom CSS",
-	"Upload": "Upload",
-	"Delete": "Delete",
-	"Default download location": "Default download location",
-	"Change": "Change",
-	"Reset Application Data": "Reset Application Data",
-	"This will delete all application data including all added accounts and preferences": "This will delete all application data including all added accounts and preferences",
-	"Reset App Data": "Reset App Data",
-	"Proxy": "Proxy",
-	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)",
-	"Manual proxy configuration": "Manual proxy configuration",
-	"script": "script",
-	"Proxy rules": "Proxy rules",
-	"Proxy bypass rules": "Proxy bypass rules",
-	"Save": "Save",
-	"Connected organizations": "Connected organizations",
-	"All the connected orgnizations will appear here.": "All the connected orgnizations will appear here.",
-	"Connect to another organization": "Connect to another organization",
-	"Add Custom Certificates": "Add Custom Certificates",
-	"Find accounts by email": "Find accounts by email",
-	"All the connected orgnizations will appear here": "All the connected orgnizations will appear here",
-	"Disconnect": "Disconnect",
-	"Organization URL": "Organization URL",
-	"Certificate file": "Certificate file",
-	"Find accounts": "Find accounts",
-	"Tip": "Tip",
-	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's",
-	"keyboard shortcuts": "keyboard shortcuts",
-	"Application Shortcuts": "Application Shortcuts",
-	"Settings": "Settings",
-	"Log Out": "Log Out",
-	"Quit Zulip": "Quit Zulip",
-	"Edit Shortcuts": "Edit Shortcuts",
-	"View Shortcuts": "View Shortcuts",
-	"History Shortcuts": "History Shortcuts",
-	"Window Shortcuts": "Window Shortcuts"
-}

app/translations/en.json

@@ -1,117 +1,39 @@
 {
 	"About Zulip": "About Zulip",
 	"Actual Size": "Actual Size",
-	"Add Custom Certificates": "Add Custom Certificates",
-	"Add Organization": "Add Organization",
-	"Add a Zulip organization": "Add a Zulip organization",
-	"Add custom CSS": "Add custom CSS",
-	"Advanced": "Advanced",
-	"All the connected organizations will appear here": "All the connected organizations will appear here",
-	"Always start minimized": "Always start minimized",
-	"App Updates": "App Updates",
-	"Appearance": "Appearance",
-	"Application Shortcuts": "Application Shortcuts",
-	"Are you sure you want to disconnect this organization?": "Are you sure you want to disconnect this organization?",
-	"Auto hide Menu bar": "Auto hide Menu bar",
-	"Auto hide menu bar (Press Alt key to display)": "Auto hide menu bar (Press Alt key to display)",
 	"Back": "Back",
-	"Bounce dock on new private message": "Bounce dock on new private message",
-	"Certificate file": "Certificate file",
-	"Change": "Change",
-	"Check for Updates": "Check for Updates",
 	"Close": "Close",
-	"Connect": "Connect",
-	"Connect to another organization": "Connect to another organization",
-	"Connected organizations": "Connected organizations",
 	"Copy": "Copy",
-	"Copy Zulip URL": "Copy Zulip URL",
-	"Create a new organization": "Create a new organization",
 	"Cut": "Cut",
-	"Default download location": "Default download location",
 	"Delete": "Delete",
 	"Desktop App Settings": "Desktop App Settings",
-	"Desktop Notifications": "Desktop Notifications",
-	"Desktop Settings": "Desktop Settings",
-	"Disconnect": "Disconnect",
-	"Download App Logs": "Download App Logs",
 	"Edit": "Edit",
-	"Edit Shortcuts": "Edit Shortcuts",
-	"Enable auto updates": "Enable auto updates",
-	"Enable error reporting (requires restart)": "Enable error reporting (requires restart)",
-	"Enable spellchecker (requires restart)": "Enable spellchecker (requires restart)",
-	"Factory Reset": "Factory Reset",
 	"File": "File",
-	"Find accounts": "Find accounts",
-	"Find accounts by email": "Find accounts by email",
-	"Flash taskbar on new message": "Flash taskbar on new message",
 	"Forward": "Forward",
-	"Functionality": "Functionality",
-	"General": "General",
-	"Get beta updates": "Get beta updates",
 	"Hard Reload": "Hard Reload",
 	"Help": "Help",
-	"Help Center": "Help Center",
 	"History": "History",
-	"History Shortcuts": "History Shortcuts",
 	"Keyboard Shortcuts": "Keyboard Shortcuts",
 	"Log Out": "Log Out",
-	"Log Out of Organization": "Log Out of Organization",
-	"Manual proxy configuration": "Manual proxy configuration",
 	"Minimize": "Minimize",
-	"Mute all sounds from Zulip": "Mute all sounds from Zulip",
-	"NO": "NO",
-	"Network": "Network",
-	"OR": "OR",
-	"Organization URL": "Organization URL",
-	"Organizations": "Organizations",
 	"Paste": "Paste",
 	"Paste and Match Style": "Paste and Match Style",
-	"Proxy": "Proxy",
-	"Proxy bypass rules": "Proxy bypass rules",
-	"Proxy rules": "Proxy rules",
 	"Quit": "Quit",
-	"Quit Zulip": "Quit Zulip",
 	"Redo": "Redo",
-	"Release Notes": "Release Notes",
 	"Reload": "Reload",
-	"Report an Issue": "Report an Issue",
-	"Reset App Data": "Reset App Data",
+	"Report an issue...": "Report an issue...",
 	"Reset App Settings": "Reset App Settings",
-	"Reset Application Data": "Reset Application Data",
-	"Save": "Save",
 	"Select All": "Select All",
-	"Settings": "Settings",
-	"Shortcuts": "Shortcuts",
 	"Show App Logs": "Show App Logs",
-	"Show app icon in system tray": "Show app icon in system tray",
-	"Show app unread badge": "Show app unread badge",
-	"Show desktop notifications": "Show desktop notifications",
-	"Show downloaded files in file manager": "Show downloaded files in file manager",
-	"Show sidebar": "Show sidebar",
-	"Start app at login": "Start app at login",
-	"Switch to Next Organization": "Switch to Next Organization",
-	"Switch to Previous Organization": "Switch to Previous Organization",
-	"These desktop app shortcuts extend the Zulip webapp's": "These desktop app shortcuts extend the Zulip webapp's",
-	"This will delete all application data including all added accounts and preferences": "This will delete all application data including all added accounts and preferences",
-	"Tip": "Tip",
 	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
 	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
-	"Toggle Do Not Disturb": "Toggle Do Not Disturb",
 	"Toggle Full Screen": "Toggle Full Screen",
 	"Toggle Sidebar": "Toggle Sidebar",
 	"Toggle Tray Icon": "Toggle Tray Icon",
-	"Tools": "Tools",
 	"Undo": "Undo",
-	"Upload": "Upload",
-	"Use system proxy settings (requires restart)": "Use system proxy settings (requires restart)",
 	"View": "View",
-	"View Shortcuts": "View Shortcuts",
 	"Window": "Window",
-	"Window Shortcuts": "Window Shortcuts",
-	"YES": "YES",
 	"Zoom In": "Zoom In",
 	"Zoom Out": "Zoom Out",
-	"Zulip Help": "Zulip Help",
-	"keyboard shortcuts": "keyboard shortcuts",
-	"script": "script"
+	"Zulip Help": "Zulip Help"
 }

app/translations/es.json

@@ -1,117 +1,39 @@
 {
 	"About Zulip": "Acerca de Zulip",
 	"Actual Size": "Tamaño real",
-	"Add Custom Certificates": "Añadir certificados personalizados",
-	"Add Organization": "Añadir organización",
-	"Add a Zulip organization": "Añadir una organización Zulip",
-	"Add custom CSS": "Añadir CSS personalizado",
-	"Advanced": "Avanzado",
-	"All the connected organizations will appear here": "Todas las organizaciones conectadas aparecerán aquí.",
-	"Always start minimized": "Siempre empezar minimizado",
-	"App Updates": "Actualizaciones de la aplicación",
-	"Appearance": "Apariencia",
-	"Application Shortcuts": "Atajos de aplicación",
-	"Are you sure you want to disconnect this organization?": "¿Estás seguro de que quieres desconectar esta organización?",
-	"Auto hide Menu bar": "Ocultar automáticamente la barra de menú",
-	"Auto hide menu bar (Press Alt key to display)": "Ocultar automáticamente la barra de menú (presionar la tecla Alt para mostrar)",
 	"Back": "Espalda",
-	"Bounce dock on new private message": "Bounce dock en nuevo mensaje privado",
-	"Certificate file": "Archivo de certificado",
-	"Change": "Cambio",
-	"Check for Updates": "Buscar actualizaciones",
-	"Close": "Cerrar",
-	"Connect": "Conectar",
-	"Connect to another organization": "Conectarse a otra organización",
-	"Connected organizations": "Organizaciones conectadas",
+	"Close": "Cerca",
 	"Copy": "Dupdo",
-	"Copy Zulip URL": "Copiar URL de Zulip",
-	"Create a new organization": "Crear una nueva organización",
 	"Cut": "Cortar",
-	"Default download location": "Ubicación de descarga predeterminada",
 	"Delete": "Borrar",
 	"Desktop App Settings": "Configuración de la aplicación de escritorio",
-	"Desktop Notifications": "Notificaciones de escritorio",
-	"Desktop Settings": "Configuraciones de escritorio",
-	"Disconnect": "Desconectar",
-	"Download App Logs": "Descargar App Logs",
 	"Edit": "Editar",
-	"Edit Shortcuts": "Editar accesos directos",
-	"Enable auto updates": "Habilitar actualizaciones automáticas",
-	"Enable error reporting (requires restart)": "Habilitar informes de errores (requiere reinicio)",
-	"Enable spellchecker (requires restart)": "Habilitar el corrector ortográfico (requiere reinicio)",
-	"Factory Reset": "Restablecimiento de fábrica",
-	"File": "Expediente",
-	"Find accounts": "Encontrar cuentas",
-	"Find accounts by email": "Encuentra cuentas por correo electrónico",
-	"Flash taskbar on new message": "Flash barra de tareas en nuevo mensaje",
+	"File": "Archivo",
 	"Forward": "Adelante",
-	"Functionality": "Funcionalidad",
-	"General": "General",
-	"Get beta updates": "Recibe actualizaciones beta",
-	"Hard Reload": "Recarga dura",
+	"Hard Reload": "Recargar duro",
 	"Help": "Ayuda",
-	"Help Center": "Centro de ayuda",
 	"History": "Historia",
-	"History Shortcuts": "Atajos de historia",
 	"Keyboard Shortcuts": "Atajos de teclado",
 	"Log Out": "Cerrar sesión",
-	"Log Out of Organization": "Salir de la organización",
-	"Manual proxy configuration": "Configuración de proxy manual",
 	"Minimize": "Minimizar",
-	"Mute all sounds from Zulip": "Silencia todos los sonidos de Zulip",
-	"NO": "NO",
-	"Network": "Red",
-	"OR": "O",
-	"Organization URL": "URL de la organización",
-	"Organizations": "Organizaciones",
 	"Paste": "Pegar",
 	"Paste and Match Style": "Pegar y combinar estilo",
-	"Proxy": "Apoderado",
-	"Proxy bypass rules": "Reglas de omisión de proxy",
-	"Proxy rules": "Reglas de proxy",
 	"Quit": "Dejar",
-	"Quit Zulip": "Dejar Zulip",
 	"Redo": "Rehacer",
-	"Release Notes": "Notas de lanzamiento",
 	"Reload": "Recargar",
-	"Report an Issue": "Reportar un problema",
-	"Reset App Data": "Restablecer datos de la aplicación",
-	"Reset App Settings": "Restablecer la configuración de la aplicación",
-	"Reset Application Data": "Restablecer datos de aplicación",
-	"Save": "Salvar",
+	"Report an issue...": "Reportar un problema...",
+	"Reset App Settings": "Restablecer configuraciones",
 	"Select All": "Seleccionar todo",
-	"Settings": "Ajustes",
-	"Shortcuts": "Atajos",
 	"Show App Logs": "Mostrar registros de aplicaciones",
-	"Show app icon in system tray": "Mostrar icono de la aplicación en la bandeja del sistema",
-	"Show app unread badge": "Mostrar la aplicación de placa sin leer",
-	"Show desktop notifications": "Mostrar notificaciones de escritorio",
-	"Show downloaded files in file manager": "Mostrar los archivos descargados en el administrador de archivos",
-	"Show sidebar": "Mostrar barra lateral",
-	"Start app at login": "Iniciar la aplicación al iniciar sesión",
-	"Switch to Next Organization": "Cambiar a la siguiente organización",
-	"Switch to Previous Organization": "Cambiar a la organización anterior",
-	"These desktop app shortcuts extend the Zulip webapp's": "Estos accesos directos de aplicaciones de escritorio extienden las aplicaciones web de Zulip.",
-	"This will delete all application data including all added accounts and preferences": "Esto eliminará todos los datos de la aplicación, incluidas todas las cuentas y preferencias agregadas.",
-	"Tip": "Propina",
 	"Toggle DevTools for Active Tab": "Alternar DevTools para Active Tab",
-	"Toggle DevTools for Zulip App": "Alternar DevTools para Zulip App",
-	"Toggle Do Not Disturb": "Alternar No molestar",
+	"Toggle DevTools for Zulip App": "Alternar DevTools para la aplicación Zulip",
 	"Toggle Full Screen": "Alternar pantalla completa",
 	"Toggle Sidebar": "Alternar barra lateral",
-	"Toggle Tray Icon": "Icono de bandeja de palanca",
-	"Tools": "Herramientas",
+	"Toggle Tray Icon": "Alternar el icono de la bandeja",
 	"Undo": "Deshacer",
-	"Upload": "Subir",
-	"Use system proxy settings (requires restart)": "Usar la configuración del proxy del sistema (requiere reinicio)",
 	"View": "Ver",
-	"View Shortcuts": "Ver accesos directos",
 	"Window": "Ventana",
-	"Window Shortcuts": "Atajos de ventana",
-	"YES": "SÍ",
 	"Zoom In": "Acercarse",
 	"Zoom Out": "Disminuir el zoom",
-	"Zulip Help": "Ayuda de Zulip",
-	"keyboard shortcuts": "atajos de teclado",
-	"script": "guión"
+	"Zulip Help": "Ayuda de Zulip"
 }

app/translations/fr.json

@@ -1,117 +1,39 @@
 {
 	"About Zulip": "À propos de Zulip",
 	"Actual Size": "Taille actuelle",
-	"Add Custom Certificates": "Ajouter des certificats personnalisés",
-	"Add Organization": "Ajouter une organisation",
-	"Add a Zulip organization": "Ajouter une organisation Zulip",
-	"Add custom CSS": "Ajouter un CSS personnalisé",
-	"Advanced": "Avancée",
-	"All the connected organizations will appear here": "Toutes les organisations connectées apparaîtront ici",
-	"Always start minimized": "Toujours commencer minimisé",
-	"App Updates": "Mises à jour de l'application",
-	"Appearance": "Apparence",
-	"Application Shortcuts": "Raccourcis d'application",
-	"Are you sure you want to disconnect this organization?": "Êtes-vous sûr de vouloir déconnecter cette organisation?",
-	"Auto hide Menu bar": "Masquer automatiquement la barre de menus",
-	"Auto hide menu bar (Press Alt key to display)": "Masquer automatiquement la barre de menu (appuyez sur la touche Alt pour afficher)",
-	"Back": "Retour",
-	"Bounce dock on new private message": "Bounce Dock sur un nouveau message privé",
-	"Certificate file": "Dossier de certificat",
-	"Change": "Changement",
-	"Check for Updates": "Vérifier les mises à jour",
+	"Back": "Arrière",
 	"Close": "Fermer",
-	"Connect": "Relier",
-	"Connect to another organization": "Se connecter à une autre organisation",
-	"Connected organizations": "Organisations connectées",
 	"Copy": "Copie",
-	"Copy Zulip URL": "Copier l'URL Zulip",
-	"Create a new organization": "Créer une nouvelle organisation",
 	"Cut": "Couper",
-	"Default download location": "Emplacement de téléchargement par défaut",
 	"Delete": "Effacer",
 	"Desktop App Settings": "Paramètres de l'application de bureau",
-	"Desktop Notifications": "Notifications de bureau",
-	"Desktop Settings": "Paramètres du bureau",
-	"Disconnect": "Déconnecter",
-	"Download App Logs": "Télécharger les journaux d'application",
 	"Edit": "modifier",
-	"Edit Shortcuts": "Modifier les raccourcis",
-	"Enable auto updates": "Activer les mises à jour automatiques",
-	"Enable error reporting (requires restart)": "Activer le signalement des erreurs (nécessite un redémarrage)",
-	"Enable spellchecker (requires restart)": "Activer le correcteur orthographique (nécessite un redémarrage)",
-	"Factory Reset": "Retour aux paramètres d'usine",
 	"File": "Fichier",
-	"Find accounts": "Trouver des comptes",
-	"Find accounts by email": "Trouver des comptes par email",
-	"Flash taskbar on new message": "Barre de tâches Flash sur un nouveau message",
 	"Forward": "Vers l'avant",
-	"Functionality": "La fonctionnalité",
-	"General": "Général",
-	"Get beta updates": "Obtenir les mises à jour bêta",
 	"Hard Reload": "Rechargement dur",
 	"Help": "Aidez-moi",
-	"Help Center": "Centre d'aide",
-	"History": "L'histoire",
-	"History Shortcuts": "Raccourcis Histoire",
+	"History": "Histoire",
 	"Keyboard Shortcuts": "Raccourcis clavier",
 	"Log Out": "Connectez - Out",
-	"Log Out of Organization": "Déconnexion de l'organisation",
-	"Manual proxy configuration": "Configuration manuelle du proxy",
 	"Minimize": "Minimiser",
-	"Mute all sounds from Zulip": "Couper tous les sons de Zulip",
-	"NO": "NON",
-	"Network": "Réseau",
-	"OR": "OU",
-	"Organization URL": "URL de l'organisation",
-	"Organizations": "Les organisations",
 	"Paste": "Coller",
 	"Paste and Match Style": "Coller et assortir le style",
-	"Proxy": "Procuration",
-	"Proxy bypass rules": "Règles de contournement des procurations",
-	"Proxy rules": "Règles de procuration",
 	"Quit": "Quitter",
-	"Quit Zulip": "Quittez Zulip",
 	"Redo": "Refaire",
-	"Release Notes": "Notes de version",
 	"Reload": "Recharger",
-	"Report an Issue": "Signaler un problème",
-	"Reset App Data": "Réinitialiser les données de l'application",
-	"Reset App Settings": "Réinitialiser les paramètres de l'application",
-	"Reset Application Data": "Réinitialiser les données d'application",
-	"Save": "sauvegarder",
+	"Report an issue...": "Signaler un problème...",
+	"Reset App Settings": "Réinitialiser les paramètres",
 	"Select All": "Tout sélectionner",
-	"Settings": "Réglages",
-	"Shortcuts": "Raccourcis",
-	"Show App Logs": "Afficher les journaux d'application",
-	"Show app icon in system tray": "Afficher l'icône de l'application dans la barre d'état système",
-	"Show app unread badge": "Afficher le badge non lu de l'application",
-	"Show desktop notifications": "Afficher les notifications du bureau",
-	"Show downloaded files in file manager": "Afficher les fichiers téléchargés dans le gestionnaire de fichiers",
-	"Show sidebar": "Afficher la barre latérale",
-	"Start app at login": "Lancer l'application à la connexion",
-	"Switch to Next Organization": "Passer à l'organisation suivante",
-	"Switch to Previous Organization": "Passer à l'organisation précédente",
-	"These desktop app shortcuts extend the Zulip webapp's": "Ces raccourcis d’applications de bureau étendent les applications Web de Zulip.",
-	"This will delete all application data including all added accounts and preferences": "Cela supprimera toutes les données de l'application, y compris tous les comptes et préférences ajoutés.",
-	"Tip": "Pointe",
+	"Show App Logs": "Afficher les journaux d'applications",
 	"Toggle DevTools for Active Tab": "Basculer DevTools pour l'onglet actif",
-	"Toggle DevTools for Zulip App": "Basculer DevTools pour Zulip App",
-	"Toggle Do Not Disturb": "Basculer ne pas déranger",
+	"Toggle DevTools for Zulip App": "Basculer DevTools pour l'application Zulip",
 	"Toggle Full Screen": "Basculer en plein écran",
 	"Toggle Sidebar": "Basculer la barre latérale",
-	"Toggle Tray Icon": "Basculer l'icône du plateau",
-	"Tools": "Outils",
+	"Toggle Tray Icon": "Toggle Tray Icône",
 	"Undo": "annuler",
-	"Upload": "Télécharger",
-	"Use system proxy settings (requires restart)": "Utiliser les paramètres proxy du système (nécessite un redémarrage)",
 	"View": "Vue",
-	"View Shortcuts": "Afficher les raccourcis",
-	"Window": "La fenêtre",
-	"Window Shortcuts": "Raccourcis de la fenêtre",
-	"YES": "OUI",
+	"Window": "Fenêtre",
 	"Zoom In": "Agrandir",
 	"Zoom Out": "Dézoomer",
-	"Zulip Help": "Aide Zulip",
-	"keyboard shortcuts": "Raccourcis clavier",
-	"script": "scénario"
+	"Zulip Help": "Aide Zulip"
 }