release: New beta release v5.4.1-beta.

Update the screenshots to accomodate new Zulip logo and both the day and night modes

.editorconfig

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

.gitattributes

@@ -1 +1,14 @@
-* text=auto
+* text=auto eol=lf
+
+*.gif binary
+*.jpg binary
+*.jpeg binary
+*.eot binary
+*.woff binary
+*.woff2 binary
+*.svg binary
+*.ttf binary
+*.png binary
+*.otf binary
+*.tif binary
+*.ogg binary

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+<!-- Clear steps to reproduce the issue. -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Desktop (please complete the following information):**
+ - Operating System: 
+ <!-- (Platform and Version) e.g. macOS 10.13.6 / Windows 10 (1803) / Ubuntu 18.04 x64 -->
+ - Zulip Desktop Version:
+<!-- e.g. 5.2.0 --> 
+
+**Additional context**
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,6 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,16 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+---
+
+**Problem Description**
+<!-- Please add a clear and concise description of what the problem is. -->
+
+**Proposed Solution**
+<!-- Describe the solution you'd like in a clear and concise manner -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+---
+<!--
+Remove the fields that are not appropriate
+Please include:
+-->
+
+**What's this PR do?**
+
+**Any background context you want to provide?**
+
+**Screenshots?**
+
+**You have tested this PR on:**
+  - [ ] Windows
+  - [ ] Linux/Ubuntu
+  - [ ] macOS

.gitignore

@@ -1,9 +1,44 @@
-node_modules
-npm-debug.log
-domain.json
-dist
-config.gypi
+# Dependency directory
+/node_modules/
+
+# npm cache directory
+.npm
+
+# transifexrc - if user prefers it to be in working tree
+.transifexrc
+
+# Compiled binary build directory
+dist/
+
+#snap generated files
+snap/parts
+snap/prime
+snap/snap
+snap/stage
+snap/*.snap
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
 // osx garbage
 *.DS_Store
 .DS_Store
+
+# dotenv environment variables file
+.env
+
+# miscellaneous
+.idea
+config.gypi
+
+# Test generated files
+# tests/package.json
+
+.python-version
+
+# Ignore all the typescript compiled files
+app/**/*.js

.htmlhintrc

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

.mailmap

@@ -0,0 +1,5 @@
+Anders Kaseorg <anders@zulip.com> <anders@zulipchat.com>
+Rishi Gupta <rishig@zulip.com> <rishig@zulipchat.com>
+Rishi Gupta <rishig@zulip.com> <rishig@users.noreply.github.com>
+Tim Abbott <tabbott@zulip.com> <tabbott@zulipchat.com>
+Tim Abbott <tabbott@zulip.com> <tabbott@mit.edu>

.node-version

@@ -0,0 +1 @@
+6.9.4

.stylelintrc

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

.travis.yml

@@ -1,6 +1,3 @@
-sudo: required
-dist: trusty
-
 os:
 - osx
 - linux
@@ -15,24 +12,12 @@ addons:
 
 language: node_js
 node_js:
-- '6'
-
-before_install:
-- npm install -g gulp
-- npm install
+- '10'
+- '12'
 
 cache:
   directories:
   - node_modules
-  - app/node_modules
-  - $HOME/.electron
-  - $HOME/.cache
 
 script:
-- npm run travis
-notifications:
-  webhooks:
-    urls:
-      - https://zulip.org/zulipbot/travis
-    on_success: always
-    on_failure: always
+- npm run test

.tx/config

@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+
+[zulip.desktopjson]
+file_filter = app/translations/<lang>.json
+minimum_perc = 0
+source_file = app/translations/en.json
+source_lang = en
+type = KEYVALUEJSON

CONTRIBUTING.md

@@ -2,44 +2,46 @@
 
 Thanks for taking the time to contribute!
 
-The following is a set of guidelines for contributing to zulip-electron. These are just guidelines, not rules, use your best judgement and feel free to propose changes to this document in a pull request.
+The following is a set of guidelines for contributing to Zulip's desktop Client. These are just guidelines, not rules, so use your best judgement and feel free to propose changes to this document in a pull request.
 
 ## Getting Started
 
-Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If you are new to Electron please head over to [this](http://jlord.us/essential-electron/) great article.
+Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If you are new to Electron, please head over to [this](https://jlord.us/essential-electron) great article.
 
 ## Community
 
-* The whole zulip documentation such as development environment, setting up with zulip project, testing, code of conduct can be read [here](https://zulip.readthedocs.io).
+* The whole Zulip documentation, such as setting up a development environment, setting up with the Zulip webapp project, and testing, can be read [here](https://zulip.readthedocs.io).
 
-* If you have any questions regarding zulip-electron, open an [issue](https://github.com/zulip/zulip-electron/issues/new/) or ask it [here](https://chat.zulip.org/#narrow/stream/electron).
+* If you have any questions regarding zulip-desktop, open an [issue](https://github.com/zulip/zulip-desktop/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/16-desktop).
 
 ## Issue
-Ensure the bug was not already reported by searching on GitHub under [Issues](https://github.com/zulip/zulip-electron/issues). If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/zulip/zulip-electron/issues/new). Please pay attention to following points while opening an issue.
+Ensure the bug was not already reported by searching on GitHub under [issues](https://github.com/zulip/zulip-desktop/issues). If you're unable to find an open issue addressing the bug, open a [new issue](https://github.com/zulip/zulip-desktop/issues/new).
 
-The [Zulipbot](https://github.com/zulip/zulipbot) helps to claim the issue by commenting the following in the comment section: "**@zulipbot** claim". **@zulipbot** will assign you to the issue and label the issue as **in progress**. For more details, check out [**@zulipbot**](https://github.com/zulip/zulipbot).
+The [zulipbot](https://github.com/zulip/zulipbot) helps to claim an issue by commenting the following in the comment section: "**@zulipbot** claim". **@zulipbot** will assign you to the issue and label the issue as **in progress**. For more details, check out [**@zulipbot**](https://github.com/zulip/zulipbot).
+
+Please pay attention to the following points while opening an issue.
 
 ### Does it happen on web browsers? (especially Chrome)
-Zulip-Desktop is based on Electron, which integrates the Chrome engine within a standalone application.
-If the problem you encounter can be reproduced on web browsers, it may be an issue with Zulip web app.
+Zulip's desktop client is based on Electron, which integrates the Chrome engine within a standalone application.
+If the problem you encounter can be reproduced on web browsers, it may be an issue with [Zulip web app](https://github.com/zulip/zulip).
 
 ### Write detailed information
-Detailed information is very helpful to understand the problem.
+Detailed information is very helpful to understand an issue.
 
 For example:
-* How to reproduce, step-by-step
-* Expected behavior (or what is wrong)
-* Screenshots (for GUI issues)
-* Application version
-* Operating system
-* Zulip-Desktop version
+* How to reproduce the issue, step-by-step.
+* The expected behavior (or what is wrong).
+* Screenshots for GUI issues.
+* The application version.
+* The operating system.
+* The Zulip-Desktop version.
 
 
 ## Pull Requests
-Pull Requests are welcome. 
+Pull Requests are always welcome.
 
-1. When you edit the code, please run `npm run test` to check formatting of your code before git commit.
+1. When you edit the code, please run `npm run test` to check the formatting of your code before you `git commit`.
 2. Ensure the PR description clearly describes the problem and solution. It should include:
-   * Operating System version on which you tested
-   * Zulip-Desktop version on which you tested
-   * The relevant issue number if applicable
+   * The operating system on which you tested.
+   * The Zulip-Desktop version on which you tested.
+   * The relevant issue number, if applicable.

ISSUE_TEMPLATE.md

@@ -1,7 +0,0 @@
----
-Please include: 
-- `Operating System`
-- `Clear steps to reproduce the issue`
-- `Relevant error messages and/or screenshots`
-
-

README.md

@@ -1,82 +1,37 @@
 # Zulip Desktop Client
-[![Build Status](https://travis-ci.org/zulip/zulip-electron.svg?branch=master)](https://travis-ci.org/zulip/zulip-electron)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-electron?branch=master&svg=true)](https://ci.appveyor.com/project/akashnimare/zulip-electron/branch/master)
+[![Build Status](https://travis-ci.org/zulip/zulip-desktop.svg?branch=master)](https://travis-ci.org/zulip/zulip-desktop)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-desktop?branch=master&svg=true)](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/master)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
+[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://chat.zulip.org)
 
-This is an experimental replacement for the [Zulip Desktop
-app](https://github.com/zulip/zulip-desktop) implemented in
-[Electron](http://electron.atom.io/).eeee
+Desktop client for Zulip. Available for Mac, Linux, and Windows.
 
-The goal is to achieve feature-compatibility with the old desktop app
-and then start adding cool features like easy support for
-multi-account, auto-updates etc.
+<img src="https://i.imgur.com/s1o6TRA.png"/>
+<img src="https://i.imgur.com/vekKnW4.png"/>
 
-## Prerequisites
-* node >= v6.3.1
-> Use [nvm](https://github.com/creationix/nvm) to install the current stable version of node
+# Download
+Please see the [installation guide](https://zulip.com/help/desktop-app-install-guide).
 
+# Features
+* Sign in to multiple organizations
+* Desktop notifications with inline reply
+* Tray/dock integration
+* Multi-language spell checker
+* Automatic updates
 
-* python (v2.7.x recommended)
-* If you're on Debian or Ubuntu, you'll need to install following packages:
-```sh
-$ sudo apt-get install build-essential libxext-dev libxtst-dev libxkbfile-dev
-```
+# Reporting issues
 
-## Installation
+This desktop client shares most of its code with the Zulip webapp.
+Issues in an individual organization's Zulip window should be reported
+in the [Zulip server and webapp
+project](https://github.com/zulip/zulip/issues/new).  Other
+issues in the desktop app and its settings should be reported [in this
+project](https://github.com/zulip/zulip-desktop/issues/new).
 
-Clone the source locally:
+# Contribute
 
-```sh
-$ git clone https://github.com/zulip/zulip-electron
-$ cd zulip-electron
-```
+First, join us on the [Zulip community server](https://zulip.readthedocs.io/en/latest/contributing/chat-zulip-org.html)!
+Also see our [contribution guidelines](./CONTRIBUTING.md) and our [development guide](./development.md).
 
-Install project dependencies:
-
-```sh
-$ npm install
-```
-Start the app:
-
-```sh
-$ npm start
-```
-
-Start and watch changes  
-
-```sh
-$ npm run dev
-```
-# Making a release
-
-To package app into an installer use command:
-```
-npm run dist
-```
-It will start the packaging process for operating system you are running this command on. Ready for distribution file (e.g. dmg, windows installer, deb package) will be outputted to `dist` directory.
-
-You can create Windows installer only when running on Windows, the same is true for Linux and OSX. So to generate all three installers you need all three operating systems.
-
-
-## Features
-
-- [x] Native Notifications
-- [x] SpellChecker
-- [x] OSX/Win/Linux installer
-- [x] Automatic Updates (macOS/Windows)
-- [x] Keyboard shortcuts
-
-Description            | Keys
------------------------| -----------------------
-Default shortcuts      | <kbd>Cmd/Ctrl</kbd> <kbd>k</kbd>
-Change Zulip Server    | <kbd>Cmd/Ctrl</kbd> <kbd>,</kbd>
-Back                   | <kbd>Cmd/Ctrl</kbd> <kbd>[</kbd>
-Forward                | <kbd>Cmd/Ctrl</kbd> <kbd>]</kbd>
-
-
-## Contribute
-
-If you want to contribute please make sure to read [our documentation about contributing](./CONTRIBUTING.md) first.
-
-* [Issue Tracker](https://github.com/zulip/zulip-electron/issues)
-* [Source Code](https://github.com/zulip/zulip-electron/)
+# License
+Released under the [Apache-2.0](./LICENSE) license.

app/main/autoupdater.js

@@ -1,47 +0,0 @@
-'use strict';
-const {app, dialog} = require('electron');
-const {autoUpdater} = require('electron-updater');
-
-function appUpdater() {
-	// Log whats happening
-	const log = require('electron-log');
-	log.transports.file.level = 'info';
-	autoUpdater.logger = log;
-	/*
-	autoUpdater.on('error', err => log.info(err));
-	autoUpdater.on('checking-for-update', () => log.info('checking-for-update'));
-	autoUpdater.on('update-available', () => log.info('update-available'));
-	autoUpdater.on('update-not-available', () => log.info('update-not-available'));
-	*/
-
-	// Ask the user if update is available
-	// eslint-disable-next-line no-unused-vars
-	autoUpdater.on('update-downloaded', (event, info) => {
-		// let message = app.getName() + ' ' + info.releaseName + ' is now available. It will be installed the next time you restart the application.';
-		// if (info.releaseNotes) {
-			// const splitNotes = info.releaseNotes.split(/[^\r]\n/);
-			// message += '\n\nRelease notes:\n';
-			// splitNotes.forEach(notes => {
-				// message += notes + '\n\n';
-			// });
-		// }
-		// Ask user to update the app
-		dialog.showMessageBox({
-			type: 'question',
-			buttons: ['Install and Relaunch', 'Later'],
-			defaultId: 0,
-			message: 'A new version of ' + app.getName() + ' has been downloaded',
-			detail: 'It will be installed the next time you restart the application'
-		}, response => {
-			if (response === 0) {
-				setTimeout(() => autoUpdater.quitAndInstall(), 1);
-			}
-		});
-	});
-	// init for updates
-	autoUpdater.checkForUpdates();
-}
-
-exports = module.exports = {
-	appUpdater
-};

app/main/autoupdater.ts

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

app/main/domain.js

@@ -1,48 +0,0 @@
-const {app} = require('electron').remote;
-const ipcRenderer = require('electron').ipcRenderer;
-const JsonDB = require('node-json-db');
-const request = require('request');
-
-const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
-const data = db.getData('/');
-
-console.log(data.domain);
-window.addDomain = function () {
-	let newDomain = document.getElementById('url').value;
-	newDomain = newDomain.replace(/^https?:\/\//, '');
-	newDomain = newDomain.replace(/^http?:\/\//, '');
-	if (newDomain === '') {
-		document.getElementById('server-status').innerHTML = 'Please input a value';
-	} else {
-		document.getElementById('main').innerHTML = 'Checking...';
-		if (newDomain.indexOf('localhost:') >= 0) {
-			const domain = 'http://' + newDomain;
-			const checkDomain = domain + '/static/audio/zulip.ogg';
-			request(checkDomain, (error, response) => {
-				if (!error && response.statusCode !== 404) {
-					document.getElementById('main').innerHTML = 'Connect';
-					db.push('/domain', domain);
-					ipcRenderer.send('new-domain', domain);
-				} else {
-					document.getElementById('main').innerHTML = 'Connect';
-					document.getElementById('server-status').innerHTML = 'Not a valid Zulip Local Server.';
-				}
-			});
-			//	});
-		} else {
-			const domain = 'https://' + newDomain;
-			const checkDomain = domain + '/static/audio/zulip.ogg';
-
-			request(checkDomain, (error, response) => {
-				if (!error && response.statusCode !== 404) {
-					document.getElementById('main').innerHTML = 'Connect';
-					db.push('/domain', domain);
-					ipcRenderer.send('new-domain', domain);
-				} else {
-					document.getElementById('main').innerHTML = 'Connect';
-					document.getElementById('server-status').innerHTML = 'Not a valid Zulip Server.';
-				}
-			});
-		}
-	}
-};

app/main/index.js

@@ -1,321 +0,0 @@
-'use strict';
-const path = require('path');
-const fs = require('fs');
-const os = require('os');
-const electron = require('electron');
-const {app} = require('electron');
-const ipc = require('electron').ipcMain;
-const {dialog} = require('electron');
-const https = require('https');
-const http = require('http');
-const electronLocalshortcut = require('electron-localshortcut');
-const Configstore = require('electron-config');
-const JsonDB = require('node-json-db');
-const isDev = require('electron-is-dev');
-const tray = require('./tray');
-const appMenu = require('./menu');
-const {linkIsInternal, skipImages} = require('./link-helper');
-const {appUpdater} = require('./autoupdater');
-
-const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
-const data = db.getData('/');
-
-// adds debug features like hotkeys for triggering dev tools and reload
-require('electron-debug')();
-
-const conf = new Configstore();
-
-function userOS() {
-	if (os.platform() === 'darwin') {
-		return 'Mac';
-	}
-	if (os.platform() === 'linux') {
-		return 'Linux';
-	}
-	if (os.platform() === 'win32' || os.platform() === 'win64') {
-		if (parseFloat(os.release()) < 6.2) {
-			return 'Windows 7';
-		} else {
-			return 'Windows 10';
-		}
-	}
-}
-
-// setting userAgent so that server-side code can identify the desktop app
-const isUserAgent = 'ZulipElectron/' + app.getVersion() + ' ' + userOS();
-
-// prevent window being garbage collected
-let mainWindow;
-let targetLink;
-
-// Load this url in main window
-const staticURL = 'file://' + path.join(__dirname, '../renderer', 'index.html');
-
-const targetURL = function () {
-	if (data.domain === undefined) {
-		return staticURL;
-	}
-	return data.domain;
-};
-
-function serverError(targetURL) {
-	if (targetURL.indexOf('localhost:') < 0 && data.domain) {
-		const req = https.request(targetURL + '/static/audio/zulip.ogg', res => {
-			console.log('Server StatusCode:', res.statusCode);
-			console.log('You are connected to:', res.req._headers.host);
-			if (res.statusCode >= 500 && res.statusCode <= 599) {
-				return dialog.showErrorBox('SERVER IS DOWN!', 'We are getting a ' + res.statusCode + ' error status from the server ' + res.req._headers.host + '. Please try again after some time or you may switch server.');
-			}
-		});
-		req.on('error', e => {
-			console.error(e);
-		});
-		req.end();
-	} else if (data.domain) {
-		const req = http.request(targetURL + '/static/audio/zulip.ogg', res => {
-			console.log('Server StatusCode:', res.statusCode);
-			console.log('You are connected to:', res.req._headers.host);
-		});
-		req.on('error', e => {
-			console.error(e);
-		});
-		req.end();
-	}
-}
-
-function checkConnectivity() {
-	return dialog.showMessageBox({
-		title: 'Internet connection problem',
-		message: 'No internet available! Try again?',
-		type: 'warning',
-		buttons: ['Try again', 'Close'],
-		defaultId: 0
-	}, index => {
-		if (index === 0) {
-			mainWindow.webContents.reload();
-		}
-		if (index === 1) {
-			app.quit();
-		}
-	});
-}
-
-function checkConnection() {
-	// eslint-disable-next-line no-unused-vars
-	mainWindow.webContents.on('did-fail-load', (event, errorCode, errorDescription, validatedURL) => {
-		if (errorDescription === 'ERR_INTERNET_DISCONNECTED' || errorDescription === 'ERR_PROXY_CONNECTION_FAILED') {
-			console.log('Error Description:' + errorDescription);
-			checkConnectivity();
-		}
-	});
-}
-
-const isAlreadyRunning = app.makeSingleInstance(() => {
-	if (mainWindow) {
-		if (mainWindow.isMinimized()) {
-			mainWindow.restore();
-		}
-
-		mainWindow.show();
-	}
-});
-
-if (isAlreadyRunning) {
-	app.quit();
-}
-
-function checkWindowURL() {
-	if (data.domain !== undefined) {
-		return data.domain;
-	}
-	return targetLink;
-}
-
-function isWindowsOrmacOS() {
-	return process.platform === 'darwin' || process.platform === 'win32';
-}
-
-const APP_ICON = path.join(__dirname, '../resources', 'Icon');
-
-const iconPath = () => {
-	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
-};
-
-function onClosed() {
-	// Dereference the window
-	// For multiple windows, store them in an array
-	mainWindow = null;
-}
-
-function updateDockBadge(title) {
-	if (title.indexOf('Zulip') === -1) {
-		return;
-	}
-
-	let messageCount = (/\(([0-9]+)\)/).exec(title);
-	messageCount = messageCount ? Number(messageCount[1]) : 0;
-
-	if (process.platform === 'darwin') {
-		app.setBadgeCount(messageCount);
-	}
-}
-
-function createMainWindow() {
-	const win = new electron.BrowserWindow({
-		// This settings needs to be saved in config
-		title: 'Zulip',
-		width: conf.get('width') || 1000,
-		height: conf.get('height') || 600,
-		icon: iconPath(),
-		minWidth: 600,
-		minHeight: 400,
-		webPreferences: {
-			preload: path.join(__dirname, 'preload.js'),
-			plugins: true,
-			allowDisplayingInsecureContent: true,
-			nodeIntegration: false
-		},
-		show: false
-	});
-
-	win.once('ready-to-show', () => {
-		win.show();
-	});
-
-	serverError(targetURL());
-
-	win.loadURL(targetURL(), {
-		userAgent: isUserAgent + ' ' + win.webContents.getUserAgent()
-	});
-
-	win.on('closed', onClosed);
-	win.setTitle('Zulip');
-
-	// Let's save browser window position
-	if (conf.get('x') || conf.get('y')) {
-		win.setPosition(conf.get('x'), conf.get('y'));
-	}
-
-	if (conf.get('maximize')) {
-		win.maximize();
-	}
-
-	// Handle sizing events so we can persist them.
-	win.on('maximize', () => {
-		conf.set('maximize', true);
-	});
-
-	win.on('unmaximize', () => {
-		conf.set('maximize', false);
-	});
-
-	win.on('resize', function () {
-		const size = this.getSize();
-		conf.set({
-			width: size[0],
-			height: size[1]
-		});
-	});
-
-	// on osx it's 'moved'
-	win.on('move', function () {
-		const pos = this.getPosition();
-		conf.set({
-			x: pos[0],
-			y: pos[1]
-		});
-	});
-
-	// stop page to update it's title
-	win.on('page-title-updated', (e, title) => {
-		e.preventDefault();
-		updateDockBadge(title);
-	});
-
-	return win;
-}
-
-// TODO - fix certificate errors
-app.commandLine.appendSwitch('ignore-certificate-errors', 'true');
-
-app.on('window-all-closed', () => {
-	// unregister all the shortcuts so that they don't interfare with other apps
-	electronLocalshortcut.unregisterAll(mainWindow);
-	if (process.platform !== 'darwin') {
-		app.quit();
-	}
-});
-
-app.on('activate', () => {
-	if (!mainWindow) {
-		mainWindow = createMainWindow();
-	}
-});
-
-app.on('ready', () => {
-	electron.Menu.setApplicationMenu(appMenu);
-	mainWindow = createMainWindow();
-	tray.create();
-
-	const page = mainWindow.webContents;
-
-	// TODO - use global shortcut instead
-	electronLocalshortcut.register(mainWindow, 'CommandOrControl+R', () => {
-		mainWindow.reload();
-	});
-
-	electronLocalshortcut.register(mainWindow, 'CommandOrControl+[', () => {
-		if (page.canGoBack()) {
-			page.goBack();
-		}
-	});
-
-	electronLocalshortcut.register(mainWindow, 'CommandOrControl+]', () => {
-		if (page.canGoForward()) {
-			page.goForward();
-		}
-	});
-
-	page.on('dom-ready', () => {
-		page.insertCSS(fs.readFileSync(path.join(__dirname, 'preload.css'), 'utf8'));
-		mainWindow.show();
-	});
-
-	page.on('new-window', (event, url) => {
-		if (linkIsInternal(checkWindowURL(), url) && url.match(skipImages) === null) {
-			event.preventDefault();
-			return mainWindow.loadURL(url);
-		}
-		event.preventDefault();
-		electron.shell.openExternal(url);
-	});
-
-	page.once('did-frame-finish-load', () => {
-		const checkOS = isWindowsOrmacOS();
-		if (checkOS && !isDev) {
-			// Initate auto-updates on MacOS and Windows
-			appUpdater();
-		}
-	});
-	checkConnection();
-});
-
-app.on('will-quit', () => {
-	// unregister all the shortcuts so that they don't interfare with other apps
-	electronLocalshortcut.unregisterAll(mainWindow);
-});
-
-ipc.on('new-domain', (e, domain) => {
-	// mainWindow.loadURL(domain);
-	if (!mainWindow) {
-		mainWindow = createMainWindow();
-		mainWindow.loadURL(domain);
-	} else if (mainWindow.isMinimized()) {
-		mainWindow.loadURL(domain);
-		mainWindow.show();
-	} else {
-		mainWindow.loadURL(domain);
-		serverError(domain);
-	}
-	targetLink = domain;
-});

app/main/index.ts

@@ -0,0 +1,473 @@
+
+import electron, {app, dialog, ipcMain, session} from 'electron';
+import fs from 'fs';
+import path from 'path';
+
+import windowStateKeeper from 'electron-window-state';
+
+import * as BadgeSettings from '../renderer/js/pages/preference/badge-settings';
+import * as CertificateUtil from '../renderer/js/utils/certificate-util';
+import * as ConfigUtil from '../renderer/js/utils/config-util';
+import * as ProxyUtil from '../renderer/js/utils/proxy-util';
+import {sentryInit} from '../renderer/js/utils/sentry-util';
+
+import {appUpdater} from './autoupdater';
+import * as AppMenu from './menu';
+import {_getServerSettings, _saveServerIcon, _isOnline} from './request';
+import {setAutoLaunch} from './startup';
+
+let mainWindowState: windowStateKeeper.State;
+
+// Prevent window being garbage collected
+let mainWindow: Electron.BrowserWindow;
+let badgeCount: number;
+
+let isQuitting = false;
+
+// Load this url in main window
+const mainURL = 'file://' + path.join(__dirname, '../renderer', 'main.html');
+
+const singleInstanceLock = app.requestSingleInstanceLock();
+if (singleInstanceLock) {
+	app.on('second-instance', () => {
+		if (mainWindow) {
+			if (mainWindow.isMinimized()) {
+				mainWindow.restore();
+			}
+
+			mainWindow.show();
+		}
+	});
+} else {
+	app.quit();
+}
+
+const rendererCallbacks = new Map();
+let nextRendererCallbackId = 0;
+
+ipcMain.on('renderer-callback', (event: Event, rendererCallbackId: number, ...args: any[]) => {
+	rendererCallbacks.get(rendererCallbackId)(...args);
+	rendererCallbacks.delete(rendererCallbackId);
+});
+
+function makeRendererCallback(callback: (...args: any[]) => void): number {
+	rendererCallbacks.set(nextRendererCallbackId, callback);
+	return nextRendererCallbackId++;
+}
+
+const APP_ICON = path.join(__dirname, '../resources', 'Icon');
+
+const iconPath = (): string => APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
+
+// Toggle the app window
+const toggleApp = (): void => {
+	if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
+		mainWindow.show();
+	} else {
+		mainWindow.hide();
+	}
+};
+
+function createMainWindow(): Electron.BrowserWindow {
+	// Load the previous state with fallback to defaults
+	const mainWindowState: windowStateKeeper.State = windowStateKeeper({
+		defaultWidth: 1100,
+		defaultHeight: 720,
+		path: `${app.getPath('userData')}/config`
+	});
+
+	const win = new electron.BrowserWindow({
+		// This settings needs to be saved in config
+		title: 'Zulip',
+		icon: iconPath(),
+		x: mainWindowState.x,
+		y: mainWindowState.y,
+		width: mainWindowState.width,
+		height: mainWindowState.height,
+		minWidth: 500,
+		minHeight: 400,
+		webPreferences: {
+			plugins: true,
+			nodeIntegration: true,
+			partition: 'persist:webviewsession',
+			webviewTag: true
+		},
+		show: false
+	});
+
+	win.on('focus', () => {
+		win.webContents.send('focus');
+	});
+
+	(async () => win.loadURL(mainURL))();
+
+	// Keep the app running in background on close event
+	win.on('close', event => {
+		if (ConfigUtil.getConfigItem('quitOnClose')) {
+			app.quit();
+		}
+
+		if (!isQuitting) {
+			event.preventDefault();
+
+			if (process.platform === 'darwin') {
+				app.hide();
+			} else {
+				win.hide();
+			}
+		}
+	});
+
+	win.setTitle('Zulip');
+
+	win.on('enter-full-screen', () => {
+		win.webContents.send('enter-fullscreen');
+	});
+
+	win.on('leave-full-screen', () => {
+		win.webContents.send('leave-fullscreen');
+	});
+
+	//  To destroy tray icon when navigate to a new URL
+	win.webContents.on('will-navigate', event => {
+		if (event) {
+			win.webContents.send('destroytray');
+		}
+	});
+
+	// Let us register listeners on the window, so we can update the state
+	// automatically (the listeners will be removed when the window is closed)
+	// and restore the maximized or full screen state
+	mainWindowState.manage(win);
+
+	return win;
+}
+
+// Decrease load on GPU (experimental)
+app.disableHardwareAcceleration();
+
+// Temporary fix for Electron render colors differently
+// More info here - https://github.com/electron/electron/issues/10732
+app.commandLine.appendSwitch('force-color-profile', 'srgb');
+
+// This event is only available on macOS. Triggers when you click on the dock icon.
+app.on('activate', () => {
+	if (mainWindow) {
+		// If there is already a window show it
+		mainWindow.show();
+	} else {
+		mainWindow = createMainWindow();
+	}
+});
+
+app.on('ready', () => {
+	const ses = session.fromPartition('persist:webviewsession');
+	ses.setUserAgent(`ZulipElectron/${app.getVersion()} ${ses.getUserAgent()}`);
+
+	ipcMain.on('set-spellcheck-langs', () => {
+		ses.setSpellCheckerLanguages(ConfigUtil.getConfigItem('spellcheckerLanguages'));
+	});
+	AppMenu.setMenu({
+		tabs: []
+	});
+	mainWindow = createMainWindow();
+
+	// Auto-hide menu bar on Windows + Linux
+	if (process.platform !== 'darwin') {
+		const shouldHideMenu = ConfigUtil.getConfigItem('autoHideMenubar') || false;
+		mainWindow.autoHideMenuBar = shouldHideMenu;
+		mainWindow.setMenuBarVisibility(!shouldHideMenu);
+	}
+
+	// Initialize sentry for main process
+	const errorReporting = ConfigUtil.getConfigItem('errorReporting');
+	if (errorReporting) {
+		sentryInit();
+	}
+
+	const isSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
+
+	if (isSystemProxy) {
+		(async () => ProxyUtil.resolveSystemProxy(mainWindow))();
+	}
+
+	const page = mainWindow.webContents;
+
+	page.on('dom-ready', () => {
+		if (ConfigUtil.getConfigItem('startMinimized')) {
+			mainWindow.hide();
+		} else {
+			mainWindow.show();
+		}
+	});
+
+	ipcMain.on('fetch-user-agent', event => {
+		event.returnValue = session.fromPartition('persist:webviewsession').getUserAgent();
+	});
+
+	ipcMain.handle('get-server-settings', async (event, domain: string) => _getServerSettings(domain, ses));
+
+	ipcMain.handle('save-server-icon', async (event, url: string) => _saveServerIcon(url, ses));
+
+	ipcMain.handle('is-online', async (event, url: string) => _isOnline(url, ses));
+
+	page.once('did-frame-finish-load', async () => {
+		// Initiate auto-updates on MacOS and Windows
+		if (ConfigUtil.getConfigItem('autoUpdate')) {
+			await appUpdater();
+		}
+	});
+
+	app.on('certificate-error', (
+		event: Event,
+		webContents: Electron.WebContents,
+		urlString: string,
+		error: string,
+		certificate: Electron.Certificate,
+		callback: (isTrusted: boolean) => void
+	) /* eslint-disable-line max-params */ => {
+		// TODO: The entire concept of selectively ignoring certificate errors
+		// is ill-conceived, and this handler needs to be deleted.
+
+		const url = new URL(urlString);
+		if (url.protocol === 'wss:') {
+			url.protocol = 'https:';
+		}
+
+		const filename = CertificateUtil.getCertificate(encodeURIComponent(url.origin));
+		if (filename !== undefined) {
+			try {
+				const savedCertificate = fs.readFileSync(
+					path.join(`${app.getPath('userData')}/certificates`, filename),
+					'utf8'
+				);
+				if (certificate.data.replace(/[\r\n]/g, '') ===
+					savedCertificate.replace(/[\r\n]/g, '')) {
+					event.preventDefault();
+					callback(true);
+					return;
+				}
+			} catch (error) {
+				console.error(`Error reading certificate file ${filename}:`, error);
+			}
+		}
+
+		dialog.showErrorBox(
+			'Certificate error',
+			`The server presented an invalid certificate for ${url.origin}:
+
+${error}`
+		);
+	});
+
+	page.session.setPermissionRequestHandler((webContents, permission, callback, details) => {
+		const {origin} = new URL(details.requestingUrl);
+		page.send('permission-request', {
+			webContentsId: webContents.id === mainWindow.webContents.id ?
+				null :
+				webContents.id,
+			origin,
+			permission
+		}, makeRendererCallback(callback));
+	});
+
+	// Temporarily remove this event
+	// electron.powerMonitor.on('resume', () => {
+	// 	mainWindow.reload();
+	// 	page.send('destroytray');
+	// });
+
+	ipcMain.on('focus-app', () => {
+		mainWindow.show();
+	});
+
+	ipcMain.on('quit-app', () => {
+		app.quit();
+	});
+
+	// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+	// ipcMain.on('pdf-view', (event, url) => {
+	// 	// Paddings for pdfWindow so that it fits into the main browserWindow
+	// 	const paddingWidth = 55;
+	// 	const paddingHeight = 22;
+
+	// 	// Get the config of main browserWindow
+	// 	const mainWindowState = global.mainWindowState;
+
+	// 	// Window to view the pdf file
+	// 	const pdfWindow = new electron.BrowserWindow({
+	// 		x: mainWindowState.x + paddingWidth,
+	// 		y: mainWindowState.y + paddingHeight,
+	// 		width: mainWindowState.width - paddingWidth,
+	// 		height: mainWindowState.height - paddingHeight,
+	// 		webPreferences: {
+	// 			plugins: true,
+	// 			partition: 'persist:webviewsession'
+	// 		}
+	// 	});
+	// 	pdfWindow.loadURL(url);
+
+	// 	// We don't want to have the menu bar in pdf window
+	// 	pdfWindow.setMenu(null);
+	// });
+
+	// Reload full app not just webview, useful in debugging
+	ipcMain.on('reload-full-app', () => {
+		mainWindow.reload();
+		page.send('destroytray');
+	});
+
+	ipcMain.on('clear-app-settings', () => {
+		mainWindowState.unmanage();
+		app.relaunch();
+		app.exit();
+	});
+
+	ipcMain.on('toggle-app', () => {
+		toggleApp();
+	});
+
+	ipcMain.on('toggle-badge-option', () => {
+		BadgeSettings.updateBadge(badgeCount, mainWindow);
+	});
+
+	ipcMain.on('toggle-menubar', (_event: Electron.IpcMainEvent, showMenubar: boolean) => {
+		mainWindow.autoHideMenuBar = showMenubar;
+		mainWindow.setMenuBarVisibility(!showMenubar);
+		page.send('toggle-autohide-menubar', showMenubar, true);
+	});
+
+	ipcMain.on('update-badge', (_event: Electron.IpcMainEvent, messageCount: number) => {
+		badgeCount = messageCount;
+		BadgeSettings.updateBadge(badgeCount, mainWindow);
+		page.send('tray', messageCount);
+	});
+
+	ipcMain.on('update-taskbar-icon', (_event: Electron.IpcMainEvent, data: string, text: string) => {
+		BadgeSettings.updateTaskbarIcon(data, text, mainWindow);
+	});
+
+	ipcMain.on('forward-message', (_event: Electron.IpcMainEvent, listener: string, ...parameters: unknown[]) => {
+		page.send(listener, ...parameters);
+	});
+
+	ipcMain.on('update-menu', (_event: Electron.IpcMainEvent, props: AppMenu.MenuProps) => {
+		AppMenu.setMenu(props);
+		const activeTab = props.tabs[props.activeTabIndex];
+		if (activeTab) {
+			mainWindow.setTitle(`Zulip - ${activeTab.webviewName}`);
+		}
+	});
+
+	ipcMain.on('toggleAutoLauncher', async (_event: Electron.IpcMainEvent, AutoLaunchValue: boolean) => {
+		await setAutoLaunch(AutoLaunchValue);
+	});
+
+	ipcMain.on('downloadFile', (_event: Electron.IpcMainEvent, url: string, downloadPath: string) => {
+		page.downloadURL(url);
+		page.session.once('will-download', async (_event: Event, item) => {
+			if (ConfigUtil.getConfigItem('promptDownload', false)) {
+				const showDialogOptions: electron.SaveDialogOptions = {
+					defaultPath: path.join(downloadPath, item.getFilename())
+				};
+				item.setSaveDialogOptions(showDialogOptions);
+			} else {
+				const getTimeStamp = (): number => {
+					const date = new Date();
+					return date.getTime();
+				};
+
+				const formatFile = (filePath: string): string => {
+					const fileExtension = path.extname(filePath);
+					const baseName = path.basename(filePath, fileExtension);
+					return `${baseName}-${getTimeStamp()}${fileExtension}`;
+				};
+
+				const filePath = path.join(downloadPath, item.getFilename());
+
+				// Update the name and path of the file if it already exists
+				const updatedFilePath = path.join(downloadPath, formatFile(filePath));
+				const setFilePath: string = fs.existsSync(filePath) ? updatedFilePath : filePath;
+				item.setSavePath(setFilePath);
+			}
+
+			const updatedListener = (_event: Event, state: string): void => {
+				switch (state) {
+					case 'interrupted': {
+						// Can interrupted to due to network error, cancel download then
+						console.log('Download interrupted, cancelling and fallback to dialog download.');
+						item.cancel();
+						break;
+					}
+
+					case 'progressing': {
+						if (item.isPaused()) {
+							item.cancel();
+						}
+
+						// This event can also be used to show progress in percentage in future.
+						break;
+					}
+
+					default: {
+						console.info('Unknown updated state of download item');
+					}
+				}
+			};
+
+			item.on('updated', updatedListener);
+			item.once('done', (_event: Event, state) => {
+				if (state === 'completed') {
+					page.send('downloadFileCompleted', item.getSavePath(), path.basename(item.getSavePath()));
+				} else {
+					console.log('Download failed state:', state);
+					page.send('downloadFileFailed', state);
+				}
+
+				// To stop item for listening to updated events of this file
+				item.removeListener('updated', updatedListener);
+			});
+		});
+	});
+
+	ipcMain.on('realm-name-changed', (_event: Electron.IpcMainEvent, serverURL: string, realmName: string) => {
+		page.send('update-realm-name', serverURL, realmName);
+	});
+
+	ipcMain.on('realm-icon-changed', (_event: Electron.IpcMainEvent, serverURL: string, iconURL: string) => {
+		page.send('update-realm-icon', serverURL, iconURL);
+	});
+
+	// Using event.sender.send instead of page.send here to
+	// make sure the value of errorReporting is sent only once on load.
+	ipcMain.on('error-reporting', (event: Electron.IpcMainEvent) => {
+		event.sender.send('error-reporting-val', errorReporting);
+	});
+
+	ipcMain.on('save-last-tab', (_event: Electron.IpcMainEvent, index: number) => {
+		ConfigUtil.setConfigItem('lastActiveTab', index);
+	});
+
+	// Update user idle status for each realm after every 15s
+	const idleCheckInterval = 15 * 1000; // 15 seconds
+	setInterval(() => {
+		// Set user idle if no activity in 1 second (idleThresholdSeconds)
+		const idleThresholdSeconds = 1; // 1 second
+		const idleState = electron.powerMonitor.getSystemIdleState(idleThresholdSeconds);
+		if (idleState === 'active') {
+			page.send('set-active');
+		} else {
+			page.send('set-idle');
+		}
+	}, idleCheckInterval);
+});
+
+app.on('before-quit', () => {
+	isQuitting = true;
+});
+
+// Send crash reports
+process.on('uncaughtException', err => {
+	console.error(err);
+	console.error(err.stack);
+});

app/main/link-helper.js

@@ -1,15 +0,0 @@
-const wurl = require('wurl');
-
-// Check link if it's internal/external
-function linkIsInternal(currentUrl, newUrl) {
-	const currentDomain = wurl('hostname', currentUrl);
-	const newDomain = wurl('hostname', newUrl);
-	return currentDomain === newDomain;
-}
-
-// We'll be needing this to open images in default browser
-const skipImages = '.jpg|.gif|.png|.jpeg|.JPG|.PNG';
-
-exports = module.exports = {
-	linkIsInternal, skipImages
-};

app/main/linuxupdater.ts

@@ -0,0 +1,45 @@
+import {app, Notification, net} from 'electron';
+
+import getStream from 'get-stream';
+import semver from 'semver';
+
+import * as ConfigUtil from '../renderer/js/utils/config-util';
+import * as LinuxUpdateUtil from '../renderer/js/utils/linux-update-util';
+import Logger from '../renderer/js/utils/logger-util';
+
+import {fetchResponse} from './request';
+
+const logger = new Logger({
+	file: 'linux-update-util.log',
+	timestamp: true
+});
+
+export async function linuxUpdateNotification(session: Electron.session): Promise<void> {
+	let	url = 'https://api.github.com/repos/zulip/zulip-desktop/releases';
+	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
+
+	try {
+		const response = await fetchResponse(net.request({url, session}));
+		if (response.statusCode !== 200) {
+			logger.log('Linux update response status: ', response.statusCode);
+			return;
+		}
+
+		const data = JSON.parse(await getStream(response));
+		const latestVersion = ConfigUtil.getConfigItem('betaUpdate') ? data[0].tag_name : data.tag_name;
+		if (typeof latestVersion !== 'string') {
+			throw new TypeError('Expected string for tag_name');
+		}
+
+		if (semver.gt(latestVersion, app.getVersion())) {
+			const notified = LinuxUpdateUtil.getUpdateItem(latestVersion);
+			if (notified === null) {
+				new Notification({title: 'Zulip Update', body: `A new version ${latestVersion} is available. Please update using your package manager.`}).show();
+				LinuxUpdateUtil.setUpdateItem(latestVersion, true);
+			}
+		}
+	} catch (error) {
+		logger.error('Linux update error.');
+		logger.error(error);
+	}
+}

app/main/menu.js

@@ -1,362 +0,0 @@
-'use strict';
-const os = require('os');
-const electron = require('electron');
-
-const {dialog} = require('electron');
-
-const app = electron.app;
-const BrowserWindow = electron.BrowserWindow;
-const shell = electron.shell;
-const appName = app.getName();
-const tray = require('./tray');
-
-const {addDomain, about} = require('./windowmanager');
-
-function sendAction(action) {
-	const win = BrowserWindow.getAllWindows()[0];
-
-	if (process.platform === 'darwin') {
-		win.restore();
-	}
-
-	win.webContents.send(action);
-}
-
-function clearCache() {
-	const win = BrowserWindow.getAllWindows()[0];
-	const ses = win.webContents.session;
-	ses.clearCache(() => {
-		dialog.showMessageBox({type: 'info', buttons: [], message: 'Cache cleared!'});
-	});
-}
-
-const viewSubmenu = [
-	{
-		label: 'Reload',
-		click(item, focusedWindow) {
-			if (focusedWindow) {
-				focusedWindow.reload();
-			}
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		role: 'togglefullscreen'
-	},
-	{
-		label: 'Zoom In',
-		accelerator: 'CommandOrControl+=',
-		click(item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomIn');
-			}
-		}
-	},
-	{
-		label: 'Zoom Out',
-		accelerator: 'CommandOrControl+-',
-		click(item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomOut');
-			}
-		}
-	},
-	{
-		label: 'Actual Size',
-		accelerator: 'CommandOrControl+0',
-		click(item, focusedWindow) {
-			if (focusedWindow) {
-				sendAction('zoomActualSize');
-			}
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Toggle Tray Icon',
-		click(item, focusedWindow) {
-			if (focusedWindow) {
-				tray.toggle();
-			}
-		}
-	},
-	{
-		label: 'Toggle Developer Tools',
-		accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
-		click(item, focusedWindow) {
-			if (focusedWindow) {
-				focusedWindow.webContents.toggleDevTools();
-			}
-		}
-	}
-];
-
-const helpSubmenu = [
-	{
-		label: `${appName} Website`,
-		click() {
-			shell.openExternal('https://zulip.org');
-		}
-	},
-	{
-		label: `${appName + 'Desktop'} - ${app.getVersion()}`,
-		enabled: false
-	},
-	{
-		label: 'Report an Issue...',
-		click() {
-			const body = `
-<!-- Please succinctly describe your issue and steps to reproduce it. -->
--
-${app.getName()} ${app.getVersion()}
-Electron ${process.versions.electron}
-${process.platform} ${process.arch} ${os.release()}`;
-
-			shell.openExternal(`https://github.com/zulip/zulip-electron/issues/new?body=${encodeURIComponent(body)}`);
-		}
-	}
-];
-
-const darwinTpl = [
-
-	{
-		label: `${app.getName()}`,
-		submenu: [
-			{
-				label: 'Zulip desktop',
-				click() {
-					about();
-				}
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Change Zulip Server',
-				accelerator: 'Cmd+,',
-				click() {
-					addDomain();
-				}
-			},
-			{
-				label: 'Keyboard shortcuts',
-				accelerator: 'Cmd+K',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						sendAction('shortcut');
-					}
-				}
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Clear Cache',
-				click() {
-					clearCache();
-				}
-			},
-			{
-				label: 'Log Out',
-				accelerator: 'Cmd+L',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						sendAction('log-out');
-					}
-				}
-			},
-			{
-				type: 'separator'
-			},
-			{
-				role: 'services',
-				submenu: []
-			},
-			{
-				type: 'separator'
-			},
-			{
-				role: 'hide'
-			},
-			{
-				role: 'hideothers'
-			},
-			{
-				role: 'unhide'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				role: 'quit'
-			}
-		]
-	},
-	{
-		label: 'Edit',
-		submenu: [
-			{
-				role: 'undo'
-			},
-			{
-				role: 'redo'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				role: 'cut'
-			},
-			{
-				role: 'copy'
-			},
-			{
-				role: 'paste'
-			},
-			{
-				role: 'pasteandmatchstyle'
-			},
-			{
-				role: 'delete'
-			},
-			{
-				role: 'selectall'
-			}
-		]
-	},
-	{
-		label: 'View',
-		submenu: viewSubmenu
-	},
-	{
-		role: 'window',
-		submenu: [
-			{
-				role: 'minimize'
-			},
-			{
-				role: 'close'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				role: 'front'
-			}
-		]
-	},
-	{
-		role: 'help',
-		submenu: helpSubmenu
-	}
-];
-
-const otherTpl = [
-	{
-		label: 'File',
-		submenu: [
-			{
-				label: 'Zulip desktop',
-				click() {
-					about();
-				}
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Change Zulip Server',
-				accelerator: 'Ctrl+,',
-				click() {
-					addDomain();
-				}
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Keyboard shortcuts',
-				accelerator: 'Ctrl+K',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						sendAction('shortcut');
-					}
-				}
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Clear Cache',
-				click() {
-					clearCache();
-				}
-			},
-			{
-				label: 'Log Out',
-				accelerator: 'Ctrl+L',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						sendAction('log-out');
-					}
-				}
-			},
-			{
-				type: 'separator'
-			},
-			{
-				role: 'quit'
-			}
-		]
-	},
-	{
-		label: 'Edit',
-		submenu: [
-			{
-				role: 'undo'
-			},
-			{
-				role: 'redo'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				role: 'cut'
-			},
-			{
-				role: 'copy'
-			},
-			{
-				role: 'paste'
-			},
-			{
-				role: 'pasteandmatchstyle'
-			},
-			{
-				role: 'delete'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				role: 'selectall'
-			}
-		]
-	},
-	{
-		label: 'View',
-		submenu: viewSubmenu
-	},
-	{
-		role: 'help',
-		submenu: helpSubmenu
-	}
-];
-
-const tpl = process.platform === 'darwin' ? darwinTpl : otherTpl;
-
-module.exports = electron.Menu.buildFromTemplate(tpl);

app/main/menu.ts

@@ -0,0 +1,572 @@
+import {app, shell, BrowserWindow, Menu} from 'electron';
+
+import AdmZip from 'adm-zip';
+
+import type {TabData} from '../renderer/js/main';
+import * as ConfigUtil from '../renderer/js/utils/config-util';
+import * as DNDUtil from '../renderer/js/utils/dnd-util';
+import * as LinkUtil from '../renderer/js/utils/link-util';
+import * as t from '../renderer/js/utils/translation-util';
+
+import {appUpdater} from './autoupdater';
+
+export interface MenuProps {
+	tabs: TabData[];
+	activeTabIndex?: number;
+	enableMenu?: boolean;
+}
+
+const appName = app.name;
+
+function getHistorySubmenu(enableMenu: boolean): Electron.MenuItemConstructorOptions[] {
+	return [{
+		label: t.__('Back'),
+		accelerator: process.platform === 'darwin' ? 'Command+Left' : 'Alt+Left',
+		enabled: enableMenu,
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				sendAction('back');
+			}
+		}
+	}, {
+		label: t.__('Forward'),
+		accelerator: process.platform === 'darwin' ? 'Command+Right' : 'Alt+Right',
+		enabled: enableMenu,
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				sendAction('forward');
+			}
+		}
+	}];
+}
+
+function getToolsSubmenu(): Electron.MenuItemConstructorOptions[] {
+	return [{
+		label: t.__('Check for Updates'),
+		async click() {
+			await checkForUpdate();
+		}
+	},
+	{
+		label: t.__('Release Notes'),
+		async click() {
+			await LinkUtil.openBrowser(new URL(`https://github.com/zulip/zulip-desktop/releases/tag/v${app.getVersion()}`));
+		}
+	},
+	{
+		type: 'separator'
+	},
+	{
+		label: t.__('Download App Logs'),
+		click() {
+			const zip = new AdmZip();
+			const date = new Date();
+			const dateString = date.toLocaleDateString().replace(/\//g, '-');
+
+			// Create a zip file of all the logs and config data
+			zip.addLocalFolder(`${app.getPath('appData')}/${appName}/Logs`);
+			zip.addLocalFolder(`${app.getPath('appData')}/${appName}/config`);
+
+			// Put the log file in downloads folder
+			const logFilePath = `${app.getPath('downloads')}/Zulip-logs-${dateString}.zip`;
+			zip.writeZip(logFilePath);
+
+			// Open and select the log file
+			shell.showItemInFolder(logFilePath);
+		}
+	},
+	{
+		type: 'separator'
+	},
+	{
+		label: t.__('Toggle DevTools for Zulip App'),
+		accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				focusedWindow.webContents.openDevTools({mode: 'undocked'});
+			}
+		}
+	},
+	{
+		label: t.__('Toggle DevTools for Active Tab'),
+		accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				sendAction('tab-devtools');
+			}
+		}
+	}];
+}
+
+function getViewSubmenu(): Electron.MenuItemConstructorOptions[] {
+	return [{
+		label: t.__('Reload'),
+		accelerator: 'CommandOrControl+R',
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				sendAction('reload-current-viewer');
+			}
+		}
+	}, {
+		label: t.__('Hard Reload'),
+		accelerator: 'CommandOrControl+Shift+R',
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				sendAction('hard-reload');
+			}
+		}
+	}, {
+		type: 'separator'
+	}, {
+		label: t.__('Toggle Full Screen'),
+		role: 'togglefullscreen'
+	}, {
+		label: t.__('Zoom In'),
+		accelerator: 'CommandOrControl+=',
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				sendAction('zoomIn');
+			}
+		}
+	}, {
+		label: t.__('Zoom Out'),
+		accelerator: 'CommandOrControl+-',
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				sendAction('zoomOut');
+			}
+		}
+	}, {
+		label: t.__('Actual Size'),
+		accelerator: 'CommandOrControl+0',
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				sendAction('zoomActualSize');
+			}
+		}
+	}, {
+		type: 'separator'
+	}, {
+		label: t.__('Toggle Tray Icon'),
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				focusedWindow.webContents.send('toggletray');
+			}
+		}
+	}, {
+		label: t.__('Toggle Sidebar'),
+		accelerator: 'CommandOrControl+Shift+S',
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				const newValue = !ConfigUtil.getConfigItem('showSidebar');
+				focusedWindow.webContents.send('toggle-sidebar', newValue);
+				ConfigUtil.setConfigItem('showSidebar', newValue);
+			}
+		}
+	}, {
+		label: t.__('Auto hide Menu bar'),
+		checked: ConfigUtil.getConfigItem('autoHideMenubar', false),
+		visible: process.platform !== 'darwin',
+		click(_item, focusedWindow) {
+			if (focusedWindow) {
+				const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
+				focusedWindow.autoHideMenuBar = newValue;
+				focusedWindow.setMenuBarVisibility(!newValue);
+				focusedWindow.webContents.send('toggle-autohide-menubar', newValue);
+				ConfigUtil.setConfigItem('autoHideMenubar', newValue);
+			}
+		},
+		type: 'checkbox'
+	}];
+}
+
+function getHelpSubmenu(): Electron.MenuItemConstructorOptions[] {
+	return [
+		{
+			label: `${appName + ' Desktop'} v${app.getVersion()}`,
+			enabled: false
+		},
+		{
+			label: t.__('About Zulip'),
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('open-about');
+				}
+			}
+		},
+		{
+			label: t.__('Help Center'),
+			click(focusedWindow) {
+				if (focusedWindow) {
+					sendAction('open-help');
+				}
+			}
+		},
+		{
+			label: t.__('Report an Issue'),
+			click() {
+				// The goal is to notify the main.html BrowserWindow
+				// which may not be the focused window.
+				BrowserWindow.getAllWindows().forEach(window => {
+					window.webContents.send('open-feedback-modal');
+				});
+			}
+		}
+	];
+}
+
+function getWindowSubmenu(tabs: TabData[], activeTabIndex: number): Electron.MenuItemConstructorOptions[] {
+	const initialSubmenu: Electron.MenuItemConstructorOptions[] = [{
+		label: t.__('Minimize'),
+		role: 'minimize'
+	}, {
+		label: t.__('Close'),
+		role: 'close'
+	}];
+
+	if (tabs.length > 0) {
+		const ShortcutKey = process.platform === 'darwin' ? 'Cmd' : 'Ctrl';
+		initialSubmenu.push({
+			type: 'separator'
+		});
+		tabs.forEach(tab => {
+			// Do not add functional tab settings to list of windows in menu bar
+			if (tab.role === 'function' && tab.name === 'Settings') {
+				return;
+			}
+
+			initialSubmenu.push({
+				label: tab.name,
+				accelerator: tab.role === 'function' ? '' : `${ShortcutKey} + ${tab.index + 1}`,
+				checked: tab.index === activeTabIndex,
+				click(_item, focusedWindow) {
+					if (focusedWindow) {
+						sendAction('switch-server-tab', tab.index);
+					}
+				},
+				type: 'checkbox'
+			});
+		});
+		initialSubmenu.push({
+			type: 'separator'
+		});
+		initialSubmenu.push({
+			label: t.__('Switch to Next Organization'),
+			accelerator: 'Ctrl+Tab',
+			enabled: tabs.length > 1,
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('switch-server-tab', getNextServer(tabs, activeTabIndex));
+				}
+			}
+		}, {
+			label: t.__('Switch to Previous Organization'),
+			accelerator: 'Ctrl+Shift+Tab',
+			enabled: tabs.length > 1,
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('switch-server-tab', getPreviousServer(tabs, activeTabIndex));
+				}
+			}
+		});
+	}
+
+	return initialSubmenu;
+}
+
+function getDarwinTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
+	const {tabs, activeTabIndex, enableMenu} = props;
+
+	return [{
+		label: app.name,
+		submenu: [{
+			label: t.__('Add Organization'),
+			accelerator: 'Cmd+Shift+N',
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('new-server');
+				}
+			}
+		}, {
+			label: t.__('Toggle Do Not Disturb'),
+			accelerator: 'Cmd+Shift+M',
+			click() {
+				const dndUtil = DNDUtil.toggle();
+				sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+			}
+		}, {
+			label: t.__('Desktop Settings'),
+			accelerator: 'Cmd+,',
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('open-settings');
+				}
+			}
+		}, {
+			label: t.__('Keyboard Shortcuts'),
+			accelerator: 'Cmd+Shift+K',
+			enabled: enableMenu,
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('shortcut');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Copy Zulip URL'),
+			accelerator: 'Cmd+Shift+C',
+			enabled: enableMenu,
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('copy-zulip-url');
+				}
+			}
+		}, {
+			label: t.__('Log Out of Organization'),
+			accelerator: 'Cmd+L',
+			enabled: enableMenu,
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('log-out');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Services'),
+			role: 'services',
+			submenu: []
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Hide'),
+			role: 'hide'
+		}, {
+			label: t.__('Hide Others'),
+			role: 'hideOthers'
+		}, {
+			label: t.__('Unhide'),
+			role: 'unhide'
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Minimize'),
+			role: 'minimize'
+		}, {
+			label: t.__('Close'),
+			role: 'close'
+		}, {
+			label: t.__('Quit'),
+			role: 'quit'
+		}]
+	}, {
+		label: t.__('Edit'),
+		submenu: [{
+			label: t.__('Undo'),
+			accelerator: 'Cmd+Z',
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('undo');
+				}
+			}
+		}, {
+			label: t.__('Redo'),
+			accelerator: 'Cmd+Shift+Z',
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('redo');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Cut'),
+			role: 'cut'
+		}, {
+			label: t.__('Copy'),
+			role: 'copy'
+		}, {
+			label: t.__('Paste'),
+			role: 'paste'
+		}, {
+			label: t.__('Paste and Match Style'),
+			role: 'pasteAndMatchStyle'
+		}, {
+			label: t.__('Select All'),
+			role: 'selectAll'
+		}]
+	}, {
+		label: t.__('View'),
+		submenu: getViewSubmenu()
+	}, {
+		label: t.__('History'),
+		submenu: getHistorySubmenu(enableMenu)
+	}, {
+		label: t.__('Window'),
+		submenu: getWindowSubmenu(tabs, activeTabIndex)
+	}, {
+		label: t.__('Tools'),
+		submenu: getToolsSubmenu()
+	}, {
+		label: t.__('Help'),
+		role: 'help',
+		submenu: getHelpSubmenu()
+	}];
+}
+
+function getOtherTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
+	const {tabs, activeTabIndex, enableMenu} = props;
+	return [{
+		label: t.__('File'),
+		submenu: [{
+			label: t.__('Add Organization'),
+			accelerator: 'Ctrl+Shift+N',
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('new-server');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Toggle Do Not Disturb'),
+			accelerator: 'Ctrl+Shift+M',
+			click() {
+				const dndUtil = DNDUtil.toggle();
+				sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+			}
+		}, {
+			label: t.__('Desktop Settings'),
+			accelerator: 'Ctrl+,',
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('open-settings');
+				}
+			}
+		}, {
+			label: t.__('Keyboard Shortcuts'),
+			accelerator: 'Ctrl+Shift+K',
+			enabled: enableMenu,
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('shortcut');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Copy Zulip URL'),
+			accelerator: 'Ctrl+Shift+C',
+			enabled: enableMenu,
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('copy-zulip-url');
+				}
+			}
+		}, {
+			label: t.__('Log Out of Organization'),
+			accelerator: 'Ctrl+L',
+			enabled: enableMenu,
+			click(_item, focusedWindow) {
+				if (focusedWindow) {
+					sendAction('log-out');
+				}
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Minimize'),
+			role: 'minimize'
+		}, {
+			label: t.__('Close'),
+			role: 'close'
+		}, {
+			label: t.__('Quit'),
+			role: 'quit',
+			accelerator: 'Ctrl+Q'
+		}]
+	}, {
+		label: t.__('Edit'),
+		submenu: [{
+			label: t.__('Undo'),
+			role: 'undo'
+		}, {
+			label: t.__('Redo'),
+			role: 'redo'
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Cut'),
+			role: 'cut'
+		}, {
+			label: t.__('Copy'),
+			role: 'copy'
+		}, {
+			label: t.__('Paste'),
+			role: 'paste'
+		}, {
+			label: t.__('Paste and Match Style'),
+			role: 'pasteAndMatchStyle'
+		}, {
+			type: 'separator'
+		}, {
+			label: t.__('Select All'),
+			role: 'selectAll'
+		}]
+	}, {
+		label: t.__('View'),
+		submenu: getViewSubmenu()
+	}, {
+		label: t.__('History'),
+		submenu: getHistorySubmenu(enableMenu)
+	}, {
+		label: t.__('Window'),
+		submenu: getWindowSubmenu(tabs, activeTabIndex)
+	}, {
+		label: t.__('Tools'),
+		submenu: getToolsSubmenu()
+	}, {
+		label: t.__('Help'),
+		role: 'help',
+		submenu: getHelpSubmenu()
+	}];
+}
+
+function sendAction(action: string, ...parameters: unknown[]): void {
+	const win = BrowserWindow.getAllWindows()[0];
+
+	if (process.platform === 'darwin') {
+		win.restore();
+	}
+
+	win.webContents.send(action, ...parameters);
+}
+
+async function checkForUpdate(): Promise<void> {
+	await appUpdater(true);
+}
+
+function getNextServer(tabs: TabData[], activeTabIndex: number): number {
+	do {
+		activeTabIndex = (activeTabIndex + 1) % tabs.length;
+	}
+	while (tabs[activeTabIndex].role !== 'server');
+
+	return activeTabIndex;
+}
+
+function getPreviousServer(tabs: TabData[], activeTabIndex: number): number {
+	do {
+		activeTabIndex = (activeTabIndex - 1 + tabs.length) % tabs.length;
+	}
+	while (tabs[activeTabIndex].role !== 'server');
+
+	return activeTabIndex;
+}
+
+export function setMenu(props: MenuProps): void {
+	const tpl = process.platform === 'darwin' ? getDarwinTpl(props) : getOtherTpl(props);
+	const menu = Menu.buildFromTemplate(tpl);
+	Menu.setApplicationMenu(menu);
+}

