docs: Add release notes for v3.1.0-beta.

Reads .env file in root folder of repo to get Sentry DSN for builds.

.editorconfig

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

.gitignore

@@ -36,3 +36,6 @@ config.gypi
 # tests/package.json
 
 .python-version
+
+# Ignore all the typescript compiled files
+app/**/*.js

app/main/autoupdater.ts

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

app/main/index.ts

@@ -1,21 +1,25 @@
 'use strict';
-const path = require('path');
-const fs = require('fs');
-
-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 { setAutoLaunch } = require('./startup');
+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;
 
-const BadgeSettings = require('./../renderer/js/pages/preference/badge-settings.js');
-const ConfigUtil = require('./../renderer/js/utils/config-util.js');
-const ProxyUtil = require('./../renderer/js/utils/proxy-util.js');
-const { sentryInit } = require('./../renderer/js/utils/sentry-util.js');
+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
@@ -24,8 +28,8 @@ if (isDev) {
 }
 
 // Prevent window being garbage collected
-let mainWindow;
-let badgeCount;
+let mainWindow: Electron.BrowserWindow;
+let badgeCount: number;
 
 let isQuitting = false;
 
@@ -49,20 +53,20 @@ if (singleInstanceLock) {
 
 const APP_ICON = path.join(__dirname, '../resources', 'Icon');
 
-const iconPath = () => {
+const iconPath = (): string => {
 	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
 };
 
-function createMainWindow() {
+function createMainWindow(): Electron.BrowserWindow {
 	// Load the previous state with fallback to defaults
-	const mainWindowState = windowStateKeeper({
+	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
-	global.mainWindowState = mainWindowState;
+	globalPatched.mainWindowState = mainWindowState;
 
 	const win = new electron.BrowserWindow({
 		// This settings needs to be saved in config
@@ -134,7 +138,7 @@ app.disableHardwareAcceleration();
 app.commandLine.appendSwitch('force-color-profile', 'srgb');
 
 // eslint-disable-next-line max-params
-app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
+app.on('certificate-error', (event: Event, _webContents: Electron.WebContents, _url: string, _error: string, _certificate: any, callback) => {
 	event.preventDefault();
 	callback(true);
 });
@@ -146,7 +150,7 @@ app.on('activate', () => {
 });
 
 app.on('ready', () => {
-	appMenu.setMenu({
+	AppMenu.setMenu({
 		tabs: []
 	});
 	mainWindow = createMainWindow();
@@ -234,7 +238,7 @@ app.on('ready', () => {
 	});
 
 	ipcMain.on('clear-app-settings', () => {
-		global.mainWindowState.unmanage(mainWindow);
+		globalPatched.mainWindowState.unmanage();
 		app.relaunch();
 		app.exit();
 	});
@@ -251,49 +255,49 @@ app.on('ready', () => {
 		BadgeSettings.updateBadge(badgeCount, mainWindow);
 	});
 
-	ipcMain.on('toggle-menubar', (event, showMenubar) => {
+	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, messageCount) => {
+	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, data, text) => {
+	ipcMain.on('update-taskbar-icon', (_event: Electron.IpcMessageEvent, data: any, text: string) => {
 		BadgeSettings.updateTaskbarIcon(data, text, mainWindow);
 	});
 
-	ipcMain.on('forward-message', (event, listener, ...params) => {
+	ipcMain.on('forward-message', (_event: Electron.IpcMessageEvent, listener: any, ...params: any[]) => {
 		page.send(listener, ...params);
 	});
 
-	ipcMain.on('update-menu', (event, props) => {
-		appMenu.setMenu(props);
+	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, AutoLaunchValue) => {
+	ipcMain.on('toggleAutoLauncher', (_event: Electron.IpcMessageEvent, AutoLaunchValue: boolean) => {
 		setAutoLaunch(AutoLaunchValue);
 	});
 
-	ipcMain.on('downloadFile', (event, url, downloadPath) => {
+	ipcMain.on('downloadFile', (_event: Electron.IpcMessageEvent, url: string, downloadPath: string) => {
 		page.downloadURL(url);
-		page.session.once('will-download', (event, item) => {
+		page.session.once('will-download', (_event: Event, item) => {
 			const filePath = path.join(downloadPath, item.getFilename());
 
-			const getTimeStamp = () => {
+			const getTimeStamp = (): any => {
 				const date = new Date();
 				return date.getTime();
 			};
 
-			const formatFile = filePath => {
+			const formatFile = (filePath: string): string => {
 				const fileExtension = path.extname(filePath);
 				const baseName = path.basename(filePath, fileExtension);
 				return `${baseName}-${getTimeStamp()}${fileExtension}`;
@@ -307,7 +311,7 @@ app.on('ready', () => {
 
 			item.setSavePath(setFilePath);
 
-			item.on('updated', (event, state) => {
+			item.on('updated', (_event: Event, state) => {
 				switch (state) {
 					case 'interrupted': {
 						// Can interrupted to due to network error, cancel download then
@@ -327,7 +331,7 @@ app.on('ready', () => {
 					}
 				}
 			});
-			item.once('done', (event, state) => {
+			item.once('done', (_event: Event, state) => {
 				const getFileName = fs.existsSync(filePath) ? formatFile(filePath) : item.getFilename();
 				if (state === 'completed') {
 					page.send('downloadFileCompleted', item.getSavePath(), getFileName);
@@ -341,19 +345,23 @@ app.on('ready', () => {
 		});
 	});
 
-	ipcMain.on('realm-name-changed', (event, serverURL, realmName) => {
+	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, serverURL, iconURL) => {
+	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 => {
+	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', () => {

app/main/linuxupdater.ts

@@ -1,19 +1,18 @@
-const { app } = require('electron');
-const { Notification } = require('electron');
+import { app, Notification } from 'electron';
 
-const request = require('request');
-const semver = require('semver');
-const ConfigUtil = require('../renderer/js/utils/config-util');
-const ProxyUtil = require('../renderer/js/utils/proxy-util');
-const LinuxUpdateUtil = require('../renderer/js/utils/linux-update-util');
-const Logger = require('../renderer/js/utils/logger-util');
+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
 });
 
-function linuxUpdateNotification() {
+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');
@@ -25,7 +24,7 @@ function linuxUpdateNotification() {
 		ecdhCurve: 'auto'
 	};
 
-	request(options, (error, response, body) => {
+	request(options, (error: any, response: any, body: any) => {
 		if (error) {
 			logger.error('Linux update error.');
 			logger.error(error);
@@ -47,7 +46,3 @@ function linuxUpdateNotification() {
 		}
 	});
 }
-
-module.exports = {
-	linuxUpdateNotification
-};

app/main/menu.ts

@@ -1,15 +1,13 @@
 'use strict';
-const path = require('path');
+import { app, shell, BrowserWindow, Menu, dialog } from 'electron';
+import { appUpdater } from './autoupdater';
 
-const { app, shell, BrowserWindow, Menu, dialog } = require('electron');
-
-const fs = require('fs-extra');
-const AdmZip = require('adm-zip');
-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 Logger = require(__dirname + '/../renderer/js/utils/logger-util.js');
+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');
 
 const appName = app.getName();
 
@@ -19,11 +17,12 @@ const logger = new Logger({
 });
 
 class AppMenu {
-	getHistorySubmenu() {
+	getHistorySubmenu(enableMenu: boolean): Electron.MenuItemConstructorOptions[] {
 		return [{
 			label: 'Back',
 			accelerator: process.platform === 'darwin' ? 'Command+Left' : 'Alt+Left',
-			click(item, focusedWindow) {
+			enabled: enableMenu,
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					AppMenu.sendAction('back');
 				}
@@ -31,7 +30,8 @@ class AppMenu {
 		}, {
 			label: 'Forward',
 			accelerator: process.platform === 'darwin' ? 'Command+Right' : 'Alt+Right',
-			click(item, focusedWindow) {
+			enabled: enableMenu,
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					AppMenu.sendAction('forward');
 				}
@@ -39,58 +39,64 @@ class AppMenu {
 		}];
 	}
 
-	getToolsSubmenu() {
+	getToolsSubmenu(): Electron.MenuItemConstructorOptions[] {
 		return [{
-			label: `Check for Updates`,
+			label: 'Check for Updates',
 			click() {
 				AppMenu.checkForUpdate();
 			}
 		},
 		{
-			label: `Release Notes`,
+			label: 'Release Notes',
 			click() {
 				shell.openExternal(`https://github.com/zulip/zulip-desktop/releases/tag/v${app.getVersion()}`);
 			}
-		}, {
+		},
+		{
 			type: 'separator'
-		}, {
+		},
+		{
 			label: 'Factory Reset',
 			accelerator: process.platform === 'darwin' ? 'Command+Shift+D' : 'Ctrl+Shift+D',
 			click() {
 				AppMenu.resetAppSettings();
 			}
-		}, {
+		},
+		{
 			label: 'Download App Logs',
 			click() {
 				const zip = new AdmZip();
-				let date = new Date();
-				date = date.toLocaleDateString().replace(/\//g, '-');
+				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-${date}.zip`;
+				const logFilePath = `${app.getPath('downloads')}/Zulip-logs-${dateString}.zip`;
 				zip.writeZip(logFilePath);
 
 				// Open and select the log file
 				shell.showItemInFolder(logFilePath);
 			}
-		}, {
+		},
+		{
 			type: 'separator'
-		}, {
+		},
+		{
 			label: 'Toggle DevTools for Zulip App',
 			accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					focusedWindow.webContents.toggleDevTools();
 				}
 			}
-		}, {
+		},
+		{
 			label: 'Toggle DevTools for Active Tab',
 			accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					AppMenu.sendAction('tab-devtools');
 				}
@@ -98,11 +104,11 @@ class AppMenu {
 		}];
 	}
 
-	getViewSubmenu() {
+	getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
 		return [{
 			label: 'Reload',
 			accelerator: 'CommandOrControl+R',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					AppMenu.sendAction('reload-current-viewer');
 				}
@@ -110,7 +116,7 @@ class AppMenu {
 		}, {
 			label: 'Hard Reload',
 			accelerator: 'CommandOrControl+Shift+R',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					AppMenu.sendAction('hard-reload');
 				}
@@ -122,7 +128,7 @@ class AppMenu {
 		}, {
 			label: 'Zoom In',
 			accelerator: process.platform === 'darwin' ? 'Command+Plus' : 'Control+=',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					AppMenu.sendAction('zoomIn');
 				}
@@ -130,7 +136,7 @@ class AppMenu {
 		}, {
 			label: 'Zoom Out',
 			accelerator: 'CommandOrControl+-',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					AppMenu.sendAction('zoomOut');
 				}
@@ -138,7 +144,7 @@ class AppMenu {
 		}, {
 			label: 'Actual Size',
 			accelerator: 'CommandOrControl+0',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					AppMenu.sendAction('zoomActualSize');
 				}
@@ -147,7 +153,7 @@ class AppMenu {
 			type: 'separator'
 		}, {
 			label: 'Toggle Tray Icon',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					focusedWindow.webContents.send('toggletray');
 				}
@@ -155,7 +161,7 @@ class AppMenu {
 		}, {
 			label: 'Toggle Sidebar',
 			accelerator: 'CommandOrControl+Shift+S',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					const newValue = !ConfigUtil.getConfigItem('showSidebar');
 					focusedWindow.webContents.send('toggle-sidebar', newValue);
@@ -166,7 +172,7 @@ class AppMenu {
 			label: 'Auto hide Menu bar',
 			checked: ConfigUtil.getConfigItem('autoHideMenubar', false),
 			visible: process.platform !== 'darwin',
-			click(item, focusedWindow) {
+			click(_item: any, focusedWindow: any) {
 				if (focusedWindow) {
 					const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
 					focusedWindow.setAutoHideMenuBar(newValue);
@@ -179,7 +185,7 @@ class AppMenu {
 		}];
 	}
 
-	getHelpSubmenu() {
+	getHelpSubmenu(): Electron.MenuItemConstructorOptions[] {
 		return [
 			{
 				label: `${appName + ' Desktop'} v${app.getVersion()}`,
@@ -187,7 +193,7 @@ class AppMenu {
 			},
 			{
 				label: 'About Zulip',
-				click(item, focusedWindow) {
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('open-about');
 					}
@@ -200,7 +206,8 @@ class AppMenu {
 						AppMenu.sendAction('open-help');
 					}
 				}
-			}, {
+			},
+			{
 				label: 'Report an Issue',
 				click() {
 					// the goal is to notify the main.html BrowserWindow
@@ -209,11 +216,12 @@ class AppMenu {
 						window.webContents.send('open-feedback-modal');
 					});
 				}
-			}];
+			}
+		];
 	}
 
-	getWindowSubmenu(tabs, activeTabIndex) {
-		const initialSubmenu = [{
+	getWindowSubmenu(tabs: any[], activeTabIndex: number, enableMenu: boolean): Electron.MenuItemConstructorOptions[] {
+		const initialSubmenu: any[] = [{
 			role: 'minimize'
 		}, {
 			role: 'close'
@@ -224,32 +232,32 @@ class AppMenu {
 			initialSubmenu.push({
 				type: 'separator'
 			});
-			for (let i = 0; i < tabs.length; i++) {
+			tabs.forEach(tab => {
 				// 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;
+				if (tab.props.role === 'function' && tab.webview.props.name === 'Settings') {
+					return;
 				}
 
 				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) {
+					label: tab.webview.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', tabs[i].props.index);
+							AppMenu.sendAction('switch-server-tab', tab.props.index);
 						}
 					},
 					type: 'checkbox'
 				});
-			}
+			});
 			initialSubmenu.push({
 				type: 'separator'
 			});
 			initialSubmenu.push({
 				label: 'Switch to Next Organization',
 				accelerator: `Ctrl+Tab`,
-				enabled: tabs[activeTabIndex].props.role === 'server',
-				click(item, focusedWindow) {
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('switch-server-tab', AppMenu.getNextServer(tabs, activeTabIndex));
 					}
@@ -257,8 +265,8 @@ class AppMenu {
 			}, {
 				label: 'Switch to Previous Organization',
 				accelerator: `Ctrl+Shift+Tab`,
-				enabled: tabs[activeTabIndex].props.role === 'server',
-				click(item, focusedWindow) {
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('switch-server-tab', AppMenu.getPreviousServer(tabs, activeTabIndex));
 					}
@@ -269,7 +277,7 @@ class AppMenu {
 		return initialSubmenu;
 	}
 
-	getDarwinTpl(props) {
+	getDarwinTpl(props: any): Electron.MenuItemConstructorOptions[] {
 		const { tabs, activeTabIndex, enableMenu } = props;
 
 		return [{
@@ -277,7 +285,7 @@ class AppMenu {
 			submenu: [{
 				label: 'Add Organization',
 				accelerator: 'Cmd+Shift+N',
-				click(item, focusedWindow) {
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('new-server');
 					}
@@ -292,7 +300,7 @@ class AppMenu {
 			}, {
 				label: 'Desktop Settings',
 				accelerator: 'Cmd+,',
-				click(item, focusedWindow) {
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('open-settings');
 					}
@@ -301,7 +309,7 @@ class AppMenu {
 				label: 'Keyboard Shortcuts',
 				accelerator: 'Cmd+Shift+K',
 				enabled: enableMenu,
-				click(item, focusedWindow) {
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
 					}
@@ -311,7 +319,8 @@ class AppMenu {
 			}, {
 				label: 'Copy Zulip URL',
 				accelerator: 'Cmd+Shift+C',
-				click(item, focusedWindow) {
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('copy-zulip-url');
 					}
@@ -320,7 +329,7 @@ class AppMenu {
 				label: 'Log Out of Organization',
 				accelerator: 'Cmd+L',
 				enabled: enableMenu,
-				click(item, focusedWindow) {
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('log-out');
 					}
@@ -367,10 +376,10 @@ class AppMenu {
 			submenu: this.getViewSubmenu()
 		}, {
 			label: 'History',
-			submenu: this.getHistorySubmenu()
+			submenu: this.getHistorySubmenu(enableMenu)
 		}, {
 			label: 'Window',
-			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
+			submenu: this.getWindowSubmenu(tabs, activeTabIndex, enableMenu)
 		}, {
 			label: 'Tools',
 			submenu: this.getToolsSubmenu()
@@ -380,7 +389,7 @@ class AppMenu {
 		}];
 	}
 
-	getOtherTpl(props) {
+	getOtherTpl(props: any): Electron.MenuItemConstructorOptions[] {
 		const { tabs, activeTabIndex, enableMenu } = props;
 
 		return [{
@@ -388,7 +397,7 @@ class AppMenu {
 			submenu: [{
 				label: 'Add Organization',
 				accelerator: 'Ctrl+Shift+N',
-				click(item, focusedWindow) {
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('new-server');
 					}
@@ -405,7 +414,7 @@ class AppMenu {
 			}, {
 				label: 'Desktop Settings',
 				accelerator: 'Ctrl+,',
-				click(item, focusedWindow) {
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('open-settings');
 					}
@@ -414,7 +423,7 @@ class AppMenu {
 				label: 'Keyboard Shortcuts',
 				accelerator: 'Ctrl+Shift+K',
 				enabled: enableMenu,
-				click(item, focusedWindow) {
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
 					}
@@ -424,7 +433,8 @@ class AppMenu {
 			}, {
 				label: 'Copy Zulip URL',
 				accelerator: 'Ctrl+Shift+C',
-				click(item, focusedWindow) {
+				enabled: enableMenu,
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('copy-zulip-url');
 					}
@@ -433,7 +443,7 @@ class AppMenu {
 				label: 'Log Out of Organization',
 				accelerator: 'Ctrl+L',
 				enabled: enableMenu,
-				click(item, focusedWindow) {
+				click(_item: any, focusedWindow: any) {
 					if (focusedWindow) {
 						AppMenu.sendAction('log-out');
 					}
@@ -470,10 +480,10 @@ class AppMenu {
 			submenu: this.getViewSubmenu()
 		}, {
 			label: '&History',
-			submenu: this.getHistorySubmenu()
+			submenu: this.getHistorySubmenu(enableMenu)
 		}, {
 			label: '&Window',
-			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
+			submenu: this.getWindowSubmenu(tabs, activeTabIndex, enableMenu)
 		}, {
 			label: '&Tools',
 			submenu: this.getToolsSubmenu()
@@ -484,7 +494,7 @@ class AppMenu {
 		}];
 	}
 
-	static sendAction(action, ...params) {
+	static sendAction(action: any, ...params: any[]): void {
 		const win = BrowserWindow.getAllWindows()[0];
 
 		if (process.platform === 'darwin') {
@@ -494,11 +504,11 @@ class AppMenu {
 		win.webContents.send(action, ...params);
 	}
 
-	static checkForUpdate() {
+	static checkForUpdate(): void {
 		appUpdater(true);
 	}
 
-	static getNextServer(tabs, activeTabIndex) {
+	static getNextServer(tabs: any[], activeTabIndex: number): number {
 		do {
 			activeTabIndex = (activeTabIndex + 1) % tabs.length;
 		}
@@ -506,7 +516,7 @@ class AppMenu {
 		return activeTabIndex;
 	}
 
-	static getPreviousServer(tabs, activeTabIndex) {
+	static getPreviousServer(tabs: any[], activeTabIndex: number): number {
 		do {
 			activeTabIndex = (activeTabIndex - 1 + tabs.length) % tabs.length;
 		}
@@ -514,7 +524,7 @@ class AppMenu {
 		return activeTabIndex;
 	}
 
-	static resetAppSettings() {
+	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
@@ -530,7 +540,7 @@ class AppMenu {
 			if (response === 0) {
 				settingFiles.forEach(settingFileName => {
 					const getSettingFilesPath = path.join(app.getPath('appData'), appName, settingFileName);
-					fs.access(getSettingFilesPath, error => {
+					fs.access(getSettingFilesPath, (error: any) => {
 						if (error) {
 							logger.error('Error while resetting app settings.');
 							logger.error(error);
@@ -545,11 +555,11 @@ class AppMenu {
 		});
 	}
 
-	setMenu(props) {
+	setMenu(props: any): void {
 		const tpl = process.platform === 'darwin' ? this.getDarwinTpl(props) : this.getOtherTpl(props);
 		const menu = Menu.buildFromTemplate(tpl);
 		Menu.setApplicationMenu(menu);
 	}
 }
 
-module.exports = new AppMenu();
+export = new AppMenu();

app/main/startup.ts

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

app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "zulip",
-  "version": "3.0.0",
+  "version": "3.1.0-beta",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -260,7 +260,7 @@
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -464,6 +464,11 @@
         "dns-packet": "^1.1.0"
       }
     },
+    "dotenv": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.0.0.tgz",
+      "integrity": "sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg=="
+    },
     "duplexer3": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
@@ -775,7 +780,7 @@
     "hashids": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/hashids/-/hashids-1.1.4.tgz",
-      "integrity": "sha1-5P+SrWa2hKO9aqznwX1mYY7l+iE="
+      "integrity": "sha512-U/fnTE3edW0AV92ZI/BfEluMZuVcu3MDOopsN7jS+HqDYcarQo8rXQiWlsBlm0uX48/taYSdxRsfzh2HRg5Z6w=="
     },
     "hawk": {
       "version": "6.0.2",
@@ -1094,7 +1099,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -1123,9 +1128,9 @@
       "integrity": "sha1-ltDNYQ69WNS03pzAxoKM2pnHVI8="
     },
     "node-json-db": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/node-json-db/-/node-json-db-0.9.1.tgz",
-      "integrity": "sha512-4BydUI7a10W8QBdHq/J3UBswU1i8WhCgTS4BZU0MjlUKrSU7cuUti71eojistgqe5hIrb4adj/wvAT5dw63NPg==",
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/node-json-db/-/node-json-db-0.9.2.tgz",
+      "integrity": "sha512-vd8A6wznm3hi82IKlVKdomZvsEnASYWl0n4iwLkI7ukbIQkXTtFdJG8aZg0BNbEN+Vr/VktDFSqwWx/iSdf31Q==",
       "requires": {
         "mkdirp": "0.5.x"
       }
@@ -1497,7 +1502,7 @@
     "spawn-rx": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.12.tgz",
-      "integrity": "sha1-tihSlEmUJgib7qDDwewy1/xXo3Y=",
+      "integrity": "sha512-gOPXiQQFQ9lTOLuys0iMn3jfxxv9c7zzwhbYLOEbQGvEShHVJ5sSR1oD3Daj88os7jKArDYT7rbOKdvNhe7iEg==",
       "requires": {
         "debug": "^2.5.1",
         "lodash.assign": "^4.2.0",

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "3.0.0",
+  "version": "3.1.0-beta",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
   "copyright": "Kandra Labs, Inc.",
@@ -30,6 +30,7 @@
     "@sentry/electron": "0.14.0",
     "adm-zip": "0.4.11",
     "auto-launch": "5.0.5",
+    "dotenv": "8.0.0",
     "electron-is-dev": "0.3.0",
     "electron-log": "2.2.14",
     "electron-spellchecker": "1.1.2",
@@ -37,7 +38,7 @@
     "electron-window-state": "5.0.3",
     "escape-html": "1.0.3",
     "is-online": "7.0.0",
-    "node-json-db": "0.9.1",
+    "node-json-db": "0.9.2",
     "request": "2.85.0",
     "semver": "5.4.1",
     "wurl": "2.5.0"

app/renderer/js/components/base.ts

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

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

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

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

@@ -1,12 +1,15 @@
-const { ipcRenderer } = require('electron');
-const { shell, app } = require('electron').remote;
-const LinkUtil = require('../utils/link-util');
-const DomainUtil = require('../utils/domain-util');
-const ConfigUtil = require('../utils/config-util');
+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');
 
-function handleExternalLink(event) {
+// 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')}`);
@@ -37,7 +40,7 @@ function handleExternalLink(event) {
 		// if (!LinkUtil.isImage(url) && !LinkUtil.isPDF(url) && isUploadsURL) {
 		if (!LinkUtil.isImage(url) && isUploadsURL) {
 			ipcRenderer.send('downloadFile', url, downloadPath);
-			ipcRenderer.once('downloadFileCompleted', (event, filePath, fileName) => {
+			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
@@ -48,7 +51,7 @@ function handleExternalLink(event) {
 					dingSound.play();
 				}
 
-				downloadNotification.onclick = () => {
+				downloadNotification.addEventListener('click', () => {
 					if (shouldShowInFolder) {
 						// Reveal file in download folder
 						shell.showItemInFolder(filePath);
@@ -56,7 +59,7 @@ function handleExternalLink(event) {
 						// Open file in the default native app
 						shell.openItem(filePath);
 					}
-				};
+				});
 				ipcRenderer.removeAllListeners('downloadFileFailed');
 			});
 
@@ -77,4 +80,4 @@ function handleExternalLink(event) {
 	}
 }
 
-module.exports = handleExternalLink;
+export = handleExternalLink;

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

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

app/renderer/js/components/tab.ts

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

app/renderer/js/components/webview.ts

@@ -1,22 +1,39 @@
 'use strict';
+import { remote } from 'electron';
 
-const path = require('path');
-const fs = require('fs');
+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 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 { app, dialog } = remote;
 
 const shouldSilentWebview = ConfigUtil.getConfigItem('silent');
+
+// TODO: TypeScript - Type annotate WebViewProps.
+interface WebViewProps {
+	[key: string]: any;
+}
+
 class WebView extends BaseComponent {
-	constructor(props) {
+	props: any;
+	zoomFactor: number;
+	badgeCount: number;
+	loading: boolean;
+	customCSS: string;
+	$webviewsContainer: DOMTokenList;
+	$el: Electron.WebviewTag;
+
+	// This is required because in main.js we access WebView.method as
+	// webview[method].
+	[key: string]: any;
+
+	constructor(props: WebViewProps) {
 		super();
 
 		this.props = props;
-
 		this.zoomFactor = 1.0;
 		this.loading = true;
 		this.badgeCount = 0;
@@ -24,7 +41,7 @@ class WebView extends BaseComponent {
 		this.$webviewsContainer = document.querySelector('#webviews-container').classList;
 	}
 
-	template() {
+	template(): string {
 		return `<webview
 					class="disabled"
 					data-tab-id="${this.props.tabIndex}"
@@ -38,14 +55,14 @@ class WebView extends BaseComponent {
 				</webview>`;
 	}
 
-	init() {
-		this.$el = this.generateNodeFromTemplate(this.template());
-		this.props.$root.appendChild(this.$el);
+	init(): void {
+		this.$el = this.generateNodeFromTemplate(this.template()) as Electron.WebviewTag;
+		this.props.$root.append(this.$el);
 
 		this.registerListeners();
 	}
 
-	registerListeners() {
+	registerListeners(): void {
 		this.$el.addEventListener('new-window', event => {
 			handleExternalLink.call(this, event);
 		});
@@ -105,7 +122,7 @@ class WebView extends BaseComponent {
 
 		this.$el.addEventListener('did-fail-load', event => {
 			const { errorDescription } = event;
-			const hasConnectivityErr = (SystemUtil.connectivityERR.indexOf(errorDescription) >= 0);
+			const hasConnectivityErr = SystemUtil.connectivityERR.includes(errorDescription);
 			if (hasConnectivityErr) {
 				console.error('error', errorDescription);
 				this.props.onNetworkError();
@@ -130,12 +147,12 @@ class WebView extends BaseComponent {
 		});
 	}
 
-	getBadgeCount(title) {
-		const messageCountInTitle = (/\(([0-9]+)\)/).exec(title);
+	getBadgeCount(title: string): number {
+		const messageCountInTitle = (/\((\d+)\)/).exec(title);
 		return messageCountInTitle ? Number(messageCountInTitle[1]) : 0;
 	}
 
-	show() {
+	show(): void {
 		// Do not show WebView if another tab was selected and this tab should be in background.
 		if (!this.props.isActive()) {
 			return;
@@ -176,7 +193,7 @@ class WebView extends BaseComponent {
 		}
 	}
 
-	focus() {
+	focus(): void {
 		// focus Webview and it's contents when Window regain focus.
 		const webContents = this.$el.getWebContents();
 		// HACK: webContents.isFocused() seems to be true even without the element
@@ -185,18 +202,18 @@ class WebView extends BaseComponent {
 			// 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.blur();
+			(document.activeElement as HTMLElement).blur();
 			this.$el.focus();
 			webContents.focus();
 		}
 	}
 
-	hide() {
+	hide(): void {
 		this.$el.classList.add('disabled');
 		this.$el.classList.remove('active');
 	}
 
-	load() {
+	load(): void {
 		if (this.$el) {
 			this.show();
 		} else {
@@ -204,41 +221,41 @@ class WebView extends BaseComponent {
 		}
 	}
 
-	zoomIn() {
+	zoomIn(): void {
 		this.zoomFactor += 0.1;
 		this.$el.setZoomFactor(this.zoomFactor);
 	}
 
-	zoomOut() {
+	zoomOut(): void {
 		this.zoomFactor -= 0.1;
 		this.$el.setZoomFactor(this.zoomFactor);
 	}
 
-	zoomActualSize() {
+	zoomActualSize(): void {
 		this.zoomFactor = 1.0;
 		this.$el.setZoomFactor(this.zoomFactor);
 	}
 
-	logOut() {
+	logOut(): void {
 		this.$el.executeJavaScript('logout()');
 	}
 
-	showShortcut() {
+	showShortcut(): void {
 		this.$el.executeJavaScript('shortcut()');
 	}
 
-	openDevTools() {
+	openDevTools(): void {
 		this.$el.openDevTools();
 	}
 
-	back() {
+	back(): void {
 		if (this.$el.canGoBack()) {
 			this.$el.goBack();
 			this.focus();
 		}
 	}
 
-	canGoBackButton() {
+	canGoBackButton(): void {
 		const $backButton = document.querySelector('#actions-container #back-action');
 		if (this.$el.canGoBack()) {
 			$backButton.classList.remove('disable');
@@ -247,13 +264,13 @@ class WebView extends BaseComponent {
 		}
 	}
 
-	forward() {
+	forward(): void {
 		if (this.$el.canGoForward()) {
 			this.$el.goForward();
 		}
 	}
 
-	reload() {
+	reload(): void {
 		this.hide();
 		// Shows the loading indicator till the webview is reloaded
 		this.$webviewsContainer.remove('loaded');
@@ -261,9 +278,9 @@ class WebView extends BaseComponent {
 		this.$el.reload();
 	}
 
-	send(...param) {
-		this.$el.send(...param);
+	send(channel: string, ...param: any[]): void {
+		this.$el.send(channel, ...param);
 	}
 }
 
-module.exports = WebView;
+export = WebView;

app/renderer/js/electron-bridge.ts

@@ -1,17 +1,20 @@
-const events = require('events');
-const { ipcRenderer } = require('electron');
+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 camelcase */
+/* eslint-disable @typescript-eslint/camelcase */
 class ElectronBridge extends events {
-	send_event(...args) {
-		this.emit(...args);
+	send_event(eventName: string | symbol, ...args: any[]): void {
+		this.emit(eventName, ...args);
 	}
 
-	on_event(...args) {
-		this.on(...args);
+	on_event(eventName: string, listener: ListenerType): void {
+		this.on(eventName, listener);
 	}
 }
 
@@ -37,4 +40,6 @@ electron_bridge.on('realm_icon_url', iconURL => {
 // 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.
-module.exports = electron_bridge;
+export = electron_bridge;
+
+/* eslint-enable @typescript-eslint/camelcase */

app/renderer/js/feedback.ts

@@ -1,7 +1,16 @@
-const { app } = require('electron').remote;
-const path = require('path');
-const fs = require('fs');
-const SendFeedback = require('@electron-elements/send-feedback');
+import { remote } from 'electron';
+import SendFeedback from '@electron-elements/send-feedback';
+
+import path = require('path');
+import fs = require('fs');
+
+const { app } = remote;
+
+interface SendFeedback extends HTMLElement {
+	[key: string]: any;
+}
+
+type SendFeedbackType = SendFeedback;
 
 // make the button color match zulip app's theme
 SendFeedback.customStyles = `
@@ -22,8 +31,8 @@ button {
 `;
 
 customElements.define('send-feedback', SendFeedback);
-const sendFeedback = document.querySelector('send-feedback');
-const feedbackHolder = sendFeedback.parentElement;
+export const sendFeedback: SendFeedbackType = document.querySelector('send-feedback');
+export const feedbackHolder = sendFeedback.parentElement;
 
 // customize the fields of custom elements
 sendFeedback.title = 'Report Issue';
@@ -38,7 +47,7 @@ sendFeedback.useReporter('emailReporter', {
 	email: 'akash@zulipchat.com'
 });
 
-feedbackHolder.addEventListener('click', e => {
+feedbackHolder.addEventListener('click', (e: Event) => {
 	// only remove the class if the grey out faded
 	// part is clicked and not the feedback element itself
 	if (e.target === e.currentTarget) {
@@ -55,8 +64,3 @@ 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.ts

@@ -1,53 +1,127 @@
 'use strict';
 
-const { ipcRenderer, remote, clipboard, shell } = require('electron');
-const isDev = require('electron-is-dev');
+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;
-const escape = require('escape-html');
 
-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 Logger = require(__dirname + '/js/utils/logger-util.js');
-const CommonUtil = require(__dirname + '/js/utils/common-util.js');
+// eslint-disable-next-line import/no-unassigned-import
+require('./tray');
 
-const { feedbackHolder } = require(__dirname + '/js/feedback.js');
+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');
 
 const logger = new Logger({
 	file: 'errors.log',
 	timestamp: true
 });
 
-class ServerManagerView {
-	constructor() {
-		this.$addServerButton = document.getElementById('add-tab');
-		this.$tabsContainer = document.getElementById('tabs-container');
+interface FunctionalTabProps {
+	name: string;
+	materialIcon: string;
+	url: string;
+}
 
-		const $actionsContainer = document.getElementById('actions-container');
+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;
+	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.getElementById('webviews-container');
+		this.$webviewsContainer = document.querySelector('#webviews-container');
 		this.$backButton = $actionsContainer.querySelector('#back-action');
 		this.$dndButton = $actionsContainer.querySelector('#dnd-action');
 
-		this.$addServerTooltip = document.getElementById('add-server-tooltip');
+		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');
-		this.$serverIconTooltip = document.getElementsByClassName('server-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.getElementById('sidebar');
+		this.$sidebar = document.querySelector('#sidebar');
 
-		this.$fullscreenPopup = document.getElementById('fullscreen-popup');
+		this.$fullscreenPopup = document.querySelector('#fullscreen-popup');
 		this.$fullscreenEscapeKey = process.platform === 'darwin' ? '^⌘F' : 'F11';
 		this.$fullscreenPopup.innerHTML = `Press ${this.$fullscreenEscapeKey} to exit full screen`;
 
@@ -58,7 +132,7 @@ class ServerManagerView {
 		this.tabIndex = 0;
 	}
 
-	init() {
+	init(): void {
 		this.loadProxy().then(() => {
 			this.initSidebar();
 			this.initTabs();
@@ -68,7 +142,7 @@ class ServerManagerView {
 		});
 	}
 
-	loadProxy() {
+	loadProxy(): Promise<boolean> {
 		return new Promise(resolve => {
 			// To change proxyEnable to useManualProxy in older versions
 			const proxyEnabledOld = ConfigUtil.isConfigItemExists('useProxy');
@@ -100,9 +174,9 @@ class ServerManagerView {
 	// 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() {
+	initDefaultSettings(): void {
 		// Default settings which should be respected
-		const settingOptions = {
+		const settingOptions: SettingsOptions = {
 			autoHideMenubar: false,
 			trayIcon: true,
 			useManualProxy: false,
@@ -146,18 +220,19 @@ class ServerManagerView {
 		}
 
 		for (const i in settingOptions) {
+			const setting = i as keyof SettingsOptions;
 			if (ConfigUtil.getConfigItem(i) === null) {
-				ConfigUtil.setConfigItem(i, settingOptions[i]);
+				ConfigUtil.setConfigItem(i, settingOptions[setting]);
 			}
 		}
 	}
 
-	initSidebar() {
+	initSidebar(): void {
 		const showSidebar = ConfigUtil.getConfigItem('showSidebar', true);
 		this.toggleSidebar(showSidebar);
 	}
 
-	initTabs() {
+	initTabs(): void {
 		const servers = DomainUtil.getDomains();
 		if (servers.length > 0) {
 			for (let i = 0; i < servers.length; i++) {
@@ -174,7 +249,7 @@ class ServerManagerView {
 		}
 	}
 
-	initServer(server, index) {
+	initServer(server: any, index: number): void {
 		const tabIndex = this.getTabIndex();
 		this.tabs.push(new ServerTab({
 			role: 'server',
@@ -196,7 +271,7 @@ class ServerManagerView {
 				isActive: () => {
 					return index === this.activeTabIndex;
 				},
-				switchLoading: (loading, url) => {
+				switchLoading: (loading: boolean, url: string) => {
 					if (!loading && this.loading[url]) {
 						this.loading[url] = false;
 					} else if (loading && !this.loading[url]) {
@@ -213,14 +288,14 @@ class ServerManagerView {
 		this.loading[server.url] = true;
 	}
 
-	initActions() {
+	initActions(): void {
 		this.initDNDButton();
 		this.initServerActions();
 		this.initLeftSidebarEvents();
 	}
 
-	initServerActions() {
-		const $serverImgs = document.querySelectorAll('.server-icons');
+	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')) {
@@ -232,7 +307,7 @@ class ServerManagerView {
 		});
 	}
 
-	initLeftSidebarEvents() {
+	initLeftSidebarEvents(): void {
 		this.$dndButton.addEventListener('click', () => {
 			const dndUtil = DNDUtil.toggle();
 			ipcRenderer.send('forward-message', 'toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
@@ -258,22 +333,22 @@ class ServerManagerView {
 		this.sidebarHoverEvent(this.$dndButton, this.$dndTooltip);
 	}
 
-	initDNDButton() {
+	initDNDButton(): void {
 		const dnd = ConfigUtil.getConfigItem('dnd', false);
 		this.toggleDNDButton(dnd);
 	}
 
-	getTabIndex() {
+	getTabIndex(): number {
 		const currentIndex = this.tabIndex;
 		this.tabIndex++;
 		return currentIndex;
 	}
 
-	getCurrentActiveServer() {
+	getCurrentActiveServer(): string {
 		return this.tabs[this.activeTabIndex].webview.props.url;
 	}
 
-	displayInitialCharLogo($img, index) {
+	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
@@ -296,12 +371,12 @@ class ServerManagerView {
 		$altIcon.classList.add('alt-icon');
 
 		$parent.removeChild($img);
-		$parent.appendChild($altIcon);
+		$parent.append($altIcon);
 
-		this.addContextMenu($altIcon, index);
+		this.addContextMenu($altIcon as HTMLImageElement, index);
 	}
 
-	sidebarHoverEvent(SidebarButton, SidebarTooltip, addServer = false) {
+	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
@@ -318,7 +393,7 @@ class ServerManagerView {
 		});
 	}
 
-	onHover(index) {
+	onHover(index: number): void {
 		// this.$serverIconTooltip[index].innerHTML already has realm name, so we are just
 		// removing the style.
 		this.$serverIconTooltip[index].removeAttribute('style');
@@ -329,11 +404,11 @@ class ServerManagerView {
 		this.$serverIconTooltip[index].style.top = top + 'px';
 	}
 
-	onHoverOut(index) {
+	onHoverOut(index: number): void {
 		this.$serverIconTooltip[index].style.display = 'none';
 	}
 
-	openFunctionalTab(tabProps) {
+	openFunctionalTab(tabProps: FunctionalTabProps): void {
 		if (this.functionalTabs[tabProps.name] !== undefined) {
 			this.activateTab(this.functionalTabs[tabProps.name]);
 			return;
@@ -362,7 +437,7 @@ class ServerManagerView {
 				isActive: () => {
 					return this.functionalTabs[tabProps.name] === this.activeTabIndex;
 				},
-				switchLoading: (loading, url) => {
+				switchLoading: (loading: AnyObject, url: string) => {
 					if (!loading && this.loading[url]) {
 						this.loading[url] = false;
 					} else if (loading && !this.loading[url]) {
@@ -384,46 +459,46 @@ class ServerManagerView {
 		this.activateTab(this.functionalTabs[tabProps.name]);
 	}
 
-	openSettings(nav = 'General') {
+	openSettings(nav = 'General'): void {
 		this.openFunctionalTab({
 			name: 'Settings',
 			materialIcon: 'settings',
-			url: `file://${__dirname}/preference.html#${nav}`
+			url: `file://${rendererDirectory}/preference.html#${nav}`
 		});
 		this.$settingsButton.classList.add('active');
 		this.tabs[this.functionalTabs.Settings].webview.send('switch-settings-nav', nav);
 	}
 
-	openAbout() {
+	openAbout(): void {
 		this.openFunctionalTab({
 			name: 'About',
 			materialIcon: 'sentiment_very_satisfied',
-			url: `file://${__dirname}/about.html`
+			url: `file://${rendererDirectory}/about.html`
 		});
 	}
 
-	openNetworkTroubleshooting() {
+	openNetworkTroubleshooting(): void {
 		this.openFunctionalTab({
 			name: 'Network Troubleshooting',
 			materialIcon: 'network_check',
-			url: `file://${__dirname}/network.html`
+			url: `file://${rendererDirectory}/network.html`
 		});
 	}
 
-	activateLastTab(index) {
+	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
-		ConfigUtil.setConfigItem('lastActiveTab', 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() {
-		const tabs = [];
-		this.tabs.forEach(tab => {
+	get tabsForIpc(): ServerOrFunctionalTab[] {
+		const tabs: ServerOrFunctionalTab[] = [];
+		this.tabs.forEach((tab: ServerOrFunctionalTab) => {
 			const proto = Object.create(Object.getPrototypeOf(tab));
 			const tabClone = Object.assign(proto, tab);
 
@@ -436,7 +511,7 @@ class ServerManagerView {
 		return tabs;
 	}
 
-	activateTab(index, hideOldTab = true) {
+	activateTab(index: number, hideOldTab = true): void {
 		if (!this.tabs[index]) {
 			return;
 		}
@@ -473,7 +548,7 @@ class ServerManagerView {
 		});
 	}
 
-	showLoading(loading) {
+	showLoading(loading: boolean): void {
 		if (!loading) {
 			this.$reloadButton.removeAttribute('style');
 			this.$loadingIndicator.style.display = 'none';
@@ -483,7 +558,7 @@ class ServerManagerView {
 		}
 	}
 
-	destroyTab(name, index) {
+	destroyTab(name: string, index: number): void {
 		if (this.tabs[index].webview.loading) {
 			return;
 		}
@@ -499,7 +574,7 @@ class ServerManagerView {
 		}
 	}
 
-	destroyView() {
+	destroyView(): void {
 		// Show loading indicator
 		this.$webviewsContainer.classList.remove('loaded');
 
@@ -513,7 +588,7 @@ class ServerManagerView {
 		this.$webviewsContainer.innerHTML = '';
 	}
 
-	reloadView() {
+	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);
@@ -526,33 +601,33 @@ class ServerManagerView {
 
 	// This will trigger when pressed CTRL/CMD + R [WIP]
 	// It won't reload the current view properly when you add/delete a server.
-	reloadCurrentView() {
+	reloadCurrentView(): void {
 		this.$reloadButton.click();
 	}
 
-	updateBadge() {
+	updateBadge(): void {
 		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;
+		for (const tab of this.tabs) {
+			if (tab && tab instanceof ServerTab && tab.updateBadge) {
+				const count = tab.webview.badgeCount;
 				messageCountAll += count;
-				this.tabs[i].updateBadge(count);
+				tab.updateBadge(count);
 			}
 		}
 
 		ipcRenderer.send('update-badge', messageCountAll);
 	}
 
-	updateGeneralSettings(setting, value) {
+	updateGeneralSettings(setting: string, value: any): void {
 		const selector = 'webview:not([class*=disabled])';
-		const webview = document.querySelector(selector);
+		const webview: Electron.WebviewTag = document.querySelector(selector);
 		if (webview) {
 			const webContents = webview.getWebContents();
 			webContents.send(setting, value);
 		}
 	}
 
-	toggleSidebar(show) {
+	toggleSidebar(show: boolean): void {
 		if (show) {
 			this.$sidebar.classList.remove('sidebar-hide');
 		} else {
@@ -561,12 +636,12 @@ class ServerManagerView {
 	}
 
 	// Toggles the dnd button icon.
-	toggleDNDButton(alert) {
+	toggleDNDButton(alert: boolean): void {
 		this.$dndTooltip.textContent = (alert ? 'Disable' : 'Enable') + ' Do Not Disturb';
 		this.$dndButton.querySelector('i').textContent = alert ? 'notifications_off' : 'notifications';
 	}
 
-	addContextMenu($serverImg, index) {
+	addContextMenu($serverImg: HTMLImageElement, index: number): void {
 		$serverImg.addEventListener('contextmenu', e => {
 			e.preventDefault();
 			const template = [
@@ -598,8 +673,8 @@ class ServerManagerView {
 		});
 	}
 
-	registerIpcs() {
-		const webviewListeners = {
+	registerIpcs(): void {
+		const webviewListeners: AnyObject = {
 			'webview-reload': 'reload',
 			back: 'back',
 			focus: 'focus',
@@ -616,12 +691,12 @@ class ServerManagerView {
 			ipcRenderer.on(key, () => {
 				const activeWebview = this.tabs[this.activeTabIndex].webview;
 				if (activeWebview) {
-					activeWebview[webviewListeners[key]]();
+					activeWebview[webviewListeners[key] as string]();
 				}
 			});
 		}
 
-		ipcRenderer.on('open-settings', (event, settingNav) => {
+		ipcRenderer.on('open-settings', (event: Event, settingNav: string) => {
 			this.openSettings(settingNav);
 		});
 
@@ -645,7 +720,7 @@ class ServerManagerView {
 			ipcRenderer.send('clear-app-settings');
 		});
 
-		ipcRenderer.on('switch-server-tab', (event, index) => {
+		ipcRenderer.on('switch-server-tab', (event: Event, index: number) => {
 			this.activateLastTab(index);
 		});
 
@@ -653,7 +728,7 @@ class ServerManagerView {
 			this.openSettings('AddServer');
 		});
 
-		ipcRenderer.on('reload-proxy', (event, showAlert) => {
+		ipcRenderer.on('reload-proxy', (event: Event, showAlert: boolean) => {
 			this.loadProxy().then(() => {
 				if (showAlert) {
 					alert('Proxy settings saved!');
@@ -662,7 +737,7 @@ class ServerManagerView {
 			});
 		});
 
-		ipcRenderer.on('toggle-sidebar', (event, show) => {
+		ipcRenderer.on('toggle-sidebar', (event: Event, show: boolean) => {
 			// Toggle the left sidebar
 			this.toggleSidebar(show);
 
@@ -670,8 +745,8 @@ class ServerManagerView {
 			this.updateGeneralSettings('toggle-sidebar-setting', show);
 		});
 
-		ipcRenderer.on('toggle-silent', (event, state) => {
-			const webviews = document.querySelectorAll('webview');
+		ipcRenderer.on('toggle-silent', (event: Event, state: boolean) => {
+			const webviews: NodeListOf<Electron.WebviewTag> = document.querySelectorAll('webview');
 			webviews.forEach(webview => {
 				try {
 					webview.setAudioMuted(state);
@@ -684,7 +759,7 @@ class ServerManagerView {
 			});
 		});
 
-		ipcRenderer.on('toggle-autohide-menubar', (event, autoHideMenubar, updateMenu) => {
+		ipcRenderer.on('toggle-autohide-menubar', (event: Event, autoHideMenubar: boolean, updateMenu: boolean) => {
 			if (updateMenu) {
 				ipcRenderer.send('update-menu', {
 					tabs: this.tabsForIpc,
@@ -695,17 +770,18 @@ class ServerManagerView {
 			this.updateGeneralSettings('toggle-menubar-setting', autoHideMenubar);
 		});
 
-		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
+		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 = document.querySelector(selector);
+			const webview: Electron.WebviewTag = document.querySelector(selector);
 			const webContents = webview.getWebContents();
 			webContents.send('toggle-dnd', state, newSettings);
 		});
 
-		ipcRenderer.on('update-realm-name', (event, serverURL, realmName) => {
-			DomainUtil.getDomains().forEach((domain, index) => {
+		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);
@@ -725,12 +801,13 @@ class ServerManagerView {
 			});
 		});
 
-		ipcRenderer.on('update-realm-icon', (event, serverURL, iconURL) => {
-			DomainUtil.getDomains().forEach((domain, index) => {
+		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 => {
+					DomainUtil.saveServerIcon(iconURL).then((localIconUrl: string) => {
 						const serverImgsSelector = `.tab .server-icons`;
-						const serverImgs = document.querySelectorAll(serverImgsSelector);
+						const serverImgs: NodeListOf<HTMLImageElement> = document.querySelectorAll(serverImgsSelector);
 						serverImgs[index].src = localIconUrl;
 
 						domain.icon = localIconUrl;
@@ -750,21 +827,21 @@ class ServerManagerView {
 			this.$fullscreenPopup.classList.remove('show');
 		});
 
-		ipcRenderer.on('focus-webview-with-id', (event, webviewId) => {
-			const webviews = document.querySelectorAll('webview');
+		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 = document.querySelector(`div[data-tab-id="${tabId}"]`);
+				const concurrentTab: HTMLButtonElement = document.querySelector(`div[data-tab-id="${tabId}"]`);
 				if (currentId === webviewId) {
 					concurrentTab.click();
 				}
 			});
 		});
 
-		ipcRenderer.on('render-taskbar-icon', (event, messageCount) => {
+		ipcRenderer.on('render-taskbar-icon', (event: Event, messageCount: number) => {
 			// Create a canvas from unread messagecounts
-			function createOverlayIcon(messageCount) {
+			function createOverlayIcon(messageCount: number): HTMLCanvasElement {
 				const canvas = document.createElement('canvas');
 				canvas.height = 128;
 				canvas.width = 128;
@@ -805,7 +882,7 @@ class ServerManagerView {
 	}
 }
 
-window.onload = () => {
+window.addEventListener('load', () => {
 	const serverManagerView = new ServerManagerView();
 	const reconnectUtil = new ReconnectUtil(serverManagerView);
 	serverManagerView.init();
@@ -824,7 +901,8 @@ window.onload = () => {
 	// `--no-electron-connect`
 	const mainProcessArgv = remote.getGlobal('process').argv;
 	if (isDev && !mainProcessArgv.includes('--no-electron-connect')) {
-		const electronConnect = require('electron-connect');
-		electronConnect.client.create();
+		require('electron-connect').client.create();
 	}
-};
+});
+
+export = new ServerManagerView();

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

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

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

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

app/renderer/js/notification/helpers.ts

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

app/renderer/js/notification/index.ts

@@ -1,12 +1,11 @@
 'use strict';
 
-const {
-  remote: { app }
-} = require('electron');
+import { remote } from 'electron';
+import * as params from '../utils/params-util';
+import { appId, loadBots } from './helpers';
 
-const params = require('../utils/params-util.js');
-const DefaultNotification = require('./default-notification');
-const { appId, loadBots } = require('./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.
@@ -15,12 +14,11 @@ app.setAppUserModelId(appId);
 window.Notification = DefaultNotification;
 
 if (process.platform === 'darwin') {
-	const DarwinNotification = require('./darwin-notifications');
-	window.Notification = DarwinNotification;
+	window.Notification = require('./darwin-notifications');
 }
 
 window.addEventListener('load', () => {
-	// eslint-disable-next-line no-undef, camelcase
+	// eslint-disable-next-line no-undef, @typescript-eslint/camelcase
 	if (params.isPageParams() && page_params.realm_uri) {
 		loadBots();
 	}

app/renderer/js/pages/network.ts

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

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

@@ -1,20 +1,28 @@
 'use-strict';
 
-const { dialog } = require('electron').remote;
-const path = require('path');
+import { remote, OpenDialogOptions } from 'electron';
 
-const BaseComponent = require(__dirname + '/../../components/base.js');
-const CertificateUtil = require(__dirname + '/../../utils/certificate-util.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+import path = require('path');
+import BaseComponent = require('../../components/base');
+import CertificateUtil = require('../../utils/certificate-util');
+import DomainUtil = require('../../utils/domain-util');
+
+const { dialog } = remote;
 
 class AddCertificate extends BaseComponent {
-	constructor(props) {
+	// 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() {
+	template(): string {
 		return `
 			<div class="settings-card certificates-card">
 				<div class="certificate-input">
@@ -29,15 +37,15 @@ class AddCertificate extends BaseComponent {
 		`;
 	}
 
-	init() {
+	init(): void {
 		this.$addCertificate = this.generateNodeFromTemplate(this.template());
-		this.props.$root.appendChild(this.$addCertificate);
+		this.props.$root.append(this.$addCertificate);
 		this.addCertificateButton = this.$addCertificate.querySelector('#add-certificate-button');
-		this.serverUrl = this.$addCertificate.querySelectorAll('input.setting-input-value')[0];
+		this.serverUrl = this.$addCertificate.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
 		this.initListeners();
 	}
 
-	validateAndAdd() {
+	validateAndAdd(): void {
 		const certificate = this._certFile;
 		const serverUrl = this.serverUrl.value;
 		if (certificate !== '' && serverUrl !== '') {
@@ -59,10 +67,9 @@ class AddCertificate extends BaseComponent {
 		}
 	}
 
-	addHandler() {
-		const showDialogOptions = {
+	addHandler(): void {
+		const showDialogOptions: OpenDialogOptions = {
 			title: 'Select file',
-			defaultId: 1,
 			properties: ['openFile'],
 			filters: [{ name: 'crt, pem', extensions: ['crt', 'pem'] }]
 		};
@@ -74,7 +81,7 @@ class AddCertificate extends BaseComponent {
 		});
 	}
 
-	initListeners() {
+	initListeners(): void {
 		this.addCertificateButton.addEventListener('click', () => {
 			this.addHandler();
 		});
@@ -89,4 +96,4 @@ class AddCertificate extends BaseComponent {
 	}
 }
 
-module.exports = AddCertificate;
+export = AddCertificate;

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

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

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

@@ -1,22 +1,23 @@
 'use strict';
 
-const {ipcRenderer} = require('electron');
+import { ipcRenderer } from 'electron';
 
-const BaseComponent = require(__dirname + '/../../components/base.js');
+import BaseComponent = require('../../components/base');
 
 class BaseSection extends BaseComponent {
-	generateSettingOption(props) {
+	// TODO: TypeScript - Here props should be object type
+	generateSettingOption(props: any): void {
 		const {$element, value, clickHandler} = props;
 
 		$element.innerHTML = '';
 
 		const $optionControl = this.generateNodeFromTemplate(this.generateOptionTemplate(value));
-		$element.appendChild($optionControl);
+		$element.append($optionControl);
 
 		$optionControl.addEventListener('click', clickHandler);
 	}
 
-	generateOptionTemplate(settingOption) {
+	generateOptionTemplate(settingOption: boolean): string {
 		if (settingOption) {
 			return `
 				<div class="action">
@@ -38,9 +39,9 @@ class BaseSection extends BaseComponent {
 		}
 	}
 
-	reloadApp() {
+	reloadApp(): void {
 		ipcRenderer.send('forward-message', 'reload-viewer');
 	}
 }
 
-module.exports = BaseSection;
+export = BaseSection;

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

@@ -1,18 +1,27 @@
 'use strict';
 
-const BaseSection = require(__dirname + '/base-section.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-const ServerInfoForm = require(__dirname + '/server-info-form.js');
-const AddCertificate = require(__dirname + '/add-certificate.js');
-const FindAccounts = require(__dirname + '/find-accounts.js');
+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');
 
 class ConnectedOrgSection extends BaseSection {
-	constructor(props) {
+	// 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() {
+	template(): string {
 		return `
 			<div class="settings-pane" id="server-settings-pane">
 				<div class="page-title">Connected organizations</div>
@@ -27,21 +36,21 @@ class ConnectedOrgSection extends BaseSection {
 		`;
 	}
 
-	init() {
+	init(): void {
 		this.initServers();
 	}
 
-	initServers() {
+	initServers(): void {
 		this.props.$root.innerHTML = '';
 
 		const servers = DomainUtil.getDomains();
 		this.props.$root.innerHTML = this.template();
 
-		this.$serverInfoContainer = document.getElementById('server-info-container');
-		this.$existingServers = document.getElementById('existing-servers');
-		this.$newOrgButton = document.getElementById('new-org-button');
-		this.$addCertificateContainer = document.getElementById('add-certificate-container');
-		this.$findAccountsContainer = document.getElementById('find-accounts-container');
+		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 = 'All the connected orgnizations will appear here';
 		// Show noServerText if no servers are there otherwise hide it
@@ -57,8 +66,6 @@ class ConnectedOrgSection extends BaseSection {
 		}
 
 		this.$newOrgButton.addEventListener('click', () => {
-			// We don't need to import this since it's already imported in other files
-			// eslint-disable-next-line no-undef
 			ipcRenderer.send('forward-message', 'open-org-tab');
 		});
 
@@ -66,17 +73,17 @@ class ConnectedOrgSection extends BaseSection {
 		this.initFindAccounts();
 	}
 
-	initAddCertificate() {
+	initAddCertificate(): void {
 		new AddCertificate({
 			$root: this.$addCertificateContainer
 		}).init();
 	}
 
-	initFindAccounts() {
+	initFindAccounts(): void {
 		new FindAccounts({
 			$root: this.$findAccountsContainer
 		}).init();
 	}
 }
 
-module.exports = ConnectedOrgSection;
+export = ConnectedOrgSection;

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

@@ -1,16 +1,21 @@
 'use-strict';
 
-const { shell } = require('electron');
+import { shell } from 'electron';
 
-const BaseComponent = require(__dirname + '/../../components/base.js');
+import BaseComponent = require('../../components/base');
 
 class FindAccounts extends BaseComponent {
-	constructor(props) {
+	// 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() {
+	template(): string {
 		return `
 			<div class="settings-card certificate-card">
 				<div class="certificate-input">
@@ -24,15 +29,15 @@ class FindAccounts extends BaseComponent {
 		`;
 	}
 
-	init() {
+	init(): void {
 		this.$findAccounts = this.generateNodeFromTemplate(this.template());
-		this.props.$root.appendChild(this.$findAccounts);
+		this.props.$root.append(this.$findAccounts);
 		this.$findAccountsButton = this.$findAccounts.querySelector('#find-accounts-button');
-		this.$serverUrlField = this.$findAccounts.querySelectorAll('input.setting-input-value')[0];
+		this.$serverUrlField = this.$findAccounts.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
 		this.initListeners();
 	}
 
-	findAccounts(url) {
+	findAccounts(url: string): void {
 		if (!url) {
 			return;
 		}
@@ -42,7 +47,7 @@ class FindAccounts extends BaseComponent {
 		shell.openExternal(url + '/accounts/find');
 	}
 
-	initListeners() {
+	initListeners(): void {
 		this.$findAccountsButton.addEventListener('click', () => {
 			this.findAccounts(this.$serverUrlField.value);
 		});
@@ -69,4 +74,4 @@ class FindAccounts extends BaseComponent {
 	}
 }
 
-module.exports = FindAccounts;
+export = FindAccounts;

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

@@ -1,20 +1,24 @@
 'use strict';
-const path = require('path');
-const { ipcRenderer, remote } = require('electron');
-const fs = require('fs-extra');
+import { ipcRenderer, remote, OpenDialogOptions } from 'electron';
+
+import path = require('path');
+import fs = require('fs-extra');
 
 const { app, dialog } = remote;
 const currentBrowserWindow = remote.getCurrentWindow();
-const BaseSection = require(__dirname + '/base-section.js');
-const ConfigUtil = require(__dirname + '/../../utils/config-util.js');
+
+import BaseSection = require('./base-section');
+import ConfigUtil = require('../../utils/config-util');
 
 class GeneralSection extends BaseSection {
-	constructor(props) {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	constructor(props: any) {
 		super();
 		this.props = props;
 	}
 
-	template() {
+	template(): string {
 		return `
             <div class="settings-pane">
                 <div class="title">Appearance</div>
@@ -131,7 +135,7 @@ class GeneralSection extends BaseSection {
 		`;
 	}
 
-	init() {
+	init(): void {
 		this.props.$root.innerHTML = this.template();
 		this.updateTrayOption();
 		this.updateBadgeOption();
@@ -168,7 +172,7 @@ class GeneralSection extends BaseSection {
 		}
 	}
 
-	updateTrayOption() {
+	updateTrayOption(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#tray-option .setting-control'),
 			value: ConfigUtil.getConfigItem('trayIcon', true),
@@ -181,7 +185,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateMenubarOption() {
+	updateMenubarOption(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#menubar-option .setting-control'),
 			value: ConfigUtil.getConfigItem('autoHideMenubar', false),
@@ -194,7 +198,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateBadgeOption() {
+	updateBadgeOption(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#badge-option .setting-control'),
 			value: ConfigUtil.getConfigItem('badgeOption', true),
@@ -207,7 +211,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateDockBouncing() {
+	updateDockBouncing(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#dock-bounce-option .setting-control'),
 			value: ConfigUtil.getConfigItem('dockBouncing', true),
@@ -219,7 +223,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateFlashTaskbar() {
+	updateFlashTaskbar(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#flash-taskbar-option .setting-control'),
 			value: ConfigUtil.getConfigItem('flashTaskbarOnMessage', true),
@@ -231,7 +235,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	autoUpdateOption() {
+	autoUpdateOption(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#autoupdate-option .setting-control'),
 			value: ConfigUtil.getConfigItem('autoUpdate', true),
@@ -247,7 +251,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	betaUpdateOption() {
+	betaUpdateOption(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#betaupdate-option .setting-control'),
 			value: ConfigUtil.getConfigItem('betaUpdate', false),
@@ -261,7 +265,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateSilentOption() {
+	updateSilentOption(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#silent-option .setting-control'),
 			value: ConfigUtil.getConfigItem('silent', false),
@@ -269,12 +273,14 @@ class GeneralSection extends BaseSection {
 				const newValue = !ConfigUtil.getConfigItem('silent', true);
 				ConfigUtil.setConfigItem('silent', newValue);
 				this.updateSilentOption();
-				currentBrowserWindow.send('toggle-silent', newValue);
+				// TODO: TypeScript: currentWindow of type BrowserWindow doesn't
+				// have a .send() property per typescript.
+				(currentBrowserWindow as any).send('toggle-silent', newValue);
 			}
 		});
 	}
 
-	showDesktopNotification() {
+	showDesktopNotification(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#show-notification-option .setting-control'),
 			value: ConfigUtil.getConfigItem('showNotification', true),
@@ -286,7 +292,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateSidebarOption() {
+	updateSidebarOption(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#sidebar-option .setting-control'),
 			value: ConfigUtil.getConfigItem('showSidebar', true),
@@ -299,7 +305,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateStartAtLoginOption() {
+	updateStartAtLoginOption(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#startAtLogin-option .setting-control'),
 			value: ConfigUtil.getConfigItem('startAtLogin', false),
@@ -312,7 +318,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	enableSpellchecker() {
+	enableSpellchecker(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#enable-spellchecker-option .setting-control'),
 			value: ConfigUtil.getConfigItem('enableSpellchecker', true),
@@ -324,7 +330,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	enableErrorReporting() {
+	enableErrorReporting(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#enable-error-reporting .setting-control'),
 			value: ConfigUtil.getConfigItem('errorReporting', true),
@@ -336,7 +342,7 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	clearAppDataDialog() {
+	clearAppDataDialog(): void {
 		const clearAppDataMessage = 'By clicking proceed you will be removing all added accounts and preferences from Zulip. When the application restarts, it will be as if you are starting Zulip for the first time.';
 		const getAppPath = path.join(app.getPath('appData'), app.getName());
 
@@ -354,10 +360,9 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	customCssDialog() {
-		const showDialogOptions = {
+	customCssDialog(): void {
+		const showDialogOptions: OpenDialogOptions = {
 			title: 'Select file',
-			defaultId: 1,
 			properties: ['openFile'],
 			filters: [{ name: 'CSS file', extensions: ['css'] }]
 		};
@@ -370,14 +375,14 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateResetDataOption() {
+	updateResetDataOption(): void {
 		const resetDataButton = document.querySelector('#resetdata-option .reset-data-button');
 		resetDataButton.addEventListener('click', () => {
 			this.clearAppDataDialog();
 		});
 	}
 
-	minimizeOnStart() {
+	minimizeOnStart(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#start-minimize-option .setting-control'),
 			value: ConfigUtil.getConfigItem('startMinimized', false),
@@ -389,51 +394,50 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	addCustomCSS() {
+	addCustomCSS(): void {
 		const customCSSButton = document.querySelector('#add-custom-css .custom-css-button');
 		customCSSButton.addEventListener('click', () => {
 			this.customCssDialog();
 		});
 	}
 
-	showCustomCSSPath() {
+	showCustomCSSPath(): void {
 		if (!ConfigUtil.getConfigItem('customCSS')) {
-			const cssPATH = document.getElementById('remove-custom-css');
+			const cssPATH: HTMLElement = document.querySelector('#remove-custom-css');
 			cssPATH.style.display = 'none';
 		}
 	}
 
-	removeCustomCSS() {
-		const removeCSSButton = document.getElementById('css-delete-action');
+	removeCustomCSS(): void {
+		const removeCSSButton = document.querySelector('#css-delete-action');
 		removeCSSButton.addEventListener('click', () => {
-			ConfigUtil.setConfigItem('customCSS');
+			ConfigUtil.setConfigItem('customCSS', "");
 			ipcRenderer.send('forward-message', 'hard-reload');
 		});
 	}
 
-	downloadFolderDialog() {
-		const showDialogOptions = {
+	downloadFolderDialog(): void {
+		const showDialogOptions: OpenDialogOptions = {
 			title: 'Select Download Location',
-			defaultId: 1,
 			properties: ['openDirectory']
 		};
 
 		dialog.showOpenDialog(showDialogOptions, selectedFolder => {
 			if (selectedFolder) {
 				ConfigUtil.setConfigItem('downloadsPath', selectedFolder[0]);
-				const downloadFolderPath = document.querySelector('.download-folder-path');
+				const downloadFolderPath: HTMLElement = document.querySelector('.download-folder-path');
 				downloadFolderPath.innerText = selectedFolder[0];
 			}
 		});
 	}
-	downloadFolder() {
+	downloadFolder(): void {
 		const downloadFolder = document.querySelector('#download-folder .download-folder-button');
 		downloadFolder.addEventListener('click', () => {
 			this.downloadFolderDialog();
 		});
 	}
 
-	showDownloadFolder() {
+	showDownloadFolder(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#show-download-folder .setting-control'),
 			value: ConfigUtil.getConfigItem('showDownloadFolder', false),
@@ -444,7 +448,6 @@ class GeneralSection extends BaseSection {
 			}
 		});
 	}
-
 }
 
-module.exports = GeneralSection;
+export = GeneralSection;

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

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

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

@@ -1,17 +1,24 @@
 'use strict';
 
-const {ipcRenderer} = require('electron');
+import { ipcRenderer } from 'electron';
 
-const BaseSection = require(__dirname + '/base-section.js');
-const ConfigUtil = require(__dirname + '/../../utils/config-util.js');
+import BaseSection = require('./base-section');
+import ConfigUtil = require('../../utils/config-util');
 
 class NetworkSection extends BaseSection {
-	constructor(props) {
+	// 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() {
+	template(): string {
 		return `
             <div class="settings-pane">
                 <div class="title">Proxy</div>
@@ -48,12 +55,12 @@ class NetworkSection extends BaseSection {
 		`;
 	}
 
-	init() {
+	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.getElementById('proxy-save-action');
+		this.$proxySaveAction = document.querySelector('#proxy-save-action');
 		this.$manualProxyBlock = this.props.$root.querySelector('.manual-proxy-block');
 		this.initProxyOption();
 
@@ -70,14 +77,14 @@ class NetworkSection extends BaseSection {
 		});
 	}
 
-	initProxyOption() {
+	initProxyOption(): void {
 		const manualProxyEnabled = ConfigUtil.getConfigItem('useManualProxy', false);
 		this.toggleManualProxySettings(manualProxyEnabled);
 
 		this.updateProxyOption();
 	}
 
-	toggleManualProxySettings(option) {
+	toggleManualProxySettings(option: boolean): void {
 		if (option) {
 			this.$manualProxyBlock.classList.remove('hidden');
 		} else {
@@ -85,7 +92,7 @@ class NetworkSection extends BaseSection {
 		}
 	}
 
-	updateProxyOption() {
+	updateProxyOption(): void {
 		this.generateSettingOption({
 			$element: document.querySelector('#use-system-settings .setting-control'),
 			value: ConfigUtil.getConfigItem('useSystemProxy', false),
@@ -125,4 +132,4 @@ class NetworkSection extends BaseSection {
 	}
 }
 
-module.exports = NetworkSection;
+export = NetworkSection;

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

@@ -1,16 +1,22 @@
 'use strict';
 
-const BaseComponent = require(__dirname + '/../../components/base.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-const shell = require('electron').shell;
+import { shell } from 'electron';
+
+import BaseComponent = require('../../components/base');
+import DomainUtil = require('../../utils/domain-util');
 
 class NewServerForm extends BaseComponent {
-	constructor(props) {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	$newServerForm: Element;
+	$saveServerButton: HTMLButtonElement;
+	$newServerUrl: HTMLInputElement;
+	constructor(props: any) {
 		super();
 		this.props = props;
 	}
 
-	template() {
+	template(): string {
 		return `
 			<div class="server-input-container">
 				<div class="title">Organization URL</div>
@@ -36,21 +42,20 @@ class NewServerForm extends BaseComponent {
 		`;
 	}
 
-	init() {
+	init(): void {
 		this.initForm();
 		this.initActions();
 	}
 
-	initForm() {
+	initForm(): void {
 		this.$newServerForm = this.generateNodeFromTemplate(this.template());
-		this.$saveServerButton = this.$newServerForm.getElementsByClassName('server-save-action')[0];
+		this.$saveServerButton = this.$newServerForm.querySelectorAll('.server-save-action')[0] as HTMLButtonElement;
 		this.props.$root.innerHTML = '';
-		this.props.$root.appendChild(this.$newServerForm);
-
-		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0];
+		this.props.$root.append(this.$newServerForm);
+		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
 	}
 
-	submitFormHandler() {
+	submitFormHandler(): void {
 		this.$saveServerButton.children[0].innerHTML = 'Connecting...';
 		DomainUtil.checkDomain(this.$newServerUrl.value).then(serverConf => {
 			DomainUtil.addDomain(serverConf).then(() => {
@@ -62,15 +67,15 @@ class NewServerForm extends BaseComponent {
 		});
 	}
 
-	openCreateNewOrgExternalLink() {
+	openCreateNewOrgExternalLink(): void {
 		const link = 'https://zulipchat.com/new/';
-		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
+		const externalCreateNewOrgEl = document.querySelector('#open-create-org-link');
 		externalCreateNewOrgEl.addEventListener('click', () => {
 			shell.openExternal(link);
 		});
 	}
 
-	initActions() {
+	initActions(): void {
 		this.$saveServerButton.addEventListener('click', () => {
 			this.submitFormHandler();
 		});
@@ -86,4 +91,4 @@ class NewServerForm extends BaseComponent {
 	}
 }
 
-module.exports = NewServerForm;
+export = NewServerForm;

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

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

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

@@ -1,17 +1,26 @@
 'use strict';
-const { dialog } = require('electron').remote;
-const { ipcRenderer } = require('electron');
 
-const BaseComponent = require(__dirname + '/../../components/base.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+import { remote, ipcRenderer } from 'electron';
+
+import BaseComponent = require('../../components/base');
+import DomainUtil = require('../../utils/domain-util');
+
+const { dialog } = remote;
 
 class ServerInfoForm extends BaseComponent {
-	constructor(props) {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	$serverInfoForm: Element;
+	$serverInfoAlias: Element;
+	$serverIcon: Element;
+	$deleteServerButton: Element;
+	$openServerButton: Element;
+	constructor(props: any) {
 		super();
 		this.props = props;
 	}
 
-	template() {
+	template(): string {
 		return `
 			<div class="settings-card">
 				<div class="server-info-left">
@@ -35,21 +44,21 @@ class ServerInfoForm extends BaseComponent {
 		`;
 	}
 
-	init() {
+	init(): void {
 		this.initForm();
 		this.initActions();
 	}
 
-	initForm() {
+	initForm(): void {
 		this.$serverInfoForm = this.generateNodeFromTemplate(this.template());
-		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);
+		this.$serverInfoAlias = this.$serverInfoForm.querySelectorAll('.server-info-alias')[0];
+		this.$serverIcon = this.$serverInfoForm.querySelectorAll('.server-info-icon')[0];
+		this.$deleteServerButton = this.$serverInfoForm.querySelectorAll('.server-delete-action')[0];
+		this.$openServerButton = this.$serverInfoForm.querySelectorAll('.open-tab-button')[0];
+		this.props.$root.append(this.$serverInfoForm);
 	}
 
-	initActions() {
+	initActions(): void {
 		this.$deleteServerButton.addEventListener('click', () => {
 			dialog.showMessageBox({
 				type: 'warning',
@@ -76,7 +85,6 @@ class ServerInfoForm extends BaseComponent {
 			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
 		});
 	}
-
 }
 
-module.exports = ServerInfoForm;
+export = ServerInfoForm;

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

@@ -1,15 +1,18 @@
 'use strict';
 
-const BaseSection = require(__dirname + '/base-section.js');
-const NewServerForm = require(__dirname + '/new-server-form.js');
+import BaseSection = require('./base-section');
+import NewServerForm = require('./new-server-form');
 
 class ServersSection extends BaseSection {
-	constructor(props) {
+	// TODO: TypeScript - Here props should be object type
+	props: any;
+	$newServerContainer: Element;
+	constructor(props: any) {
 		super();
 		this.props = props;
 	}
 
-	template() {
+	template(): string {
 		return `
 		<div class="add-server-modal">
 			<div class="modal-container">
@@ -22,20 +25,20 @@ class ServersSection extends BaseSection {
 		`;
 	}
 
-	init() {
+	init(): void {
 		this.initServers();
 	}
 
-	initServers() {
+	initServers(): void {
 		this.props.$root.innerHTML = '';
 
 		this.props.$root.innerHTML = this.template();
-		this.$newServerContainer = document.getElementById('new-server-container');
+		this.$newServerContainer = document.querySelector('#new-server-container');
 
 		this.initNewServerForm();
 	}
 
-	initNewServerForm() {
+	initNewServerForm(): void {
 		new NewServerForm({
 			$root: this.$newServerContainer,
 			onChange: this.reloadApp
@@ -43,4 +46,4 @@ class ServersSection extends BaseSection {
 	}
 }
 
-module.exports = ServersSection;
+export = ServersSection;

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

@@ -1,338 +0,0 @@
-'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="settings-card tip"><p><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>.</p></div>
-              <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>
-                  <tr>
-                    <td><kbd>Ctrl</kbd> + <kbd>Tab</kbd></td>
-                    <td>Switch to Next Organization</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd></td>
-                    <td>Switch to Previous Organization</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">History Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>←</kbd></td>
-                    <td>Back</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>→</kbd></td>
-                    <td>Forward</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-              <div class="title">Window Shortcuts</div>
-              <div class="settings-card">
-                <table>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>M</kbd></td>
-                    <td>Minimize</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>W</kbd></td>
-                    <td>Close</td>
-                  </tr>
-                </table>
-                <div class="setting-control"></div>
-              </div>
-            </div>
-		`;
-	}
-
-	templateWinLin() {
-		const userOSKey = 'Ctrl';
-
-		return `
-            <div class="settings-pane">
-            <div class="settings-card tip"><p><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>.</p></div>
-              <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>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Tab</kbd></td>
-                    <td>Switch to Next Organization</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd></td>
-                    <td>Switch to Previous Organization</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>
-		`;
-	}
-
-	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

@@ -0,0 +1,344 @@
+'use strict';
+
+import { shell } from 'electron';
+
+import BaseSection = require('./base-section');
+
+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>Tip:  </b>These desktop app shortcuts extend the Zulip webapp's <span id="open-hotkeys-link"> keyboard shortcuts</span>.</p></div>
+							<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>
+									<tr>
+										<td><kbd>Ctrl</kbd> + <kbd>Tab</kbd></td>
+										<td>Switch to Next Organization</td>
+									</tr>
+									<tr>
+										<td><kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd></td>
+										<td>Switch to Previous Organization</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">History Shortcuts</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>←</kbd></td>
+										<td>Back</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>→</kbd></td>
+										<td>Forward</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+							<div class="title">Window Shortcuts</div>
+							<div class="settings-card">
+								<table>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>M</kbd></td>
+										<td>Minimize</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd><kbd>W</kbd></td>
+										<td>Close</td>
+									</tr>
+								</table>
+								<div class="setting-control"></div>
+							</div>
+						</div>
+		`;
+	}
+
+	templateWinLin(): string {
+		const userOSKey = 'Ctrl';
+
+		return `
+						<div class="settings-pane">
+						<div class="settings-card tip"><p><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>.</p></div>
+							<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>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Tab</kbd></td>
+										<td>Switch to Next Organization</td>
+									</tr>
+									<tr>
+										<td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd></td>
+										<td>Switch to Previous Organization</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>
+		`;
+	}
+
+	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.ts

@@ -1,11 +1,17 @@
 'use strict';
 
-const { ipcRenderer, shell } = require('electron');
-const SetupSpellChecker = require('./spellchecker');
+import { ipcRenderer, shell } from 'electron';
+import SetupSpellChecker from './spellchecker';
 
-const ConfigUtil = require(__dirname + '/utils/config-util.js');
-const LinkUtil = require(__dirname + '/utils/link-util.js');
-const params = require(__dirname + '/utils/params-util.js');
+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');
@@ -13,44 +19,46 @@ require('./notification');
 // Prevent drag and drop event in main process which prevents remote code executaion
 require(__dirname + '/shared/preventdrag.js');
 
-// eslint-disable-next-line camelcase
+declare let window: ZulipWebWindow;
+
+// eslint-disable-next-line @typescript-eslint/camelcase
 window.electron_bridge = require('./electron-bridge');
 
-const logout = () => {
+const logout = (): void => {
 	// Create the menu for the below
-	document.querySelector('.dropdown-toggle').click();
+	const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
+	dropdown.click();
 
-	const nodes = document.querySelectorAll('.dropdown-menu li:last-child a');
+	const nodes: NodeListOf<HTMLElement> = document.querySelectorAll('.dropdown-menu li:last-child a');
 	nodes[nodes.length - 1].click();
 };
 
-const shortcut = () => {
+const shortcut = (): void => {
 	// Create the menu for the below
-	const node = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
+	const node: HTMLElement = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
 	// Additional check
-	if (node.text.trim().toLowerCase() === 'keyboard shortcuts (?)') {
+	if (node.textContent.trim().toLowerCase() === 'keyboard shortcuts (?)') {
 		node.click();
 	} else {
 		// Atleast click the dropdown
-		document.querySelector('.dropdown-toggle').click();
+		const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
+		dropdown.click();
 	}
 };
 
-process.once('loaded', () => {
-	global.logout = logout;
-	global.shortcut = shortcut;
+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', () => {
+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, camelcase
+		const serverLanguage = page_params.default_language; // eslint-disable-line no-undef, @typescript-eslint/camelcase
 		if (serverLanguage) {
-			// Set spellcheker language
-			ConfigUtil.setConfigItem('spellcheckerLanguage', serverLanguage);
 			// Init spellchecker
-			SetupSpellChecker.init();
+			SetupSpellChecker.init(serverLanguage);
 		}
 		// redirect users to network troubleshooting page
 		const getRestartButton = document.querySelector('.restart_get_events_button');
@@ -61,7 +69,7 @@ document.addEventListener('DOMContentLoaded', () => {
 		}
 		// 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) {
+		$('#main_div').on('click', '.message_content p a', function (this: HTMLElement, e: Event) {
 			const url = $(this).attr('href');
 
 			if (LinkUtil.isImage(url)) {
@@ -85,7 +93,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
 // Clean up spellchecker events after you navigate away from this page;
 // otherwise, you may experience errors
-window.addEventListener('beforeunload', () => {
+window.addEventListener('beforeunload', (): void => {
 	SetupSpellChecker.unsubscribeSpellChecker();
 });
 

app/renderer/js/shared/preventdrag.ts

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

app/renderer/js/spellchecker.js

@@ -1,55 +0,0 @@
-'use strict';
-
-const { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } = require('electron-spellchecker');
-
-const ConfigUtil = require(__dirname + '/utils/config-util.js');
-const Logger = require(__dirname + '/utils/logger-util.js');
-
-const logger = new Logger({
-	file: 'errors.log',
-	timestamp: true
-});
-
-class SetupSpellChecker {
-	init() {
-		if (ConfigUtil.getConfigItem('enableSpellchecker')) {
-			this.enableSpellChecker();
-		}
-		this.enableContextMenu();
-	}
-
-	enableSpellChecker() {
-		try {
-			this.SpellCheckHandler = new SpellCheckHandler();
-		} catch (err) {
-			logger.error(err);
-		}
-	}
-
-	enableContextMenu() {
-		if (this.SpellCheckHandler) {
-			this.SpellCheckHandler.attachToInput();
-
-			const userLanguage = ConfigUtil.getConfigItem('spellcheckerLanguage');
-
-			this.SpellCheckHandler.switchLanguage(userLanguage);
-		}
-
-		const contextMenuBuilder = new ContextMenuBuilder(this.SpellCheckHandler);
-		this.contextMenuListener = new ContextMenuListener(info => {
-			contextMenuBuilder.showPopupMenu(info);
-		});
-	}
-
-	unsubscribeSpellChecker() {
-		// eslint-disable-next-line no-undef
-		if (this.SpellCheckHandler) {
-			this.SpellCheckHandler.unsubscribe();
-		}
-		if (this.contextMenuListener) {
-			this.contextMenuListener.unsubscribe();
-		}
-	}
-}
-
-module.exports = new SetupSpellChecker();

app/renderer/js/spellchecker.ts

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

app/renderer/js/tray.ts

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

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

@@ -1,11 +1,14 @@
 'use strict';
 
-const { app, dialog } = require('electron').remote;
-const fs = require('fs');
-const path = require('path');
-const JsonDB = require('node-json-db');
-const Logger = require('./logger-util');
-const { initSetUp } = require('./default-util');
+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();
 
@@ -14,10 +17,12 @@ const logger = new Logger({
 	timestamp: true
 });
 
-let instance = null;
+let instance: null | CertificateUtil = null;
 const certificatesDir = `${app.getPath('userData')}/certificates`;
 
 class CertificateUtil {
+	db: JsonDB;
+
 	constructor() {
 		if (instance) {
 			return instance;
@@ -28,7 +33,8 @@ class CertificateUtil {
 		this.reloadDB();
 		return instance;
 	}
-	getCertificate(server, defaultValue = null) {
+
+	getCertificate(server: string, defaultValue: any = null): any {
 		this.reloadDB();
 		const value = this.db.getData('/')[server];
 		if (value === undefined) {
@@ -37,8 +43,9 @@ class CertificateUtil {
 			return value;
 		}
 	}
+
 	// Function to copy the certificate to userData folder
-	copyCertificate(server, location, fileName) {
+	copyCertificate(_server: string, location: string, fileName: string): boolean {
 		let copied = false;
 		const filePath = `${certificatesDir}/${fileName}`;
 		try {
@@ -54,16 +61,19 @@ class CertificateUtil {
 		}
 		return copied;
 	}
-	setCertificate(server, fileName) {
+
+	setCertificate(server: string, fileName: string): void {
 		const filePath = `${certificatesDir}/${fileName}`;
 		this.db.push(`/${server}`, filePath, true);
 		this.reloadDB();
 	}
-	removeCertificate(server) {
+
+	removeCertificate(server: string): void {
 		this.db.delete(`/${server}`);
 		this.reloadDB();
 	}
-	reloadDB() {
+
+	reloadDB(): void {
 		const settingsJsonPath = path.join(app.getPath('userData'), '/config/certificates.json');
 		try {
 			const file = fs.readFileSync(settingsJsonPath, 'utf8');
@@ -83,4 +93,4 @@ class CertificateUtil {
 	}
 }
 
-module.exports = new CertificateUtil();
+export = new CertificateUtil();

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

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

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

@@ -1,32 +1,33 @@
 'use strict';
+import JsonDB from 'node-json-db';
 
-const fs = require('fs');
-const path = require('path');
-const process = require('process');
-const JsonDB = require('node-json-db');
-const Logger = require('./logger-util');
+import fs = require('fs');
+import path = require('path');
+import electron = require('electron');
+import Logger = require('./logger-util');
 
 const logger = new Logger({
 	file: 'config-util.log',
 	timestamp: true
 });
 
-let instance = null;
-let dialog = null;
-let app = null;
+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 = require('electron').remote;
+	const { remote } = electron;
 	dialog = remote.dialog;
 	app = remote.app;
 } else {
-	const electron = require('electron');
 	dialog = electron.dialog;
 	app = electron.app;
 }
 
 class ConfigUtil {
+	db: JsonDB;
+
 	constructor() {
 		if (instance) {
 			return instance;
@@ -38,7 +39,7 @@ class ConfigUtil {
 		return instance;
 	}
 
-	getConfigItem(key, defaultValue = null) {
+	getConfigItem(key: string, defaultValue: any = null): any {
 		try {
 			this.db.reload();
 		} catch (err) {
@@ -53,8 +54,9 @@ class ConfigUtil {
 			return value;
 		}
 	}
+
 	// This function returns whether a key exists in the configuration file (settings.json)
-	isConfigItemExists(key) {
+	isConfigItemExists(key: string): boolean {
 		try {
 			this.db.reload();
 		} catch (err) {
@@ -65,17 +67,17 @@ class ConfigUtil {
 		return (value !== undefined);
 	}
 
-	setConfigItem(key, value) {
+	setConfigItem(key: string, value: any): void {
 		this.db.push(`/${key}`, value, true);
 		this.db.save();
 	}
 
-	removeConfigItem(key) {
+	removeConfigItem(key: string): void {
 		this.db.delete(`/${key}`);
 		this.db.save();
 	}
 
-	reloadDB() {
+	reloadDB(): void {
 		const settingsJsonPath = path.join(app.getPath('userData'), '/config/settings.json');
 		try {
 			const file = fs.readFileSync(settingsJsonPath, 'utf8');
@@ -96,4 +98,4 @@ class ConfigUtil {
 	}
 }
 
-module.exports = new ConfigUtil();
+export = new ConfigUtil();

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

@@ -1,6 +1,6 @@
-const fs = require('fs');
+import fs = require('fs');
 
-let app = null;
+let app: Electron.App = null;
 let setupCompleted = false;
 if (process.type === 'renderer') {
 	app = require('electron').remote.app;
@@ -12,7 +12,7 @@ const zulipDir = app.getPath('userData');
 const logDir = `${zulipDir}/Logs/`;
 const certificatesDir = `${zulipDir}/certificates/`;
 const configDir = `${zulipDir}/config/`;
-const initSetUp = () => {
+export const initSetUp = (): void => {
 	// if it is the first time the app is running
 	// create zulip dir in userData folder to
 	// avoid errors
@@ -72,7 +72,3 @@ const initSetUp = () => {
 		setupCompleted = true;
 	}
 };
-
-module.exports = {
-	initSetUp
-};

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

@@ -1,17 +1,30 @@
 'use strict';
 
-const ConfigUtil = require(__dirname + '/config-util.js');
+import ConfigUtil = require('./config-util');
 
-function toggle() {
+// TODO: TypeScript - add to Setting interface
+// the list of settings since we have fixed amount of them
+// We want to do this by creating a new module that exports
+// this interface
+interface Setting {
+	[key: string]: any;
+}
+
+interface Toggle {
+	dnd: boolean;
+	newSettings: Setting;
+}
+
+export function toggle(): Toggle {
 	const dnd = !ConfigUtil.getConfigItem('dnd', false);
 	const dndSettingList = ['showNotification', 'silent'];
 	if (process.platform === 'win32') {
 		dndSettingList.push('flashTaskbarOnMessage');
 	}
 
-	let newSettings;
+	let newSettings: Setting;
 	if (dnd) {
-		const oldSettings = {};
+		const oldSettings: Setting = {};
 		newSettings = {};
 
 		// Iterate through the dndSettingList.
@@ -35,7 +48,3 @@ function toggle() {
 	ConfigUtil.setConfigItem('dnd', dnd);
 	return {dnd, newSettings};
 }
-
-module.exports = {
-	toggle
-};

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

@@ -1,27 +1,29 @@
 'use strict';
+import JsonDB from 'node-json-db';
 
-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');
+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');
 
-const Logger = require('./logger-util');
+import RequestUtil = require('./request-util');
+import Messages = require('../../../resources/messages');
 
-const RequestUtil = require(__dirname + '/../utils/request-util.js');
-const Messages = require(__dirname + '/../../../resources/messages.js');
+const { app, dialog } = electron.remote;
 
 const logger = new Logger({
 	file: `domain-util.log`,
 	timestamp: true
 });
 
-let instance = null;
+let instance: null | DomainUtil = null;
 
 const defaultIconUrl = '../renderer/img/icon.png';
 
 class DomainUtil {
+	db: JsonDB;
 	constructor() {
 		if (instance) {
 			return instance;
@@ -42,7 +44,7 @@ class DomainUtil {
 		return instance;
 	}
 
-	getDomains() {
+	getDomains(): any {
 		this.reloadDB();
 		if (this.db.getData('/').domains === undefined) {
 			return [];
@@ -51,18 +53,18 @@ class DomainUtil {
 		}
 	}
 
-	getDomain(index) {
+	getDomain(index: number): any {
 		this.reloadDB();
 		return this.db.getData(`/domains[${index}]`);
 	}
 
-	updateDomain(index, server) {
+	updateDomain(index: number, server: object): void {
 		this.reloadDB();
 		this.db.push(`/domains[${index}]`, server, true);
 	}
 
-	addDomain(server) {
-		const ignoreCerts = server.ignoreCerts;
+	addDomain(server: any): Promise<void> {
+		const { ignoreCerts } = server;
 		return new Promise(resolve => {
 			if (server.icon) {
 				this.saveServerIcon(server, ignoreCerts).then(localIconUrl => {
@@ -80,18 +82,18 @@ class DomainUtil {
 		});
 	}
 
-	removeDomains() {
+	removeDomains(): void {
 		this.db.delete('/domains');
 		this.reloadDB();
 	}
 
-	removeDomain(index) {
+	removeDomain(index: number): void {
 		this.db.delete(`/domains[${index}]`);
 		this.reloadDB();
 	}
 
 	// Check if domain is already added
-	duplicateDomain(domain) {
+	duplicateDomain(domain: any): boolean {
 		domain = this.formatUrl(domain);
 		const servers = this.getDomains();
 		for (const i in servers) {
@@ -102,30 +104,30 @@ class DomainUtil {
 		return false;
 	}
 
-	async checkCertError(domain, serverConf, error, silent) {
+	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));
+			logger.reportSentry(new Error(error).toString());
 			const certErrorMessage = Messages.certErrorMessage(domain, error);
 			const certErrorDetail = Messages.certErrorDetail();
 
-			const response = await dialog.showMessageBox({
+			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 (err) {
+				} catch (_) {
 					if (error === Messages.noOrgsError(domain)) {
 						throw new Error(error);
 					}
@@ -139,7 +141,7 @@ class DomainUtil {
 
 	// ignoreCerts parameter helps in fetching server icon and
 	// other server details when user chooses to ignore certificate warnings
-	async checkDomain(domain, ignoreCerts = false, silent = false) {
+	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.');
@@ -168,25 +170,21 @@ class DomainUtil {
 
 			const certsError = error.toString().includes('certificate');
 			if (domain.indexOf(whitelistDomains) >= 0 || certsError) {
-				try {
-					return await this.checkCertError(domain, serverConf, error, silent);
-				} catch (err) {
-					throw err;
-				}
+				return this.checkCertError(domain, serverConf, error, silent);
 			} else {
 				throw Messages.invalidZulipServerError(domain);
 			}
 		}
 	}
 
-	getServerSettings(domain, ignoreCerts = false) {
+	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, response) => {
+			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) {
@@ -208,7 +206,7 @@ class DomainUtil {
 		});
 	}
 
-	saveServerIcon(server, ignoreCerts = false) {
+	saveServerIcon(server: any, ignoreCerts = false): Promise<string> {
 		const url = server.icon;
 		const domain = server.url;
 
@@ -222,8 +220,8 @@ class DomainUtil {
 			const filePath = this.generateFilePath(url);
 			const file = fs.createWriteStream(filePath);
 			try {
-				request(serverIconOptions).on('response', response => {
-					response.on('error', err => {
+				request(serverIconOptions).on('response', (response: any) => {
+					response.on('error', (err: string) => {
 						logger.log('Could not get server icon.');
 						logger.log(err);
 						logger.reportSentry(err);
@@ -232,7 +230,7 @@ class DomainUtil {
 					response.pipe(file).on('finish', () => {
 						resolve(filePath);
 					});
-				}).on('error', err => {
+				}).on('error', (err: string) => {
 					logger.log('Could not get server icon.');
 					logger.log(err);
 					logger.reportSentry(err);
@@ -247,9 +245,9 @@ class DomainUtil {
 		});
 	}
 
-	updateSavedServer(url, index) {
+	updateSavedServer(url: string, index: number): void {
 		// Does not promise successful update
-		const ignoreCerts = this.getDomain(index).ignoreCerts;
+		const { ignoreCerts } = this.getDomain(index);
 		this.checkDomain(url, ignoreCerts, true).then(newServerConf => {
 			this.saveServerIcon(newServerConf, ignoreCerts).then(localIconUrl => {
 				newServerConf.icon = localIconUrl;
@@ -259,7 +257,7 @@ class DomainUtil {
 		});
 	}
 
-	reloadDB() {
+	reloadDB(): void {
 		const domainJsonPath = path.join(app.getPath('userData'), 'config/domain.json');
 		try {
 			const file = fs.readFileSync(domainJsonPath, 'utf8');
@@ -280,7 +278,7 @@ class DomainUtil {
 		this.db = new JsonDB(domainJsonPath, true, true);
 	}
 
-	generateFilePath(url) {
+	generateFilePath(url: string): string {
 		const dir = `${app.getPath('userData')}/server-icons`;
 		const extension = path.extname(url).split('?')[0];
 
@@ -299,7 +297,7 @@ class DomainUtil {
 		return `${dir}/${hash >>> 0}${extension}`;
 	}
 
-	formatUrl(domain) {
+	formatUrl(domain: any): string {
 		const hasPrefix = (domain.indexOf('http') === 0);
 		if (hasPrefix) {
 			return domain;
@@ -309,4 +307,4 @@ class DomainUtil {
 	}
 }
 
-module.exports = new DomainUtil();
+export = new DomainUtil();

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

@@ -1,8 +1,14 @@
 'use strict';
 
-const wurl = require('wurl');
+// TODO: TypeScript - Add @types/
+import wurl = require('wurl');
 
-let instance = null;
+let instance: null | LinkUtil = null;
+
+interface IsInternalResponse {
+	isInternalUrl: boolean;
+	isUploadsUrl: boolean;
+}
 
 class LinkUtil {
 	constructor() {
@@ -15,7 +21,7 @@ class LinkUtil {
 		return instance;
 	}
 
-	isInternal(currentUrl, newUrl) {
+	isInternal(currentUrl: string, newUrl: string): IsInternalResponse {
 		const currentDomain = wurl('hostname', currentUrl);
 		const newDomain = wurl('hostname', newUrl);
 
@@ -29,17 +35,17 @@ class LinkUtil {
 		};
 	}
 
-	isImage(url) {
+	isImage(url: string): boolean {
 		// test for images extension as well as urls like .png?s=100
 		const isImageUrl = /\.(bmp|gif|jpg|jpeg|png|webp)\?*.*$/i;
 		return isImageUrl.test(url);
 	}
 
-	isPDF(url) {
+	isPDF(url: string): boolean {
 		// test for pdf extension
 		const isPDFUrl = /\.(pdf)\?*.*$/i;
 		return isPDFUrl.test(url);
 	}
 }
 
-module.exports = new LinkUtil();
+export = new LinkUtil();

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

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

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

@@ -1,37 +1,57 @@
-const NodeConsole = require('console').Console;
-const fs = require('fs');
-const os = require('os');
-const isDev = require('electron-is-dev');
-const { initSetUp } = require('./default-util');
-const { sentryInit, captureException } = require('./sentry-util');
+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 = null;
+let app: Electron.App = null;
 let reportErrors = true;
 if (process.type === 'renderer') {
-	app = require('electron').remote.app;
+	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 } = require('electron');
+	const { ipcRenderer } = electron;
 	ipcRenderer.send('error-reporting');
-	ipcRenderer.on('error-reporting-val', (event, errorReporting) => {
+	ipcRenderer.on('error-reporting-val', (_event: any, errorReporting: boolean) => {
 		reportErrors = errorReporting;
 		if (reportErrors) {
 			sentryInit();
 		}
 	});
 } else {
-	app = require('electron').app;
+	app = electron.app;
 }
 
-const browserConsole = console;
+const browserConsole: PatchedConsole = console;
 const logDir = `${app.getPath('userData')}/Logs`;
 
 class Logger {
-	constructor(opts = {}) {
+	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',
@@ -61,7 +81,7 @@ class Logger {
 		this.setUpConsole();
 	}
 
-	_log(type, ...args) {
+	_log(type: string, ...args: any[]): void {
 		const {
 			nodeConsole, timestamp, level, logInDevMode
 		} = this;
@@ -77,7 +97,7 @@ class Logger {
 
 			case isDev || logInDevMode:
 				nodeConsoleLog = nodeConsole[type] || nodeConsole.log;
-				nodeConsoleLog.apply(null, args);
+				nodeConsoleLog.apply(null, args); // eslint-disable-line prefer-spread
 
 			default: break;
 		}
@@ -86,19 +106,20 @@ class Logger {
 		browserConsole[type].apply(null, args);
 	}
 
-	setUpConsole() {
+	setUpConsole(): void {
 		for (const type in browserConsole) {
 			this.setupConsoleMethod(type);
 		}
 	}
 
-	setupConsoleMethod(type) {
-		this[type] = (...args) => {
-			this._log(type, ...args);
+	setupConsoleMethod(type: string): void {
+		this[type] = (...args: any[]) => {
+			const log = this._log.bind(this, type, ...args);
+			log();
 		};
 	}
 
-	getTimestamp() {
+	getTimestamp(): string {
 		const date = new Date();
 		const timestamp =
 			`${date.getMonth()}/${date.getDate()} ` +
@@ -106,13 +127,13 @@ class Logger {
 		return timestamp;
 	}
 
-	reportSentry(err) {
+	reportSentry(err: string): void {
 		if (reportErrors) {
 			captureException(err);
 		}
 	}
 
-	trimLog(file) {
+	trimLog(file: string): void{
 		fs.readFile(file, 'utf8', (err, data) => {
 			if (err) {
 				throw err;
@@ -131,4 +152,4 @@ class Logger {
 	}
 }
 
-module.exports = Logger;
+export = Logger;

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

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

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

@@ -1,9 +1,15 @@
 'use strict';
 
-const url = require('url');
-const ConfigUtil = require('./config-util.js');
+import url = require('url');
 
-let instance = null;
+import ConfigUtil = require('./config-util');
+
+let instance: null | ProxyUtil = null;
+
+interface ProxyRule {
+	hostname?: string;
+	port?: number;
+}
 
 class ProxyUtil {
 	constructor() {
@@ -17,8 +23,13 @@ class ProxyUtil {
 	}
 
 	// Return proxy to be used for a particular uri, to be used for request
-	getProxy(uri) {
-		uri = url.parse(uri);
+	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.
@@ -27,9 +38,9 @@ class ProxyUtil {
 			return;
 		}
 
-		const proxyRule = {};
+		const proxyRule: any = {};
 		if (uri.protocol === 'http:') {
-			proxyRules.forEach(proxy => {
+			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];
@@ -39,7 +50,7 @@ class ProxyUtil {
 		}
 
 		if (uri.protocol === 'https:') {
-			proxyRules.forEach(proxy => {
+			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];
@@ -49,14 +60,15 @@ class ProxyUtil {
 		}
 	}
 
-	resolveSystemProxy(mainWindow) {
+	// 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 => {
+			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
@@ -70,12 +82,12 @@ class ProxyUtil {
 		});
 		// Check HTTPS Proxy
 		const httpsProxy = new Promise(resolve => {
-			ses.resolveProxy('https://' + resolveProxyUrl, proxy => {
+			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'))) {
+					if (proxy.includes('PROXY') || proxy.includes('HTTPS')) {
 						httpsString += 'https=' + proxy.split('PROXY')[1] + ';';
 					}
 				}
@@ -85,7 +97,7 @@ class ProxyUtil {
 
 		// Check FTP Proxy
 		const ftpProxy = new Promise(resolve => {
-			ses.resolveProxy('ftp://' + resolveProxyUrl, proxy => {
+			ses.resolveProxy('ftp://' + resolveProxyUrl, (proxy: string) => {
 				let ftpString = '';
 				if (proxy !== 'DIRECT') {
 					if (proxy.includes('PROXY')) {
@@ -98,7 +110,7 @@ class ProxyUtil {
 
 		// Check SOCKS Proxy
 		const socksProxy = new Promise(resolve => {
-			ses.resolveProxy('socks4://' + resolveProxyUrl, proxy => {
+			ses.resolveProxy('socks4://' + resolveProxyUrl, (proxy: string) => {
 				let socksString = '';
 				if (proxy !== 'DIRECT') {
 					if (proxy.includes('SOCKS5')) {
@@ -127,4 +139,4 @@ class ProxyUtil {
 	}
 }
 
-module.exports = new ProxyUtil();
+export = new ProxyUtil();

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

@@ -1,5 +1,5 @@
-const isOnline = require('is-online');
-const Logger = require('./logger-util');
+import isOnline = require('is-online');
+import Logger = require('./logger-util');
 
 const logger = new Logger({
 	file: `domain-util.log`,
@@ -7,16 +7,22 @@ const logger = new Logger({
 });
 
 class ReconnectUtil {
-	constructor(serverManagerView) {
+	// 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() {
+	clearState(): void {
 		this.alreadyReloaded = false;
 	}
 
-	pollInternetAndReload() {
+	pollInternetAndReload(): void {
 		const pollInterval = setInterval(() => {
 			this._checkAndReload()
 				.then(status => {
@@ -28,14 +34,15 @@ class ReconnectUtil {
 		}, 1500);
 	}
 
-	_checkAndReload() {
+	// 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 => {
+					.then((online: boolean) => {
 						if (online) {
 							if (!this.alreadyReloaded) {
-								this.serverManagerView.reloadView();
+								this.serverManagerView.reloadCurrentView();
 							}
 							logger.log('You\'re back online.');
 							return resolve(true);
@@ -57,4 +64,4 @@ class ReconnectUtil {
 	}
 }
 
-module.exports = ReconnectUtil;
+export = ReconnectUtil;

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

@@ -1,29 +1,39 @@
-const fs = require('fs');
-const Logger = require('./logger-util');
-
-const CertificateUtil = require(__dirname + '/certificate-util.js');
-const ProxyUtil = require(__dirname + '/proxy-util.js');
-const ConfigUtil = require(__dirname + '/config-util.js');
-const SystemUtil = require(__dirname + '/../utils/system-util.js');
+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;
+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, ignoreCerts) {
+	requestOptions(domain: string, ignoreCerts: boolean): RequestUtilResponse {
 		domain = this.formatUrl(domain);
 		const certificate = CertificateUtil.getCertificate(
 			encodeURIComponent(domain)
@@ -32,9 +42,9 @@ class RequestUtil {
 		if (certificate) {
 			// To handle case where certificate has been moved from the location in certificates.json
 			try {
-				certificateLocation = fs.readFileSync(certificate);
+				certificateLocation = fs.readFileSync(certificate, 'utf8');
 			} catch (err) {
-				logger.warn('Error while trying to get certificate: ' + err);
+				logger.warn(`Error while trying to get certificate: ${err}`);
 			}
 		}
 		const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
@@ -49,14 +59,15 @@ class RequestUtil {
 		};
 	}
 
-	formatUrl(domain) {
-		const hasPrefix = (domain.indexOf('http') === 0);
+	formatUrl(domain: string): string {
+		const hasPrefix = domain.startsWith('http', 0);
 		if (hasPrefix) {
 			return domain;
 		} else {
-			return (domain.indexOf('localhost:') >= 0) ? `http://${domain}` : `https://${domain}`;
+			return domain.includes('localhost:') ? `http://${domain}` : `https://${domain}`;
 		}
 	}
 }
 
-module.exports = new RequestUtil();
+const requestUtil = new RequestUtil();
+export = requestUtil;

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

@@ -1,20 +0,0 @@
-const { init, captureException } = require('@sentry/electron');
-const isDev = require('electron-is-dev');
-
-const sentryInit = () => {
-	if (!isDev) {
-		init({
-			dsn: '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
-		});
-	}
-};
-
-module.exports = {
-	sentryInit,
-	captureException
-};

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

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

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

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

app/renderer/main.html

@@ -55,6 +55,11 @@
             <send-feedback></send-feedback>
         </div>
     </body>
-    <script src="js/main.js"></script>
+    
+    <script>
+        // we don't use src='./js/main' in the script tag because
+        // it messes up require module path resolution
+        require('./js/main');
+    </script>
     <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/renderer/preference.html

@@ -12,6 +12,8 @@
             <div id="settings-container"></div>
         </div>
     </body>
-    <script src="js/pages/preference/preference.js"></script>
-    <script>require('./js/shared/preventdrag.js')</script>
+    <script>
+        require('./js/pages/preference/preference.js');
+        require('./js/shared/preventdrag.js')
+    </script>
 </html>

app/resources/messages.ts

@@ -1,5 +1,5 @@
 class Messages {
-	invalidZulipServerError(domain) {
+	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.\
@@ -7,16 +7,16 @@ class Messages {
 			\n • The server has a valid certificate. (You can add custom certificates in Settings > Organizations).`;
 	}
 
-	noOrgsError(domain) {
+	noOrgsError(domain: string): string {
 		return `${domain} does not have any organizations added.\
 		\nPlease contact your server administrator.`;
 	}
 
-	certErrorMessage(domain, error) {
+	certErrorMessage(domain: string, error: string): string {
 		return `Do you trust certificate from ${domain}? \n ${error}`;
 	}
 
-	certErrorDetail() {
+	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.
@@ -24,4 +24,4 @@ class Messages {
 	}
 }
 
-module.exports = new Messages();
+export = new Messages();

changelog.md

@@ -2,6 +2,40 @@
 
 All notable changes to the Zulip desktop app are documented in this file.
 
+### v3.1.0-beta --2019-07-19
+
+**New features**:
+* Add option to find accounts by email.
+* Add option to hide Menu bar to View menu.
+* Show a loading indicator in the sidebar.
+* Update Help Center to open help page of the currently active server.
+* Improve auto-detection of spellchecker language.
+* Disable menu items on non-server pages.
+* Support dark mode on macOS.
+
+**Fixes**:
+* Updated, more robust server validation logic.
+* Fix JSON DB errors observed when switching tabs.
+* Remove unused `isLoading` function from `Tab`.
+* Remove unused `defaultId` parameter.
+* Fix syntax error in `proxy-util.js`.
+* Fix issue with creation of large `.node` files in the `Temp` folder on Windows machines.
+* Fix issue where drafts were not saved properly.
+
+**Development**:
+* Migrate codebase to TypeScript.
+* Set the indent_size in `.editconfig` to 4.
+* Use `.env` file for reading Sentry DSN.
+
+**Documentation**:
+* Improve development guide.
+
+**Module updates**:
+* Upgrade xo to v0.24.0.
+* Upgrade node-json-db to v0.9.2.
+* Upgrade electron to v3.1.10.
+* Add missing transitive dependencies.
+
 ### v3.0.0 --2019-05-20
 
 **New features**:

gulpfile.js

@@ -5,16 +5,37 @@ const electron = require('electron-connect').server.create({
 });
 const tape = require('gulp-tape');
 const tapColorize = require('tap-colorize');
+const ts = require("gulp-typescript");
+const tsProject = ts.createProject("tsconfig.json");
+
+const glob = require('glob');
+const { execSync } = require('child_process');
+
+const baseFilePattern = 'app/+(main|renderer)/**/*';
+const globOptions = { cwd: __dirname };
+const jsFiles = glob.sync(baseFilePattern + '.js', globOptions);
+const tsFiles = glob.sync(baseFilePattern + '.ts', globOptions);
+if (jsFiles.length !== tsFiles.length) {
+	const npx = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+	console.log('Compiling typescript files...');
+	execSync(`${npx} tsc`);
+}
+
+gulp.task("compile", function () {
+    return tsProject.src()
+        .pipe(tsProject())
+        .js.pipe(gulp.dest("app"));
+});
 
 gulp.task('dev', () => {
   // Start browser process
 	electron.start();
   // Restart browser process
-	gulp.watch('app/main/*.js', gulp.series('restart:browser'));
+	gulp.watch('app/main/*.ts', gulp.series('compile', 'restart:browser'));
   // Reload renderer process
 	gulp.watch('app/renderer/css/*.css', gulp.series('reload:renderer'));
 	gulp.watch('app/renderer/*.html', gulp.series('reload:renderer'));
-	gulp.watch('app/renderer/js/**/*.js', gulp.series('reload:renderer'));
+	gulp.watch('app/renderer/js/**/*.ts', gulp.series('compile', 'reload:renderer'));
 });
 
 gulp.task('restart:browser', done => {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "3.0.0",
+  "version": "3.1.0-beta",
   "main": "./app/main",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
@@ -21,7 +21,9 @@
     "node": ">=6.0.0"
   },
   "scripts": {
-    "start": "electron app --disable-http-cache --no-electron-connect",
+    "start": "node tools/run-dev",
+    "clean-ts-files": "git clean app/*.js -xf",
+    "watch-ts": "tsc -w",
     "reinstall": "node ./tools/reinstall-node-modules.js",
     "postinstall": "electron-builder install-app-deps",
     "lint-css": "stylelint app/renderer/css/*.css",
@@ -29,10 +31,11 @@
     "lint-js": "xo",
     "test": "npm run lint-html && npm run lint-css && npm run lint-js",
     "test-e2e": "gulp test-e2e",
-    "dev": "gulp dev & nodemon --watch app/main --watch app/renderer --exec 'npm test' -e html,css,js",
-    "pack": "electron-builder --dir",
-    "dist": "electron-builder",
-    "mas": "electron-builder --mac mas",
+    "compile": "gulp compile",
+    "dev": "gulp dev && npm test",
+    "pack": "tsc && electron-builder --dir",
+    "dist": "tsc && electron-builder",
+    "mas": "tsc && electron-builder --mac mas",
     "travis": "cd ./scripts && ./travis-build-test.sh",
     "build-locales": "node tools/locale-helper"
   },
@@ -42,6 +45,9 @@
   "build": {
     "appId": "org.zulip.zulip-electron",
     "asar": true,
+    "asarUnpack": [
+      "**/*.node"
+    ],
     "files": [
       "**/*",
       "!docs${/*}",
@@ -50,6 +56,7 @@
     "copyright": "©2019 Kandra Labs, Inc.",
     "mac": {
       "category": "public.app-category.productivity",
+      "darkModeSupport": true,
       "artifactName": "${productName}-${version}-${arch}.${ext}"
     },
     "linux": {
@@ -124,6 +131,10 @@
     "InstantMessaging"
   ],
   "devDependencies": {
+    "@types/adm-zip": "^0.4.32",
+    "@types/dotenv": "6.1.1",
+    "@typescript-eslint/eslint-plugin": "1.10.2",
+    "@typescript-eslint/parser": "1.10.2",
     "assert": "1.4.1",
     "cp-file": "5.0.0",
     "devtron": "1.4.0",
@@ -131,9 +142,12 @@
     "electron-builder": "20.40.2",
     "electron-connect": "0.6.2",
     "electron-debug": "1.4.0",
+    "eslint-config-xo-typescript": "0.14.0",
+    "fs-extra": "8.1.0",
     "google-translate-api": "2.3.0",
     "gulp": "4.0.0",
     "gulp-tape": "0.0.9",
+    "gulp-typescript": "5.0.1",
     "htmlhint": "0.11.0",
     "is-ci": "1.0.10",
     "nodemon": "1.14.11",
@@ -142,24 +156,31 @@
     "stylelint": "9.10.1",
     "tap-colorize": "1.2.0",
     "tape": "4.8.0",
-    "xo": "0.18.2"
+    "typescript": "3.5.2",
+    "xo": "0.24.0"
   },
   "xo": {
+    "extends": "xo-typescript",
+    "extensions": [
+      "ts"
+    ],
     "parserOptions": {
-      "sourceType": "script",
+      "ecmaVersion": 6,
+      "sourceType": "module",
       "ecmaFeatures": {
-        "globalReturn": true
+        "globalReturn": true,
+        "modules": true
       }
     },
     "esnext": true,
     "overrides": [
       {
-        "files": "app*/**/*.js",
+        "files": "app/**/*.ts",
         "rules": {
           "max-lines": [
             "warn",
             {
-              "max": 700,
+              "max": 800,
               "skipBlankLines": true,
               "skipComments": true
             }
@@ -174,13 +195,26 @@
           "prefer-promise-reject-errors": 0,
           "import/no-unresolved": 0,
           "import/no-extraneous-dependencies": 0,
-          "no-prototype-builtins": 0
+          "no-prototype-builtins": 0,
+          "lines-between-class-members": 0,
+          "padding-line-between-statements": 0,
+          "quotes": 0,
+          "unicorn/catch-error-name": 0,
+          "unicorn/no-console-spaces": 0,
+          "node/no-deprecated-api": 0,
+          "@typescript-eslint/member-ordering": "never",
+          "@typescript-eslint/restrict-plus-operands": "never",
+          "import/default": 0,
+          "@typescript-eslint/no-unused-vars": 0
         }
       }
     ],
     "ignore": [
       "tests/*.js",
-      "tools/locale-helper/*.js"
+      "tools/locale-helper/*.js",
+      "*/**/*.js",
+      "*.js",
+      "typings.d.ts"
     ],
     "envs": [
       "node",

tools/run-dev

@@ -0,0 +1,89 @@
+#!/usr/bin/env node
+
+const path = require('path');
+const glob = require('glob');
+const chalk = require('chalk');
+const { spawn } = require('child_process');
+
+async function run(task, commandToRun, opts = {}) {
+  const args = commandToRun.split(' ');
+  let cmd = args[0];
+  args.splice(0, 1);
+
+  if (process.platform === 'win32' && /np(m|x)/.test(cmd)) {
+    cmd = cmd + '.cmd';
+  }
+
+  const defaults = {
+    cwd: path.resolve(__dirname, '..'),
+    env: process.env,
+    stdio: 'pipe'
+  };
+
+  opts = { ...defaults, ...opts };
+  task = ' ' + task + ' ';
+  
+  const colors = [
+    { bg: 'bold.bgGreen', color: 'bold.green' },
+    { bg: 'bold.bgMagenta', color: 'bold.magenta' },
+    { bg: 'bold.bgBlue', color: 'bold.blue' },
+    { bg: 'bold.bgYellow', color: 'bold.yellow' },
+    { bg: 'bold.bgCyan', color: 'bold.cyan' },
+    { bg: 'bold.bgKeyword("rebeccapurple")', color: 'bold.keyword("rebeccapurple")' },
+    { bg: 'bold.bgKeyword("darkslategray")', color: 'bold.keyword("darkslategray")' },
+  ];
+
+  const randomColorIndex = Math.floor((Math.random() * (colors.length * 1000)) / 1000);
+  const randomColor = colors[randomColorIndex];
+  console.log(chalk`{${randomColor.bg} ${ task }} {${randomColor.color} ${commandToRun}}`);
+
+  const proc = spawn(cmd, args, opts);
+  proc.stderr.on('data', data => console.log(data.toString()));
+  proc.stdout.on('data', data => console.log(data.toString()));
+
+  return new Promise((resolve, reject) => {
+    function check(code) {
+      if (code !== 0) {
+        reject(chalk`{bgRed ERROR!} Running {red ${commandToRun}} failed with exit code: ${code}`);
+      } else {
+        resolve();
+      }
+
+      // we don't want to exit after compiling typescript files
+      // but instead want to do it if the tsc -w or electron app died.
+      if (commandToRun !== 'npx tsc') {
+        process.exit(0); 
+      }
+    }
+
+    proc.on('exit', check);
+    proc.on('close', check);
+    proc.on('error', () => {
+      reject();
+      process.exit(0);
+    });
+  });
+}
+
+async function main() {
+  const baseFilePattern = 'app/+(main|renderer)/**/*';
+  const globOptions = { cwd: path.resolve(__dirname, '..') };
+  const jsFiles = glob.sync(baseFilePattern + '.js', globOptions);
+  const tsFiles = glob.sync(baseFilePattern + '.ts', globOptions);
+
+
+  // if the are missing compiled js file for typescript files
+  // run the typescript compiler before starting the app
+  if (jsFiles.length !== tsFiles.length) {
+    console.log('Compiling typescript files...');
+    await run('TypeScript', 'npx tsc');
+  }
+
+  await Promise.all([
+    run('Electron app', 'npx electron app --disable-http-cache --no-electron-connect'),
+    run('TypeScript watch mode', 'npx tsc --watch --pretty')
+  ]);
+}
+
+main()
+  .catch(err => console.error(err));

tsconfig.json

@@ -0,0 +1,29 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+
+    /* Strict type-checking */
+    "strict": true,
+    "noImplicitAny": true,
+    "strictNullChecks": false,
+    "noImplicitThis": true,
+    "alwaysStrict": true,
+
+    /* Additional checks */
+    "noUnusedLocals": true,
+    "noUnusedParameters": false,
+    "noImplicitReturns": true
+  },
+  "include":[
+    "app/**/*",
+    "typings.d.ts"
+  ],
+  "exclude":[
+    "node_modules",
+    "app/node_modules"
+  ]
+}

typings.d.ts

@@ -0,0 +1,54 @@
+declare module 'adm-zip';
+declare module 'auto-launch';
+declare module 'is-online';
+declare module 'request';
+declare module 'semver';
+declare module '@electron-elements/send-feedback';
+declare module 'node-mac-notifier';
+declare module 'electron-connect';
+declare module 'electron-is-dev';
+declare module 'electron-spellchecker';
+declare module 'escape-html';
+declare module 'fs-extra';
+declare module 'wurl';
+
+interface PageParamsObject {
+    realm_uri: string;
+    default_language: string;
+}
+declare var page_params: PageParamsObject;
+
+// since requestIdleCallback didn't make it into lib.dom.d.ts yet
+declare function requestIdleCallback(callback: Function, options?: object): void;
+
+// Patch Notification object so we can implement our side
+// of Notification classes which we export into zulip side through
+// preload.js; if we don't do his extending Notification will throw error.
+// Relevant code is in app/renderer/js/notification/default-notification.ts
+// and the relevant function is requestPermission.
+declare var PatchedNotification: {
+  prototype: Notification;
+  new(title: string, options?: NotificationOptions): Notification;
+  readonly maxActions: number;
+  readonly permission: NotificationPermission;
+  requestPermission(): void;
+}
+
+// This is mostly zulip side of code we access from window
+interface Window {
+  $: any;
+  narrow: any
+  Notification: typeof PatchedNotification;
+}
+
+// typescript doesn't have up to date NotificationOptions yet
+interface NotificationOptions {
+  silent?: boolean;
+}
+
+interface ZulipWebWindow extends Window {
+    electron_bridge: any;
+    tray: any;
+    $: any;
+    lightbox: any;
+}