From c2102bb25734a8c33fec635e0445873a23fd6559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Vay=C3=A1?= <guillermo.vaya@mattermost.com>
Date: Sat, 9 May 2020 00:29:02 +0200
Subject: [PATCH] [MM-22102] upgrade to electron 7 (#1268)

* fix errors

* upgrade to electron 7

* getsavepath is deprecated

* fix typo

* disable messaging from 'null'

* replace getname to its property

* deprecated zoomlevel

* deprecated setbadgecount

* isdarkmode deprecated

* it's a property, not a function

* fix error message

* fix test

* fix test on linux
---
 package-lock.json                         | 415 ++++++++++++++++------
 package.json                              |   7 +-
 scripts/fix_catalina_dark_mode_debug.js   |  13 -
 src/browser/components/ErrorView.jsx      |   8 +-
 src/browser/components/MainPage.jsx       |  18 +-
 src/browser/components/MattermostView.jsx |   2 +-
 src/browser/components/NewTeamModal.jsx   |   4 +-
 src/browser/components/SettingsPage.jsx   |  16 +-
 src/browser/index.jsx                     |   4 +-
 src/browser/settings.jsx                  |   2 +-
 src/browser/updater.jsx                   |  12 +-
 src/browser/webview/mattermost.js         |   6 +-
 src/main.js                               |  12 +-
 src/main/AutoLauncher.js                  |   2 +-
 src/main/CriticalErrorHandler.js          |   8 +-
 src/main/autoUpdater.js                   |   2 +-
 src/main/mainWindow.js                    |   4 +-
 src/main/menus/app.js                     |   2 +-
 test/modules/environment.js               |   2 +-
 test/specs/browser/settings_test.js       |   1 +
 20 files changed, 371 insertions(+), 169 deletions(-)
 delete mode 100644 scripts/fix_catalina_dark_mode_debug.js

diff --git a/package-lock.json b/package-lock.json
index 482f04dc..8f602f0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -915,6 +915,51 @@
         "ajv-keywords": "^3.1.0"
       }
     },
+    "@electron/get": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.10.0.tgz",
+      "integrity": "sha512-hlueNXU51c3CwQjBw/i5fwt+VfQgSQVUTdicpCHkhEjNZaa4CXJ5W1GaxSwtLE2dvRmAHjpIjUMHTqJ53uojfg==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "env-paths": "^2.2.0",
+        "fs-extra": "^8.1.0",
+        "global-agent": "^2.0.2",
+        "global-tunnel-ng": "^2.7.1",
+        "got": "^9.6.0",
+        "progress": "^2.0.3",
+        "sanitize-filename": "^1.6.2",
+        "sumchecker": "^3.0.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+          "dev": true
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        }
+      }
+    },
     "@emotion/cache": {
       "version": "0.8.8",
       "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-0.8.8.tgz",
@@ -1415,9 +1460,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "10.17.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz",
-      "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==",
+      "version": "12.12.35",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.35.tgz",
+      "integrity": "sha512-ASYsaKecA7TUsDrqIGPNk3JeEox0z/0XR/WsJJ8BIX/9+SkMSImQXKWfU/yBrSyc7ZSE/NPqLu36Nur0miCFfQ==",
       "dev": true
     },
     "@types/q": {
@@ -2264,9 +2309,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
       "dev": true
     },
     "babel-code-frame": {
@@ -3238,6 +3283,13 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
+    "boolean": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz",
+      "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==",
+      "dev": true,
+      "optional": true
+    },
     "boxen": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/boxen/-/boxen-2.1.0.tgz",
@@ -4125,9 +4177,9 @@
       "optional": true
     },
     "combined-stream": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
@@ -4386,9 +4438,9 @@
       },
       "dependencies": {
         "buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
-          "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz",
+          "integrity": "sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==",
           "dev": true,
           "requires": {
             "base64-js": "^1.0.2",
@@ -5710,13 +5762,13 @@
       "dev": true
     },
     "electron": {
-      "version": "6.1.7",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-6.1.7.tgz",
-      "integrity": "sha512-QhBA/fcYJit2XJGkD2xEfxlWTtTaWYu7qkKVohtVWXpELFqkpel2DCDxet5BTo0qs8ukuZHxlQPnIonODnl2bw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-7.2.1.tgz",
+      "integrity": "sha512-Y8ehT8NMR7oltzJ/j5+PD9YU8qbJsYAqiPslwPrZV+e+vl76tiIkRZy78UaJq9gin3ddzpS2Yt0rACsfgYr85w==",
       "dev": true,
       "requires": {
-        "@types/node": "^10.12.18",
-        "electron-download": "^4.1.0",
+        "@electron/get": "^1.0.1",
+        "@types/node": "^12.0.12",
         "extract-zip": "^1.0.3"
       }
     },
@@ -5970,13 +6022,13 @@
       }
     },
     "electron-chromedriver": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-4.0.0.tgz",