app/main/preload.css

@@ -1 +0,0 @@
-/* We'll be overriding default styling so that app look more native * / 

app/main/preload.js

@@ -1,66 +0,0 @@
-'use strict';
-const ipcRenderer = require('electron').ipcRenderer;
-const {webFrame} = require('electron');
-const {spellChecker} = require('./spellchecker');
-
-const _setImmediate = setImmediate;
-const _clearImmediate = clearImmediate;
-process.once('loaded', () => {
-	global.setImmediate = _setImmediate;
-	global.clearImmediate = _clearImmediate;
-});
-
-// eslint-disable-next-line import/no-unassigned-import
-require('./domain');
-
-// handle zooming functionality
-const zoomIn = () => {
-	webFrame.setZoomFactor(webFrame.getZoomFactor() + 0.1);
-};
-
-const zoomOut = () => {
-	webFrame.setZoomFactor(webFrame.getZoomFactor() - 0.1);
-};
-
-const zoomActualSize = () => {
-	webFrame.setZoomFactor(1);
-};
-
-// get zooming actions from main process
-ipcRenderer.on('zoomIn', () => {
-	zoomIn();
-});
-
-ipcRenderer.on('zoomOut', () => {
-	zoomOut();
-});
-
-ipcRenderer.on('zoomActualSize', () => {
-	zoomActualSize();
-});
-
-ipcRenderer.on('log-out', () => {
-	// create the menu for the below
-	document.querySelector('.dropdown-toggle').click();
-
-	const nodes = document.querySelectorAll('.dropdown-menu li:last-child a');
-	nodes[nodes.length - 1].click();
-});
-
-ipcRenderer.on('shortcut', () => {
-	// create the menu for the below
-	const node = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
-	// additional check
-	if (node.text.trim().toLowerCase() === 'keyboard shortcuts') {
-		node.click();
-	} else {
-		// atleast click the dropdown
-		document.querySelector('.dropdown-toggle').click();
-	}
-});
-
-// To prevent failing this script on linux we need to load it after the document loaded
-document.addEventListener('DOMContentLoaded', () => {
-	// init spellchecker
-	spellChecker();
-});

app/main/request.ts

@@ -0,0 +1,113 @@
+import {ClientRequest, IncomingMessage, app, net} from 'electron';
+import fs from 'fs';
+import path from 'path';
+import stream from 'stream';
+import util from 'util';
+
+import escape from 'escape-html';
+import getStream from 'get-stream';
+
+import {ServerConf} from '../renderer/js/utils/domain-util';
+import Logger from '../renderer/js/utils/logger-util';
+import * as Messages from '../resources/messages';
+
+export async function fetchResponse(request: ClientRequest): Promise<IncomingMessage> {
+	return new Promise((resolve, reject) => {
+		request.on('response', resolve);
+		request.on('abort', () => reject(new Error('Request aborted')));
+		request.on('error', reject);
+		request.end();
+	});
+}
+
+const pipeline = util.promisify(stream.pipeline);
+
+/* Request: domain-util */
+
+const defaultIconUrl = '../renderer/img/icon.png';
+
+const logger = new Logger({
+	file: 'domain-util.log',
+	timestamp: true
+});
+
+const generateFilePath = (url: string): string => {
+	const dir = `${app.getPath('userData')}/server-icons`;
+	const extension = path.extname(url).split('?')[0];
+
+	let hash = 5381;
+	let {length} = url;
+
+	while (length) {
+		hash = (hash * 33) ^ url.charCodeAt(--length);
+	}
+
+	// Create 'server-icons' directory if not existed
+	if (!fs.existsSync(dir)) {
+		fs.mkdirSync(dir);
+	}
+
+	return `${dir}/${hash >>> 0}${extension}`;
+};
+
+export const _getServerSettings = async (domain: string, session: Electron.session): Promise<ServerConf> => {
+	const response = await fetchResponse(net.request({
+		url: domain + '/api/v1/server_settings',
+		session
+	}));
+	if (response.statusCode !== 200) {
+		throw new Error(Messages.invalidZulipServerError(domain));
+	}
+
+	const {realm_name, realm_uri, realm_icon} = JSON.parse(await getStream(response));
+	if (
+		typeof realm_name !== 'string' ||
+			typeof realm_uri !== 'string' ||
+			typeof realm_icon !== 'string'
+	) {
+		throw new TypeError(Messages.noOrgsError(domain));
+	}
+
+	return {
+		// Some Zulip Servers use absolute URL for server icon whereas others use relative URL
+		// Following check handles both the cases
+		icon: realm_icon.startsWith('/') ? realm_uri + realm_icon : realm_icon,
+		url: realm_uri,
+		alias: escape(realm_name)
+	};
+};
+
+export const _saveServerIcon = async (url: string, session: Electron.session): Promise<string> => {
+	try {
+		const response = await fetchResponse(net.request({url, session}));
+		if (response.statusCode !== 200) {
+			logger.log('Could not get server icon.');
+			return defaultIconUrl;
+		}
+
+		const filePath = generateFilePath(url);
+		await pipeline(response, fs.createWriteStream(filePath));
+		return filePath;
+	} catch (error) {
+		logger.log('Could not get server icon.');
+		logger.log(error);
+		logger.reportSentry(error);
+		return defaultIconUrl;
+	}
+};
+
+/* Request: reconnect-util */
+
+export const _isOnline = async (url: string, session: Electron.session): Promise<boolean> => {
+	try {
+		const response = await fetchResponse(net.request({
+			url: `${url}/static/favicon.ico`,
+			session
+		}));
+		const isValidResponse = response.statusCode >= 200 && response.statusCode < 400;
+		return isValidResponse;
+	} catch (error) {
+		logger.log(error);
+		return false;
+	}
+};

app/main/spellchecker.js

@@ -1,27 +0,0 @@
-const {SpellCheckHandler, ContextMenuListener, ContextMenuBuilder} = require('electron-spellchecker');
-
-function spellChecker() {
-	// Implement spellcheck using electron api
-	window.spellCheckHandler = new SpellCheckHandler();
-	window.spellCheckHandler.attachToInput();
-
-	// Start off as US English
-	window.spellCheckHandler.switchLanguage('en-US');
-
-	const contextMenuBuilder = new ContextMenuBuilder(window.spellCheckHandler);
-	const contextMenuListener = new ContextMenuListener(info => {
-		contextMenuBuilder.showPopupMenu(info);
-	});
-
-	// Clean up events after you navigate away from this page;
-	// otherwise, you may experience errors
-	window.addEventListener('beforeunload', () => {
-	// eslint-disable-next-line no-undef
-		spellCheckHandler.unsubscribe();
-		contextMenuListener.unsubscribe();
-	});
-}
-
-exports = module.exports = {
-	spellChecker
-};

app/main/startup.ts

@@ -0,0 +1,33 @@
+import {app} from 'electron';
+
+import AutoLaunch from 'auto-launch';
+import isDev from 'electron-is-dev';
+
+import * as ConfigUtil from '../renderer/js/utils/config-util';
+
+export const setAutoLaunch = async (AutoLaunchValue: boolean): Promise<void> => {
+	// Don't run this in development
+	if (isDev) {
+		return;
+	}
+
+	const autoLaunchOption = ConfigUtil.getConfigItem('startAtLogin', AutoLaunchValue);
+
+	// `setLoginItemSettings` doesn't support linux
+	if (process.platform === 'linux') {
+		const ZulipAutoLauncher = new AutoLaunch({
+			name: 'Zulip',
+			isHidden: false
+		});
+		if (autoLaunchOption) {
+			await ZulipAutoLauncher.enable();
+		} else {
+			await ZulipAutoLauncher.disable();
+		}
+	} else {
+		app.setLoginItemSettings({
+			openAtLogin: autoLaunchOption,
+			openAsHidden: false
+		});
+	}
+};

app/main/tray.js

@@ -1,81 +0,0 @@
-'use strict';
-const path = require('path');
-const electron = require('electron');
-const app = require('electron').app;
-const {addDomain, about} = require('./windowmanager');
-
-let tray = null;
-
-const APP_ICON = path.join(__dirname, '../resources/tray', 'tray');
-
-const iconPath = () => {
-	if (process.platform === 'linux') {
-		return APP_ICON + 'linux.png';
-	}
-	return APP_ICON + (process.platform === 'win32' ? 'win.ico' : 'osx.png');
-};
-
-const createHandler = () => {
-	const contextMenu = electron.Menu.buildFromTemplate([
-		{
-			label: 'About',
-			click() {
-				about();
-			}
-		},
-		{
-			type: 'separator'
-		},
-		{
-			label: 'Change Zulip server',
-			click() {
-				addDomain();
-			}
-		},
-		{
-			type: 'separator'
-		},
-		{
-			label: 'Reload',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					focusedWindow.reload();
-				}
-			}
-		},
-		{
-			type: 'separator'
-		},
-		{
-			label: 'Quit',
-			click() {
-				app.quit();
-			}
-		}
-	]);
-
-	tray = new electron.Tray(iconPath());
-	tray.setToolTip(`${app.getName()}`);
-	tray.setContextMenu(contextMenu);
-};
-
-const destroyHandler = () => {
-	tray.destroy();
-	if (tray.isDestroyed()) {
-		tray = null;
-	} else {
-		throw new Error('Tray icon not properly destroyed.');
-	}
-};
-
-const toggleHandler = () => {
-	if (tray) {
-		destroyHandler();
-	} else {
-		createHandler();
-	}
-};
-
-exports.create = createHandler;
-exports.destroy = destroyHandler;
-exports.toggle = toggleHandler;

app/main/windowmanager.js

@@ -1,85 +0,0 @@
-'use strict';
-const path = require('path');
-const electron = require('electron');
-
-const APP_ICON = path.join(__dirname, '../resources', 'Icon');
-
-const iconPath = () => {
-	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
-};
-let domainWindow;
-let aboutWindow;
-
-function onClosed() {
-	// dereference the window
-	domainWindow = null;
-	aboutWindow = null;
-}
-
-// Change Zulip server Window
-function createdomainWindow() {
-	const domainwin = new electron.BrowserWindow({
-		title: 'Switch Server',
-		frame: false,
-		height: 300,
-		resizable: false,
-		width: 400,
-		show: false,
-		icon: iconPath()
-
-	});
-	const domainURL = 'file://' + path.join(__dirname, '../renderer', 'pref.html');
-	domainwin.loadURL(domainURL);
-	domainwin.on('closed', onClosed);
-
-	return domainwin;
-}
-// Call this window onClick addDomain in tray
-function addDomain() {
-	domainWindow = createdomainWindow();
-	domainWindow.once('ready-to-show', () => {
-		domainWindow.show();
-	});
-	setTimeout(() => {
-		if (domainWindow !== null) {
-			if (!domainWindow.isDestroyed()) {
-				domainWindow.destroy();
-			}
-		}
-	}, 15000);
-}
-// About window
-function createAboutWindow() {
-	const aboutwin = new electron.BrowserWindow({
-		width: 500,
-		height: 500,
-		title: 'About Zulip Desktop',
-		show: false,
-		center: true,
-		fullscreen: false,
-		fullscreenable: false,
-		resizable: false
-	});
-	const aboutURL = 'file://' + path.join(__dirname, '../renderer', 'about.html');
-	aboutwin.loadURL(aboutURL);
-	aboutwin.on('closed', onClosed);
-
-	// stop page to update it's title
-	aboutwin.on('page-title-updated', e => {
-		e.preventDefault();
-	});
-
-	aboutwin.on('closed', onClosed);
-
-	return aboutwin;
-}
-
-// Call this onClick About in tray
-function about() {
-	aboutWindow = createAboutWindow();
-	aboutWindow.once('ready-to-show', () => {
-		aboutWindow.show();
-	});
-}
-
-exports = module.exports = {addDomain, about};

app/package.json

@@ -1,42 +0,0 @@
-{
-  "name": "zulip",
-  "productName": "Zulip",
-  "version": "0.5.9",
-  "description": "Zulip Desktop App",
-  "license": "Apache-2.0",
-  "email": "<svnitakash@gmail.com>",
-  "copyright": "©2017 Kandra Labs, Inc.",
-  "author": {
-    "name": "Akash Nimare",
-    "email": "svnitakash@gmail.com"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/zulip/zulip-electron.git"
-  },
-  "bugs": {
-    "url": "https://github.com/zulip/zulip-electron/issues"
-  },
-  "main": "main/index.js",
-  "keywords": [
-    "Zulip",
-    "Group Chat app",
-    "electron-app",
-    "electron",
-    "Desktop app",
-    "InstantMessaging"
-  ],
-  "dependencies": {
-    "electron-config":"0.2.1",
-    "electron-debug": "1.1.0",
-    "electron-is-dev": "0.1.2",
-    "electron-localshortcut": "1.0.0",
-    "electron-log": "1.3.0",
-    "electron-spellchecker": "1.0.5",
-    "electron-updater": "1.11.2",
-    "https": "^1.0.0",
-    "node-json-db": "0.7.3",
-    "request": "2.79.0",
-    "wurl": "2.1.0"
-  }
-}

app/renderer/about.html

@@ -1,31 +1,33 @@
 <!DOCTYPE html>
 <html lang="en">
+
     <head>
         <meta charset="UTF-8">
         <link rel="stylesheet" href="css/about.css">
+        <title>Zulip - About</title>
     </head>
+
     <body>
         <div class="about">
-		<center><img src="../resources/zulip.png"></center>
-		<center><p class="detail" id="version"> Version : ?.?.? </p>
-		<center><p class="detail"> License : Apache </p>
-		<center><p class="detail"> Maintainer : Zulip </p>
-		<p class="left"><a class="bug" onclick="linkInBrowser()" href="#">Found bug?</a></p>
+            <img class="logo" src="../resources/zulip.png" />
+            <p class="detail" id="version">v?.?.?</p>
+            <div class="maintenance-info">
+                <p class="detail maintainer">
+                    Maintained by
+                    <a href="https://zulip.com" target="_blank" rel="noopener noreferrer">Zulip</a>
+                </p>
+                <p class="detail license">
+                    Available under the
+                    <a href="https://github.com/zulip/zulip-desktop/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">Apache 2.0 License</a>
+                </p>
+            </div>
         </div>
         <script>
 
-	const app = require('electron').remote.app;
-	const version_tag = document.getElementById('version');
-	version_tag.innerHTML = ' Version : ' + app.getVersion() + ' ';
-
-	function linkInBrowser(event) {
-
-		const shell = require('electron').shell;
-
-		const url = "https://github.com/zulip/zulip-electron/issues/new?body=Please describe your issue and steps to reproduce it."
-
-		shell.openExternal(url);
-	}
+            const { app } = require('electron').remote;
+            const version_tag = document.querySelector('#version');
+            version_tag.innerHTML = 'v' + app.getVersion();
         </script>
+        <script>require('./js/shared/preventdrag.js')</script>
     </body>
 </html>

app/renderer/css/about.css

