Upgrade to electron 21

Fixes https://github.com/vector-im/element-web/issues/23783

.github/workflows/build.yaml

@@ -8,211 +8,35 @@ concurrency:
   cancel-in-progress: true
 jobs:
   fetch:
-    name: Prepare
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
-        with:
-          cache: "yarn"
-
-      - name: Install Deps
-        run: "yarn install --pure-lockfile"
-
-      - name: Fetch Element Web (develop)
-        if: github.event.pull_request.base.ref == 'develop'
-        run: yarn run fetch --noverify develop -d element.io/nightly
-
-      - name: Fetch Element Web
-        if: github.event.pull_request.base.ref != 'develop'
-        run: yarn run fetch --noverify --cfgdir element.io/release
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: webapp
-          retention-days: 1
-          path: |
-            webapp.asar
-            package.json
+    uses: ./.github/workflows/build_prepare.yaml
+    with:
+      config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }}
+      version: ${{ github.event.pull_request.base.ref == 'develop' && 'develop' || '' }}
 
   windows:
     needs: fetch
+    name: Windows
+    uses: ./.github/workflows/build_windows.yaml
     strategy:
       matrix:
-        include:
-          - target: x86_64-pc-windows-msvc
-            arch: x64
-          - target: i686-pc-windows-msvc
-            arch: x86
-            build-args: --ia32
-    name: Windows (${{ matrix.arch }})
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: webapp
-
-      - name: Cache .hak
-        uses: actions/cache@v3
-        with:
-          key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }}
-          path: |
-            ./.hak
-
-      - name: Set up build tools
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: ${{ matrix.arch }}
-
-      # ActiveTCL package on choco is from 2015,
-      # this one is newer but includes more than we need
-      - name: Choco install tclsh
-        shell: pwsh
-        run: |
-          choco install -y magicsplat-tcl-tk --no-progress
-          echo "${HOME}/AppData/Local/Apps/Tcl86/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - name: Choco install NetWide Assembler
-        shell: pwsh
-        run: |
-          choco install -y nasm --no-progress
-          echo "C:/Program Files/NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-
-      - uses: actions/setup-node@v3
-        with:
-          cache: "yarn"
-
-      # Does not need branch matching as only analyses this layer
-      - name: Install Deps
-        run: "yarn install --pure-lockfile"
-
-      - name: Build Natives
-        run: |
-          refreshenv
-          yarn build:native --target ${{ matrix.target }}
-
-      - name: Build App
-        run: "yarn build --publish never -w ${{ matrix.build-args }}"
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: win-${{ matrix.arch }}
-          path: dist
-          retention-days: 1
+        arch: [ x64, x86 ]
+    with:
+      arch: ${{ matrix.arch }}
 
   linux:
     needs: fetch
+    name: Linux
+    uses: ./.github/workflows/build_linux.yaml
     strategy:
       matrix:
-        include:
-          - sqlcipher: system
-          - sqlcipher: static
-            static: 1
-    name: 'Linux (sqlcipher: ${{ matrix.sqlcipher }})'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: webapp
-
-      - name: Cache .hak
-        uses: actions/cache@v3
-        with:
-          key: ${{ hashFiles('./yarn.lock') }}
-          path: |
-            ./.hak
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Install libsqlcipher-dev
-        if: matrix.sqlcipher == 'system'
-        run: sudo apt-get install -y libsqlcipher-dev
-
-      - uses: actions/setup-node@v3
-        with:
-          cache: "yarn"
-
-      # Does not need branch matching as only analyses this layer
-      - name: Install Deps
-        run: "yarn install --pure-lockfile"
-
-      - name: Build Natives
-        run: "yarn build:native"
-        env:
-          SQLCIPHER_STATIC: ${{ matrix.static }}
-
-      - name: Build App
-        run: "yarn build --publish never"
-
-      - name: Install .deb
-        run: "sudo apt install ./dist/*.deb"
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: linux-sqlcipher-${{ matrix.sqlcipher }}
-          path: dist
-          retention-days: 1
+        sqlcipher: [ system, static ]
+    with:
+      sqlcipher: ${{ matrix.sqlcipher }}
 
   macos:
     needs: fetch
-    name: macOS (universal)
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: webapp
-
-      - name: Cache .hak
-        uses: actions/cache@v3
-        with:
-          key: ${{ hashFiles('./yarn.lock') }}
-          path: |
-            ./.hak
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: aarch64-apple-darwin
-
-      - uses: actions/setup-node@v3
-        with:
-          cache: "yarn"
-
-      # Does not need branch matching as only analyses this layer
-      - name: Install Deps
-        run: "yarn install --pure-lockfile"
-
-      - name: Build Natives
-        run: "yarn build:native:universal"
-
-      - name: Build App
-        run: "yarn build:universal --publish never"
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: macos
-          path: dist
-          retention-days: 1
+    name: macOS
+    uses: ./.github/workflows/build_macos.yaml
 
   test:
     needs:

.github/workflows/build_linux.yaml

@@ -0,0 +1,58 @@
+on:
+  workflow_call:
+    inputs:
+      sqlcipher:
+        type: string
+        required: true
+        description: "How to link sqlcipher, one of 'system' | 'static'"
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: webapp
+
+      - name: Cache .hak
+        uses: actions/cache@v3
+        with:
+          key: ${{ hashFiles('./yarn.lock') }}
+          path: |
+            ./.hak
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Install libsqlcipher-dev
+        if: inputs.sqlcipher == 'system'
+        run: sudo apt-get install -y libsqlcipher-dev
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "yarn"
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Build Natives
+        run: "yarn build:native"
+        env:
+          SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
+
+      - name: Build App
+        run: "yarn build --publish never -l"
+
+      - name: Install .deb
+        run: "sudo apt install ./dist/*.deb"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux-sqlcipher-${{ inputs.sqlcipher }}
+          path: dist
+          retention-days: 1

.github/workflows/build_macos.yaml

@@ -0,0 +1,45 @@
+on:
+  workflow_call:
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: webapp
+
+      - name: Cache .hak
+        uses: actions/cache@v3
+        with:
+          key: ${{ hashFiles('./yarn.lock') }}
+          path: |
+            ./.hak
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: aarch64-apple-darwin
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "yarn"
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Build Natives
+        run: "yarn build:native:universal"
+
+      - name: Build App
+        run: "yarn build:universal --publish never"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos
+          path: dist
+          retention-days: 1

.github/workflows/build_prepare.yaml

@@ -0,0 +1,35 @@
+on:
+  workflow_call:
+    inputs:
+      config:
+        type: string
+        required: true
+        description: "The config directory to use"
+      version:
+        type: string
+        required: false
+        description: "The version tag to fetch, or 'develop', will pick automatically if not passed"
+jobs:
+  prepare:
+    name: Prepare
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "yarn"
+
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Fetch Element Web
+        run: yarn run fetch --noverify -d ${{ inputs.config }} ${{ inputs.version }}
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: webapp
+          retention-days: 1
+          path: |
+            webapp.asar
+            package.json

.github/workflows/build_windows.yaml

@@ -0,0 +1,87 @@
+on:
+  workflow_call:
+    inputs:
+      arch:
+        type: string
+        required: true
+        description: "The architecture to build for, one of 'x64' | 'x86'"
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - uses: kanga333/variable-mapper@master
+        id: config
+        with:
+          key: "${{ inputs.arch }}"
+          export_to: output
+          map: |
+            {
+              "x64": {
+                "target": "x86_64-pc-windows-msvc"
+              },
+              "x86": {
+                "target": "i686-pc-windows-msvc",
+                "build-args": "--ia32"
+              }
+            }
+
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: webapp
+
+      - name: Cache .hak
+        uses: actions/cache@v3
+        with:
+          key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }}
+          path: |
+            ./.hak
+
+      - name: Set up build tools
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ inputs.arch }}
+
+      # ActiveTCL package on choco is from 2015,
+      # this one is newer but includes more than we need
+      - name: Choco install tclsh
+        shell: pwsh
+        run: |
+          choco install -y magicsplat-tcl-tk --no-progress
+          echo "${HOME}/AppData/Local/Apps/Tcl86/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Choco install NetWide Assembler
+        shell: pwsh
+        run: |
+          choco install -y nasm --no-progress
+          echo "C:/Program Files/NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: ${{ steps.config.outputs.target }}
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "yarn"
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Build Natives
+        run: |
+          refreshenv
+          yarn build:native --target ${{ steps.config.outputs.target }}
+
+      - name: Build App
+        run: "yarn build --publish never -w ${{ steps.config.outputs.build-args }}"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: win-${{ inputs.arch }}
+          path: dist
+          retention-days: 1

CHANGELOG.md