-      "integrity": "sha512-CeeAr4QVtsxkEpDWvFLzhdtgDVLQt32RBWjEJ4WxkIPNj0MX5D8gzli2djEPnnLUOX19vcBgs/CW7WBB/O3JIg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-7.0.0.tgz",
+      "integrity": "sha512-7qymT0fn3VTit0peym1iz4Y+fTwq9EPsv1V9Qh+vQdoVqP/4SM9lOHrsBeuFN1JJADZLu7R119ZvMkP6EnLYhw==",
       "dev": true,
       "requires": {
-        "electron-download": "^4.1.0",
-        "extract-zip": "^1.6.5"
+        "electron-download": "^4.1.1",
+        "extract-zip": "^1.6.7"
       }
     },
     "electron-connect": {
@@ -6017,6 +6069,12 @@
             "ms": "^2.1.1"
           }
         },
+        "env-paths": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
+          "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
+          "dev": true
+        },
         "fs-extra": {
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
@@ -6036,6 +6094,32 @@
           "requires": {
             "graceful-fs": "^4.1.6"
           }
+        },
+        "sumchecker": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
+          "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
+          "dev": true,
+          "requires": {
+            "debug": "^2.2.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
+            }
+          }
         }
       }
     },
@@ -6251,9 +6335,9 @@
       "dev": true
     },
     "env-paths": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
-      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
+      "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==",
       "dev": true
     },
     "errno": {
@@ -6305,6 +6389,13 @@
       "integrity": "sha512-MjoCAHE6P2Dirme70Cxd9i2Ng8rhXiaVSsxDWdSwimfLERJL/ypR2ed2rTYkeeYrMk8gq281dzKLiGcdrmc8qg==",
       "dev": true
     },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true,
+      "optional": true
+    },
     "es6-shim": {
       "version": "0.35.4",
       "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.4.tgz",
@@ -7581,15 +7672,15 @@
       }
     },
     "extract-zip": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
-      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1",
-        "yauzl": "2.4.1"
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
       },
       "dependencies": {
         "debug": {
@@ -7601,6 +7692,21 @@
             "ms": "2.0.0"
           }
         },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -7686,9 +7792,9 @@
       }
     },
     "fd-slicer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
       "requires": {
         "pend": "~1.2.0"
@@ -8766,6 +8872,38 @@
         "process": "~0.5.1"
       }
     },
+    "global-agent": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.8.tgz",
+      "integrity": "sha512-VpBe/rhY6Rw2VDOTszAMNambg+4Qv8j0yiTNDYEXXXxkUNGWLHp8A3ztK4YDBbFNcWF4rgsec6/5gPyryya/+A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boolean": "^3.0.0",
+        "core-js": "^3.6.4",
+        "es6-error": "^4.1.1",
+        "matcher": "^2.1.0",
+        "roarr": "^2.15.2",
+        "semver": "^7.1.2",
+        "serialize-error": "^5.0.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.6.5",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "7.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.0.tgz",
+          "integrity": "sha512-uyvgU/igkrMgNHwLgXvlpD9jEADbJhB0+JXSywoO47JgJ6c16iau9F9cjtc/E5o0PoqRYTiTIAPRKaYe84z6eQ==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "global-dirs": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
@@ -8805,12 +8943,35 @@
         "which": "^1.2.14"
       }
     },
+    "global-tunnel-ng": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz",
+      "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "encodeurl": "^1.0.2",
+        "lodash": "^4.17.10",
+        "npm-conf": "^1.1.3",
+        "tunnel": "^0.0.6"
+      }
+    },
     "globals": {
       "version": "11.9.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
       "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==",
       "dev": true
     },
+    "globalthis": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz",
+      "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "define-properties": "^1.1.3"
+      }
+    },
     "globby": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz",
@@ -8827,13 +8988,13 @@
       }
     },
     "globule": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