@@ -1,15 +1,24 @@
 body {
-	background: #6BB6C7;
+    background: rgba(250, 250, 250, 1.000);
+    font-family: menu, "Helvetica Neue", sans-serif;
+    -webkit-font-smoothing: subpixel-antialiased;
+}
+
+.logo {
+    display: block;
+    margin: -40px auto;
+}
+
+#version {
+    color: rgba(68, 67, 67, 1.000);
+    font-size: 1.3em;
+    padding-top: 40px;
 }
 
 .about {
-	margin-top: 50px;
-}
-
-.left {
-	position: absolute;
-	top:89%;
-	left:76%;
+    margin: 25vh auto;
+    height: 25vh;
+    text-align: center;
 }
 
 .about p {
@@ -18,10 +27,40 @@ body {
 }
 
 .about img {
-	width:160px;
+    width: 150px;
 }
 
 .detail {
-	text-align: left;
-	margin-left: 35%;
+    text-align: center;
+}
+
+.detail.maintainer {
+    font-size: 1.2em;
+    font-weight: 500;
+}
+
+.detail.license {
+    font-size: 0.8em;
+}
+
+.maintenance-info {
+    cursor: pointer;
+    position: absolute;
+    width: 100%;
+    left: 0px;
+    color: rgba(68, 68, 68, 1.000);
+}
+
+.maintenance-info p {
+    margin: 0;
+    font-size: 1em;
+    width: 100%;
+}
+
+p.detail a {
+    color: rgba(53, 95, 76, 1.000);
+}
+
+p.detail a:hover {
+    text-decoration: underline;
 }

app/renderer/css/feedback.css

@@ -0,0 +1,19 @@
+:host {
+    --button-color: rgb(69, 166, 149);
+}
+
+button:hover,
+button:focus {
+    border-color: var(--button-color);
+    color: var(--button-color);
+}
+  
+button:active {
+    background-color: rgb(241, 241, 241);
+    color: var(--button-color);
+}
+
+button {
+    background-color: var(--button-color);
+    border-color: var(--button-color);
+}

app/renderer/css/main.css

@@ -1,375 +1,490 @@
-@charset "UTF-8";
-header,
-section {
-    display: block
-}
-html {
-    font-size: 100%;
-    overflow-y: scroll;
-    -webkit-text-size-adjust: 100%;
-}
-html,
-button,
-input {
-    font-family: "Helvetica Neue", Arial, sans-serif
-}
+/*******************
+ *  General rules  *
+ *******************/
+
 html,
 body {
     height: 100%;
-    margin: 0
-}
-img {
-    border: 0;
-    -ms-interpolation-mode: bicubic
-}
-img {
-    vertical-align: middle
-}
-form {
-    margin: 0
-}
-fieldset {
-    border: 0;
     margin: 0;
-    padding: 0
+    cursor: default;
+    user-select: none;
 }
-button,
-input {
-    font-size: 100%;
-    margin: 0;
-    vertical-align: baseline;
-    box-sizing: content-box;
-    -webkit-box-sizing: content-box
+
+#content {
+    display: flex;
+    height: 100%;
 }
-button,
-input {
-    line-height: normal
+
+.toggle-sidebar {
+    background: rgba(34, 44, 49, 1.000);
+    width: 54px;
+    padding: 27px 0 20px 0;
+    justify-content: space-between;
+    display: flex;
+    flex-direction: column;
+    -webkit-app-region: drag;
+    overflow: hidden;
+    transition: all 0.5s ease;
+    z-index: 2;
 }
-button {
-    cursor: pointer;
-    -webkit-appearance: button;
+
+.toggle-sidebar div {
+    transition: all 0.5s ease-out;
 }
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0
+
+.sidebar-hide {
+    width: 0;
+    transition: all 0.8s ease;
 }
-hr {
-    display: none
+
+.sidebar-hide div {
+    transform: translateX(-100%);
+    transition: all 0.6s ease-out;
 }
-img {
-    max-width: 100%
+
+#view-controls-container {
+    height: calc(100% - 208px);
+    overflow-y: hidden;
 }
-h1 {
-    color: #111;
-    line-height: 1em;
+
+#view-controls-container:hover {
+    overflow-y: overlay;
+}
+
+#view-controls-container::-webkit-scrollbar {
+    width: 4px;
+}
+
+#view-controls-container::-webkit-scrollbar-track {
+    box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+}
+
+#view-controls-container::-webkit-scrollbar-thumb {
+    background-color: rgba(169, 169, 169, 1.000);
+    outline: 1px solid rgba(169, 169, 169, 1.000);
+}
+
+@font-face {
+    font-family: 'Material Icons';
+    font-style: normal;
     font-weight: 400;
-    font-family: "Helvetica Neue", Arial, sans-serif;
-    text-rendering: optimizelegibility;
-    -webkit-text-stroke: none
-}
-h1 {
-    margin: 0 0 35px
+    src: local('Material Icons'), local('MaterialIcons-Regular'), url(../fonts/MaterialIcons-Regular.ttf) format('truetype');
 }
 
-body.container-layout header #logo {
+
+/*******************
+  *   Left Sidebar  *
+  *******************/
+
+#tabs-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+}
+
+.material-icons {
+    font-family: 'Material Icons';
+    font-weight: normal;
+    font-style: normal;
+    /* Preferred icon size */
+    font-size: 24px;
+    display: inline-block;
+    line-height: 1;
+    text-transform: none;
+    letter-spacing: normal;
+    word-wrap: normal;
+    white-space: nowrap;
+    direction: ltr;
+    /* Support for all WebKit browsers. */
+    -webkit-font-smoothing: antialiased;
+    /* Support for Safari and Chrome. */
+    text-rendering: optimizeLegibility;
+}
+
+#actions-container {
+    display: flex;
+    flex-direction: column;
+    position: fixed;
+    bottom: 0;
+}
+
+.action-button {
+    display: flex;
+    flex-direction: column;
+    padding: 12px;
+}
+
+.action-button:hover {
+    cursor: pointer;
+}
+
+.action-button i {
+    color: rgba(108, 133, 146, 1.000);
+    font-size: 28px;
+}
+
+.action-button:hover i {
+    color: rgba(152, 169, 179, 1.000);
+}
+
+.action-button.disable {
+    opacity: 0.6;
+}
+
+.action-button.disable:hover {
+    cursor: not-allowed;
+}
+
+.action-button.disable:hover i {
+    color: rgba(108, 133, 146, 1.000);
+}
+
+.action-button.active {
+    /* background-color: rgba(255, 255, 255, 0.25); */
+    background-color: rgba(239, 239, 239, 1.000);
+    opacity: 0.9;
+    padding-right: 14px;
+}
+
+.action-button.active i {
+    color: rgba(28, 38, 43, 1.000);
+}
+
+.tab:first-child {
+    margin-top: 9px;
+}
+
+.tab {
     position: relative;
-    display: inline-block;
-    vertical-align: top
+    margin: 2px 0;
+    cursor: pointer;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 100%;
 }
-body.container-layout header #logo {
-    width: 50px;
-    height: 50px;
-    background-position: -790px 0
-}
-button[type=submit] {
-    text-decoration: none;
-    display: inline-block;
+
+.tab .server-icons {
+    width: 35px;
     vertical-align: top;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    -webkit-border-radius: 4px;
     border-radius: 4px;
+}
+
+.tab .server-tab {
+    width: 100%;
+    height: 35px;
     position: relative;
-    font-family: "Helvetica Neue", Arial, sans-serif;
-    font-size-adjust: auto;
-    vertical-align: bottom;
-    background-color: #e6eaef;
-    border: 2px solid #e6eaef;
-    color: #96a0ac;
-    font-size: 20px;
-    line-height: 26px;
-    padding: 6px 17px
+    margin-top: 5px;
+    z-index: 11;
+    line-height: 31px;
+    color: rgba(238, 238, 238, 1.000);
+    text-align: center;
+    overflow: hidden;
+    opacity: 0.6;
+    padding: 6px 0;
 }
-.desktop button[type=submit] {
-    -webkit-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out
-}
-.desktop button[type=submit]:hover {
-    background-color: #eff2f5;
-    border: 2px solid #eff2f5;
-    color: #96a0ac
-}
-button[type=submit]:focus {
-    outline: 0
-}
-button[type=submit].btn-primary {
-    background-color: #20b36c;
-    border: 2px solid #20b36c;
-    color: #fff
-}
-.desktop button[type=submit].btn-primary:hover {
-    background-color: #39ca83;
-    border: 2px solid #39ca83;
-    color: #fff
-}
-button[type=submit].btn-primary:focus {
-    outline: 0
-}
-button[type=submit].btn-large {
-    font-family: "Helvetica Neue", Arial, sans-serif;
-    font-size: 20px;
-    line-height: 26px;
-    padding: 12px 30px
-}
-input[type=text] {
-    font-family: "Helvetica Neue", Arial, sans-serif;
-    font-weight: 200;
-    display: inline-block;
-    vertical-align: top;
-    -webkit-border-radius: 4px;
+
+.server-tab .alt-icon {
+    font-family: Verdana;
+    font-weight: 600;
+    font-size: 22px;
+    border: 2px solid rgba(34, 44, 49, 1.000);
+    margin-left: 17%;
+    width: 35px;
     border-radius: 4px;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    background-color: #fff;
-    border: 1px solid #cad0d7;
-    color: #000;
-    font-size: 18px;
-    line-height: 26px;
-    height: 42px;
-    padding: 10px 10px
 }
-.desktop input[type=text]:hover {
-    background-color: #fff;
-    border-color: #bbc3cc;
-    color: #111
+
+.tab .server-tab:hover {
+    opacity: 0.8;
 }
-input[type=text]:focus {
-    background-color: #fff;
-    border-color: #20b36c!important;
-    color: #000;
-    outline: 0
+
+.tab.functional-tab {
+    height: 46px;
+    padding: 0;
 }
-input[type=text]::-webkit-input-placeholder {
-    color: #8e959e
+
+.tab.functional-tab.active .server-tab {
+    padding: 2px 0;
+    height: 40px;
+    background-color: rgba(255, 255, 255, 0.25);
 }
-input[type=text]::-moz-placeholder {
-    color: #8e959e
+
+.tab.functional-tab .server-tab i {
+    font-size: 28px;
+    line-height: 36px;
 }
-input[type=text]:-ms-input-placeholder {
-    color: #8e959e
+
+.tab.active .server-tab {
+    opacity: 1;
+    background-color: rgba(100, 132, 120, 1.000);
 }
-.form-large input[type=text] {
-    font-size: 18px;
-    line-height: 26px;
-    height: 54px;
-    padding: 12px 15px
-}
-.control-group {
-    margin-top: 40px
-}
-h1 {
-    white-space: normal;
-    word-break: break-all;
-    word-break: break-word;
-    -webkit-hyphens: auto;
-    -moz-hyphens: auto;
-    hyphens: auto
-}
-.section-main {
-    position: relative
-}
-body {
-    color: #111;
-    font-size: 18px;
-    line-height: 24px;
-    font-family: "Helvetica Neue", Arial, sans-serif;
-    background: #edf1f3;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box
-}
-.desktop body {
-    padding-top: 116px
-}
-body.container-layout {
-    padding: 0!important;
-    background-color: #E6EAEF
-}
-header {
-    z-index: 800;
-    border-bottom: 1px solid #dae0e7;
-    background: rgba(255, 255, 255, .97);
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    position: relative;
-    top: 0;
-    left: 0;
-    width: 100%
-}
-header .container {
-    position: relative
-}
-.desktop header {
-    position: fixed
-}
- header .container {
-    position: relative;
-    height: 75px
-}
-.container-layout header {
-    position: relative;
-    border: 0;
-    background: 0 0;
-    padding: 30px 0
-}
-.container-layout header .container {
-    height: auto
-}
-header #logo {
+
+.tab .server-tab-badge.active {
+    border-radius: 9px;
+    min-width: 11px;
+    padding: 0 3px;
+    height: 17px;
+    background-color: rgba(244, 67, 54, 1.000);
+    font-size: 10px;
+    font-family: sans-serif;
+    position: absolute;
+    right: 5px;
+    z-index: 15;
+    top: 6px;
+    float: right;
+    color: rgba(255, 255, 255, 1.000);
+    text-align: center;
+    line-height: 17px;
     display: block;
-    text-indent: -9999px
+    right: 0;
 }
 
- header #logo {
-    position: absolute!important;
-    top: 50%;
-    left: 10px;
-    -webkit-transform: translate(0, -50%);
-    transform: translate(0, -50%)
+.tab .server-tab-badge {
+    display: none;
 }
-body.container-layout header #logo {
-    position: relative!important;
+
+.tab .server-tab-badge.close-button {
+    width: 16px;
+    padding: 0;
+}
+
+.tab .server-tab-badge.close-button i {
+    font-size: 13px;
+    line-height: 17px;
+}
+
+#add-tab {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+}
+
+.tab .server-tab-shortcut {
+    color: rgba(100, 132, 120, 1.000);
+    font-size: 12px;
+    text-align: center;
+    font-family: sans-serif;
+    margin-bottom: 5px;
+}
+
+.refresh {
+    animation: rotate-loader 1s linear infinite;
+}
+
+@keyframes rotate-loader {
+    from {
+        transform: rotate(0);
+    }
+    to {
+        transform: rotate(-360deg);
+    }
+}
+
+/*******************
+  *   Webview Area  *
+  *******************/
+
+#webviews-container {
+    display: flex;
+    height: 100%;
+    width: 100%;
+}
+
+/* Pseudo element for loading indicator */
+#webviews-container::before {
+    content: "";
+    position: absolute;
+    z-index: 1;
+    background: rgba(255, 255, 255, 1.000) url(../img/ic_loading.gif) no-repeat;
+    background-size: 60px 60px;
+    background-position: center;
+    width: 100%;
+    height: 100%;
+}
+
+/* When the active webview is loaded */
+#webviews-container.loaded::before {
+    opacity: 0;
+    z-index: -1;
+    visibility: hidden;
+}
+
+webview {
+    /* transition: opacity 0.3s ease-in; */
+    flex-grow: 1;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+}
+
+webview.onload {
+    transition: opacity 1s cubic-bezier(0.95, 0.05, 0.795, 0.035);
+}
+
+webview.active {
+    opacity: 1;
+    z-index: 1;
+    visibility: visible;
+}
+
+webview.disabled {
+    opacity: 0;
+}
+
+webview.focus {
+    outline: 0px solid transparent;
+}
+
+/* Tooltip styling */
+
+#loading-tooltip,
+#dnd-tooltip,
+#back-tooltip,
+#reload-tooltip,
+#setting-tooltip {
+    font-family: sans-serif;
+    background: rgba(34, 44, 49, 1.000);
+    margin-left: 48px;
+    padding: 6px 8px;
+    position: absolute;
+    margin-top: 0px;
+    z-index: 1000;
+    color: rgba(255, 255, 255, 1.000);
+    border-radius: 4px;
+    text-align: center;
+    width: 55px;
+    font-size: 14px;
+}
+
+#loading-tooltip::after,
+#dnd-tooltip::after,
+#back-tooltip::after,
+#reload-tooltip::after,
+#setting-tooltip::after {
+    content: " ";
+    border-top: 8px solid transparent;
+    border-bottom: 8px solid transparent;
+    border-right: 8px solid rgba(34, 44, 49, 1.000);
+    position: absolute;
+    top: 7px;
+    right: 68px;
+}
+
+#add-server-tooltip,
+.server-tooltip {
+    font-family: 'arial';
+    background: rgba(34, 44, 49, 1.000);
+    left: 56px;
+    padding: 10px 20px;
+    position: fixed;
+    margin-top: 11px;
+    z-index: 5000 !important;
+    color: rgba(255, 255, 255, 1.000);
+    border-radius: 4px;
+    text-align: center;
+    width: max-content;
+    font-size: 14px;
+}
+
+#add-server-tooltip::after,
+.server-tooltip::after {
+    content: " ";
+    border-top: 8px solid transparent;
+    border-bottom: 8px solid transparent;
+    border-right: 8px solid rgba(34, 44, 49, 1.000);
+    position: absolute;
+    top: 10px;
+    left: -5px;
+}
+
+#collapse-button {
+    bottom: 30px;
+    left: 20px;
+    position: absolute;
+    width: 24px;
+    height: 24px;
+    background: rgba(34, 44, 49, 1.000);
+    border-radius: 20px;
+    cursor: pointer;
+    box-shadow: rgba(153, 153, 153, 1.000) 1px 1px;
+}
+
+#collapse-button i {
+    color: rgba(239, 239, 239, 1.000);
+}
+
+#main-container {
+    display: flex;
+    height: 100%;
+    width: 100%;
+    position: relative;
+    flex-grow: 1;
+    flex-basis: 0px;
+}
+
+.hidden {
+    display: none !important;
+}
+
+
+/* Full screen Popup container  */
+
+.popup .popuptext {
+    visibility: hidden;
+    background-color: rgba(85, 85, 85, 1.000);
+    color: rgba(255, 255, 255, 1.000);
+    text-align: center;
+    border-radius: 6px;
+    padding: 9px 0;
+    position: absolute;
+    z-index: 1000;
+    font-family: arial;
+    width: 240px;
+    top: 15px;
+    height: 20px;
+    left: 43%;
+}
+
+.popup .show {
+    visibility: visible;
+    animation: cssAnimation 0s ease-in 5s forwards;
+    animation-fill-mode: forwards;
+}
+
+@keyframes cssAnimation {
+    from {
+        opacity: 0;
+    }
+    to {
+        width: 0;
+        height: 0;
+        overflow: hidden;
+        opacity: 1;
+    }
+}
+
+send-feedback {
+    width: 60%;
+    height: 85%;
+}
+
+#feedback-modal {
+    display: none;
+    position: absolute;
     top: 0;
     left: 0;
-    -webkit-transform: translate(0, 0);
-    transform: translate(0, 0);
-    margin: 0 auto;
-    display: block
+    width: 100%;
+    height: 100%;
+    background-color: rgba(68, 67, 67, 0.81);
+    align-items: center;
+    justify-content: center;
+    z-index: 2;
+    transition: all 1s ease-out;
 }
-.content {
-    padding-bottom: 40px;
-    overflow: hidden
-}
-.container-layout .content {
-    max-width: 660px;
-    margin: 0 auto
-}
-.content .server {
-    position: relative;
-    margin: 0 10px
-}
-.content .server .container {
-    background: #fff;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    padding: 50px 0 0;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    position: relative;
-    z-index: 10;
-    max-width: 580px
-}
-.content .server h1 {
-    text-align: center;
-    padding: 0 10%
-}
-.content .server h1 {
-    font-size: 2.4em;
-    line-height: 1.2em;
-    margin-bottom: 10px
-}
-.content .server fieldset {
-    padding: 25px 10% 80px 39px;
-    position: relative
-}
-.content .server fieldset .control-group .control-field input {
-    width: 100%
-}
-.content .server button {
-    width: 100%
-}
-@media screen and (min-width: 749px) {
-    input[type=text] {
-        width: 60%
-    }
-}
-@media screen and (min-width: 1071px) {
-    h1 {
-        font-size: 3.2em;
-        line-height: 1.3em
-    }
-}
-.container {
-    width: 1070px;
-    margin-left: auto;
-    margin-right: auto;
-    padding-left: 10px;
-    padding-right: 10px;
-}
-.container:before,
-.container:after {
-    content: "";
-    display: table
-}
-.container:after {
-    clear: both
-}
-.responsive .container {
-    max-width: 1070px;
-    width: auto;
-    margin-left: auto;
-    margin-right: auto;
-    padding-left: 10px;
-    padding-right: 10px;
-}
-.responsive .container:before,
-.responsive .container:after {
-    content: "";
-    display: table
-}
-.responsive .container:after {
-    clear: both
-}
-@media screen and (max-width: 480px) {
-    .responsive h1 {
-        font-size: 1.7em;
-        line-height: 1.3em
-    }
-}
-@media screen and (min-width: 481px) and (max-width: 640px) {
-    .responsive h1 {
-        font-size: 1.9em;
-        line-height: 1.3em
-    }
-}
-@media screen and (min-width: 641px) and (max-width: 748px) {
-    .responsive h1 {
-        font-size: 2.2em;
-        line-height: 1.3em
-    }
-}
-@media screen and (max-width: 748px) {
-    .responsive input[type=text] {
-        width: 100%
-    }
-}
-@media screen and (min-width: 749px) and (max-width: 1070px) {
-    .responsive h1 {
-        font-size: 2.6em;
-        line-height: 1.3em
-    }
-}
-#server-status {
-    text-align: center;
-    color: #c71212;
+
+#feedback-modal.show {
+    display: flex;
 }

app/renderer/css/network.css

@@ -0,0 +1,59 @@
+html,
+body {
+    margin: 0;
+    cursor: default;
+    font-size: 14px;
+    color: rgba(51, 51, 51, 1.000);
+    background: rgba(255, 255, 255, 1.000);
+    user-select: none;
+}
+
+#content {
+    display: flex;
+    flex-direction: column;
+    font-family: "Trebuchet MS", Helvetica, sans-serif;
+    margin: 100px 200px;
+    text-align: center;
+}
+
+#title {
+    text-align: left;
+    font-size: 24px;
+    font-weight: bold;
+    margin: 20px 0;
+}
+
+#subtitle {
+    font-size: 20px;
+    text-align: left;
+    margin: 12px 0;
+}
+
+#description {
+    text-align: left;
+    font-size: 16px;
+    list-style-position: inside;
+}
+
+#reconnect {
+    float: left;
+}
+
+#settings {
+    margin-left: 116px;
+}
+
+.button {
+    font-size: 16px;
+    background: rgba(0, 150, 136, 1.000);
+    color: rgba(255, 255, 255, 1.000);
+    width: 96px;
+    height: 32px;
+    border-radius: 5px;
+    line-height: 32px;
+    cursor: pointer;
+}
+
+.button:hover {
+    opacity: 0.8;
+}

app/renderer/css/pref.css

@@ -1,74 +0,0 @@
-body{
-	background-color: #6BB6C7;
-}
-
-.form {
-    position: absolute;
-    top: 35%;
-    width: 300px;
-    left: 9%;
-}
-
-.close {
-    background: transparent url('../img/close.png') no-repeat 4px 4px;
-    background-size: 24px 24px;
-    cursor: pointer;
-    display: inline-block;
-    height: 32px;
-    position: absolute;
-    right: 6px;
-    text-indent: -10000px;
-    top: 6px;
-    width: 32px;
-    z-index: 1;
-    -webkit-app-region: no-drag;
-}
-
-input[type="text"] {
-    display: block;
-    margin: 0;
-    width: 100%;
-    font-family: sans-serif;
-    font-size: 18px;
-    appearance: none;
-    box-shadow: none;
-    border-radius: none;
-    color: #646464;
-}
-input[type="text"]:focus {
-  outline: none;
-}
-
-.form input[type="text"] {
-  padding: 10px;
-  border: solid 1px #dcdcdc;
-  transition: box-shadow 0.3s, border 0.3s;
-}
-.form input[type="text"]:focus,
-.form input[type="text"].focus {
-  border: solid 1px #707070;
-  box-shadow: 0 0 5px 1px #969696;
-}
-button {
-    border: none;
-    color: #fff;
-    padding: 12px 32px;
-    text-align: center;
-    text-decoration: none;
-    margin-left: 107px;
-    margin-top: 24px;
-    display: inline-block;
-    font-size: 16px;
-    background: #137b86;
-}
-button:focus {
-    outline: 0;
-}
-#urladded {
-    font-size: 20px;
-    position: absolute;
-    font-family: 'opensans';
-    top: -61%;
-    left: 25%;
-    text-align: center;
-}

app/renderer/css/preference.css