@@ -1,3 +1,43 @@
+Changes in [1.11.14](https://github.com/vector-im/element-desktop/releases/tag/v1.11.14) (2022-11-08)
+=====================================================================================================
+
+## ✨ Features
+ * Switch to notarytool ([\#440](https://github.com/vector-im/element-desktop/pull/440)).
+ * Loading threads with server-side assistance ([\#9356](https://github.com/matrix-org/matrix-react-sdk/pull/9356)). Fixes vector-im/element-web#21807, vector-im/element-web#21799, vector-im/element-web#21911, vector-im/element-web#22141, vector-im/element-web#22157, vector-im/element-web#22641, vector-im/element-web#22501 vector-im/element-web#22438 and vector-im/element-web#21678. Contributed by @justjanne.
+ * Make thread replies trigger a room list re-ordering ([\#9510](https://github.com/matrix-org/matrix-react-sdk/pull/9510)). Fixes vector-im/element-web#21700.
+ * Device manager - add extra details to device security and renaming ([\#9501](https://github.com/matrix-org/matrix-react-sdk/pull/9501)). Contributed by @kerryarchibald.
+ * Add plain text mode to the wysiwyg composer ([\#9503](https://github.com/matrix-org/matrix-react-sdk/pull/9503)). Contributed by @florianduros.
+ * Sliding Sync: improve sort order, show subspace rooms, better tombstoned room handling ([\#9484](https://github.com/matrix-org/matrix-react-sdk/pull/9484)).
+ * Device manager - add learn more popups to filtered sessions section ([\#9497](https://github.com/matrix-org/matrix-react-sdk/pull/9497)). Contributed by @kerryarchibald.
+ * Show thread notification if thread timeline is closed ([\#9495](https://github.com/matrix-org/matrix-react-sdk/pull/9495)). Fixes vector-im/element-web#23589.
+ * Add message editing to wysiwyg composer ([\#9488](https://github.com/matrix-org/matrix-react-sdk/pull/9488)). Contributed by @florianduros.
+ * Device manager - confirm sign out of other sessions ([\#9487](https://github.com/matrix-org/matrix-react-sdk/pull/9487)). Contributed by @kerryarchibald.
+ * Automatically request logs from other users in a call when submitting logs ([\#9492](https://github.com/matrix-org/matrix-react-sdk/pull/9492)).
+ * Add thread notification with server assistance (MSC3773) ([\#9400](https://github.com/matrix-org/matrix-react-sdk/pull/9400)). Fixes vector-im/element-web#21114, vector-im/element-web#21413, vector-im/element-web#21416, vector-im/element-web#21433, vector-im/element-web#21481, vector-im/element-web#21798, vector-im/element-web#21823 vector-im/element-web#23192 and vector-im/element-web#21765.
+ * Support for login + E2EE set up with QR ([\#9403](https://github.com/matrix-org/matrix-react-sdk/pull/9403)). Contributed by @hughns.
+ * Allow pressing Enter to send messages in new composer ([\#9451](https://github.com/matrix-org/matrix-react-sdk/pull/9451)). Contributed by @andybalaam.
+
+## 🐛 Bug Fixes
+ * Fix regressions around media uploads failing and causing soft crashes ([\#9549](https://github.com/matrix-org/matrix-react-sdk/pull/9549)). Fixes matrix-org/element-web-rageshakes#16831, matrix-org/element-web-rageshakes#16824 matrix-org/element-web-rageshakes#16810 and vector-im/element-web#23641.
+ * Fix /myroomavatar slash command ([\#9536](https://github.com/matrix-org/matrix-react-sdk/pull/9536)). Fixes matrix-org/synapse#14321.
+ * Fix i18n interpolation ([\#432](https://github.com/vector-im/element-desktop/pull/432)). Fixes vector-im/element-web#23568.
+ * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
+ * Fix NotificationBadge unsent color ([\#9522](https://github.com/matrix-org/matrix-react-sdk/pull/9522)). Fixes vector-im/element-web#23646.
+ * Fix room list sorted by recent on app startup ([\#9515](https://github.com/matrix-org/matrix-react-sdk/pull/9515)). Fixes vector-im/element-web#23635.
+ * Reset custom power selector when blurred on empty ([\#9508](https://github.com/matrix-org/matrix-react-sdk/pull/9508)). Fixes vector-im/element-web#23481.
+ * Reinstate timeline/redaction callbacks when updating notification state ([\#9494](https://github.com/matrix-org/matrix-react-sdk/pull/9494)). Fixes vector-im/element-web#23554.
+ * Only render NotificationBadge when needed ([\#9493](https://github.com/matrix-org/matrix-react-sdk/pull/9493)). Fixes vector-im/element-web#23584.
+ * Fix embedded Element Call screen sharing ([\#9485](https://github.com/matrix-org/matrix-react-sdk/pull/9485)). Fixes vector-im/element-web#23571.
+ * Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes vector-im/element-web#23580.
+ * Fix joining calls without audio or video inputs ([\#9486](https://github.com/matrix-org/matrix-react-sdk/pull/9486)). Fixes vector-im/element-web#23511.
+ * Ensure spaces in the spotlight dialog have rounded square avatars ([\#9480](https://github.com/matrix-org/matrix-react-sdk/pull/9480)). Fixes vector-im/element-web#23515.
+ * Only show mini avatar uploader in room intro when no avatar yet exists ([\#9479](https://github.com/matrix-org/matrix-react-sdk/pull/9479)). Fixes vector-im/element-web#23552.
+ * Fix threads fallback incorrectly targets root event ([\#9229](https://github.com/matrix-org/matrix-react-sdk/pull/9229)). Fixes vector-im/element-web#23147.
+ * Align video call icon with banner text ([\#9460](https://github.com/matrix-org/matrix-react-sdk/pull/9460)).
+ * Set relations helper when creating event tile context menu ([\#9253](https://github.com/matrix-org/matrix-react-sdk/pull/9253)). Fixes vector-im/element-web#22018.
+ * Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)). Contributed by @kerryarchibald.
+ * Update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
+
 Changes in [1.11.13](https://github.com/vector-im/element-desktop/releases/tag/v1.11.13) (2022-11-01)
 =====================================================================================================
 

dockerbuild/Dockerfile

@@ -31,7 +31,7 @@ ENV LC_ALL C.UTF-8
 
 ENV DEBUG_COLORS true
 ENV FORCE_COLOR true
-ENV NODE_VERSION 14.17.0
+ENV NODE_VERSION 16.18.1
 
 # this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
 RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \

element.io/nightly/control.template

@@ -3,7 +3,7 @@ License: Apache-2.0
 Vendor: support@element.io
 Architecture: amd64
 Maintainer: support@element.io
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0
+Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
 Recommends: libappindicator3-1, libsqlcipher0
 Section: net
 Priority: extra

element.io/release/control.template

@@ -3,7 +3,7 @@ License: Apache-2.0
 Vendor: support@element.io
 Architecture: amd64
 Maintainer: support@element.io
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0
+Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
 Recommends: libappindicator3-1, libsqlcipher0
 Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
 Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)

package.json

@@ -2,7 +2,7 @@
   "name": "element-desktop",
   "productName": "Element",
   "main": "lib/electron-main.js",
-  "version": "1.11.13",
+  "version": "1.11.14",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {
@@ -53,6 +53,7 @@
     "@babel/core": "^7.18.10",
     "@babel/preset-env": "^7.18.10",
     "@babel/preset-typescript": "^7.18.6",
+    "@electron/notarize": "^1.2.3",
     "@types/auto-launch": "^5.0.1",
     "@types/counterpart": "^0.18.1",
     "@types/detect-libc": "^1.0.0",
@@ -61,23 +62,23 @@
     "@types/mkdirp": "^1.0.2",
     "@types/pacote": "^11.1.1",
     "@types/rimraf": "^3.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.42.0",
+    "@typescript-eslint/parser": "^5.42.0",
     "allchange": "^1.0.6",
     "app-builder-lib": "^22.14.10",
     "asar": "^2.0.1",
     "babel-jest": "^28.1.3",
     "chokidar": "^3.5.2",
     "detect-libc": "^1.0.3",
-    "electron": "^20",
-    "electron-builder": "22.11.4",
-    "electron-builder-squirrel-windows": "22.11.4",
+    "electron": "^21",
+    "electron-builder": "^23.6.0",
+    "electron-builder-squirrel-windows": "^23.6.0",
     "electron-devtools-installer": "^3.1.1",
-    "electron-notarize": "^1.0.0",
-    "eslint": "7.18.0",
+    "eslint": "^8.26.0",
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-matrix-org": "^0.4.0",
+    "eslint-plugin-matrix-org": "^0.7.0",
+    "eslint-plugin-unicorn": "^44.0.2",
     "expect-playwright": "^0.8.0",
     "find-npm-prefix": "^1.0.2",
     "fs-extra": "^8.1.0",
@@ -121,7 +122,10 @@
       "webapp.asar"
     ],
     "linux": {
-      "target": "deb",
+      "target": [
+        "tar.gz",
+        "deb"
+      ],
       "category": "Network;InstantMessaging;Chat",
       "maintainer": "support@element.io",
       "desktop": {
@@ -134,14 +138,10 @@
     },
     "win": {
       "target": [
-        "squirrel",
-        "msi"
+        "squirrel"
       ],
       "sign": "scripts/electron_winSign"
     },
-    "msi": {
-      "perMachine": true
-    },
     "directories": {
       "output": "dist"
     },

scripts/electron_afterSign.js

@@ -1,4 +1,4 @@
-const { notarize } = require('electron-notarize');
+const { notarize } = require('@electron/notarize');
 
 let warned = false;
 exports.default = async function(context) {
@@ -7,16 +7,14 @@ exports.default = async function(context) {
 
     if (electronPlatformName === 'darwin') {
         const appName = context.packager.appInfo.productFilename;
-        // We get the password from keychain. The keychain stores
-        // user IDs too, but apparently altool can't get the user ID
-        // from the keychain, so we need to get it from the environment.
-        const userId = process.env.NOTARIZE_APPLE_ID;
-        if (userId === undefined) {
+
+        const keychainProfile = process.env.NOTARIZE_KEYCHAIN_PROFILE;
+        if (keychainProfile === undefined) {
             if (!warned) {
-                console.log("*************************************");
-                console.log("*   NOTARIZE_APPLE_ID is not set.   *");
-                console.log("* This build will NOT be notarised. *");
-                console.log("*************************************");
+                console.log("*****************************************");
+                console.log("* NOTARIZE_KEYCHAIN_PROFILE is not set. *");
+                console.log("*   This build will NOT be notarised.   *");
+                console.log("*****************************************");
                 warned = true;
             }
             return;
@@ -24,10 +22,11 @@ exports.default = async function(context) {
 
         console.log("Notarising macOS app. This may be some time.");
         return await notarize({
+            tool: "notarytool",
             appBundleId: appId,
             appPath: `${appOutDir}/${appName}.app`,
-            appleId: userId,
-            appleIdPassword: '@keychain:NOTARIZE_CREDS',
+            keychainProfile,
+            keychain: process.env.NOTARIZE_KEYCHAIN,
         });
     }
 };

scripts/fetch-package.js

@@ -14,7 +14,7 @@ const { setPackageVersion } = require('./set-version.js');
 
 const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
 const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
-const DEVELOP_TGZ_URL = "https://element-web-develop.element.io/develop.tar.gz";
+const DEVELOP_TGZ_URL = "https://develop.element.io/develop.tar.gz";
 const ASAR_PATH = 'webapp.asar';
 
 async function downloadToFile(url, filename) {

src/i18n/strings/ar.json

@@ -7,7 +7,6 @@
     "Delete": "احذف",
     "Copy": "انسخ",
     "Edit": "تحرير",
-    "Close Element": "أغلِق Element",
     "Cancel": "ألغِ",
     "Bring All to Front": "ضَع الكل في المقدّمة",
     "Speech": "نطق",

src/i18n/strings/be.json

@@ -41,6 +41,5 @@
     "Quit": "Выйсці",
     "Show/Hide": "Паказаць / схаваць",
     "Are you sure you want to quit?": "Вы ўпэўненыя, што хочаце выйсці?",
-    "Close Element": "Зачыніць Element",
     "Cancel": "Адмена"
 }

src/i18n/strings/bg.json

@@ -42,6 +42,5 @@
     "Quit": "Напусни",
     "Show/Hide": "Покажи/Скрий",
     "Are you sure you want to quit?": "Сигурен ли си че искаш да напуснеш?",
-    "Close Element": "Затвори Елемент",
     "Cancel": "Отказ"
 }

src/i18n/strings/bn.json

@@ -1,6 +1,5 @@
 {
     "Are you sure you want to quit?": "তুমি কি আসলেই বের হতে চাও?",
-    "Close Element": "এলিমেন্ট বন্ধ করো",
     "Cancel": "বাতিল",
     "Save image as...": "ছবি সংরক্ষণের ধরন...",
     "Failed to save image": "ছবি সংরক্ষণ ব্যর্থ",

src/i18n/strings/ca.json

@@ -41,6 +41,5 @@
     "Quit": "Surt",
     "Show/Hide": "Mostra/Amaga",
     "Are you sure you want to quit?": "Esteu segur que voleu sortir?",
-    "Close Element": "Tanca l'Element",
     "Cancel": "Cancel·la"
 }

src/i18n/strings/de.json

@@ -41,7 +41,6 @@
     "Edit": "Bearbeiten",
     "Quit": "Beenden",
     "Show/Hide": "Anzeigen/Ausblenden",
-    "Close Element": "Element schließen",
     "Cancel": "Abbrechen",
     "Copy image address": "Bild-Adresse kopieren",
     "Close %(brand)s": "%(brand)s schließen"

src/i18n/strings/el.json

@@ -35,7 +35,6 @@
     "Edit": "Επεξεργασία",
     "Quit": "Κλείσιμο",
     "Show/Hide": "Eμφάνιση/Απόκρυψη",
-    "Close Element": "Κλείστε το Element",
     "Cancel": "Ακύρωση",
     "Add to dictionary": "Προσθήκη στο λεξικό",
     "The image failed to save": "Η αποθήκευση της εικόνας απέτυχε",

src/i18n/strings/en_US.json

@@ -41,6 +41,5 @@
     "Quit": "Quit",
     "Show/Hide": "Show/Hide",
     "Are you sure you want to quit?": "Are you sure you want to quit?",
-    "Close Element": "Close Element",
     "Cancel": "Cancel"
 }

src/i18n/strings/es.json

@@ -41,7 +41,6 @@
     "Quit": "Salir",
     "Show/Hide": "Ver/Ocultar",
     "Are you sure you want to quit?": "¿Quieres salir?",
-    "Close Element": "Cerrar Element",
     "Cancel": "Cancelar",
     "Copy image address": "Copiar dirección de la imagen",
     "Close %(brand)s": "Cerrar %(brand)s"

src/i18n/strings/et.json

@@ -41,7 +41,6 @@
     "Quit": "Välju",
     "Show/Hide": "Näita/peida",
     "Are you sure you want to quit?": "Kas sa kindlasti soovid rakendusest väljuda?",
-    "Close Element": "Sulge Element",
     "Cancel": "Tühista",
     "Copy image address": "Kopeeri pildi aadress",
     "Close %(brand)s": "Sulge %(brand)s"

src/i18n/strings/fa.json

@@ -42,7 +42,6 @@
     "Quit": "خروج",
     "Show/Hide": "نمایش/پنهان",
     "Are you sure you want to quit?": "آیا مطمئنید که می‌خواهید خارج شوید؟",
-    "Close Element": "بستن المنت",
     "Cancel": "لغو",
     "Close %(brand)s": "بستن %(brand)s"
 }

src/i18n/strings/fi.json

@@ -41,7 +41,6 @@
     "Quit": "Lopeta",
     "Show/Hide": "Näytä/piilota",
     "Are you sure you want to quit?": "Haluatko varmasti poistua?",
-    "Close Element": "Sulje Element",
     "Cancel": "Peruuta",
     "Copy image address": "Kopioi kuvan osoite",
     "Close %(brand)s": "Sulje %(brand)s"

src/i18n/strings/fr.json

@@ -4,7 +4,6 @@
     "Quit": "Quitter",
     "Show/Hide": "Afficher/Masquer",
     "Are you sure you want to quit?": "Êtes-vous sûr de vouloir quitter ?",
-    "Close Element": "Fermer Element",
     "Cancel": "Annuler",
     "Unhide": "Dé-masquer",
     "Hide Others": "Masquer les autres",

src/i18n/strings/fy.json

@@ -41,6 +41,5 @@
     "Quit": "Ofslute",
     "Show/Hide": "Toane/Ferbergje",
     "Are you sure you want to quit?": "Binne jo der wis fan dat jo ôfslute wolle?",
-    "Close Element": "Element ôfslute",
     "Cancel": "Annulearje"
 }

src/i18n/strings/gl.json

@@ -41,6 +41,5 @@
     "Quit": "Saír",
     "Show/Hide": "Mostrar/Agochar",
     "Are you sure you want to quit?": "Tes a certeza de que queres saír?",
-    "Close Element": "Pechar Element",
     "Cancel": "Cancelar"
 }

src/i18n/strings/he.json

@@ -40,7 +40,6 @@
     "Quit": "יציאה",
     "Show/Hide": "הצג\\הסתר",
     "Are you sure you want to quit?": "האם אתה בטוח שברצונך לצאת?",
-    "Close Element": "סגור את אלמנט",
     "Cancel": "ביטול",
     "Paste and Match Style": "הדבק והתאם סגנון",
     "Copy image address": "העתקת כתובת התמונה"

src/i18n/strings/hr.json

@@ -8,6 +8,5 @@
     "Quit": "Prestati",
     "Show/Hide": "Pokaži/sakrij",
     "Are you sure you want to quit?": "Jesi li siguran da želiš odustati?",
-    "Close Element": "Zatvori Element",
     "Cancel": "Otkazati"
 }

src/i18n/strings/hu.json

@@ -41,7 +41,6 @@
     "Quit": "Kilép",
     "Show/Hide": "Megmutat/Elrejt",
     "Are you sure you want to quit?": "Biztos, hogy kilép?",
-    "Close Element": "Element bezárása",
     "Cancel": "Mégsem",
     "Copy image address": "Kép címének másolása",
     "Close %(brand)s": "%(brand)s bezárása"

src/i18n/strings/id.json

@@ -41,7 +41,6 @@
     "Quit": "Keluar",
     "Show/Hide": "Tampilkan/Sembunyikan",
     "Are you sure you want to quit?": "Apakah Anda yakin ingin keluar?",
-    "Close Element": "Tutup Element",
     "Cancel": "Batal",
     "Copy image address": "Salin alamat gambar",
     "Close %(brand)s": "Tutuo %(brand)s"

src/i18n/strings/is.json

@@ -41,7 +41,6 @@
     "Quit": "Hætta",
     "Show/Hide": "Sýna/Fela",
     "Are you sure you want to quit?": "Ertu viss um að þú viljir hætta?",
-    "Close Element": "Loka Element",
     "Cancel": "Hætta við",
     "Copy image address": "Afrita slóð myndar"
 }

src/i18n/strings/it.json

@@ -39,7 +39,6 @@
     "Quit": "Esci",
     "Show/Hide": "Mostra/Nascondi",
     "Are you sure you want to quit?": "Vuoi veramente uscire?",
-    "Close Element": "Chiudi Element",
     "Cancel": "Annulla",
     "Stop Speaking": "Smetti di parlare",
     "Speech": "Dettatura",

src/i18n/strings/lo.json

@@ -42,6 +42,5 @@
     "Quit": "ຍົກເລີກ",
     "Show/Hide": "ສະແດງ/ເຊື່ອງ",
     "Are you sure you want to quit?": "ທ່ານຕ້ອງການປິດແທ້ບໍ່?",
-    "Close Element": "ປິດລະບົບ",
     "Cancel": "ຍົກເລີກ"
 }

src/i18n/strings/lt.json

@@ -42,6 +42,6 @@
     "Quit": "Išeiti",
     "Show/Hide": "Rodyti/Slėpti",
     "Are you sure you want to quit?": "Ar tikrai norite išeiti?",
-    "Close Element": "Uždaryti Element",
-    "Cancel": "Atšaukti"
+    "Cancel": "Atšaukti",
+    "Close %(brand)s": "Uždaryti %(brand)s"
 }

src/i18n/strings/lv.json

@@ -41,7 +41,6 @@
     "Quit": "Iziet",
     "Show/Hide": "Rādīt/nerādīt",
     "Are you sure you want to quit?": "Tiešām vēlaties iziet?",
-    "Close Element": "Aizvērt Elementu",
     "Cancel": "Atcelt",
     "Copy image address": "Kopēt attēla adresi",
     "Close %(brand)s": "Aizvērt %(brand)s"

src/i18n/strings/nb_NO.json

@@ -30,7 +30,6 @@
     "Quit": "Avslutt",
     "Show/Hide": "Vis/Skjul",
     "Are you sure you want to quit?": "Er du sikker på at du vil slutte?",
-    "Close Element": "Lukk Element",
     "Cancel": "Avbryt",
     "Services": "Tjenester",
     "Hide Others": "Skjul Andre"

src/i18n/strings/nl.json

@@ -41,7 +41,6 @@
     "Quit": "Sluiten",
     "Show/Hide": "Tonen/Verbergen",
     "Are you sure you want to quit?": "Weet u zeker dat u wilt stoppen?",
-    "Close Element": "Element sluiten",
     "Cancel": "Annuleren",
     "Copy image address": "Kopieer afbeeldingsadres",
     "Close %(brand)s": "Sluit %(brand)s"

src/i18n/strings/nn.json

@@ -41,6 +41,5 @@
     "Edit": "Rediger",
     "Quit": "Avslutt",
     "Show/Hide": "Vis/Gøym",
-    "Close Element": "Lat att Element",
     "Cancel": "Avbryt"
 }

src/i18n/strings/pl.json

@@ -41,7 +41,6 @@
     "Quit": "Zamknij",
     "Show/Hide": "Pokaż/Ukryj",
     "Are you sure you want to quit?": "Czy na pewno chcesz zamknąć?",
-    "Close Element": "Zamknij Elementa",
     "Cancel": "Anuluj",
     "Copy image address": "Skopiuj adres obrazu"
 }

src/i18n/strings/pt_BR.json

@@ -39,7 +39,6 @@
     "Quit": "Sair",
     "Show/Hide": "Mostrar/Esconder",
     "Are you sure you want to quit?": "Você tem certeza que você quer sair?",
-    "Close Element": "Fechar Element",
     "Cancel": "Cancelar",
     "Bring All to Front": "Trazer Todas Para Frente",
     "Hide Others": "Esconder Outras(os)",

src/i18n/strings/ro.json

@@ -38,6 +38,5 @@
     "Quit": "Închid",
     "Show/Hide": "Arată/Ascunde",
     "Are you sure you want to quit?": "Sigur vrei să ieși din cont?",
-    "Close Element": "Închid Element",
     "Cancel": "Anulare"
 }

src/i18n/strings/ru.json

@@ -1,7 +1,6 @@
 {
     "Edit": "Изменить",
     "Quit": "Выйти",
-    "Close Element": "Закрыть Element",
     "Cancel": "Отмена",
     "Show/Hide": "Показать/скрыть",
     "Are you sure you want to quit?": "Вы уверены, что хотите выйти?",

src/i18n/strings/si.json

@@ -1,7 +1,6 @@
 {
     "Show/Hide": "පෙන්වන්න/සඟවන්න",
     "Are you sure you want to quit?": "ඔබට ඉවත් වීමට අවශ්‍ය බව විශ්වාස ද?",
-    "Close Element": "ඉලමෙන්ට් වසන්න",
     "Cancel": "අවලංගු කරන්න",
     "Add to dictionary": "ශබ්ද කෝෂයට එකතු කරන්න",
     "Copy link address": "සබැඳියේ ලිපිනය පිටපත් කරන්න",

src/i18n/strings/sk.json

@@ -5,7 +5,6 @@
     "Speech": "Reč",
     "Element Help": "Pomocník pre aplikáciu Element",
     "Paste and Match Style": "Vložiť a prispôsobiť štýl",
-    "Close Element": "Zavrieť aplikáciu Element",
     "Add to dictionary": "Pridať do slovníka",
     "The image failed to save": "Obrázok sa nepodarilo uložiť",
     "Failed to save image": "Chyba pri ukladaní obrázka",

src/i18n/strings/sv.json

@@ -37,7 +37,6 @@
     "Unhide": "Sluta gömma",
     "Zoom Out": "Zooma ut",
     "Zoom In": "Zooma in",
-    "Close Element": "Stäng Element",
     "Show/Hide": "Visa/dölj",
     "Add to dictionary": "Lägg till i ordlistan",
     "The image failed to save": "Bilden sparades inte",

src/i18n/strings/ta.json

@@ -41,7 +41,7 @@
     "Quit": "வெளியேறு",
     "Show/Hide": "காட்டு/மறை",
     "Are you sure you want to quit?": "நீங்கள் நிச்சயம் வெளியேற விரும்புகிறீர்களா?",
-    "Close Element": "எலிமெண்ட் ஐ மூடு",
     "Cancel": "விலக்கிக்கொள்",
-    "Copy image address": "பட முகவரியை நகலெடு"
+    "Copy image address": "பட முகவரியை நகலெடு",
+    "Close %(brand)s": "%(brand)s ஐ மூடு"
 }

src/i18n/strings/te.json

@@ -5,6 +5,5 @@
     "Cut": "కట్",
     "Copy": "కాపీ",
     "Are you sure you want to quit?": "మీరు వెళ్ళిపోవాలని అనుకుంటున్నారా?",
-    "Close Element": "మూసివేత element",
     "Cancel": "ఆపు"
 }

src/i18n/strings/tr.json

@@ -41,7 +41,6 @@
     "Quit": "Çık",
     "Show/Hide": "Göster/Gizle",
     "Are you sure you want to quit?": "Çıkmak istediğinize emin misiniz?",
-    "Close Element": "Element'i kapat",
     "Cancel": "İptal",
     "Copy image address": "Görsel adresini kopyala"
 }

src/i18n/strings/ur.json

@@ -0,0 +1,21 @@
+{
+    "Paste": "پیسٹ",
+    "Redo": "دوبارہ کریں",
+    "Preferences": "ترجیحات",
+    "Hide Others": "",
+    "Show/Hide": "دکھائیں/چھپائیں",
+    "Quit": "چھوڑو",
+    "Hide": "چھپائیں",
+    "Unhide": "دکھائیں",
+    "Zoom": "زوم",
+    "Close": "بند",
+    "Window": "کھڑکی",
+    "Cut": "کٹ",
+    "Delete": "مٹاؤ",
+    "File": "فائل",
+    "Help": "مدد",
+    "Copy": "کاپی",
+    "Add to dictionary": "لغت میں شامل کریں",
+    "Copy image": "تصویر کاپی کریں",
+    "Start Speaking": "بولنا شروع کریں"
+}

src/i18n/strings/vi.json

@@ -41,7 +41,6 @@
     "Quit": "Thoát",
     "Show/Hide": "Hiển thị/Ẩn",
     "Are you sure you want to quit?": "Bạn có chắc chắn muốn thoát?",
-    "Close Element": "Đóng Element",
     "Cancel": "Hủy bỏ",
     "Copy image address": "Sao chép địa chỉ ảnh"
 }

src/i18n/strings/zh_Hans.json

@@ -41,7 +41,6 @@
     "Quit": "退出",
     "Show/Hide": "显示/隐藏",
     "Are you sure you want to quit?": "你确定要退出吗？",
-    "Close Element": "关闭 Element",
     "Cancel": "取消",
     "Copy image address": "复制图片地址"
 }

src/i18n/strings/zh_Hant.json

@@ -41,7 +41,6 @@
     "Quit": "退出",
     "Show/Hide": "顯示/隱藏",
     "Are you sure you want to quit?": "您確定要退出嗎？",
-    "Close Element": "關閉 Element",
     "Cancel": "取消",
     "Copy image address": "複製圖片地址",
     "Close %(brand)s": "關閉 %(brand)s"

src/seshat.ts

@@ -47,8 +47,6 @@ try {
     }
 }
 
-const eventStorePath = path.join(app.getPath('userData'), 'EventStore');
-
 let eventIndex: SeshatType | null = null;
 
 const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE";
@@ -80,6 +78,9 @@ const deleteContents = async (p: string): Promise<void> => {
 ipcMain.on('seshat', async function(_ev: IpcMainEvent, payload): Promise<void> {
     if (!global.mainWindow) return;
 
+    // We do this here to ensure we get the path after --profile has been resolved
+    const eventStorePath = path.join(app.getPath('userData'), 'EventStore');
+
     const sendError = (id, e) => {
         const error = {
             message: e.message,

test/launch-test.ts

@@ -48,12 +48,14 @@ describe("App launch", () => {
             }
         });
         window = await app.firstWindow();
-    });
+    }, 30000);
 
     afterAll(async () => {
-        await app?.close();
+        await app?.close().catch(e => {
+            console.error(e);
+        });
         fs.rmSync(tmpDir, { recursive: true });
-    });
+    }, 30000);
 
     it("should launch and render the welcome view successfully", async () => {
         await window.locator("#matrixchat").waitFor();