+      "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
       "dev": true,
       "requires": {
         "glob": "~7.1.1",
-        "lodash": "~4.17.10",
+        "lodash": "~4.17.12",
         "minimatch": "~3.0.2"
       }
     },
@@ -10774,6 +10935,25 @@
         "object-visit": "^1.0.0"
       }
     },
+    "matcher": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz",
+      "integrity": "sha512-o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "md5": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
@@ -11750,12 +11930,6 @@
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-          "dev": true
         }
       }
     },
@@ -12662,9 +12836,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.1.31",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
-      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
     "public-encrypt": {
@@ -13584,9 +13758,9 @@
       "dev": true
     },
     "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -13596,7 +13770,7 @@
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
         "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
+        "har-validator": "~5.1.3",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -13606,7 +13780,7 @@
         "performance-now": "^2.1.0",
         "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
       },
@@ -13709,9 +13883,9 @@
       "dev": true
     },
     "rgb2hex": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.9.tgz",
-      "integrity": "sha512-32iuQzhOjyT+cv9aAFRBJ19JgHwzQwbjUhH3Fj2sWW2EEGAW8fpFrDFP5ndoKDxJaLO06x1hE3kyuIFrUQtybQ==",
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.10.tgz",
+      "integrity": "sha512-vKz+kzolWbL3rke/xeTE2+6vHmZnNxGyDnaVW4OckntAIcc7DcZzWkQSfxMDwqHS8vhgySnIFyBUH7lIk6PxvQ==",
       "dev": true
     },
     "rimraf": {
@@ -13733,6 +13907,30 @@
         "inherits": "^2.0.1"
       }
     },
+    "roarr": {
+      "version": "2.15.3",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz",
+      "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boolean": "^3.0.0",
+        "detect-node": "^2.0.4",
+        "globalthis": "^1.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "semver-compare": "^1.0.0",
+        "sprintf-js": "^1.1.2"
+      },
+      "dependencies": {
+        "sprintf-js": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "run-async": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
@@ -13875,6 +14073,13 @@
       "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
       "dev": true
     },
+    "semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
+      "dev": true,
+      "optional": true
+    },
     "semver-diff": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
@@ -13939,6 +14144,25 @@
         }
       }
     },
+    "serialize-error": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz",
+      "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "type-fest": "^0.8.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "serialize-javascript": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz",
@@ -14536,13 +14760,13 @@
       }
     },
     "spectron": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/spectron/-/spectron-6.0.0.tgz",
-      "integrity": "sha512-YQnQgdlpdPU572YhyX1hcDT40Q+5D0hkH4hM3jYy8HLHU1+6z4WTRQkjYdCBcYHE/3fHIQdPeaI+9DUzupQZtw==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/spectron/-/spectron-9.0.0.tgz",
+      "integrity": "sha512-aMxprQ+5/8hDl27P6FafIuuL8jAueJ7WEc6S6pEEQNU7xGCMcfj0RY6TB1i9BtkazMymIxAkmwqlK233Fbhcgw==",
       "dev": true,
       "requires": {
         "dev-null": "^0.1.1",
-        "electron-chromedriver": "~4.0.0",
+        "electron-chromedriver": "^7.0.0",
         "request": "^2.87.0",
         "split": "^1.0.0",
         "webdriverio": "^4.13.0"
@@ -14621,9 +14845,9 @@
       }
     },
     "sshpk": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz",
-      "integrity": "sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "dev": true,
       "requires": {
         "asn1": "~0.2.3",
@@ -14877,29 +15101,12 @@
       }
     },
     "sumchecker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
-      "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
+      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
       "dev": true,
       "requires": {
-        "debug": "^2.2.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
+        "debug": "^4.1.0"
       }
     },
     "supports-color": {
@@ -15417,21 +15624,13 @@
       }
     },
     "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
     "tree-kill": {
@@ -15483,6 +15682,13 @@
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
       "dev": true
     },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true,
+      "optional": true
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -16645,6 +16851,12 @@
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "dev": true
+    },
     "worker-farm": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