@@ -0,0 +1,757 @@
+html,
+body {
+    height: 100%;
+    margin: 0;
+    cursor: default;
+    user-select: none;
+    font-family: menu, "Helvetica Neue", sans-serif;
+    -webkit-font-smoothing: antialiased;
+    font-size: 14px;
+    background: rgba(239, 239, 239, 1.000);
+    letter-spacing: -.08px;
+    line-height: 18px;
+    color: rgba(139, 142, 143, 1.000);
+}
+
+kbd {
+    display: inline-block;
+    border: 1px solid rgba(204, 204, 204, 1.000);
+    border-radius: 4px;
+    font-size: 15px;
+    font-family: Courier New, Courier, monospace;
+    font-weight: bold;
+    white-space: nowrap;
+    background-color: rgba(247, 247, 247, 1.000);
+    color: rgba(51, 51, 51, 1.000);
+    margin: 0 0.1em;
+    padding: 0.3em 0.8em;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 1.000);
+    line-height: 1.4;
+}
+
+table,
+th,
+td {
+    border-collapse: collapse;
+    color: rgba(56, 52, 48, 1.000);
+}
+
+table {
+    width: 100%;
+    margin-top: 18px;
+    margin-bottom: 18px;
+}
+
+table tr:nth-child(even) {
+    background-color: rgba(250, 250, 250, 1.000);
+}
+
+table tr:nth-child(odd) {
+    background-color: rgba(255, 255, 255, 1.000);
+}
+
+td {
+    padding: 5px;
+}
+
+td:nth-child(odd) {
+    text-align: right;
+    width: 50%;
+}
+
+@font-face {
+    font-family: 'Material Icons';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Material Icons'), local('MaterialIcons-Regular'), url(../fonts/MaterialIcons-Regular.ttf) format('truetype');
+}
+
+@font-face {
+    font-family: 'Montserrat';
+    src: url(../fonts/Montserrat-Regular.ttf) format('truetype');
+}
+
+.material-icons {
+    font-family: 'Material Icons';
+    font-weight: normal;
+    font-style: normal;
+    /* Preferred icon size */
+    font-size: 24px;
+    display: inline-block;
+    line-height: 1;
+    text-transform: none;
+    letter-spacing: normal;
+    word-wrap: normal;
+    white-space: nowrap;
+    direction: ltr;
+    /* Support for all WebKit browsers. */
+    -webkit-font-smoothing: antialiased;
+    /* Support for Safari and Chrome. */
+    text-rendering: optimizeLegibility;
+}
+
+#content {
+    display: flex;
+    height: 100%;
+    font-family: 'Montserrat';
+}
+
+#sidebar {
+    width: 150px;
+    min-width: 100px;
+    padding: 30px 30px 30px 35px;
+    display: flex;
+    flex-direction: column;
+    font-size: 16px;
+    background: rgba(242, 242, 242, 1.000);
+}
+
+#nav-container {
+    padding: 20px 0;
+}
+
+.nav {
+    padding: 7px 0;
+    color: rgba(153, 153, 153, 1.000);
+    cursor: pointer;
+}
+
+.nav.active {
+    color: rgba(78, 191, 172, 1.000);
+    cursor: default;
+    position: relative;
+}
+
+.nav.active::before {
+    background: rgba(70, 78, 90, 1.000);
+    width: 3px;
+    height: 18px;
+    position: absolute;
+    left: -8px;
+    content: '';
+}
+
+/* We don't want to show this in nav item since we have the + button for adding an Organization */
+
+#nav-AddServer {
+    display: none;
+}
+
+#settings-header {
+    font-size: 22px;
+    color: rgba(34, 44, 49, 1.000);
+    font-weight: bold;
+    text-transform: uppercase;
+}
+
+#settings-container {
+    width: 100%;
+    display: flex;
+    padding: 30px;
+    overflow-y: scroll;
+}
+
+#new-server-container {
+    padding-left: 42px;
+    padding-top: 25px;
+    margin-right: 16px;
+}
+
+.title {
+    font-weight: 500;
+    color: rgba(34, 44, 49, 1.000);
+}
+
+.page-title {
+    color: rgba(34, 44, 49, 1.000);
+    font-size: 15px;
+    font-weight: bold;
+    padding: 4px 0 6px 0;
+}
+
+.add-server-info-row {
+    display: flex;
+    margin: 8px 0 0 0;
+}
+
+.add-server-info-right {
+    flex-grow: 1;
+    margin-top: 10px;
+}
+
+.sub-title {
+    padding: 4px 0 6px 0;
+    font-weight: bold;
+    color: rgba(97, 97, 97, 1.000);
+}
+
+img.server-info-icon {
+    width: 36px;
+    height: 36px;
+    padding: 4px 4px 4px 10px;
+    cursor: pointer;
+    vertical-align: middle;
+}
+
+.server-info-left {
+    margin: 4px 20px 0 0;
+    min-width: 40%;
+}
+
+.server-info-right {
+    margin-top: 4px;
+    width: 55%;
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    flex-grow: 1;
+}
+
+.server-info-row {
+    display: inline-block;
+    margin: 5px 0 0 0;
+}
+
+.server-info-left .server-info-row {
+    display: inline-flex;
+    align-items: inherit;
+    vertical-align: -2px;
+    position: relative;
+}
+
+.server-url {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.server-info-alias {
+    font-weight: bold;
+    cursor: pointer;
+}
+
+.server-url-info {
+    margin-right: 10px;
+}
+
+.setting-input-key {
+    font-size: 14px;
+    height: 27px;
+    line-height: 27px;
+    font-weight: bold;
+    background: transparent;
+    flex-wrap: nowrap;
+    margin-right: 10px;
+}
+
+.setting-input-value {
+    flex-grow: 1;
+    font-size: 14px;
+    border-radius: 4px;
+    padding: 13px;
+    border: rgba(237, 237, 237, 1.000) 2px solid;
+    outline-width: 0;
+    background: transparent;
+    max-width: 450px;
+}
+
+.setting-input-value:focus {
+    border: rgba(78, 191, 172, 1.000) 2px solid;
+}
+
+.invalid-input-value:focus {
+    border: rgba(239, 83, 80, 1) 2px solid;
+}
+
+.manual-proxy-block {
+    width: 96%;
+}
+
+.actions-container {
+    display: flex;
+    font-size: 14px;
+    color: rgba(35, 93, 58, 1.000);
+    vertical-align: middle;
+    margin: 10px 0;
+    flex-wrap: wrap;
+}
+
+.action {
+    display: flex;
+    align-items: center;
+    padding: 0 10px;
+    margin-right: 10px;
+}
+
+.action i {
+    margin-right: 5px;
+    font-size: 18px;
+    line-height: 26px;
+}
+
+.settings-pane {
+    flex-grow: 1;
+    min-width: 550px;
+}
+
+.action:hover {
+    cursor: pointer;
+}
+
+.action.disabled:hover {
+    cursor: default;
+}
+
+.action.disabled {
+    color: rgba(153, 153, 153, 1.000);
+}
+
+.settings-card {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 12px 30px;
+    margin: 10px 0 20px 0;
+    background: rgba(255, 255, 255, 1.000);
+    width: 80%;
+    transition: all 0.2s;
+}
+
+.settings-card:hover {
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 0px 0px rgba(0, 0, 0, 0.12);
+}
+
+.hidden {
+    display: none;
+    margin: 5px !important;
+}
+
+.red {
+    color: rgb(240, 148, 148);
+    background: rgba(255, 255, 255, 1.000);
+    border-radius: 4px;
+    display: inline-block;
+    border: 2px solid rgb(240, 148, 148);
+    padding: 10px;
+    width: 100px;
+    cursor: pointer;
+    font-size: 1rem;
+    font-weight: bold;
+    transition: background-color 0.2s ease;
+    text-decoration: none;
+    text-align: center;
+}
+
+.red:hover {
+    background-color: rgb(240, 148, 148);
+    color: rgba(255, 255, 255, 1.000);
+}
+
+.green {
+    color: rgba(255, 255, 255, 1.000);
+    background: rgba(78, 191, 172, 1.000);
+    border-radius: 4px;
+    display: inline-block;
+    border: none;
+    padding: 10px;
+    width: 100px;
+    cursor: pointer;
+    font-size: 1rem;
+    font-weight: bold;
+    transition: background-color 0.2s ease;
+    text-decoration: none;
+    text-align: center;
+}
+
+.green:hover {
+    background-color: rgba(60, 159, 141, 1.000);
+    color: rgba(255, 255, 255, 1.000);
+}
+
+.w-150 {
+    width: 150px;
+}
+
+.w-250 {
+    width: 250px;
+}
+
+.grey {
+    color: rgba(158, 158, 158, 1.000);
+    background: rgba(250, 250, 250, 1.000);
+    border: 1px solid rgba(158, 158, 158, 1.000);
+}
+
+.setting-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    margin: 6px;
+}
+
+#note {
+    font-size: 10px;
+}
+
+.code {
+    font-family: Courier New, Courier, monospace;
+}
+
+i.open-tab-button {
+    padding-left: 5px;
+    font-size: 19px;
+    cursor: pointer;
+}
+
+#css-delete-action {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+
+    /*
+        .action class will add extra margin to right which
+        we don't want for a button; the extra margin is intended for radio buttons
+    */
+    margin-right: 0px;
+}
+
+.selected-css-path,
+.download-folder-path {
+    background: rgba(238, 238, 238, 1.000);
+    padding: 5px 10px;
+    margin-right: 10px;
+    display: flex;
+    width: 90%;
+    justify-content: space-between;
+}
+
+#remove-custom-css {
+    align-items: flex-end;
+}
+
+#server-info-container {
+    /* min-height: calc(100% - 260px); */
+}
+
+#new-org-button {
+    margin: 30px 0px 30px 0px;
+}
+
+#create-organization-container {
+    font-size: 1.15em;
+}
+
+#create-organization-container i {
+    position: relative;
+    top: 3px;
+}
+
+#open-create-org-link {
+    cursor: pointer;
+    text-decoration: none;
+}
+
+.toggle {
+    position: absolute;
+    margin-left: -9999px;
+    visibility: hidden;
+}
+
+.toggle + label {
+    display: block;
+    position: relative;
+    cursor: pointer;
+    outline: none;
+    user-select: none;
+}
+
+.disallowed:hover {
+    background-color: rgba(241, 241, 241, 1.000);
+    cursor: not-allowed;
+}
+
+input.toggle-round + label {
+    padding: 2px;
+    width: 50px;
+    height: 25px;
+    background-color: rgba(221, 221, 221, 1.000);
+    border-radius: 25px;
+}
+
+input.toggle-round + label::before,
+input.toggle-round + label::after {
+    display: block;
+    position: absolute;
+    top: 2px;
+    left: 2px;
+    bottom: 2px;
+    content: "";
+}
+
+input.toggle-round + label::before {
+    background-color: rgba(241, 241, 241, 1.000);
+    border-radius: 25px;
+    top: 0;
+    right: 0px;
+    left: 0px;
+    bottom: 0px;
+}
+
+input.toggle-round + label::after {
+    width: 25px;
+    height: 25px;
+    background-color: rgba(255, 255, 255, 1.000);
+    border-radius: 100%;
+}
+
+input.toggle-round:checked + label::before {
+    background-color: rgba(78, 191, 172, 1.000);
+    top: 0;
+    right: 0px;
+    left: 0px;
+    bottom: 0px;
+}
+
+input.toggle-round:checked + label::after {
+    margin-left: 25px;
+}
+
+/*  Add new server modal */
+
+.add-server-modal {
+    display: block;
+    position: fixed;
+    z-index: 1;
+    padding-top: 15vh;
+    left: 0;
+    top: 0;
+    margin: auto;
+    width: 100%;
+    height: 100%;
+    /* background: rgba(61, 64, 67, 15); */
+    background: linear-gradient(35deg, rgba(0, 59, 82, 1.000), rgba(69, 181, 155, 1.000));
+    overflow: auto;
+}
+
+/* Modal Content */
+
+.modal-container {
+    background-color: rgba(244, 247, 248, 1.000);
+    margin: auto;
+    padding: 57px;
+    border: rgba(218, 225, 227, 1.000) 1px solid;
+    width: 550px;
+    height: 370px;
+    border-radius: 4px;
+}
+
+.add-server-modal .page-title {
+    text-align: center;
+    font-size: 1.6rem;
+}
+
+.divider {
+    margin-bottom: 30px;
+    margin-top: 30px;
+    color: rgba(125, 135, 138, 1.000);
+}
+
+.divider hr {
+    margin-left: 8px;
+    margin-right: 8px;
+    width: 44%;
+}
+
+.left {
+    float: left;
+}
+
+.right {
+    float: right;
+}
+
+.server-center {
+    width: 100%;
+    text-align: center;
+    align-items: center;
+    padding-top: 13px;
+    margin-left: -5px;
+}
+
+.server-center button {
+    font-weight: bold;
+    font-size: 1.1rem;
+    margin: auto;
+    align-items: center;
+    text-align: center;
+    color: rgba(255, 255, 255, 1.000);
+    background: rgba(78, 191, 172, 1.000);
+    border-color: none;
+    border: none;
+    width: 98%;
+    height: 46px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+
+.server-center button:hover {
+    background: rgba(50, 149, 136, 1.000);
+}
+
+.server-center button:focus {
+    background: rgba(50, 149, 136, 1.000);
+}
+
+.certificates-card {
+    width: 80%;
+}
+
+.certificate-input {
+    width: 100%;
+    margin-top: 10px;
+    display: inline-flex;
+}
+
+.certificate-input div {
+    align-self: center;
+}
+
+.certificate-input .setting-input-value {
+    margin-left: 10px;
+    max-width: 100%;
+}
+
+#add-certificate-button {
+    margin: 10px 10px 10px 37px;
+}
+
+.tip {
+    background: none;
+    padding: 0;
+}
+
+.tip:hover {
+    box-shadow: none;
+}
+
+.md-14 {
+    font-size: 14px;
+    vertical-align: middle;
+    padding-right: 6px;
+}
+
+#open-hotkeys-link {
+    text-decoration: underline;
+    cursor: pointer;
+}
+
+.server-network-option {
+    font-weight: bold;
+    font-size: 1.1rem;
+    margin-top: 10px;
+    padding-top: 15px;
+    align-items: center;
+    text-align: center;
+    color: rgb(78, 191, 172);
+    width: 98%;
+    height: 46px;
+    cursor: pointer;
+}
+
+i.open-network-button {
+    font-size: 16px;
+    cursor: pointer;
+    padding-left: 5px;
+    position: absolute;
+}
+
+/* responsive grid */
+@media (min-width: 500px) and (max-width: 720px) {
+    #new-server-container {
+        padding-left: 0px;
+        width: 60vw;
+        padding-right: 4vh;
+    }
+    .page-title {
+        width: 60vw;
+    }
+}
+
+@media (max-width: 500px) {
+    #new-server-container {
+        padding-left: 0px;
+        width: 54%;
+    }
+    .page-title {
+        width: 54%;
+    }
+}
+
+@media (max-width: 650px) {
+    .selected-css-path,
+    .download-folder-path {
+        margin-right: 15px;
+    }
+    #css-delete-action {
+        margin-left: 10px;
+    }
+    #css-delete-action span {
+        display: none;
+    }
+}
+
+@media (max-width: 720px) {
+    .modal-container {
+        width: 60vw;
+        padding: 40px;
+        min-width: 300px;
+    }
+    .server-center button {
+        margin-right: -12px;
+        width: 100%;
+    }
+    .divider {
+        margin-right: -8px;
+    }
+    .divider hr {
+        margin-left: 6px;
+        margin-right: 6px;
+        width: 43%;
+    }
+}
+
+@media (max-width: 600px) {
+    .divider {
+        margin-left: 4%;
+    }
+    .divider hr {
+        margin-left: 2px;
+        margin-right: 2px;
+        width: 40%;
+    }
+}
+
+@media (max-width: 900px) {
+    .settings-card {
+        flex-direction: column;
+        align-items: center;
+    }
+    .server-info-right {
+        flex-direction: column;
+        align-items: center;
+    }
+    .action {
+        margin-top: 10px;
+    }
+}
+
+.lang-menu {
+    font-size: 13px;
+    font-weight: bold;
+    background: rgba(78, 191, 172, 1.000);
+    width: 100px;
+    height: 38px;
+    color: rgba(255, 255, 255, 1.000);
+    border-color: rgba(0, 0, 0, 0);
+}

app/renderer/css/preload.css

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

app/renderer/index.html

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" class="responsive desktop">
-  <!--<![endif]-->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width">
-    <title>Login - Zulip</title>
-    <link rel="stylesheet" href="css/main.css" type="text/css" media="screen">
-  </head>
-  <body class="container-layout">
-    <div class="section-main">
-      <header>
-        <div class="container">
-          <img src="../resources/zulip.png" id="logo"/>
-        </div>
-      </header>
-      <hr>
-      <section class="content">
-        <section class="server">
-          <div class="container">
-            <h1>Enter your Zulip Server URL</h1>
-            <form id="frm-signInForm" class="form-large" onsubmit="addDomain(); return false">
-              <fieldset>
-                <div class="control-group control-required">
-                  <div class="control-field">
-                    <input type="text" id="url"  autofocus="autofocus" spellcheck="false" placeholder="Server URL">
-                  </div>
-                </div>
-                <div class="control-group">
-                  <div class="control-submit">
-                    <button type="submit" id="main" class="btn-primary btn-large" value="Submit" onclick="addDomain();">Connect</button>
-                  </div>
-                </div>
-                <p id="server-status"><p>
-              </fieldset>
-            </form>
-          </div>
-        </section>
-      </section>
-    </div>
-  </body>
-</html>

app/renderer/js/clipboard-decrypter.ts

@@ -0,0 +1,82 @@
+import crypto from 'crypto';
+import {clipboard} from 'electron';
+
+// This helper is exposed via electron_bridge for use in the social
+// login flow.
+//
+// It consists of a key and a promised token.  The in-app page sends
+// the key to the server, and opens the user’s browser to a page where
+// they can log in and get a token encrypted to that key.  When the
+// user copies the encrypted token from their browser to the
+// clipboard, we decrypt it and resolve the promise.  The in-app page
+// then uses the decrypted token to log the user in within the app.
+//
+// The encryption is authenticated (AES-GCM) to guarantee that we
+// don’t leak anything from the user’s clipboard other than the token
+// intended for us.
+
+export class ClipboardDecrypterImpl implements ClipboardDecrypter {
+	version: number;
+	key: Uint8Array;
+	pasted: Promise<string>;
+
+	constructor(_: number) {
+		// At this time, the only version is 1.
+		this.version = 1;
+		this.key = crypto.randomBytes(32);
+		this.pasted = new Promise(resolve => {
+			let interval: NodeJS.Timeout | null = null;
+			const startPolling = () => {
+				if (interval === null) {
+					interval = setInterval(poll, 1000);
+				}
+
+				poll();
+			};
+
+			const stopPolling = () => {
+				if (interval !== null) {
+					clearInterval(interval);
+					interval = null;
+				}
+			};
+
+			const poll = () => {
+				let plaintext;
+
+				try {
+					const data = Buffer.from(clipboard.readText(), 'hex');
+					const iv = data.slice(0, 12);
+					const ciphertext = data.slice(12, -16);
+					const authTag = data.slice(-16);
+					const decipher = crypto.createDecipheriv(
+						'aes-256-gcm',
+						this.key,
+						iv,
+						{authTagLength: 16}
+					);
+					decipher.setAuthTag(authTag);
+					plaintext =
+						decipher.update(ciphertext, undefined, 'utf8') +
+						decipher.final('utf8');
+				} catch {
+					// If the parsing or decryption failed in any way,
+					// the correct token hasn’t been copied yet; try
+					// again next time.
+					return;
+				}
+
+				window.removeEventListener('focus', startPolling);
+				window.removeEventListener('blur', stopPolling);
+				stopPolling();
+				resolve(plaintext);
+			};
+
+			window.addEventListener('focus', startPolling);
+			window.addEventListener('blur', stopPolling);
+			if (document.hasFocus()) {
+				startPolling();
+			}
+		});
+	}
+}

app/renderer/js/components/base.ts

@@ -0,0 +1,7 @@
+export default class BaseComponent {
+	generateNodeFromTemplate(template: string): Element | null {
+		const wrapper = document.createElement('div');
+		wrapper.innerHTML = template;
+		return wrapper.firstElementChild;
+	}
+}

app/renderer/js/components/context-menu.ts

@@ -0,0 +1,115 @@
+import {remote, ContextMenuParams} from 'electron';
+
+import * as t from '../utils/translation-util';
+
+const {clipboard, Menu} = remote;
+
+export const contextMenu = (webContents: Electron.WebContents, event: Event, props: ContextMenuParams) => {
+	const isText = props.selectionText !== '';
+	const isLink = props.linkURL !== '';
+	const linkURL = isLink ? new URL(props.linkURL) : undefined;
+	const isEmailAddress = isLink ? linkURL.protocol === 'mailto:' : undefined;
+
+	const makeSuggestion = (suggestion: string) => ({
+		label: suggestion,
+		visible: true,
+		async click() {
+			await webContents.insertText(suggestion);
+		}
+	});
+
+	let menuTemplate: Electron.MenuItemConstructorOptions[] = [{
+		label: t.__('Add to Dictionary'),
+		visible: props.isEditable && isText && props.misspelledWord.length !== 0,
+		click(_item) {
+			webContents.session.addWordToSpellCheckerDictionary(props.misspelledWord);
+		}
+	}, {
+		type: 'separator',
+		visible: props.isEditable && isText && props.misspelledWord.length !== 0
+	}, {
+		label: `${t.__('Look Up')} "${props.selectionText}"`,
+		visible: process.platform === 'darwin' && isText,
+		click(_item) {
+			webContents.showDefinitionForSelection();
+		}
+	}, {
+		type: 'separator',
+		visible: process.platform === 'darwin' && isText
+	}, {
+		label: t.__('Cut'),
+		visible: isText,
+		enabled: props.isEditable,
+		accelerator: 'CommandOrControl+X',
+		click(_item) {
+			webContents.cut();
+		}
+	}, {
+		label: t.__('Copy'),
+		accelerator: 'CommandOrControl+C',
+		enabled: props.editFlags.canCopy,
+		click(_item) {
+			webContents.copy();
+		}
+	}, {
+		label: t.__('Paste'), // Bug: Paste replaces text
+		accelerator: 'CommandOrControl+V',
+		enabled: props.isEditable,
+		click() {
+			webContents.paste();
+		}
+	}, {
+		type: 'separator'
+	}, {
+		label: isEmailAddress ? t.__('Copy Email Address') : t.__('Copy Link'),
+		visible: isLink,
+		click(_item) {
+			clipboard.write({
+				bookmark: props.linkText,
+				text: isEmailAddress ? linkURL.pathname : props.linkURL
+			});
+		}
+	}, {
+		label: t.__('Copy Image'),
+		visible: props.mediaType === 'image',
+		click(_item) {
+			webContents.copyImageAt(props.x, props.y);
+		}
+	}, {
+		label: t.__('Copy Image URL'),
+		visible: props.mediaType === 'image',
+		click(_item) {
+			clipboard.write({
+				bookmark: props.srcURL,
+				text: props.srcURL
+			});
+		}
+	}, {
+		type: 'separator',
+		visible: isLink || props.mediaType === 'image'
+	}, {
+		label: t.__('Services'),
+		visible: process.platform === 'darwin',
+		role: 'services'
+	}];
+
+	if (props.misspelledWord) {
+		if (props.dictionarySuggestions.length > 0) {
+			const suggestions: Electron.MenuItemConstructorOptions[] = props.dictionarySuggestions.map((suggestion: string) => makeSuggestion(suggestion));
+			menuTemplate = suggestions.concat(menuTemplate);
+		} else {
+			menuTemplate.unshift({
+				label: t.__('No Suggestion Found'),
+				enabled: false
+			});
+		}
+	}
+	// Hide the invisible separators on Linux and Windows
+	// Electron has a bug which ignores visible: false parameter for separator menuitems. So we remove them here.
+	// https://github.com/electron/electron/issues/5869
+	// https://github.com/electron/electron/issues/6906
+
+	const filteredMenuTemplate = menuTemplate.filter(menuItem => menuItem.visible ?? true);
+	const menu = Menu.buildFromTemplate(filteredMenuTemplate);
+	menu.popup();
+};

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

@@ -0,0 +1,47 @@
+import Tab, {TabProps} from './tab';
+
+export default class FunctionalTab extends Tab {
+	$closeButton: Element;
+
+	constructor(props: TabProps) {
+		super(props);
+		this.init();
+	}
+
+	template(): string {
+		return `<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
+					<div class="server-tab-badge close-button">
+						<i class="material-icons">close</i>
+					</div>
+					<div class="server-tab">
+						<i class="material-icons">${this.props.materialIcon}</i>
+					</div>
+				</div>`;
+	}
+
+	init(): void {
+		this.$el = this.generateNodeFromTemplate(this.template());
+		if (this.props.name !== 'Settings') {
+			this.props.$root.append(this.$el);
+			this.$closeButton = this.$el.querySelectorAll('.server-tab-badge')[0];
+			this.registerListeners();
+		}
+	}
+
+	registerListeners(): void {
+		super.registerListeners();
+
+		this.$el.addEventListener('mouseover', () => {
+			this.$closeButton.classList.add('active');
+		});
+
+		this.$el.addEventListener('mouseout', () => {
+			this.$closeButton.classList.remove('active');
+		});
+
+		this.$closeButton.addEventListener('click', (event: Event) => {
+			this.props.onDestroy();
+			event.stopPropagation();
+		});
+	}
+}

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