@@ -16844,12 +17056,13 @@
       }
     },
     "yauzl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
       "requires": {
-        "fd-slicer": "~1.0.1"
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
       }
     },
     "zip-stream": {
diff --git a/package.json b/package.json
index 666a32ed..87e3875d 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,7 @@
     "url": "git://github.com/mattermost/desktop.git"
   },
   "scripts": {
-    "postinstall": "electron-builder install-app-deps && npm run extract-dict && npm run fix-catalina-dark-mode",
-    "fix-catalina-dark-mode": "node scripts/fix_catalina_dark_mode_debug.js",
+    "postinstall": "electron-builder install-app-deps && npm run extract-dict",
     "extract-dict": "node scripts/extract_dict.js src/node_modules/simple-spellchecker/dict",
     "build": "npm-run-all build:*",
     "build:main": "webpack-cli --bail --config webpack.config.main.js",
@@ -55,7 +54,7 @@
     "cross-env": "^5.2.0",
     "css-loader": "^1.0.1",
     "devtron": "^1.4.0",
-    "electron": "^6.1.7",
+    "electron": "^7.2.1",
     "electron-builder": "^22.2.0",
     "electron-connect": "^0.6.3",
     "electron-notarize": "^0.1.1",
@@ -75,7 +74,7 @@
     "react": "^16.6.3",
     "react-dom": "^16.6.3",
     "react-smooth-dnd": "github:mattermost/react-smooth-dnd#af6b471295007274560a375799622c1cd52d678a",
-    "spectron": "^6.0.0",
+    "spectron": "^9.0.0",
     "style-loader": "^0.23.1",
     "url-loader": "^1.1.2",
     "webpack": "^4.27.0",
diff --git a/scripts/fix_catalina_dark_mode_debug.js b/scripts/fix_catalina_dark_mode_debug.js
deleted file mode 100644
index 358a7118..00000000
--- a/scripts/fix_catalina_dark_mode_debug.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-const {exec} = require('child_process');
-
-if (process.platform === 'darwin') {
-  exec('plutil -insert NSRequiresAquaSystemAppearance -bool NO ./node_modules/electron/dist/Electron.app/Contents/Info.plist', (err) => {
-    if (err) {
-      console.error(err);
-    }
-  });
-}
-
diff --git a/src/browser/components/ErrorView.jsx b/src/browser/components/ErrorView.jsx
index 4fa07464..f8d28dcf 100644
--- a/src/browser/components/ErrorView.jsx
+++ b/src/browser/components/ErrorView.jsx
@@ -38,13 +38,13 @@ export default function ErrorView(props) {
               md={10}
               lg={8}
             >
-              <h2>{`Cannot connect to ${remote.app.getName()}`}</h2>
+              <h2>{`Cannot connect to ${remote.app.name}`}</h2>
               <hr/>
-              <p>{`We're having trouble connecting to ${remote.app.getName()}. If refreshing this page (Ctrl+R or Command+R) does not work please verify that:`}</p>
+              <p>{`We're having trouble connecting to ${remote.app.name}. If refreshing this page (Ctrl+R or Command+R) does not work please verify that:`}</p>
               <br/>
               <ul className='ErrorView-bullets' >
                 <li>{'Your computer is connected to the internet.'}</li>
-                <li>{`The ${remote.app.getName()} URL `}
+                <li>{`The ${remote.app.name} URL `}
                   <a
                     onClick={handleClick}
                     href={props.errorInfo.validatedURL}
@@ -79,6 +79,6 @@ export default function ErrorView(props) {
 
 ErrorView.propTypes = {
   errorInfo: PropTypes.object,
-  id: PropTypes.number,
+  id: PropTypes.string,
   active: PropTypes.bool,
 };
diff --git a/src/browser/components/MainPage.jsx b/src/browser/components/MainPage.jsx
index 16a5bd81..33b5cfc3 100644
--- a/src/browser/components/MainPage.jsx
+++ b/src/browser/components/MainPage.jsx
@@ -184,8 +184,8 @@ export default class MainPage extends React.Component {
     ipcRenderer.on('download-complete', this.showDownloadCompleteNotification);
 
     function focusListener() {
-      if (this.state.showNewTeamModal && this.inputRef) {
-        this.inputRef.current().focus();
+      if (self.state.showNewTeamModal && self.inputRef) {
+        self.inputRef.current().focus();
       } else {
         self.handleOnTeamFocused(self.state.key);
         self.refs[`mattermostView${self.state.key}`].focusOnWebView();
@@ -230,10 +230,10 @@ export default class MainPage extends React.Component {
       if (!activeTabWebContents) {
         return;
       }
-      if (activeTabWebContents.getZoomLevel() >= 9) {
+      if (activeTabWebContents.zoomLevel >= 9) {
         return;
       }
-      activeTabWebContents.setZoomLevel(activeTabWebContents.getZoomLevel() + 1);
+      activeTabWebContents.zoomLevel += 1;
     });
 
     ipcRenderer.on('zoom-out', () => {
@@ -241,10 +241,10 @@ export default class MainPage extends React.Component {
       if (!activeTabWebContents) {
         return;
       }
-      if (activeTabWebContents.getZoomLevel() <= -8) {
+      if (activeTabWebContents.zoomLevel <= -8) {
         return;
       }
-      activeTabWebContents.setZoomLevel(activeTabWebContents.getZoomLevel() - 1);
+      activeTabWebContents.zoomLevel -= 1;
     });
 
     ipcRenderer.on('zoom-reset', () => {
@@ -252,7 +252,7 @@ export default class MainPage extends React.Component {
       if (!activeTabWebContents) {
         return;
       }
-      activeTabWebContents.setZoomLevel(0);
+      activeTabWebContents.zoomLevel = 0;
     });
 
     ipcRenderer.on('undo', () => {
@@ -342,11 +342,11 @@ export default class MainPage extends React.Component {
 
     if (process.platform === 'darwin') {
       self.setState({
-        isDarkMode: remote.systemPreferences.isDarkMode(),
+        isDarkMode: remote.nativeTheme.shouldUseDarkColors,
       });
       remote.systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
         self.setState({
-          isDarkMode: remote.systemPreferences.isDarkMode(),
+          isDarkMode: remote.nativeTheme.shouldUseDarkColors,
         });
       });
     } else {
diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx
index 70d4d147..c7ee6e1b 100644
--- a/src/browser/components/MattermostView.jsx
+++ b/src/browser/components/MattermostView.jsx
@@ -96,7 +96,7 @@ export default class MattermostView extends React.Component {
           shell.openExternal(e.url);
         } else if (Utils.isTeamUrl(this.props.src, e.url, true) || Utils.isPluginUrl(this.props.src, e.url)) {
           // New window should disable nodeIntegration.
-          window.open(e.url, remote.app.getName(), 'nodeIntegration=no, contextIsolation=yes, show=yes');
+          window.open(e.url, remote.app.name, 'nodeIntegration=no, contextIsolation=yes, show=yes');
         } else {
           e.preventDefault();
           shell.openExternal(e.url);
diff --git a/src/browser/components/NewTeamModal.jsx b/src/browser/components/NewTeamModal.jsx
index a4ef3d26..2796e31f 100644
--- a/src/browser/components/NewTeamModal.jsx
+++ b/src/browser/components/NewTeamModal.jsx
@@ -183,7 +183,7 @@ export default class NewTeamModal extends React.Component {
                 onClick={(e) => {
                   e.stopPropagation();
                 }}
-                autofocus='true'
+                autoFocus={true}
               />
               <FormControl.Feedback/>
               <HelpBlock>{'The name of the server displayed on your desktop app tab bar.'}</HelpBlock>
@@ -242,5 +242,5 @@ NewTeamModal.propTypes = {
   modalContainer: PropTypes.object,
   restoreFocus: PropTypes.bool,
   currentOrder: PropTypes.number,
-  setInputRef: PropTypes.ref,
+  setInputRef: PropTypes.func,
 };
diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index 312c214f..82ee12ce 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -120,10 +120,10 @@ export default class SettingsPage extends React.Component {
       if (!activeTabWebContents) {
         return;
       }
-      if (activeTabWebContents.getZoomLevel() >= 9) {
+      if (activeTabWebContents.zoomLevel >= 9) {
         return;
       }
-      activeTabWebContents.setZoomLevel(activeTabWebContents.getZoomLevel() + 1);
+      activeTabWebContents.zoomLevel += 1;
     });
 
     ipcRenderer.on('zoom-out', () => {
@@ -131,10 +131,10 @@ export default class SettingsPage extends React.Component {
       if (!activeTabWebContents) {
         return;
       }
-      if (activeTabWebContents.getZoomLevel() <= -8) {
+      if (activeTabWebContents.zoomLevel <= -8) {
         return;
       }
-      activeTabWebContents.setZoomLevel(activeTabWebContents.getZoomLevel() - 1);
+      activeTabWebContents.zoomLevel -= 1;
     });
 
     ipcRenderer.on('zoom-reset', () => {
@@ -142,7 +142,7 @@ export default class SettingsPage extends React.Component {
       if (!activeTabWebContents) {
         return;
       }
-      activeTabWebContents.setZoomLevel(0);
+      activeTabWebContents.zoomLevel = 0;
     });
 
     ipcRenderer.on('undo', () => {
@@ -195,11 +195,11 @@ export default class SettingsPage extends React.Component {
 
     if (process.platform === 'darwin') {
       self.setState({
-        isDarkMode: remote.systemPreferences.isDarkMode(),
+        isDarkMode: remote.nativeTheme.shouldUseDarkColors,
       });
       remote.systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
         self.setState({
-          isDarkMode: remote.systemPreferences.isDarkMode(),
+          isDarkMode: remote.nativeTheme.shouldUseDarkColors,
         });
       });
     } else {
@@ -808,7 +808,7 @@ export default class SettingsPage extends React.Component {
           checked={this.state.showTrayIcon}
           onChange={this.handleChangeShowTrayIcon}
         >
-          {process.platform === 'darwin' ? `Show ${remote.app.getName()} icon in the menu bar` : 'Show icon in the notification area'}
+          {process.platform === 'darwin' ? `Show ${remote.app.name} icon in the menu bar` : 'Show icon in the notification area'}
           <HelpBlock>
             {'Setting takes effect after restarting the app.'}
           </HelpBlock>
diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 6f2d9045..998ce337 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -105,9 +105,9 @@ function showBadgeOSX(sessionExpired, unreadCount, mentionCount) {
 function showBadgeLinux(sessionExpired, unreadCount, mentionCount) {
   if (remote.app.isUnityRunning()) {
     if (sessionExpired) {
-      remote.app.setBadgeCount(mentionCount + 1);
+      remote.app.badgeCount = mentionCount + 1;
     } else {
-      remote.app.setBadgeCount(mentionCount);
+      remote.app.badgeCount = mentionCount;
     }
   }
 
diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index c41e658c..c4368b9b 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -4,7 +4,7 @@
 import {remote, ipcRenderer} from 'electron';
 
 window.eval = global.eval = () => { // eslint-disable-line no-multi-assign, no-eval
-  throw new Error(`Sorry, ${remote.app.getName()} does not support window.eval() for security reasons.`);
+  throw new Error(`Sorry, ${remote.app.name} does not support window.eval() for security reasons.`);
 };
 
 import React from 'react';
diff --git a/src/browser/updater.jsx b/src/browser/updater.jsx
index 356b7faa..ef4b1c76 100644
--- a/src/browser/updater.jsx
+++ b/src/browser/updater.jsx
@@ -39,10 +39,10 @@ class UpdaterPageContainer extends React.Component {
       if (!activeTabWebContents) {
         return;
       }
-      if (activeTabWebContents.getZoomLevel() >= 9) {
+      if (activeTabWebContents.zoomLevel >= 9) {
         return;
       }
-      activeTabWebContents.setZoomLevel(activeTabWebContents.getZoomLevel() + 1);
+      activeTabWebContents.zoomLevel += 1;
     });
 
     ipcRenderer.on('zoom-out', () => {
@@ -50,10 +50,10 @@ class UpdaterPageContainer extends React.Component {
       if (!activeTabWebContents) {
         return;
       }
-      if (activeTabWebContents.getZoomLevel() <= -8) {
+      if (activeTabWebContents.zoomLevel <= -8) {
         return;
       }
-      activeTabWebContents.setZoomLevel(activeTabWebContents.getZoomLevel() - 1);
+      activeTabWebContents.zoomLevel -= 1;
     });
 
     ipcRenderer.on('zoom-reset', () => {
@@ -61,7 +61,7 @@ class UpdaterPageContainer extends React.Component {
       if (!activeTabWebContents) {
         return;
       }
-      activeTabWebContents.setZoomLevel(0);
+      activeTabWebContents.zoomLevel = 0;
     });
 
     ipcRenderer.on('undo', () => {
@@ -116,7 +116,7 @@ class UpdaterPageContainer extends React.Component {
   render() {
     return (
       <UpdaterPage
-        appName={`${remote.app.getName()} Desktop App`}
+        appName={`${remote.app.name} Desktop App`}
         notifyOnly={this.props.notifyOnly}
         {...this.state}
         onClickReleaseNotes={() => {
diff --git a/src/browser/webview/mattermost.js b/src/browser/webview/mattermost.js
index c81505e4..19d824bb 100644
--- a/src/browser/webview/mattermost.js
+++ b/src/browser/webview/mattermost.js
@@ -71,7 +71,7 @@ window.addEventListener('message', ({origin, data: {type, message = {}} = {}} =
           version: remote.app.getVersion(),
         },
       },
-      window.location.origin
+      window.location.origin || '*'
     );
     break;
   }
@@ -250,7 +250,9 @@ ipcRenderer.on('set-spellchecker', setSpellChecker);
 
 // push user activity updates to the webapp
 ipcRenderer.on('user-activity-update', (event, {userIsActive, isSystemEvent}) => {
-  window.postMessage({type: 'user-activity-update', message: {userIsActive, manual: isSystemEvent}}, window.location.origin);
+  if (window.location.origin !== 'null') {
+    window.postMessage({type: 'user-activity-update', message: {userIsActive, manual: isSystemEvent}}, window.location.origin);
+  }
 });
 
 // exit fullscreen embedded elements like youtube - https://mattermost.atlassian.net/browse/MM-19226
diff --git a/src/main.js b/src/main.js
index 929a7503..dd0c93af 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,7 @@ import os from 'os';
 import path from 'path';
 import fs from 'fs';
 
-import electron from 'electron';
+import electron, {nativeTheme} from 'electron';
 import isDev from 'electron-is-dev';
 import installExtension, {REACT_DEVELOPER_TOOLS} from 'electron-devtools-installer';
 import log from 'electron-log';
@@ -692,12 +692,12 @@ function initializeAfterAppReady() {
     if (process.platform === 'darwin') {
       trayIcon.setPressedImage(trayImages.clicked.normal);
       systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
-        switchMenuIconImages(trayImages, systemPreferences.isDarkMode());
+        switchMenuIconImages(trayImages, nativeTheme.shouldUseDarkColors);
         trayIcon.setImage(trayImages.normal);
       });
     }
 
-    trayIcon.setToolTip(app.getName());
+    trayIcon.setToolTip(app.name);
     trayIcon.on('click', () => {
       if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
         if (mainWindow.isMinimized()) {
@@ -760,7 +760,7 @@ function initializeAfterAppReady() {
       if (state === 'completed') {
         mainWindow.webContents.send('download-complete', {
           fileName: filename,
-          path: item.getSavePath(),
+          path: item.savePath,
           serverInfo: Utils.getServer(webContents.getURL(), config.teams),
         });
       }
@@ -875,7 +875,7 @@ function handleUpdateUnreadEvent(event, arg) {
       if (process.platform === 'darwin') {
         trayIcon.setPressedImage(trayImages.clicked.normal);
       }
-      trayIcon.setToolTip(app.getName());
+      trayIcon.setToolTip(app.name);
     }
   }
 }
@@ -1056,7 +1056,7 @@ function getTrayImages() {
         mention: nativeImage.createFromPath(path.resolve(assetsDir, 'osx/ClickedMenuIconMention.png')),
       },
     };
-    switchMenuIconImages(icons, systemPreferences.isDarkMode());
+    switchMenuIconImages(icons, nativeTheme.shouldUseDarkColors);
     return icons;
   }
   case 'linux':
diff --git a/src/main/AutoLauncher.js b/src/main/AutoLauncher.js
index 2251c7c7..27532e19 100644
--- a/src/main/AutoLauncher.js
+++ b/src/main/AutoLauncher.js
@@ -9,7 +9,7 @@ import isDev from 'electron-is-dev';
 export default class AutoLauncher {
   constructor() {
     this.appLauncher = new AutoLaunch({
-      name: app.getName(),
+      name: app.name,
       isHidden: true,
     });
   }
diff --git a/src/main/CriticalErrorHandler.js b/src/main/CriticalErrorHandler.js
index 263188b8..4fb3e03c 100644
--- a/src/main/CriticalErrorHandler.js
+++ b/src/main/CriticalErrorHandler.js
@@ -13,7 +13,7 @@ const BUTTON_SHOW_DETAILS = 'Show Details';
 const BUTTON_REOPEN = 'Reopen';
 
 function createErrorReport(err) {
-  return `Application: ${app.getName()} ${app.getVersion()}\n` +
+  return `Application: ${app.name} ${app.getVersion()}\n` +
          `Platform: ${os.type()} ${os.release()} ${os.arch()}\n` +
          `${err.stack}`;
 }
@@ -51,7 +51,7 @@ export default class CriticalErrorHandler {
   windowUnresponsiveHandler() {
     const result = dialog.showMessageBox(this.mainWindow, {
       type: 'warning',
-      title: app.getName(),
+      title: app.name,
       message: 'The window is no longer responsive.\nDo you wait until the window becomes responsive again?',
       buttons: ['No', 'Yes'],
       defaultId: 0,
@@ -74,8 +74,8 @@ export default class CriticalErrorHandler {
       const showMessageBox = bindWindowToShowMessageBox(this.mainWindow);
       const result = showMessageBox({
         type: 'error',
-        title: app.getName(),
-        message: `The ${app.getName()} app quit unexpectedly. Click "Show Details" to learn more or "Reopen" to open the application again.\n\nInternal error: ${err.message}`,
+        title: app.name,
+        message: `The ${app.name} app quit unexpectedly. Click "Show Details" to learn more or "Reopen" to open the application again.\n\nInternal error: ${err.message}`,
         buttons,
         defaultId: buttons.indexOf(BUTTON_REOPEN),
         noLink: true,
diff --git a/src/main/autoUpdater.js b/src/main/autoUpdater.js
index 7b9e2ae0..873fcef1 100644
--- a/src/main/autoUpdater.js
+++ b/src/main/autoUpdater.js
@@ -30,7 +30,7 @@ function createUpdaterModal(parentWindow, options) {
   const windowWidth = 480;
   const windowHeight = 280;
   const windowOptions = {
-    title: `${app.getName()} Updater`,
+    title: `${app.name} Updater`,
     parent: parentWindow,
     modal: true,
     maximizable: false,
diff --git a/src/main/mainWindow.js b/src/main/mainWindow.js
index b93caec9..bd175a7f 100644
--- a/src/main/mainWindow.js
+++ b/src/main/mainWindow.js
@@ -46,7 +46,7 @@ function createMainWindow(config, options) {
     windowOptions.icon = options.linuxAppIcon;
   }
   Object.assign(windowOptions, {
-    title: app.getName(),
+    title: app.name,
     fullscreenable: true,
     show: hideOnStartup || false,
     minWidth: minimumWindowWidth,
@@ -79,7 +79,7 @@ function createMainWindow(config, options) {
   }
 
   mainWindow.once('ready-to-show', () => {
-    mainWindow.webContents.setZoomLevel(0);
+    mainWindow.webContents.zoomLevel = 0;
 
     // handle showing the window when not launched by auto-start
     // - when not configured to auto-start, immediately show contents and optionally maximize as needed
diff --git a/src/main/menus/app.js b/src/main/menus/app.js
index 17c9cd76..6b01cb21 100644
--- a/src/main/menus/app.js
+++ b/src/main/menus/app.js
@@ -12,7 +12,7 @@ function createTemplate(mainWindow, config, isDev) {
     type: 'separator',
   };
 
-  const appName = app.getName();
+  const appName = app.name;
   const firstMenuName = (process.platform === 'darwin') ? appName : 'File';
   const template = [];
 
diff --git a/test/modules/environment.js b/test/modules/environment.js
index 7a26cd33..f646696f 100644
--- a/test/modules/environment.js
+++ b/test/modules/environment.js
@@ -57,7 +57,7 @@ module.exports = {
       // enable this if chromedriver hangs to see logs
       // chromeDriverLogPath: '../chromedriverlog.txt',
     };
-    if (process.platform === 'darwin') {
+    if (process.platform === 'darwin' || process.platform === 'linux') {
       // on a mac, debbuging port might conflict with other apps
       // this changes the default debugging port so chromedriver can run without issues.
       options.chromeDriverArgs.push('remote-debugging-port=9222');
diff --git a/test/specs/browser/settings_test.js b/test/specs/browser/settings_test.js
index 4d749275..02a5630b 100644
--- a/test/specs/browser/settings_test.js
+++ b/test/specs/browser/settings_test.js
@@ -78,6 +78,7 @@ describe('browser/settings.html', function desc() {
         click('#addNewServer').
         waitForVisible('#newServerModal').
         setValue('#teamNameInput', 'TestTeam').
+        pause(100).
         setValue('#teamUrlInput', 'http://example.org').
         click('#saveNewServerModal').
         waitForVisible('#newServerModal', true).