@@ -0,0 +1,61 @@
+import {ipcRenderer, remote} from 'electron';
+
+import * as ConfigUtil from '../utils/config-util';
+import * as LinkUtil from '../utils/link-util';
+
+import type WebView from './webview';
+
+const {shell, app} = remote;
+
+const dingSound = new Audio('../resources/sounds/ding.ogg');
+
+export default function handleExternalLink(this: WebView, event: Electron.NewWindowEvent): void {
+	event.preventDefault();
+
+	const url = new URL(event.url);
+	const downloadPath = ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`);
+
+	if (LinkUtil.isUploadsUrl(this.props.url, url)) {
+		ipcRenderer.send('downloadFile', url.href, downloadPath);
+		ipcRenderer.once('downloadFileCompleted', async (_event: Event, filePath: string, fileName: string) => {
+			const downloadNotification = new Notification('Download Complete', {
+				body: `Click to show ${fileName} in folder`,
+				silent: true // We'll play our own sound - ding.ogg
+			});
+
+			downloadNotification.addEventListener('click', () => {
+				// Reveal file in download folder
+				shell.showItemInFolder(filePath);
+			});
+			ipcRenderer.removeAllListeners('downloadFileFailed');
+
+			// Play sound to indicate download complete
+			if (!ConfigUtil.getConfigItem('silent')) {
+				await dingSound.play();
+			}
+		});
+
+		ipcRenderer.once('downloadFileFailed', (_event: Event, state: string) => {
+			// Automatic download failed, so show save dialog prompt and download
+			// through webview
+			// Only do this if it is the automatic download, otherwise show an error (so we aren't showing two save
+			// prompts right after each other)
+			// Check that the download is not cancelled by user
+			if (state !== 'cancelled') {
+				if (ConfigUtil.getConfigItem('promptDownload', false)) {
+					// We need to create a "new Notification" to display it, but just `Notification(...)` on its own
+					// doesn't work
+					new Notification('Download Complete', { // eslint-disable-line no-new
+						body: 'Download failed'
+					});
+				} else {
+					this.$el.downloadURL(url.href);
+				}
+			}
+
+			ipcRenderer.removeAllListeners('downloadFileCompleted');
+		});
+	} else {
+		(async () => LinkUtil.openBrowser(url))();
+	}
+}

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

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

app/renderer/js/components/tab.ts

@@ -0,0 +1,54 @@
+import BaseComponent from './base';
+import WebView from './webview';
+
+export interface TabProps {
+	role: string;
+	icon?: string;
+	name: string;
+	$root: Element;
+	onClick: () => void;
+	index: number;
+	tabIndex: number;
+	onHover?: () => void;
+	onHoverOut?: () => void;
+	webview: WebView;
+	materialIcon?: string;
+	onDestroy?: () => void;
+}
+
+export default class Tab extends BaseComponent {
+	props: TabProps;
+	webview: WebView;
+	$el: Element;
+	constructor(props: TabProps) {
+		super();
+
+		this.props = props;
+		this.webview = this.props.webview;
+	}
+
+	registerListeners(): void {
+		this.$el.addEventListener('click', this.props.onClick);
+		this.$el.addEventListener('mouseover', this.props.onHover);
+		this.$el.addEventListener('mouseout', this.props.onHoverOut);
+	}
+
+	showNetworkError(): void {
+		this.webview.forceLoad();
+	}
+
+	activate(): void {
+		this.$el.classList.add('active');
+		this.webview.load();
+	}
+
+	deactivate(): void {
+		this.$el.classList.remove('active');
+		this.webview.hide();
+	}
+
+	destroy(): void {
+		this.$el.remove();
+		this.webview.$el.remove();
+	}
+}

app/renderer/js/components/webview.ts

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

app/renderer/js/electron-bridge.ts

@@ -0,0 +1,80 @@
+import {ipcRenderer} from 'electron';
+import {EventEmitter} from 'events';
+
+import {ClipboardDecrypterImpl} from './clipboard-decrypter';
+import {NotificationData, newNotification} from './notification';
+
+type ListenerType = ((...args: any[]) => void);
+
+class ElectronBridgeImpl extends EventEmitter implements ElectronBridge {
+	send_notification_reply_message_supported: boolean;
+	idle_on_system: boolean;
+	last_active_on_system: number;
+
+	constructor() {
+		super();
+		this.send_notification_reply_message_supported = false;
+		// Indicates if the user is idle or not
+		this.idle_on_system = false;
+
+		// Indicates the time at which user was last active
+		this.last_active_on_system = Date.now();
+	}
+
+	send_event = (eventName: string | symbol, ...args: unknown[]): void => {
+		this.emit(eventName, ...args);
+	};
+
+	on_event = (eventName: string, listener: ListenerType): void => {
+		this.on(eventName, listener);
+	};
+
+	new_notification = (
+		title: string,
+		options: NotificationOptions | undefined,
+		dispatch: (type: string, eventInit: EventInit) => boolean
+	): NotificationData =>
+		newNotification(title, options, dispatch);
+
+	get_idle_on_system = (): boolean => this.idle_on_system;
+
+	get_last_active_on_system = (): number => this.last_active_on_system;
+
+	get_send_notification_reply_message_supported = (): boolean =>
+		this.send_notification_reply_message_supported;
+
+	set_send_notification_reply_message_supported = (value: boolean): void => {
+		this.send_notification_reply_message_supported = value;
+	};
+
+	decrypt_clipboard = (version: number): ClipboardDecrypterImpl =>
+		new ClipboardDecrypterImpl(version);
+}
+
+const electron_bridge = new ElectronBridgeImpl();
+
+electron_bridge.on('total_unread_count', (...args) => {
+	ipcRenderer.send('unread-count', ...args);
+});
+
+electron_bridge.on('realm_name', realmName => {
+	const serverURL = location.origin;
+	ipcRenderer.send('realm-name-changed', serverURL, realmName);
+});
+
+electron_bridge.on('realm_icon_url', (iconURL: unknown) => {
+	if (typeof iconURL !== 'string') {
+		throw new TypeError('Expected string for iconURL');
+	}
+
+	const serverURL = location.origin;
+	iconURL = iconURL.includes('http') ? iconURL : `${serverURL}${iconURL}`;
+	ipcRenderer.send('realm-icon-changed', serverURL, iconURL);
+});
+
+// This follows node's idiomatic implementation of event
+// emitters to make event handling more simpler instead of using
+// functions zulip side will emit event using ElectronBrigde.send_event
+// which is alias of .emit and on this side we can handle the data by adding
+// a listener for the event.
+export default electron_bridge;

app/renderer/js/feedback.ts

@@ -0,0 +1,50 @@
+import {remote} from 'electron';
+import fs from 'fs';
+import path from 'path';
+
+import SendFeedback from '@electron-elements/send-feedback';
+
+const {app} = remote;
+
+customElements.define('send-feedback', SendFeedback);
+export const sendFeedback: SendFeedback = document.querySelector('send-feedback');
+export const feedbackHolder = sendFeedback.parentElement;
+
+// Make the button color match zulip app's theme
+sendFeedback.customStylesheet = 'css/feedback.css';
+
+// Customize the fields of custom elements
+sendFeedback.title = 'Report Issue';
+sendFeedback.titleLabel = 'Issue title:';
+sendFeedback.titlePlaceholder = 'Enter issue title';
+sendFeedback.textareaLabel = 'Describe the issue:';
+sendFeedback.textareaPlaceholder = 'Succinctly describe your issue and steps to reproduce it...';
+
+sendFeedback.buttonLabel = 'Report Issue';
+sendFeedback.loaderSuccessText = '';
+
+sendFeedback.useReporter('emailReporter', {
+	email: 'support@zulip.com'
+});
+
+feedbackHolder.addEventListener('click', (event: Event) => {
+	// Only remove the class if the grey out faded
+	// part is clicked and not the feedback element itself
+	if (event.target === event.currentTarget) {
+		feedbackHolder.classList.remove('show');
+	}
+});
+
+sendFeedback.addEventListener('feedback-submitted', () => {
+	setTimeout(() => {
+		feedbackHolder.classList.remove('show');
+	}, 1000);
+});
+
+sendFeedback.addEventListener('feedback-cancelled', () => {
+	feedbackHolder.classList.remove('show');
+});
+
+const dataDir = app.getPath('userData');
+const logsDir = path.join(dataDir, '/Logs');
+sendFeedback.logs.push(...fs.readdirSync(logsDir).map(file => path.join(logsDir, file)));

app/renderer/js/injected.ts

@@ -0,0 +1,133 @@
+'use strict';
+
+interface CompatElectronBridge extends ElectronBridge {
+	readonly idle_on_system: boolean;
+	readonly last_active_on_system: number;
+	send_notification_reply_message_supported: boolean;
+}
+
+(() => {
+	const zulipWindow = window as typeof window & {
+		electron_bridge: CompatElectronBridge;
+		narrow: {
+			by_subject?: (target_id: number, opts: {trigger?: string}) => void;
+			by_topic?: (target_id: number, opts: {trigger?: string}) => void;
+		};
+		page_params?: {
+			default_language?: string;
+		};
+		raw_electron_bridge: ElectronBridge;
+	};
+
+	const electron_bridge: CompatElectronBridge = {
+		...zulipWindow.raw_electron_bridge,
+
+		get idle_on_system(): boolean {
+			return this.get_idle_on_system();
+		},
+
+		get last_active_on_system(): number {
+			return this.get_last_active_on_system();
+		},
+
+		get send_notification_reply_message_supported(): boolean {
+			return this.get_send_notification_reply_message_supported();
+		},
+
+		set send_notification_reply_message_supported(value: boolean) {
+			this.set_send_notification_reply_message_supported(value);
+		}
+	};
+
+	zulipWindow.electron_bridge = electron_bridge;
+
+	(async () => {
+		if (document.readyState === 'loading') {
+			await new Promise(resolve => {
+				document.addEventListener('DOMContentLoaded', () => {
+					resolve();
+				});
+			});
+		}
+
+		const {page_params} = zulipWindow;
+		if (page_params) {
+			electron_bridge.send_event('zulip-loaded');
+		}
+	})();
+
+	electron_bridge.on_event('narrow-by-topic', (id: number) => {
+		const {narrow} = zulipWindow;
+		const narrowByTopic = narrow.by_topic || narrow.by_subject;
+		narrowByTopic(id, {trigger: 'notification'});
+	});
+
+	function attributeListener<T extends EventTarget>(type: string): PropertyDescriptor {
+		const symbol = Symbol('on' + type);
+
+		function listener(this: T, ev: Event): void {
+			if ((this as any)[symbol].call(this, ev) === false) {
+				ev.preventDefault();
+			}
+		}
+
+		return {
+			configurable: true,
+			enumerable: true,
+			get(this: T) {
+				return (this as any)[symbol];
+			},
+			set(this: T, value: unknown) {
+				if (typeof value === 'function') {
+					if (!(symbol in this)) {
+						this.addEventListener(type, listener);
+					}
+
+					(this as any)[symbol] = value;
+				} else if (symbol in this) {
+					this.removeEventListener(type, listener);
+					delete (this as any)[symbol];
+				}
+			}
+		};
+	}
+
+	const NativeNotification = Notification;
+
+	class InjectedNotification extends EventTarget {
+		constructor(title: string, options?: NotificationOptions) {
+			super();
+			Object.assign(
+				this,
+				electron_bridge.new_notification(title, options, (type: string, eventInit: EventInit) =>
+					this.dispatchEvent(new Event(type, eventInit))
+				)
+			);
+		}
+
+		static get maxActions(): number {
+			return NativeNotification.maxActions;
+		}
+
+		static get permission(): NotificationPermission {
+			return NativeNotification.permission;
+		}
+
+		static async requestPermission(callback?: NotificationPermissionCallback): Promise<NotificationPermission> {
+			if (callback) {
+				callback(await Promise.resolve(NativeNotification.permission));
+			}
+
+			return NativeNotification.permission;
+		}
+	}
+
+	Object.defineProperties(InjectedNotification.prototype, {
+		onclick: attributeListener('click'),
+		onclose: attributeListener('close'),
+		onerror: attributeListener('error'),
+		onshow: attributeListener('show')
+	});
+
+	window.Notification = InjectedNotification as any;
+})();

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

@@ -0,0 +1,113 @@
+import {ipcRenderer} from 'electron';
+
+import MacNotifier from 'node-mac-notifier';
+
+import electron_bridge from '../electron-bridge';
+import * as ConfigUtil from '../utils/config-util';
+
+import {
+	appId, customReply, focusCurrentServer, parseReply
+} from './helpers';
+
+type ReplyHandler = (response: string) => void;
+type ClickHandler = () => void;
+let replyHandler: ReplyHandler;
+let clickHandler: ClickHandler;
+
+interface NotificationHandlerArgs {
+	response: string;
+}
+
+class DarwinNotification {
+	tag: number;
+
+	constructor(title: string, options: NotificationOptions) {
+		const silent: boolean = ConfigUtil.getConfigItem('silent') || false;
+		const {icon} = options;
+		const profilePic = new URL(icon, location.href).href;
+
+		this.tag = Number.parseInt(options.tag, 10);
+		const notification = new MacNotifier(title, Object.assign(options, {
+			bundleId: appId,
+			canReply: true,
+			silent,
+			icon: profilePic
+		}));
+
+		notification.addEventListener('click', () => {
+			// Focus to the server who sent the
+			// notification if not focused already
+			if (clickHandler) {
+				clickHandler();
+			}
+
+			focusCurrentServer();
+			ipcRenderer.send('focus-app');
+		});
+
+		notification.addEventListener('reply', this.notificationHandler);
+	}
+
+	static requestPermission(): void {
+		// Do nothing
+	}
+
+	// Override default Notification permission
+	static get permission(): NotificationPermission {
+		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
+	}
+
+	get onreply(): ReplyHandler {
+		return replyHandler;
+	}
+
+	set onreply(handler: ReplyHandler) {
+		replyHandler = handler;
+	}
+
+	get onclick(): ClickHandler {
+		return clickHandler;
+	}
+
+	set onclick(handler: ClickHandler) {
+		clickHandler = handler;
+	}
+
+	// Not something that is common or
+	// used by zulip server but added to be
+	// future proff.
+	addEventListener(event: string, handler: ClickHandler | ReplyHandler): void {
+		if (event === 'click') {
+			clickHandler = handler as ClickHandler;
+		}
+
+		if (event === 'reply') {
+			replyHandler = handler as ReplyHandler;
+		}
+	}
+
+	async notificationHandler({response}: NotificationHandlerArgs): Promise<void> {
+		response = await parseReply(response);
+		focusCurrentServer();
+		if (electron_bridge.send_notification_reply_message_supported) {
+			electron_bridge.send_event('send_notification_reply_message', this.tag, response);
+			return;
+		}
+
+		electron_bridge.emit('narrow-by-topic', this.tag);
+		if (replyHandler) {
+			replyHandler(response);
+			return;
+		}
+
+		customReply(response);
+	}
+
+	// Method specific to notification api
+	// used by zulip
+	close(): void {
+		// Do nothing
+	}
+}
+
+module.exports = DarwinNotification;

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

@@ -0,0 +1,29 @@
+import {ipcRenderer} from 'electron';
+
+import * as ConfigUtil from '../utils/config-util';
+
+import {focusCurrentServer} from './helpers';
+
+const NativeNotification = window.Notification;
+export default class BaseNotification extends NativeNotification {
+	constructor(title: string, options: NotificationOptions) {
+		options.silent = true;
+		super(title, options);
+
+		this.addEventListener('click', () => {
+			// Focus to the server who sent the
+			// notification if not focused already
+			focusCurrentServer();
+			ipcRenderer.send('focus-app');
+		});
+	}
+
+	static async requestPermission(): Promise<NotificationPermission> {
+		return this.permission;
+	}
+
+	// Override default Notification permission
+	static get permission(): NotificationPermission {
+		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
+	}
+}

app/renderer/js/notification/helpers.ts

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

app/renderer/js/notification/index.ts

@@ -0,0 +1,69 @@
+import {remote} from 'electron';
+
+import DefaultNotification from './default-notification';
+import {appId} from './helpers';
+
+const {app} = remote;
+
+// From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid
+// On windows 8 we have to explicitly set the appUserModelId otherwise notification won't work.
+app.setAppUserModelId(appId);
+
+let Notification = DefaultNotification;
+
+if (process.platform === 'darwin') {
+	Notification = require('./darwin-notifications');
+}
+
+export interface NotificationData {
+	close: () => void;
+	title: string;
+	dir: NotificationDirection;
+	lang: string;
+	body: string;
+	tag: string;
+	image: string;
+	icon: string;
+	badge: string;
+	vibrate: readonly number[];
+	timestamp: number;
+	renotify: boolean;
+	silent: boolean;
+	requireInteraction: boolean;
+	data: unknown;
+	actions: readonly NotificationAction[];
+}
+
+export function newNotification(
+	title: string,
+	options: NotificationOptions | undefined,
+	dispatch: (type: string, eventInit: EventInit) => boolean
+): NotificationData {
+	const notification = new Notification(title, options);
+	for (const type of ['click', 'close', 'error', 'show']) {
+		notification.addEventListener(type, (ev: Event) => {
+			if (!dispatch(type, ev)) {
+				ev.preventDefault();
+			}
+		});
+	}
+
+	return {
+		close: () => notification.close(),
+		title: notification.title,
+		dir: notification.dir,
+		lang: notification.lang,
+		body: notification.body,
+		tag: notification.tag,
+		image: notification.image,
+		icon: notification.icon,
+		badge: notification.badge,
+		vibrate: notification.vibrate,
+		timestamp: notification.timestamp,
+		renotify: notification.renotify,
+		silent: notification.silent,
+		requireInteraction: notification.requireInteraction,
+		data: notification.data,
+		actions: notification.actions
+	};
+}

app/renderer/js/pages/network.ts

@@ -0,0 +1,10 @@
+import {ipcRenderer} from 'electron';
+
+export function init($reconnectButton: Element, $settingsButton: Element): void {
+	$reconnectButton.addEventListener('click', () => {
+		ipcRenderer.send('forward-message', 'reload-viewer');
+	});
+	$settingsButton.addEventListener('click', () => {
+		ipcRenderer.send('forward-message', 'open-settings');
+	});
+}

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

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

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

@@ -0,0 +1,44 @@
+import electron, {app} from 'electron';
+
+import * as ConfigUtil from '../../utils/config-util';
+
+function showBadgeCount(messageCount: number, mainWindow: electron.BrowserWindow): void {
+	if (process.platform === 'win32') {
+		updateOverlayIcon(messageCount, mainWindow);
+	} else {
+		app.badgeCount = messageCount;
+	}
+}
+
+function hideBadgeCount(mainWindow: electron.BrowserWindow): void {
+	if (process.platform === 'win32') {
+		mainWindow.setOverlayIcon(null, '');
+	} else {
+		app.badgeCount = 0;
+	}
+}
+
+export function updateBadge(badgeCount: number, mainWindow: electron.BrowserWindow): void {
+	if (ConfigUtil.getConfigItem('badgeOption', true)) {
+		showBadgeCount(badgeCount, mainWindow);
+	} else {
+		hideBadgeCount(mainWindow);
+	}
+}
+
+function updateOverlayIcon(messageCount: number, mainWindow: electron.BrowserWindow): void {
+	if (!mainWindow.isFocused()) {
+		mainWindow.flashFrame(ConfigUtil.getConfigItem('flashTaskbarOnMessage'));
+	}
+
+	if (messageCount === 0) {
+		mainWindow.setOverlayIcon(null, '');
+	} else {
+		mainWindow.webContents.send('render-taskbar-icon', messageCount);
+	}
+}
+
+export function updateTaskbarIcon(data: string, text: string, mainWindow: electron.BrowserWindow): void {
+	const img = electron.nativeImage.createFromDataURL(data);
+	mainWindow.setOverlayIcon(img, text);
+}

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

@@ -0,0 +1,66 @@
+import {ipcRenderer} from 'electron';
+
+import escape from 'escape-html';
+
+import BaseComponent from '../../components/base';
+
+interface BaseSectionProps {
+	$element: HTMLElement;
+	disabled?: boolean;
+	value: boolean;
+	clickHandler: () => void;
+}
+
+export default class BaseSection extends BaseComponent {
+	generateSettingOption(props: BaseSectionProps): void {
+		const {$element, disabled, value, clickHandler} = props;
+
+		$element.innerHTML = '';
+
+		const $optionControl = this.generateNodeFromTemplate(this.generateOptionTemplate(value, disabled));
+		$element.append($optionControl);
+
+		if (!disabled) {
+			$optionControl.addEventListener('click', clickHandler);
+		}
+	}
+
+	generateOptionTemplate(settingOption: boolean, disabled?: boolean): string {
+		const label = disabled ? '<label class="disallowed" title="Setting locked by system administrator."/>' : '<label/>';
+		if (settingOption) {
+			return `
+				<div class="action">
+					<div class="switch">
+					  <input class="toggle toggle-round" type="checkbox" checked disabled>
+					  ${label}
+					</div>
+				</div>
+			`;
+		}
+
+		return `
+				<div class="action">
+					<div class="switch">
+					  <input class="toggle toggle-round" type="checkbox">
+					  ${label}
+					</div>
+				</div>
+			`;
+	}
+
+	/* A method that in future can be used to create dropdown menus using <select> <option> tags.
+		it needs an object which has ``key: value`` pairs and will return a string that can be appended to HTML
+	*/
+	generateSelectTemplate(options: {[key: string]: string}, className?: string, idName?: string): string {
+		let select = `<select class="${escape(className)}" id="${escape(idName)}">\n`;
+		Object.keys(options).forEach(key => {
+			select += `<option name="${escape(key)}" value="${escape(key)}">${escape(options[key])}</option>\n`;
+		});
+		select += '</select>';
+		return select;
+	}
+
+	reloadApp(): void {
+		ipcRenderer.send('forward-message', 'reload-viewer');
+	}
+}

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

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

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

@@ -0,0 +1,78 @@
+import BaseComponent from '../../components/base';
+import * as LinkUtil from '../../utils/link-util';
+import * as t from '../../utils/translation-util';
+
+interface FindAccountsProps {
+	$root: Element;
+}
+
+export default class FindAccounts extends BaseComponent {
+	props: FindAccountsProps;
+	$findAccounts: Element | null;
+	$findAccountsButton: Element | null;
+	$serverUrlField: HTMLInputElement | null;
+	constructor(props: FindAccountsProps) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+			<div class="settings-card certificate-card">
+				<div class="certificate-input">
+					<div>${t.__('Organization URL')}</div>
+					<input class="setting-input-value" value="zulipchat.com"/>
+				</div>
+				<div class="certificate-input">
+					<button class="green w-150" id="find-accounts-button">${t.__('Find accounts')}</button>
+				</div>
+			</div>
+		`;
+	}
+
+	init(): void {
+		this.$findAccounts = this.generateNodeFromTemplate(this.template());
+		this.props.$root.append(this.$findAccounts);
+		this.$findAccountsButton = this.$findAccounts.querySelector('#find-accounts-button');
+		this.$serverUrlField = this.$findAccounts.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
+		this.initListeners();
+	}
+
+	async findAccounts(url: string): Promise<void> {
+		if (!url) {
+			return;
+		}
+
+		if (!url.startsWith('http')) {
+			url = 'https://' + url;
+		}
+
+		await LinkUtil.openBrowser(new URL('/accounts/find', url));
+	}
+
+	initListeners(): void {
+		this.$findAccountsButton.addEventListener('click', async () => {
+			await this.findAccounts(this.$serverUrlField.value);
+		});
+
+		this.$serverUrlField.addEventListener('click', () => {
+			if (this.$serverUrlField.value === 'zulipchat.com') {
+				this.$serverUrlField.setSelectionRange(0, 0);
+			}
+		});
+
+		this.$serverUrlField.addEventListener('keypress', async event => {
+			if (event.key === 'Enter') {
+				await this.findAccounts(this.$serverUrlField.value);
+			}
+		});
+
+		this.$serverUrlField.addEventListener('input', () => {
+			if (this.$serverUrlField.value) {
+				this.$serverUrlField.classList.remove('invalid-input-value');
+			} else {
+				this.$serverUrlField.classList.add('invalid-input-value');
+			}
+		});
+	}
+}

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

@@ -0,0 +1,582 @@
+import {ipcRenderer, remote, OpenDialogOptions} from 'electron';
+import path from 'path';
+
+import Tagify from '@yaireo/tagify';
+import fs from 'fs-extra';
+import ISO6391 from 'iso-639-1';
+
+import supportedLocales from '../../../../translations/supported-locales.json';
+import * as ConfigUtil from '../../utils/config-util';
+import * as EnterpriseUtil from '../../utils/enterprise-util';
+import * as t from '../../utils/translation-util';
+
+import BaseSection from './base-section';
+
+const {app, dialog, session} = remote;
+const currentBrowserWindow = remote.getCurrentWindow();
+
+interface GeneralSectionProps {
+	$root: Element;
+}
+
+export default class GeneralSection extends BaseSection {
+	props: GeneralSectionProps;
+	constructor(props: GeneralSectionProps) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+            <div class="settings-pane">
+                <div class="title">${t.__('Appearance')}</div>
+                <div id="appearance-option-settings" class="settings-card">
+					<div class="setting-row" id="tray-option">
+						<div class="setting-description">${t.__('Show app icon in system tray')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="menubar-option" style= "display:${process.platform === 'darwin' ? 'none' : ''}">
+						<div class="setting-description">${t.__('Auto hide menu bar (Press Alt key to display)')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="sidebar-option">
+						<div class="setting-description">${t.__('Show sidebar')} (<span class="code">${process.platform === 'darwin' ? 'Cmd+Shift+S' : 'Ctrl+Shift+S'}</span>)</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="badge-option">
+						<div class="setting-description">${t.__('Show app unread badge')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="dock-bounce-option" style= "display:${process.platform === 'darwin' ? '' : 'none'}">
+						<div class="setting-description">${t.__('Bounce dock on new private message')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="flash-taskbar-option" style= "display:${process.platform === 'win32' ? '' : 'none'}">
+						<div class="setting-description">${t.__('Flash taskbar on new message')}</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">${t.__('Desktop Notifications')}</div>
+				<div class="settings-card">
+					<div class="setting-row" id="show-notification-option">
+						<div class="setting-description">${t.__('Show desktop notifications')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="silent-option">
+						<div class="setting-description">${t.__('Mute all sounds from Zulip')}</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">${t.__('App Updates')}</div>
+				<div class="settings-card">
+				<div class="setting-row" id="autoupdate-option">
+						<div class="setting-description">${t.__('Enable auto updates')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="betaupdate-option">
+						<div class="setting-description">${t.__('Get beta updates')}</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">${t.__('Functionality')}</div>
+                <div class="settings-card">
+					<div class="setting-row" id="startAtLogin-option">
+						<div class="setting-description">${t.__('Start app at login')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="start-minimize-option">
+						<div class="setting-description">${t.__('Always start minimized')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="quitOnClose-option">
+						<div class="setting-description">${t.__('Quit when the window is closed')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="enable-spellchecker-option">
+						<div class="setting-description">${t.__('Enable spellchecker (requires restart)')}</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="setting-row" id="spellcheck-langs" style= "display:${process.platform === 'darwin' ? 'none' : ''}"></div>
+					<div class="setting-row" id="note"></div>
+				</div>
+
+				<div class="title">${t.__('Advanced')}</div>
+				<div class="settings-card">
+
+					<div class="setting-row" id="enable-error-reporting">
+						<div class="setting-description">${t.__('Enable error reporting (requires restart)')}</div>
+						<div class="setting-control"></div>
+					</div>
+
+					<div class="setting-row" id="app-language">
+						<div class="setting-description">${t.__('App language (requires restart)')}</div>
+						<div  id="lang-div" class="lang-div"></div>
+					</div>
+
+					<div class="setting-row" id="add-custom-css">
+						<div class="setting-description">
+							${t.__('Add custom CSS')}
+						</div>
+						<button class="custom-css-button green">${t.__('Upload')}</button>
+					</div>
+					<div class="setting-row" id="remove-custom-css">
+						<div class="setting-description">
+							<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigString('customCSS', '')}</div>
+						</div>
+						<div class="action red" id="css-delete-action">
+							<i class="material-icons">indeterminate_check_box</i>
+							<span>${t.__('Delete')}</span>
+						</div>
+					</div>
+					<div class="setting-row" id="download-folder">
+						<div class="setting-description">
+							${t.__('Default download location')}
+						</div>
+						<button class="download-folder-button green">${t.__('Change')}</button>
+					</div>
+					<div class="setting-row">
+						<div class="setting-description">
+							<div class="download-folder-path">${ConfigUtil.getConfigString('downloadsPath', app.getPath('downloads'))}</div>
+						</div>
+					</div>
+					<div class="setting-row" id="prompt-download">
+						<div class="setting-description">${t.__('Ask where to save files before downloading')}</div>
+						<div class="setting-control"></div>
+					</div>
+				</div>
+				<div class="title">${t.__('Factory Reset Data')}</div>
+                <div class="settings-card">
+					<div class="setting-row" id="factory-reset-option">
+						<div class="setting-description">${t.__('Reset the application, thus deleting all the connected organizations, accounts, and certificates.')}
+						</div>
+						<button class="factory-reset-button red w-150">${t.__('Factory Reset')}</button>
+					</div>
+				</div>
+			</div>
+		`;
+	}
+
+	init(): void {
+		this.props.$root.innerHTML = this.template();
+		this.updateTrayOption();
+		this.updateBadgeOption();
+		this.updateSilentOption();
+		this.autoUpdateOption();
+		this.betaUpdateOption();
+		this.updateSidebarOption();
+		this.updateStartAtLoginOption();
+		this.factoryReset();
+		this.showDesktopNotification();
+		this.enableSpellchecker();
+		this.minimizeOnStart();
+		this.addCustomCSS();
+		this.showCustomCSSPath();
+		this.removeCustomCSS();
+		this.downloadFolder();
+		this.updateQuitOnCloseOption();
+		this.updatePromptDownloadOption();
+		this.enableErrorReporting();
+		this.setLocale();
+		this.initSpellChecker();
+
+		// Platform specific settings
+
+		// Flashing taskbar on Windows
+		if (process.platform === 'win32') {
+			this.updateFlashTaskbar();
+		}
+
+		// Dock bounce on macOS
+		if (process.platform === 'darwin') {
+			this.updateDockBouncing();
+		}
+
+		// Auto hide menubar on Windows and Linux
+		if (process.platform !== 'darwin') {
+			this.updateMenubarOption();
+		}
+	}
+
+	updateTrayOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#tray-option .setting-control'),
+			value: ConfigUtil.getConfigItem('trayIcon', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('trayIcon');
+				ConfigUtil.setConfigItem('trayIcon', newValue);
+				ipcRenderer.send('forward-message', 'toggletray');
+				this.updateTrayOption();
+			}
+		});
+	}
+
+	updateMenubarOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#menubar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('autoHideMenubar', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
+				ConfigUtil.setConfigItem('autoHideMenubar', newValue);
+				ipcRenderer.send('toggle-menubar', newValue);
+				this.updateMenubarOption();
+			}
+		});
+	}
+
+	updateBadgeOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#badge-option .setting-control'),
+			value: ConfigUtil.getConfigItem('badgeOption', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('badgeOption');
+				ConfigUtil.setConfigItem('badgeOption', newValue);
+				ipcRenderer.send('toggle-badge-option', newValue);
+				this.updateBadgeOption();
+			}
+		});
+	}
+
+	updateDockBouncing(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#dock-bounce-option .setting-control'),
+			value: ConfigUtil.getConfigItem('dockBouncing', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('dockBouncing');
+				ConfigUtil.setConfigItem('dockBouncing', newValue);
+				this.updateDockBouncing();
+			}
+		});
+	}
+
+	updateFlashTaskbar(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#flash-taskbar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('flashTaskbarOnMessage', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('flashTaskbarOnMessage');
+				ConfigUtil.setConfigItem('flashTaskbarOnMessage', newValue);
+				this.updateFlashTaskbar();
+			}
+		});
+	}
+
+	autoUpdateOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#autoupdate-option .setting-control'),
+			disabled: EnterpriseUtil.configItemExists('autoUpdate'),
+			value: ConfigUtil.getConfigItem('autoUpdate', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('autoUpdate');
+				ConfigUtil.setConfigItem('autoUpdate', newValue);
+				if (!newValue) {
+					ConfigUtil.setConfigItem('betaUpdate', false);
+					this.betaUpdateOption();
+				}
+
+				this.autoUpdateOption();
+			}
+		});
+	}
+
+	betaUpdateOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#betaupdate-option .setting-control'),
+			value: ConfigUtil.getConfigItem('betaUpdate', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('betaUpdate');
+				if (ConfigUtil.getConfigItem('autoUpdate')) {
+					ConfigUtil.setConfigItem('betaUpdate', newValue);
+					this.betaUpdateOption();
+				}
+			}
+		});
+	}
+
+	updateSilentOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#silent-option .setting-control'),
+			value: ConfigUtil.getConfigItem('silent', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('silent', true);
+				ConfigUtil.setConfigItem('silent', newValue);
+				this.updateSilentOption();
+				currentBrowserWindow.webContents.send('toggle-silent', newValue);
+			}
+		});
+	}
+
+	showDesktopNotification(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#show-notification-option .setting-control'),
+			value: ConfigUtil.getConfigItem('showNotification', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('showNotification', true);
+				ConfigUtil.setConfigItem('showNotification', newValue);
+				this.showDesktopNotification();
+			}
+		});
+	}
+
+	updateSidebarOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#sidebar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('showSidebar', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('showSidebar');
+				ConfigUtil.setConfigItem('showSidebar', newValue);
+				ipcRenderer.send('forward-message', 'toggle-sidebar', newValue);
+				this.updateSidebarOption();
+			}
+		});
+	}
+
+	updateStartAtLoginOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#startAtLogin-option .setting-control'),
+			value: ConfigUtil.getConfigItem('startAtLogin', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('startAtLogin');
+				ConfigUtil.setConfigItem('startAtLogin', newValue);
+				ipcRenderer.send('toggleAutoLauncher', newValue);
+				this.updateStartAtLoginOption();
+			}
+		});
+	}
+
+	updateQuitOnCloseOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#quitOnClose-option .setting-control'),
+			value: ConfigUtil.getConfigItem('quitOnClose', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('quitOnClose');
+				ConfigUtil.setConfigItem('quitOnClose', newValue);
+				this.updateQuitOnCloseOption();
+			}
+		});
+	}
+
+	enableSpellchecker(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#enable-spellchecker-option .setting-control'),
+			value: ConfigUtil.getConfigItem('enableSpellchecker', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('enableSpellchecker');
+				ConfigUtil.setConfigItem('enableSpellchecker', newValue);
+				this.enableSpellchecker();
+				const spellcheckerLanguageInput: HTMLElement = document.querySelector('#spellcheck-langs');
+				const spellcheckerNote: HTMLElement = document.querySelector('#note');
+				spellcheckerLanguageInput.style.display = spellcheckerLanguageInput.style.display === 'none' ? '' : 'none';
+				spellcheckerNote.style.display = spellcheckerNote.style.display === 'none' ? '' : 'none';
+			}
+		});
+	}
+
+	enableErrorReporting(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#enable-error-reporting .setting-control'),
+			value: ConfigUtil.getConfigItem('errorReporting', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('errorReporting');
+				ConfigUtil.setConfigItem('errorReporting', newValue);
+				this.enableErrorReporting();
+			}
+		});
+	}
+
+	async customCssDialog(): Promise<void> {
+		const showDialogOptions: OpenDialogOptions = {
+			title: 'Select file',
+			properties: ['openFile'],
+			filters: [{name: 'CSS file', extensions: ['css']}]
+		};
+
+		const {filePaths, canceled} = await dialog.showOpenDialog(showDialogOptions);
+		if (!canceled) {
+			ConfigUtil.setConfigItem('customCSS', filePaths[0]);
+			ipcRenderer.send('forward-message', 'hard-reload');
+		}
+	}
+
+	setLocale(): void {
+		const langDiv: HTMLSelectElement = document.querySelector('.lang-div');
+		const langList = this.generateSelectTemplate(supportedLocales, 'lang-menu');
+		langDiv.innerHTML += langList;
+		// `langMenu` is the select-option dropdown menu formed after executing the previous command
+		const langMenu: HTMLSelectElement = document.querySelector('.lang-menu');
+
+		// The next three lines set the selected language visible on the dropdown button
+		let language = ConfigUtil.getConfigItem('appLanguage');
+		language = language && langMenu.options.namedItem(language) ? language : 'en';
+		langMenu.options.namedItem(language).selected = true;
+
+		langMenu.addEventListener('change', (event: Event) => {
+			ConfigUtil.setConfigItem('appLanguage', (event.target as HTMLSelectElement).value);
+		});
+	}
+
+	minimizeOnStart(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#start-minimize-option .setting-control'),
+			value: ConfigUtil.getConfigItem('startMinimized', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('startMinimized');
+				ConfigUtil.setConfigItem('startMinimized', newValue);
+				this.minimizeOnStart();
+			}
+		});
+	}
+
+	addCustomCSS(): void {
+		const customCSSButton = document.querySelector('#add-custom-css .custom-css-button');
+		customCSSButton.addEventListener('click', async () => {
+			await this.customCssDialog();
+		});
+	}
+
+	showCustomCSSPath(): void {
+		if (!ConfigUtil.getConfigItem('customCSS')) {
+			const cssPATH: HTMLElement = document.querySelector('#remove-custom-css');
+			cssPATH.style.display = 'none';
+		}
+	}
+
+	removeCustomCSS(): void {
+		const removeCSSButton = document.querySelector('#css-delete-action');
+		removeCSSButton.addEventListener('click', () => {
+			ConfigUtil.setConfigItem('customCSS', '');
+			ipcRenderer.send('forward-message', 'hard-reload');
+		});
+	}
+
+	async downloadFolderDialog(): Promise<void> {
+		const showDialogOptions: OpenDialogOptions = {
+			title: 'Select Download Location',
+			properties: ['openDirectory']
+		};
+
+		const {filePaths, canceled} = await dialog.showOpenDialog(showDialogOptions);
+		if (!canceled) {
+			ConfigUtil.setConfigItem('downloadsPath', filePaths[0]);
+			const downloadFolderPath: HTMLElement = document.querySelector('.download-folder-path');
+			downloadFolderPath.textContent = filePaths[0];
+		}
+	}
+
+	downloadFolder(): void {
+		const downloadFolder = document.querySelector('#download-folder .download-folder-button');
+		downloadFolder.addEventListener('click', async () => {
+			await this.downloadFolderDialog();
+		});
+	}
+
+	updatePromptDownloadOption(): void {
+		this.generateSettingOption({
+			$element: document.querySelector('#prompt-download .setting-control'),
+			value: ConfigUtil.getConfigItem('promptDownload', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('promptDownload');
+				ConfigUtil.setConfigItem('promptDownload', newValue);
+				this.updatePromptDownloadOption();
+			}
+		});
+	}
+
+	async factoryResetSettings(): Promise<void> {
+		const clearAppDataMessage = 'When the application restarts, it will be as if you have just downloaded Zulip app.';
+		const getAppPath = path.join(app.getPath('appData'), app.name);
+
+		const {response} = await dialog.showMessageBox({
+			type: 'warning',
+			buttons: ['YES', 'NO'],
+			defaultId: 0,
+			message: 'Are you sure?',
+			detail: clearAppDataMessage
+		});
+		if (response === 0) {
+			await fs.remove(getAppPath);
+			setTimeout(() => ipcRenderer.send('clear-app-settings'), 1000);
+		}
+	}
+
+	factoryReset(): void {
+		const factoryResetButton = document.querySelector('#factory-reset-option .factory-reset-button');
+		factoryResetButton.addEventListener('click', async () => {
+			await this.factoryResetSettings();
+		});
+	}
+
+	initSpellChecker(): void {
+		// The elctron API is a no-op on macOS and macOS default spellchecker is used.
+		if (process.platform === 'darwin') {
+			const note: HTMLElement = document.querySelector('#note');
+			note.append(t.__('On macOS, the OS spellchecker is used.'));
+			note.append(document.createElement('br'));
+			note.append(t.__('Change the language from System Preferences → Keyboard → Text → Spelling.'));
+		} else {
+			const note: HTMLElement = document.querySelector('#note');
+			note.append(t.__('You can select a maximum of 3 languages for spellchecking.'));
+			const spellDiv: HTMLElement = document.querySelector('#spellcheck-langs');
+			spellDiv.innerHTML += `
+				<div class="setting-description">${t.__('Spellchecker Languages')}</div>
+				<input name='spellcheck' placeholder='Enter Languages'>`;
+
+			const availableLanguages = session.fromPartition('persist:webviewsession').availableSpellCheckerLanguages;
+			let languagePairs: Map<string, string> = new Map();
+			availableLanguages.forEach((l: string) => {
+				if (ISO6391.validate(l)) {
+					languagePairs.set(ISO6391.getName(l), l);
+				}
+			});
+
+			// Manually set names for languages not available in ISO6391
+			languagePairs.set('English (AU)', 'en-AU');
+			languagePairs.set('English (CA)', 'en-CA');
+			languagePairs.set('English (GB)', 'en-GB');
+			languagePairs.set('English (US)', 'en-US');
+			languagePairs.set('Spanish (Latin America)', 'es-419');
+			languagePairs.set('Spanish (Argentina)', 'es-AR');
+			languagePairs.set('Spanish (Mexico)', 'es-MX');
+			languagePairs.set('Spanish (US)', 'es-US');
+			languagePairs.set('Portuguese (Brazil)', 'pt-BR');
+			languagePairs.set('Portuguese (Portugal)', 'pt-PT');
+			languagePairs.set('Serbo-Croatian', 'sh');
+
+			languagePairs = new Map([...languagePairs].sort((a, b) => ((a[0] < b[0]) ? -1 : 1)));
+
+			const tagField: HTMLElement = document.querySelector('input[name=spellcheck]');
+			const tagify = new Tagify(tagField, {
+				whitelist: [...languagePairs.keys()],
+				enforceWhitelist: true,
+				maxTags: 3,
+				dropdown: {
+					enabled: 0,
+					maxItems: Infinity,
+					closeOnSelect: false,
+					highlightFirst: true
+				}
+			});
+
+			const configuredLanguages: string[] = ConfigUtil.getConfigItem('spellcheckerLanguages').map((code: string) => [...languagePairs].filter(pair => (pair[1] === code))[0][0]);
+			tagify.addTags(configuredLanguages);
+
+			tagField.addEventListener('change', event => {
+				if ((event.target as HTMLInputElement).value.length === 0) {
+					ConfigUtil.setConfigItem('spellcheckerLanguages', []);
+					ipcRenderer.send('set-spellcheck-langs');
+				} else {
+					const spellLangs: string[] = [...JSON.parse((event.target as HTMLInputElement).value).values()].map(elt => languagePairs.get(elt.value));
+					ConfigUtil.setConfigItem('spellcheckerLanguages', spellLangs);
+					ipcRenderer.send('set-spellcheck-langs');
+				}
+			});
+		}
+
+		// Do not display the spellchecker input and note if it is disabled
+		if (!ConfigUtil.getConfigItem('enableSpellchecker')) {
+			const spellcheckerLanguageInput: HTMLElement = document.querySelector('#spellcheck-langs');
+			const spellcheckerNote: HTMLElement = document.querySelector('#note');
+			spellcheckerLanguageInput.style.display = 'none';
+			spellcheckerNote.style.display = 'none';
+		}
+	}
+}

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

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

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

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

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

@@ -0,0 +1,111 @@
+import {ipcRenderer, remote} from 'electron';
+
+import BaseComponent from '../../components/base';
+import * as DomainUtil from '../../utils/domain-util';
+import * as LinkUtil from '../../utils/link-util';
+import * as t from '../../utils/translation-util';
+
+const {dialog} = remote;
+
+interface NewServerFormProps {
+	$root: Element;
+	onChange: () => void;
+}
+
+export default class NewServerForm extends BaseComponent {
+	props: NewServerFormProps;
+	$newServerForm: Element;
+	$saveServerButton: HTMLButtonElement;
+	$newServerUrl: HTMLInputElement;
+	constructor(props: NewServerFormProps) {
+		super();
+		this.props = props;
+	}
+
+	template(): string {
+		return `
+			<div class="server-input-container">
+				<div class="title">${t.__('Organization URL')}</div>
+				<div class="add-server-info-row">
+					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
+				</div>
+				<div class="server-center">
+					<button id="connect">${t.__('Connect')}</button>
+				</div>
+				<div class="server-center">
+					<div class="divider">
+						<hr class="left"/>${t.__('OR')}<hr class="right" />
+					</div>
+				</div>
+				<div class="server-center">
+					<button id="open-create-org-link">${t.__('Create a new organization')}</button>
+				</div>
+				<div class="server-center">
+					<div class="server-network-option">
+						<span id="open-network-settings">${t.__('Network and Proxy Settings')}</span>
+						<i class="material-icons open-network-button">open_in_new</i>
+					</div>
+				</div>
+			</div>
+		`;
+	}
+
+	init(): void {
+		this.initForm();
+		this.initActions();
+	}
+
+	initForm(): void {
+		this.$newServerForm = this.generateNodeFromTemplate(this.template());
+		this.$saveServerButton = this.$newServerForm.querySelector('#connect');
+		this.props.$root.innerHTML = '';
+		this.props.$root.append(this.$newServerForm);
+		this.$newServerUrl = this.$newServerForm.querySelectorAll('input.setting-input-value')[0] as HTMLInputElement;
+	}
+
+	async submitFormHandler(): Promise<void> {
+		this.$saveServerButton.innerHTML = 'Connecting...';
+		let serverConf;
+		try {
+			serverConf = await DomainUtil.checkDomain(this.$newServerUrl.value);
+		} catch (error) {
+			this.$saveServerButton.innerHTML = 'Connect';
+			await dialog.showMessageBox({
+				type: 'error',
+				message: error.toString(),
+				buttons: ['OK']
+			});
+			return;
+		}
+
+		await DomainUtil.addDomain(serverConf);
+		this.props.onChange();
+	}
+
+	openCreateNewOrgExternalLink(): void {
+		const link = 'https://zulip.com/new/';
+		const externalCreateNewOrgElement = document.querySelector('#open-create-org-link');
+		externalCreateNewOrgElement.addEventListener('click', async () => {
+			await LinkUtil.openBrowser(new URL(link));
+		});
+	}
+
+	networkSettingsLink(): void {
+		const networkSettingsId = document.querySelectorAll('.server-network-option')[0];
+		networkSettingsId.addEventListener('click', () => ipcRenderer.send('forward-message', 'open-network-settings'));
+	}
+
+	initActions(): void {
+		this.$saveServerButton.addEventListener('click', async () => {
+			await this.submitFormHandler();
+		});
+		this.$newServerUrl.addEventListener('keypress', async event => {
+			if (event.key === 'Enter') {
+				await this.submitFormHandler();
+			}
+		});
+		// Open create new org link in default browser
+		this.openCreateNewOrgExternalLink();
+		this.networkSettingsLink();
+	}
+}

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

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

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

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

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

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

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

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

app/renderer/js/pref.js

@@ -1,67 +0,0 @@
-'use strict';
-// eslint-disable-next-line import/no-extraneous-dependencies
-const {remote} = require('electron');
-
-const prefWindow = remote.getCurrentWindow();
-
-document.getElementById('close-button').addEventListener('click', () => {
-	prefWindow.close();
-});
-
-document.addEventListener('keydown', event => {
-	if (event.key === 'Escape' || event.keyCode === 27) {
-		prefWindow.close();
-	}
-});
-// eslint-disable-next-line no-unused-vars
-window.prefDomain = function () {
-	const request = require('request');
-	// eslint-disable-next-line import/no-extraneous-dependencies
-	const ipcRenderer = require('electron').ipcRenderer;
-	const JsonDB = require('node-json-db');
-	// eslint-disable-next-line import/no-extraneous-dependencies
-	const {
-		app
-	} = require('electron').remote;
-
-	const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
-
-	let newDomain = document.getElementById('url').value;
-	newDomain = newDomain.replace(/^https?:\/\//, '');
-	newDomain = newDomain.replace(/^http?:\/\//, '');
-
-	if (newDomain === '') {
-		document.getElementById('urladded').innerHTML = 'Please input a value';
-	} else {
-		document.getElementById('main').innerHTML = 'Checking...';
-		if (newDomain.indexOf('localhost:') >= 0) {
-			const domain = 'http://' + newDomain;
-			const checkDomain = domain + '/static/audio/zulip.ogg';
-			request(checkDomain, (error, response) => {
-				if (!error && response.statusCode !== 404) {
-					document.getElementById('main').innerHTML = 'Switch';
-					document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
-					db.push('/domain', domain);
-					ipcRenderer.send('new-domain', domain);
-				} else {
-					document.getElementById('main').innerHTML = 'Switch';
-					document.getElementById('urladded').innerHTML = 'Not a valid Zulip Local Server.';
-				}
-			});
-		} else {
-			const domain = 'https://' + newDomain;
-			const checkDomain = domain + '/static/audio/zulip.ogg';
-			request(checkDomain, (error, response) => {
-				if (!error && response.statusCode !== 404) {
-					document.getElementById('main').innerHTML = 'Switch';
-					document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
-					db.push('/domain', domain);
-					ipcRenderer.send('new-domain', domain);
-				} else {
-					document.getElementById('main').innerHTML = 'Switch';
-					document.getElementById('urladded').innerHTML = 'Not a valid Zulip Server.';
-				}
-			});
-		}
-	}
-};

app/renderer/js/preload.ts

@@ -0,0 +1,115 @@
+import {contextBridge, ipcRenderer, webFrame} from 'electron';
+import fs from 'fs';
+
+import isDev from 'electron-is-dev';
+
+import electron_bridge from './electron-bridge';
+import {loadBots} from './notification/helpers';
+import * as NetworkError from './pages/network';
+
+// Prevent drag and drop event in main process which prevents remote code executaion
+// eslint-disable-next-line import/no-unassigned-import
+import './shared/preventdrag';
+
+contextBridge.exposeInMainWorld('raw_electron_bridge', electron_bridge);
+
+electron_bridge.once('zulip-loaded', async () => {
+	await loadBots();
+});
+
+ipcRenderer.on('logout', () => {
+	// Create the menu for the below
+	const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
+	dropdown.click();
+
+	const nodes: NodeListOf<HTMLElement> = document.querySelectorAll('.dropdown-menu li:last-child a');
+	nodes[nodes.length - 1].click();
+});
+
+ipcRenderer.on('shortcut', () => {
+	// Create the menu for the below
+	const node: HTMLElement = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
+	// Additional check
+	if (node.textContent.trim().toLowerCase() === 'keyboard shortcuts (?)') {
+		node.click();
+	} else {
+		// Atleast click the dropdown
+		const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
+		dropdown.click();
+	}
+});
+
+ipcRenderer.on('show-notification-settings', () => {
+	// Create the menu for the below
+	const dropdown: HTMLElement = document.querySelector('.dropdown-toggle');
+	dropdown.click();
+
+	const nodes: NodeListOf<HTMLElement> = document.querySelectorAll('.dropdown-menu li a');
+	nodes[2].click();
+
+	const notificationItem: NodeListOf<HTMLElement> = document.querySelectorAll('.normal-settings-list li div');
+
+	// Wait until the notification dom element shows up
+	setTimeout(() => {
+		notificationItem[2].click();
+	}, 100);
+});
+
+electron_bridge.once('zulip-loaded', () => {
+	// Redirect users to network troubleshooting page
+	const getRestartButton = document.querySelector('.restart_get_events_button');
+	if (getRestartButton) {
+		getRestartButton.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'reload-viewer');
+		});
+	}
+});
+
+window.addEventListener('load', (event: any): void => {
+	if (!event.target.URL.includes('app/renderer/network.html')) {
+		return;
+	}
+
+	const $reconnectButton = document.querySelector('#reconnect');
+	const $settingsButton = document.querySelector('#settings');
+	NetworkError.init($reconnectButton, $settingsButton);
+});
+
+// Electron's globalShortcut can cause unexpected results
+// so adding the reload shortcut in the old-school way
+// Zoom from numpad keys is not supported by electron, so adding it through listeners.
+document.addEventListener('keydown', event => {
+	const cmdOrCtrl = event.ctrlKey || event.metaKey;
+	if (event.code === 'F5') {
+		ipcRenderer.send('forward-message', 'hard-reload');
+	} else if (cmdOrCtrl && (event.code === 'NumpadAdd' || event.code === 'Equal')) {
+		ipcRenderer.send('forward-message', 'zoomIn');
+	} else if (cmdOrCtrl && event.code === 'NumpadSubtract') {
+		ipcRenderer.send('forward-message', 'zoomOut');
+	} else if (cmdOrCtrl && event.code === 'Numpad0') {
+		ipcRenderer.send('forward-message', 'zoomActualSize');
+	}
+});
+
+// Set user as active and update the time of last activity
+ipcRenderer.on('set-active', () => {
+	if (isDev) {
+		console.log('active');
+	}
+
+	electron_bridge.idle_on_system = false;
+	electron_bridge.last_active_on_system = Date.now();
+});
+
+// Set user as idle and time of last activity is left unchanged
+ipcRenderer.on('set-idle', () => {
+	if (isDev) {
+		console.log('idle');
+	}
+
+	electron_bridge.idle_on_system = true;
+});
+
+(async () => webFrame.executeJavaScript(
+	fs.readFileSync(require.resolve('./injected'), 'utf8')
+))();

app/renderer/js/shared/preventdrag.ts

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

app/renderer/js/tray.ts

@@ -0,0 +1,220 @@
+import {ipcRenderer, remote, WebviewTag, NativeImage} from 'electron';
+import path from 'path';
+
+import * as ConfigUtil from './utils/config-util';
+
+const {Tray, Menu, nativeImage, BrowserWindow} = remote;
+
+let tray: Electron.Tray;
+
+const ICON_DIR = '../../resources/tray';
+
+const TRAY_SUFFIX = 'tray';
+
+const APP_ICON = path.join(__dirname, ICON_DIR, TRAY_SUFFIX);
+
+const iconPath = (): string => {
+	if (process.platform === 'linux') {
+		return APP_ICON + 'linux.png';
+	}
+
+	return APP_ICON + (process.platform === 'win32' ? 'win.ico' : 'macOSTemplate.png');
+};
+
+let unread = 0;
+
+const trayIconSize = (): number => {
+	switch (process.platform) {
+		case 'darwin':
+			return 20;
+		case 'win32':
+			return 100;
+		case 'linux':
+			return 100;
+		default: return 80;
+	}
+};
+
+//  Default config for Icon we might make it OS specific if needed like the size
+const config = {
+	pixelRatio: window.devicePixelRatio,
+	unreadCount: 0,
+	showUnreadCount: true,
+	unreadColor: '#000000',
+	readColor: '#000000',
+	unreadBackgroundColor: '#B9FEEA',
+	readBackgroundColor: '#B9FEEA',
+	size: trayIconSize(),
+	thick: process.platform === 'win32'
+};
+
+const renderCanvas = function (arg: number): HTMLCanvasElement {
+	config.unreadCount = arg;
+
+	const SIZE = config.size * config.pixelRatio;
+	const PADDING = SIZE * 0.05;
+	const CENTER = SIZE / 2;
+	const HAS_COUNT = config.showUnreadCount && config.unreadCount;
+	const color = config.unreadCount ? config.unreadColor : config.readColor;
+	const backgroundColor = config.unreadCount ? config.unreadBackgroundColor : config.readBackgroundColor;
+
+	const canvas = document.createElement('canvas');
+	canvas.width = SIZE;
+	canvas.height = SIZE;
+	const ctx = canvas.getContext('2d');
+
+	// Circle
+	// If (!config.thick || config.thick && HAS_COUNT) {
+	ctx.beginPath();
+	ctx.arc(CENTER, CENTER, (SIZE / 2) - PADDING, 0, 2 * Math.PI, false);
+	ctx.fillStyle = backgroundColor;
+	ctx.fill();
+	ctx.lineWidth = SIZE / (config.thick ? 10 : 20);
+	ctx.strokeStyle = backgroundColor;
+	ctx.stroke();
+	// Count or Icon
+	if (HAS_COUNT) {
+		ctx.fillStyle = color;
+		ctx.textAlign = 'center';
+		if (config.unreadCount > 99) {
+			ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.4}px Helvetica`;
+			ctx.fillText('99+', CENTER, CENTER + (SIZE * 0.15));
+		} else if (config.unreadCount < 10) {
+			ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.5}px Helvetica`;
+			ctx.fillText(String(config.unreadCount), CENTER, CENTER + (SIZE * 0.2));
+		} else {
+			ctx.font = `${config.thick ? 'bold ' : ''}${SIZE * 0.5}px Helvetica`;
+			ctx.fillText(String(config.unreadCount), CENTER, CENTER + (SIZE * 0.15));
+		}
+	}
+
+	return canvas;
+};
+
+/**
+ * Renders the tray icon as a native image
+ * @param arg: Unread count
+ * @return the native image
+ */
+const renderNativeImage = function (arg: number): NativeImage {
+	const canvas = renderCanvas(arg);
+	const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPNG();
+	return nativeImage.createFromBuffer(pngData, {
+		scaleFactor: config.pixelRatio
+	});
+};
+
+function sendAction(action: string): void {
+	const win = BrowserWindow.getAllWindows()[0];
+
+	if (process.platform === 'darwin') {
+		win.restore();
+	}
+
+	win.webContents.send(action);
+}
+
+const createTray = function (): void {
+	const contextMenu = Menu.buildFromTemplate([
+		{
+			label: 'Zulip',
+			click() {
+				ipcRenderer.send('focus-app');
+			}
+		},
+		{
+			label: 'Settings',
+			click() {
+				ipcRenderer.send('focus-app');
+				sendAction('open-settings');
+			}
+		},
+		{
+			type: 'separator'
+		},
+		{
+			label: 'Quit',
+			click() {
+				ipcRenderer.send('quit-app');
+			}
+		}
+	]);
+	tray = new Tray(iconPath());
+	tray.setContextMenu(contextMenu);
+	if (process.platform === 'linux' || process.platform === 'win32') {
+		tray.on('click', () => {
+			ipcRenderer.send('toggle-app');
+		});
+	}
+};
+
+ipcRenderer.on('destroytray', (event: Event): Event => {
+	if (!tray) {
+		return undefined;
+	}
+
+	tray.destroy();
+	if (tray.isDestroyed()) {
+		tray = null;
+	} else {
+		throw new Error('Tray icon not properly destroyed.');
+	}
+
+	return event;
+});
+
+ipcRenderer.on('tray', (_event: Event, arg: number): void => {
+	if (!tray) {
+		return;
+	}
+
+	// We don't want to create tray from unread messages on macOS since it already has dock badges.
+	if (process.platform === 'linux' || process.platform === 'win32') {
+		if (arg === 0) {
+			unread = arg;
+			tray.setImage(iconPath());
+			tray.setToolTip('No unread messages');
+		} else {
+			unread = arg;
+			const image = renderNativeImage(arg);
+			tray.setImage(image);
+			tray.setToolTip(`${arg} unread messages`);
+		}
+	}
+});
+
+function toggleTray(): void {
+	let state;
+	if (tray) {
+		state = false;
+		tray.destroy();
+		if (tray.isDestroyed()) {
+			tray = null;
+		}
+
+		ConfigUtil.setConfigItem('trayIcon', false);
+	} else {
+		state = true;
+		createTray();
+		if (process.platform === 'linux' || process.platform === 'win32') {
+			const image = renderNativeImage(unread);
+			tray.setImage(image);
+			tray.setToolTip(`${unread} unread messages`);
+		}
+
+		ConfigUtil.setConfigItem('trayIcon', true);
+	}
+
+	const selector = 'webview:not([class*=disabled])';
+	const webview: WebviewTag = document.querySelector(selector);
+	const webContents = remote.webContents.fromId(webview.getWebContentsId());
+	webContents.send('toggletray', state);
+}
+
+ipcRenderer.on('toggletray', toggleTray);
+
+if (ConfigUtil.getConfigItem('trayIcon', true)) {
+	createTray();
+}
+
+export {};

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

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

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

@@ -0,0 +1,8 @@
+// Unescape already encoded/escaped strings
+export function decodeString(stringInput: string): string {
+	const parser = new DOMParser();
+	const dom = parser.parseFromString(
+		'<!doctype html><body>' + stringInput,
+		'text/html');
+	return dom.body.textContent;
+}

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

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

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

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

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

@@ -0,0 +1,48 @@
+import * as ConfigUtil from './config-util';
+
+type SettingName = 'showNotification' | 'silent' | 'flashTaskbarOnMessage';
+
+export interface DNDSettings {
+	showNotification?: boolean;
+	silent?: boolean;
+	flashTaskbarOnMessage?: boolean;
+}
+
+interface Toggle {
+	dnd: boolean;
+	newSettings: DNDSettings;
+}
+
+export function toggle(): Toggle {
+	const dnd = !ConfigUtil.getConfigItem('dnd', false);
+	const dndSettingList: SettingName[] = ['showNotification', 'silent'];
+	if (process.platform === 'win32') {
+		dndSettingList.push('flashTaskbarOnMessage');
+	}
+
+	let newSettings: DNDSettings;
+	if (dnd) {
+		const oldSettings: DNDSettings = {};
+		newSettings = {};
+
+		// Iterate through the dndSettingList.
+		for (const settingName of dndSettingList) {
+			// Store the current value of setting.
+			oldSettings[settingName] = ConfigUtil.getConfigItem(settingName);
+			// New value of setting.
+			newSettings[settingName] = (settingName === 'silent');
+		}
+
+		// Store old value in oldSettings.
+		ConfigUtil.setConfigItem('dndPreviousSettings', oldSettings);
+	} else {
+		newSettings = ConfigUtil.getConfigItem('dndPreviousSettings');
+	}
+
+	for (const settingName of dndSettingList) {
+		ConfigUtil.setConfigItem(settingName, newSettings[settingName]);
+	}
+
+	ConfigUtil.setConfigItem('dnd', dnd);
+	return {dnd, newSettings};
+}

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

@@ -0,0 +1,204 @@
+import {remote, ipcRenderer} from 'electron';
+import fs from 'fs';
+import path from 'path';
+
+import {JsonDB} from 'node-json-db';
+
+import * as Messages from '../../../resources/messages';
+
+import * as EnterpriseUtil from './enterprise-util';
+import Logger from './logger-util';
+
+const {app, dialog} = remote;
+
+export interface ServerConf {
+	url: string;
+	alias?: string;
+	icon?: string;
+}
+
+const logger = new Logger({
+	file: 'domain-util.log',
+	timestamp: true
+});
+
+const defaultIconUrl = '../renderer/img/icon.png';
+
+let db: JsonDB;
+
+reloadDB();
+// Migrate from old schema
+if (db.getData('/').domain) {
+	(async () => {
+		await addDomain({
+			alias: 'Zulip',
+			url: db.getData('/domain')
+		});
+		db.delete('/domain');
+	})();
+}
+
+export function getDomains(): ServerConf[] {
+	reloadDB();
+	if (db.getData('/').domains === undefined) {
+		return [];
+	}
+
+	return db.getData('/domains');
+}
+
+export function getDomain(index: number): ServerConf {
+	reloadDB();
+	return db.getData(`/domains[${index}]`);
+}
+
+export function updateDomain(index: number, server: ServerConf): void {
+	reloadDB();
+	db.push(`/domains[${index}]`, server, true);
+}
+
+export async function addDomain(server: ServerConf): Promise<void> {
+	if (server.icon) {
+		const localIconUrl = await saveServerIcon(server);
+		server.icon = localIconUrl;
+		db.push('/domains[]', server, true);
+		reloadDB();
+	} else {
+		server.icon = defaultIconUrl;
+		db.push('/domains[]', server, true);
+		reloadDB();
+	}
+}
+
+export function removeDomains(): void {
+	db.delete('/domains');
+	reloadDB();
+}
+
+export function removeDomain(index: number): boolean {
+	if (EnterpriseUtil.isPresetOrg(getDomain(index).url)) {
+		return false;
+	}
+
+	db.delete(`/domains[${index}]`);
+	reloadDB();
+	return true;
+}
+
+// Check if domain is already added
+export function duplicateDomain(domain: string): boolean {
+	domain = formatUrl(domain);
+	return getDomains().some(server => server.url === domain);
+}
+
+async function checkCertError(domain: string, serverConf: ServerConf, error: any, silent: boolean): Promise<ServerConf> {
+	if (silent) {
+		// Since getting server settings has already failed
+		return serverConf;
+	}
+
+	// Report error to sentry to get idea of possible certificate errors
+	// users get when adding the servers
+	logger.reportSentry(error);
+	const certErrorMessage = Messages.certErrorMessage(domain, error);
+	const certErrorDetail = Messages.certErrorDetail();
+
+	await dialog.showMessageBox({
+		type: 'error',
+		buttons: ['OK'],
+		message: certErrorMessage,
+		detail: certErrorDetail
+	});
+	throw new Error('Untrusted certificate.');
+}
+
+export async function checkDomain(domain: string, silent = false): Promise<ServerConf> {
+	if (!silent && duplicateDomain(domain)) {
+		// Do not check duplicate in silent mode
+		throw new Error('This server has been added.');
+	}
+
+	domain = formatUrl(domain);
+
+	const serverConf = {
+		icon: defaultIconUrl,
+		url: domain,
+		alias: domain
+	};
+
+	try {
+		return await getServerSettings(domain);
+	} catch (error_) {
+		// Make sure that error is an error or string not undefined
+		// so validation does not throw error.
+		const error = error_ || '';
+
+		const certsError = error.toString().includes('certificate');
+		if (certsError) {
+			const result = await checkCertError(domain, serverConf, error, silent);
+			return result;
+		}
+
+		throw new Error(Messages.invalidZulipServerError(domain));
+	}
+}
+
+async function getServerSettings(domain: string): Promise<ServerConf> {
+	return ipcRenderer.invoke('get-server-settings', domain);
+}
+
+export async function saveServerIcon(server: ServerConf): Promise<string> {
+	return ipcRenderer.invoke('save-server-icon', server.icon);
+}
+
+export async function updateSavedServer(url: string, index: number): Promise<void> {
+	// Does not promise successful update
+	const oldIcon = getDomain(index).icon;
+	try {
+		const newServerConf = await checkDomain(url, true);
+		const localIconUrl = await saveServerIcon(newServerConf);
+		if (!oldIcon || localIconUrl !== '../renderer/img/icon.png') {
+			newServerConf.icon = localIconUrl;
+			updateDomain(index, newServerConf);
+			reloadDB();
+		}
+	} catch (error) {
+		logger.log('Could not update server icon.');
+		logger.log(error);
+		logger.reportSentry(error);
+	}
+}
+
+function reloadDB(): void {
+	const domainJsonPath = path.join(app.getPath('userData'), 'config/domain.json');
+	try {
+		const file = fs.readFileSync(domainJsonPath, 'utf8');
+		JSON.parse(file);
+	} catch (error) {
+		if (fs.existsSync(domainJsonPath)) {
+			fs.unlinkSync(domainJsonPath);
+			dialog.showErrorBox(
+				'Error saving new organization',
+				'There seems to be error while saving new organization, ' +
+				'you may have to re-add your previous organizations back.'
+			);
+			logger.error('Error while JSON parsing domain.json: ');
+			logger.error(error);
+			logger.reportSentry(error);
+		}
+	}
+
+	db = new JsonDB(domainJsonPath, true, true);
+}
+
+export function formatUrl(domain: string): string {
+	if (domain.startsWith('http://') || domain.startsWith('https://')) {
+		return domain;
+	}
+
+	if (domain.startsWith('localhost:')) {
+		return `http://${domain}`;
+	}
+
+	return `https://${domain}`;
+}

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

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

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

@@ -0,0 +1,46 @@
+import {shell} from 'electron';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+
+import escape from 'escape-html';
+
+export function isUploadsUrl(server: string, url: URL): boolean {
+	return url.origin === server && url.pathname.startsWith('/user_uploads/');
+}
+
+export async function openBrowser(url: URL): Promise<void> {
+	if (['http:', 'https:', 'mailto:'].includes(url.protocol)) {
+		await shell.openExternal(url.href);
+	} else {
+		// For security, indirect links to non-whitelisted protocols
+		// through a real web browser via a local HTML file.
+		const dir = fs.mkdtempSync(
+			path.join(os.tmpdir(), 'zulip-redirect-')
+		);
+		const file = path.join(dir, 'redirect.html');
+		fs.writeFileSync(file, `\
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="UTF-8" />
+        <meta http-equiv="Refresh" content="0; url=${escape(url.href)}" />
+        <title>Redirecting</title>
+        <style>
+            html {
+                font-family: menu, "Helvetica Neue", sans-serif;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Opening <a href="${escape(url.href)}">${escape(url.href)}</a>…</p>
+    </body>
+</html>
+`);
+		await shell.openPath(file);
+		setTimeout(() => {
+			fs.unlinkSync(file);
+			fs.rmdirSync(dir);
+		}, 15000);
+	}
+}

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

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

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

@@ -0,0 +1,154 @@
+import {Console} from 'console'; // eslint-disable-line node/prefer-global/console
+import electron from 'electron';
+import fs from 'fs';
+import os from 'os';
+
+import isDev from 'electron-is-dev';
+
+import {initSetUp} from './default-util';
+import {sentryInit, captureException} from './sentry-util';
+
+interface LoggerOptions {
+	timestamp?: true | (() => string);
+	file?: string;
+	level?: boolean;
+	logInDevMode?: boolean;
+}
+
+initSetUp();
+
+let app: Electron.App = null;
+let reportErrors = true;
+if (process.type === 'renderer') {
+	app = electron.remote.app;
+
+	// Report Errors to Sentry only if it is enabled in settings
+	// Gets the value of reportErrors from config-util for renderer process
+	// For main process, sentryInit() is handled in index.js
+	const {ipcRenderer} = electron;
+	ipcRenderer.send('error-reporting');
+	ipcRenderer.on('error-reporting-val', (_event: Event, errorReporting: boolean) => {
+		reportErrors = errorReporting;
+		if (reportErrors) {
+			sentryInit();
+		}
+	});
+} else {
+	app = electron.app;
+}
+
+const logDir = `${app.getPath('userData')}/Logs`;
+
+type Level = 'log' | 'debug' | 'info' | 'warn' | 'error';
+const levels: Level[] = ['log', 'debug', 'info', 'warn', 'error'];
+type LogMethod = (...args: unknown[]) => void;
+
+export default class Logger {
+	log: LogMethod;
+	debug: LogMethod;
+	info: LogMethod;
+	warn: LogMethod;
+	error: LogMethod;
+
+	nodeConsole: Console;
+	timestamp?: () => string;
+	level: boolean;
+	logInDevMode: boolean;
+
+	constructor(options: LoggerOptions = {}) {
+		let {
+			timestamp = true,
+			file = 'console.log',
+			level = true,
+			logInDevMode = false
+		} = options;
+
+		file = `${logDir}/${file}`;
+		if (timestamp === true) {
+			timestamp = this.getTimestamp;
+		}
+
+		// Trim log according to type of process
+		if (process.type === 'renderer') {
+			requestIdleCallback(() => this.trimLog(file));
+		} else {
+			process.nextTick(() => this.trimLog(file));
+		}
+
+		const fileStream = fs.createWriteStream(file, {flags: 'a'});
+		const nodeConsole = new Console(fileStream);
+
+		this.nodeConsole = nodeConsole;
+		this.timestamp = timestamp;
+		this.level = level;
+		this.logInDevMode = logInDevMode;
+		this.setUpConsole();
+	}
+
+	_log(type: Level, ...args: unknown[]): void {
+		const {
+			nodeConsole, timestamp, level, logInDevMode
+		} = this;
+
+		switch (true) {
+			case typeof timestamp === 'function':
+				args.unshift(timestamp() + ' |\t');
+				// Fall through
+
+			case (level):
+				args.unshift(type.toUpperCase() + ' |');
+				// Fall through
+
+			case isDev || logInDevMode:
+				nodeConsole[type](...args);
+				break;
+
+			default:
+		}
+
+		console[type](...args);
+	}
+
+	setUpConsole(): void {
+		for (const type of levels) {
+			this.setupConsoleMethod(type);
+		}
+	}
+
+	setupConsoleMethod(type: Level): void {
+		this[type] = (...args: unknown[]) => this._log(type, ...args);
+	}
+
+	getTimestamp(): string {
+		const date = new Date();
+		const timestamp =
+			`${date.getMonth()}/${date.getDate()} ` +
+			`${date.getMinutes()}:${date.getSeconds()}`;
+		return timestamp;
+	}
+
+	reportSentry(err: unknown): void {
+		if (reportErrors) {
+			captureException(err);
+		}
+	}
+
+	trimLog(file: string): void{
+		fs.readFile(file, 'utf8', (err, data) => {
+			if (err) {
+				throw err;
+			}
+
+			const MAX_LOG_FILE_LINES = 500;
+			const logs = data.split(os.EOL);
+			const logLength = logs.length - 1;
+
+			// Keep bottom MAX_LOG_FILE_LINES of each log instance
+			if (logLength > MAX_LOG_FILE_LINES) {
+				const trimmedLogs = logs.slice(logLength - MAX_LOG_FILE_LINES);
+				const toWrite = trimmedLogs.join(os.EOL);
+				fs.writeFileSync(file, toWrite);
+			}
+		});
+	}
+}

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

@@ -0,0 +1,83 @@
+import * as ConfigUtil from './config-util';
+
+export interface ProxyRule {
+	hostname?: string;
+	port?: number;
+}
+
+// TODO: Refactor to async function
+export async function resolveSystemProxy(mainWindow: Electron.BrowserWindow): Promise<void> {
+	const page = mainWindow.webContents;
+	const ses = page.session;
+	const resolveProxyUrl = 'www.example.com';
+
+	// Check HTTP Proxy
+	const httpProxy = (async () => {
+		const proxy = await ses.resolveProxy('http://' + resolveProxyUrl);
+		let httpString = '';
+		if (proxy !== 'DIRECT') {
+			// In case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
+			// for all other HTTP or direct url:port both uses PROXY
+			if (proxy.includes('PROXY') || proxy.includes('HTTPS')) {
+				httpString = 'http=' + proxy.split('PROXY')[1] + ';';
+			}
+		}
+
+		return httpString;
+	})();
+	// Check HTTPS Proxy
+	const httpsProxy = (async () => {
+		const proxy = await ses.resolveProxy('https://' + resolveProxyUrl);
+		let httpsString = '';
+		if (proxy !== 'DIRECT' || proxy.includes('HTTPS')) {
+			// In case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
+			// for all other HTTP or direct url:port both uses PROXY
+			if (proxy.includes('PROXY') || proxy.includes('HTTPS')) {
+				httpsString += 'https=' + proxy.split('PROXY')[1] + ';';
+			}
+		}
+
+		return httpsString;
+	})();
+
+	// Check FTP Proxy
+	const ftpProxy = (async () => {
+		const proxy = await ses.resolveProxy('ftp://' + resolveProxyUrl);
+		let ftpString = '';
+		if (proxy !== 'DIRECT') {
+			if (proxy.includes('PROXY')) {
+				ftpString += 'ftp=' + proxy.split('PROXY')[1] + ';';
+			}
+		}
+
+		return ftpString;
+	})();
+
+	// Check SOCKS Proxy
+	const socksProxy = (async () => {
+		const proxy = await ses.resolveProxy('socks4://' + resolveProxyUrl);
+		let socksString = '';
+		if (proxy !== 'DIRECT') {
+			if (proxy.includes('SOCKS5')) {
+				socksString += 'socks=' + proxy.split('SOCKS5')[1] + ';';
+			} else if (proxy.includes('SOCKS4')) {
+				socksString += 'socks=' + proxy.split('SOCKS4')[1] + ';';
+			} else if (proxy.includes('PROXY')) {
+				socksString += 'socks=' + proxy.split('PROXY')[1] + ';';
+			}
+		}
+
+		return socksString;
+	})();
+
+	const values = await Promise.all([httpProxy, httpsProxy, ftpProxy, socksProxy]);
+	let proxyString = '';
+	values.forEach(proxy => {
+		proxyString += proxy;
+	});
+	ConfigUtil.setConfigItem('systemProxyRules', proxyString);
+	const useSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
+	if (useSystemProxy) {
+		ConfigUtil.setConfigItem('proxyRules', proxyString);
+	}
+}

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

@@ -0,0 +1,70 @@
+import {ipcRenderer} from 'electron';
+
+import backoff from 'backoff';
+
+import type WebView from '../components/webview';
+
+import Logger from './logger-util';
+
+const logger = new Logger({
+	file: 'domain-util.log',
+	timestamp: true
+});
+
+export default class ReconnectUtil {
+	webview: WebView;
+	url: string;
+	alreadyReloaded: boolean;
+	fibonacciBackoff: backoff.Backoff;
+
+	constructor(webview: WebView) {
+		this.webview = webview;
+		this.url = webview.props.url;
+		this.alreadyReloaded = false;
+		this.clearState();
+	}
+
+	clearState(): void {
+		this.fibonacciBackoff = backoff.fibonacci({
+			initialDelay: 5000,
+			maxDelay: 300000
+		});
+	}
+
+	async isOnline(): Promise<boolean> {
+		return ipcRenderer.invoke('is-online', this.url);
+	}
+
+	pollInternetAndReload(): void {
+		this.fibonacciBackoff.backoff();
+		this.fibonacciBackoff.on('ready', async () => {
+			if (await this._checkAndReload()) {
+				this.fibonacciBackoff.reset();
+			} else {
+				this.fibonacciBackoff.backoff();
+			}
+		});
+	}
+
+	async _checkAndReload(): Promise<boolean> {
+		if (this.alreadyReloaded) {
+			return true;
+		}
+
+		if (await this.isOnline()) {
+			ipcRenderer.send('forward-message', 'reload-viewer');
+			logger.log('You\'re back online.');
+			return true;
+		}
+
+		logger.log('There is no internet connection, try checking network cables, modem and router.');
+		const errorMessageHolder = document.querySelector('#description');
+		if (errorMessageHolder) {
+			errorMessageHolder.innerHTML = `
+						<div>Your internet connection doesn't seem to work properly!</div>
+						<div>Verify that it works and then click try again.</div>`;
+		}
+
+		return false;
+	}
+}

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

@@ -0,0 +1,17 @@
+import {init} from '@sentry/electron';
+import isDev from 'electron-is-dev';
+
+export const sentryInit = (): void => {
+	if (!isDev) {
+		init({
+			dsn: 'https://628dc2f2864243a08ead72e63f94c7b1@sentry.io/204668',
+			// 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

@@ -0,0 +1,38 @@
+import {ipcRenderer} from 'electron';
+import os from 'os';
+
+export const connectivityERR: string[] = [
+	'ERR_INTERNET_DISCONNECTED',
+	'ERR_PROXY_CONNECTION_FAILED',
+	'ERR_CONNECTION_RESET',
+	'ERR_NOT_CONNECTED',
+	'ERR_NAME_NOT_RESOLVED',
+	'ERR_NETWORK_CHANGED'
+];
+
+const userAgent = ipcRenderer.sendSync('fetch-user-agent');
+
+export function getOS(): string {
+	const platform = os.platform();
+	if (platform === 'darwin') {
+		return 'Mac';
+	}
+
+	if (platform === 'linux') {
+		return 'Linux';
+	}
+
+	if (platform === 'win32') {
+		if (Number.parseFloat(os.release()) < 6.2) {
+			return 'Windows 7';
+		}
+
+		return 'Windows 10';
+	}
+
+	return '';
+}
+
+export function getUserAgent(): string {
+	return userAgent;
+}

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

@@ -0,0 +1,18 @@
+import path from 'path';
+
+import i18n from 'i18n';
+
+import * as ConfigUtil from './config-util';
+
+i18n.configure({
+	directory: path.join(__dirname, '../../../translations/'),
+	updateFiles: false
+});
+
+/* Fetches the current appLocale from settings.json */
+const appLocale = ConfigUtil.getConfigItem('appLanguage');
+
+/* If no locale present in the json, en is set default */
+export function __(phrase: string): string {
+	return i18n.__({phrase, locale: appLocale ? appLocale : 'en'});
+}

app/renderer/main.html

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

app/renderer/network.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en" class="responsive desktop">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+        <title>Zulip - Network Troubleshooting</title>
+        <link rel="stylesheet" href="css/network.css" type="text/css" media="screen">
+    </head>
+    <body>
+        <div id="content">
+            <div id="picture"><img src="img/zulip_network.png"></div>
+            <div id="title">We can't connect to this organization</div>
+            <div id="subtitle">This could be because</div>
+            <ul id="description">
+                <li>You're not online or your proxy is misconfigured.</li>
+                <li>There is no Zulip organization hosted at this URL.</li>
+                <li>This Zulip organization is temporarily unavailable.</li>
+                <li>This Zulip organization has been moved or deleted.</li>
+            </ul>
+            <div id="buttons">
+                <div id="reconnect" class="button">Reconnect</div>
+                <div id="settings" class="button">Settings</div>
+            </div>
+        </div>
+    </body>
+</html>