From 6395f125d1d544ead4c7dc9a880eadc4e20e44dd Mon Sep 17 00:00:00 2001
From: hazre
Date: Fri, 27 Feb 2026 09:17:37 +0100
Subject: [PATCH 01/59] chore(lint): add knip
---
knip.json | 6 +
package-lock.json | 665 +++++++++++++++++++++++++++++++++++++++++++++-
package.json | 4 +-
3 files changed, 673 insertions(+), 2 deletions(-)
create mode 100644 knip.json
diff --git a/knip.json b/knip.json
new file mode 100644
index 00000000..c9201d3b
--- /dev/null
+++ b/knip.json
@@ -0,0 +1,6 @@
+{
+ "$schema": "https://unpkg.com/knip@5/schema.json",
+ "tags": [
+ "-lintignore"
+ ]
+}
diff --git a/package-lock.json b/package-lock.json
index 22781aba..850c7724 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -94,8 +94,9 @@
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.0.1",
+ "knip": "5.85.0",
"prettier": "^3.8.1",
- "typescript": "^5.9.3",
+ "typescript": "5.9.3",
"typescript-eslint": "^8.56.1",
"vite": "^7.3.1",
"vite-plugin-pwa": "^1.2.0",
@@ -1762,6 +1763,40 @@
"integrity": "sha512-OViKJonDaDNVBUW9WdV9mk78/Ruh34C7XsEgt3O8D9z+64C39elbIgllHSoH5S12IRlv9RYrrV37FZLo6QWsDQ==",
"dev": true
},
+ "node_modules/@emnapi/core": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz",
+ "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/wasi-threads": "1.1.0",
+ "tslib": "^2.4.0"
+ }
+ },
+ "node_modules/@emnapi/runtime": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz",
+ "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
+ "node_modules/@emnapi/wasi-threads": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz",
+ "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
"node_modules/@emotion/hash": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz",
@@ -2887,6 +2922,344 @@
"url": "https://github.com/sponsors/Brooooooklyn"
}
},
+ "node_modules/@napi-rs/wasm-runtime": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.1.tgz",
+ "integrity": "sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/core": "^1.7.1",
+ "@emnapi/runtime": "^1.7.1",
+ "@tybys/wasm-util": "^0.10.1"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/Brooooooklyn"
+ }
+ },
+ "node_modules/@nodelib/fs.scandir": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.stat": "2.0.5",
+ "run-parallel": "^1.1.9"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.stat": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.walk": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.scandir": "2.1.5",
+ "fastq": "^1.6.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@oxc-resolver/binding-android-arm-eabi": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.19.0.tgz",
+ "integrity": "sha512-dlMjjWE3h+qMujLp5nBX/x7R5ny+xfr4YtsyaMNuM5JImOtQBzpFxQr9kJOKGL+9RbaoTOXpt5KF05f9pnOsgw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-android-arm64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.19.0.tgz",
+ "integrity": "sha512-x5P0Y12oMcSC9PKkz1FtdVVLosXYi/05m+ufxPrUggd6vZRBPJhW4zZUsMVbz8dwwk71Dh0f6/2ntw3WPOq+Ig==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-darwin-arm64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.19.0.tgz",
+ "integrity": "sha512-DjnuIPB60IQrVSCiuVBzN8/8AeeIjthdkk+dZYdZzgLeP2T5ZF41u50haJMtIdGr5cRzRH6zPV/gh6+RFjlvKA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-darwin-x64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.19.0.tgz",
+ "integrity": "sha512-dVAqIZIIY7xOXCCV0nJPs8ExlYc6R7mcNpFobwNyE3qlXGbgvwb7Gl3iOumOiPBfF+sbJR3MMP7RAPfKqbvYyA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-freebsd-x64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.19.0.tgz",
+ "integrity": "sha512-kwcZ30bIpJNFcT22sIlde4mz0EyXmB3lAefCFWtffqpbmLweQUwz1dKDcsutxEjpkbEKLmfrj1wCyRZp7n5Hnw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.19.0.tgz",
+ "integrity": "sha512-GImk/cb3X+zBGEwr6l9h0dbiNo5zNd52gamZmluEpbyybiZ8kc5q44/7zRR4ILChWRW7pI92W57CJwhkF+wRmg==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-arm-musleabihf": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.19.0.tgz",
+ "integrity": "sha512-uIEyws3bBD1gif4SZCOV2XIr6q5fd1WbzzBbpL8qk+TbzOvKMWnMNNtfNacnAGGa2lLRNXR1Fffot2mlZ/Xmbw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.19.0.tgz",
+ "integrity": "sha512-bIkgp+AB+yZfvdKDfjFT7PycsRtih7+zCV5AbnkzfyvNvQ47rfssf8R1IbG++mx+rZ4YUCUu8EbP66HC3O5c5w==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-arm64-musl": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.19.0.tgz",
+ "integrity": "sha512-bOt5pKPcbidTSy64m2CfM0XcaCmxBEFclCMPuOPO08hh8QIFTiZVhFf/OxTFqyRwhq/tlzzKmXpMo7DfzbO5lQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-ppc64-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.19.0.tgz",
+ "integrity": "sha512-BymEPqVeLZzA/1kXow9U9rdniq1r5kk4u686Cx3ZU77YygR48NJI/2TyjM70vKHZffGx75ZShobcc1M5GXG3WA==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-riscv64-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.19.0.tgz",
+ "integrity": "sha512-aFgPTzZZY+XCYe4B+3A1S63xcIh2i136+2TPXWr9NOwXXTdMdBntb1J9fEgxXDnX82MjBknLUpJqAZHNTJzixA==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-riscv64-musl": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.19.0.tgz",
+ "integrity": "sha512-9WDGt7fV9GK97WrWE/VEDhMFv9m0ZXYn5NQ+16QvyT0ux8yGLAvyadi6viaTjEdJII/OaHBRYHcL+zUjmaWwmg==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-s390x-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.19.0.tgz",
+ "integrity": "sha512-SY3di6tccocppAVal5Hev3D6D1N5Y6TCEypAvNCOiPqku2Y8U/aXfvGbthqdPNa72KYqjUR1vomOv6J9thHITA==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-x64-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.19.0.tgz",
+ "integrity": "sha512-SV+4zBeCC3xjSE2wvhN45eyABoVRX3xryWBABFKfLwAWhF3wsB3bUF+CantYfQ/TLpasyvplRS9ovvFT9cb/0A==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-x64-musl": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.19.0.tgz",
+ "integrity": "sha512-LkbjO+r5Isl8Xl29pJYOCB/iSUIULFUJDGdMp+yJD3OgWtSa6VJta2iw7QXmpcoOkq18UIL09yWrlyjLDL0Hug==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-openharmony-arm64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-openharmony-arm64/-/binding-openharmony-arm64-11.19.0.tgz",
+ "integrity": "sha512-Ud1gelL5slpEU5AjzBWQz1WheprOAl5CPnCKTWynvvdlBbAZXA6fPYLuCrlRo0uw+x3f37XJ71kirpSew8Zyvg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openharmony"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-wasm32-wasi": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.19.0.tgz",
+ "integrity": "sha512-wXLNAVmL4vWXKaYJnFPgg5zQsSr3Rv+ftNReIU3UkzTcoVLK0805Pnbr2NwcBWSO5hhpOEdys02qlT2kxVgjWw==",
+ "cpu": [
+ "wasm32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@napi-rs/wasm-runtime": "^1.1.1"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.19.0.tgz",
+ "integrity": "sha512-zszvr0dJfvv0Jg49hLwjAJ4SRzfsq28SoearUtT1qv3qXRYsBWuctdlRa/lEZkiuG4tZWiY425Jh9QqLafwsAg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-win32-ia32-msvc": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-11.19.0.tgz",
+ "integrity": "sha512-I7ZYujr5XL1l7OwuddbOeqdUyFOaf51W1U2xUogInFdupIAKGqbpugpAK6RaccLcSlN0bbuo3CS5h7ue38SUAg==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-win32-x64-msvc": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.19.0.tgz",
+ "integrity": "sha512-NxErbI1TmJEZZVvGPePjgXFZCuOzrjQuJ6YwHjcWkelReK7Uhg4QeL05zRdfTpgkH6IY/C8OjbKx5ZilQ4yDFg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
"node_modules/@react-aria/breadcrumbs": {
"version": "3.5.31",
"resolved": "https://registry.npmjs.org/@react-aria/breadcrumbs/-/breadcrumbs-3.5.31.tgz",
@@ -5723,6 +6096,17 @@
"url": "https://github.com/sponsors/tannerlinsley"
}
},
+ "node_modules/@tybys/wasm-util": {
+ "version": "0.10.1",
+ "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
+ "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
"node_modules/@types/babel__core": {
"version": "7.20.5",
"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -9086,6 +9470,36 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"dev": true
},
+ "node_modules/fast-glob": {
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+ "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.2",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.8"
+ },
+ "engines": {
+ "node": ">=8.6.0"
+ }
+ },
+ "node_modules/fast-glob/node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/fast-json-stable-stringify": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -9115,6 +9529,26 @@
],
"license": "BSD-3-Clause"
},
+ "node_modules/fastq": {
+ "version": "1.20.1",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+ "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "reusify": "^1.0.4"
+ }
+ },
+ "node_modules/fd-package-json": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/fd-package-json/-/fd-package-json-2.0.0.tgz",
+ "integrity": "sha512-jKmm9YtsNXN789RS/0mSzOC1NUq9mkVd65vbSSVsKdjGvYXBuE4oWe2QOEoFeRmJg+lPuZxpmrfFclNhoRMneQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "walk-up-path": "^4.0.0"
+ }
+ },
"node_modules/fdir": {
"version": "6.5.0",
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -9302,6 +9736,22 @@
"url": "https://github.com/sponsors/isaacs"
}
},
+ "node_modules/formatly": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/formatly/-/formatly-0.3.0.tgz",
+ "integrity": "sha512-9XNj/o4wrRFyhSMJOvsuyMwy8aUfBaZ1VrqHVfohyXf0Sw0e+yfKG+xZaY3arGCOMdwFsqObtzVOc1gU9KiT9w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fd-package-json": "^2.0.0"
+ },
+ "bin": {
+ "formatly": "bin/index.mjs"
+ },
+ "engines": {
+ "node": ">=18.3.0"
+ }
+ },
"node_modules/framer-motion": {
"version": "12.34.3",
"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.34.3.tgz",
@@ -10494,6 +10944,16 @@
"integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
"license": "MIT"
},
+ "node_modules/jiti": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
+ "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "jiti": "lib/jiti-cli.mjs"
+ }
+ },
"node_modules/jotai": {
"version": "2.18.0",
"resolved": "https://registry.npmjs.org/jotai/-/jotai-2.18.0.tgz",
@@ -10653,6 +11113,61 @@
"json-buffer": "3.0.1"
}
},
+ "node_modules/knip": {
+ "version": "5.85.0",
+ "resolved": "https://registry.npmjs.org/knip/-/knip-5.85.0.tgz",
+ "integrity": "sha512-V2kyON+DZiYdNNdY6GALseiNCwX7dYdpz9Pv85AUn69Gk0UKCts+glOKWfe5KmaMByRjM9q17Mzj/KinTVOyxg==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/webpro"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/knip"
+ }
+ ],
+ "license": "ISC",
+ "dependencies": {
+ "@nodelib/fs.walk": "^1.2.3",
+ "fast-glob": "^3.3.3",
+ "formatly": "^0.3.0",
+ "jiti": "^2.6.0",
+ "js-yaml": "^4.1.1",
+ "minimist": "^1.2.8",
+ "oxc-resolver": "^11.15.0",
+ "picocolors": "^1.1.1",
+ "picomatch": "^4.0.1",
+ "smol-toml": "^1.5.2",
+ "strip-json-comments": "5.0.3",
+ "zod": "^4.1.11"
+ },
+ "bin": {
+ "knip": "bin/knip.js",
+ "knip-bun": "bin/knip-bun.js"
+ },
+ "engines": {
+ "node": ">=18.18.0"
+ },
+ "peerDependencies": {
+ "@types/node": ">=18",
+ "typescript": ">=5.0.4 <7"
+ }
+ },
+ "node_modules/knip/node_modules/strip-json-comments": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.3.tgz",
+ "integrity": "sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=14.16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/language-subtag-registry": {
"version": "0.3.23",
"resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
@@ -10899,6 +11414,43 @@
"@babel/runtime": "^7.12.5"
}
},
+ "node_modules/merge2": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/micromatch": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "braces": "^3.0.3",
+ "picomatch": "^2.3.1"
+ },
+ "engines": {
+ "node": ">=8.6"
+ }
+ },
+ "node_modules/micromatch/node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
"node_modules/millify": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/millify/-/millify-6.1.0.tgz",
@@ -11224,6 +11776,38 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/oxc-resolver": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.19.0.tgz",
+ "integrity": "sha512-oEe42WEoZc2T5sCQqgaRBx8huzP4cJvrnm+BfNTJESdtM633Tqs6iowkpsMTXgnb7SLwU6N6D9bqwW/PULjo6A==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/Boshen"
+ },
+ "optionalDependencies": {
+ "@oxc-resolver/binding-android-arm-eabi": "11.19.0",
+ "@oxc-resolver/binding-android-arm64": "11.19.0",
+ "@oxc-resolver/binding-darwin-arm64": "11.19.0",
+ "@oxc-resolver/binding-darwin-x64": "11.19.0",
+ "@oxc-resolver/binding-freebsd-x64": "11.19.0",
+ "@oxc-resolver/binding-linux-arm-gnueabihf": "11.19.0",
+ "@oxc-resolver/binding-linux-arm-musleabihf": "11.19.0",
+ "@oxc-resolver/binding-linux-arm64-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-arm64-musl": "11.19.0",
+ "@oxc-resolver/binding-linux-ppc64-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-riscv64-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-riscv64-musl": "11.19.0",
+ "@oxc-resolver/binding-linux-s390x-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-x64-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-x64-musl": "11.19.0",
+ "@oxc-resolver/binding-openharmony-arm64": "11.19.0",
+ "@oxc-resolver/binding-wasm32-wasi": "11.19.0",
+ "@oxc-resolver/binding-win32-arm64-msvc": "11.19.0",
+ "@oxc-resolver/binding-win32-ia32-msvc": "11.19.0",
+ "@oxc-resolver/binding-win32-x64-msvc": "11.19.0"
+ }
+ },
"node_modules/p-limit": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -11569,6 +12153,27 @@
"node": ">=6"
}
},
+ "node_modules/queue-microtask": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "license": "MIT"
+ },
"node_modules/raf-schd": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
@@ -11991,6 +12596,17 @@
"node": ">=4"
}
},
+ "node_modules/reusify": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+ "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "iojs": ">=1.0.0",
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/rollup": {
"version": "4.57.1",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
@@ -12035,6 +12651,30 @@
"fsevents": "~2.3.2"
}
},
+ "node_modules/run-parallel": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "queue-microtask": "^1.2.2"
+ }
+ },
"node_modules/safe-array-concat": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
@@ -12390,6 +13030,19 @@
"node": ">=20.0.0"
}
},
+ "node_modules/smol-toml": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.0.tgz",
+ "integrity": "sha512-4zemZi0HvTnYwLfrpk/CF9LOd9Lt87kAt50GnqhMpyF9U3poDAP2+iukq2bZsO/ufegbYehBkqINbsWxj4l4cw==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "engines": {
+ "node": ">= 18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/cyyynthia"
+ }
+ },
"node_modules/snake-case": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz",
@@ -13866,6 +14519,16 @@
"node": ">=0.10.0"
}
},
+ "node_modules/walk-up-path": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-4.0.0.tgz",
+ "integrity": "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": "20 || >=22"
+ }
+ },
"node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
diff --git a/package.json b/package.json
index 1fe71d42..25f68e65 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,8 @@
"check:eslint": "eslint src/*",
"check:prettier": "prettier --check .",
"fix:prettier": "prettier --write .",
- "typecheck": "tsc"
+ "typecheck": "tsc",
+ "knip": "knip"
},
"keywords": [],
"author": "7w1",
@@ -108,6 +109,7 @@
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.0.1",
+ "knip": "5.85.0",
"prettier": "^3.8.1",
"typescript": "^5.9.3",
"typescript-eslint": "^8.56.1",
From 44fbfa0d0e3b8aadd06fc2d79356911c69ac15d8 Mon Sep 17 00:00:00 2001
From: hazre
Date: Fri, 27 Feb 2026 10:39:00 +0100
Subject: [PATCH 02/59] chore: tighten knip/eslint config and remove dead code
---
eslint.config.js | 40 +-
knip.json | 15 +-
package-lock.json | 746 +++++++++++++-----
package.json | 20 +-
src/app/components/CapabilitiesLoader.tsx | 19 -
src/app/components/MediaConfigLoader.tsx | 19 -
.../components/SpaceChildDirectsProvider.tsx | 28 -
.../components/SpaceChildRoomsProvider.tsx | 28 -
src/app/components/editor/Editor.preview.tsx | 84 --
src/app/features/space-settings/styles.css.ts | 6 -
src/app/hooks/useDisplayName.ts | 17 -
src/app/hooks/useForceUpdate.js | 13 -
src/app/hooks/useUserTrustStatusChange.ts | 16 -
src/app/pages/client/sidebar/SettingsTab.tsx | 49 --
src/app/state/hooks/inviteList.ts | 55 --
src/app/utils/disposable.ts | 16 -
src/index.tsx | 1 -
src/types/utils.ts | 3 -
tsconfig.json | 2 +-
19 files changed, 611 insertions(+), 566 deletions(-)
delete mode 100644 src/app/components/CapabilitiesLoader.tsx
delete mode 100644 src/app/components/MediaConfigLoader.tsx
delete mode 100644 src/app/components/SpaceChildDirectsProvider.tsx
delete mode 100644 src/app/components/SpaceChildRoomsProvider.tsx
delete mode 100644 src/app/components/editor/Editor.preview.tsx
delete mode 100644 src/app/features/space-settings/styles.css.ts
delete mode 100644 src/app/hooks/useDisplayName.ts
delete mode 100644 src/app/hooks/useForceUpdate.js
delete mode 100644 src/app/hooks/useUserTrustStatusChange.ts
delete mode 100644 src/app/pages/client/sidebar/SettingsTab.tsx
delete mode 100644 src/app/state/hooks/inviteList.ts
delete mode 100644 src/app/utils/disposable.ts
delete mode 100644 src/types/utils.ts
diff --git a/eslint.config.js b/eslint.config.js
index 792e263f..4f32bc93 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,15 +1,21 @@
import js from '@eslint/js';
+import { includeIgnoreFile } from '@eslint/compat';
import { defineConfig } from 'eslint/config';
+import { fileURLToPath } from 'node:url';
import css from '@eslint/css';
+import { createTypeScriptImportResolver } from 'eslint-import-resolver-typescript';
import tseslint from 'typescript-eslint';
import react from 'eslint-plugin-react';
import reactHooks from 'eslint-plugin-react-hooks';
-import importPlugin from 'eslint-plugin-import';
+import jsxA11y from 'eslint-plugin-jsx-a11y';
+import { createNodeResolver, importX } from 'eslint-plugin-import-x';
+import unusedImports from 'eslint-plugin-unused-imports';
import eslintConfigPrettier from 'eslint-config-prettier';
-const sourceFiles = ['**/*.{js,jsx,ts,tsx,mjs,cjs,mts,cts}'];
-const tsSourceFiles = ['**/*.{ts,tsx,mts,cts}'];
-const jsSourceFiles = ['**/*.{js,jsx,mjs,cjs}'];
+const sourceFiles = ['src/**/*.{js,jsx,ts,tsx,mjs,cjs,mts,cts}'];
+const tsSourceFiles = ['src/**/*.{ts,tsx,mts,cts}'];
+const jsSourceFiles = ['src/**/*.{js,jsx,mjs,cjs}'];
+const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url));
const scopedRecommendedTsConfigs = tseslint.configs.recommended.map((config) =>
config.files ? config : { ...config, files: sourceFiles }
);
@@ -18,6 +24,7 @@ const scopedRecommendedTypeCheckedTsConfigs = tseslint.configs.recommendedTypeCh
);
export default defineConfig(
+ includeIgnoreFile(gitignorePath),
{
files: ['**/*.css'],
plugins: { css },
@@ -41,20 +48,30 @@ export default defineConfig(
react: {
version: 'detect',
},
+ 'import-x/resolver-next': [
+ createTypeScriptImportResolver({
+ project: './tsconfig.json',
+ }),
+ createNodeResolver(),
+ ],
},
},
{ ...js.configs.recommended, files: sourceFiles },
...scopedRecommendedTsConfigs,
...scopedRecommendedTypeCheckedTsConfigs,
- { ...importPlugin.flatConfigs.recommended, files: sourceFiles },
- { ...importPlugin.flatConfigs.typescript, files: tsSourceFiles },
+ { ...importX.flatConfigs.recommended, files: sourceFiles },
+ { ...importX.flatConfigs.typescript, files: tsSourceFiles },
{ ...react.configs.flat.recommended, files: sourceFiles },
{ ...react.configs.flat['jsx-runtime'], files: sourceFiles },
+ { ...jsxA11y.flatConfigs.recommended, files: sourceFiles },
{ ...reactHooks.configs.flat.recommended, files: sourceFiles },
{ ...tseslint.configs.disableTypeChecked, files: jsSourceFiles },
{ ...eslintConfigPrettier, files: sourceFiles },
{
files: sourceFiles,
+ plugins: {
+ 'unused-imports': unusedImports,
+ },
rules: {
'linebreak-style': 'off',
'no-unused-vars': 'off',
@@ -70,18 +87,15 @@ export default defineConfig(
'react/require-default-props': 'off',
'react/jsx-props-no-spreading': 'off',
'react-hooks/exhaustive-deps': 'error',
- 'import/no-extraneous-dependencies': [
+ 'import-x/no-extraneous-dependencies': [
'error',
{
devDependencies: true,
},
],
- '@typescript-eslint/no-unused-vars': [
- 'error',
- {
- varsIgnorePattern: '^React$',
- },
- ],
+ '@typescript-eslint/no-unused-vars': 'off',
+ 'unused-imports/no-unused-imports': 'error',
+ 'unused-imports/no-unused-vars': 'error',
'@typescript-eslint/no-shadow': 'error',
},
},
diff --git a/knip.json b/knip.json
index c9201d3b..bc885b41 100644
--- a/knip.json
+++ b/knip.json
@@ -1,6 +1,15 @@
{
"$schema": "https://unpkg.com/knip@5/schema.json",
- "tags": [
- "-lintignore"
- ]
+ "entry": ["src/sw.ts", "scripts/normalize-imports.js"],
+ "ignoreExportsUsedInFile": {
+ "interface": true,
+ "type": true
+ },
+ "ignoreDependencies": ["buffer", "@element-hq/element-call-embedded"],
+ "rules": {
+ "exports": "off",
+ "types": "off",
+ "enumMembers": "off"
+ },
+ "tags": ["-lintignore"]
}
diff --git a/package-lock.json b/package-lock.json
index 850c7724..fb279440 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,6 @@
"browser-encrypt-attachment": "^0.3.0",
"chroma-js": "^3.2.0",
"classnames": "^2.5.1",
- "dateformat": "^5.0.3",
"dayjs": "^1.11.19",
"domhandler": "^5.0.3",
"emojibase": "^15.3.1",
@@ -71,8 +70,8 @@
"devDependencies": {
"@element-hq/element-call-embedded": "0.16.3",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+ "@eslint/compat": "2.0.2",
"@eslint/css": "^0.14.1",
- "@eslint/eslintrc": "^3.3.4",
"@eslint/js": "^9.39.3",
"@rollup/plugin-inject": "^5.0.5",
"@rollup/plugin-wasm": "^6.2.2",
@@ -90,13 +89,15 @@
"buffer": "^6.0.3",
"eslint": "^9.39.3",
"eslint-config-prettier": "^10.1.8",
- "eslint-plugin-import": "^2.32.0",
- "eslint-plugin-jsx-a11y": "^6.10.2",
+ "eslint-import-resolver-typescript": "4.4.4",
+ "eslint-plugin-import-x": "4.16.1",
+ "eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.0.1",
+ "eslint-plugin-unused-imports": "4.4.1",
"knip": "5.85.0",
"prettier": "^3.8.1",
- "typescript": "5.9.3",
+ "typescript": "^5.9.3",
"typescript-eslint": "^8.56.1",
"vite": "^7.3.1",
"vite-plugin-pwa": "^1.2.0",
@@ -2282,6 +2283,40 @@
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
+ "node_modules/@eslint/compat": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-2.0.2.tgz",
+ "integrity": "sha512-pR1DoD0h3HfF675QZx0xsyrsU8q70Z/plx7880NOhS02NuWLgBCOMDL787nUeQ7EWLkxv3bPQJaarjcPQb2Dwg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@eslint/core": "^1.1.0"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ },
+ "peerDependencies": {
+ "eslint": "^8.40 || 9 || 10"
+ },
+ "peerDependenciesMeta": {
+ "eslint": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@eslint/compat/node_modules/@eslint/core": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.1.0.tgz",
+ "integrity": "sha512-/nr9K9wkr3P1EzFTdFdMoLuo1PmIxjmwvPozwoSodjNBdefGujXQUF93u1DDZpEaTuDvMsIQddsd35BwtrW9Xw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@types/json-schema": "^7.0.15"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ }
+ },
"node_modules/@eslint/config-array": {
"version": "0.21.1",
"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
@@ -5519,13 +5554,6 @@
"win32"
]
},
- "node_modules/@rtsao/scc": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
- "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/@surma/rollup-plugin-off-main-thread": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -6188,12 +6216,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/@types/json5": {
- "version": "0.0.29",
- "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
- "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
- "dev": true
- },
"node_modules/@types/node": {
"version": "24.10.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.13.tgz",
@@ -6551,6 +6573,288 @@
"url": "https://opencollective.com/eslint"
}
},
+ "node_modules/@unrs/resolver-binding-android-arm-eabi": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
+ "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-android-arm64": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
+ "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-darwin-arm64": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
+ "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-darwin-x64": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
+ "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-freebsd-x64": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
+ "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
+ "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
+ "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
+ "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
+ "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
+ "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
+ "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
+ "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
+ "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
+ "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-x64-musl": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
+ "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-wasm32-wasi": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
+ "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+ "cpu": [
+ "wasm32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@napi-rs/wasm-runtime": "^0.2.11"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@unrs/resolver-binding-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+ "version": "0.2.12",
+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+ "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/core": "^1.4.3",
+ "@emnapi/runtime": "^1.4.3",
+ "@tybys/wasm-util": "^0.10.0"
+ }
+ },
+ "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
+ "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
+ "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
+ "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
"node_modules/@use-gesture/core": {
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz",
@@ -7716,28 +8020,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/array.prototype.findlastindex": {
- "version": "1.2.6",
- "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
- "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "call-bind": "^1.0.8",
- "call-bound": "^1.0.4",
- "define-properties": "^1.2.1",
- "es-abstract": "^1.23.9",
- "es-errors": "^1.3.0",
- "es-object-atoms": "^1.1.1",
- "es-shim-unscopables": "^1.1.0"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/array.prototype.flat": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
@@ -7859,10 +8141,11 @@
}
},
"node_modules/axe-core": {
- "version": "4.10.2",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
- "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
+ "version": "4.11.1",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.1.tgz",
+ "integrity": "sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==",
"dev": true,
+ "license": "MPL-2.0",
"engines": {
"node": ">=4"
}
@@ -8310,6 +8593,16 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/comment-parser": {
+ "version": "1.4.5",
+ "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.5.tgz",
+ "integrity": "sha512-aRDkn3uyIlCFfk5NUA+VdwMmMsh8JGhc4hapfV4yxymHGQ3BVskMQfoXGpCo5IoBuQ9tS5iiVKhCpTcB4pW4qw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 12.0.0"
+ }
+ },
"node_modules/common-tags": {
"version": "1.8.2",
"resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
@@ -8450,7 +8743,8 @@
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
"integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
- "dev": true
+ "dev": true,
+ "license": "BSD-2-Clause"
},
"node_modules/data-view-buffer": {
"version": "1.0.2",
@@ -8503,14 +8797,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/dateformat": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-5.0.3.tgz",
- "integrity": "sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA==",
- "engines": {
- "node": ">=12.20"
- }
- },
"node_modules/dayjs": {
"version": "1.11.19",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
@@ -8721,7 +9007,8 @@
"version": "9.2.2",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/emojibase": {
"version": "15.3.1",
@@ -9076,116 +9363,140 @@
"eslint": ">=7.0.0"
}
},
- "node_modules/eslint-import-resolver-node": {
- "version": "0.3.9",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
- "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
- "dev": true,
- "dependencies": {
- "debug": "^3.2.7",
- "is-core-module": "^2.13.0",
- "resolve": "^1.22.4"
- }
- },
- "node_modules/eslint-import-resolver-node/node_modules/debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
- "dev": true,
- "dependencies": {
- "ms": "^2.1.1"
- }
- },
- "node_modules/eslint-module-utils": {
- "version": "2.12.1",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
- "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
+ "node_modules/eslint-import-context": {
+ "version": "0.1.9",
+ "resolved": "https://registry.npmjs.org/eslint-import-context/-/eslint-import-context-0.1.9.tgz",
+ "integrity": "sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "debug": "^3.2.7"
+ "get-tsconfig": "^4.10.1",
+ "stable-hash-x": "^0.2.0"
},
"engines": {
- "node": ">=4"
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-import-context"
+ },
+ "peerDependencies": {
+ "unrs-resolver": "^1.0.0"
},
"peerDependenciesMeta": {
- "eslint": {
+ "unrs-resolver": {
"optional": true
}
}
},
- "node_modules/eslint-module-utils/node_modules/debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "node_modules/eslint-import-resolver-typescript": {
+ "version": "4.4.4",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.4.4.tgz",
+ "integrity": "sha512-1iM2zeBvrYmUNTj2vSC/90JTHDth+dfOfiNKkxApWRsTJYNrc8rOdxxIf5vazX+BiAXTeOT0UvWpGI/7qIWQOw==",
"dev": true,
- "license": "MIT",
+ "license": "ISC",
"dependencies": {
- "ms": "^2.1.1"
- }
- },
- "node_modules/eslint-plugin-import": {
- "version": "2.32.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
- "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@rtsao/scc": "^1.1.0",
- "array-includes": "^3.1.9",
- "array.prototype.findlastindex": "^1.2.6",
- "array.prototype.flat": "^1.3.3",
- "array.prototype.flatmap": "^1.3.3",
- "debug": "^3.2.7",
- "doctrine": "^2.1.0",
- "eslint-import-resolver-node": "^0.3.9",
- "eslint-module-utils": "^2.12.1",
- "hasown": "^2.0.2",
- "is-core-module": "^2.16.1",
- "is-glob": "^4.0.3",
- "minimatch": "^3.1.2",
- "object.fromentries": "^2.0.8",
- "object.groupby": "^1.0.3",
- "object.values": "^1.2.1",
- "semver": "^6.3.1",
- "string.prototype.trimend": "^1.0.9",
- "tsconfig-paths": "^3.15.0"
+ "debug": "^4.4.1",
+ "eslint-import-context": "^0.1.8",
+ "get-tsconfig": "^4.10.1",
+ "is-bun-module": "^2.0.0",
+ "stable-hash-x": "^0.2.0",
+ "tinyglobby": "^0.2.14",
+ "unrs-resolver": "^1.7.11"
},
"engines": {
- "node": ">=4"
+ "node": "^16.17.0 || >=18.6.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-import-resolver-typescript"
},
"peerDependencies": {
- "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+ "eslint": "*",
+ "eslint-plugin-import": "*",
+ "eslint-plugin-import-x": "*"
+ },
+ "peerDependenciesMeta": {
+ "eslint-plugin-import": {
+ "optional": true
+ },
+ "eslint-plugin-import-x": {
+ "optional": true
+ }
}
},
- "node_modules/eslint-plugin-import/node_modules/debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "node_modules/eslint-plugin-import-x": {
+ "version": "4.16.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.16.1.tgz",
+ "integrity": "sha512-vPZZsiOKaBAIATpFE2uMI4w5IRwdv/FpQ+qZZMR4E+PeOcM4OeoEbqxRMnywdxP19TyB/3h6QBB0EWon7letSQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "ms": "^2.1.1"
- }
- },
- "node_modules/eslint-plugin-import/node_modules/doctrine": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
- "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
- "dev": true,
- "dependencies": {
- "esutils": "^2.0.2"
+ "@typescript-eslint/types": "^8.35.0",
+ "comment-parser": "^1.4.1",
+ "debug": "^4.4.1",
+ "eslint-import-context": "^0.1.9",
+ "is-glob": "^4.0.3",
+ "minimatch": "^9.0.3 || ^10.0.1",
+ "semver": "^7.7.2",
+ "stable-hash-x": "^0.2.0",
+ "unrs-resolver": "^1.9.2"
},
"engines": {
- "node": ">=0.10.0"
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-plugin-import-x"
+ },
+ "peerDependencies": {
+ "@typescript-eslint/utils": "^8.0.0",
+ "eslint": "^8.57.0 || ^9.0.0",
+ "eslint-import-resolver-node": "*"
+ },
+ "peerDependenciesMeta": {
+ "@typescript-eslint/utils": {
+ "optional": true
+ },
+ "eslint-import-resolver-node": {
+ "optional": true
+ }
}
},
- "node_modules/eslint-plugin-import/node_modules/semver": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
- "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "node_modules/eslint-plugin-import-x/node_modules/balanced-match": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+ "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
"dev": true,
- "bin": {
- "semver": "bin/semver.js"
+ "license": "MIT",
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/eslint-plugin-import-x/node_modules/brace-expansion": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
+ "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^4.0.2"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/eslint-plugin-import-x/node_modules/minimatch": {
+ "version": "10.2.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+ "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+ "dev": true,
+ "license": "BlueOak-1.0.0",
+ "dependencies": {
+ "brace-expansion": "^5.0.2"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/eslint-plugin-jsx-a11y": {
@@ -9309,6 +9620,22 @@
"semver": "bin/semver.js"
}
},
+ "node_modules/eslint-plugin-unused-imports": {
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.4.1.tgz",
+ "integrity": "sha512-oZGYUz1X3sRMGUB+0cZyK2VcvRX5lm/vB56PgNNcU+7ficUCKm66oZWKUubXWnOuPjQ8PvmXtCViXBMONPe7tQ==",
+ "dev": true,
+ "license": "MIT",
+ "peerDependencies": {
+ "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
+ "eslint": "^10.0.0 || ^9.0.0 || ^8.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@typescript-eslint/eslint-plugin": {
+ "optional": true
+ }
+ }
+ },
"node_modules/eslint-scope": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
@@ -9909,6 +10236,19 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/get-tsconfig": {
+ "version": "4.13.6",
+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.6.tgz",
+ "integrity": "sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "resolve-pkg-maps": "^1.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+ }
+ },
"node_modules/glob": {
"version": "11.1.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
@@ -10499,6 +10839,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/is-bun-module": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-2.0.0.tgz",
+ "integrity": "sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "semver": "^7.7.1"
+ }
+ },
"node_modules/is-callable": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -11172,13 +11522,15 @@
"version": "0.3.23",
"resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
"integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==",
- "dev": true
+ "dev": true,
+ "license": "CC0-1.0"
},
"node_modules/language-tags": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
"integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"language-subtag-registry": "^0.3.20"
},
@@ -11550,6 +11902,22 @@
"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
}
},
+ "node_modules/napi-postinstall": {
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz",
+ "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "napi-postinstall": "lib/cli.js"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/napi-postinstall"
+ }
+ },
"node_modules/natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -11692,20 +12060,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/object.groupby": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
- "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
- "dev": true,
- "dependencies": {
- "call-bind": "^1.0.7",
- "define-properties": "^1.2.1",
- "es-abstract": "^1.23.2"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
"node_modules/object.values": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
@@ -12596,6 +12950,16 @@
"node": ">=4"
}
},
+ "node_modules/resolve-pkg-maps": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+ "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+ }
+ },
"node_modules/reusify": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
@@ -13134,6 +13498,16 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/stable-hash-x": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/stable-hash-x/-/stable-hash-x-0.2.0.tgz",
+ "integrity": "sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/stop-iteration-iterator": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
@@ -13301,15 +13675,6 @@
"node": ">=8"
}
},
- "node_modules/strip-bom": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
- "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/strip-comments": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
@@ -13490,30 +13855,6 @@
"typescript": ">=4.8.4"
}
},
- "node_modules/tsconfig-paths": {
- "version": "3.15.0",
- "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
- "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
- "dev": true,
- "dependencies": {
- "@types/json5": "^0.0.29",
- "json5": "^1.0.2",
- "minimist": "^1.2.6",
- "strip-bom": "^3.0.0"
- }
- },
- "node_modules/tsconfig-paths/node_modules/json5": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
- "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
- "dev": true,
- "dependencies": {
- "minimist": "^1.2.0"
- },
- "bin": {
- "json5": "lib/cli.js"
- }
- },
"node_modules/tslib": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -13785,6 +14126,41 @@
"node": ">= 10.0.0"
}
},
+ "node_modules/unrs-resolver": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
+ "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "dependencies": {
+ "napi-postinstall": "^0.3.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/unrs-resolver"
+ },
+ "optionalDependencies": {
+ "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
+ "@unrs/resolver-binding-android-arm64": "1.11.1",
+ "@unrs/resolver-binding-darwin-arm64": "1.11.1",
+ "@unrs/resolver-binding-darwin-x64": "1.11.1",
+ "@unrs/resolver-binding-freebsd-x64": "1.11.1",
+ "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
+ "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
+ "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
+ "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
+ "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
+ "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
+ "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
+ "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
+ "@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
+ }
+ },
"node_modules/upath": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
diff --git a/package.json b/package.json
index 25f68e65..f9fa6f85 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
"name": "sable",
"version": "1.2.0",
"description": "Yet another matrix client fork",
- "main": "index.js",
"type": "module",
"packageManager": "npm@11.11.0",
"engines": {
@@ -10,13 +9,13 @@
"npm": "11.x"
},
"scripts": {
- "start": "vite",
+ "dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
- "lint": "npm run check:eslint && npm run check:prettier",
- "check:eslint": "eslint src/*",
- "check:prettier": "prettier --check .",
- "fix:prettier": "prettier --write .",
+ "lint": "eslint .",
+ "lint:fix": "eslint . --fix",
+ "fmt": "prettier --write .",
+ "fmt:check": "prettier --check .",
"typecheck": "tsc",
"knip": "knip"
},
@@ -42,7 +41,6 @@
"browser-encrypt-attachment": "^0.3.0",
"chroma-js": "^3.2.0",
"classnames": "^2.5.1",
- "dateformat": "^5.0.3",
"dayjs": "^1.11.19",
"domhandler": "^5.0.3",
"emojibase": "^15.3.1",
@@ -86,8 +84,8 @@
"devDependencies": {
"@element-hq/element-call-embedded": "0.16.3",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+ "@eslint/compat": "2.0.2",
"@eslint/css": "^0.14.1",
- "@eslint/eslintrc": "^3.3.4",
"@eslint/js": "^9.39.3",
"@rollup/plugin-inject": "^5.0.5",
"@rollup/plugin-wasm": "^6.2.2",
@@ -105,10 +103,12 @@
"buffer": "^6.0.3",
"eslint": "^9.39.3",
"eslint-config-prettier": "^10.1.8",
- "eslint-plugin-import": "^2.32.0",
- "eslint-plugin-jsx-a11y": "^6.10.2",
+ "eslint-import-resolver-typescript": "4.4.4",
+ "eslint-plugin-import-x": "4.16.1",
+ "eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.0.1",
+ "eslint-plugin-unused-imports": "4.4.1",
"knip": "5.85.0",
"prettier": "^3.8.1",
"typescript": "^5.9.3",
diff --git a/src/app/components/CapabilitiesLoader.tsx b/src/app/components/CapabilitiesLoader.tsx
deleted file mode 100644
index 2152b572..00000000
--- a/src/app/components/CapabilitiesLoader.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ReactNode, useCallback, useEffect } from 'react';
-import { Capabilities } from '$types/matrix-sdk';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-
-type CapabilitiesLoaderProps = {
- children: (capabilities: Capabilities | undefined) => ReactNode;
-};
-export function CapabilitiesLoader({ children }: CapabilitiesLoaderProps) {
- const mx = useMatrixClient();
-
- const [state, load] = useAsyncCallback(useCallback(() => mx.getCapabilities(), [mx]));
-
- useEffect(() => {
- load();
- }, [load]);
-
- return children(state.status === AsyncStatus.Success ? state.data : undefined);
-}
diff --git a/src/app/components/MediaConfigLoader.tsx b/src/app/components/MediaConfigLoader.tsx
deleted file mode 100644
index 9fd99330..00000000
--- a/src/app/components/MediaConfigLoader.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ReactNode, useCallback, useEffect } from 'react';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { MediaConfig } from '../hooks/useMediaConfig';
-
-type MediaConfigLoaderProps = {
- children: (mediaConfig: MediaConfig | undefined) => ReactNode;
-};
-export function MediaConfigLoader({ children }: MediaConfigLoaderProps) {
- const mx = useMatrixClient();
-
- const [state, load] = useAsyncCallback(useCallback(() => mx.getMediaConfig(), [mx]));
-
- useEffect(() => {
- load();
- }, [load]);
-
- return children(state.status === AsyncStatus.Success ? state.data : undefined);
-}
diff --git a/src/app/components/SpaceChildDirectsProvider.tsx b/src/app/components/SpaceChildDirectsProvider.tsx
deleted file mode 100644
index 8ec88614..00000000
--- a/src/app/components/SpaceChildDirectsProvider.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ReactNode } from 'react';
-import { RoomToParents } from '$types/matrix/room';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { allRoomsAtom } from '../state/room-list/roomList';
-import { useChildDirectScopeFactory, useSpaceChildren } from '../state/hooks/roomList';
-
-type SpaceChildDirectsProviderProps = {
- spaceId: string;
- mDirects: Set;
- roomToParents: RoomToParents;
- children: (rooms: string[]) => ReactNode;
-};
-export function SpaceChildDirectsProvider({
- spaceId,
- roomToParents,
- mDirects,
- children,
-}: SpaceChildDirectsProviderProps) {
- const mx = useMatrixClient();
-
- const childDirects = useSpaceChildren(
- allRoomsAtom,
- spaceId,
- useChildDirectScopeFactory(mx, mDirects, roomToParents)
- );
-
- return children(childDirects);
-}
diff --git a/src/app/components/SpaceChildRoomsProvider.tsx b/src/app/components/SpaceChildRoomsProvider.tsx
deleted file mode 100644
index d7ce387b..00000000
--- a/src/app/components/SpaceChildRoomsProvider.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ReactNode } from 'react';
-import { RoomToParents } from '$types/matrix/room';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { allRoomsAtom } from '../state/room-list/roomList';
-import { useChildRoomScopeFactory, useSpaceChildren } from '../state/hooks/roomList';
-
-type SpaceChildRoomsProviderProps = {
- spaceId: string;
- mDirects: Set;
- roomToParents: RoomToParents;
- children: (rooms: string[]) => ReactNode;
-};
-export function SpaceChildRoomsProvider({
- spaceId,
- roomToParents,
- mDirects,
- children,
-}: SpaceChildRoomsProviderProps) {
- const mx = useMatrixClient();
-
- const childRooms = useSpaceChildren(
- allRoomsAtom,
- spaceId,
- useChildRoomScopeFactory(mx, mDirects, roomToParents)
- );
-
- return children(childRooms);
-}
diff --git a/src/app/components/editor/Editor.preview.tsx b/src/app/components/editor/Editor.preview.tsx
deleted file mode 100644
index 6dc2795d..00000000
--- a/src/app/components/editor/Editor.preview.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import React, { useState } from 'react';
-import FocusTrap from 'focus-trap-react';
-import {
- config,
- Icon,
- IconButton,
- Icons,
- Line,
- Modal,
- Overlay,
- OverlayBackdrop,
- OverlayCenter,
-} from 'folds';
-
-import { CustomEditor, useEditor } from './Editor';
-import { Toolbar } from './Toolbar';
-import { stopPropagation } from '$appUtils/keyboard';
-
-export function EditorPreview() {
- const [open, setOpen] = useState(false);
- const editor = useEditor();
- const [toolbar, setToolbar] = useState(false);
-
- return (
- <>
- setOpen(!open)}>
-
-
- }>
-
- setOpen(false),
- clickOutsideDeactivates: true,
- escapeDeactivates: stopPropagation,
- }}
- >
-
-
-
-
-
- }
- after={
- <>
- setToolbar(!toolbar)}
- aria-pressed={toolbar}
- >
-
-
-
-
-
-
-
-
- >
- }
- bottom={
- toolbar && (
-
-
-
-
- )
- }
- />
-
-
-
-
-
- >
- );
-}
diff --git a/src/app/features/space-settings/styles.css.ts b/src/app/features/space-settings/styles.css.ts
deleted file mode 100644
index ce89c16e..00000000
--- a/src/app/features/space-settings/styles.css.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { style } from '@vanilla-extract/css';
-import { config } from 'folds';
-
-export const SequenceCardStyle = style({
- padding: config.space.S300,
-});
diff --git a/src/app/hooks/useDisplayName.ts b/src/app/hooks/useDisplayName.ts
deleted file mode 100644
index 87c35f2b..00000000
--- a/src/app/hooks/useDisplayName.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useAtomValue } from 'jotai';
-import type { Room } from '$types/matrix-sdk';
-import { nicknamesAtom } from '../state/nicknames';
-import { getMemberDisplayName } from '../utils/room';
-import { getMxIdLocalPart } from '../utils/matrix';
-
-/**
- * Returns the display name for a user, preferring any locally-set nickname,
- * then the room member display name, then the local part of the MXID.
- */
-export const useDisplayName = (userId: string, room?: Room): string => {
- const nicknames = useAtomValue(nicknamesAtom);
- if (room) {
- return getMemberDisplayName(room, userId, nicknames) ?? getMxIdLocalPart(userId) ?? userId;
- }
- return nicknames[userId] ?? getMxIdLocalPart(userId) ?? userId;
-};
diff --git a/src/app/hooks/useForceUpdate.js b/src/app/hooks/useForceUpdate.js
deleted file mode 100644
index 2244c529..00000000
--- a/src/app/hooks/useForceUpdate.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import { useState } from 'react';
-
-export function useForceUpdate() {
- const [data, setData] = useState(null);
-
- return [
- data,
- function forceUpdateHook() {
- setData({});
- },
- ];
-}
diff --git a/src/app/hooks/useUserTrustStatusChange.ts b/src/app/hooks/useUserTrustStatusChange.ts
deleted file mode 100644
index 546f2203..00000000
--- a/src/app/hooks/useUserTrustStatusChange.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { CryptoEvent, CryptoEventHandlerMap } from '$types/matrix-sdk';
-import { useEffect } from 'react';
-import { useMatrixClient } from './useMatrixClient';
-
-export const useUserTrustStatusChange = (
- onChange: CryptoEventHandlerMap[CryptoEvent.UserTrustStatusChanged]
-) => {
- const mx = useMatrixClient();
-
- useEffect(() => {
- mx.on(CryptoEvent.UserTrustStatusChanged, onChange);
- return () => {
- mx.removeListener(CryptoEvent.UserTrustStatusChanged, onChange);
- };
- }, [mx, onChange]);
-};
diff --git a/src/app/pages/client/sidebar/SettingsTab.tsx b/src/app/pages/client/sidebar/SettingsTab.tsx
deleted file mode 100644
index 8e495d2e..00000000
--- a/src/app/pages/client/sidebar/SettingsTab.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React, { useState } from 'react';
-import { Text } from 'folds';
-import { SidebarItem, SidebarItemTooltip, SidebarAvatar } from '$components/sidebar';
-import { UserAvatar } from '$components/user-avatar';
-import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
-import { nameInitials } from '$appUtils/common';
-import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { Settings } from '$features/settings';
-import { useUserProfile } from '$hooks/useUserProfile';
-import { Modal500 } from '$components/Modal500';
-
-export function SettingsTab() {
- const mx = useMatrixClient();
- const useAuthentication = useMediaAuthentication();
- const userId = mx.getUserId()!;
- const profile = useUserProfile(userId);
-
- const [settings, setSettings] = useState(false);
-
- const displayName = profile.displayName ?? getMxIdLocalPart(userId) ?? userId;
- const avatarUrl = profile.avatarUrl
- ? (mxcUrlToHttp(mx, profile.avatarUrl, useAuthentication, 96, 96, 'crop') ?? undefined)
- : undefined;
-
- const openSettings = () => setSettings(true);
- const closeSettings = () => setSettings(false);
-
- return (
-
-
- {(triggerRef) => (
-
- {nameInitials(displayName)}}
- />
-
- )}
-
- {settings && (
-
-
-
- )}
-
- );
-}
diff --git a/src/app/state/hooks/inviteList.ts b/src/app/state/hooks/inviteList.ts
deleted file mode 100644
index 54729396..00000000
--- a/src/app/state/hooks/inviteList.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useAtomValue } from 'jotai';
-import { selectAtom } from 'jotai/utils';
-import { MatrixClient } from '$types/matrix-sdk';
-import { useCallback } from 'react';
-import { isDirectInvite, isRoom, isSpace, isUnsupportedRoom } from '$appUtils/room';
-import { compareRoomsEqual } from '../room-list/utils';
-import { allInvitesAtom } from '../room-list/inviteList';
-
-export const useSpaceInvites = (mx: MatrixClient, invitesAtom: typeof allInvitesAtom) => {
- const selector = useCallback(
- (rooms: string[]) => rooms.filter((roomId) => isSpace(mx.getRoom(roomId))),
- [mx]
- );
- return useAtomValue(selectAtom(invitesAtom, selector, compareRoomsEqual));
-};
-
-export const useRoomInvites = (
- mx: MatrixClient,
- invitesAtom: typeof allInvitesAtom,
- mDirects: Set
-) => {
- const selector = useCallback(
- (rooms: string[]) =>
- rooms.filter(
- (roomId) =>
- isRoom(mx.getRoom(roomId)) &&
- !(mDirects.has(roomId) || isDirectInvite(mx.getRoom(roomId), mx.getUserId()))
- ),
- [mx, mDirects]
- );
- return useAtomValue(selectAtom(invitesAtom, selector, compareRoomsEqual));
-};
-
-export const useDirectInvites = (
- mx: MatrixClient,
- invitesAtom: typeof allInvitesAtom,
- mDirects: Set
-) => {
- const selector = useCallback(
- (rooms: string[]) =>
- rooms.filter(
- (roomId) => mDirects.has(roomId) || isDirectInvite(mx.getRoom(roomId), mx.getUserId())
- ),
- [mx, mDirects]
- );
- return useAtomValue(selectAtom(invitesAtom, selector, compareRoomsEqual));
-};
-
-export const useUnsupportedInvites = (mx: MatrixClient, invitesAtom: typeof allInvitesAtom) => {
- const selector = useCallback(
- (rooms: string[]) => rooms.filter((roomId) => isUnsupportedRoom(mx.getRoom(roomId))),
- [mx]
- );
- return useAtomValue(selectAtom(invitesAtom, selector, compareRoomsEqual));
-};
diff --git a/src/app/utils/disposable.ts b/src/app/utils/disposable.ts
deleted file mode 100644
index 0982adaa..00000000
--- a/src/app/utils/disposable.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export type DisposeCallback = (
- ...args: DisposeArgs
-) => DisposeReturn;
-export type DisposableContext<
- DisposableArgs extends unknown[] = [],
- DisposeArgs extends unknown[] = [],
- DisposeReturn = void,
-> = (...args: DisposableArgs) => DisposeCallback;
-
-export const disposable = <
- DisposableArgs extends unknown[],
- DisposeArgs extends unknown[] = [],
- DisposeReturn = void,
->(
- context: DisposableContext
-) => context;
diff --git a/src/index.tsx b/src/index.tsx
index d5bbd8e2..8c132b07 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { createRoot } from 'react-dom/client';
import { enableMapSet } from 'immer';
import '@fontsource-variable/nunito';
diff --git a/src/types/utils.ts b/src/types/utils.ts
deleted file mode 100644
index 353ace6e..00000000
--- a/src/types/utils.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export type WithRequiredProp = Type & {
- [Property in Key]-?: Type[Property];
-};
diff --git a/tsconfig.json b/tsconfig.json
index 1372cc8a..d98b4a1d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"sourceMap": true,
- "jsx": "react",
+ "jsx": "react-jsx",
"target": "ES2022",
"module": "ES2022",
"allowJs": true,
From 5770ca1c14c9aab17af1a6e6094dd8843ec5b067 Mon Sep 17 00:00:00 2001
From: hazre
Date: Fri, 27 Feb 2026 10:53:19 +0100
Subject: [PATCH 03/59] chore(lint): drop obsolete React imports
---
src/app/components/AccountDataEditor.tsx | 2 +-
src/app/components/ActionUIA.tsx | 2 +-
src/app/components/BackupRestore.tsx | 2 +-
src/app/components/BetaNoticeBadge.tsx | 1 -
src/app/components/DeviceVerification.tsx | 7 +++----
.../components/DeviceVerificationSetup.tsx | 2 +-
src/app/components/HexColorPickerPopOut.tsx | 2 +-
src/app/components/JoinRulesSwitcher.tsx | 2 +-
src/app/components/LogoutDialog.tsx | 2 +-
src/app/components/ManualVerification.tsx | 2 +-
src/app/components/MemberSortMenu.tsx | 1 -
src/app/components/MembershipFilterMenu.tsx | 1 -
src/app/components/Modal500.tsx | 2 +-
src/app/components/Pdf-viewer/PdfViewer.tsx | 6 +++---
.../components/RoomNotificationSwitcher.tsx | 2 +-
src/app/components/RoomSummaryLoader.tsx | 3 +--
src/app/components/SecretStorage.tsx | 2 +-
src/app/components/SwipeableChatWrapper.tsx | 2 +-
.../components/SwipeableOverlayWrapper.tsx | 2 +-
src/app/components/UIAFlowOverlay.tsx | 2 +-
.../components/UserRoomProfileRenderer.tsx | 1 -
.../create-room/AdditionalCreatorInput.tsx | 2 +-
.../create-room/CreateRoomAccessSelector.tsx | 1 -
.../create-room/CreateRoomAliasInput.tsx | 2 +-
.../create-room/CreateRoomTypeSelector.tsx | 1 -
.../create-room/RoomVersionSelector.tsx | 2 +-
src/app/components/create-room/utils.ts | 3 +--
src/app/components/cutout-card/CutoutCard.tsx | 1 -
src/app/components/editor/Editor.tsx | 4 ++--
src/app/components/editor/Elements.tsx | 1 -
src/app/components/editor/Toolbar.tsx | 2 +-
.../editor/autocomplete/AutocompleteMenu.tsx | 2 +-
.../autocomplete/EmoticonAutocomplete.tsx | 2 +-
.../autocomplete/RoomMentionAutocomplete.tsx | 2 +-
.../autocomplete/UserMentionAutocomplete.tsx | 4 ++--
src/app/components/editor/output.ts | 2 +-
src/app/components/editor/utils.ts | 4 ++--
src/app/components/emoji-board/EmojiBoard.tsx | 2 +-
.../emoji-board/components/Group.tsx | 2 +-
.../emoji-board/components/Item.tsx | 1 -
.../emoji-board/components/Layout.tsx | 2 +-
.../emoji-board/components/NoStickerPacks.tsx | 1 -
.../emoji-board/components/Preview.tsx | 1 -
.../emoji-board/components/SearchInput.tsx | 2 +-
.../emoji-board/components/Sidebar.tsx | 2 +-
.../emoji-board/components/Tabs.tsx | 2 +-
.../components/event-readers/EventReaders.tsx | 1 -
.../components/image-editor/ImageEditor.tsx | 1 -
.../image-pack-view/ImagePackContent.tsx | 2 +-
.../image-pack-view/ImagePackView.tsx | 1 -
.../components/image-pack-view/ImageTile.tsx | 2 +-
.../components/image-pack-view/PackMeta.tsx | 2 +-
.../image-pack-view/RoomImagePack.tsx | 2 +-
.../image-pack-view/UsageSwitcher.tsx | 2 +-
.../image-pack-view/UserImagePack.tsx | 2 +-
.../components/image-viewer/ImageViewer.tsx | 4 ++--
src/app/components/info-card/InfoCard.tsx | 2 +-
.../invite-user-prompt/InviteUserPrompt.tsx | 2 +-
.../join-address-prompt/JoinAddressPrompt.tsx | 2 +-
.../leave-room-prompt/LeaveRoomPrompt.tsx | 2 +-
.../leave-space-prompt/LeaveSpacePrompt.tsx | 2 +-
src/app/components/media/Image.tsx | 2 +-
src/app/components/media/MediaControls.tsx | 2 +-
src/app/components/media/Video.tsx | 2 +-
src/app/components/member-tile/MemberTile.tsx | 2 +-
src/app/components/message/FileHeader.tsx | 2 +-
.../components/message/MsgTypeRenderers.tsx | 2 +-
src/app/components/message/Reaction.tsx | 1 -
src/app/components/message/RenderBody.tsx | 1 -
src/app/components/message/Reply.tsx | 6 +++---
.../message/attachment/Attachment.tsx | 1 -
.../message/content/AudioContent.tsx | 2 +-
.../message/content/EventContent.tsx | 2 +-
.../message/content/FallbackContent.tsx | 1 -
.../message/content/FileContent.tsx | 2 +-
.../message/content/ImageContent.tsx | 2 +-
.../message/content/VideoContent.tsx | 2 +-
src/app/components/message/layout/Base.tsx | 1 -
src/app/components/message/layout/Bubble.tsx | 2 +-
src/app/components/message/layout/Compact.tsx | 2 +-
src/app/components/message/layout/Modern.tsx | 2 +-
.../message/modals/GlobalModalManager.tsx | 1 -
.../message/modals/MessageReactions.tsx | 3 +--
.../placeholder/CompactPlaceholder.tsx | 2 +-
.../placeholder/DefaultPlaceholder.tsx | 2 +-
.../message/placeholder/LinePlaceholder.tsx | 1 -
src/app/components/nav/NavCategory.tsx | 2 +-
src/app/components/nav/NavCategoryHeader.tsx | 2 +-
src/app/components/nav/NavEmptyLayout.tsx | 2 +-
src/app/components/nav/NavItem.tsx | 2 +-
src/app/components/nav/NavItemContent.tsx | 2 +-
src/app/components/nav/NavItemOptions.tsx | 2 +-
src/app/components/page/Page.tsx | 2 +-
.../password-input/PasswordInput.tsx | 2 +-
src/app/components/power/PowerColorBadge.tsx | 1 -
src/app/components/power/PowerIcon.tsx | 1 -
src/app/components/power/PowerSelector.tsx | 2 +-
src/app/components/presence/Presence.tsx | 2 +-
src/app/components/room-avatar/RoomAvatar.tsx | 2 +-
src/app/components/room-card/RoomCard.tsx | 2 +-
src/app/components/room-intro/RoomIntro.tsx | 2 +-
.../room-topic-viewer/RoomTopicViewer.tsx | 1 -
.../ScrollTopContainer.tsx | 2 +-
.../components/sequence-card/SequenceCard.tsx | 2 +-
.../components/server-badge/ServerBadge.tsx | 1 -
.../components/setting-tile/SettingTile.tsx | 2 +-
src/app/components/sidebar/Sidebar.tsx | 1 -
src/app/components/sidebar/SidebarContent.tsx | 2 +-
src/app/components/sidebar/SidebarItem.tsx | 2 +-
src/app/components/sidebar/SidebarStack.tsx | 1 -
.../sidebar/SidebarStackSeparator.tsx | 1 -
.../components/splash-screen/SplashScreen.tsx | 2 +-
src/app/components/text-viewer/TextViewer.tsx | 4 ++--
src/app/components/time-date/DatePicker.tsx | 2 +-
src/app/components/time-date/PickerColumn.tsx | 2 +-
src/app/components/time-date/TimePicker.tsx | 2 +-
.../typing-indicator/TypingIndicator.tsx | 1 -
src/app/components/uia-stages/DummyStage.tsx | 2 +-
src/app/components/uia-stages/EmailStage.tsx | 2 +-
.../components/uia-stages/PasswordStage.tsx | 2 +-
.../components/uia-stages/ReCaptchaStage.tsx | 1 -
.../uia-stages/RegistrationTokenStage.tsx | 2 +-
src/app/components/uia-stages/SSOStage.tsx | 2 +-
src/app/components/uia-stages/TermsStage.tsx | 2 +-
.../components/unread-badge/UnreadBadge.tsx | 2 +-
.../components/upload-board/UploadBoard.tsx | 4 ++--
.../upload-card/CompactUploadCardRenderer.tsx | 2 +-
src/app/components/upload-card/UploadCard.tsx | 2 +-
.../upload-card/UploadCardRenderer.tsx | 2 +-
src/app/components/url-preview/UrlPreview.tsx | 1 -
.../components/url-preview/UrlPreviewCard.tsx | 5 +----
src/app/components/user-avatar/UserAvatar.tsx | 2 +-
.../components/user-profile/CreatorChip.tsx | 2 +-
src/app/components/user-profile/PowerChip.tsx | 2 +-
src/app/components/user-profile/UserChips.tsx | 2 +-
src/app/components/user-profile/UserHero.tsx | 2 +-
.../user-profile/UserModeration.tsx | 2 +-
.../components/virtualizer/VirtualTile.tsx | 1 -
src/app/features/add-existing/AddExisting.tsx | 2 +-
src/app/features/call/CallViewUser.tsx | 3 +--
src/app/features/call/SmallWidget.ts | 6 +++---
src/app/features/call/SmallWidgetDriver.ts | 18 ++++++++---------
.../common-settings/cosmetics/Cosmetics.tsx | 2 +-
.../developer-tools/DevelopTools.tsx | 2 +-
.../developer-tools/SendRoomEvent.tsx | 2 +-
.../developer-tools/StateEventEditor.tsx | 2 +-
.../emojis-stickers/EmojisStickers.tsx | 2 +-
.../emojis-stickers/RoomPacks.tsx | 4 ++--
.../common-settings/general/RoomAddress.tsx | 4 ++--
.../general/RoomEncryption.tsx | 2 +-
.../general/RoomHistoryVisibility.tsx | 5 ++---
.../common-settings/general/RoomJoinRules.tsx | 5 ++---
.../common-settings/general/RoomProfile.tsx | 2 +-
.../common-settings/general/RoomPublish.tsx | 4 +---
.../common-settings/general/RoomUpgrade.tsx | 5 ++---
.../common-settings/members/Members.tsx | 2 +-
.../permissions/PermissionGroups.tsx | 4 ++--
.../common-settings/permissions/Powers.tsx | 4 ++--
.../permissions/PowersEditor.tsx | 2 +-
src/app/features/create-chat/CreateChat.tsx | 2 +-
src/app/features/create-room/CreateRoom.tsx | 2 +-
.../features/create-room/CreateRoomModal.tsx | 1 -
src/app/features/create-space/CreateSpace.tsx | 2 +-
.../create-space/CreateSpaceModal.tsx | 1 -
.../JoinBeforeNavigate.tsx | 1 -
src/app/features/lobby/DnD.tsx | 2 +-
src/app/features/lobby/HierarchyItemMenu.tsx | 2 +-
src/app/features/lobby/Lobby.tsx | 8 +++-----
src/app/features/lobby/LobbyHeader.tsx | 2 +-
src/app/features/lobby/LobbyHero.tsx | 1 -
src/app/features/lobby/RoomItem.tsx | 5 ++---
src/app/features/lobby/SpaceHierarchy.tsx | 5 ++---
src/app/features/lobby/SpaceItem.tsx | 5 ++---
.../features/message-search/MessageSearch.tsx | 2 +-
.../features/message-search/SearchFilters.tsx | 2 +-
.../features/message-search/SearchInput.tsx | 2 +-
.../message-search/SearchResultGroup.tsx | 4 ++--
.../features/room-nav/RoomCallNavStatus.tsx | 1 -
.../room-nav/RoomNavCategoryButton.tsx | 1 -
src/app/features/room-nav/RoomNavItem.tsx | 2 +-
src/app/features/room-nav/RoomNavUser.tsx | 3 +--
.../features/room-settings/RoomSettings.tsx | 3 +--
.../room-settings/RoomSettingsRenderer.tsx | 1 -
.../room-settings/general/General.tsx | 1 -
.../room-settings/permissions/Permissions.tsx | 2 +-
src/app/features/room/CommandAutocomplete.tsx | 2 +-
src/app/features/room/MembersDrawer.tsx | 2 +-
src/app/features/room/Room.tsx | 2 +-
src/app/features/room/RoomInput.tsx | 9 +--------
.../features/room/RoomInputPlaceholder.tsx | 2 +-
src/app/features/room/RoomTimeline.tsx | 8 ++------
src/app/features/room/RoomTombstone.tsx | 2 +-
src/app/features/room/RoomView.tsx | 2 +-
src/app/features/room/RoomViewFollowing.tsx | 2 +-
src/app/features/room/RoomViewHeader.tsx | 2 +-
src/app/features/room/RoomViewTyping.tsx | 1 -
.../features/room/jump-to-time/JumpToTime.tsx | 2 +-
.../room/message/EncryptedContent.tsx | 2 +-
src/app/features/room/message/Message.tsx | 10 ++--------
.../features/room/message/MessageEditor.tsx | 2 +-
src/app/features/room/message/Reactions.tsx | 2 +-
.../room/reaction-viewer/ReactionViewer.tsx | 5 ++---
.../room/room-pin-menu/RoomPinMenu.tsx | 7 +++----
src/app/features/search/Search.tsx | 2 +-
src/app/features/settings/Settings.tsx | 2 +-
src/app/features/settings/about/About.tsx | 1 -
src/app/features/settings/account/Account.tsx | 1 -
.../features/settings/account/BioEditor.tsx | 2 +-
.../features/settings/account/ContactInfo.tsx | 2 +-
.../settings/account/IgnoredUserList.tsx | 2 +-
.../features/settings/account/MatrixId.tsx | 1 -
.../settings/account/NameColorEditor.tsx | 2 +-
src/app/features/settings/account/Profile.tsx | 2 +-
.../settings/account/PronounEditor.tsx | 2 +-
.../settings/account/TimezoneEditor.tsx | 2 +-
.../features/settings/cosmetics/Cosmetics.tsx | 2 +-
.../features/settings/cosmetics/Themes.tsx | 2 +-
.../settings/developer-tools/AccountData.tsx | 6 +++---
.../settings/developer-tools/DevelopTools.tsx | 2 +-
.../features/settings/devices/DeviceTile.tsx | 5 ++---
src/app/features/settings/devices/Devices.tsx | 1 -
.../features/settings/devices/LocalBackup.tsx | 2 +-
.../settings/devices/OtherDevices.tsx | 2 +-
.../settings/devices/Verification.tsx | 2 +-
.../emojis-stickers/EmojisStickers.tsx | 2 +-
.../settings/emojis-stickers/GlobalPacks.tsx | 2 +-
.../settings/emojis-stickers/UserPack.tsx | 1 -
src/app/features/settings/general/General.tsx | 2 +-
.../settings/notifications/AllMessages.tsx | 2 +-
.../notifications/KeywordMessages.tsx | 2 +-
.../NotificationModeSwitcher.tsx | 2 +-
.../settings/notifications/Notifications.tsx | 1 -
.../notifications/SpecialMessages.tsx | 2 +-
.../notifications/SystemNotification.tsx | 2 +-
.../features/space-settings/SpaceSettings.tsx | 2 +-
.../space-settings/SpaceSettingsRenderer.tsx | 1 -
.../space-settings/general/General.tsx | 1 -
.../permissions/Permissions.tsx | 2 +-
.../features/widgets/GenericWidgetDriver.ts | 2 +-
.../features/widgets/IntegrationManager.tsx | 2 +-
src/app/features/widgets/WidgetIframe.tsx | 4 ++--
src/app/features/widgets/WidgetsDrawer.tsx | 2 +-
src/app/hooks/useAuthFlows.ts | 3 +--
src/app/hooks/useCallMemberships.ts | 4 +---
src/app/hooks/useCommands.ts | 9 +++------
src/app/hooks/useDeviceList.ts | 3 +--
src/app/hooks/useMemberEventParser.tsx | 2 +-
src/app/hooks/useNickname.ts | 2 +-
src/app/hooks/usePowerLevels.ts | 20 +++++++++----------
src/app/hooks/useRoomAliases.ts | 3 +--
src/app/hooks/useRoomEvent.ts | 3 +--
src/app/hooks/useRoomLatestRenderedEvent.ts | 2 +-
src/app/hooks/useRoomMeta.ts | 3 +--
src/app/hooks/useRoomPinnedEvents.ts | 3 +--
src/app/hooks/useRoomWidgets.ts | 2 +-
src/app/hooks/useSessionProfiles.ts | 2 +-
src/app/hooks/useSpaceHierarchy.ts | 3 +--
src/app/hooks/useStateEvent.ts | 2 +-
src/app/hooks/useVirtualPaginator.ts | 4 ++--
src/app/pages/App.tsx | 1 -
src/app/pages/ConfigConfig.tsx | 1 -
src/app/pages/FeatureCheck.tsx | 2 +-
src/app/pages/Router.tsx | 1 -
src/app/pages/ThemeManager.tsx | 2 +-
src/app/pages/auth/AuthFooter.tsx | 1 -
src/app/pages/auth/AuthLayout.tsx | 2 +-
src/app/pages/auth/FiledError.tsx | 1 -
src/app/pages/auth/OrDivider.tsx | 1 -
src/app/pages/auth/SSOLogin.tsx | 2 +-
src/app/pages/auth/ServerPicker.tsx | 2 +-
src/app/pages/auth/login/Login.tsx | 2 +-
.../pages/auth/login/PasswordLoginForm.tsx | 2 +-
src/app/pages/auth/login/TokenLogin.tsx | 2 +-
.../auth/register/PasswordRegisterForm.tsx | 2 +-
src/app/pages/auth/register/Register.tsx | 2 +-
.../auth/reset-password/PasswordResetForm.tsx | 2 +-
.../auth/reset-password/ResetPassword.tsx | 2 +-
.../pages/client/BackgroundNotifications.tsx | 4 +---
.../pages/client/ClientInitStorageAtom.tsx | 2 +-
src/app/pages/client/ClientLayout.tsx | 2 +-
src/app/pages/client/ClientNonUIFeatures.tsx | 2 +-
.../ClientRoomsNotificationPreferences.tsx | 2 +-
src/app/pages/client/ClientRoot.tsx | 2 +-
src/app/pages/client/SidebarNav.tsx | 2 +-
src/app/pages/client/SpecVersions.tsx | 2 +-
src/app/pages/client/SyncStatus.tsx | 2 +-
src/app/pages/client/WelcomePage.tsx | 1 -
src/app/pages/client/call/CallProvider.tsx | 9 ++++-----
.../client/call/PersistentCallContainer.tsx | 2 +-
src/app/pages/client/create/Create.tsx | 1 -
src/app/pages/client/direct/Direct.tsx | 2 +-
src/app/pages/client/direct/DirectCreate.tsx | 2 +-
src/app/pages/client/direct/RoomProvider.tsx | 2 +-
src/app/pages/client/explore/Explore.tsx | 2 +-
src/app/pages/client/explore/Featured.tsx | 1 -
src/app/pages/client/explore/Server.tsx | 2 +-
src/app/pages/client/home/CreateRoom.tsx | 1 -
src/app/pages/client/home/Home.tsx | 2 +-
src/app/pages/client/home/RoomProvider.tsx | 2 +-
src/app/pages/client/home/Search.tsx | 2 +-
src/app/pages/client/inbox/Inbox.tsx | 1 -
src/app/pages/client/inbox/Invites.tsx | 5 ++---
src/app/pages/client/inbox/Notifications.tsx | 4 ++--
src/app/pages/client/sidebar/CreateTab.tsx | 2 +-
src/app/pages/client/sidebar/DirectTab.tsx | 2 +-
src/app/pages/client/sidebar/ExploreTab.tsx | 1 -
src/app/pages/client/sidebar/HomeTab.tsx | 2 +-
src/app/pages/client/sidebar/InboxTab.tsx | 1 -
src/app/pages/client/sidebar/SearchTab.tsx | 1 -
src/app/pages/client/sidebar/SpaceTabs.tsx | 2 +-
.../pages/client/sidebar/UnverifiedTab.tsx | 2 +-
src/app/pages/client/space/RoomProvider.tsx | 2 +-
src/app/pages/client/space/Search.tsx | 2 +-
src/app/pages/client/space/Space.tsx | 6 ++----
src/app/pages/client/space/SpaceProvider.tsx | 2 +-
src/app/plugins/custom-emoji/utils.ts | 6 ++----
src/app/plugins/react-custom-html-parser.tsx | 2 +-
src/app/plugins/react-prism/ReactPrism.tsx | 2 +-
src/app/state/modal.ts | 3 +--
src/app/state/room/roomToUnread.ts | 3 +--
src/app/utils/debug.ts | 2 +-
src/app/utils/matrix.ts | 4 ++--
src/app/utils/room.ts | 3 +--
src/types/matrix-sdk-events.d.ts | 3 +--
src/util/colorMXID.js | 4 ++--
src/util/cryptE2ERoomKeys.js | 2 +-
326 files changed, 328 insertions(+), 455 deletions(-)
diff --git a/src/app/components/AccountDataEditor.tsx b/src/app/components/AccountDataEditor.tsx
index 2e58bed9..0e424604 100644
--- a/src/app/components/AccountDataEditor.tsx
+++ b/src/app/components/AccountDataEditor.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/components/ActionUIA.tsx b/src/app/components/ActionUIA.tsx
index 10a16792..ab5a33db 100644
--- a/src/app/components/ActionUIA.tsx
+++ b/src/app/components/ActionUIA.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { AuthDict, AuthType, IAuthData, UIAFlow } from '$types/matrix-sdk';
import { getUIAFlowForStages } from '../utils/matrix-uia';
import { useSupportedUIAFlows, useUIACompleted, useUIAFlow } from '../hooks/useUIAFlows';
diff --git a/src/app/components/BackupRestore.tsx b/src/app/components/BackupRestore.tsx
index 0192af2f..f12d3ef9 100644
--- a/src/app/components/BackupRestore.tsx
+++ b/src/app/components/BackupRestore.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEventHandler, useCallback, useState } from 'react';
import { useAtom } from 'jotai';
import { CryptoApi, KeyBackupInfo } from '$types/matrix-sdk';
import {
diff --git a/src/app/components/BetaNoticeBadge.tsx b/src/app/components/BetaNoticeBadge.tsx
index d1859876..a6ba55e0 100644
--- a/src/app/components/BetaNoticeBadge.tsx
+++ b/src/app/components/BetaNoticeBadge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { TooltipProvider, Tooltip, Box, Text, Badge, toRem } from 'folds';
export function BetaNoticeBadge() {
diff --git a/src/app/components/DeviceVerification.tsx b/src/app/components/DeviceVerification.tsx
index 3267b72a..2d45391a 100644
--- a/src/app/components/DeviceVerification.tsx
+++ b/src/app/components/DeviceVerification.tsx
@@ -2,10 +2,9 @@ import {
ShowSasCallbacks,
VerificationPhase,
VerificationRequest,
- Verifier,
+ Verifier, VerificationMethod
} from '$types/matrix-sdk';
-import React, { CSSProperties, useCallback, useEffect, useState } from 'react';
-import { VerificationMethod } from '$types/matrix-sdk';
+import { CSSProperties, useCallback, useEffect, useState } from 'react';
import {
Box,
Button,
@@ -137,7 +136,7 @@ function CompareEmoji({ sasData }: { sasData: ShowSasCallbacks }) {
>
{sasData.sas.emoji?.map(([emoji, name], index) => (
{
};
export const resetEditorHistory = (editor: Editor) => {
- // eslint-disable-next-line no-param-reassign
+
editor.history = {
undos: [],
redos: [],
@@ -229,7 +229,7 @@ export const getPointUntilChar = (
reverse: options.reverse,
});
- // eslint-disable-next-line no-restricted-syntax
+
for (const point of pointItr) {
if (!Point.equals(point, cursorPoint) && prevPoint) {
char = Editor.string(editor, { anchor: point, focus: prevPoint });
diff --git a/src/app/components/emoji-board/EmojiBoard.tsx b/src/app/components/emoji-board/EmojiBoard.tsx
index e4a9ab11..09ebc925 100644
--- a/src/app/components/emoji-board/EmojiBoard.tsx
+++ b/src/app/components/emoji-board/EmojiBoard.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
FocusEventHandler,
MouseEventHandler,
diff --git a/src/app/components/emoji-board/components/Group.tsx b/src/app/components/emoji-board/components/Group.tsx
index cf19c6e0..293ac614 100644
--- a/src/app/components/emoji-board/components/Group.tsx
+++ b/src/app/components/emoji-board/components/Group.tsx
@@ -1,5 +1,5 @@
import { as, Box, Text } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/emoji-board/components/Item.tsx b/src/app/components/emoji-board/components/Item.tsx
index 56ea5d72..5039d657 100644
--- a/src/app/components/emoji-board/components/Item.tsx
+++ b/src/app/components/emoji-board/components/Item.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box } from 'folds';
import { MatrixClient } from '$types/matrix-sdk';
import { EmojiItemInfo, EmojiType } from '../types';
diff --git a/src/app/components/emoji-board/components/Layout.tsx b/src/app/components/emoji-board/components/Layout.tsx
index 392d4a31..28600689 100644
--- a/src/app/components/emoji-board/components/Layout.tsx
+++ b/src/app/components/emoji-board/components/Layout.tsx
@@ -1,5 +1,5 @@
import { as, Box, Line } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/emoji-board/components/NoStickerPacks.tsx b/src/app/components/emoji-board/components/NoStickerPacks.tsx
index 6703362c..9b46229a 100644
--- a/src/app/components/emoji-board/components/NoStickerPacks.tsx
+++ b/src/app/components/emoji-board/components/NoStickerPacks.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, toRem, config, Icons, Icon, Text } from 'folds';
export function NoStickerPacks() {
diff --git a/src/app/components/emoji-board/components/Preview.tsx b/src/app/components/emoji-board/components/Preview.tsx
index 2a75d4dc..b6fe436d 100644
--- a/src/app/components/emoji-board/components/Preview.tsx
+++ b/src/app/components/emoji-board/components/Preview.tsx
@@ -1,5 +1,4 @@
import { Box, Text } from 'folds';
-import React from 'react';
import { Atom, atom, useAtomValue } from 'jotai';
import * as css from './styles.css';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/emoji-board/components/SearchInput.tsx b/src/app/components/emoji-board/components/SearchInput.tsx
index 05074645..bf3ef608 100644
--- a/src/app/components/emoji-board/components/SearchInput.tsx
+++ b/src/app/components/emoji-board/components/SearchInput.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEventHandler, useRef } from 'react';
+import { ChangeEventHandler, useRef } from 'react';
import { Input, Chip, Icon, Icons, Text } from 'folds';
import { mobileOrTablet } from '$appUtils/user-agent';
diff --git a/src/app/components/emoji-board/components/Sidebar.tsx b/src/app/components/emoji-board/components/Sidebar.tsx
index de22b483..70bf8790 100644
--- a/src/app/components/emoji-board/components/Sidebar.tsx
+++ b/src/app/components/emoji-board/components/Sidebar.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import {
Box,
Scroll,
diff --git a/src/app/components/emoji-board/components/Tabs.tsx b/src/app/components/emoji-board/components/Tabs.tsx
index d433354f..fc3386d2 100644
--- a/src/app/components/emoji-board/components/Tabs.tsx
+++ b/src/app/components/emoji-board/components/Tabs.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties } from 'react';
+import { CSSProperties } from 'react';
import { Badge, Box, Text } from 'folds';
import { EmojiBoardTab } from '../types';
diff --git a/src/app/components/event-readers/EventReaders.tsx b/src/app/components/event-readers/EventReaders.tsx
index 201eafbb..cab82b8a 100644
--- a/src/app/components/event-readers/EventReaders.tsx
+++ b/src/app/components/event-readers/EventReaders.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import classNames from 'classnames';
import {
Avatar,
diff --git a/src/app/components/image-editor/ImageEditor.tsx b/src/app/components/image-editor/ImageEditor.tsx
index 1ec474e8..f937192e 100644
--- a/src/app/components/image-editor/ImageEditor.tsx
+++ b/src/app/components/image-editor/ImageEditor.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Text, as } from 'folds';
import * as css from './ImageEditor.css';
diff --git a/src/app/components/image-pack-view/ImagePackContent.tsx b/src/app/components/image-pack-view/ImagePackContent.tsx
index af6a1ee6..04eaf278 100644
--- a/src/app/components/image-pack-view/ImagePackContent.tsx
+++ b/src/app/components/image-pack-view/ImagePackContent.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
import { as, Box, Text, config, Button, Menu, Spinner } from 'folds';
import {
ImagePack,
diff --git a/src/app/components/image-pack-view/ImagePackView.tsx b/src/app/components/image-pack-view/ImagePackView.tsx
index e304d8b6..bf6d18bd 100644
--- a/src/app/components/image-pack-view/ImagePackView.tsx
+++ b/src/app/components/image-pack-view/ImagePackView.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, IconButton, Text, Icon, Icons, Scroll, Chip } from 'folds';
import { PackAddress } from '$plugins/custom-emoji';
import { Page, PageHeader, PageContent } from '../page';
diff --git a/src/app/components/image-pack-view/ImageTile.tsx b/src/app/components/image-pack-view/ImageTile.tsx
index bbaec005..38d7d258 100644
--- a/src/app/components/image-pack-view/ImageTile.tsx
+++ b/src/app/components/image-pack-view/ImageTile.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, ReactNode, useMemo, useState } from 'react';
+import { FormEventHandler, ReactNode, useMemo, useState } from 'react';
import { Badge, Box, Button, Chip, Icon, Icons, Input, Text } from 'folds';
import { UsageSwitcher, useUsageStr } from './UsageSwitcher';
import { mxcUrlToHttp } from '$appUtils/matrix';
diff --git a/src/app/components/image-pack-view/PackMeta.tsx b/src/app/components/image-pack-view/PackMeta.tsx
index fdf54794..c79dee92 100644
--- a/src/app/components/image-pack-view/PackMeta.tsx
+++ b/src/app/components/image-pack-view/PackMeta.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useMemo, useState } from 'react';
+import { FormEventHandler, useCallback, useMemo, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/components/image-pack-view/RoomImagePack.tsx b/src/app/components/image-pack-view/RoomImagePack.tsx
index d3c8ca4f..2082bb61 100644
--- a/src/app/components/image-pack-view/RoomImagePack.tsx
+++ b/src/app/components/image-pack-view/RoomImagePack.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { Room } from '$types/matrix-sdk';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/image-pack-view/UsageSwitcher.tsx b/src/app/components/image-pack-view/UsageSwitcher.tsx
index b8875f31..31d9fae3 100644
--- a/src/app/components/image-pack-view/UsageSwitcher.tsx
+++ b/src/app/components/image-pack-view/UsageSwitcher.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useMemo, useState } from 'react';
+import { MouseEventHandler, useMemo, useState } from 'react';
import { Box, Button, config, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
import FocusTrap from 'focus-trap-react';
import { ImageUsage } from '$plugins/custom-emoji';
diff --git a/src/app/components/image-pack-view/UserImagePack.tsx b/src/app/components/image-pack-view/UserImagePack.tsx
index 329c137d..0003ff5e 100644
--- a/src/app/components/image-pack-view/UserImagePack.tsx
+++ b/src/app/components/image-pack-view/UserImagePack.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { ImagePackContent } from './ImagePackContent';
import { ImagePack, PackContent } from '$plugins/custom-emoji';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/image-viewer/ImageViewer.tsx b/src/app/components/image-viewer/ImageViewer.tsx
index 4066bd6b..87d77556 100644
--- a/src/app/components/image-viewer/ImageViewer.tsx
+++ b/src/app/components/image-viewer/ImageViewer.tsx
@@ -1,5 +1,5 @@
-/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
-import React, { useEffect } from 'react';
+
+import React from 'react';
import FileSaver from 'file-saver';
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Text, as } from 'folds';
diff --git a/src/app/components/info-card/InfoCard.tsx b/src/app/components/info-card/InfoCard.tsx
index 6e4d8ecc..9db5f5f4 100644
--- a/src/app/components/info-card/InfoCard.tsx
+++ b/src/app/components/info-card/InfoCard.tsx
@@ -1,5 +1,5 @@
import { Box, ContainerColor, Text } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import { BreakWord } from '$styles/Text.css';
import { ContainerColor as ContainerClr } from '$styles/ContainerColor.css';
diff --git a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
index 2b9480ee..cdcee398 100644
--- a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
+++ b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
FormEventHandler,
KeyboardEventHandler,
diff --git a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
index ebdd1f67..dbf31778 100644
--- a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
+++ b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useState } from 'react';
+import { FormEventHandler, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Dialog,
diff --git a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
index 6a7e2868..a7cabfe9 100644
--- a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
+++ b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Dialog,
diff --git a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
index f70d4994..f7f674c4 100644
--- a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
+++ b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Dialog,
diff --git a/src/app/components/media/Image.tsx b/src/app/components/media/Image.tsx
index dda21a53..29990e99 100644
--- a/src/app/components/media/Image.tsx
+++ b/src/app/components/media/Image.tsx
@@ -1,4 +1,4 @@
-import React, { ImgHTMLAttributes, forwardRef } from 'react';
+import { ImgHTMLAttributes, forwardRef } from 'react';
import classNames from 'classnames';
import * as css from './media.css';
diff --git a/src/app/components/media/MediaControls.tsx b/src/app/components/media/MediaControls.tsx
index 95a344ab..2360b9f9 100644
--- a/src/app/components/media/MediaControls.tsx
+++ b/src/app/components/media/MediaControls.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, as } from 'folds';
export type MediaControlProps = {
diff --git a/src/app/components/media/Video.tsx b/src/app/components/media/Video.tsx
index 03108c32..307dc9e6 100644
--- a/src/app/components/media/Video.tsx
+++ b/src/app/components/media/Video.tsx
@@ -1,4 +1,4 @@
-import React, { VideoHTMLAttributes, forwardRef } from 'react';
+import { VideoHTMLAttributes, forwardRef } from 'react';
import classNames from 'classnames';
import * as css from './media.css';
diff --git a/src/app/components/member-tile/MemberTile.tsx b/src/app/components/member-tile/MemberTile.tsx
index 60725784..fa5252f4 100644
--- a/src/app/components/member-tile/MemberTile.tsx
+++ b/src/app/components/member-tile/MemberTile.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { as, Avatar, Box, Icon, Icons, Text } from 'folds';
import { MatrixClient, Room, RoomMember } from '$types/matrix-sdk';
import { getMemberDisplayName } from '$appUtils/room';
diff --git a/src/app/components/message/FileHeader.tsx b/src/app/components/message/FileHeader.tsx
index 2b85b2c7..f0d8273d 100644
--- a/src/app/components/message/FileHeader.tsx
+++ b/src/app/components/message/FileHeader.tsx
@@ -1,5 +1,5 @@
import { Badge, Box, Icon, IconButton, Icons, Spinner, Text, as, toRem } from 'folds';
-import React, { ReactNode, useCallback } from 'react';
+import { ReactNode, useCallback } from 'react';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import FileSaver from 'file-saver';
import { mimeTypeToExt } from '$appUtils/mimeTypes';
diff --git a/src/app/components/message/MsgTypeRenderers.tsx b/src/app/components/message/MsgTypeRenderers.tsx
index fc9acd6e..17dbbc6e 100644
--- a/src/app/components/message/MsgTypeRenderers.tsx
+++ b/src/app/components/message/MsgTypeRenderers.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties, ReactNode } from 'react';
+import { CSSProperties, ReactNode } from 'react';
import { Box, Chip, Icon, Icons, Text, toRem } from 'folds';
import { IContent } from '$types/matrix-sdk';
import { JUMBO_EMOJI_REG, URL_REG } from '$appUtils/regex';
diff --git a/src/app/components/message/Reaction.tsx b/src/app/components/message/Reaction.tsx
index d3b6be1c..9d7214ce 100644
--- a/src/app/components/message/Reaction.tsx
+++ b/src/app/components/message/Reaction.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, as } from 'folds';
import classNames from 'classnames';
import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
diff --git a/src/app/components/message/RenderBody.tsx b/src/app/components/message/RenderBody.tsx
index a67dc682..ff612757 100644
--- a/src/app/components/message/RenderBody.tsx
+++ b/src/app/components/message/RenderBody.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import parse, { HTMLReactParserOptions } from 'html-react-parser';
import Linkify from 'linkify-react';
import { Opts } from 'linkifyjs';
diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx
index 748f980c..074cc39c 100644
--- a/src/app/components/message/Reply.tsx
+++ b/src/app/components/message/Reply.tsx
@@ -1,6 +1,6 @@
import { Box, Icon, Icons, Text, as, color, toRem } from 'folds';
import { EventTimelineSet, Room } from '$types/matrix-sdk';
-import React, { MouseEventHandler, ReactNode, useCallback, useMemo } from 'react';
+import { MouseEventHandler, ReactNode, useCallback, useMemo } from 'react';
import classNames from 'classnames';
import parse from 'html-react-parser';
import { useAtomValue } from 'jotai';
@@ -81,7 +81,7 @@ export const Reply = as<'div', ReplyProps>(
const mx = useMatrixClient();
- // eslint-disable-next-line camelcase
+
const { body, formatted_body, format } = replyEvent?.getContent() ?? {};
const sender = replyEvent?.getSender();
@@ -97,7 +97,7 @@ export const Reply = as<'div', ReplyProps>(
const badEncryption = replyEvent?.getContent().msgtype === 'm.bad.encrypted';
let bodyJSX: ReactNode = fallbackBody;
- // eslint-disable-next-line camelcase
+
if (format === 'org.matrix.custom.html' && formatted_body) {
const strippedHtml = trimReplyFromFormattedBody(formatted_body)
.replace(/
/gi, ' ')
diff --git a/src/app/components/message/attachment/Attachment.tsx b/src/app/components/message/attachment/Attachment.tsx
index 4b0b71f3..d0c737ca 100644
--- a/src/app/components/message/attachment/Attachment.tsx
+++ b/src/app/components/message/attachment/Attachment.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import * as css from './Attachment.css';
diff --git a/src/app/components/message/content/AudioContent.tsx b/src/app/components/message/content/AudioContent.tsx
index 5704595b..97668806 100644
--- a/src/app/components/message/content/AudioContent.tsx
+++ b/src/app/components/message/content/AudioContent.tsx
@@ -1,5 +1,5 @@
/* eslint-disable jsx-a11y/media-has-caption */
-import React, { ReactNode, useCallback, useRef, useState } from 'react';
+import { ReactNode, useCallback, useRef, useState } from 'react';
import { Badge, Chip, Icon, IconButton, Icons, ProgressBar, Spinner, Text, toRem } from 'folds';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import { Range } from 'react-range';
diff --git a/src/app/components/message/content/EventContent.tsx b/src/app/components/message/content/EventContent.tsx
index e1e7f2fd..747cf23a 100644
--- a/src/app/components/message/content/EventContent.tsx
+++ b/src/app/components/message/content/EventContent.tsx
@@ -1,5 +1,5 @@
import { Box, Icon, IconSrc } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { BubbleLayout, CompactLayout, ModernLayout } from '..';
import { MessageLayout } from '$state/settings';
diff --git a/src/app/components/message/content/FallbackContent.tsx b/src/app/components/message/content/FallbackContent.tsx
index 9edb9678..270504f0 100644
--- a/src/app/components/message/content/FallbackContent.tsx
+++ b/src/app/components/message/content/FallbackContent.tsx
@@ -1,5 +1,4 @@
import { Box, Icon, Icons, Text, as, color, config } from 'folds';
-import React from 'react';
const warningStyle = { color: color.Warning.Main, opacity: config.opacity.P300 };
const criticalStyle = { color: color.Critical.Main, opacity: config.opacity.P300 };
diff --git a/src/app/components/message/content/FileContent.tsx b/src/app/components/message/content/FileContent.tsx
index bbc8314b..6da0abde 100644
--- a/src/app/components/message/content/FileContent.tsx
+++ b/src/app/components/message/content/FileContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useCallback, useState } from 'react';
+import { ReactNode, useCallback, useState } from 'react';
import {
Box,
Button,
diff --git a/src/app/components/message/content/ImageContent.tsx b/src/app/components/message/content/ImageContent.tsx
index d9b073e7..cb5b4631 100644
--- a/src/app/components/message/content/ImageContent.tsx
+++ b/src/app/components/message/content/ImageContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useCallback, useEffect, useState } from 'react';
+import { ReactNode, useCallback, useEffect, useState } from 'react';
import {
Badge,
Box,
diff --git a/src/app/components/message/content/VideoContent.tsx b/src/app/components/message/content/VideoContent.tsx
index cf458e7e..9ef1a039 100644
--- a/src/app/components/message/content/VideoContent.tsx
+++ b/src/app/components/message/content/VideoContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useCallback, useEffect, useState } from 'react';
+import { ReactNode, useCallback, useEffect, useState } from 'react';
import {
Badge,
Box,
diff --git a/src/app/components/message/layout/Base.tsx b/src/app/components/message/layout/Base.tsx
index ac196a5b..63a01387 100644
--- a/src/app/components/message/layout/Base.tsx
+++ b/src/app/components/message/layout/Base.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Text, as } from 'folds';
import classNames from 'classnames';
import * as css from './layout.css';
diff --git a/src/app/components/message/layout/Bubble.tsx b/src/app/components/message/layout/Bubble.tsx
index 93ff84bc..c49cfa35 100644
--- a/src/app/components/message/layout/Bubble.tsx
+++ b/src/app/components/message/layout/Bubble.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import { Box, ContainerColor, as, color } from 'folds';
import * as css from './layout.css';
diff --git a/src/app/components/message/layout/Compact.tsx b/src/app/components/message/layout/Compact.tsx
index a033919f..e9015ab9 100644
--- a/src/app/components/message/layout/Compact.tsx
+++ b/src/app/components/message/layout/Compact.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, as } from 'folds';
import * as css from './layout.css';
diff --git a/src/app/components/message/layout/Modern.tsx b/src/app/components/message/layout/Modern.tsx
index 70b25c57..e73e9301 100644
--- a/src/app/components/message/layout/Modern.tsx
+++ b/src/app/components/message/layout/Modern.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, as } from 'folds';
import * as css from './layout.css';
diff --git a/src/app/components/message/modals/GlobalModalManager.tsx b/src/app/components/message/modals/GlobalModalManager.tsx
index 72f1e0ed..86c20600 100644
--- a/src/app/components/message/modals/GlobalModalManager.tsx
+++ b/src/app/components/message/modals/GlobalModalManager.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { useAtom } from 'jotai';
import { Overlay, OverlayBackdrop, OverlayCenter, Box, Modal } from 'folds';
import FocusTrap from 'focus-trap-react';
diff --git a/src/app/components/message/modals/MessageReactions.tsx b/src/app/components/message/modals/MessageReactions.tsx
index a2b612e3..99c6c7fa 100644
--- a/src/app/components/message/modals/MessageReactions.tsx
+++ b/src/app/components/message/modals/MessageReactions.tsx
@@ -1,6 +1,5 @@
import React from 'react';
-import { Room } from '$types/matrix-sdk';
-import { Relations } from '$types/matrix-sdk';
+import { Room, Relations } from '$types/matrix-sdk';
import { useSetAtom } from 'jotai';
import { Icon, Icons, Text, MenuItem } from 'folds';
import { modalAtom, ModalType } from '$state/modal';
diff --git a/src/app/components/message/placeholder/CompactPlaceholder.tsx b/src/app/components/message/placeholder/CompactPlaceholder.tsx
index 0dbffa0e..62d9ca23 100644
--- a/src/app/components/message/placeholder/CompactPlaceholder.tsx
+++ b/src/app/components/message/placeholder/CompactPlaceholder.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { as, ContainerColor, toRem } from 'folds';
import { randomNumberBetween } from '$appUtils/common';
import { LinePlaceholder } from './LinePlaceholder';
diff --git a/src/app/components/message/placeholder/DefaultPlaceholder.tsx b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
index 20fc506e..21fbc6e2 100644
--- a/src/app/components/message/placeholder/DefaultPlaceholder.tsx
+++ b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties, useMemo } from 'react';
+import { CSSProperties, useMemo } from 'react';
import { Avatar, Box, ContainerColor, as, color, toRem } from 'folds';
import { randomNumberBetween } from '$appUtils/common';
import { LinePlaceholder } from './LinePlaceholder';
diff --git a/src/app/components/message/placeholder/LinePlaceholder.tsx b/src/app/components/message/placeholder/LinePlaceholder.tsx
index 58fc52c0..7aaaac36 100644
--- a/src/app/components/message/placeholder/LinePlaceholder.tsx
+++ b/src/app/components/message/placeholder/LinePlaceholder.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import * as css from './LinePlaceholder.css';
diff --git a/src/app/components/nav/NavCategory.tsx b/src/app/components/nav/NavCategory.tsx
index 4ccf1158..7285330f 100644
--- a/src/app/components/nav/NavCategory.tsx
+++ b/src/app/components/nav/NavCategory.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { as } from 'folds';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/nav/NavCategoryHeader.tsx b/src/app/components/nav/NavCategoryHeader.tsx
index e6ae700a..1d4152fc 100644
--- a/src/app/components/nav/NavCategoryHeader.tsx
+++ b/src/app/components/nav/NavCategoryHeader.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import { Header, as } from 'folds';
import * as css from './styles.css';
diff --git a/src/app/components/nav/NavEmptyLayout.tsx b/src/app/components/nav/NavEmptyLayout.tsx
index 322ef1c3..25b69380 100644
--- a/src/app/components/nav/NavEmptyLayout.tsx
+++ b/src/app/components/nav/NavEmptyLayout.tsx
@@ -1,5 +1,5 @@
import { Box, config } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
export function NavEmptyCenter({ children }: { children: ReactNode }) {
return (
diff --git a/src/app/components/nav/NavItem.tsx b/src/app/components/nav/NavItem.tsx
index 1ec1257f..68a967f6 100644
--- a/src/app/components/nav/NavItem.tsx
+++ b/src/app/components/nav/NavItem.tsx
@@ -1,5 +1,5 @@
import classNames from 'classnames';
-import React, { ComponentProps, forwardRef } from 'react';
+import { ComponentProps, forwardRef } from 'react';
import { Link } from 'react-router-dom';
import { as } from 'folds';
import * as css from './styles.css';
diff --git a/src/app/components/nav/NavItemContent.tsx b/src/app/components/nav/NavItemContent.tsx
index d6a5d131..22a45881 100644
--- a/src/app/components/nav/NavItemContent.tsx
+++ b/src/app/components/nav/NavItemContent.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps } from 'react';
+import { ComponentProps } from 'react';
import { Text, as } from 'folds';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/nav/NavItemOptions.tsx b/src/app/components/nav/NavItemOptions.tsx
index 1c2ffd3f..a735781e 100644
--- a/src/app/components/nav/NavItemOptions.tsx
+++ b/src/app/components/nav/NavItemOptions.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps } from 'react';
+import { ComponentProps } from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/page/Page.tsx b/src/app/components/page/Page.tsx
index 84bdf6dc..be4fd70c 100644
--- a/src/app/components/page/Page.tsx
+++ b/src/app/components/page/Page.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps, MutableRefObject, ReactNode } from 'react';
+import { ComponentProps, MutableRefObject, ReactNode } from 'react';
import { Box, Header, Line, Scroll, Text, as } from 'folds';
import classNames from 'classnames';
import { ContainerColor } from '$styles/ContainerColor.css';
diff --git a/src/app/components/password-input/PasswordInput.tsx b/src/app/components/password-input/PasswordInput.tsx
index 4ffe0d83..16aa1f16 100644
--- a/src/app/components/password-input/PasswordInput.tsx
+++ b/src/app/components/password-input/PasswordInput.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps, forwardRef } from 'react';
+import { ComponentProps, forwardRef } from 'react';
import { Icon, IconButton, Input, config, Icons } from 'folds';
import { UseStateProvider } from '../UseStateProvider';
diff --git a/src/app/components/power/PowerColorBadge.tsx b/src/app/components/power/PowerColorBadge.tsx
index 497385b7..5ef1f12a 100644
--- a/src/app/components/power/PowerColorBadge.tsx
+++ b/src/app/components/power/PowerColorBadge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { as } from 'folds';
import classNames from 'classnames';
import * as css from './style.css';
diff --git a/src/app/components/power/PowerIcon.tsx b/src/app/components/power/PowerIcon.tsx
index 868b8ee2..d640a04f 100644
--- a/src/app/components/power/PowerIcon.tsx
+++ b/src/app/components/power/PowerIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import * as css from './style.css';
import { JUMBO_EMOJI_REG } from '$appUtils/regex';
diff --git a/src/app/components/power/PowerSelector.tsx b/src/app/components/power/PowerSelector.tsx
index cceb19d1..a4a2a554 100644
--- a/src/app/components/power/PowerSelector.tsx
+++ b/src/app/components/power/PowerSelector.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, MouseEventHandler, ReactNode, useState } from 'react';
+import { forwardRef, MouseEventHandler, ReactNode, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { Box, config, Menu, MenuItem, PopOut, Scroll, Text, toRem, RectCords } from 'folds';
import { getPowers, PowerLevelTags } from '$hooks/usePowerLevelTags';
diff --git a/src/app/components/presence/Presence.tsx b/src/app/components/presence/Presence.tsx
index 7bd87579..9283509e 100644
--- a/src/app/components/presence/Presence.tsx
+++ b/src/app/components/presence/Presence.tsx
@@ -10,7 +10,7 @@ import {
TooltipProvider,
toRem,
} from 'folds';
-import React, { ReactNode, useId } from 'react';
+import { ReactNode, useId } from 'react';
import * as css from './styles.css';
import { Presence, usePresenceLabel } from '$hooks/useUserPresence';
diff --git a/src/app/components/room-avatar/RoomAvatar.tsx b/src/app/components/room-avatar/RoomAvatar.tsx
index 6220af97..ef9218bb 100644
--- a/src/app/components/room-avatar/RoomAvatar.tsx
+++ b/src/app/components/room-avatar/RoomAvatar.tsx
@@ -1,6 +1,6 @@
import { JoinRule } from '$types/matrix-sdk';
import { AvatarFallback, AvatarImage, Icon, Icons, color } from 'folds';
-import React, { ComponentProps, ReactEventHandler, ReactNode, forwardRef, useState } from 'react';
+import { ComponentProps, ReactEventHandler, ReactNode, forwardRef, useState } from 'react';
import * as css from './RoomAvatar.css';
import { getRoomIconSrc } from '$appUtils/room';
import colorMXID from '$util/colorMXID';
diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx
index 40a0f65e..847740ec 100644
--- a/src/app/components/room-card/RoomCard.tsx
+++ b/src/app/components/room-card/RoomCard.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useCallback, useRef, useState } from 'react';
+import { ReactNode, useCallback, useRef, useState } from 'react';
import { MatrixError, Room } from '$types/matrix-sdk';
import {
Avatar,
diff --git a/src/app/components/room-intro/RoomIntro.tsx b/src/app/components/room-intro/RoomIntro.tsx
index 3ab97979..0db3bd3a 100644
--- a/src/app/components/room-intro/RoomIntro.tsx
+++ b/src/app/components/room-intro/RoomIntro.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Avatar, Box, Button, Spinner, Text, as } from 'folds';
import { Room } from '$types/matrix-sdk';
import { useAtomValue } from 'jotai';
diff --git a/src/app/components/room-topic-viewer/RoomTopicViewer.tsx b/src/app/components/room-topic-viewer/RoomTopicViewer.tsx
index 96a2c01b..72798181 100644
--- a/src/app/components/room-topic-viewer/RoomTopicViewer.tsx
+++ b/src/app/components/room-topic-viewer/RoomTopicViewer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { as, Box, Header, Icon, IconButton, Icons, Modal, Scroll, Text } from 'folds';
import classNames from 'classnames';
import Linkify from 'linkify-react';
diff --git a/src/app/components/scroll-top-container/ScrollTopContainer.tsx b/src/app/components/scroll-top-container/ScrollTopContainer.tsx
index 11433dc8..36b19417 100644
--- a/src/app/components/scroll-top-container/ScrollTopContainer.tsx
+++ b/src/app/components/scroll-top-container/ScrollTopContainer.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject, useCallback, useState } from 'react';
+import { RefObject, useCallback, useState } from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import * as css from './style.css';
diff --git a/src/app/components/sequence-card/SequenceCard.tsx b/src/app/components/sequence-card/SequenceCard.tsx
index 9f3c73fc..65d80dce 100644
--- a/src/app/components/sequence-card/SequenceCard.tsx
+++ b/src/app/components/sequence-card/SequenceCard.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps } from 'react';
+import { ComponentProps } from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import { ContainerColor, ContainerColorVariants } from '$styles/ContainerColor.css';
diff --git a/src/app/components/server-badge/ServerBadge.tsx b/src/app/components/server-badge/ServerBadge.tsx
index f61a146f..9a53af6e 100644
--- a/src/app/components/server-badge/ServerBadge.tsx
+++ b/src/app/components/server-badge/ServerBadge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { as, Badge, Text } from 'folds';
export const ServerBadge = as<
diff --git a/src/app/components/setting-tile/SettingTile.tsx b/src/app/components/setting-tile/SettingTile.tsx
index 541480a3..e57dccd5 100644
--- a/src/app/components/setting-tile/SettingTile.tsx
+++ b/src/app/components/setting-tile/SettingTile.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, Text } from 'folds';
import { BreakWord } from '$styles/Text.css';
diff --git a/src/app/components/sidebar/Sidebar.tsx b/src/app/components/sidebar/Sidebar.tsx
index 7caf1b21..1e755987 100644
--- a/src/app/components/sidebar/Sidebar.tsx
+++ b/src/app/components/sidebar/Sidebar.tsx
@@ -1,6 +1,5 @@
import classNames from 'classnames';
import { as } from 'folds';
-import React from 'react';
import * as css from './Sidebar.css';
export const Sidebar = as<'div'>(({ as: AsSidebar = 'div', className, ...props }, ref) => (
diff --git a/src/app/components/sidebar/SidebarContent.tsx b/src/app/components/sidebar/SidebarContent.tsx
index b09ea64a..a4546b19 100644
--- a/src/app/components/sidebar/SidebarContent.tsx
+++ b/src/app/components/sidebar/SidebarContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box } from 'folds';
type SidebarContentProps = {
diff --git a/src/app/components/sidebar/SidebarItem.tsx b/src/app/components/sidebar/SidebarItem.tsx
index b23772bb..6e6e0146 100644
--- a/src/app/components/sidebar/SidebarItem.tsx
+++ b/src/app/components/sidebar/SidebarItem.tsx
@@ -1,6 +1,6 @@
import classNames from 'classnames';
import { as, Avatar, Text, Tooltip, TooltipProvider, toRem } from 'folds';
-import React, { ComponentProps, ReactNode, RefCallback } from 'react';
+import { ComponentProps, ReactNode, RefCallback } from 'react';
import * as css from './Sidebar.css';
export const SidebarItem = as<'div', css.SidebarItemVariants>(
diff --git a/src/app/components/sidebar/SidebarStack.tsx b/src/app/components/sidebar/SidebarStack.tsx
index c0e976c8..86a898e5 100644
--- a/src/app/components/sidebar/SidebarStack.tsx
+++ b/src/app/components/sidebar/SidebarStack.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import classNames from 'classnames';
import { as } from 'folds';
import * as css from './Sidebar.css';
diff --git a/src/app/components/sidebar/SidebarStackSeparator.tsx b/src/app/components/sidebar/SidebarStackSeparator.tsx
index 110341ca..40dada0a 100644
--- a/src/app/components/sidebar/SidebarStackSeparator.tsx
+++ b/src/app/components/sidebar/SidebarStackSeparator.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Line, toRem } from 'folds';
export function SidebarStackSeparator() {
diff --git a/src/app/components/splash-screen/SplashScreen.tsx b/src/app/components/splash-screen/SplashScreen.tsx
index a5696f59..463fd66d 100644
--- a/src/app/components/splash-screen/SplashScreen.tsx
+++ b/src/app/components/splash-screen/SplashScreen.tsx
@@ -1,5 +1,5 @@
import { Box, Text } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import * as patternsCSS from '$styles/Patterns.css';
import * as css from './SplashScreen.css';
diff --git a/src/app/components/text-viewer/TextViewer.tsx b/src/app/components/text-viewer/TextViewer.tsx
index e362d439..0eeaad9f 100644
--- a/src/app/components/text-viewer/TextViewer.tsx
+++ b/src/app/components/text-viewer/TextViewer.tsx
@@ -1,5 +1,5 @@
-/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
-import React, { ComponentProps, HTMLAttributes, Suspense, forwardRef, lazy } from 'react';
+
+import { ComponentProps, HTMLAttributes, Suspense, forwardRef, lazy } from 'react';
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Scroll, Text, as } from 'folds';
import { ErrorBoundary } from 'react-error-boundary';
diff --git a/src/app/components/time-date/DatePicker.tsx b/src/app/components/time-date/DatePicker.tsx
index 0f93985f..0d996f5e 100644
--- a/src/app/components/time-date/DatePicker.tsx
+++ b/src/app/components/time-date/DatePicker.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react';
+import { forwardRef } from 'react';
import { Menu, Box, Text, Chip } from 'folds';
import dayjs from 'dayjs';
import * as css from './styles.css';
diff --git a/src/app/components/time-date/PickerColumn.tsx b/src/app/components/time-date/PickerColumn.tsx
index c31daf43..cf227a82 100644
--- a/src/app/components/time-date/PickerColumn.tsx
+++ b/src/app/components/time-date/PickerColumn.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, Text, Scroll } from 'folds';
import { CutoutCard } from '../cutout-card';
import * as css from './styles.css';
diff --git a/src/app/components/time-date/TimePicker.tsx b/src/app/components/time-date/TimePicker.tsx
index 22f29800..da9b5be6 100644
--- a/src/app/components/time-date/TimePicker.tsx
+++ b/src/app/components/time-date/TimePicker.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react';
+import { forwardRef } from 'react';
import { Menu, Box, Text, Chip } from 'folds';
import dayjs from 'dayjs';
import * as css from './styles.css';
diff --git a/src/app/components/typing-indicator/TypingIndicator.tsx b/src/app/components/typing-indicator/TypingIndicator.tsx
index e7997cf1..779a728a 100644
--- a/src/app/components/typing-indicator/TypingIndicator.tsx
+++ b/src/app/components/typing-indicator/TypingIndicator.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, as, toRem } from 'folds';
import * as css from './TypingIndicator.css';
diff --git a/src/app/components/uia-stages/DummyStage.tsx b/src/app/components/uia-stages/DummyStage.tsx
index 2f75752e..9a78af0e 100644
--- a/src/app/components/uia-stages/DummyStage.tsx
+++ b/src/app/components/uia-stages/DummyStage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback } from 'react';
+import { useEffect, useCallback } from 'react';
import { Dialog, Text, Box, Button, config } from 'folds';
import { AuthType } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
diff --git a/src/app/components/uia-stages/EmailStage.tsx b/src/app/components/uia-stages/EmailStage.tsx
index ce396e99..11da8cf1 100644
--- a/src/app/components/uia-stages/EmailStage.tsx
+++ b/src/app/components/uia-stages/EmailStage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback, FormEventHandler } from 'react';
+import { useEffect, useCallback, FormEventHandler } from 'react';
import { Dialog, Text, Box, Button, config, Input, color, Spinner } from 'folds';
import { AuthType, MatrixError } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
diff --git a/src/app/components/uia-stages/PasswordStage.tsx b/src/app/components/uia-stages/PasswordStage.tsx
index d123a77e..d168ddcc 100644
--- a/src/app/components/uia-stages/PasswordStage.tsx
+++ b/src/app/components/uia-stages/PasswordStage.tsx
@@ -1,5 +1,5 @@
import { Box, Button, color, config, Dialog, Header, Icon, IconButton, Icons, Text } from 'folds';
-import React, { FormEventHandler } from 'react';
+import { FormEventHandler } from 'react';
import { AuthType } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
import { ErrorCode } from '../../cs-errorcode';
diff --git a/src/app/components/uia-stages/ReCaptchaStage.tsx b/src/app/components/uia-stages/ReCaptchaStage.tsx
index 6d9558c0..65357b0e 100644
--- a/src/app/components/uia-stages/ReCaptchaStage.tsx
+++ b/src/app/components/uia-stages/ReCaptchaStage.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Dialog, Text, Box, Button, config } from 'folds';
import { AuthType } from '$types/matrix-sdk';
import ReCAPTCHA from 'react-google-recaptcha';
diff --git a/src/app/components/uia-stages/RegistrationTokenStage.tsx b/src/app/components/uia-stages/RegistrationTokenStage.tsx
index 772db07f..cfe79786 100644
--- a/src/app/components/uia-stages/RegistrationTokenStage.tsx
+++ b/src/app/components/uia-stages/RegistrationTokenStage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback, FormEventHandler } from 'react';
+import { useEffect, useCallback, FormEventHandler } from 'react';
import { Dialog, Text, Box, Button, config, Input } from 'folds';
import { AuthType } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
diff --git a/src/app/components/uia-stages/SSOStage.tsx b/src/app/components/uia-stages/SSOStage.tsx
index e3d6126a..fb20e03b 100644
--- a/src/app/components/uia-stages/SSOStage.tsx
+++ b/src/app/components/uia-stages/SSOStage.tsx
@@ -1,5 +1,5 @@
import { Box, Button, color, config, Dialog, Header, Icon, IconButton, Icons, Text } from 'folds';
-import React, { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
import { StageComponentProps } from './types';
export function SSOStage({
diff --git a/src/app/components/uia-stages/TermsStage.tsx b/src/app/components/uia-stages/TermsStage.tsx
index 7e3fd9b6..bfe8e403 100644
--- a/src/app/components/uia-stages/TermsStage.tsx
+++ b/src/app/components/uia-stages/TermsStage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback } from 'react';
+import { useEffect, useCallback } from 'react';
import { Dialog, Text, Box, Button, config } from 'folds';
import { AuthType } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
diff --git a/src/app/components/unread-badge/UnreadBadge.tsx b/src/app/components/unread-badge/UnreadBadge.tsx
index 25b0cfe1..6a62642a 100644
--- a/src/app/components/unread-badge/UnreadBadge.tsx
+++ b/src/app/components/unread-badge/UnreadBadge.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties, ReactNode } from 'react';
+import { CSSProperties, ReactNode } from 'react';
import { Box, Badge, toRem, Text } from 'folds';
import { millify } from '$plugins/millify';
diff --git a/src/app/components/upload-board/UploadBoard.tsx b/src/app/components/upload-board/UploadBoard.tsx
index 74f1b663..56acf2b7 100644
--- a/src/app/components/upload-board/UploadBoard.tsx
+++ b/src/app/components/upload-board/UploadBoard.tsx
@@ -1,4 +1,4 @@
-import React, { MutableRefObject, ReactNode, useImperativeHandle, useRef } from 'react';
+import { MutableRefObject, ReactNode, useImperativeHandle, useRef } from 'react';
import { Badge, Box, Chip, Header, Icon, Icons, Spinner, Text, as, percent } from 'folds';
import classNames from 'classnames';
import { useAtomValue } from 'jotai';
@@ -66,7 +66,7 @@ export function UploadBoardHeader({
if (sendingRef.current) return;
sendingRef.current = true;
await onSend(
- uploads.filter((upload) => upload.status === UploadStatus.Success) as UploadSuccess[]
+ uploads.filter((upload) => upload.status === UploadStatus.Success)
);
sendingRef.current = false;
};
diff --git a/src/app/components/upload-card/CompactUploadCardRenderer.tsx b/src/app/components/upload-card/CompactUploadCardRenderer.tsx
index fd0272da..6fdc1e9a 100644
--- a/src/app/components/upload-card/CompactUploadCardRenderer.tsx
+++ b/src/app/components/upload-card/CompactUploadCardRenderer.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
import { Chip, Icon, IconButton, Icons, Text, color } from 'folds';
import { UploadCard, UploadCardError, CompactUploadCardProgress } from './UploadCard';
import { TUploadAtom, UploadStatus, UploadSuccess, useBindUploadAtom } from '$state/upload';
diff --git a/src/app/components/upload-card/UploadCard.tsx b/src/app/components/upload-card/UploadCard.tsx
index b1c57e4f..b438ba3f 100644
--- a/src/app/components/upload-card/UploadCard.tsx
+++ b/src/app/components/upload-card/UploadCard.tsx
@@ -1,5 +1,5 @@
import { Badge, Box, Icon, Icons, ProgressBar, Text, percent } from 'folds';
-import React, { ReactNode, forwardRef } from 'react';
+import { ReactNode, forwardRef } from 'react';
import * as css from './UploadCard.css';
import { bytesToSize } from '$appUtils/common';
diff --git a/src/app/components/upload-card/UploadCardRenderer.tsx b/src/app/components/upload-card/UploadCardRenderer.tsx
index 5f978703..6aa2a3a8 100644
--- a/src/app/components/upload-card/UploadCardRenderer.tsx
+++ b/src/app/components/upload-card/UploadCardRenderer.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useEffect } from 'react';
+import { ReactNode, useEffect } from 'react';
import { Box, Chip, Icon, IconButton, Icons, Text, color, config, toRem } from 'folds';
import { UploadCard, UploadCardError, UploadCardProgress } from './UploadCard';
import { UploadStatus, UploadSuccess, useBindUploadAtom } from '$state/upload';
diff --git a/src/app/components/url-preview/UrlPreview.tsx b/src/app/components/url-preview/UrlPreview.tsx
index 4ba3e4e2..ae970b0e 100644
--- a/src/app/components/url-preview/UrlPreview.tsx
+++ b/src/app/components/url-preview/UrlPreview.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import classNames from 'classnames';
import { Box, as } from 'folds';
import * as css from './UrlPreview.css';
diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx
index 6354bed3..0d25d0f6 100644
--- a/src/app/components/url-preview/UrlPreviewCard.tsx
+++ b/src/app/components/url-preview/UrlPreviewCard.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
import { IPreviewUrlResponse } from '$types/matrix-sdk';
import { Box, Icon, IconButton, Icons, Scroll, Spinner, Text, as, color, config } from 'folds';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
@@ -11,9 +11,6 @@ import {
import * as css from './UrlPreviewCard.css';
import { mxcUrlToHttp } from '$appUtils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { ImageViewer } from '../image-viewer';
-import { Image, Video } from '../media';
-import { ImageContent, VideoContent } from '../message';
const linkStyles = { color: color.Success.Main };
const TARGET_HEIGHT = 300;
diff --git a/src/app/components/user-avatar/UserAvatar.tsx b/src/app/components/user-avatar/UserAvatar.tsx
index 96611563..a8f08a61 100644
--- a/src/app/components/user-avatar/UserAvatar.tsx
+++ b/src/app/components/user-avatar/UserAvatar.tsx
@@ -1,5 +1,5 @@
import { AvatarFallback, AvatarImage, color } from 'folds';
-import React, { ReactEventHandler, ReactNode, useState } from 'react';
+import { ReactEventHandler, ReactNode, useState } from 'react';
import classNames from 'classnames';
import * as css from './UserAvatar.css';
import colorMXID from '$util/colorMXID';
diff --git a/src/app/components/user-profile/CreatorChip.tsx b/src/app/components/user-profile/CreatorChip.tsx
index 5ce91a5f..71dc36be 100644
--- a/src/app/components/user-profile/CreatorChip.tsx
+++ b/src/app/components/user-profile/CreatorChip.tsx
@@ -1,5 +1,5 @@
import { Chip, config, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
-import React, { MouseEventHandler, useState } from 'react';
+import { MouseEventHandler, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { isKeyHotkey } from 'is-hotkey';
import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
diff --git a/src/app/components/user-profile/PowerChip.tsx b/src/app/components/user-profile/PowerChip.tsx
index 6fad42e6..39f5d39b 100644
--- a/src/app/components/user-profile/PowerChip.tsx
+++ b/src/app/components/user-profile/PowerChip.tsx
@@ -20,7 +20,7 @@ import {
Text,
toRem,
} from 'folds';
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEventHandler, useCallback, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { isKeyHotkey } from 'is-hotkey';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/user-profile/UserChips.tsx b/src/app/components/user-profile/UserChips.tsx
index c35443ca..0041a2e2 100644
--- a/src/app/components/user-profile/UserChips.tsx
+++ b/src/app/components/user-profile/UserChips.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
KeyboardEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/components/user-profile/UserHero.tsx b/src/app/components/user-profile/UserHero.tsx
index a538c803..39b6597e 100644
--- a/src/app/components/user-profile/UserHero.tsx
+++ b/src/app/components/user-profile/UserHero.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import {
Avatar,
Box,
diff --git a/src/app/components/user-profile/UserModeration.tsx b/src/app/components/user-profile/UserModeration.tsx
index a093c263..67695636 100644
--- a/src/app/components/user-profile/UserModeration.tsx
+++ b/src/app/components/user-profile/UserModeration.tsx
@@ -1,5 +1,5 @@
import { Box, Button, color, config, Icon, Icons, Spinner, Text, Input } from 'folds';
-import React, { useCallback, useRef } from 'react';
+import { useCallback, useRef } from 'react';
import { useRoom } from '$hooks/useRoom';
import { CutoutCard } from '../cutout-card';
import { SettingTile } from '../setting-tile';
diff --git a/src/app/components/virtualizer/VirtualTile.tsx b/src/app/components/virtualizer/VirtualTile.tsx
index 0c6a5bd3..b92add55 100644
--- a/src/app/components/virtualizer/VirtualTile.tsx
+++ b/src/app/components/virtualizer/VirtualTile.tsx
@@ -1,6 +1,5 @@
import { VirtualItem } from '@tanstack/react-virtual';
import { as } from 'folds';
-import React from 'react';
import classNames from 'classnames';
import * as css from './style.css';
diff --git a/src/app/features/add-existing/AddExisting.tsx b/src/app/features/add-existing/AddExisting.tsx
index 8e7c8a2f..605457b5 100644
--- a/src/app/features/add-existing/AddExisting.tsx
+++ b/src/app/features/add-existing/AddExisting.tsx
@@ -19,7 +19,7 @@ import {
Spinner,
Text,
} from 'folds';
-import React, {
+import {
ChangeEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/features/call/CallViewUser.tsx b/src/app/features/call/CallViewUser.tsx
index afce615f..c3b60b1b 100644
--- a/src/app/features/call/CallViewUser.tsx
+++ b/src/app/features/call/CallViewUser.tsx
@@ -1,8 +1,7 @@
import { as, Avatar, Box, Icon, Icons, Text } from 'folds';
import React from 'react';
import classNames from 'classnames';
-import { Room } from '$types/matrix-sdk';
-import { CallMembership } from '$types/matrix-sdk';
+import { Room, CallMembership } from '$types/matrix-sdk';
import { UserAvatar } from '$components/user-avatar';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { getMxIdLocalPart } from '$appUtils/matrix';
diff --git a/src/app/features/call/SmallWidget.ts b/src/app/features/call/SmallWidget.ts
index b90c1a2a..192c3f72 100644
--- a/src/app/features/call/SmallWidget.ts
+++ b/src/app/features/call/SmallWidget.ts
@@ -62,7 +62,7 @@ export const getWidgetUrl = (
userId: mx.getUserId()!,
deviceId: mx.getDeviceId()!,
roomId,
- baseUrl: mx.baseUrl!,
+ baseUrl: mx.baseUrl,
parentUrl: window.location.origin,
});
@@ -140,7 +140,7 @@ export class SmallWidget extends EventEmitter {
// Populate the map of "read up to" events for this widget with the current event in every room.
// This is a bit inefficient, but should be okay. We do this for all rooms in case the widget
// requests timeline capabilities in other rooms down the road. It's just easier to manage here.
- // eslint-disable-next-line no-restricted-syntax
+
for (const room of this.client.getRooms()) {
// Timelines are most recent last
const events = room.getLiveTimeline()?.getEvents() || [];
@@ -243,7 +243,7 @@ export class SmallWidget extends EventEmitter {
return room === null || !room.findEventById(ev.relationEventId);
}
- // eslint-disable-next-line class-methods-use-this
+
private arrayFastClone(a: T[]): T[] {
return a.slice(0, a.length);
}
diff --git a/src/app/features/call/SmallWidgetDriver.ts b/src/app/features/call/SmallWidgetDriver.ts
index 54258b4f..92e3d5b8 100644
--- a/src/app/features/call/SmallWidgetDriver.ts
+++ b/src/app/features/call/SmallWidgetDriver.ts
@@ -1,8 +1,8 @@
-/* eslint-disable no-return-await */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-continue */
-/* eslint-disable class-methods-use-this */
-/* eslint-disable no-dupe-class-members */
+
+
+
+
+
/*
* Copyright 2024 New Vector Ltd.
* Copyright 2020-2023 The Matrix.org Foundation C.I.C.
@@ -127,7 +127,7 @@ export class SmallWidgetDriver extends WidgetDriver {
EventType.RoomRedaction,
'io.element.call.reaction',
];
- // eslint-disable-next-line no-restricted-syntax
+
for (const eventType of sendRecvRoomEvents) {
this.allowedCapabilities.add(
WidgetEventCapability.forRoomEvent(EventDirection.Send, eventType).raw
@@ -150,7 +150,7 @@ export class SmallWidgetDriver extends WidgetDriver {
EventType.CallReplaces,
EventType.CallEncryptionKeysPrefix,
];
- // eslint-disable-next-line no-restricted-syntax
+
for (const eventType of sendRecvToDevice) {
this.allowedCapabilities.add(
WidgetEventCapability.forToDeviceEvent(EventDirection.Send, eventType).raw
@@ -325,10 +325,10 @@ export class SmallWidgetDriver extends WidgetDriver {
// attempt to re-batch these up into a single request
const invertedContentMap: { [content: string]: { userId: string; deviceId: string }[] } = {};
- // eslint-disable-next-line no-restricted-syntax
+
for (const userId of Object.keys(contentMap)) {
const userContentMap = contentMap[userId];
- // eslint-disable-next-line no-restricted-syntax
+
for (const deviceId of Object.keys(userContentMap)) {
const content = userContentMap[deviceId];
const stringifiedContent = JSON.stringify(content);
diff --git a/src/app/features/common-settings/cosmetics/Cosmetics.tsx b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
index c2871630..dec707f2 100644
--- a/src/app/features/common-settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll, Switch } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
index 0b99de81..0f94e6e5 100644
--- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
index 373ea224..478f0519 100644
--- a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
+++ b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useRef, useState, FormEventHandler, useEffect } from 'react';
+import { useCallback, useRef, useState, FormEventHandler, useEffect } from 'react';
import { MatrixError } from '$types/matrix-sdk';
import {
Box,
diff --git a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
index 4d358000..0aedf844 100644
--- a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
+++ b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
index 63a0dd00..0ee350a6 100644
--- a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
+++ b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { ImagePack } from '$plugins/custom-emoji';
diff --git a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
index 4e69397b..e5a8b580 100644
--- a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
+++ b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useMemo, useState } from 'react';
+import { FormEventHandler, useCallback, useMemo, useState } from 'react';
import {
Box,
Text,
@@ -163,7 +163,7 @@ export function RoomPacks({ onViewPack }: RoomPacksProps) {
useCallback(async () => {
for (let i = 0; i < removedPacks.length; i += 1) {
const addr = removedPacks[i];
- // eslint-disable-next-line no-await-in-loop
+
await mx.sendStateEvent(room.roomId, StateEvent.PoniesRoomEmotes as any, {}, addr.stateKey);
}
}, [mx, room, removedPacks])
diff --git a/src/app/features/common-settings/general/RoomAddress.tsx b/src/app/features/common-settings/general/RoomAddress.tsx
index 62d7f4d7..b69b46e5 100644
--- a/src/app/features/common-settings/general/RoomAddress.tsx
+++ b/src/app/features/common-settings/general/RoomAddress.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useState } from 'react';
+import { FormEventHandler, useCallback, useState } from 'react';
import {
Badge,
Box,
@@ -237,7 +237,7 @@ function LocalAddressesList({
async (aliases: string[]) => {
for (let i = 0; i < aliases.length; i += 1) {
const alias = aliases[i];
- // eslint-disable-next-line no-await-in-loop
+
await removeLocalAlias(alias);
}
},
diff --git a/src/app/features/common-settings/general/RoomEncryption.tsx b/src/app/features/common-settings/general/RoomEncryption.tsx
index 183aaf22..25ea12aa 100644
--- a/src/app/features/common-settings/general/RoomEncryption.tsx
+++ b/src/app/features/common-settings/general/RoomEncryption.tsx
@@ -15,7 +15,7 @@ import {
Spinner,
Text,
} from 'folds';
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { MatrixError } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx
index 51ec3ce0..01e0e213 100644
--- a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx
+++ b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useMemo, useState } from 'react';
+import { MouseEventHandler, useCallback, useMemo, useState } from 'react';
import {
Button,
color,
@@ -12,8 +12,7 @@ import {
Spinner,
Text,
} from 'folds';
-import { HistoryVisibility, MatrixError } from '$types/matrix-sdk';
-import { RoomHistoryVisibilityEventContent } from '$types/matrix-sdk';
+import { HistoryVisibility, MatrixError, RoomHistoryVisibilityEventContent } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
import { SequenceCard } from '$components/sequence-card';
import { SequenceCardStyle } from '$features/room-settings/styles.css';
diff --git a/src/app/features/common-settings/general/RoomJoinRules.tsx b/src/app/features/common-settings/general/RoomJoinRules.tsx
index f3229b42..926f73c8 100644
--- a/src/app/features/common-settings/general/RoomJoinRules.tsx
+++ b/src/app/features/common-settings/general/RoomJoinRules.tsx
@@ -1,7 +1,6 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { color, Text } from 'folds';
-import { JoinRule, MatrixError, RestrictedAllowType } from '$types/matrix-sdk';
-import { RoomJoinRulesEventContent } from '$types/matrix-sdk';
+import { JoinRule, MatrixError, RestrictedAllowType, RoomJoinRulesEventContent } from '$types/matrix-sdk';
import { useAtomValue } from 'jotai';
import {
ExtendedJoinRules,
diff --git a/src/app/features/common-settings/general/RoomProfile.tsx b/src/app/features/common-settings/general/RoomProfile.tsx
index c06d7639..e3a0daf7 100644
--- a/src/app/features/common-settings/general/RoomProfile.tsx
+++ b/src/app/features/common-settings/general/RoomProfile.tsx
@@ -11,7 +11,7 @@ import {
Text,
TextArea,
} from 'folds';
-import React, { FormEventHandler, useCallback, useMemo, useState } from 'react';
+import { FormEventHandler, useCallback, useMemo, useState } from 'react';
import { useAtomValue } from 'jotai';
import Linkify from 'linkify-react';
import classNames from 'classnames';
diff --git a/src/app/features/common-settings/general/RoomPublish.tsx b/src/app/features/common-settings/general/RoomPublish.tsx
index 16beccbb..7be15b66 100644
--- a/src/app/features/common-settings/general/RoomPublish.tsx
+++ b/src/app/features/common-settings/general/RoomPublish.tsx
@@ -1,7 +1,5 @@
-import React from 'react';
import { Box, color, Spinner, Switch, Text } from 'folds';
-import { JoinRule, MatrixError } from '$types/matrix-sdk';
-import { RoomJoinRulesEventContent } from '$types/matrix-sdk';
+import { JoinRule, MatrixError, RoomJoinRulesEventContent } from '$types/matrix-sdk';
import { SequenceCard } from '$components/sequence-card';
import { SequenceCardStyle } from '$features/room-settings/styles.css';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/common-settings/general/RoomUpgrade.tsx b/src/app/features/common-settings/general/RoomUpgrade.tsx
index c3db79e4..18140adc 100644
--- a/src/app/features/common-settings/general/RoomUpgrade.tsx
+++ b/src/app/features/common-settings/general/RoomUpgrade.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
import {
Button,
color,
@@ -16,8 +16,7 @@ import {
Icons,
} from 'folds';
import FocusTrap from 'focus-trap-react';
-import { MatrixError, Method } from '$types/matrix-sdk';
-import { RoomTombstoneEventContent } from '$types/matrix-sdk';
+import { MatrixError, Method, RoomTombstoneEventContent } from '$types/matrix-sdk';
import { SequenceCard } from '$components/sequence-card';
import { SequenceCardStyle } from '$features/room-settings/styles.css';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/common-settings/members/Members.tsx b/src/app/features/common-settings/members/Members.tsx
index 66d79356..743e40b4 100644
--- a/src/app/features/common-settings/members/Members.tsx
+++ b/src/app/features/common-settings/members/Members.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/features/common-settings/permissions/PermissionGroups.tsx b/src/app/features/common-settings/permissions/PermissionGroups.tsx
index b1e9e398..385e0237 100644
--- a/src/app/features/common-settings/permissions/PermissionGroups.tsx
+++ b/src/app/features/common-settings/permissions/PermissionGroups.tsx
@@ -1,5 +1,5 @@
-/* eslint-disable react/no-array-index-key */
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+
+import { useCallback, useEffect, useMemo, useState } from 'react';
import { Badge, Box, Button, Chip, config, Icon, Icons, Menu, Spinner, Text } from 'folds';
import { produce } from 'immer';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/common-settings/permissions/Powers.tsx b/src/app/features/common-settings/permissions/Powers.tsx
index 703ad9ad..005059cd 100644
--- a/src/app/features/common-settings/permissions/Powers.tsx
+++ b/src/app/features/common-settings/permissions/Powers.tsx
@@ -1,5 +1,5 @@
-/* eslint-disable react/no-array-index-key */
-import React, { useState, MouseEventHandler, ReactNode } from 'react';
+
+import { useState, MouseEventHandler, ReactNode } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Box,
diff --git a/src/app/features/common-settings/permissions/PowersEditor.tsx b/src/app/features/common-settings/permissions/PowersEditor.tsx
index 1ed122a6..d861ca70 100644
--- a/src/app/features/common-settings/permissions/PowersEditor.tsx
+++ b/src/app/features/common-settings/permissions/PowersEditor.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, MouseEventHandler, useCallback, useMemo, useState } from 'react';
+import { FormEventHandler, MouseEventHandler, useCallback, useMemo, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/create-chat/CreateChat.tsx b/src/app/features/create-chat/CreateChat.tsx
index 9f9bec49..3fbd868d 100644
--- a/src/app/features/create-chat/CreateChat.tsx
+++ b/src/app/features/create-chat/CreateChat.tsx
@@ -1,5 +1,5 @@
import { Box, Button, color, config, Icon, Icons, Input, Spinner, Switch, Text } from 'folds';
-import React, { FormEventHandler, useCallback, useState } from 'react';
+import { FormEventHandler, useCallback, useState } from 'react';
import { ICreateRoomStateEvent, MatrixError, Preset, Visibility } from '$types/matrix-sdk';
import { useNavigate } from 'react-router-dom';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/create-room/CreateRoom.tsx b/src/app/features/create-room/CreateRoom.tsx
index cd106b48..2f2411d7 100644
--- a/src/app/features/create-room/CreateRoom.tsx
+++ b/src/app/features/create-room/CreateRoom.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useState } from 'react';
import { MatrixError, Room, JoinRule } from '$types/matrix-sdk';
import {
Box,
diff --git a/src/app/features/create-room/CreateRoomModal.tsx b/src/app/features/create-room/CreateRoomModal.tsx
index 5ecce259..57ea7fb3 100644
--- a/src/app/features/create-room/CreateRoomModal.tsx
+++ b/src/app/features/create-room/CreateRoomModal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import {
Box,
config,
diff --git a/src/app/features/create-space/CreateSpace.tsx b/src/app/features/create-space/CreateSpace.tsx
index 60b50ee9..a4808808 100644
--- a/src/app/features/create-space/CreateSpace.tsx
+++ b/src/app/features/create-space/CreateSpace.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useState } from 'react';
import { MatrixError, Room } from '$types/matrix-sdk';
import {
Box,
diff --git a/src/app/features/create-space/CreateSpaceModal.tsx b/src/app/features/create-space/CreateSpaceModal.tsx
index 939ed7ed..bda884df 100644
--- a/src/app/features/create-space/CreateSpaceModal.tsx
+++ b/src/app/features/create-space/CreateSpaceModal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import {
Box,
config,
diff --git a/src/app/features/join-before-navigate/JoinBeforeNavigate.tsx b/src/app/features/join-before-navigate/JoinBeforeNavigate.tsx
index babac537..c11ea99f 100644
--- a/src/app/features/join-before-navigate/JoinBeforeNavigate.tsx
+++ b/src/app/features/join-before-navigate/JoinBeforeNavigate.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text, toRem } from 'folds';
import { useAtomValue } from 'jotai';
import { RoomCard } from '$components/room-card';
diff --git a/src/app/features/lobby/DnD.tsx b/src/app/features/lobby/DnD.tsx
index 6835ddb2..71c6bf8e 100644
--- a/src/app/features/lobby/DnD.tsx
+++ b/src/app/features/lobby/DnD.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject, useEffect, useRef, useState } from 'react';
+import { RefObject, useEffect, useRef, useState } from 'react';
import {
dropTargetForElements,
draggable,
diff --git a/src/app/features/lobby/HierarchyItemMenu.tsx b/src/app/features/lobby/HierarchyItemMenu.tsx
index f67e5ff0..b598a6a5 100644
--- a/src/app/features/lobby/HierarchyItemMenu.tsx
+++ b/src/app/features/lobby/HierarchyItemMenu.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useEffect, useState } from 'react';
+import { MouseEventHandler, useCallback, useEffect, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Box,
diff --git a/src/app/features/lobby/Lobby.tsx b/src/app/features/lobby/Lobby.tsx
index a0ea7dd2..d52e1335 100644
--- a/src/app/features/lobby/Lobby.tsx
+++ b/src/app/features/lobby/Lobby.tsx
@@ -1,11 +1,9 @@
-import React, { MouseEventHandler, useCallback, useMemo, useRef, useState } from 'react';
+import { MouseEventHandler, useCallback, useMemo, useRef, useState } from 'react';
import { Box, Chip, Icon, IconButton, Icons, Line, Scroll, Spinner, Text, config } from 'folds';
import { useVirtualizer } from '@tanstack/react-virtual';
import { useAtom, useAtomValue } from 'jotai';
import { useNavigate } from 'react-router-dom';
-import { JoinRule, RestrictedAllowType, Room } from '$types/matrix-sdk';
-import { RoomJoinRulesEventContent } from '$types/matrix-sdk';
-import { IHierarchyRoom } from '$types/matrix-sdk';
+import { JoinRule, RestrictedAllowType, Room, RoomJoinRulesEventContent , IHierarchyRoom } from '$types/matrix-sdk';
import { produce } from 'immer';
import { useSpace } from '$hooks/useSpace';
import { Page, PageContent, PageContentCenter, PageHeroSection } from '$components/page';
@@ -215,7 +213,7 @@ export function Lobby() {
return [getRoom(i.space.roomId), ...childRooms];
})
- .filter((r) => !!r) as Room[],
+ .filter((r) => !!r),
[hierarchy, getRoom]
)
);
diff --git a/src/app/features/lobby/LobbyHeader.tsx b/src/app/features/lobby/LobbyHeader.tsx
index 9269e8a5..f495ffd2 100644
--- a/src/app/features/lobby/LobbyHeader.tsx
+++ b/src/app/features/lobby/LobbyHeader.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useState } from 'react';
import {
Avatar,
Box,
diff --git a/src/app/features/lobby/LobbyHero.tsx b/src/app/features/lobby/LobbyHero.tsx
index 55c9a26f..4c2a44c1 100644
--- a/src/app/features/lobby/LobbyHero.tsx
+++ b/src/app/features/lobby/LobbyHero.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Avatar, Overlay, OverlayBackdrop, OverlayCenter, Text } from 'folds';
import FocusTrap from 'focus-trap-react';
import { useRoomAvatar, useRoomName, useRoomTopic } from '$hooks/useRoomMeta';
diff --git a/src/app/features/lobby/RoomItem.tsx b/src/app/features/lobby/RoomItem.tsx
index 807f9cb8..eab56511 100644
--- a/src/app/features/lobby/RoomItem.tsx
+++ b/src/app/features/lobby/RoomItem.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, ReactNode, useCallback, useRef } from 'react';
+import { MouseEventHandler, ReactNode, useCallback, useRef } from 'react';
import {
Avatar,
Badge,
@@ -19,8 +19,7 @@ import {
toRem,
} from 'folds';
import FocusTrap from 'focus-trap-react';
-import { JoinRule, MatrixError, Room } from '$types/matrix-sdk';
-import { IHierarchyRoom } from '$types/matrix-sdk';
+import { JoinRule, MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
import { SequenceCard } from '$components/sequence-card';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/features/lobby/SpaceHierarchy.tsx b/src/app/features/lobby/SpaceHierarchy.tsx
index ab06cf13..827aebc7 100644
--- a/src/app/features/lobby/SpaceHierarchy.tsx
+++ b/src/app/features/lobby/SpaceHierarchy.tsx
@@ -1,6 +1,5 @@
-import React, { forwardRef, MouseEventHandler, useEffect, useMemo } from 'react';
-import { MatrixError, Room } from '$types/matrix-sdk';
-import { IHierarchyRoom } from '$types/matrix-sdk';
+import { forwardRef, MouseEventHandler, useEffect, useMemo } from 'react';
+import { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { Box, config, Text } from 'folds';
import {
HierarchyItem,
diff --git a/src/app/features/lobby/SpaceItem.tsx b/src/app/features/lobby/SpaceItem.tsx
index f12a3035..48009293 100644
--- a/src/app/features/lobby/SpaceItem.tsx
+++ b/src/app/features/lobby/SpaceItem.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, ReactNode, useCallback, useRef, useState } from 'react';
+import { MouseEventHandler, ReactNode, useCallback, useRef, useState } from 'react';
import {
Box,
Avatar,
@@ -18,8 +18,7 @@ import {
} from 'folds';
import FocusTrap from 'focus-trap-react';
import classNames from 'classnames';
-import { MatrixError, Room } from '$types/matrix-sdk';
-import { IHierarchyRoom } from '$types/matrix-sdk';
+import { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { HierarchyItem } from '$hooks/useSpaceHierarchy';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { RoomAvatar } from '$components/room-avatar';
diff --git a/src/app/features/message-search/MessageSearch.tsx b/src/app/features/message-search/MessageSearch.tsx
index b6537fea..fd96ebab 100644
--- a/src/app/features/message-search/MessageSearch.tsx
+++ b/src/app/features/message-search/MessageSearch.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject, useEffect, useMemo, useRef } from 'react';
+import { RefObject, useEffect, useMemo, useRef } from 'react';
import { Text, Box, Icon, Icons, config, Spinner, IconButton, Line, toRem } from 'folds';
import { useAtomValue } from 'jotai';
import { useVirtualizer } from '@tanstack/react-virtual';
diff --git a/src/app/features/message-search/SearchFilters.tsx b/src/app/features/message-search/SearchFilters.tsx
index d395b62b..7b08150c 100644
--- a/src/app/features/message-search/SearchFilters.tsx
+++ b/src/app/features/message-search/SearchFilters.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/features/message-search/SearchInput.tsx b/src/app/features/message-search/SearchInput.tsx
index 533eb5fd..ad1ca593 100644
--- a/src/app/features/message-search/SearchInput.tsx
+++ b/src/app/features/message-search/SearchInput.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, RefObject } from 'react';
+import { FormEventHandler, RefObject } from 'react';
import { Box, Text, Input, Icon, Icons, Spinner, Chip, config } from 'folds';
type SearchProps = {
diff --git a/src/app/features/message-search/SearchResultGroup.tsx b/src/app/features/message-search/SearchResultGroup.tsx
index afad0be1..5308cf3b 100644
--- a/src/app/features/message-search/SearchResultGroup.tsx
+++ b/src/app/features/message-search/SearchResultGroup.tsx
@@ -1,5 +1,5 @@
-/* eslint-disable react/destructuring-assignment */
-import React, { MouseEventHandler, useMemo } from 'react';
+
+import { MouseEventHandler, useMemo } from 'react';
import { IEventWithRoomId, JoinRule, RelationType, Room } from '$types/matrix-sdk';
import { HTMLReactParserOptions } from 'html-react-parser';
import { Avatar, Box, Chip, Header, Icon, Icons, Text, config } from 'folds';
diff --git a/src/app/features/room-nav/RoomCallNavStatus.tsx b/src/app/features/room-nav/RoomCallNavStatus.tsx
index b02b10bd..63073d4d 100644
--- a/src/app/features/room-nav/RoomCallNavStatus.tsx
+++ b/src/app/features/room-nav/RoomCallNavStatus.tsx
@@ -11,7 +11,6 @@ import {
TooltipProvider,
color,
} from 'folds';
-import React from 'react';
import { useCallState } from '$pages/client/call/CallProvider';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import * as css from './RoomCallNavStatus.css';
diff --git a/src/app/features/room-nav/RoomNavCategoryButton.tsx b/src/app/features/room-nav/RoomNavCategoryButton.tsx
index 3af8aeac..7adc6dcb 100644
--- a/src/app/features/room-nav/RoomNavCategoryButton.tsx
+++ b/src/app/features/room-nav/RoomNavCategoryButton.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { as, Chip, Icon, Icons, Text } from 'folds';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx
index 01ac62a5..f81220ec 100644
--- a/src/app/features/room-nav/RoomNavItem.tsx
+++ b/src/app/features/room-nav/RoomNavItem.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useState, MouseEvent } from 'react';
+import { MouseEventHandler, forwardRef, useState, MouseEvent } from 'react';
import { EventType, Room } from '$types/matrix-sdk';
import {
Avatar,
diff --git a/src/app/features/room-nav/RoomNavUser.tsx b/src/app/features/room-nav/RoomNavUser.tsx
index 891ca340..fba3cf9d 100644
--- a/src/app/features/room-nav/RoomNavUser.tsx
+++ b/src/app/features/room-nav/RoomNavUser.tsx
@@ -1,7 +1,6 @@
import { Avatar, Box, Icon, Icons, Text } from 'folds';
import React from 'react';
-import { Room } from '$types/matrix-sdk';
-import { CallMembership } from '$types/matrix-sdk';
+import { Room, CallMembership } from '$types/matrix-sdk';
import { NavButton, NavItem, NavItemContent } from '$components/nav';
import { UserAvatar } from '$components/user-avatar';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx
index cce7b970..ed34331b 100644
--- a/src/app/features/room-settings/RoomSettings.tsx
+++ b/src/app/features/room-settings/RoomSettings.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
import { useAtomValue } from 'jotai';
import { Avatar, Box, config, Icon, IconButton, Icons, IconSrc, MenuItem, Text } from 'folds';
import { JoinRule } from '$types/matrix-sdk';
@@ -18,7 +18,6 @@ import { RoomSettingsPage } from '$state/roomSettings';
import { useRoom } from '$hooks/useRoom';
import { DeveloperTools } from '../common-settings/developer-tools';
import { Cosmetics } from '../common-settings/cosmetics/Cosmetics';
-import { SwipeableChatWrapper } from '$components/SwipeableChatWrapper';
import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper';
type RoomSettingsMenuItem = {
diff --git a/src/app/features/room-settings/RoomSettingsRenderer.tsx b/src/app/features/room-settings/RoomSettingsRenderer.tsx
index d1a704e3..4a59d01b 100644
--- a/src/app/features/room-settings/RoomSettingsRenderer.tsx
+++ b/src/app/features/room-settings/RoomSettingsRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { RoomSettings } from './RoomSettings';
import { Modal500 } from '$components/Modal500';
import { useCloseRoomSettings, useRoomSettingsState } from '$state/hooks/roomSettings';
diff --git a/src/app/features/room-settings/general/General.tsx b/src/app/features/room-settings/general/General.tsx
index 76187545..c4546b60 100644
--- a/src/app/features/room-settings/general/General.tsx
+++ b/src/app/features/room-settings/general/General.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { usePowerLevels } from '$hooks/usePowerLevels';
diff --git a/src/app/features/room-settings/permissions/Permissions.tsx b/src/app/features/room-settings/permissions/Permissions.tsx
index 4c943ade..f10b4fab 100644
--- a/src/app/features/room-settings/permissions/Permissions.tsx
+++ b/src/app/features/room-settings/permissions/Permissions.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { useRoom } from '$hooks/useRoom';
diff --git a/src/app/features/room/CommandAutocomplete.tsx b/src/app/features/room/CommandAutocomplete.tsx
index cb3b09fb..dc51ae6f 100644
--- a/src/app/features/room/CommandAutocomplete.tsx
+++ b/src/app/features/room/CommandAutocomplete.tsx
@@ -1,4 +1,4 @@
-import React, { KeyboardEvent as ReactKeyboardEvent, useCallback, useEffect, useMemo } from 'react';
+import { KeyboardEvent as ReactKeyboardEvent, useCallback, useEffect, useMemo } from 'react';
import { Editor } from 'slate';
import { Box, config, MenuItem, Text } from 'folds';
import { Room } from '$types/matrix-sdk';
diff --git a/src/app/features/room/MembersDrawer.tsx b/src/app/features/room/MembersDrawer.tsx
index 5384484c..8b1f955e 100644
--- a/src/app/features/room/MembersDrawer.tsx
+++ b/src/app/features/room/MembersDrawer.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/features/room/Room.tsx b/src/app/features/room/Room.tsx
index f9093cf8..ebd7b2aa 100644
--- a/src/app/features/room/Room.tsx
+++ b/src/app/features/room/Room.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { Box, Line } from 'folds';
import { useParams } from 'react-router-dom';
import { isKeyHotkey } from 'is-hotkey';
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index 379dc4a6..c6234690 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -116,13 +116,6 @@ import { roomToParentsAtom } from '$state/room/roomToParents';
import { nicknamesAtom } from '$state/nicknames';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useImagePackRooms } from '$hooks/useImagePackRooms';
-import { usePowerLevelsContext } from '$hooks/usePowerLevels';
-import { useIsDirectRoom } from '$hooks/useRoom';
-import { useAccessiblePowerTagColors, useGetMemberPowerTag } from '$hooks/useMemberPowerTag';
-import { useRoomCreators } from '$hooks/useRoomCreators';
-import { useTheme } from '$hooks/useTheme';
-import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
-import { usePowerLevelTags } from '$hooks/usePowerLevelTags';
import { useComposingCheck } from '$hooks/useComposingCheck';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
@@ -495,7 +488,7 @@ export const RoomInput = forwardRef(
.reverse()
.map((fileItem, index) => (
(
@@ -1115,7 +1111,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
const myReaction = reactions.find(factoryEventSentBy(mx.getUserId()!));
if (myReaction && !!(myReaction as any)?.isRelation()) {
- mx.redactEvent(room.roomId, (myReaction as any).getId()!);
+ mx.redactEvent(room.roomId, (myReaction as any).getId());
return;
}
const rShortcode =
diff --git a/src/app/features/room/RoomTombstone.tsx b/src/app/features/room/RoomTombstone.tsx
index ef9edfb2..abaf5714 100644
--- a/src/app/features/room/RoomTombstone.tsx
+++ b/src/app/features/room/RoomTombstone.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { Box, Button, Spinner, Text, color } from 'folds';
import * as css from './RoomTombstone.css';
diff --git a/src/app/features/room/RoomView.tsx b/src/app/features/room/RoomView.tsx
index 0b4c5ee0..fe21af3d 100644
--- a/src/app/features/room/RoomView.tsx
+++ b/src/app/features/room/RoomView.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useRef } from 'react';
+import { useCallback, useRef } from 'react';
import { Box, Text, config, toRem } from 'folds';
import { EventType, Room } from '$types/matrix-sdk';
import { ReactEditor } from 'slate-react';
diff --git a/src/app/features/room/RoomViewFollowing.tsx b/src/app/features/room/RoomViewFollowing.tsx
index 046d0b54..fa1ab0c5 100644
--- a/src/app/features/room/RoomViewFollowing.tsx
+++ b/src/app/features/room/RoomViewFollowing.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import {
Box,
Icon,
diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx
index d87cdec2..f4d9540c 100644
--- a/src/app/features/room/RoomViewHeader.tsx
+++ b/src/app/features/room/RoomViewHeader.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useEffect, useState } from 'react';
+import { MouseEventHandler, forwardRef, useEffect, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Box,
diff --git a/src/app/features/room/RoomViewTyping.tsx b/src/app/features/room/RoomViewTyping.tsx
index 188e2ee1..547cfb7a 100644
--- a/src/app/features/room/RoomViewTyping.tsx
+++ b/src/app/features/room/RoomViewTyping.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Text, as } from 'folds';
import { Room } from '$types/matrix-sdk';
import classNames from 'classnames';
diff --git a/src/app/features/room/jump-to-time/JumpToTime.tsx b/src/app/features/room/jump-to-time/JumpToTime.tsx
index e6f7201a..5aa99c0c 100644
--- a/src/app/features/room/jump-to-time/JumpToTime.tsx
+++ b/src/app/features/room/jump-to-time/JumpToTime.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useMemo, useState } from 'react';
+import { MouseEventHandler, useCallback, useMemo, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Dialog,
diff --git a/src/app/features/room/message/EncryptedContent.tsx b/src/app/features/room/message/EncryptedContent.tsx
index 79db79e7..e0084d08 100644
--- a/src/app/features/room/message/EncryptedContent.tsx
+++ b/src/app/features/room/message/EncryptedContent.tsx
@@ -1,5 +1,5 @@
import { MatrixEvent, MatrixEventEvent, MatrixEventHandlerMap } from '$types/matrix-sdk';
-import React, { ReactNode, useEffect, useState } from 'react';
+import { ReactNode, useEffect, useState } from 'react';
import { MessageEvent } from '$types/matrix/room';
type EncryptedContentProps = {
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index ff7882aa..7601813b 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -24,11 +24,9 @@ import React, {
} from 'react';
import FocusTrap from 'focus-trap-react';
import { useHover, useFocusWithin } from 'react-aria';
-import { MatrixEvent, Room } from '$types/matrix-sdk';
-import { Relations } from '$types/matrix-sdk';
+import { MatrixEvent, Room, Relations , RoomPinnedEventsEventContent } from '$types/matrix-sdk';
import classNames from 'classnames';
import { useAtomValue, useSetAtom } from 'jotai';
-import { RoomPinnedEventsEventContent } from '$types/matrix-sdk';
import {
AvatarBase,
BubbleLayout,
@@ -46,11 +44,7 @@ import { nicknamesAtom, setNicknameAtom } from '$state/nicknames';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRecentEmoji } from '$hooks/useRecentEmoji';
import * as css from './styles.css';
-import { EventReaders } from '$components/event-readers';
-import { TextViewer } from '$components/text-viewer';
-import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { EmojiBoard } from '$components/emoji-board';
-import { ReactionViewer } from '../reaction-viewer';
import { MessageEditor } from './MessageEditor';
import { UserAvatar } from '$components/user-avatar';
import { copyToClipboard } from '$appUtils/dom';
@@ -760,7 +754,7 @@ function MessageInternal(
>
Nickname
setNickDraft(e.target.value)}
diff --git a/src/app/features/room/message/MessageEditor.tsx b/src/app/features/room/message/MessageEditor.tsx
index d257662a..3c77a698 100644
--- a/src/app/features/room/message/MessageEditor.tsx
+++ b/src/app/features/room/message/MessageEditor.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
KeyboardEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/features/room/message/Reactions.tsx b/src/app/features/room/message/Reactions.tsx
index 263cbe8e..7d724e0b 100644
--- a/src/app/features/room/message/Reactions.tsx
+++ b/src/app/features/room/message/Reactions.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEventHandler, useCallback, useState } from 'react';
import {
Box,
Modal,
diff --git a/src/app/features/room/reaction-viewer/ReactionViewer.tsx b/src/app/features/room/reaction-viewer/ReactionViewer.tsx
index 1cf0319d..1bfd7984 100644
--- a/src/app/features/room/reaction-viewer/ReactionViewer.tsx
+++ b/src/app/features/room/reaction-viewer/ReactionViewer.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import classNames from 'classnames';
import {
Avatar,
@@ -14,8 +14,7 @@ import {
as,
config,
} from 'folds';
-import { MatrixEvent, Room, RoomMember } from '$types/matrix-sdk';
-import { Relations } from '$types/matrix-sdk';
+import { MatrixEvent, Room, RoomMember, Relations } from '$types/matrix-sdk';
import { getMemberDisplayName } from '$appUtils/room';
import { eventWithShortcode, getMxIdLocalPart } from '$appUtils/matrix';
import * as css from './ReactionViewer.css';
diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
index de1c0f12..37e78506 100644
--- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
+++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
@@ -1,7 +1,6 @@
-/* eslint-disable react/destructuring-assignment */
-import React, { forwardRef, MouseEventHandler, useCallback, useMemo, useRef } from 'react';
-import { MatrixEvent, Room } from '$types/matrix-sdk';
-import { RoomPinnedEventsEventContent } from '$types/matrix-sdk';
+
+import { forwardRef, MouseEventHandler, useCallback, useMemo, useRef } from 'react';
+import { MatrixEvent, Room, RoomPinnedEventsEventContent } from '$types/matrix-sdk';
import {
Avatar,
Box,
diff --git a/src/app/features/search/Search.tsx b/src/app/features/search/Search.tsx
index a48b4e14..a33bda54 100644
--- a/src/app/features/search/Search.tsx
+++ b/src/app/features/search/Search.tsx
@@ -15,7 +15,7 @@ import {
Text,
toRem,
} from 'folds';
-import React, {
+import {
ChangeEventHandler,
KeyboardEventHandler,
MouseEventHandler,
diff --git a/src/app/features/settings/Settings.tsx b/src/app/features/settings/Settings.tsx
index 2412c9d8..720d24b7 100644
--- a/src/app/features/settings/Settings.tsx
+++ b/src/app/features/settings/Settings.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
import {
Avatar,
Box,
diff --git a/src/app/features/settings/about/About.tsx b/src/app/features/settings/about/About.tsx
index 53d3e1bd..3ae6fdbd 100644
--- a/src/app/features/settings/about/About.tsx
+++ b/src/app/features/settings/about/About.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll, Button, config, toRem } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/account/Account.tsx b/src/app/features/settings/account/Account.tsx
index 225a9309..c6c3aa8f 100644
--- a/src/app/features/settings/account/Account.tsx
+++ b/src/app/features/settings/account/Account.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { MatrixId } from './MatrixId';
diff --git a/src/app/features/settings/account/BioEditor.tsx b/src/app/features/settings/account/BioEditor.tsx
index 31d77049..ce83140e 100644
--- a/src/app/features/settings/account/BioEditor.tsx
+++ b/src/app/features/settings/account/BioEditor.tsx
@@ -1,4 +1,4 @@
-import React, { KeyboardEventHandler, useCallback, useEffect, useState, useRef } from 'react';
+import { KeyboardEventHandler, useCallback, useEffect, useState, useRef } from 'react';
import {
Box,
Chip,
diff --git a/src/app/features/settings/account/ContactInfo.tsx b/src/app/features/settings/account/ContactInfo.tsx
index d62ed168..b34faa0d 100644
--- a/src/app/features/settings/account/ContactInfo.tsx
+++ b/src/app/features/settings/account/ContactInfo.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import { Box, Text, Chip } from 'folds';
import { SequenceCard } from '$components/sequence-card';
import { SequenceCardStyle } from '../styles.css';
diff --git a/src/app/features/settings/account/IgnoredUserList.tsx b/src/app/features/settings/account/IgnoredUserList.tsx
index 9fc2bb5e..75395f96 100644
--- a/src/app/features/settings/account/IgnoredUserList.tsx
+++ b/src/app/features/settings/account/IgnoredUserList.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEventHandler, FormEventHandler, useCallback, useState } from 'react';
+import { ChangeEventHandler, FormEventHandler, useCallback, useState } from 'react';
import { Box, Button, Chip, Icon, IconButton, Icons, Input, Spinner, Text, config } from 'folds';
import { SequenceCard } from '$components/sequence-card';
import { SequenceCardStyle } from '../styles.css';
diff --git a/src/app/features/settings/account/MatrixId.tsx b/src/app/features/settings/account/MatrixId.tsx
index a019ef3f..a7f1c008 100644
--- a/src/app/features/settings/account/MatrixId.tsx
+++ b/src/app/features/settings/account/MatrixId.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, Chip } from 'folds';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/account/NameColorEditor.tsx b/src/app/features/settings/account/NameColorEditor.tsx
index 4f3da4fc..1bfa060c 100644
--- a/src/app/features/settings/account/NameColorEditor.tsx
+++ b/src/app/features/settings/account/NameColorEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
import { Box, Button, config, Text, Input, IconButton, Icon, Icons } from 'folds';
import { HexColorPicker } from 'react-colorful';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx
index 249ddafa..9be959e4 100644
--- a/src/app/features/settings/account/Profile.tsx
+++ b/src/app/features/settings/account/Profile.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
FormEventHandler,
useCallback,
diff --git a/src/app/features/settings/account/PronounEditor.tsx b/src/app/features/settings/account/PronounEditor.tsx
index 8cab2db2..0f5f8bc4 100644
--- a/src/app/features/settings/account/PronounEditor.tsx
+++ b/src/app/features/settings/account/PronounEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, ChangeEvent } from 'react';
+import { useState, useEffect, ChangeEvent } from 'react';
import { Input } from 'folds';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/settings/account/TimezoneEditor.tsx b/src/app/features/settings/account/TimezoneEditor.tsx
index e17b0516..7f85c974 100644
--- a/src/app/features/settings/account/TimezoneEditor.tsx
+++ b/src/app/features/settings/account/TimezoneEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState, useEffect, ChangeEvent } from 'react';
+import { useMemo, useState, useEffect, ChangeEvent } from 'react';
import { Box, IconButton, Icon, Icons, Input } from 'folds';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/settings/cosmetics/Cosmetics.tsx b/src/app/features/settings/cosmetics/Cosmetics.tsx
index bdd54d35..bf6cbdb3 100644
--- a/src/app/features/settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/settings/cosmetics/Cosmetics.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useState } from 'react';
+import { MouseEventHandler, useState } from 'react';
import {
Box,
Button,
diff --git a/src/app/features/settings/cosmetics/Themes.tsx b/src/app/features/settings/cosmetics/Themes.tsx
index ae1a1118..814045aa 100644
--- a/src/app/features/settings/cosmetics/Themes.tsx
+++ b/src/app/features/settings/cosmetics/Themes.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
KeyboardEventHandler,
MouseEventHandler,
diff --git a/src/app/features/settings/developer-tools/AccountData.tsx b/src/app/features/settings/developer-tools/AccountData.tsx
index 2aedcc98..5bc06b3c 100644
--- a/src/app/features/settings/developer-tools/AccountData.tsx
+++ b/src/app/features/settings/developer-tools/AccountData.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Box, Text, Icon, Icons, Button, MenuItem } from 'folds';
import { SequenceCard } from '$components/sequence-card';
import { SequenceCardStyle } from '../styles.css';
@@ -17,14 +17,14 @@ export function AccountData({ expand, onExpandToggle, onSelect }: AccountDataPro
const [accountDataTypes, setAccountDataKeys] = useState(
() =>
// TODO: tighten this once account data event typing is standardized.
- Array.from(mx.store.accountData.keys()) as string[]
+ Array.from(mx.store.accountData.keys())
);
useAccountDataCallback(
mx,
useCallback(() => {
// TODO: tighten this once account data event typing is standardized.
- setAccountDataKeys(Array.from(mx.store.accountData.keys()) as string[]);
+ setAccountDataKeys(Array.from(mx.store.accountData.keys()));
}, [mx])
);
diff --git a/src/app/features/settings/developer-tools/DevelopTools.tsx b/src/app/features/settings/developer-tools/DevelopTools.tsx
index e7b14db3..c81172d3 100644
--- a/src/app/features/settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/settings/developer-tools/DevelopTools.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll, Switch, Button } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/devices/DeviceTile.tsx b/src/app/features/settings/devices/DeviceTile.tsx
index 5e78f1cb..42631fa3 100644
--- a/src/app/features/settings/devices/DeviceTile.tsx
+++ b/src/app/features/settings/devices/DeviceTile.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, ReactNode, useCallback, useEffect, useState } from 'react';
+import { FormEventHandler, ReactNode, useCallback, useEffect, useState } from 'react';
import {
Box,
Text,
@@ -15,9 +15,8 @@ import {
OverlayBackdrop,
OverlayCenter,
} from 'folds';
-import { CryptoApi } from '$types/matrix-sdk';
+import { CryptoApi, IMyDevice, MatrixError } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
-import { IMyDevice, MatrixError } from '$types/matrix-sdk';
import { SettingTile } from '$components/setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { timeDayMonYear, timeHourMinute, today, yesterday } from '$appUtils/time';
diff --git a/src/app/features/settings/devices/Devices.tsx b/src/app/features/settings/devices/Devices.tsx
index cce0322c..3d8ac109 100644
--- a/src/app/features/settings/devices/Devices.tsx
+++ b/src/app/features/settings/devices/Devices.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/devices/LocalBackup.tsx b/src/app/features/settings/devices/LocalBackup.tsx
index b797a91f..eb05777c 100644
--- a/src/app/features/settings/devices/LocalBackup.tsx
+++ b/src/app/features/settings/devices/LocalBackup.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useState } from 'react';
import { Box, Button, color, Icon, Icons, Spinner, Text, toRem } from 'folds';
import FileSaver from 'file-saver';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/devices/OtherDevices.tsx b/src/app/features/settings/devices/OtherDevices.tsx
index e570575d..ec61a84e 100644
--- a/src/app/features/settings/devices/OtherDevices.tsx
+++ b/src/app/features/settings/devices/OtherDevices.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Box, Button, config, Menu, Spinner, Text } from 'folds';
import { AuthDict, IMyDevice, MatrixError } from '$types/matrix-sdk';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/devices/Verification.tsx b/src/app/features/settings/devices/Verification.tsx
index ac9c5af1..adea4d61 100644
--- a/src/app/features/settings/devices/Verification.tsx
+++ b/src/app/features/settings/devices/Verification.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEventHandler, useCallback, useState } from 'react';
import {
Badge,
Box,
diff --git a/src/app/features/settings/emojis-stickers/EmojisStickers.tsx b/src/app/features/settings/emojis-stickers/EmojisStickers.tsx
index 60557f99..482945f3 100644
--- a/src/app/features/settings/emojis-stickers/EmojisStickers.tsx
+++ b/src/app/features/settings/emojis-stickers/EmojisStickers.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { GlobalPacks } from './GlobalPacks';
diff --git a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
index 2864adcf..0d34477a 100644
--- a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
+++ b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
+import { MouseEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/settings/emojis-stickers/UserPack.tsx b/src/app/features/settings/emojis-stickers/UserPack.tsx
index 1ed91917..50673df0 100644
--- a/src/app/features/settings/emojis-stickers/UserPack.tsx
+++ b/src/app/features/settings/emojis-stickers/UserPack.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Avatar, AvatarFallback, AvatarImage, Box, Button, Icon, Icons, Text } from 'folds';
import { useUserImagePack } from '$hooks/useImagePacks';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx
index fc78c8cf..84d0c039 100644
--- a/src/app/features/settings/general/General.tsx
+++ b/src/app/features/settings/general/General.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
FormEventHandler,
MouseEventHandler,
diff --git a/src/app/features/settings/notifications/AllMessages.tsx b/src/app/features/settings/notifications/AllMessages.tsx
index 73276440..ed22fa60 100644
--- a/src/app/features/settings/notifications/AllMessages.tsx
+++ b/src/app/features/settings/notifications/AllMessages.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { Badge, Box, Text } from 'folds';
import {
ConditionKind,
diff --git a/src/app/features/settings/notifications/KeywordMessages.tsx b/src/app/features/settings/notifications/KeywordMessages.tsx
index 5c649933..bb8c22b8 100644
--- a/src/app/features/settings/notifications/KeywordMessages.tsx
+++ b/src/app/features/settings/notifications/KeywordMessages.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEventHandler, FormEventHandler, useCallback, useMemo, useState } from 'react';
+import { ChangeEventHandler, FormEventHandler, useCallback, useMemo, useState } from 'react';
import { IPushRule, IPushRules, PushRuleKind } from '$types/matrix-sdk';
import { Box, Text, Badge, Button, Input, config, IconButton, Icons, Icon, Spinner } from 'folds';
import { useAccountData } from '$hooks/useAccountData';
diff --git a/src/app/features/settings/notifications/NotificationModeSwitcher.tsx b/src/app/features/settings/notifications/NotificationModeSwitcher.tsx
index 18a24adc..e9a7e182 100644
--- a/src/app/features/settings/notifications/NotificationModeSwitcher.tsx
+++ b/src/app/features/settings/notifications/NotificationModeSwitcher.tsx
@@ -12,7 +12,7 @@ import {
Text,
} from 'folds';
import { IPushRule } from '$types/matrix-sdk';
-import React, { MouseEventHandler, useMemo, useState } from 'react';
+import { MouseEventHandler, useMemo, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { NotificationMode, useNotificationActionsMode } from '$hooks/useNotificationMode';
import { stopPropagation } from '$appUtils/keyboard';
diff --git a/src/app/features/settings/notifications/Notifications.tsx b/src/app/features/settings/notifications/Notifications.tsx
index 66220cd5..d939fda1 100644
--- a/src/app/features/settings/notifications/Notifications.tsx
+++ b/src/app/features/settings/notifications/Notifications.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SystemNotification } from './SystemNotification';
diff --git a/src/app/features/settings/notifications/SpecialMessages.tsx b/src/app/features/settings/notifications/SpecialMessages.tsx
index 1a94f5c4..11d25354 100644
--- a/src/app/features/settings/notifications/SpecialMessages.tsx
+++ b/src/app/features/settings/notifications/SpecialMessages.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { ConditionKind, IPushRules, PushRuleKind, RuleId } from '$types/matrix-sdk';
import { Box, Text, Badge } from 'folds';
import { useAccountData } from '$hooks/useAccountData';
diff --git a/src/app/features/settings/notifications/SystemNotification.tsx b/src/app/features/settings/notifications/SystemNotification.tsx
index a28c7878..97679777 100644
--- a/src/app/features/settings/notifications/SystemNotification.tsx
+++ b/src/app/features/settings/notifications/SystemNotification.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { Box, Text, Switch, Button, color, Spinner } from 'folds';
import { IPusherRequest } from '$types/matrix-sdk';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/space-settings/SpaceSettings.tsx b/src/app/features/space-settings/SpaceSettings.tsx
index a116cd61..43e55526 100644
--- a/src/app/features/space-settings/SpaceSettings.tsx
+++ b/src/app/features/space-settings/SpaceSettings.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
import { useAtomValue } from 'jotai';
import { Avatar, Box, config, Icon, IconButton, Icons, IconSrc, MenuItem, Text } from 'folds';
import { JoinRule } from '$types/matrix-sdk';
diff --git a/src/app/features/space-settings/SpaceSettingsRenderer.tsx b/src/app/features/space-settings/SpaceSettingsRenderer.tsx
index 31289dd4..6431f0a0 100644
--- a/src/app/features/space-settings/SpaceSettingsRenderer.tsx
+++ b/src/app/features/space-settings/SpaceSettingsRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { SpaceSettings } from './SpaceSettings';
import { Modal500 } from '$components/Modal500';
import { useCloseSpaceSettings, useSpaceSettingsState } from '$state/hooks/spaceSettings';
diff --git a/src/app/features/space-settings/general/General.tsx b/src/app/features/space-settings/general/General.tsx
index 2c305fe3..8cee28c6 100644
--- a/src/app/features/space-settings/general/General.tsx
+++ b/src/app/features/space-settings/general/General.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { usePowerLevels } from '$hooks/usePowerLevels';
diff --git a/src/app/features/space-settings/permissions/Permissions.tsx b/src/app/features/space-settings/permissions/Permissions.tsx
index 33817cb0..388212a6 100644
--- a/src/app/features/space-settings/permissions/Permissions.tsx
+++ b/src/app/features/space-settings/permissions/Permissions.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { useRoom } from '$hooks/useRoom';
diff --git a/src/app/features/widgets/GenericWidgetDriver.ts b/src/app/features/widgets/GenericWidgetDriver.ts
index a26e1c73..21819a18 100644
--- a/src/app/features/widgets/GenericWidgetDriver.ts
+++ b/src/app/features/widgets/GenericWidgetDriver.ts
@@ -93,7 +93,7 @@ export class GenericWidgetDriver extends WidgetDriver {
content as TimelineEvents[keyof TimelineEvents]
);
}
- return { roomId, eventId: r!.event_id };
+ return { roomId, eventId: r.event_id };
}
public async sendDelayedEvent(
diff --git a/src/app/features/widgets/IntegrationManager.tsx b/src/app/features/widgets/IntegrationManager.tsx
index abe056df..3c22783b 100644
--- a/src/app/features/widgets/IntegrationManager.tsx
+++ b/src/app/features/widgets/IntegrationManager.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
import {
Box,
Header,
diff --git a/src/app/features/widgets/WidgetIframe.tsx b/src/app/features/widgets/WidgetIframe.tsx
index 7f6c589a..bd6c6f58 100644
--- a/src/app/features/widgets/WidgetIframe.tsx
+++ b/src/app/features/widgets/WidgetIframe.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
import { ClientWidgetApi, IWidget, IRoomEvent, Widget, WidgetKind } from 'matrix-widget-api';
import {
ClientEvent,
@@ -129,7 +129,7 @@ export function WidgetIframe({ widget, roomId, mx, onCapabilityRequest }: Widget
messagingRef.current = null;
setReady(false);
};
- }, [widget.id, roomId, mx]); // eslint-disable-line react-hooks/exhaustive-deps
+ }, [widget.id, roomId, mx]);
return (
diff --git a/src/app/features/settings/notifications/SpecialMessages.tsx b/src/app/features/settings/notifications/SpecialMessages.tsx
index 1a94f5c4..1feb7564 100644
--- a/src/app/features/settings/notifications/SpecialMessages.tsx
+++ b/src/app/features/settings/notifications/SpecialMessages.tsx
@@ -4,7 +4,6 @@ import { Box, Text, Badge } from 'folds';
import { useAccountData } from '$hooks/useAccountData';
import { AccountDataEvent } from '$types/matrix/accountData';
import { SequenceCard } from '$components/sequence-card';
-import { SequenceCardStyle } from '../styles.css';
import { SettingTile } from '$components/setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useUserProfile } from '$hooks/useUserProfile';
@@ -16,6 +15,7 @@ import {
NotificationModeOptions,
useNotificationModeActions,
} from '$hooks/useNotificationMode';
+import { SequenceCardStyle } from '../styles.css';
import { NotificationModeSwitcher } from './NotificationModeSwitcher';
const NOTIFY_MODE_OPS: NotificationModeOptions = {
diff --git a/src/app/features/settings/notifications/SystemNotification.tsx b/src/app/features/settings/notifications/SystemNotification.tsx
index a28c7878..1ae74465 100644
--- a/src/app/features/settings/notifications/SystemNotification.tsx
+++ b/src/app/features/settings/notifications/SystemNotification.tsx
@@ -2,7 +2,6 @@ import React, { useCallback } from 'react';
import { Box, Text, Switch, Button, color, Spinner } from 'folds';
import { IPusherRequest } from '$types/matrix-sdk';
import { SequenceCard } from '$components/sequence-card';
-import { SequenceCardStyle } from '../styles.css';
import { SettingTile } from '$components/setting-tile';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
@@ -10,6 +9,7 @@ import { getNotificationState, usePermissionState } from '$hooks/usePermission';
import { useEmailNotifications } from '$hooks/useEmailNotifications';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useMatrixClient } from '$hooks/useMatrixClient';
+import { SequenceCardStyle } from '../styles.css';
function EmailNotification() {
const mx = useMatrixClient();
diff --git a/src/app/features/space-settings/SpaceSettingsRenderer.tsx b/src/app/features/space-settings/SpaceSettingsRenderer.tsx
index 31289dd4..78de9ff4 100644
--- a/src/app/features/space-settings/SpaceSettingsRenderer.tsx
+++ b/src/app/features/space-settings/SpaceSettingsRenderer.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import { SpaceSettings } from './SpaceSettings';
import { Modal500 } from '$components/Modal500';
import { useCloseSpaceSettings, useSpaceSettingsState } from '$state/hooks/spaceSettings';
import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
import { SpaceSettingsState } from '$state/spaceSettings';
import { RoomProvider } from '$hooks/useRoom';
import { SpaceProvider } from '$hooks/useSpace';
+import { SpaceSettings } from './SpaceSettings';
type RenderSettingsProps = {
state: SpaceSettingsState;
diff --git a/src/app/features/space-settings/permissions/Permissions.tsx b/src/app/features/space-settings/permissions/Permissions.tsx
index 33817cb0..a12ca201 100644
--- a/src/app/features/space-settings/permissions/Permissions.tsx
+++ b/src/app/features/space-settings/permissions/Permissions.tsx
@@ -5,10 +5,10 @@ import { useRoom } from '$hooks/useRoom';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { StateEvent } from '$types/matrix/room';
-import { usePermissionGroups } from './usePermissionItems';
import { PermissionGroups, Powers, PowersEditor } from '$features/common-settings/permissions';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
+import { usePermissionGroups } from './usePermissionItems';
type PermissionsProps = {
requestClose: () => void;
diff --git a/src/app/features/widgets/GenericWidgetDriver.ts b/src/app/features/widgets/GenericWidgetDriver.ts
index a26e1c73..99358bf6 100644
--- a/src/app/features/widgets/GenericWidgetDriver.ts
+++ b/src/app/features/widgets/GenericWidgetDriver.ts
@@ -34,6 +34,7 @@ export type CapabilityApprovalCallback = (requested: Set) => Promise
// this driver provides a capability approval mechanism for untrusted widgets.
export class GenericWidgetDriver extends WidgetDriver {
private readonly mxClient: MatrixClient;
+
private readonly approveCapabilities: CapabilityApprovalCallback;
public constructor(
@@ -300,7 +301,7 @@ export class GenericWidgetDriver extends WidgetDriver {
}
public async getMediaConfig(): Promise {
- return await this.mxClient.getMediaConfig();
+ return this.mxClient.getMediaConfig();
}
public async uploadFile(file: XMLHttpRequestBodyInit): Promise<{ contentUri: string }> {
diff --git a/src/app/features/widgets/IntegrationManager.tsx b/src/app/features/widgets/IntegrationManager.tsx
index abe056df..982b15b9 100644
--- a/src/app/features/widgets/IntegrationManager.tsx
+++ b/src/app/features/widgets/IntegrationManager.tsx
@@ -14,8 +14,8 @@ import {
import FocusTrap from 'focus-trap-react';
import { Room } from '$types/matrix-sdk';
-import * as css from './IntegrationManager.css';
import { useIntegrationManager, buildIntegrationManagerUrl } from '$hooks/useIntegrationManager';
+import * as css from './IntegrationManager.css';
interface IntegrationManagerProps {
room: Room;
diff --git a/src/app/features/widgets/WidgetIframe.tsx b/src/app/features/widgets/WidgetIframe.tsx
index 7f6c589a..44d868c7 100644
--- a/src/app/features/widgets/WidgetIframe.tsx
+++ b/src/app/features/widgets/WidgetIframe.tsx
@@ -8,8 +8,8 @@ import {
MatrixEvent,
MatrixEventEvent,
} from '$types/matrix-sdk';
-import { GenericWidgetDriver, CapabilityApprovalCallback } from './GenericWidgetDriver';
import { resolveWidgetUrl } from '$hooks/useRoomWidgets';
+import { GenericWidgetDriver, CapabilityApprovalCallback } from './GenericWidgetDriver';
interface WidgetIframeProps {
widget: IWidget;
diff --git a/src/app/features/widgets/WidgetsDrawer.tsx b/src/app/features/widgets/WidgetsDrawer.tsx
index 26a91197..d8f7529e 100644
--- a/src/app/features/widgets/WidgetsDrawer.tsx
+++ b/src/app/features/widgets/WidgetsDrawer.tsx
@@ -17,16 +17,16 @@ import {
} from 'folds';
import { Room } from '$types/matrix-sdk';
-import * as css from './WidgetsDrawer.css';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRoomWidgets, RoomWidget, enrichWidgetUrl } from '$hooks/useRoomWidgets';
-import { WidgetIframe } from './WidgetIframe';
import { useSetSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
import { StateEvent } from '$types/matrix/room';
+import { WidgetIframe } from './WidgetIframe';
+import * as css from './WidgetsDrawer.css';
import { IntegrationManager } from './IntegrationManager';
type WidgetsDrawerHeaderProps = {
diff --git a/src/app/hooks/router/useSelectedSpace.ts b/src/app/hooks/router/useSelectedSpace.ts
index 59daaa71..f9e85b84 100644
--- a/src/app/hooks/router/useSelectedSpace.ts
+++ b/src/app/hooks/router/useSelectedSpace.ts
@@ -1,7 +1,7 @@
import { useMatch, useParams } from 'react-router-dom';
import { getCanonicalAliasRoomId, isRoomAlias } from '$appUtils/matrix';
-import { useMatrixClient } from '../useMatrixClient';
import { getSpaceLobbyPath, getSpaceSearchPath } from '$pages/pathUtils';
+import { useMatrixClient } from '../useMatrixClient';
export const useSelectedSpace = (): string | undefined => {
const mx = useMatrixClient();
diff --git a/src/app/hooks/useAuthFlows.ts b/src/app/hooks/useAuthFlows.ts
index 28d9ece2..8d82435e 100644
--- a/src/app/hooks/useAuthFlows.ts
+++ b/src/app/hooks/useAuthFlows.ts
@@ -1,6 +1,5 @@
import { createContext, useContext } from 'react';
-import { IAuthData, MatrixError } from '$types/matrix-sdk';
-import { ILoginFlowsResponse } from '$types/matrix-sdk';
+import { IAuthData, MatrixError, ILoginFlowsResponse } from '$types/matrix-sdk';
export enum RegisterFlowStatus {
FlowRequired = 401,
diff --git a/src/app/hooks/useCallMemberships.ts b/src/app/hooks/useCallMemberships.ts
index e04001d2..9d1cd088 100644
--- a/src/app/hooks/useCallMemberships.ts
+++ b/src/app/hooks/useCallMemberships.ts
@@ -1,6 +1,9 @@
-import { MatrixClient } from '$types/matrix-sdk';
-import { MatrixRTCSession, MatrixRTCSessionEvent } from '$types/matrix-sdk';
-import { CallMembership } from '$types/matrix-sdk';
+import {
+ MatrixClient,
+ MatrixRTCSession,
+ MatrixRTCSessionEvent,
+ CallMembership,
+} from '$types/matrix-sdk';
import { useEffect, useState } from 'react';
export const useCallMembers = (mx: MatrixClient, roomId: string): CallMembership[] => {
diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts
index e1094317..2a1f76e5 100644
--- a/src/app/hooks/useCommands.ts
+++ b/src/app/hooks/useCommands.ts
@@ -9,9 +9,11 @@ import {
Room,
RoomMember,
Visibility,
+ RoomServerAclEventContent,
} from '$types/matrix-sdk';
-import { RoomServerAclEventContent } from '$types/matrix-sdk';
import { useMemo } from 'react';
+import { Membership, StateEvent } from '$types/matrix/room';
+import { AccountDataEvent } from '$types/matrix/accountData';
import {
addRoomIdToMDirect,
getDMRoomFor,
@@ -24,11 +26,9 @@ import {
removeRoomIdFromMDirect,
} from '../utils/matrix';
import { useRoomNavigate } from './useRoomNavigate';
-import { Membership, StateEvent } from '$types/matrix/room';
import { getStateEvent } from '../utils/room';
import { splitWithSpace } from '../utils/common';
import { createRoomEncryptionState } from '../components/create-room';
-import { AccountDataEvent } from '$types/matrix/accountData';
import { enrichWidgetUrl } from './useRoomWidgets';
export const SHRUG = '¯\\_(ツ)_/¯';
diff --git a/src/app/hooks/useDeviceList.ts b/src/app/hooks/useDeviceList.ts
index 7dcaa4b2..96578412 100644
--- a/src/app/hooks/useDeviceList.ts
+++ b/src/app/hooks/useDeviceList.ts
@@ -1,7 +1,6 @@
import { useEffect, useCallback, useMemo } from 'react';
-import { IMyDevice } from '$types/matrix-sdk';
+import { IMyDevice, CryptoEvent, CryptoEventHandlerMap } from '$types/matrix-sdk';
import { useQuery } from '@tanstack/react-query';
-import { CryptoEvent, CryptoEventHandlerMap } from '$types/matrix-sdk';
import { useMatrixClient } from './useMatrixClient';
export const useDeviceListChange = (
diff --git a/src/app/hooks/useIgnoredUsers.ts b/src/app/hooks/useIgnoredUsers.ts
index 3aadb615..d1e06817 100644
--- a/src/app/hooks/useIgnoredUsers.ts
+++ b/src/app/hooks/useIgnoredUsers.ts
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
-import { useAccountData } from './useAccountData';
import { AccountDataEvent } from '$types/matrix/accountData';
+import { useAccountData } from './useAccountData';
export type IgnoredUserListContent = {
ignored_users?: Record;
diff --git a/src/app/hooks/useLocalRoomSummary.ts b/src/app/hooks/useLocalRoomSummary.ts
index e17f6e1f..2c6f0257 100644
--- a/src/app/hooks/useLocalRoomSummary.ts
+++ b/src/app/hooks/useLocalRoomSummary.ts
@@ -1,6 +1,6 @@
import { GuestAccess, HistoryVisibility, JoinRule, Room } from '$types/matrix-sdk';
-import { getStateEvent } from '../utils/room';
import { StateEvent } from '$types/matrix/room';
+import { getStateEvent } from '../utils/room';
export type LocalRoomSummary = {
roomId: string;
diff --git a/src/app/hooks/useMemberPowerTag.ts b/src/app/hooks/useMemberPowerTag.ts
index 67669450..6d13cae2 100644
--- a/src/app/hooks/useMemberPowerTag.ts
+++ b/src/app/hooks/useMemberPowerTag.ts
@@ -1,8 +1,8 @@
import { useCallback, useMemo } from 'react';
import { MatrixClient, Room, RoomMember } from '$types/matrix-sdk';
+import { MemberPowerTag, MemberPowerTagIcon } from '$types/matrix/room';
import { getPowerLevelTag, PowerLevelTags, usePowerLevelTags } from './usePowerLevelTags';
import { IPowerLevels, readPowerLevel } from './usePowerLevels';
-import { MemberPowerTag, MemberPowerTagIcon } from '$types/matrix/room';
import { useRoomCreatorsTag } from './useRoomCreatorsTag';
import { ThemeKind } from './useTheme';
import { accessibleColor } from '../plugins/color';
diff --git a/src/app/hooks/useNickname.ts b/src/app/hooks/useNickname.ts
index 2f981874..0f3d36d5 100644
--- a/src/app/hooks/useNickname.ts
+++ b/src/app/hooks/useNickname.ts
@@ -1,8 +1,8 @@
import { useAtomValue, useSetAtom } from 'jotai';
import { useCallback, useEffect } from 'react';
import { ClientEvent, MatrixClient, MatrixEvent } from '$types/matrix-sdk';
-import { nicknamesAtom, setNicknameAtom } from '../state/nicknames';
import { AccountDataEvent } from '$types/matrix/accountData';
+import { nicknamesAtom, setNicknameAtom } from '../state/nicknames';
import { useAccountDataCallback } from './useAccountDataCallback';
import { useMatrixClient } from './useMatrixClient';
diff --git a/src/app/hooks/useNotificationJumper.ts b/src/app/hooks/useNotificationJumper.ts
index 38553924..f5e0707a 100644
--- a/src/app/hooks/useNotificationJumper.ts
+++ b/src/app/hooks/useNotificationJumper.ts
@@ -2,9 +2,9 @@ import { useCallback, useEffect } from 'react';
import { useAtom } from 'jotai';
import { SyncState, ClientEvent } from '$types/matrix-sdk';
import { pendingNotificationAtom } from '../state/sessions';
-import { useSyncState } from '../hooks/useSyncState';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { useRoomNavigate } from '../hooks/useRoomNavigate';
+import { useSyncState } from './useSyncState';
+import { useMatrixClient } from './useMatrixClient';
+import { useRoomNavigate } from './useRoomNavigate';
import { createLogger } from '../utils/debug';
export function NotificationJumper() {
diff --git a/src/app/hooks/usePowerLevelTags.ts b/src/app/hooks/usePowerLevelTags.ts
index cb011fd9..eab9cc1f 100644
--- a/src/app/hooks/usePowerLevelTags.ts
+++ b/src/app/hooks/usePowerLevelTags.ts
@@ -1,8 +1,8 @@
import { Room } from '$types/matrix-sdk';
import { useMemo } from 'react';
+import { MemberPowerTag, StateEvent } from '$types/matrix/room';
import { IPowerLevels } from './usePowerLevels';
import { useStateEvent } from './useStateEvent';
-import { MemberPowerTag, StateEvent } from '$types/matrix/room';
export type PowerLevelTags = Record;
diff --git a/src/app/hooks/usePowerLevels.ts b/src/app/hooks/usePowerLevels.ts
index ac452da6..11c8cf98 100644
--- a/src/app/hooks/usePowerLevels.ts
+++ b/src/app/hooks/usePowerLevels.ts
@@ -1,8 +1,8 @@
import { MatrixEvent, Room } from '$types/matrix-sdk';
import { createContext, useCallback, useContext, useMemo, useState } from 'react';
import { produce } from 'immer';
-import { useStateEvent } from './useStateEvent';
import { StateEvent } from '$types/matrix/room';
+import { useStateEvent } from './useStateEvent';
import { useStateEventCallback } from './useStateEventCallback';
import { useMatrixClient } from './useMatrixClient';
import { getStateEvent } from '../utils/room';
diff --git a/src/app/hooks/useRecentEmoji.ts b/src/app/hooks/useRecentEmoji.ts
index b2c83d39..c7f9fa5c 100644
--- a/src/app/hooks/useRecentEmoji.ts
+++ b/src/app/hooks/useRecentEmoji.ts
@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react';
import { ClientEvent, MatrixClient, MatrixEvent } from '$types/matrix-sdk';
-import { getRecentEmojis } from '../plugins/recent-emoji';
import { AccountDataEvent } from '$types/matrix/accountData';
+import { getRecentEmojis } from '../plugins/recent-emoji';
import { IEmoji } from '../plugins/emoji';
export const useRecentEmoji = (mx: MatrixClient, limit?: number): IEmoji[] => {
diff --git a/src/app/hooks/useRoomAliases.ts b/src/app/hooks/useRoomAliases.ts
index 40a87e9a..a497465e 100644
--- a/src/app/hooks/useRoomAliases.ts
+++ b/src/app/hooks/useRoomAliases.ts
@@ -1,11 +1,10 @@
import { useCallback, useEffect, useMemo } from 'react';
-import { MatrixError, Room } from '$types/matrix-sdk';
-import { RoomCanonicalAliasEventContent } from '$types/matrix-sdk';
+import { MatrixError, Room, RoomCanonicalAliasEventContent } from '$types/matrix-sdk';
+import { StateEvent } from '$types/matrix/room';
import { AsyncState, useAsyncCallback } from './useAsyncCallback';
import { useMatrixClient } from './useMatrixClient';
import { useAlive } from './useAlive';
import { useStateEvent } from './useStateEvent';
-import { StateEvent } from '$types/matrix/room';
import { getStateEvent } from '../utils/room';
export const usePublishedAliases = (room: Room): [string | undefined, string[]] => {
diff --git a/src/app/hooks/useRoomCreators.ts b/src/app/hooks/useRoomCreators.ts
index 421494ac..4c31bc17 100644
--- a/src/app/hooks/useRoomCreators.ts
+++ b/src/app/hooks/useRoomCreators.ts
@@ -1,7 +1,7 @@
import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
import { useMemo } from 'react';
-import { useStateEvent } from './useStateEvent';
import { IRoomCreateContent, StateEvent } from '$types/matrix/room';
+import { useStateEvent } from './useStateEvent';
import { creatorsSupported } from '../utils/matrix';
import { getStateEvent } from '../utils/room';
diff --git a/src/app/hooks/useRoomEvent.ts b/src/app/hooks/useRoomEvent.ts
index 7fff665d..d9b36352 100644
--- a/src/app/hooks/useRoomEvent.ts
+++ b/src/app/hooks/useRoomEvent.ts
@@ -1,7 +1,6 @@
-import { IEvent, MatrixEvent, Room } from '$types/matrix-sdk';
+import { IEvent, MatrixEvent, Room, CryptoBackend } from '$types/matrix-sdk';
import { useCallback, useMemo } from 'react';
import to from 'await-to-js';
-import { CryptoBackend } from '$types/matrix-sdk';
import { useQuery } from '@tanstack/react-query';
import { useMatrixClient } from './useMatrixClient';
diff --git a/src/app/hooks/useRoomLatestRenderedEvent.ts b/src/app/hooks/useRoomLatestRenderedEvent.ts
index c6d40f64..792619cd 100644
--- a/src/app/hooks/useRoomLatestRenderedEvent.ts
+++ b/src/app/hooks/useRoomLatestRenderedEvent.ts
@@ -1,9 +1,9 @@
/* eslint-disable no-continue */
import { MatrixEvent, Room, RoomEvent, RoomEventHandlerMap } from '$types/matrix-sdk';
import { useEffect, useState } from 'react';
+import { MessageEvent, StateEvent } from '$types/matrix/room';
import { settingsAtom } from '../state/settings';
import { useSetting } from '../state/hooks/settings';
-import { MessageEvent, StateEvent } from '$types/matrix/room';
import { isMembershipChanged, reactionOrEditEvent } from '../utils/room';
export const useRoomLatestRenderedEvent = (room: Room) => {
diff --git a/src/app/hooks/useRoomMeta.ts b/src/app/hooks/useRoomMeta.ts
index 883ae42e..16c72217 100644
--- a/src/app/hooks/useRoomMeta.ts
+++ b/src/app/hooks/useRoomMeta.ts
@@ -1,6 +1,5 @@
import { useEffect, useState } from 'react';
-import { RoomJoinRulesEventContent } from '$types/matrix-sdk';
-import { Room, RoomEvent, RoomStateEvent } from '$types/matrix-sdk';
+import { RoomJoinRulesEventContent, Room, RoomEvent, RoomStateEvent } from '$types/matrix-sdk';
import { StateEvent } from '$types/matrix/room';
import { useStateEvent } from './useStateEvent';
diff --git a/src/app/hooks/useRoomPinnedEvents.ts b/src/app/hooks/useRoomPinnedEvents.ts
index d6c1974f..cb610646 100644
--- a/src/app/hooks/useRoomPinnedEvents.ts
+++ b/src/app/hooks/useRoomPinnedEvents.ts
@@ -1,6 +1,5 @@
import { useMemo } from 'react';
-import { RoomPinnedEventsEventContent } from '$types/matrix-sdk';
-import { Room } from '$types/matrix-sdk';
+import { RoomPinnedEventsEventContent, Room } from '$types/matrix-sdk';
import { StateEvent } from '$types/matrix/room';
import { useStateEvent } from './useStateEvent';
diff --git a/src/app/hooks/useRoomWidgets.ts b/src/app/hooks/useRoomWidgets.ts
index c7c2ce02..c365fb15 100644
--- a/src/app/hooks/useRoomWidgets.ts
+++ b/src/app/hooks/useRoomWidgets.ts
@@ -1,10 +1,10 @@
import { Room, MatrixEvent, MatrixClient } from '$types/matrix-sdk';
import { useCallback, useMemo } from 'react';
import { IWidget } from 'matrix-widget-api';
+import { StateEvent } from '$types/matrix/room';
import { useStateEventCallback } from './useStateEventCallback';
import { useForceUpdate } from './useForceUpdate';
import { getStateEvents } from '../utils/room';
-import { StateEvent } from '$types/matrix/room';
export interface RoomWidget extends IWidget {
eventId?: string;
diff --git a/src/app/hooks/useSessionProfiles.ts b/src/app/hooks/useSessionProfiles.ts
index 714aaefc..c98d0543 100644
--- a/src/app/hooks/useSessionProfiles.ts
+++ b/src/app/hooks/useSessionProfiles.ts
@@ -102,7 +102,7 @@ export const useSessionProfiles = (sessions: Session[]): SessionProfiles => {
blobUrlsRef.current.forEach((u) => URL.revokeObjectURL(u));
blobUrlsRef.current = newBlobUrls;
};
- }, [sessionKey]); // eslint-disable-line react-hooks/exhaustive-deps
+ }, [sessionKey]);
return profiles;
};
diff --git a/src/app/hooks/useSidebarItems.ts b/src/app/hooks/useSidebarItems.ts
index 31580555..c0d50076 100644
--- a/src/app/hooks/useSidebarItems.ts
+++ b/src/app/hooks/useSidebarItems.ts
@@ -1,9 +1,9 @@
import { Dispatch, SetStateAction, useCallback, useEffect, useState } from 'react';
import { MatrixClient } from '$types/matrix-sdk';
import { AccountDataEvent } from '$types/matrix/accountData';
+import { Membership } from '$types/matrix/room';
import { useMatrixClient } from './useMatrixClient';
import { getAccountData, isSpace } from '../utils/room';
-import { Membership } from '$types/matrix/room';
import { useAccountDataCallback } from './useAccountDataCallback';
export type ISidebarFolder = {
diff --git a/src/app/hooks/useSpaceHierarchy.ts b/src/app/hooks/useSpaceHierarchy.ts
index 8dd0c55b..e21120fc 100644
--- a/src/app/hooks/useSpaceHierarchy.ts
+++ b/src/app/hooks/useSpaceHierarchy.ts
@@ -1,11 +1,10 @@
import { atom, useAtom, useAtomValue } from 'jotai';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { MatrixError, Room } from '$types/matrix-sdk';
-import { IHierarchyRoom } from '$types/matrix-sdk';
+import { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { QueryFunction, useInfiniteQuery } from '@tanstack/react-query';
+import { MSpaceChildContent, StateEvent } from '$types/matrix/room';
import { useMatrixClient } from './useMatrixClient';
import { roomToParentsAtom } from '../state/room/roomToParents';
-import { MSpaceChildContent, StateEvent } from '$types/matrix/room';
import { getAllParents, getStateEvents, isValidChild } from '../utils/room';
import { isRoomId } from '../utils/matrix';
import { SortFunc, byOrderKey, byTsOldToNew, factoryRoomIdByActivity } from '../utils/sort';
diff --git a/src/app/hooks/useStateEvent.ts b/src/app/hooks/useStateEvent.ts
index a358f291..07f51a14 100644
--- a/src/app/hooks/useStateEvent.ts
+++ b/src/app/hooks/useStateEvent.ts
@@ -1,9 +1,9 @@
import { Room } from '$types/matrix-sdk';
import { useCallback, useMemo } from 'react';
+import { StateEvent } from '$types/matrix/room';
import { useStateEventCallback } from './useStateEventCallback';
import { useForceUpdate } from './useForceUpdate';
import { getStateEvent } from '../utils/room';
-import { StateEvent } from '$types/matrix/room';
export const useStateEvent = (room: Room, eventType: StateEvent, stateKey = '') => {
const [updateCount, forceUpdate] = useForceUpdate();
diff --git a/src/app/hooks/useUserProfile.ts b/src/app/hooks/useUserProfile.ts
index 9a419c84..5cf5b730 100644
--- a/src/app/hooks/useUserProfile.ts
+++ b/src/app/hooks/useUserProfile.ts
@@ -2,12 +2,12 @@ import { useEffect, useMemo } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
import { selectAtom } from 'jotai/utils';
import { EventTimeline, Room } from '$types/matrix-sdk';
+import { StateEvent } from '$types/matrix/room';
+import colorMXID from '$util/colorMXID';
import { useMatrixClient } from './useMatrixClient';
import { profilesCacheAtom } from '../state/userRoomProfile';
-import { StateEvent } from '$types/matrix/room';
import { useSetting } from '../state/hooks/settings';
import { settingsAtom } from '../state/settings';
-import colorMXID from '$util/colorMXID';
const inFlightProfiles = new Map>();
diff --git a/src/app/pages/auth/AuthLayout.tsx b/src/app/pages/auth/AuthLayout.tsx
index 7b2d218a..f756d8c2 100644
--- a/src/app/pages/auth/AuthLayout.tsx
+++ b/src/app/pages/auth/AuthLayout.tsx
@@ -11,21 +11,21 @@ import {
} from 'react-router-dom';
import classNames from 'classnames';
-import { AuthFooter } from './AuthFooter';
-import * as css from './styles.css';
import * as PatternsCss from '$styles/Patterns.css';
import { clientAllowedServer, clientDefaultServer, useClientConfig } from '$hooks/useClientConfig';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '../paths';
import CinnySVG from '$public/favicon.png';
-import { ServerPicker } from './ServerPicker';
-import { AutoDiscoveryAction, autoDiscovery } from '../../cs-api';
import { SpecVersionsLoader } from '$components/SpecVersionsLoader';
import { SpecVersionsProvider } from '$hooks/useSpecVersions';
import { AutoDiscoveryInfoProvider } from '$hooks/useAutoDiscoveryInfo';
import { AuthFlowsLoader } from '$components/AuthFlowsLoader';
import { AuthFlowsProvider } from '$hooks/useAuthFlows';
import { AuthServerProvider } from '$hooks/useAuthServer';
+import { AutoDiscoveryAction, autoDiscovery } from '../../cs-api';
+import { ServerPicker } from './ServerPicker';
+import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '../paths';
+import * as css from './styles.css';
+import { AuthFooter } from './AuthFooter';
const currentAuthPath = (pathname: string): string => {
if (matchPath(LOGIN_PATH, pathname)) {
diff --git a/src/app/pages/auth/login/Login.tsx b/src/app/pages/auth/login/Login.tsx
index e376dc09..ce0d9339 100644
--- a/src/app/pages/auth/login/Login.tsx
+++ b/src/app/pages/auth/login/Login.tsx
@@ -5,14 +5,14 @@ import { SSOAction } from '$types/matrix-sdk';
import { useAuthFlows } from '$hooks/useAuthFlows';
import { useAuthServer } from '$hooks/useAuthServer';
import { useParsedLoginFlows } from '$hooks/useParsedLoginFlows';
-import { PasswordLoginForm } from './PasswordLoginForm';
-import { SSOLogin } from '../SSOLogin';
-import { TokenLogin } from './TokenLogin';
-import { OrDivider } from '../OrDivider';
import { getLoginPath, getRegisterPath, withSearchParam } from '$pages/pathUtils';
import { usePathWithOrigin } from '$hooks/usePathWithOrigin';
import { LoginPathSearchParams } from '$pages/paths';
import { useClientConfig } from '$hooks/useClientConfig';
+import { PasswordLoginForm } from './PasswordLoginForm';
+import { SSOLogin } from '../SSOLogin';
+import { TokenLogin } from './TokenLogin';
+import { OrDivider } from '../OrDivider';
const getLoginTokenSearchParam = () => {
// when using hasRouter query params in existing route
diff --git a/src/app/pages/auth/login/PasswordLoginForm.tsx b/src/app/pages/auth/login/PasswordLoginForm.tsx
index aca5f598..dd324976 100644
--- a/src/app/pages/auth/login/PasswordLoginForm.tsx
+++ b/src/app/pages/auth/login/PasswordLoginForm.tsx
@@ -26,6 +26,10 @@ import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAuthServer } from '$hooks/useAuthServer';
import { useClientConfig } from '$hooks/useClientConfig';
+import { PasswordInput } from '$components/password-input';
+import { getResetPasswordPath } from '$pages/pathUtils';
+import { stopPropagation } from '$appUtils/keyboard';
+import { FieldError } from '../FiledError';
import {
CustomLoginResponse,
LoginError,
@@ -33,10 +37,6 @@ import {
login,
useLoginComplete,
} from './loginUtil';
-import { PasswordInput } from '$components/password-input';
-import { FieldError } from '../FiledError';
-import { getResetPasswordPath } from '$pages/pathUtils';
-import { stopPropagation } from '$appUtils/keyboard';
function UsernameHint({ server }: { server: string }) {
const [anchor, setAnchor] = useState();
diff --git a/src/app/pages/auth/login/loginUtil.ts b/src/app/pages/auth/login/loginUtil.ts
index 931cdb6a..39c1c4b9 100644
--- a/src/app/pages/auth/login/loginUtil.ts
+++ b/src/app/pages/auth/login/loginUtil.ts
@@ -4,8 +4,6 @@ import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { useSetAtom } from 'jotai';
import { clientAllowedServer, ClientConfig } from '$hooks/useClientConfig';
-import { autoDiscovery, specVersions } from '../../../cs-api';
-import { ErrorCode } from '../../../cs-errorcode';
import {
deleteAfterLoginRedirectPath,
getAfterLoginRedirectPath,
@@ -13,6 +11,8 @@ import {
import { getHomePath } from '$pages/pathUtils';
import { activeSessionIdAtom, sessionsAtom } from '$state/sessions';
import { createLogger } from '$appUtils/debug';
+import { ErrorCode } from '../../../cs-errorcode';
+import { autoDiscovery, specVersions } from '../../../cs-api';
const log = createLogger('loginUtil');
@@ -20,8 +20,8 @@ export enum GetBaseUrlError {
NotAllow = 'NotAllow',
NotFound = 'NotFound',
}
-export const factoryGetBaseUrl = (clientConfig: ClientConfig, server: string) => {
- return async (): Promise => {
+export const factoryGetBaseUrl =
+ (clientConfig: ClientConfig, server: string) => async (): Promise => {
if (!clientAllowedServer(clientConfig, server)) {
throw new Error(GetBaseUrlError.NotAllow);
}
@@ -44,7 +44,6 @@ export const factoryGetBaseUrl = (clientConfig: ClientConfig, server: string) =>
}
return mxIdBaseUrl;
};
-};
export enum LoginError {
ServerNotAllowed = 'ServerNotAllowed',
diff --git a/src/app/pages/auth/register/PasswordRegisterForm.tsx b/src/app/pages/auth/register/PasswordRegisterForm.tsx
index 87fb2799..e547634c 100644
--- a/src/app/pages/auth/register/PasswordRegisterForm.tsx
+++ b/src/app/pages/auth/register/PasswordRegisterForm.tsx
@@ -30,8 +30,6 @@ import {
import { useUIACompleted, useUIAFlow, useUIAParams } from '$hooks/useUIAFlows';
import { AsyncState, AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
-import { RegisterError, RegisterResult, register, useRegisterComplete } from './registerUtil';
-import { FieldError } from '../FiledError';
import {
AutoDummyStageDialog,
AutoTermsStageDialog,
@@ -43,6 +41,8 @@ import { useRegisterEmail } from '$hooks/useRegisterEmail';
import { ConfirmPasswordMatch } from '$components/ConfirmPasswordMatch';
import { UIAFlowOverlay } from '$components/UIAFlowOverlay';
import { RequestEmailTokenCallback, RequestEmailTokenResponse } from '$hooks/types';
+import { FieldError } from '../FiledError';
+import { RegisterError, RegisterResult, register, useRegisterComplete } from './registerUtil';
export const SUPPORTED_REGISTER_STAGES = [
AuthType.RegistrationToken,
diff --git a/src/app/pages/auth/register/Register.tsx b/src/app/pages/auth/register/Register.tsx
index 987419fd..97d17af0 100644
--- a/src/app/pages/auth/register/Register.tsx
+++ b/src/app/pages/auth/register/Register.tsx
@@ -5,13 +5,13 @@ import { SSOAction } from '$types/matrix-sdk';
import { useAuthServer } from '$hooks/useAuthServer';
import { RegisterFlowStatus, useAuthFlows } from '$hooks/useAuthFlows';
import { useParsedLoginFlows } from '$hooks/useParsedLoginFlows';
-import { PasswordRegisterForm, SUPPORTED_REGISTER_STAGES } from './PasswordRegisterForm';
-import { OrDivider } from '../OrDivider';
-import { SSOLogin } from '../SSOLogin';
import { SupportedUIAFlowsLoader } from '$components/SupportedUIAFlowsLoader';
import { getLoginPath } from '$pages/pathUtils';
import { usePathWithOrigin } from '$hooks/usePathWithOrigin';
import { RegisterPathSearchParams } from '$pages/paths';
+import { SSOLogin } from '../SSOLogin';
+import { OrDivider } from '../OrDivider';
+import { PasswordRegisterForm, SUPPORTED_REGISTER_STAGES } from './PasswordRegisterForm';
const useRegisterSearchParams = (searchParams: URLSearchParams): RegisterPathSearchParams =>
useMemo(
diff --git a/src/app/pages/auth/register/registerUtil.ts b/src/app/pages/auth/register/registerUtil.ts
index a9c8f32f..11dfc1f4 100644
--- a/src/app/pages/auth/register/registerUtil.ts
+++ b/src/app/pages/auth/register/registerUtil.ts
@@ -9,7 +9,6 @@ import {
import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { LoginPathSearchParams } from '$pages/paths';
-import { ErrorCode } from '../../../cs-errorcode';
import {
deleteAfterLoginRedirectPath,
getAfterLoginRedirectPath,
@@ -17,6 +16,7 @@ import {
import { getHomePath, getLoginPath, withSearchParam } from '$pages/pathUtils';
import { getMxIdLocalPart, getMxIdServer } from '$appUtils/matrix';
import { setFallbackSession } from '$state/sessions';
+import { ErrorCode } from '../../../cs-errorcode';
export enum RegisterError {
UserTaken = 'UserTaken',
diff --git a/src/app/pages/auth/reset-password/PasswordResetForm.tsx b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
index 5eaec74a..6277eaad 100644
--- a/src/app/pages/auth/reset-password/PasswordResetForm.tsx
+++ b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
@@ -21,13 +21,13 @@ import { useAuthServer } from '$hooks/useAuthServer';
import { usePasswordEmail } from '$hooks/usePasswordEmail';
import { PasswordInput } from '$components/password-input';
import { ConfirmPasswordMatch } from '$components/ConfirmPasswordMatch';
-import { FieldError } from '../FiledError';
import { UIAFlowOverlay } from '$components/UIAFlowOverlay';
import { EmailStageDialog } from '$components/uia-stages';
-import { ResetPasswordResult, resetPassword } from './resetPasswordUtil';
import { getLoginPath, withSearchParam } from '$pages/pathUtils';
import { LoginPathSearchParams } from '$pages/paths';
import { getUIAError, getUIAErrorCode } from '$appUtils/matrix-uia';
+import { ResetPasswordResult, resetPassword } from './resetPasswordUtil';
+import { FieldError } from '../FiledError';
type FormData = {
email: string;
diff --git a/src/app/pages/auth/reset-password/ResetPassword.tsx b/src/app/pages/auth/reset-password/ResetPassword.tsx
index 0b90a3b7..cc70b1e1 100644
--- a/src/app/pages/auth/reset-password/ResetPassword.tsx
+++ b/src/app/pages/auth/reset-password/ResetPassword.tsx
@@ -3,8 +3,8 @@ import React, { useMemo } from 'react';
import { Link, useSearchParams } from 'react-router-dom';
import { getLoginPath } from '$pages/pathUtils';
import { useAuthServer } from '$hooks/useAuthServer';
-import { PasswordResetForm } from './PasswordResetForm';
import { ResetPasswordPathSearchParams } from '$pages/paths';
+import { PasswordResetForm } from './PasswordResetForm';
const useResetPasswordSearchParams = (
searchParams: URLSearchParams
diff --git a/src/app/pages/client/BackgroundNotifications.tsx b/src/app/pages/client/BackgroundNotifications.tsx
index b61c8201..e5210f04 100644
--- a/src/app/pages/client/BackgroundNotifications.tsx
+++ b/src/app/pages/client/BackgroundNotifications.tsx
@@ -7,8 +7,8 @@ import {
Room,
RoomEvent,
SyncState,
+ PushProcessor,
} from '$types/matrix-sdk';
-import { PushProcessor } from '$types/matrix-sdk';
import { useAtomValue, useSetAtom } from 'jotai';
import { useNavigate } from 'react-router-dom';
import {
diff --git a/src/app/pages/client/ClientNonUIFeatures.tsx b/src/app/pages/client/ClientNonUIFeatures.tsx
index a07303ac..aeee2e6c 100644
--- a/src/app/pages/client/ClientNonUIFeatures.tsx
+++ b/src/app/pages/client/ClientNonUIFeatures.tsx
@@ -15,7 +15,6 @@ import { nicknamesAtom } from '$state/nicknames';
import { allInvitesAtom } from '$state/room-list/inviteList';
import { usePreviousValue } from '$hooks/usePreviousValue';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getInboxInvitesPath } from '../pathUtils';
import {
getMemberDisplayName,
getNotificationType,
@@ -27,8 +26,9 @@ import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { useInboxNotificationsSelected } from '$hooks/router/useInbox';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { BackgroundNotifications } from './BackgroundNotifications';
import { pendingNotificationAtom } from '$state/sessions';
+import { BackgroundNotifications } from './BackgroundNotifications';
+import { getInboxInvitesPath } from '../pathUtils';
function SystemEmojiFeature() {
const [twitterEmoji] = useSetting(settingsAtom, 'twitterEmoji');
diff --git a/src/app/pages/client/ClientRoot.tsx b/src/app/pages/client/ClientRoot.tsx
index 9c89054b..8d9e2abf 100644
--- a/src/app/pages/client/ClientRoot.tsx
+++ b/src/app/pages/client/ClientRoot.tsx
@@ -31,17 +31,17 @@ import { ServerConfigsLoader } from '$components/ServerConfigsLoader';
import { CapabilitiesProvider } from '$hooks/useCapabilities';
import { MediaConfigProvider } from '$hooks/useMediaConfig';
import { MatrixClientProvider } from '$hooks/useMatrixClient';
-import { SpecVersions } from './SpecVersions';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useSyncState } from '$hooks/useSyncState';
import { stopPropagation } from '$appUtils/keyboard';
-import { SyncStatus } from './SyncStatus';
import { AuthMetadataProvider } from '$hooks/useAuthMetadata';
import { sessionsAtom, activeSessionIdAtom, Session, SessionsAction } from '$state/sessions';
-import { getHomePath } from '../pathUtils';
import { createLogger } from '$appUtils/debug';
-import { pushSessionToSW } from '../../../sw-session';
import { useSyncNicknames } from '$hooks/useNickname';
+import { getHomePath } from '../pathUtils';
+import { pushSessionToSW } from '../../../sw-session';
+import { SyncStatus } from './SyncStatus';
+import { SpecVersions } from './SpecVersions';
const log = createLogger('ClientRoot');
@@ -226,14 +226,15 @@ export function ClientRoot({ children }: ClientRootProps) {
useSyncNicknames(mx);
useLogoutListener(mx);
- useEffect(() => {
- return () => {
+ useEffect(
+ () => () => {
if (mx?.clientRunning) {
log.log('ClientRoot unmounting — stopping client', mx.getUserId());
mx.stopClient();
}
- };
- }, [mx]);
+ },
+ [mx]
+ );
useEffect(() => {
if (loadState.status === AsyncStatus.Idle) {
diff --git a/src/app/pages/client/call/CallProvider.tsx b/src/app/pages/client/call/CallProvider.tsx
index 27c13478..2056e636 100644
--- a/src/app/pages/client/call/CallProvider.tsx
+++ b/src/app/pages/client/call/CallProvider.tsx
@@ -209,7 +209,6 @@ export function CallProvider({ children }: CallProviderProps) {
if (!isActiveCallReady) return;
ev.preventDefault();
- /* eslint-disable camelcase */
const { audio_enabled, video_enabled } = ev.detail.data ?? {};
if (typeof audio_enabled === 'boolean' && audio_enabled !== isAudioEnabled) {
@@ -218,7 +217,6 @@ export function CallProvider({ children }: CallProviderProps) {
if (typeof video_enabled === 'boolean' && video_enabled !== isVideoEnabled) {
setIsVideoEnabledState(video_enabled);
}
- /* eslint-enable camelcase */
};
const handleOnScreenStateUpdate = (ev: CustomEvent) => {
diff --git a/src/app/pages/client/call/PersistentCallContainer.tsx b/src/app/pages/client/call/PersistentCallContainer.tsx
index fec94116..86c8ad3a 100644
--- a/src/app/pages/client/call/PersistentCallContainer.tsx
+++ b/src/app/pages/client/call/PersistentCallContainer.tsx
@@ -1,7 +1,6 @@
import React, { createContext, ReactNode, useCallback, useEffect, useMemo, useRef } from 'react';
import { ClientWidgetApi } from 'matrix-widget-api';
import { Box } from 'folds';
-import { useCallState } from './CallProvider';
import {
createVirtualWidget,
SmallWidget,
@@ -12,6 +11,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { useClientConfig } from '$hooks/useClientConfig';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { ThemeKind, useTheme } from '$hooks/useTheme';
+import { useCallState } from './CallProvider';
interface PersistentCallContainerProps {
children: ReactNode;
diff --git a/src/app/pages/client/direct/Direct.tsx b/src/app/pages/client/direct/Direct.tsx
index e60bfbb4..64fc2914 100644
--- a/src/app/pages/client/direct/Direct.tsx
+++ b/src/app/pages/client/direct/Direct.tsx
@@ -38,7 +38,6 @@ import { makeNavCategoryId } from '$state/closedNavCategories';
import { roomToUnreadAtom } from '$state/room/roomToUnread';
import { useCategoryHandler } from '$hooks/useCategoryHandler';
import { useNavToActivePathMapper } from '$hooks/useNavToActivePathMapper';
-import { useDirectRooms } from './useDirectRooms';
import { PageNav, PageNavContent, PageNavHeader } from '$components/page';
import { useClosedNavCategoriesAtom } from '$state/hooks/closedNavCategories';
import { useRoomsUnread } from '$state/hooks/unread';
@@ -52,6 +51,7 @@ import {
} from '$hooks/useRoomsNotificationPreferences';
import { useDirectCreateSelected } from '$hooks/router/useDirectSelected';
import { CallNavStatus } from '$features/room-nav/RoomCallNavStatus';
+import { useDirectRooms } from './useDirectRooms';
type DirectMenuProps = {
requestClose: () => void;
diff --git a/src/app/pages/client/direct/DirectCreate.tsx b/src/app/pages/client/direct/DirectCreate.tsx
index fdc3aa06..d1ebcc80 100644
--- a/src/app/pages/client/direct/DirectCreate.tsx
+++ b/src/app/pages/client/direct/DirectCreate.tsx
@@ -5,7 +5,6 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { getDirectCreateSearchParams } from '$pages/pathSearchParam';
import { getDirectRoomPath } from '$pages/pathUtils';
import { getDMRoomFor } from '$appUtils/matrix';
-import { useDirectRooms } from './useDirectRooms';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import {
Page,
@@ -17,6 +16,7 @@ import {
} from '$components/page';
import { BackRouteHandler } from '$components/BackRouteHandler';
import { CreateChat } from '$features/create-chat';
+import { useDirectRooms } from './useDirectRooms';
export function DirectCreate() {
const mx = useMatrixClient();
diff --git a/src/app/pages/client/explore/Featured.tsx b/src/app/pages/client/explore/Featured.tsx
index 41717101..05d567e7 100644
--- a/src/app/pages/client/explore/Featured.tsx
+++ b/src/app/pages/client/explore/Featured.tsx
@@ -14,10 +14,10 @@ import {
PageHeroSection,
} from '$components/page';
import { RoomTopicViewer } from '$components/room-topic-viewer';
-import * as css from './style.css';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { BackRouteHandler } from '$components/BackRouteHandler';
+import * as css from './style.css';
export function FeaturedRooms() {
const { featuredCommunities } = useClientConfig();
diff --git a/src/app/pages/client/explore/Server.tsx b/src/app/pages/client/explore/Server.tsx
index 2d64cba3..48756b2c 100644
--- a/src/app/pages/client/explore/Server.tsx
+++ b/src/app/pages/client/explore/Server.tsx
@@ -38,13 +38,13 @@ import { RoomTopicViewer } from '$components/room-topic-viewer';
import { RoomCard, RoomCardBase, RoomCardGrid } from '$components/room-card';
import { ExploreServerPathSearchParams } from '$pages/paths';
import { getExploreServerPath, withSearchParam } from '$pages/pathUtils';
-import * as css from './style.css';
import { allRoomsAtom } from '$state/room-list/roomList';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { getMxIdServer } from '$appUtils/matrix';
import { stopPropagation } from '$appUtils/keyboard';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { BackRouteHandler } from '$components/BackRouteHandler';
+import * as css from './style.css';
const useServerSearchParams = (searchParams: URLSearchParams): ExploreServerPathSearchParams =>
useMemo(
diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx
index cc775dd4..039a263b 100644
--- a/src/app/pages/client/home/Home.tsx
+++ b/src/app/pages/client/home/Home.tsx
@@ -40,7 +40,6 @@ import {
import { getCanonicalAliasOrRoomId } from '$appUtils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { useHomeCreateSelected, useHomeSearchSelected } from '$hooks/router/useHomeSelected';
-import { useHomeRooms } from './useHomeRooms';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { VirtualTile } from '$components/virtualizer';
import { RoomNavCategoryButton, RoomNavItem } from '$features/room-nav';
@@ -63,6 +62,7 @@ import { UseStateProvider } from '$components/UseStateProvider';
import { JoinAddressPrompt } from '$components/join-address-prompt';
import { _RoomSearchParams } from '$pages/paths';
import { CallNavStatus } from '$features/room-nav/RoomCallNavStatus';
+import { useHomeRooms } from './useHomeRooms';
type HomeMenuProps = {
requestClose: () => void;
diff --git a/src/app/pages/client/home/RoomProvider.tsx b/src/app/pages/client/home/RoomProvider.tsx
index 5bf71b5a..2866f105 100644
--- a/src/app/pages/client/home/RoomProvider.tsx
+++ b/src/app/pages/client/home/RoomProvider.tsx
@@ -4,8 +4,8 @@ import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { IsDirectRoomProvider, RoomProvider } from '$hooks/useRoom';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { JoinBeforeNavigate } from '$features/join-before-navigate';
-import { useHomeRooms } from './useHomeRooms';
import { useSearchParamsViaServers } from '$hooks/router/useSearchParamsViaServers';
+import { useHomeRooms } from './useHomeRooms';
export function HomeRouteRoomProvider({ children }: { children: ReactNode }) {
const mx = useMatrixClient();
diff --git a/src/app/pages/client/home/Search.tsx b/src/app/pages/client/home/Search.tsx
index 314fec4d..1e70149d 100644
--- a/src/app/pages/client/home/Search.tsx
+++ b/src/app/pages/client/home/Search.tsx
@@ -2,9 +2,9 @@ import React, { useRef } from 'react';
import { Box, Icon, Icons, Text, Scroll, IconButton } from 'folds';
import { Page, PageContent, PageContentCenter, PageHeader } from '$components/page';
import { MessageSearch } from '$features/message-search';
-import { useHomeRooms } from './useHomeRooms';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { BackRouteHandler } from '$components/BackRouteHandler';
+import { useHomeRooms } from './useHomeRooms';
export function HomeSearch() {
const scrollRef = useRef(null);
diff --git a/src/app/pages/client/inbox/Invites.tsx b/src/app/pages/client/inbox/Invites.tsx
index fc35755d..451064a6 100644
--- a/src/app/pages/client/inbox/Invites.tsx
+++ b/src/app/pages/client/inbox/Invites.tsx
@@ -19,9 +19,8 @@ import {
} from 'folds';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
-import { RoomTopicEventContent } from '$types/matrix-sdk';
+import { RoomTopicEventContent, MatrixClient, MatrixError, Room } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
-import { MatrixClient, MatrixError, Room } from '$types/matrix-sdk';
import {
Page,
PageContent,
diff --git a/src/app/pages/client/sidebar/DirectTab.tsx b/src/app/pages/client/sidebar/DirectTab.tsx
index 258a59aa..c04e778d 100644
--- a/src/app/pages/client/sidebar/DirectTab.tsx
+++ b/src/app/pages/client/sidebar/DirectTab.tsx
@@ -20,11 +20,11 @@ import { useDirectSelected } from '$hooks/router/useDirectSelected';
import { UnreadBadge } from '$components/unread-badge';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useNavToActivePathAtom } from '$state/hooks/navToActivePath';
-import { useDirectRooms } from '../direct/useDirectRooms';
import { markAsRead } from '$appUtils/notifications';
import { stopPropagation } from '$appUtils/keyboard';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
+import { useDirectRooms } from '../direct/useDirectRooms';
type DirectMenuProps = {
requestClose: () => void;
diff --git a/src/app/pages/client/sidebar/HomeTab.tsx b/src/app/pages/client/sidebar/HomeTab.tsx
index 5e2eadb6..9dfe0576 100644
--- a/src/app/pages/client/sidebar/HomeTab.tsx
+++ b/src/app/pages/client/sidebar/HomeTab.tsx
@@ -21,11 +21,11 @@ import { useHomeSelected } from '$hooks/router/useHomeSelected';
import { UnreadBadge } from '$components/unread-badge';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useNavToActivePathAtom } from '$state/hooks/navToActivePath';
-import { useHomeRooms } from '../home/useHomeRooms';
import { markAsRead } from '$appUtils/notifications';
import { stopPropagation } from '$appUtils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
+import { useHomeRooms } from '../home/useHomeRooms';
type HomeMenuProps = {
requestClose: () => void;
diff --git a/src/app/pages/client/sidebar/UnverifiedTab.tsx b/src/app/pages/client/sidebar/UnverifiedTab.tsx
index 07f47304..a75d47f2 100644
--- a/src/app/pages/client/sidebar/UnverifiedTab.tsx
+++ b/src/app/pages/client/sidebar/UnverifiedTab.tsx
@@ -8,7 +8,6 @@ import {
} from '$components/sidebar';
import { useDeviceIds, useDeviceList, useSplitCurrentDevice } from '$hooks/useDeviceList';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import * as css from './UnverifiedTab.css';
import {
useDeviceVerificationStatus,
useUnverifiedDeviceCount,
@@ -17,6 +16,7 @@ import {
import { useCrossSigningActive } from '$hooks/useCrossSigning';
import { Modal500 } from '$components/Modal500';
import { Settings, SettingsPages } from '$features/settings';
+import * as css from './UnverifiedTab.css';
function UnverifiedIndicator() {
const mx = useMatrixClient();
diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx
index b6b85e85..4de76a90 100644
--- a/src/app/pages/client/space/Space.tsx
+++ b/src/app/pages/client/space/Space.tsx
@@ -26,8 +26,7 @@ import {
toRem,
} from 'folds';
import { useVirtualizer } from '@tanstack/react-virtual';
-import { JoinRule, Room } from '$types/matrix-sdk';
-import { RoomJoinRulesEventContent } from '$types/matrix-sdk';
+import { JoinRule, Room, RoomJoinRulesEventContent } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { mDirectAtom } from '$state/mDirectList';
@@ -76,12 +75,12 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { BreakWord } from '$styles/Text.css';
import { InviteUserPrompt } from '$components/invite-user-prompt';
import { CallNavStatus } from '$features/room-nav/RoomCallNavStatus';
-import { useCallState } from '../call/CallProvider';
import { SwipeableChatWrapper } from '$components/SwipeableChatWrapper';
import { mobileOrTablet } from '$appUtils/user-agent';
import { useNavigate } from 'react-router-dom';
import { lastVisitedRoomIdAtom } from '$state/room/lastRoom';
import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper';
+import { useCallState } from '../call/CallProvider';
type SpaceMenuProps = {
room: Room;
diff --git a/src/app/plugins/custom-emoji/utils.ts b/src/app/plugins/custom-emoji/utils.ts
index 37e832c0..ab5ebfd2 100644
--- a/src/app/plugins/custom-emoji/utils.ts
+++ b/src/app/plugins/custom-emoji/utils.ts
@@ -1,9 +1,9 @@
import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
-import { ImagePack } from './ImagePack';
-import { EmoteRoomsContent, ImageUsage } from './types';
import { StateEvent } from '$types/matrix/room';
import { getAccountData, getStateEvent, getStateEvents } from '$appUtils/room';
import { AccountDataEvent } from '$types/matrix/accountData';
+import { EmoteRoomsContent, ImageUsage } from './types';
+import { ImagePack } from './ImagePack';
import { PackMetaReader } from './PackMetaReader';
import { PackAddress } from './PackAddress';
diff --git a/src/app/plugins/recent-emoji.ts b/src/app/plugins/recent-emoji.ts
index eb846a9c..8b2080fa 100644
--- a/src/app/plugins/recent-emoji.ts
+++ b/src/app/plugins/recent-emoji.ts
@@ -1,7 +1,7 @@
import { MatrixClient } from '$types/matrix-sdk';
+import { AccountDataEvent } from '$types/matrix/accountData';
import { getAccountData } from '../utils/room';
import { IEmoji, emojis } from './emoji';
-import { AccountDataEvent } from '$types/matrix/accountData';
type EmojiUnicode = string;
type EmojiUsageCount = number;
diff --git a/src/app/plugins/via-servers.ts b/src/app/plugins/via-servers.ts
index 4288eb65..cd630a4e 100644
--- a/src/app/plugins/via-servers.ts
+++ b/src/app/plugins/via-servers.ts
@@ -1,7 +1,7 @@
import { Room } from '$types/matrix-sdk';
+import { IRoomCreateContent, StateEvent } from '$types/matrix/room';
import { IPowerLevels } from '../hooks/usePowerLevels';
import { creatorsSupported, getMxIdServer } from '../utils/matrix';
-import { IRoomCreateContent, StateEvent } from '$types/matrix/room';
import { getStateEvent } from '../utils/room';
export const getViaServers = (room: Room): string[] => {
diff --git a/src/app/state/hooks/createRoomModal.ts b/src/app/state/hooks/createRoomModal.ts
index 80ba21a8..c7d2ffac 100644
--- a/src/app/state/hooks/createRoomModal.ts
+++ b/src/app/state/hooks/createRoomModal.ts
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
-import { createRoomModalAtom, CreateRoomModalState } from '../createRoomModal';
import { CreateRoomType } from '$components/create-room/types';
+import { createRoomModalAtom, CreateRoomModalState } from '../createRoomModal';
export const useCreateRoomModalState = (): CreateRoomModalState | undefined => {
const data = useAtomValue(createRoomModalAtom);
diff --git a/src/app/state/hooks/roomList.ts b/src/app/state/hooks/roomList.ts
index a0c9cf2c..045b7547 100644
--- a/src/app/state/hooks/roomList.ts
+++ b/src/app/state/hooks/roomList.ts
@@ -3,8 +3,8 @@ import { selectAtom } from 'jotai/utils';
import { MatrixClient } from '$types/matrix-sdk';
import { useCallback, useMemo } from 'react';
import { getAllParents, isRoom, isSpace, isUnsupportedRoom } from '$appUtils/room';
-import { compareRoomsEqual } from '../room-list/utils';
import { RoomToParents } from '$types/matrix/room';
+import { compareRoomsEqual } from '../room-list/utils';
export type RoomsAtom = Atom;
export type RoomSelector = (roomId: string) => boolean | undefined;
diff --git a/src/app/state/hooks/userRoomProfile.ts b/src/app/state/hooks/userRoomProfile.ts
index 8c46cea6..5d1dd865 100644
--- a/src/app/state/hooks/userRoomProfile.ts
+++ b/src/app/state/hooks/userRoomProfile.ts
@@ -1,8 +1,8 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
import { Position, RectCords } from 'folds';
-import { userRoomProfileAtom, UserRoomProfileState } from '../userRoomProfile';
import { UserProfile } from '$hooks/useUserProfile';
+import { userRoomProfileAtom, UserRoomProfileState } from '../userRoomProfile';
export const useUserRoomProfileState = (): UserRoomProfileState | undefined => {
const data = useAtomValue(userRoomProfileAtom);
diff --git a/src/app/state/modal.ts b/src/app/state/modal.ts
index 7fba4b47..1d16cfe8 100644
--- a/src/app/state/modal.ts
+++ b/src/app/state/modal.ts
@@ -1,6 +1,5 @@
import { atom } from 'jotai';
-import { MatrixEvent, Room } from '$types/matrix-sdk';
-import { Relations } from '$types/matrix-sdk';
+import { MatrixEvent, Room, Relations } from '$types/matrix-sdk';
export enum ModalType {
Delete = 'delete',
diff --git a/src/app/state/room/roomInputDrafts.ts b/src/app/state/room/roomInputDrafts.ts
index 425e0f57..72a418ed 100644
--- a/src/app/state/room/roomInputDrafts.ts
+++ b/src/app/state/room/roomInputDrafts.ts
@@ -3,8 +3,8 @@ import { atomFamily } from 'jotai/utils';
import { Descendant } from 'slate';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import { IEventRelation } from '$types/matrix-sdk';
-import { createUploadAtomFamily } from '../upload';
import { TUploadContent } from '$appUtils/matrix';
+import { createUploadAtomFamily } from '../upload';
import { createListAtom } from '../list';
export type TUploadMetadata = {
diff --git a/src/app/state/room/roomToUnread.ts b/src/app/state/room/roomToUnread.ts
index 4890a488..df6b5212 100644
--- a/src/app/state/room/roomToUnread.ts
+++ b/src/app/state/room/roomToUnread.ts
@@ -7,8 +7,9 @@ import {
Room,
RoomEvent,
SyncState,
+ ReceiptContent,
+ ReceiptType,
} from '$types/matrix-sdk';
-import { ReceiptContent, ReceiptType } from '$types/matrix-sdk';
import { useCallback, useEffect } from 'react';
import {
Membership,
@@ -25,10 +26,10 @@ import {
getUnreadInfos,
isNotificationEvent,
} from '$appUtils/room';
-import { roomToParentsAtom } from './roomToParents';
import { useStateEventCallback } from '$hooks/useStateEventCallback';
import { useSyncState } from '$hooks/useSyncState';
import { useRoomsNotificationPreferencesContext } from '$hooks/useRoomsNotificationPreferences';
+import { roomToParentsAtom } from './roomToParents';
export type RoomToUnreadAction =
| {
diff --git a/src/app/utils/matrix.ts b/src/app/utils/matrix.ts
index ff097c68..52867942 100644
--- a/src/app/utils/matrix.ts
+++ b/src/app/utils/matrix.ts
@@ -16,8 +16,8 @@ import {
import to from 'await-to-js';
import { IImageInfo, IThumbnailContent, IVideoInfo } from '$types/matrix/common';
import { AccountDataEvent } from '$types/matrix/accountData';
-import { getStateEvent } from './room';
import { Membership, StateEvent } from '$types/matrix/room';
+import { getStateEvent } from './room';
const DOMAIN_REGEX = /\b(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}\b/;
diff --git a/src/app/utils/room.ts b/src/app/utils/room.ts
index 8ede46b6..a8cb47e2 100644
--- a/src/app/utils/room.ts
+++ b/src/app/utils/room.ts
@@ -16,8 +16,8 @@ import {
RelationType,
Room,
RoomMember,
+ CryptoBackend,
} from '$types/matrix-sdk';
-import { CryptoBackend } from '$types/matrix-sdk';
import { AccountDataEvent } from '$types/matrix/accountData';
import {
IRoomCreateContent,
@@ -237,8 +237,8 @@ export const getUnreadInfo = (room: Room): UnreadInfo => {
};
};
-export const getUnreadInfos = (mx: MatrixClient): UnreadInfo[] => {
- return mx.getRooms().reduce((unread, room) => {
+export const getUnreadInfos = (mx: MatrixClient): UnreadInfo[] =>
+ mx.getRooms().reduce((unread, room) => {
if (room.isSpaceRoom()) return unread;
if (room.getMyMembership() !== 'join') return unread;
if (getNotificationType(mx, room.roomId) === NotificationType.Mute) return unread;
@@ -249,7 +249,6 @@ export const getUnreadInfos = (mx: MatrixClient): UnreadInfo[] => {
return unread;
}, []);
-};
export const getRoomIconSrc = (
icons: Record,
diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts
index f11f577c..8a7c0c4a 100644
--- a/src/client/initMatrix.ts
+++ b/src/client/initMatrix.ts
@@ -96,7 +96,7 @@ export const clearMismatchedStores = async (): Promise => {
}
for (const dbInfo of allDbs) {
- const name = dbInfo.name;
+ const { name } = dbInfo;
if (!name) continue;
const containsKnownUser = Array.from(knownUserIds).some((uid) => name.includes(uid));
diff --git a/src/index.tsx b/src/index.tsx
index 8c132b07..556bea62 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -9,8 +9,6 @@ import '@fontsource/space-mono/700-italic.css';
import 'folds/dist/style.css';
import { configClass, varsClass } from 'folds';
-enableMapSet();
-
import './index.css';
import './app/styles/themes.css';
import './app/styles/overrides/General.css';
@@ -30,6 +28,8 @@ import {
} from './app/state/sessions';
import { getLocalStorageItem } from './app/state/utils/atomWithLocalStorage';
+enableMapSet();
+
document.body.classList.add(configClass, varsClass);
// Register Service Worker
@@ -52,7 +52,7 @@ if ('serviceWorker' in navigator) {
void navigator.serviceWorker.ready.then(sendSessionToSW);
navigator.serviceWorker.addEventListener('message', (ev) => {
- const data: unknown = ev.data;
+ const { data } = ev;
if (!data || typeof data !== 'object') return;
const { type } = data as { type?: unknown };
diff --git a/src/sw.ts b/src/sw.ts
index aa818e50..e7cc6d9d 100644
--- a/src/sw.ts
+++ b/src/sw.ts
@@ -96,7 +96,7 @@ self.addEventListener('message', (event: ExtendableMessageEvent) => {
const client = event.source as Client | null;
if (!client) return;
- const data: unknown = event.data;
+ const { data } = event;
if (!data || typeof data !== 'object') return;
const { type, accessToken, baseUrl } = data as Record;
diff --git a/src/types/matrix-sdk-events.d.ts b/src/types/matrix-sdk-events.d.ts
index 459917f5..a007774d 100644
--- a/src/types/matrix-sdk-events.d.ts
+++ b/src/types/matrix-sdk-events.d.ts
@@ -1,5 +1,4 @@
-import type { PackContent } from '../app/plugins/custom-emoji/types';
-import type { EmoteRoomsContent } from '../app/plugins/custom-emoji/types';
+import type { PackContent, EmoteRoomsContent } from '../app/plugins/custom-emoji/types';
import type { IRecentEmojiContent } from '../app/plugins/recent-emoji';
import type { InCinnySpacesContent } from '../app/hooks/useSidebarItems';
diff --git a/src/util/cryptE2ERoomKeys.js b/src/util/cryptE2ERoomKeys.js
index d80ef316..bfa0101d 100644
--- a/src/util/cryptE2ERoomKeys.js
+++ b/src/util/cryptE2ERoomKeys.js
@@ -297,7 +297,7 @@ export async function encryptMegolmKeyFile(data, password, options) {
encodedData
);
} catch (e) {
- throw friendlyError('subtleCrypto.encrypt failed: ' + e, cryptoFailMsg());
+ throw friendlyError(`subtleCrypto.encrypt failed: ${e}`, cryptoFailMsg());
}
const cipherArray = new Uint8Array(ciphertext);
@@ -322,7 +322,7 @@ export async function encryptMegolmKeyFile(data, password, options) {
try {
hmac = await subtleCrypto.sign({ name: 'HMAC' }, hmacKey, toSign);
} catch (e) {
- throw friendlyError('subtleCrypto.sign failed: ' + e, cryptoFailMsg());
+ throw friendlyError(`subtleCrypto.sign failed: ${e}`, cryptoFailMsg());
}
const hmacArray = new Uint8Array(hmac);
From 724415fb2ff1d7c160f7e1057443965a5dc871e6 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 14:02:24 +0100
Subject: [PATCH 07/59] chore(vite): add types and remove invalid option
---
vite.config.ts | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/vite.config.ts b/vite.config.ts
index c9b2620b..7f47191a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,4 +1,5 @@
import { defineConfig } from 'vite';
+import type { ViteDevServer } from 'vite';
import react from '@vitejs/plugin-react';
import svgr from 'vite-plugin-svgr';
import { wasm } from '@rollup/plugin-wasm';
@@ -46,10 +47,10 @@ const copyFiles = {
],
};
-function serverMatrixSdkCryptoWasm(wasmFilePath) {
+function serverMatrixSdkCryptoWasm(wasmFilePath: string) {
return {
name: 'vite-plugin-serve-matrix-sdk-crypto-wasm',
- configureServer(server) {
+ configureServer(server: ViteDevServer) {
server.middlewares.use((req, res, next) => {
if (req.url === wasmFilePath) {
const resolvedPath = path.join(
@@ -115,9 +116,7 @@ export default defineConfig({
vanillaExtractPlugin(),
wasm(),
react(),
- svgr({
- exportAsDefault: true,
- }),
+ svgr(),
VitePWA({
srcDir: 'src',
filename: 'sw.ts',
From 150acb9bbf58d4ffaeec2d7cc0c8dd7482ebc0e6 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 14:08:47 +0100
Subject: [PATCH 08/59] chore(lint): tighten unused vars rule
updated the TypeScript no-unused-vars configuration and dropped now-unused imports across several components
---
eslint.config.js | 12 +++++++++++-
src/app/components/editor/output.ts | 2 +-
src/app/components/image-viewer/ImageViewer.tsx | 2 +-
src/app/components/url-preview/UrlPreviewCard.tsx | 3 ---
src/app/features/room-settings/RoomSettings.tsx | 1 -
src/app/features/room/RoomInput.tsx | 7 -------
src/app/features/room/RoomTimeline.tsx | 6 +-----
src/app/features/room/message/Message.tsx | 4 ----
src/app/hooks/useCommands.ts | 2 --
src/app/hooks/useNickname.ts | 2 +-
src/app/pages/client/BackgroundNotifications.tsx | 1 -
src/app/pages/client/space/Space.tsx | 1 -
12 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/eslint.config.js b/eslint.config.js
index 24512eba..a609a3ac 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -90,7 +90,17 @@ const projectOverrides = defineConfig([
name: 'project/typescript-legacy-rule-overrides',
files: tsFiles,
rules: {
- '@typescript-eslint/no-unused-vars': 'error',
+ '@typescript-eslint/no-unused-vars': [
+ 'error',
+ {
+ args: 'after-used',
+ enableAutofixRemoval: {
+ imports: true,
+ },
+ ignoreRestSiblings: true,
+ vars: 'all',
+ },
+ ],
'@typescript-eslint/no-shadow': 'error',
'no-undef': 'off',
},
diff --git a/src/app/components/editor/output.ts b/src/app/components/editor/output.ts
index a63d803a..49302991 100644
--- a/src/app/components/editor/output.ts
+++ b/src/app/components/editor/output.ts
@@ -9,7 +9,7 @@ import {
} from '$plugins/markdown';
import { findAndReplace } from '$appUtils/findAndReplace';
import { sanitizeForRegex } from '$appUtils/regex';
-import { getCanonicalAliasOrRoomId, isUserId } from '$appUtils/matrix';
+import { isUserId } from '$appUtils/matrix';
import { CustomElement } from './slate';
import { BlockType } from './types';
diff --git a/src/app/components/image-viewer/ImageViewer.tsx b/src/app/components/image-viewer/ImageViewer.tsx
index 33361d16..bb24fd3a 100644
--- a/src/app/components/image-viewer/ImageViewer.tsx
+++ b/src/app/components/image-viewer/ImageViewer.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
import FileSaver from 'file-saver';
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Text, as } from 'folds';
diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx
index cb2af9ac..b0a76685 100644
--- a/src/app/components/url-preview/UrlPreviewCard.tsx
+++ b/src/app/components/url-preview/UrlPreviewCard.tsx
@@ -11,9 +11,6 @@ import { mxcUrlToHttp } from '$appUtils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import * as css from './UrlPreviewCard.css';
import { UrlPreview, UrlPreviewContent, UrlPreviewDescription, UrlPreviewImg } from './UrlPreview';
-import { ImageViewer } from '../image-viewer';
-import { Image, Video } from '../media';
-import { ImageContent, VideoContent } from '../message';
const linkStyles = { color: color.Success.Main };
const TARGET_HEIGHT = 300;
diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx
index ff21ca62..9b54a1a2 100644
--- a/src/app/features/room-settings/RoomSettings.tsx
+++ b/src/app/features/room-settings/RoomSettings.tsx
@@ -12,7 +12,6 @@ import { mDirectAtom } from '$state/mDirectList';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
import { RoomSettingsPage } from '$state/roomSettings';
import { useRoom } from '$hooks/useRoom';
-import { SwipeableChatWrapper } from '$components/SwipeableChatWrapper';
import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper';
import { General } from './general';
import { Members } from '../common-settings/members';
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index c91b7e34..1c613eff 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -109,13 +109,6 @@ import { roomToParentsAtom } from '$state/room/roomToParents';
import { nicknamesAtom } from '$state/nicknames';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useImagePackRooms } from '$hooks/useImagePackRooms';
-import { usePowerLevelsContext } from '$hooks/usePowerLevels';
-import { useIsDirectRoom } from '$hooks/useRoom';
-import { useAccessiblePowerTagColors, useGetMemberPowerTag } from '$hooks/useMemberPowerTag';
-import { useRoomCreators } from '$hooks/useRoomCreators';
-import { useTheme } from '$hooks/useTheme';
-import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
-import { usePowerLevelTags } from '$hooks/usePowerLevelTags';
import { useComposingCheck } from '$hooks/useComposingCheck';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
import { CommandAutocomplete } from './CommandAutocomplete';
diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
index 50bbd3db..cc679e45 100644
--- a/src/app/features/room/RoomTimeline.tsx
+++ b/src/app/features/room/RoomTimeline.tsx
@@ -116,15 +116,11 @@ import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useIgnoredUsers } from '$hooks/useIgnoredUsers';
import { useImagePackRooms } from '$hooks/useImagePackRooms';
-import { useIsDirectRoom } from '$hooks/useRoom';
import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
import { useSpaceOptionally } from '$hooks/useSpace';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
-import { useAccessiblePowerTagColors, useGetMemberPowerTag } from '$hooks/useMemberPowerTag';
-import { useTheme } from '$hooks/useTheme';
-import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
-import { usePowerLevelTags } from '$hooks/usePowerLevelTags';
+import { useGetMemberPowerTag } from '$hooks/useMemberPowerTag';
import { profilesCacheAtom } from '$state/userRoomProfile';
import * as css from './RoomTimeline.css';
import { EncryptedContent, Event, Message, Reactions } from './message';
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 0ed4eb76..e9fdfc04 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -44,9 +44,6 @@ import { MessageLayout, MessageSpacing, settingsAtom } from '$state/settings';
import { nicknamesAtom, setNicknameAtom } from '$state/nicknames';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRecentEmoji } from '$hooks/useRecentEmoji';
-import { EventReaders } from '$components/event-readers';
-import { TextViewer } from '$components/text-viewer';
-import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { EmojiBoard } from '$components/emoji-board';
import { UserAvatar } from '$components/user-avatar';
import { copyToClipboard } from '$appUtils/dom';
@@ -70,7 +67,6 @@ import { MessageSourceCodeItem } from '$components/message/modals/MessageSource'
import { MessageDeleteItem } from '$components/message/modals/MessageDelete';
import { MessageReportItem } from '$components/message/modals/MessageReport';
import { MessageEditor } from './MessageEditor';
-import { ReactionViewer } from '../reaction-viewer';
import * as css from './styles.css';
export type ReactionHandler = (keyOrMxc: string, shortcode: string) => void;
diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts
index 2a1f76e5..8a047949 100644
--- a/src/app/hooks/useCommands.ts
+++ b/src/app/hooks/useCommands.ts
@@ -3,7 +3,6 @@ import {
EventTimeline,
IContextResponse,
MatrixClient,
- MatrixEvent,
Method,
Preset,
Room,
@@ -13,7 +12,6 @@ import {
} from '$types/matrix-sdk';
import { useMemo } from 'react';
import { Membership, StateEvent } from '$types/matrix/room';
-import { AccountDataEvent } from '$types/matrix/accountData';
import {
addRoomIdToMDirect,
getDMRoomFor,
diff --git a/src/app/hooks/useNickname.ts b/src/app/hooks/useNickname.ts
index 0f3d36d5..968cd17b 100644
--- a/src/app/hooks/useNickname.ts
+++ b/src/app/hooks/useNickname.ts
@@ -1,6 +1,6 @@
import { useAtomValue, useSetAtom } from 'jotai';
import { useCallback, useEffect } from 'react';
-import { ClientEvent, MatrixClient, MatrixEvent } from '$types/matrix-sdk';
+import { MatrixClient } from '$types/matrix-sdk';
import { AccountDataEvent } from '$types/matrix/accountData';
import { nicknamesAtom, setNicknameAtom } from '../state/nicknames';
import { useAccountDataCallback } from './useAccountDataCallback';
diff --git a/src/app/pages/client/BackgroundNotifications.tsx b/src/app/pages/client/BackgroundNotifications.tsx
index e5210f04..8d87ce7d 100644
--- a/src/app/pages/client/BackgroundNotifications.tsx
+++ b/src/app/pages/client/BackgroundNotifications.tsx
@@ -10,7 +10,6 @@ import {
PushProcessor,
} from '$types/matrix-sdk';
import { useAtomValue, useSetAtom } from 'jotai';
-import { useNavigate } from 'react-router-dom';
import {
sessionsAtom,
activeSessionIdAtom,
diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx
index 4de76a90..4f181c36 100644
--- a/src/app/pages/client/space/Space.tsx
+++ b/src/app/pages/client/space/Space.tsx
@@ -75,7 +75,6 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { BreakWord } from '$styles/Text.css';
import { InviteUserPrompt } from '$components/invite-user-prompt';
import { CallNavStatus } from '$features/room-nav/RoomCallNavStatus';
-import { SwipeableChatWrapper } from '$components/SwipeableChatWrapper';
import { mobileOrTablet } from '$appUtils/user-agent';
import { useNavigate } from 'react-router-dom';
import { lastVisitedRoomIdAtom } from '$state/room/lastRoom';
From 1c75c1624fc02b3314ff5640f2bf58d3bd90c280 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 14:09:18 +0100
Subject: [PATCH 09/59] chore(vscode): add knip extension recommendation
---
.vscode/extensions.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 1d7ac851..a3854a85 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,3 +1,3 @@
{
- "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
+ "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "webpro.vscode-knip"]
}
From 77fda8137409e9950e4c4dd9b4de4c7e20e8f383 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 14:40:58 +0100
Subject: [PATCH 10/59] chore(lint): drop redundant React default imports and
add jsx runtime config
---
eslint.config.js | 3 +++
src/app/components/AccountDataEditor.tsx | 2 +-
src/app/components/ActionUIA.tsx | 2 +-
src/app/components/BackupRestore.tsx | 2 +-
src/app/components/BetaNoticeBadge.tsx | 1 -
src/app/components/DeviceVerification.tsx | 2 +-
.../components/DeviceVerificationSetup.tsx | 2 +-
src/app/components/HexColorPickerPopOut.tsx | 2 +-
src/app/components/JoinRulesSwitcher.tsx | 2 +-
src/app/components/LogoutDialog.tsx | 2 +-
src/app/components/ManualVerification.tsx | 2 +-
src/app/components/MemberSortMenu.tsx | 1 -
src/app/components/MembershipFilterMenu.tsx | 1 -
src/app/components/Modal500.tsx | 2 +-
src/app/components/Pdf-viewer/PdfViewer.tsx | 2 +-
src/app/components/RenderMessageContent.tsx | 4 ++--
.../components/RoomNotificationSwitcher.tsx | 2 +-
src/app/components/SecretStorage.tsx | 2 +-
src/app/components/SwipeableChatWrapper.tsx | 2 +-
.../components/SwipeableMessageWrapper.tsx | 12 +++--------
.../components/SwipeableOverlayWrapper.tsx | 2 +-
src/app/components/UIAFlowOverlay.tsx | 2 +-
.../components/UserRoomProfileRenderer.tsx | 1 -
.../create-room/AdditionalCreatorInput.tsx | 2 +-
.../create-room/CreateRoomAccessSelector.tsx | 1 -
.../create-room/CreateRoomAliasInput.tsx | 2 +-
.../create-room/CreateRoomTypeSelector.tsx | 1 -
.../create-room/RoomVersionSelector.tsx | 2 +-
src/app/components/cutout-card/CutoutCard.tsx | 1 -
src/app/components/editor/Editor.tsx | 2 +-
src/app/components/editor/Elements.tsx | 1 -
src/app/components/editor/Toolbar.tsx | 2 +-
.../editor/autocomplete/AutocompleteMenu.tsx | 2 +-
.../autocomplete/EmoticonAutocomplete.tsx | 2 +-
.../autocomplete/RoomMentionAutocomplete.tsx | 2 +-
.../autocomplete/UserMentionAutocomplete.tsx | 2 +-
src/app/components/emoji-board/EmojiBoard.tsx | 2 +-
.../emoji-board/components/Group.tsx | 2 +-
.../emoji-board/components/Item.tsx | 1 -
.../emoji-board/components/Layout.tsx | 2 +-
.../emoji-board/components/NoStickerPacks.tsx | 1 -
.../emoji-board/components/Preview.tsx | 1 -
.../emoji-board/components/SearchInput.tsx | 2 +-
.../emoji-board/components/Sidebar.tsx | 2 +-
.../emoji-board/components/Tabs.tsx | 2 +-
.../components/event-readers/EventReaders.tsx | 1 -
.../components/image-editor/ImageEditor.tsx | 1 -
.../image-pack-view/ImagePackContent.tsx | 2 +-
.../image-pack-view/ImagePackView.tsx | 1 -
.../components/image-pack-view/ImageTile.tsx | 2 +-
.../components/image-pack-view/PackMeta.tsx | 2 +-
.../image-pack-view/RoomImagePack.tsx | 2 +-
.../image-pack-view/UsageSwitcher.tsx | 2 +-
.../image-pack-view/UserImagePack.tsx | 2 +-
.../components/image-viewer/ImageViewer.tsx | 4 ++--
src/app/components/info-card/InfoCard.tsx | 2 +-
.../invite-user-prompt/InviteUserPrompt.tsx | 2 +-
.../join-address-prompt/JoinAddressPrompt.tsx | 2 +-
.../leave-room-prompt/LeaveRoomPrompt.tsx | 2 +-
.../leave-space-prompt/LeaveSpacePrompt.tsx | 2 +-
src/app/components/media/Image.tsx | 2 +-
src/app/components/media/MediaControls.tsx | 2 +-
src/app/components/media/Video.tsx | 2 +-
src/app/components/member-tile/MemberTile.tsx | 2 +-
src/app/components/message/FileHeader.tsx | 2 +-
.../components/message/MsgTypeRenderers.tsx | 2 +-
src/app/components/message/Reaction.tsx | 1 -
src/app/components/message/RenderBody.tsx | 1 -
src/app/components/message/Reply.tsx | 2 +-
src/app/components/message/Time.tsx | 2 +-
.../message/attachment/Attachment.tsx | 1 -
.../message/content/AudioContent.tsx | 2 +-
.../message/content/EventContent.tsx | 2 +-
.../message/content/FallbackContent.tsx | 1 -
.../message/content/FileContent.tsx | 2 +-
.../message/content/ImageContent.tsx | 2 +-
.../message/content/VideoContent.tsx | 2 +-
src/app/components/message/layout/Base.tsx | 1 -
src/app/components/message/layout/Bubble.tsx | 2 +-
src/app/components/message/layout/Compact.tsx | 2 +-
src/app/components/message/layout/Modern.tsx | 2 +-
.../message/modals/GlobalModalManager.tsx | 1 -
.../message/modals/MessageDelete.tsx | 4 ++--
.../message/modals/MessageReactions.tsx | 4 ++--
.../message/modals/MessageReadRecipts.tsx | 4 ++--
.../message/modals/MessageReport.tsx | 4 ++--
.../message/modals/MessageSource.tsx | 4 ++--
.../placeholder/CompactPlaceholder.tsx | 2 +-
.../placeholder/DefaultPlaceholder.tsx | 2 +-
.../message/placeholder/LinePlaceholder.tsx | 1 -
src/app/components/nav/NavCategory.tsx | 2 +-
src/app/components/nav/NavCategoryHeader.tsx | 2 +-
src/app/components/nav/NavEmptyLayout.tsx | 2 +-
src/app/components/nav/NavItem.tsx | 2 +-
src/app/components/nav/NavItemContent.tsx | 2 +-
src/app/components/nav/NavItemOptions.tsx | 2 +-
src/app/components/page/Page.tsx | 2 +-
.../password-input/PasswordInput.tsx | 2 +-
src/app/components/power/PowerColorBadge.tsx | 1 -
src/app/components/power/PowerIcon.tsx | 1 -
src/app/components/power/PowerSelector.tsx | 2 +-
src/app/components/presence/Presence.tsx | 2 +-
src/app/components/room-avatar/RoomAvatar.tsx | 2 +-
src/app/components/room-card/RoomCard.tsx | 2 +-
src/app/components/room-intro/RoomIntro.tsx | 2 +-
.../room-topic-viewer/RoomTopicViewer.tsx | 1 -
.../ScrollTopContainer.tsx | 2 +-
.../components/sequence-card/SequenceCard.tsx | 2 +-
.../components/server-badge/ServerBadge.tsx | 1 -
.../components/setting-tile/SettingTile.tsx | 2 +-
src/app/components/sidebar/Sidebar.tsx | 1 -
src/app/components/sidebar/SidebarContent.tsx | 2 +-
src/app/components/sidebar/SidebarItem.tsx | 2 +-
src/app/components/sidebar/SidebarStack.tsx | 1 -
.../sidebar/SidebarStackSeparator.tsx | 1 -
.../components/splash-screen/SplashScreen.tsx | 2 +-
src/app/components/text-viewer/TextViewer.tsx | 2 +-
src/app/components/time-date/DatePicker.tsx | 2 +-
src/app/components/time-date/PickerColumn.tsx | 2 +-
src/app/components/time-date/TimePicker.tsx | 2 +-
.../typing-indicator/TypingIndicator.tsx | 1 -
src/app/components/uia-stages/DummyStage.tsx | 2 +-
src/app/components/uia-stages/EmailStage.tsx | 2 +-
.../components/uia-stages/PasswordStage.tsx | 2 +-
.../components/uia-stages/ReCaptchaStage.tsx | 1 -
.../uia-stages/RegistrationTokenStage.tsx | 2 +-
src/app/components/uia-stages/SSOStage.tsx | 2 +-
src/app/components/uia-stages/TermsStage.tsx | 2 +-
.../components/unread-badge/UnreadBadge.tsx | 2 +-
.../components/upload-board/UploadBoard.tsx | 2 +-
.../upload-card/CompactUploadCardRenderer.tsx | 2 +-
src/app/components/upload-card/UploadCard.tsx | 2 +-
.../upload-card/UploadCardRenderer.tsx | 2 +-
src/app/components/url-preview/UrlPreview.tsx | 1 -
.../components/url-preview/UrlPreviewCard.tsx | 2 +-
src/app/components/user-avatar/UserAvatar.tsx | 2 +-
.../components/user-profile/CreatorChip.tsx | 2 +-
src/app/components/user-profile/PowerChip.tsx | 2 +-
src/app/components/user-profile/UserChips.tsx | 2 +-
src/app/components/user-profile/UserHero.tsx | 2 +-
.../user-profile/UserModeration.tsx | 2 +-
.../user-profile/UserRoomProfile.tsx | 4 ++--
.../components/virtualizer/VirtualTile.tsx | 1 -
src/app/features/add-existing/AddExisting.tsx | 2 +-
src/app/features/call/CallView.tsx | 5 +++--
src/app/features/call/CallViewUser.tsx | 4 ++--
.../common-settings/cosmetics/Cosmetics.tsx | 2 +-
.../developer-tools/DevelopTools.tsx | 2 +-
.../developer-tools/SendRoomEvent.tsx | 2 +-
.../developer-tools/StateEventEditor.tsx | 2 +-
.../emojis-stickers/EmojisStickers.tsx | 2 +-
.../emojis-stickers/RoomPacks.tsx | 2 +-
.../common-settings/general/RoomAddress.tsx | 2 +-
.../general/RoomEncryption.tsx | 2 +-
.../general/RoomHistoryVisibility.tsx | 2 +-
.../common-settings/general/RoomJoinRules.tsx | 2 +-
.../common-settings/general/RoomProfile.tsx | 2 +-
.../common-settings/general/RoomPublish.tsx | 1 -
.../common-settings/general/RoomUpgrade.tsx | 2 +-
.../common-settings/members/Members.tsx | 2 +-
.../permissions/PermissionGroups.tsx | 2 +-
.../common-settings/permissions/Powers.tsx | 2 +-
.../permissions/PowersEditor.tsx | 2 +-
src/app/features/create-chat/CreateChat.tsx | 2 +-
src/app/features/create-room/CreateRoom.tsx | 2 +-
.../features/create-room/CreateRoomModal.tsx | 1 -
src/app/features/create-space/CreateSpace.tsx | 2 +-
.../create-space/CreateSpaceModal.tsx | 1 -
.../JoinBeforeNavigate.tsx | 1 -
src/app/features/lobby/DnD.tsx | 2 +-
src/app/features/lobby/HierarchyItemMenu.tsx | 2 +-
src/app/features/lobby/Lobby.tsx | 2 +-
src/app/features/lobby/LobbyHeader.tsx | 2 +-
src/app/features/lobby/LobbyHero.tsx | 1 -
src/app/features/lobby/RoomItem.tsx | 2 +-
src/app/features/lobby/SpaceHierarchy.tsx | 2 +-
src/app/features/lobby/SpaceItem.tsx | 2 +-
.../features/message-search/MessageSearch.tsx | 2 +-
.../features/message-search/SearchFilters.tsx | 2 +-
.../features/message-search/SearchInput.tsx | 2 +-
.../message-search/SearchResultGroup.tsx | 2 +-
.../features/room-nav/RoomCallNavStatus.tsx | 1 -
.../room-nav/RoomNavCategoryButton.tsx | 1 -
src/app/features/room-nav/RoomNavItem.tsx | 2 +-
src/app/features/room-nav/RoomNavUser.tsx | 4 ++--
.../features/room-settings/RoomSettings.tsx | 2 +-
.../room-settings/RoomSettingsRenderer.tsx | 1 -
.../room-settings/general/General.tsx | 1 -
.../room-settings/permissions/Permissions.tsx | 2 +-
src/app/features/room/CommandAutocomplete.tsx | 2 +-
src/app/features/room/MembersDrawer.tsx | 2 +-
src/app/features/room/Room.tsx | 2 +-
src/app/features/room/RoomInput.tsx | 8 ++++---
.../features/room/RoomInputPlaceholder.tsx | 2 +-
src/app/features/room/RoomTimeline.tsx | 7 ++++---
src/app/features/room/RoomTombstone.tsx | 2 +-
src/app/features/room/RoomView.tsx | 2 +-
src/app/features/room/RoomViewFollowing.tsx | 2 +-
src/app/features/room/RoomViewHeader.tsx | 2 +-
src/app/features/room/RoomViewTyping.tsx | 1 -
.../features/room/jump-to-time/JumpToTime.tsx | 2 +-
.../room/message/EncryptedContent.tsx | 2 +-
src/app/features/room/message/Message.tsx | 14 ++++++++-----
.../features/room/message/MessageEditor.tsx | 8 +------
src/app/features/room/message/Reactions.tsx | 2 +-
.../room/reaction-viewer/ReactionViewer.tsx | 2 +-
.../room/room-pin-menu/RoomPinMenu.tsx | 4 ++--
src/app/features/search/Search.tsx | 2 +-
src/app/features/settings/Settings.tsx | 2 +-
src/app/features/settings/about/About.tsx | 1 -
src/app/features/settings/account/Account.tsx | 1 -
.../features/settings/account/BioEditor.tsx | 2 +-
.../features/settings/account/ContactInfo.tsx | 2 +-
.../settings/account/IgnoredUserList.tsx | 2 +-
.../features/settings/account/MatrixId.tsx | 1 -
.../settings/account/NameColorEditor.tsx | 2 +-
src/app/features/settings/account/Profile.tsx | 2 +-
.../settings/account/PronounEditor.tsx | 2 +-
.../settings/account/TimezoneEditor.tsx | 2 +-
.../features/settings/cosmetics/Cosmetics.tsx | 2 +-
.../features/settings/cosmetics/Themes.tsx | 7 +------
.../settings/developer-tools/AccountData.tsx | 2 +-
.../settings/developer-tools/DevelopTools.tsx | 2 +-
.../features/settings/devices/DeviceTile.tsx | 2 +-
src/app/features/settings/devices/Devices.tsx | 1 -
.../features/settings/devices/LocalBackup.tsx | 2 +-
.../settings/devices/OtherDevices.tsx | 2 +-
.../settings/devices/Verification.tsx | 2 +-
.../emojis-stickers/EmojisStickers.tsx | 2 +-
.../settings/emojis-stickers/GlobalPacks.tsx | 2 +-
.../settings/emojis-stickers/UserPack.tsx | 1 -
src/app/features/settings/general/General.tsx | 2 +-
.../settings/notifications/AllMessages.tsx | 2 +-
.../notifications/KeywordMessages.tsx | 2 +-
.../NotificationModeSwitcher.tsx | 2 +-
.../settings/notifications/Notifications.tsx | 1 -
.../notifications/SpecialMessages.tsx | 2 +-
.../notifications/SystemNotification.tsx | 2 +-
.../features/space-settings/SpaceSettings.tsx | 2 +-
.../space-settings/SpaceSettingsRenderer.tsx | 1 -
.../space-settings/general/General.tsx | 1 -
.../permissions/Permissions.tsx | 2 +-
.../features/widgets/IntegrationManager.tsx | 2 +-
src/app/features/widgets/WidgetIframe.tsx | 2 +-
src/app/features/widgets/WidgetsDrawer.tsx | 2 +-
src/app/hooks/useAsyncCallback.ts | 4 ++--
src/app/hooks/useMemberEventParser.tsx | 2 +-
src/app/pages/App.tsx | 1 -
src/app/pages/ConfigConfig.tsx | 1 -
src/app/pages/FeatureCheck.tsx | 2 +-
src/app/pages/Router.tsx | 1 -
src/app/pages/ThemeManager.tsx | 2 +-
src/app/pages/auth/AuthFooter.tsx | 1 -
src/app/pages/auth/AuthLayout.tsx | 2 +-
src/app/pages/auth/FiledError.tsx | 1 -
src/app/pages/auth/OrDivider.tsx | 1 -
src/app/pages/auth/SSOLogin.tsx | 2 +-
src/app/pages/auth/ServerPicker.tsx | 2 +-
src/app/pages/auth/login/Login.tsx | 2 +-
.../pages/auth/login/PasswordLoginForm.tsx | 2 +-
src/app/pages/auth/login/TokenLogin.tsx | 2 +-
.../auth/register/PasswordRegisterForm.tsx | 2 +-
src/app/pages/auth/register/Register.tsx | 2 +-
.../auth/reset-password/PasswordResetForm.tsx | 2 +-
.../auth/reset-password/ResetPassword.tsx | 2 +-
.../pages/client/ClientInitStorageAtom.tsx | 2 +-
src/app/pages/client/ClientLayout.tsx | 2 +-
src/app/pages/client/ClientNonUIFeatures.tsx | 2 +-
.../ClientRoomsNotificationPreferences.tsx | 2 +-
src/app/pages/client/ClientRoot.tsx | 4 ++--
src/app/pages/client/SidebarNav.tsx | 2 +-
src/app/pages/client/SpecVersions.tsx | 2 +-
src/app/pages/client/SyncStatus.tsx | 2 +-
src/app/pages/client/WelcomePage.tsx | 1 -
src/app/pages/client/call/CallProvider.tsx | 2 +-
.../client/call/PersistentCallContainer.tsx | 21 +++++++++++++------
src/app/pages/client/create/Create.tsx | 1 -
src/app/pages/client/direct/Direct.tsx | 2 +-
src/app/pages/client/direct/DirectCreate.tsx | 2 +-
src/app/pages/client/direct/RoomProvider.tsx | 2 +-
src/app/pages/client/explore/Explore.tsx | 2 +-
src/app/pages/client/explore/Featured.tsx | 1 -
src/app/pages/client/explore/Server.tsx | 2 +-
src/app/pages/client/home/CreateRoom.tsx | 1 -
src/app/pages/client/home/Home.tsx | 2 +-
src/app/pages/client/home/RoomProvider.tsx | 2 +-
src/app/pages/client/home/Search.tsx | 2 +-
src/app/pages/client/inbox/Inbox.tsx | 1 -
src/app/pages/client/inbox/Invites.tsx | 2 +-
src/app/pages/client/inbox/Notifications.tsx | 2 +-
.../client/sidebar/AccountSwitcherTab.tsx | 4 ++--
src/app/pages/client/sidebar/CreateTab.tsx | 2 +-
src/app/pages/client/sidebar/DirectTab.tsx | 2 +-
src/app/pages/client/sidebar/ExploreTab.tsx | 1 -
src/app/pages/client/sidebar/HomeTab.tsx | 2 +-
src/app/pages/client/sidebar/InboxTab.tsx | 1 -
src/app/pages/client/sidebar/SearchTab.tsx | 1 -
src/app/pages/client/sidebar/SpaceTabs.tsx | 2 +-
.../pages/client/sidebar/UnverifiedTab.tsx | 2 +-
src/app/pages/client/space/RoomProvider.tsx | 2 +-
src/app/pages/client/space/Search.tsx | 2 +-
src/app/pages/client/space/Space.tsx | 9 +-------
src/app/pages/client/space/SpaceProvider.tsx | 2 +-
src/app/plugins/react-custom-html-parser.tsx | 2 +-
src/app/plugins/react-prism/ReactPrism.tsx | 2 +-
305 files changed, 290 insertions(+), 358 deletions(-)
diff --git a/eslint.config.js b/eslint.config.js
index a609a3ac..4246f577 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -7,6 +7,7 @@ import { helpers } from 'eslint-config-airbnb-extended';
import { configs } from 'eslint-config-airbnb-extended/legacy';
import { rules as prettierConfigRules } from 'eslint-config-prettier';
import prettierPlugin from 'eslint-plugin-prettier';
+import reactPlugin from 'eslint-plugin-react';
import globals from 'globals';
const gitignorePath = path.resolve('.', '.gitignore');
@@ -25,6 +26,8 @@ const reactConfig = defineConfig([
...configs.react.recommended,
// Airbnb React hooks config
...configs.react.hooks,
+ // React 17+ automatic JSX runtime
+ reactPlugin.configs.flat['jsx-runtime'],
]);
const typescriptConfig = defineConfig([
diff --git a/src/app/components/AccountDataEditor.tsx b/src/app/components/AccountDataEditor.tsx
index 2e58bed9..0e424604 100644
--- a/src/app/components/AccountDataEditor.tsx
+++ b/src/app/components/AccountDataEditor.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/components/ActionUIA.tsx b/src/app/components/ActionUIA.tsx
index 10a16792..ab5a33db 100644
--- a/src/app/components/ActionUIA.tsx
+++ b/src/app/components/ActionUIA.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { AuthDict, AuthType, IAuthData, UIAFlow } from '$types/matrix-sdk';
import { getUIAFlowForStages } from '../utils/matrix-uia';
import { useSupportedUIAFlows, useUIACompleted, useUIAFlow } from '../hooks/useUIAFlows';
diff --git a/src/app/components/BackupRestore.tsx b/src/app/components/BackupRestore.tsx
index 0192af2f..f12d3ef9 100644
--- a/src/app/components/BackupRestore.tsx
+++ b/src/app/components/BackupRestore.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEventHandler, useCallback, useState } from 'react';
import { useAtom } from 'jotai';
import { CryptoApi, KeyBackupInfo } from '$types/matrix-sdk';
import {
diff --git a/src/app/components/BetaNoticeBadge.tsx b/src/app/components/BetaNoticeBadge.tsx
index d1859876..a6ba55e0 100644
--- a/src/app/components/BetaNoticeBadge.tsx
+++ b/src/app/components/BetaNoticeBadge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { TooltipProvider, Tooltip, Box, Text, Badge, toRem } from 'folds';
export function BetaNoticeBadge() {
diff --git a/src/app/components/DeviceVerification.tsx b/src/app/components/DeviceVerification.tsx
index b3564735..cd4db9a6 100644
--- a/src/app/components/DeviceVerification.tsx
+++ b/src/app/components/DeviceVerification.tsx
@@ -5,7 +5,7 @@ import {
Verifier,
VerificationMethod,
} from '$types/matrix-sdk';
-import React, { CSSProperties, useCallback, useEffect, useState } from 'react';
+import { CSSProperties, useCallback, useEffect, useState } from 'react';
import {
Box,
Button,
diff --git a/src/app/components/DeviceVerificationSetup.tsx b/src/app/components/DeviceVerificationSetup.tsx
index 6425098d..7dbe46eb 100644
--- a/src/app/components/DeviceVerificationSetup.tsx
+++ b/src/app/components/DeviceVerificationSetup.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, forwardRef, useCallback, useState } from 'react';
+import { FormEventHandler, forwardRef, useCallback, useState } from 'react';
import {
Dialog,
Header,
diff --git a/src/app/components/HexColorPickerPopOut.tsx b/src/app/components/HexColorPickerPopOut.tsx
index d8fb4bc3..e8fb1196 100644
--- a/src/app/components/HexColorPickerPopOut.tsx
+++ b/src/app/components/HexColorPickerPopOut.tsx
@@ -1,6 +1,6 @@
import FocusTrap from 'focus-trap-react';
import { Box, Button, config, Menu, PopOut, RectCords, Text } from 'folds';
-import React, { MouseEventHandler, ReactNode, useState } from 'react';
+import { MouseEventHandler, ReactNode, useState } from 'react';
import { stopPropagation } from '../utils/keyboard';
type HexColorPickerPopOutProps = {
diff --git a/src/app/components/JoinRulesSwitcher.tsx b/src/app/components/JoinRulesSwitcher.tsx
index 048b960d..e3054822 100644
--- a/src/app/components/JoinRulesSwitcher.tsx
+++ b/src/app/components/JoinRulesSwitcher.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useMemo, useState } from 'react';
+import { MouseEventHandler, useCallback, useMemo, useState } from 'react';
import {
config,
Box,
diff --git a/src/app/components/LogoutDialog.tsx b/src/app/components/LogoutDialog.tsx
index 6b9139b8..bded57e9 100644
--- a/src/app/components/LogoutDialog.tsx
+++ b/src/app/components/LogoutDialog.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, useCallback } from 'react';
+import { forwardRef, useCallback } from 'react';
import { Dialog, Header, config, Box, Text, Button, Spinner, color } from 'folds';
import { logoutClient } from '$client/initMatrix';
import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
diff --git a/src/app/components/ManualVerification.tsx b/src/app/components/ManualVerification.tsx
index 26c6876f..f0367997 100644
--- a/src/app/components/ManualVerification.tsx
+++ b/src/app/components/ManualVerification.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, ReactNode, useCallback, useState } from 'react';
+import { MouseEventHandler, ReactNode, useCallback, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/components/MemberSortMenu.tsx b/src/app/components/MemberSortMenu.tsx
index d77c80c6..f3088482 100644
--- a/src/app/components/MemberSortMenu.tsx
+++ b/src/app/components/MemberSortMenu.tsx
@@ -1,5 +1,4 @@
import FocusTrap from 'focus-trap-react';
-import React from 'react';
import { config, Menu, MenuItem, Text } from 'folds';
import { stopPropagation } from '../utils/keyboard';
import { useMemberSortMenu } from '../hooks/useMemberSort';
diff --git a/src/app/components/MembershipFilterMenu.tsx b/src/app/components/MembershipFilterMenu.tsx
index bf17677d..8dc80392 100644
--- a/src/app/components/MembershipFilterMenu.tsx
+++ b/src/app/components/MembershipFilterMenu.tsx
@@ -1,5 +1,4 @@
import FocusTrap from 'focus-trap-react';
-import React from 'react';
import { config, Menu, MenuItem, Text } from 'folds';
import { stopPropagation } from '../utils/keyboard';
import { useMembershipFilterMenu } from '../hooks/useMemberFilter';
diff --git a/src/app/components/Modal500.tsx b/src/app/components/Modal500.tsx
index d421b625..6e068e8f 100644
--- a/src/app/components/Modal500.tsx
+++ b/src/app/components/Modal500.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import FocusTrap from 'focus-trap-react';
import { Modal, Overlay, OverlayBackdrop, OverlayCenter } from 'folds';
import { stopPropagation } from '../utils/keyboard';
diff --git a/src/app/components/Pdf-viewer/PdfViewer.tsx b/src/app/components/Pdf-viewer/PdfViewer.tsx
index d49802b5..c9457ff5 100644
--- a/src/app/components/Pdf-viewer/PdfViewer.tsx
+++ b/src/app/components/Pdf-viewer/PdfViewer.tsx
@@ -1,6 +1,6 @@
/* eslint-disable no-param-reassign */
-import React, { FormEventHandler, MouseEventHandler, useEffect, useRef, useState } from 'react';
+import { FormEventHandler, MouseEventHandler, useEffect, useRef, useState } from 'react';
import classNames from 'classnames';
import {
Box,
diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx
index b3bf50e8..8b8eb7df 100644
--- a/src/app/components/RenderMessageContent.tsx
+++ b/src/app/components/RenderMessageContent.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback } from 'react';
+import { memo, useMemo, useCallback } from 'react';
import { MsgType } from '$types/matrix-sdk';
import { HTMLReactParserOptions } from 'html-react-parser';
import { Opts } from 'linkifyjs';
@@ -267,4 +267,4 @@ function RenderMessageContentInternal({
return ;
}
-export const RenderMessageContent = React.memo(RenderMessageContentInternal);
+export const RenderMessageContent = memo(RenderMessageContentInternal);
diff --git a/src/app/components/RoomNotificationSwitcher.tsx b/src/app/components/RoomNotificationSwitcher.tsx
index 7ce91566..86fc3b2b 100644
--- a/src/app/components/RoomNotificationSwitcher.tsx
+++ b/src/app/components/RoomNotificationSwitcher.tsx
@@ -1,5 +1,5 @@
import { Box, config, Icon, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
-import React, { MouseEventHandler, ReactNode, useMemo, useState } from 'react';
+import { MouseEventHandler, ReactNode, useMemo, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { stopPropagation } from '../utils/keyboard';
import {
diff --git a/src/app/components/SecretStorage.tsx b/src/app/components/SecretStorage.tsx
index b9ea114d..b3e91dff 100644
--- a/src/app/components/SecretStorage.tsx
+++ b/src/app/components/SecretStorage.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback } from 'react';
+import { FormEventHandler, useCallback } from 'react';
import { Box, Text, Button, Spinner, color } from 'folds';
import { decodeRecoveryKey, deriveRecoveryKeyFromPassphrase } from '$types/matrix-sdk';
import { SecretStorageKeyContent, SecretStoragePassphraseContent } from '$types/matrix/accountData';
diff --git a/src/app/components/SwipeableChatWrapper.tsx b/src/app/components/SwipeableChatWrapper.tsx
index 9795dee5..820517e4 100644
--- a/src/app/components/SwipeableChatWrapper.tsx
+++ b/src/app/components/SwipeableChatWrapper.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { motion, useMotionValue, useSpring } from 'framer-motion';
import { useDrag } from '@use-gesture/react';
import { useAtomValue } from 'jotai';
diff --git a/src/app/components/SwipeableMessageWrapper.tsx b/src/app/components/SwipeableMessageWrapper.tsx
index df6ddd54..07da1056 100644
--- a/src/app/components/SwipeableMessageWrapper.tsx
+++ b/src/app/components/SwipeableMessageWrapper.tsx
@@ -1,18 +1,12 @@
import { useMotionValue, useSpring, useTransform, motion } from 'framer-motion';
import { useDrag } from '@use-gesture/react';
-import React, { useState, useMemo } from 'react';
+import { ReactNode, useMemo, useState } from 'react';
import { useAtomValue } from 'jotai';
import { config, Icon, Icons } from 'folds';
import { mobileOrTablet } from '../utils/user-agent';
import { RightSwipeAction, settingsAtom } from '../state/settings';
-function ActiveSwipeWrapper({
- children,
- onReply,
-}: {
- children: React.ReactNode;
- onReply: () => void;
-}) {
+function ActiveSwipeWrapper({ children, onReply }: { children: ReactNode; onReply: () => void }) {
const x = useMotionValue(0);
const springX = useSpring(x, { stiffness: 300, damping: 35 });
const [isReady, setIsReady] = useState(false);
@@ -75,7 +69,7 @@ export function SwipeableMessageWrapper({
children,
onReply,
}: {
- children: React.ReactNode;
+ children: ReactNode;
onReply: () => void;
}) {
const settings = useAtomValue(settingsAtom);
diff --git a/src/app/components/SwipeableOverlayWrapper.tsx b/src/app/components/SwipeableOverlayWrapper.tsx
index facff78c..9f555c68 100644
--- a/src/app/components/SwipeableOverlayWrapper.tsx
+++ b/src/app/components/SwipeableOverlayWrapper.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { motion, useMotionValue, useSpring } from 'framer-motion';
import { useDrag } from '@use-gesture/react';
import { useAtomValue } from 'jotai';
diff --git a/src/app/components/UIAFlowOverlay.tsx b/src/app/components/UIAFlowOverlay.tsx
index a2bdd1b8..85211a0f 100644
--- a/src/app/components/UIAFlowOverlay.tsx
+++ b/src/app/components/UIAFlowOverlay.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import {
Overlay,
OverlayBackdrop,
diff --git a/src/app/components/UserRoomProfileRenderer.tsx b/src/app/components/UserRoomProfileRenderer.tsx
index 246b54fd..8f151c68 100644
--- a/src/app/components/UserRoomProfileRenderer.tsx
+++ b/src/app/components/UserRoomProfileRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Menu, PopOut, toRem } from 'folds';
import FocusTrap from 'focus-trap-react';
import { useCloseUserRoomProfile, useUserRoomProfileState } from '../state/hooks/userRoomProfile';
diff --git a/src/app/components/create-room/AdditionalCreatorInput.tsx b/src/app/components/create-room/AdditionalCreatorInput.tsx
index d1fba7aa..5437dd4e 100644
--- a/src/app/components/create-room/AdditionalCreatorInput.tsx
+++ b/src/app/components/create-room/AdditionalCreatorInput.tsx
@@ -17,7 +17,7 @@ import {
} from 'folds';
import { isKeyHotkey } from 'is-hotkey';
import FocusTrap from 'focus-trap-react';
-import React, {
+import {
ChangeEventHandler,
KeyboardEventHandler,
MouseEventHandler,
diff --git a/src/app/components/create-room/CreateRoomAccessSelector.tsx b/src/app/components/create-room/CreateRoomAccessSelector.tsx
index 35f39af8..00025cfa 100644
--- a/src/app/components/create-room/CreateRoomAccessSelector.tsx
+++ b/src/app/components/create-room/CreateRoomAccessSelector.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, Icon, Icons, config, IconSrc } from 'folds';
import { SequenceCard } from '../sequence-card';
import { SettingTile } from '../setting-tile';
diff --git a/src/app/components/create-room/CreateRoomAliasInput.tsx b/src/app/components/create-room/CreateRoomAliasInput.tsx
index 7e2c51b8..4e7f099b 100644
--- a/src/app/components/create-room/CreateRoomAliasInput.tsx
+++ b/src/app/components/create-room/CreateRoomAliasInput.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
FormEventHandler,
KeyboardEventHandler,
useCallback,
diff --git a/src/app/components/create-room/CreateRoomTypeSelector.tsx b/src/app/components/create-room/CreateRoomTypeSelector.tsx
index 06227cb5..941d1762 100644
--- a/src/app/components/create-room/CreateRoomTypeSelector.tsx
+++ b/src/app/components/create-room/CreateRoomTypeSelector.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, Icon, Icons, config, IconSrc } from 'folds';
import { SequenceCard } from '../sequence-card';
import { SettingTile } from '../setting-tile';
diff --git a/src/app/components/create-room/RoomVersionSelector.tsx b/src/app/components/create-room/RoomVersionSelector.tsx
index 0300d496..908565c6 100644
--- a/src/app/components/create-room/RoomVersionSelector.tsx
+++ b/src/app/components/create-room/RoomVersionSelector.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useState } from 'react';
+import { MouseEventHandler, useState } from 'react';
import {
Box,
Button,
diff --git a/src/app/components/cutout-card/CutoutCard.tsx b/src/app/components/cutout-card/CutoutCard.tsx
index f19a556f..5a6c2ae3 100644
--- a/src/app/components/cutout-card/CutoutCard.tsx
+++ b/src/app/components/cutout-card/CutoutCard.tsx
@@ -1,5 +1,4 @@
import { as, ContainerColor as TContainerColor } from 'folds';
-import React from 'react';
import classNames from 'classnames';
import { ContainerColor } from '$styles/ContainerColor.css';
import * as css from './CutoutCard.css';
diff --git a/src/app/components/editor/Editor.tsx b/src/app/components/editor/Editor.tsx
index 4b00629c..22afffb6 100644
--- a/src/app/components/editor/Editor.tsx
+++ b/src/app/components/editor/Editor.tsx
@@ -1,5 +1,5 @@
/* eslint-disable no-param-reassign */
-import React, {
+import {
ClipboardEventHandler,
KeyboardEventHandler,
ReactNode,
diff --git a/src/app/components/editor/Elements.tsx b/src/app/components/editor/Elements.tsx
index 2ca8d504..72a791fd 100644
--- a/src/app/components/editor/Elements.tsx
+++ b/src/app/components/editor/Elements.tsx
@@ -1,5 +1,4 @@
import { Scroll, Text } from 'folds';
-import React from 'react';
import {
RenderElementProps,
RenderLeafProps,
diff --git a/src/app/components/editor/Toolbar.tsx b/src/app/components/editor/Toolbar.tsx
index bb95b567..a5413c04 100644
--- a/src/app/components/editor/Toolbar.tsx
+++ b/src/app/components/editor/Toolbar.tsx
@@ -17,7 +17,7 @@ import {
TooltipProvider,
toRem,
} from 'folds';
-import React, { MouseEventHandler, ReactNode, useState } from 'react';
+import { MouseEventHandler, ReactNode, useState } from 'react';
import { ReactEditor, useSlate } from 'slate-react';
import { isMacOS } from '$appUtils/user-agent';
import { KeySymbol } from '$appUtils/key-symbol';
diff --git a/src/app/components/editor/autocomplete/AutocompleteMenu.tsx b/src/app/components/editor/autocomplete/AutocompleteMenu.tsx
index e3e8b285..08ac980f 100644
--- a/src/app/components/editor/autocomplete/AutocompleteMenu.tsx
+++ b/src/app/components/editor/autocomplete/AutocompleteMenu.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import FocusTrap from 'focus-trap-react';
import { isKeyHotkey } from 'is-hotkey';
import { Header, Menu, Scroll, config } from 'folds';
diff --git a/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx b/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
index 0ea5495f..40425bd6 100644
--- a/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
@@ -1,4 +1,4 @@
-import React, { KeyboardEvent as ReactKeyboardEvent, useEffect, useMemo } from 'react';
+import { KeyboardEvent as ReactKeyboardEvent, useEffect, useMemo } from 'react';
import { Editor } from 'slate';
import { Box, MenuItem, Text, toRem } from 'folds';
import { Room } from '$types/matrix-sdk';
diff --git a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
index 64447f75..8be44bc9 100644
--- a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
@@ -1,4 +1,4 @@
-import React, { KeyboardEvent as ReactKeyboardEvent, useCallback, useEffect } from 'react';
+import { KeyboardEvent as ReactKeyboardEvent, useCallback, useEffect } from 'react';
import { Editor } from 'slate';
import { Avatar, Icon, Icons, MenuItem, Text } from 'folds';
import { JoinRule, MatrixClient } from '$types/matrix-sdk';
diff --git a/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
index 93f2f8c9..06260104 100644
--- a/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, KeyboardEvent as ReactKeyboardEvent } from 'react';
+import { useEffect, KeyboardEvent as ReactKeyboardEvent } from 'react';
import { Editor } from 'slate';
import { Avatar, Icon, Icons, MenuItem, Text } from 'folds';
import { MatrixClient, Room, RoomMember } from '$types/matrix-sdk';
diff --git a/src/app/components/emoji-board/EmojiBoard.tsx b/src/app/components/emoji-board/EmojiBoard.tsx
index 6d2fdc6d..e17252ad 100644
--- a/src/app/components/emoji-board/EmojiBoard.tsx
+++ b/src/app/components/emoji-board/EmojiBoard.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
FocusEventHandler,
MouseEventHandler,
diff --git a/src/app/components/emoji-board/components/Group.tsx b/src/app/components/emoji-board/components/Group.tsx
index cf19c6e0..293ac614 100644
--- a/src/app/components/emoji-board/components/Group.tsx
+++ b/src/app/components/emoji-board/components/Group.tsx
@@ -1,5 +1,5 @@
import { as, Box, Text } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/emoji-board/components/Item.tsx b/src/app/components/emoji-board/components/Item.tsx
index 7411a4d9..3cde2ca7 100644
--- a/src/app/components/emoji-board/components/Item.tsx
+++ b/src/app/components/emoji-board/components/Item.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box } from 'folds';
import { MatrixClient } from '$types/matrix-sdk';
import { PackImageReader } from '$plugins/custom-emoji';
diff --git a/src/app/components/emoji-board/components/Layout.tsx b/src/app/components/emoji-board/components/Layout.tsx
index 392d4a31..28600689 100644
--- a/src/app/components/emoji-board/components/Layout.tsx
+++ b/src/app/components/emoji-board/components/Layout.tsx
@@ -1,5 +1,5 @@
import { as, Box, Line } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/emoji-board/components/NoStickerPacks.tsx b/src/app/components/emoji-board/components/NoStickerPacks.tsx
index 6703362c..9b46229a 100644
--- a/src/app/components/emoji-board/components/NoStickerPacks.tsx
+++ b/src/app/components/emoji-board/components/NoStickerPacks.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, toRem, config, Icons, Icon, Text } from 'folds';
export function NoStickerPacks() {
diff --git a/src/app/components/emoji-board/components/Preview.tsx b/src/app/components/emoji-board/components/Preview.tsx
index 645de5da..7525fe46 100644
--- a/src/app/components/emoji-board/components/Preview.tsx
+++ b/src/app/components/emoji-board/components/Preview.tsx
@@ -1,5 +1,4 @@
import { Box, Text } from 'folds';
-import React from 'react';
import { Atom, atom, useAtomValue } from 'jotai';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
diff --git a/src/app/components/emoji-board/components/SearchInput.tsx b/src/app/components/emoji-board/components/SearchInput.tsx
index 05074645..bf3ef608 100644
--- a/src/app/components/emoji-board/components/SearchInput.tsx
+++ b/src/app/components/emoji-board/components/SearchInput.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEventHandler, useRef } from 'react';
+import { ChangeEventHandler, useRef } from 'react';
import { Input, Chip, Icon, Icons, Text } from 'folds';
import { mobileOrTablet } from '$appUtils/user-agent';
diff --git a/src/app/components/emoji-board/components/Sidebar.tsx b/src/app/components/emoji-board/components/Sidebar.tsx
index de22b483..70bf8790 100644
--- a/src/app/components/emoji-board/components/Sidebar.tsx
+++ b/src/app/components/emoji-board/components/Sidebar.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import {
Box,
Scroll,
diff --git a/src/app/components/emoji-board/components/Tabs.tsx b/src/app/components/emoji-board/components/Tabs.tsx
index d433354f..fc3386d2 100644
--- a/src/app/components/emoji-board/components/Tabs.tsx
+++ b/src/app/components/emoji-board/components/Tabs.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties } from 'react';
+import { CSSProperties } from 'react';
import { Badge, Box, Text } from 'folds';
import { EmojiBoardTab } from '../types';
diff --git a/src/app/components/event-readers/EventReaders.tsx b/src/app/components/event-readers/EventReaders.tsx
index 80a0020e..96eab263 100644
--- a/src/app/components/event-readers/EventReaders.tsx
+++ b/src/app/components/event-readers/EventReaders.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import classNames from 'classnames';
import {
Avatar,
diff --git a/src/app/components/image-editor/ImageEditor.tsx b/src/app/components/image-editor/ImageEditor.tsx
index 1ec474e8..f937192e 100644
--- a/src/app/components/image-editor/ImageEditor.tsx
+++ b/src/app/components/image-editor/ImageEditor.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Text, as } from 'folds';
import * as css from './ImageEditor.css';
diff --git a/src/app/components/image-pack-view/ImagePackContent.tsx b/src/app/components/image-pack-view/ImagePackContent.tsx
index 00317a24..64c5874a 100644
--- a/src/app/components/image-pack-view/ImagePackContent.tsx
+++ b/src/app/components/image-pack-view/ImagePackContent.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
import { as, Box, Text, config, Button, Menu, Spinner } from 'folds';
import {
ImagePack,
diff --git a/src/app/components/image-pack-view/ImagePackView.tsx b/src/app/components/image-pack-view/ImagePackView.tsx
index e2950bbe..7a6ebc9f 100644
--- a/src/app/components/image-pack-view/ImagePackView.tsx
+++ b/src/app/components/image-pack-view/ImagePackView.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, IconButton, Text, Icon, Icons, Scroll, Chip } from 'folds';
import { PackAddress } from '$plugins/custom-emoji';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/image-pack-view/ImageTile.tsx b/src/app/components/image-pack-view/ImageTile.tsx
index 8d88eec4..c766a150 100644
--- a/src/app/components/image-pack-view/ImageTile.tsx
+++ b/src/app/components/image-pack-view/ImageTile.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, ReactNode, useMemo, useState } from 'react';
+import { FormEventHandler, ReactNode, useMemo, useState } from 'react';
import { Badge, Box, Button, Chip, Icon, Icons, Input, Text } from 'folds';
import { mxcUrlToHttp } from '$appUtils/matrix';
import { ImageUsage, imageUsageEqual, PackImageReader } from '$plugins/custom-emoji';
diff --git a/src/app/components/image-pack-view/PackMeta.tsx b/src/app/components/image-pack-view/PackMeta.tsx
index c030569d..0fefb69a 100644
--- a/src/app/components/image-pack-view/PackMeta.tsx
+++ b/src/app/components/image-pack-view/PackMeta.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useMemo, useState } from 'react';
+import { FormEventHandler, useCallback, useMemo, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/components/image-pack-view/RoomImagePack.tsx b/src/app/components/image-pack-view/RoomImagePack.tsx
index 477d7a64..f4ad1dd8 100644
--- a/src/app/components/image-pack-view/RoomImagePack.tsx
+++ b/src/app/components/image-pack-view/RoomImagePack.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { Room } from '$types/matrix-sdk';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/image-pack-view/UsageSwitcher.tsx b/src/app/components/image-pack-view/UsageSwitcher.tsx
index b8875f31..31d9fae3 100644
--- a/src/app/components/image-pack-view/UsageSwitcher.tsx
+++ b/src/app/components/image-pack-view/UsageSwitcher.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useMemo, useState } from 'react';
+import { MouseEventHandler, useMemo, useState } from 'react';
import { Box, Button, config, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
import FocusTrap from 'focus-trap-react';
import { ImageUsage } from '$plugins/custom-emoji';
diff --git a/src/app/components/image-pack-view/UserImagePack.tsx b/src/app/components/image-pack-view/UserImagePack.tsx
index b1ab837d..a723b83a 100644
--- a/src/app/components/image-pack-view/UserImagePack.tsx
+++ b/src/app/components/image-pack-view/UserImagePack.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { ImagePack, PackContent } from '$plugins/custom-emoji';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AccountDataEvent } from '$types/matrix/accountData';
diff --git a/src/app/components/image-viewer/ImageViewer.tsx b/src/app/components/image-viewer/ImageViewer.tsx
index bb24fd3a..1d690f4a 100644
--- a/src/app/components/image-viewer/ImageViewer.tsx
+++ b/src/app/components/image-viewer/ImageViewer.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { WheelEvent } from 'react';
import FileSaver from 'file-saver';
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Text, as } from 'folds';
@@ -24,7 +24,7 @@ export const ImageViewer = as<'div', ImageViewerProps>(
FileSaver.saveAs(fileContent, alt);
};
- const handleWheel = (e: React.WheelEvent) => {
+ const handleWheel = (e: WheelEvent) => {
if (e.deltaY < 0) zoomIn();
else zoomOut();
};
diff --git a/src/app/components/info-card/InfoCard.tsx b/src/app/components/info-card/InfoCard.tsx
index 6e4d8ecc..9db5f5f4 100644
--- a/src/app/components/info-card/InfoCard.tsx
+++ b/src/app/components/info-card/InfoCard.tsx
@@ -1,5 +1,5 @@
import { Box, ContainerColor, Text } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import { BreakWord } from '$styles/Text.css';
import { ContainerColor as ContainerClr } from '$styles/ContainerColor.css';
diff --git a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
index 2b9480ee..cdcee398 100644
--- a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
+++ b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
FormEventHandler,
KeyboardEventHandler,
diff --git a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
index ebdd1f67..dbf31778 100644
--- a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
+++ b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useState } from 'react';
+import { FormEventHandler, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Dialog,
diff --git a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
index 6a7e2868..a7cabfe9 100644
--- a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
+++ b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Dialog,
diff --git a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
index f70d4994..f7f674c4 100644
--- a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
+++ b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Dialog,
diff --git a/src/app/components/media/Image.tsx b/src/app/components/media/Image.tsx
index dda21a53..29990e99 100644
--- a/src/app/components/media/Image.tsx
+++ b/src/app/components/media/Image.tsx
@@ -1,4 +1,4 @@
-import React, { ImgHTMLAttributes, forwardRef } from 'react';
+import { ImgHTMLAttributes, forwardRef } from 'react';
import classNames from 'classnames';
import * as css from './media.css';
diff --git a/src/app/components/media/MediaControls.tsx b/src/app/components/media/MediaControls.tsx
index 95a344ab..2360b9f9 100644
--- a/src/app/components/media/MediaControls.tsx
+++ b/src/app/components/media/MediaControls.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, as } from 'folds';
export type MediaControlProps = {
diff --git a/src/app/components/media/Video.tsx b/src/app/components/media/Video.tsx
index 03108c32..307dc9e6 100644
--- a/src/app/components/media/Video.tsx
+++ b/src/app/components/media/Video.tsx
@@ -1,4 +1,4 @@
-import React, { VideoHTMLAttributes, forwardRef } from 'react';
+import { VideoHTMLAttributes, forwardRef } from 'react';
import classNames from 'classnames';
import * as css from './media.css';
diff --git a/src/app/components/member-tile/MemberTile.tsx b/src/app/components/member-tile/MemberTile.tsx
index 584a9fc6..d3e4f230 100644
--- a/src/app/components/member-tile/MemberTile.tsx
+++ b/src/app/components/member-tile/MemberTile.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { as, Avatar, Box, Icon, Icons, Text } from 'folds';
import { MatrixClient, Room, RoomMember } from '$types/matrix-sdk';
import { getMemberDisplayName } from '$appUtils/room';
diff --git a/src/app/components/message/FileHeader.tsx b/src/app/components/message/FileHeader.tsx
index 2b85b2c7..f0d8273d 100644
--- a/src/app/components/message/FileHeader.tsx
+++ b/src/app/components/message/FileHeader.tsx
@@ -1,5 +1,5 @@
import { Badge, Box, Icon, IconButton, Icons, Spinner, Text, as, toRem } from 'folds';
-import React, { ReactNode, useCallback } from 'react';
+import { ReactNode, useCallback } from 'react';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import FileSaver from 'file-saver';
import { mimeTypeToExt } from '$appUtils/mimeTypes';
diff --git a/src/app/components/message/MsgTypeRenderers.tsx b/src/app/components/message/MsgTypeRenderers.tsx
index 5a5916d8..d3e26eb0 100644
--- a/src/app/components/message/MsgTypeRenderers.tsx
+++ b/src/app/components/message/MsgTypeRenderers.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties, ReactNode, useMemo } from 'react';
+import { CSSProperties, ReactNode, useMemo } from 'react';
import { Box, Chip, Icon, Icons, Text, toRem } from 'folds';
import { IContent } from '$types/matrix-sdk';
import { JUMBO_EMOJI_REG, URL_REG } from '$appUtils/regex';
diff --git a/src/app/components/message/Reaction.tsx b/src/app/components/message/Reaction.tsx
index 981e0664..85223ce5 100644
--- a/src/app/components/message/Reaction.tsx
+++ b/src/app/components/message/Reaction.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, as } from 'folds';
import classNames from 'classnames';
import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
diff --git a/src/app/components/message/RenderBody.tsx b/src/app/components/message/RenderBody.tsx
index 1e8c2e2f..40fa84d0 100644
--- a/src/app/components/message/RenderBody.tsx
+++ b/src/app/components/message/RenderBody.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import parse, { HTMLReactParserOptions } from 'html-react-parser';
import Linkify from 'linkify-react';
import { Opts } from 'linkifyjs';
diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx
index 4d244562..ca3190b4 100644
--- a/src/app/components/message/Reply.tsx
+++ b/src/app/components/message/Reply.tsx
@@ -1,6 +1,6 @@
import { Box, Icon, Icons, Text, as, color, toRem } from 'folds';
import { EventTimelineSet, Room } from '$types/matrix-sdk';
-import React, { MouseEventHandler, ReactNode, useCallback, useMemo } from 'react';
+import { MouseEventHandler, ReactNode, useCallback, useMemo } from 'react';
import classNames from 'classnames';
import parse from 'html-react-parser';
import { useAtomValue } from 'jotai';
diff --git a/src/app/components/message/Time.tsx b/src/app/components/message/Time.tsx
index 37572a2a..44265698 100644
--- a/src/app/components/message/Time.tsx
+++ b/src/app/components/message/Time.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps } from 'react';
+import { ComponentProps } from 'react';
import { Text, as } from 'folds';
import {
timeDayMonYear,
diff --git a/src/app/components/message/attachment/Attachment.tsx b/src/app/components/message/attachment/Attachment.tsx
index 4b0b71f3..d0c737ca 100644
--- a/src/app/components/message/attachment/Attachment.tsx
+++ b/src/app/components/message/attachment/Attachment.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import * as css from './Attachment.css';
diff --git a/src/app/components/message/content/AudioContent.tsx b/src/app/components/message/content/AudioContent.tsx
index 5704595b..97668806 100644
--- a/src/app/components/message/content/AudioContent.tsx
+++ b/src/app/components/message/content/AudioContent.tsx
@@ -1,5 +1,5 @@
/* eslint-disable jsx-a11y/media-has-caption */
-import React, { ReactNode, useCallback, useRef, useState } from 'react';
+import { ReactNode, useCallback, useRef, useState } from 'react';
import { Badge, Chip, Icon, IconButton, Icons, ProgressBar, Spinner, Text, toRem } from 'folds';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import { Range } from 'react-range';
diff --git a/src/app/components/message/content/EventContent.tsx b/src/app/components/message/content/EventContent.tsx
index afac5bf3..6aa98d6f 100644
--- a/src/app/components/message/content/EventContent.tsx
+++ b/src/app/components/message/content/EventContent.tsx
@@ -1,5 +1,5 @@
import { Box, Icon, IconSrc } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { MessageLayout } from '$state/settings';
import { BubbleLayout, CompactLayout, ModernLayout } from '..';
diff --git a/src/app/components/message/content/FallbackContent.tsx b/src/app/components/message/content/FallbackContent.tsx
index 9edb9678..270504f0 100644
--- a/src/app/components/message/content/FallbackContent.tsx
+++ b/src/app/components/message/content/FallbackContent.tsx
@@ -1,5 +1,4 @@
import { Box, Icon, Icons, Text, as, color, config } from 'folds';
-import React from 'react';
const warningStyle = { color: color.Warning.Main, opacity: config.opacity.P300 };
const criticalStyle = { color: color.Critical.Main, opacity: config.opacity.P300 };
diff --git a/src/app/components/message/content/FileContent.tsx b/src/app/components/message/content/FileContent.tsx
index bbc8314b..6da0abde 100644
--- a/src/app/components/message/content/FileContent.tsx
+++ b/src/app/components/message/content/FileContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useCallback, useState } from 'react';
+import { ReactNode, useCallback, useState } from 'react';
import {
Box,
Button,
diff --git a/src/app/components/message/content/ImageContent.tsx b/src/app/components/message/content/ImageContent.tsx
index c638c5a1..ca66d07f 100644
--- a/src/app/components/message/content/ImageContent.tsx
+++ b/src/app/components/message/content/ImageContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useCallback, useEffect, useState } from 'react';
+import { ReactNode, useCallback, useEffect, useState } from 'react';
import {
Badge,
Box,
diff --git a/src/app/components/message/content/VideoContent.tsx b/src/app/components/message/content/VideoContent.tsx
index 91593178..5c24b765 100644
--- a/src/app/components/message/content/VideoContent.tsx
+++ b/src/app/components/message/content/VideoContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useCallback, useEffect, useState } from 'react';
+import { ReactNode, useCallback, useEffect, useState } from 'react';
import {
Badge,
Box,
diff --git a/src/app/components/message/layout/Base.tsx b/src/app/components/message/layout/Base.tsx
index f5028764..f0c65f46 100644
--- a/src/app/components/message/layout/Base.tsx
+++ b/src/app/components/message/layout/Base.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Text, as } from 'folds';
import classNames from 'classnames';
import * as css from './layout.css';
diff --git a/src/app/components/message/layout/Bubble.tsx b/src/app/components/message/layout/Bubble.tsx
index 93ff84bc..c49cfa35 100644
--- a/src/app/components/message/layout/Bubble.tsx
+++ b/src/app/components/message/layout/Bubble.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import { Box, ContainerColor, as, color } from 'folds';
import * as css from './layout.css';
diff --git a/src/app/components/message/layout/Compact.tsx b/src/app/components/message/layout/Compact.tsx
index a033919f..e9015ab9 100644
--- a/src/app/components/message/layout/Compact.tsx
+++ b/src/app/components/message/layout/Compact.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, as } from 'folds';
import * as css from './layout.css';
diff --git a/src/app/components/message/layout/Modern.tsx b/src/app/components/message/layout/Modern.tsx
index 70b25c57..e73e9301 100644
--- a/src/app/components/message/layout/Modern.tsx
+++ b/src/app/components/message/layout/Modern.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, as } from 'folds';
import * as css from './layout.css';
diff --git a/src/app/components/message/modals/GlobalModalManager.tsx b/src/app/components/message/modals/GlobalModalManager.tsx
index 86de0d6e..ec827f76 100644
--- a/src/app/components/message/modals/GlobalModalManager.tsx
+++ b/src/app/components/message/modals/GlobalModalManager.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { useAtom } from 'jotai';
import { Overlay, OverlayBackdrop, OverlayCenter, Box, Modal } from 'folds';
import FocusTrap from 'focus-trap-react';
diff --git a/src/app/components/message/modals/MessageDelete.tsx b/src/app/components/message/modals/MessageDelete.tsx
index 9b674373..b91bad7f 100644
--- a/src/app/components/message/modals/MessageDelete.tsx
+++ b/src/app/components/message/modals/MessageDelete.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, FormEventHandler } from 'react';
+import { FormEventHandler, MouseEvent, useCallback } from 'react';
import { Room, MatrixEvent } from '$types/matrix-sdk';
import { useSetAtom } from 'jotai';
import {
@@ -31,7 +31,7 @@ export function MessageDeleteItem({ room, mEvent }: { room: Room; mEvent: Matrix
radii="300"
fill="None"
variant="Critical"
- onClick={(e: React.MouseEvent) => {
+ onClick={(e: MouseEvent) => {
e.preventDefault();
e.stopPropagation();
setModal({
diff --git a/src/app/components/message/modals/MessageReactions.tsx b/src/app/components/message/modals/MessageReactions.tsx
index f0dfd665..f2fa7a5b 100644
--- a/src/app/components/message/modals/MessageReactions.tsx
+++ b/src/app/components/message/modals/MessageReactions.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { MouseEvent } from 'react';
import { Room, Relations } from '$types/matrix-sdk';
import { useSetAtom } from 'jotai';
import { Icon, Icons, Text, MenuItem } from 'folds';
@@ -14,7 +14,7 @@ export function MessageAllReactionItem({ room, relations }: { room: Room; relati
size="300"
after={}
radii="300"
- onClick={(e: React.MouseEvent) => {
+ onClick={(e: MouseEvent) => {
e.preventDefault();
e.stopPropagation();
setModal({
diff --git a/src/app/components/message/modals/MessageReadRecipts.tsx b/src/app/components/message/modals/MessageReadRecipts.tsx
index f2baffe7..6642627c 100644
--- a/src/app/components/message/modals/MessageReadRecipts.tsx
+++ b/src/app/components/message/modals/MessageReadRecipts.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { MouseEvent } from 'react';
import { Room } from '$types/matrix-sdk';
import { useSetAtom } from 'jotai';
import { MenuItem, Icon, Icons, Text } from 'folds';
@@ -14,7 +14,7 @@ export function MessageReadReceiptItem({ room, eventId }: { room: Room; eventId:
size="300"
after={}
radii="300"
- onClick={(e: React.MouseEvent) => {
+ onClick={(e: MouseEvent) => {
e.preventDefault();
e.stopPropagation();
setModal({
diff --git a/src/app/components/message/modals/MessageReport.tsx b/src/app/components/message/modals/MessageReport.tsx
index 2c62bcb1..cf8aacc5 100644
--- a/src/app/components/message/modals/MessageReport.tsx
+++ b/src/app/components/message/modals/MessageReport.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, FormEventHandler } from 'react';
+import { FormEventHandler, MouseEvent, useCallback } from 'react';
import { Room, MatrixEvent } from '$types/matrix-sdk';
import { useSetAtom } from 'jotai';
import {
@@ -31,7 +31,7 @@ export function MessageReportItem({ room, mEvent }: { room: Room; mEvent: Matrix
fill="None"
after={}
radii="300"
- onClick={(e: React.MouseEvent) => {
+ onClick={(e: MouseEvent) => {
e.preventDefault();
e.stopPropagation();
setModal({
diff --git a/src/app/components/message/modals/MessageSource.tsx b/src/app/components/message/modals/MessageSource.tsx
index 3b4b655b..7de45b73 100644
--- a/src/app/components/message/modals/MessageSource.tsx
+++ b/src/app/components/message/modals/MessageSource.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { MouseEvent } from 'react';
import { Room, MatrixEvent } from '$types/matrix-sdk';
import { useSetAtom } from 'jotai';
import { MenuItem, Icon, Icons, Text } from 'folds';
@@ -15,7 +15,7 @@ export function MessageSourceCodeItem({ room, mEvent }: { room: Room; mEvent: Ma
size="300"
after={}
radii="300"
- onClick={(e: React.MouseEvent) => {
+ onClick={(e: MouseEvent) => {
e.preventDefault();
e.stopPropagation();
setModal({
diff --git a/src/app/components/message/placeholder/CompactPlaceholder.tsx b/src/app/components/message/placeholder/CompactPlaceholder.tsx
index 0dbffa0e..62d9ca23 100644
--- a/src/app/components/message/placeholder/CompactPlaceholder.tsx
+++ b/src/app/components/message/placeholder/CompactPlaceholder.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { as, ContainerColor, toRem } from 'folds';
import { randomNumberBetween } from '$appUtils/common';
import { LinePlaceholder } from './LinePlaceholder';
diff --git a/src/app/components/message/placeholder/DefaultPlaceholder.tsx b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
index 20fc506e..21fbc6e2 100644
--- a/src/app/components/message/placeholder/DefaultPlaceholder.tsx
+++ b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties, useMemo } from 'react';
+import { CSSProperties, useMemo } from 'react';
import { Avatar, Box, ContainerColor, as, color, toRem } from 'folds';
import { randomNumberBetween } from '$appUtils/common';
import { LinePlaceholder } from './LinePlaceholder';
diff --git a/src/app/components/message/placeholder/LinePlaceholder.tsx b/src/app/components/message/placeholder/LinePlaceholder.tsx
index 58fc52c0..7aaaac36 100644
--- a/src/app/components/message/placeholder/LinePlaceholder.tsx
+++ b/src/app/components/message/placeholder/LinePlaceholder.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import * as css from './LinePlaceholder.css';
diff --git a/src/app/components/nav/NavCategory.tsx b/src/app/components/nav/NavCategory.tsx
index 4ccf1158..7285330f 100644
--- a/src/app/components/nav/NavCategory.tsx
+++ b/src/app/components/nav/NavCategory.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { as } from 'folds';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/nav/NavCategoryHeader.tsx b/src/app/components/nav/NavCategoryHeader.tsx
index e6ae700a..1d4152fc 100644
--- a/src/app/components/nav/NavCategoryHeader.tsx
+++ b/src/app/components/nav/NavCategoryHeader.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import { Header, as } from 'folds';
import * as css from './styles.css';
diff --git a/src/app/components/nav/NavEmptyLayout.tsx b/src/app/components/nav/NavEmptyLayout.tsx
index 322ef1c3..25b69380 100644
--- a/src/app/components/nav/NavEmptyLayout.tsx
+++ b/src/app/components/nav/NavEmptyLayout.tsx
@@ -1,5 +1,5 @@
import { Box, config } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
export function NavEmptyCenter({ children }: { children: ReactNode }) {
return (
diff --git a/src/app/components/nav/NavItem.tsx b/src/app/components/nav/NavItem.tsx
index 1ec1257f..68a967f6 100644
--- a/src/app/components/nav/NavItem.tsx
+++ b/src/app/components/nav/NavItem.tsx
@@ -1,5 +1,5 @@
import classNames from 'classnames';
-import React, { ComponentProps, forwardRef } from 'react';
+import { ComponentProps, forwardRef } from 'react';
import { Link } from 'react-router-dom';
import { as } from 'folds';
import * as css from './styles.css';
diff --git a/src/app/components/nav/NavItemContent.tsx b/src/app/components/nav/NavItemContent.tsx
index d6a5d131..22a45881 100644
--- a/src/app/components/nav/NavItemContent.tsx
+++ b/src/app/components/nav/NavItemContent.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps } from 'react';
+import { ComponentProps } from 'react';
import { Text, as } from 'folds';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/nav/NavItemOptions.tsx b/src/app/components/nav/NavItemOptions.tsx
index 1c2ffd3f..a735781e 100644
--- a/src/app/components/nav/NavItemOptions.tsx
+++ b/src/app/components/nav/NavItemOptions.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps } from 'react';
+import { ComponentProps } from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/components/page/Page.tsx b/src/app/components/page/Page.tsx
index d31a6d4f..b481df63 100644
--- a/src/app/components/page/Page.tsx
+++ b/src/app/components/page/Page.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps, MutableRefObject, ReactNode } from 'react';
+import { ComponentProps, MutableRefObject, ReactNode } from 'react';
import { Box, Header, Line, Scroll, Text, as } from 'folds';
import classNames from 'classnames';
import { ContainerColor } from '$styles/ContainerColor.css';
diff --git a/src/app/components/password-input/PasswordInput.tsx b/src/app/components/password-input/PasswordInput.tsx
index 4ffe0d83..16aa1f16 100644
--- a/src/app/components/password-input/PasswordInput.tsx
+++ b/src/app/components/password-input/PasswordInput.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps, forwardRef } from 'react';
+import { ComponentProps, forwardRef } from 'react';
import { Icon, IconButton, Input, config, Icons } from 'folds';
import { UseStateProvider } from '../UseStateProvider';
diff --git a/src/app/components/power/PowerColorBadge.tsx b/src/app/components/power/PowerColorBadge.tsx
index 497385b7..5ef1f12a 100644
--- a/src/app/components/power/PowerColorBadge.tsx
+++ b/src/app/components/power/PowerColorBadge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { as } from 'folds';
import classNames from 'classnames';
import * as css from './style.css';
diff --git a/src/app/components/power/PowerIcon.tsx b/src/app/components/power/PowerIcon.tsx
index edddae47..d62b8c12 100644
--- a/src/app/components/power/PowerIcon.tsx
+++ b/src/app/components/power/PowerIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { JUMBO_EMOJI_REG } from '$appUtils/regex';
import * as css from './style.css';
diff --git a/src/app/components/power/PowerSelector.tsx b/src/app/components/power/PowerSelector.tsx
index 1870bec6..1134bb51 100644
--- a/src/app/components/power/PowerSelector.tsx
+++ b/src/app/components/power/PowerSelector.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, MouseEventHandler, ReactNode, useState } from 'react';
+import { forwardRef, MouseEventHandler, ReactNode, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { Box, config, Menu, MenuItem, PopOut, Scroll, Text, toRem, RectCords } from 'folds';
import { getPowers, PowerLevelTags } from '$hooks/usePowerLevelTags';
diff --git a/src/app/components/presence/Presence.tsx b/src/app/components/presence/Presence.tsx
index 739b895e..7b4e5587 100644
--- a/src/app/components/presence/Presence.tsx
+++ b/src/app/components/presence/Presence.tsx
@@ -10,7 +10,7 @@ import {
TooltipProvider,
toRem,
} from 'folds';
-import React, { ReactNode, useId } from 'react';
+import { ReactNode, useId } from 'react';
import { Presence, usePresenceLabel } from '$hooks/useUserPresence';
import * as css from './styles.css';
diff --git a/src/app/components/room-avatar/RoomAvatar.tsx b/src/app/components/room-avatar/RoomAvatar.tsx
index cde83685..ecf85972 100644
--- a/src/app/components/room-avatar/RoomAvatar.tsx
+++ b/src/app/components/room-avatar/RoomAvatar.tsx
@@ -1,6 +1,6 @@
import { JoinRule } from '$types/matrix-sdk';
import { AvatarFallback, AvatarImage, Icon, Icons, color } from 'folds';
-import React, { ComponentProps, ReactEventHandler, ReactNode, forwardRef, useState } from 'react';
+import { ComponentProps, ReactEventHandler, ReactNode, forwardRef, useState } from 'react';
import { getRoomIconSrc } from '$appUtils/room';
import colorMXID from '$util/colorMXID';
import * as css from './RoomAvatar.css';
diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx
index 5c2d604a..5f117b2f 100644
--- a/src/app/components/room-card/RoomCard.tsx
+++ b/src/app/components/room-card/RoomCard.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useCallback, useRef, useState } from 'react';
+import { ReactNode, useCallback, useRef, useState } from 'react';
import { MatrixError, Room } from '$types/matrix-sdk';
import {
Avatar,
diff --git a/src/app/components/room-intro/RoomIntro.tsx b/src/app/components/room-intro/RoomIntro.tsx
index e3bb7251..eccfbc0d 100644
--- a/src/app/components/room-intro/RoomIntro.tsx
+++ b/src/app/components/room-intro/RoomIntro.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Avatar, Box, Button, Spinner, Text, as } from 'folds';
import { Room } from '$types/matrix-sdk';
import { useAtomValue } from 'jotai';
diff --git a/src/app/components/room-topic-viewer/RoomTopicViewer.tsx b/src/app/components/room-topic-viewer/RoomTopicViewer.tsx
index 1b14f934..87fc74f4 100644
--- a/src/app/components/room-topic-viewer/RoomTopicViewer.tsx
+++ b/src/app/components/room-topic-viewer/RoomTopicViewer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { as, Box, Header, Icon, IconButton, Icons, Modal, Scroll, Text } from 'folds';
import classNames from 'classnames';
import Linkify from 'linkify-react';
diff --git a/src/app/components/scroll-top-container/ScrollTopContainer.tsx b/src/app/components/scroll-top-container/ScrollTopContainer.tsx
index dceac08c..4681e7ba 100644
--- a/src/app/components/scroll-top-container/ScrollTopContainer.tsx
+++ b/src/app/components/scroll-top-container/ScrollTopContainer.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject, useCallback, useState } from 'react';
+import { RefObject, useCallback, useState } from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import {
diff --git a/src/app/components/sequence-card/SequenceCard.tsx b/src/app/components/sequence-card/SequenceCard.tsx
index 9f3c73fc..65d80dce 100644
--- a/src/app/components/sequence-card/SequenceCard.tsx
+++ b/src/app/components/sequence-card/SequenceCard.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps } from 'react';
+import { ComponentProps } from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
import { ContainerColor, ContainerColorVariants } from '$styles/ContainerColor.css';
diff --git a/src/app/components/server-badge/ServerBadge.tsx b/src/app/components/server-badge/ServerBadge.tsx
index f61a146f..9a53af6e 100644
--- a/src/app/components/server-badge/ServerBadge.tsx
+++ b/src/app/components/server-badge/ServerBadge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { as, Badge, Text } from 'folds';
export const ServerBadge = as<
diff --git a/src/app/components/setting-tile/SettingTile.tsx b/src/app/components/setting-tile/SettingTile.tsx
index 541480a3..e57dccd5 100644
--- a/src/app/components/setting-tile/SettingTile.tsx
+++ b/src/app/components/setting-tile/SettingTile.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, Text } from 'folds';
import { BreakWord } from '$styles/Text.css';
diff --git a/src/app/components/sidebar/Sidebar.tsx b/src/app/components/sidebar/Sidebar.tsx
index 7caf1b21..1e755987 100644
--- a/src/app/components/sidebar/Sidebar.tsx
+++ b/src/app/components/sidebar/Sidebar.tsx
@@ -1,6 +1,5 @@
import classNames from 'classnames';
import { as } from 'folds';
-import React from 'react';
import * as css from './Sidebar.css';
export const Sidebar = as<'div'>(({ as: AsSidebar = 'div', className, ...props }, ref) => (
diff --git a/src/app/components/sidebar/SidebarContent.tsx b/src/app/components/sidebar/SidebarContent.tsx
index b09ea64a..a4546b19 100644
--- a/src/app/components/sidebar/SidebarContent.tsx
+++ b/src/app/components/sidebar/SidebarContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box } from 'folds';
type SidebarContentProps = {
diff --git a/src/app/components/sidebar/SidebarItem.tsx b/src/app/components/sidebar/SidebarItem.tsx
index b23772bb..6e6e0146 100644
--- a/src/app/components/sidebar/SidebarItem.tsx
+++ b/src/app/components/sidebar/SidebarItem.tsx
@@ -1,6 +1,6 @@
import classNames from 'classnames';
import { as, Avatar, Text, Tooltip, TooltipProvider, toRem } from 'folds';
-import React, { ComponentProps, ReactNode, RefCallback } from 'react';
+import { ComponentProps, ReactNode, RefCallback } from 'react';
import * as css from './Sidebar.css';
export const SidebarItem = as<'div', css.SidebarItemVariants>(
diff --git a/src/app/components/sidebar/SidebarStack.tsx b/src/app/components/sidebar/SidebarStack.tsx
index c0e976c8..86a898e5 100644
--- a/src/app/components/sidebar/SidebarStack.tsx
+++ b/src/app/components/sidebar/SidebarStack.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import classNames from 'classnames';
import { as } from 'folds';
import * as css from './Sidebar.css';
diff --git a/src/app/components/sidebar/SidebarStackSeparator.tsx b/src/app/components/sidebar/SidebarStackSeparator.tsx
index 110341ca..40dada0a 100644
--- a/src/app/components/sidebar/SidebarStackSeparator.tsx
+++ b/src/app/components/sidebar/SidebarStackSeparator.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Line, toRem } from 'folds';
export function SidebarStackSeparator() {
diff --git a/src/app/components/splash-screen/SplashScreen.tsx b/src/app/components/splash-screen/SplashScreen.tsx
index a5696f59..463fd66d 100644
--- a/src/app/components/splash-screen/SplashScreen.tsx
+++ b/src/app/components/splash-screen/SplashScreen.tsx
@@ -1,5 +1,5 @@
import { Box, Text } from 'folds';
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import * as patternsCSS from '$styles/Patterns.css';
import * as css from './SplashScreen.css';
diff --git a/src/app/components/text-viewer/TextViewer.tsx b/src/app/components/text-viewer/TextViewer.tsx
index c4294b55..9a353bbf 100644
--- a/src/app/components/text-viewer/TextViewer.tsx
+++ b/src/app/components/text-viewer/TextViewer.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps, HTMLAttributes, Suspense, forwardRef, lazy } from 'react';
+import { ComponentProps, HTMLAttributes, Suspense, forwardRef, lazy } from 'react';
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Scroll, Text, as } from 'folds';
import { ErrorBoundary } from 'react-error-boundary';
diff --git a/src/app/components/time-date/DatePicker.tsx b/src/app/components/time-date/DatePicker.tsx
index f6dc591e..68407faa 100644
--- a/src/app/components/time-date/DatePicker.tsx
+++ b/src/app/components/time-date/DatePicker.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react';
+import { forwardRef } from 'react';
import { Menu, Box, Text, Chip } from 'folds';
import dayjs from 'dayjs';
import { dateFor, daysInMonth, daysToMs } from '$appUtils/time';
diff --git a/src/app/components/time-date/PickerColumn.tsx b/src/app/components/time-date/PickerColumn.tsx
index c31daf43..cf227a82 100644
--- a/src/app/components/time-date/PickerColumn.tsx
+++ b/src/app/components/time-date/PickerColumn.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, Text, Scroll } from 'folds';
import { CutoutCard } from '../cutout-card';
import * as css from './styles.css';
diff --git a/src/app/components/time-date/TimePicker.tsx b/src/app/components/time-date/TimePicker.tsx
index 5619c2c8..d2f013ad 100644
--- a/src/app/components/time-date/TimePicker.tsx
+++ b/src/app/components/time-date/TimePicker.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react';
+import { forwardRef } from 'react';
import { Menu, Box, Text, Chip } from 'folds';
import dayjs from 'dayjs';
import { hour12to24, hour24to12, hoursToMs, inSameDay, minutesToMs } from '$appUtils/time';
diff --git a/src/app/components/typing-indicator/TypingIndicator.tsx b/src/app/components/typing-indicator/TypingIndicator.tsx
index e7997cf1..779a728a 100644
--- a/src/app/components/typing-indicator/TypingIndicator.tsx
+++ b/src/app/components/typing-indicator/TypingIndicator.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, as, toRem } from 'folds';
import * as css from './TypingIndicator.css';
diff --git a/src/app/components/uia-stages/DummyStage.tsx b/src/app/components/uia-stages/DummyStage.tsx
index 2f75752e..9a78af0e 100644
--- a/src/app/components/uia-stages/DummyStage.tsx
+++ b/src/app/components/uia-stages/DummyStage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback } from 'react';
+import { useEffect, useCallback } from 'react';
import { Dialog, Text, Box, Button, config } from 'folds';
import { AuthType } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
diff --git a/src/app/components/uia-stages/EmailStage.tsx b/src/app/components/uia-stages/EmailStage.tsx
index 17157a74..3d313449 100644
--- a/src/app/components/uia-stages/EmailStage.tsx
+++ b/src/app/components/uia-stages/EmailStage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback, FormEventHandler } from 'react';
+import { useEffect, useCallback, FormEventHandler } from 'react';
import { Dialog, Text, Box, Button, config, Input, color, Spinner } from 'folds';
import { AuthType, MatrixError } from '$types/matrix-sdk';
import { AsyncState, AsyncStatus } from '$hooks/useAsyncCallback';
diff --git a/src/app/components/uia-stages/PasswordStage.tsx b/src/app/components/uia-stages/PasswordStage.tsx
index d123a77e..d168ddcc 100644
--- a/src/app/components/uia-stages/PasswordStage.tsx
+++ b/src/app/components/uia-stages/PasswordStage.tsx
@@ -1,5 +1,5 @@
import { Box, Button, color, config, Dialog, Header, Icon, IconButton, Icons, Text } from 'folds';
-import React, { FormEventHandler } from 'react';
+import { FormEventHandler } from 'react';
import { AuthType } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
import { ErrorCode } from '../../cs-errorcode';
diff --git a/src/app/components/uia-stages/ReCaptchaStage.tsx b/src/app/components/uia-stages/ReCaptchaStage.tsx
index 6d9558c0..65357b0e 100644
--- a/src/app/components/uia-stages/ReCaptchaStage.tsx
+++ b/src/app/components/uia-stages/ReCaptchaStage.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Dialog, Text, Box, Button, config } from 'folds';
import { AuthType } from '$types/matrix-sdk';
import ReCAPTCHA from 'react-google-recaptcha';
diff --git a/src/app/components/uia-stages/RegistrationTokenStage.tsx b/src/app/components/uia-stages/RegistrationTokenStage.tsx
index 772db07f..cfe79786 100644
--- a/src/app/components/uia-stages/RegistrationTokenStage.tsx
+++ b/src/app/components/uia-stages/RegistrationTokenStage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback, FormEventHandler } from 'react';
+import { useEffect, useCallback, FormEventHandler } from 'react';
import { Dialog, Text, Box, Button, config, Input } from 'folds';
import { AuthType } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
diff --git a/src/app/components/uia-stages/SSOStage.tsx b/src/app/components/uia-stages/SSOStage.tsx
index e3d6126a..fb20e03b 100644
--- a/src/app/components/uia-stages/SSOStage.tsx
+++ b/src/app/components/uia-stages/SSOStage.tsx
@@ -1,5 +1,5 @@
import { Box, Button, color, config, Dialog, Header, Icon, IconButton, Icons, Text } from 'folds';
-import React, { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
import { StageComponentProps } from './types';
export function SSOStage({
diff --git a/src/app/components/uia-stages/TermsStage.tsx b/src/app/components/uia-stages/TermsStage.tsx
index 7e3fd9b6..bfe8e403 100644
--- a/src/app/components/uia-stages/TermsStage.tsx
+++ b/src/app/components/uia-stages/TermsStage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback } from 'react';
+import { useEffect, useCallback } from 'react';
import { Dialog, Text, Box, Button, config } from 'folds';
import { AuthType } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
diff --git a/src/app/components/unread-badge/UnreadBadge.tsx b/src/app/components/unread-badge/UnreadBadge.tsx
index 25b0cfe1..6a62642a 100644
--- a/src/app/components/unread-badge/UnreadBadge.tsx
+++ b/src/app/components/unread-badge/UnreadBadge.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties, ReactNode } from 'react';
+import { CSSProperties, ReactNode } from 'react';
import { Box, Badge, toRem, Text } from 'folds';
import { millify } from '$plugins/millify';
diff --git a/src/app/components/upload-board/UploadBoard.tsx b/src/app/components/upload-board/UploadBoard.tsx
index bf23f6ae..a0d0dcc8 100644
--- a/src/app/components/upload-board/UploadBoard.tsx
+++ b/src/app/components/upload-board/UploadBoard.tsx
@@ -1,4 +1,4 @@
-import React, { MutableRefObject, ReactNode, useImperativeHandle, useRef } from 'react';
+import { MutableRefObject, ReactNode, useImperativeHandle, useRef } from 'react';
import { Badge, Box, Chip, Header, Icon, Icons, Spinner, Text, as, percent } from 'folds';
import classNames from 'classnames';
import { useAtomValue } from 'jotai';
diff --git a/src/app/components/upload-card/CompactUploadCardRenderer.tsx b/src/app/components/upload-card/CompactUploadCardRenderer.tsx
index a6b74f7c..59107431 100644
--- a/src/app/components/upload-card/CompactUploadCardRenderer.tsx
+++ b/src/app/components/upload-card/CompactUploadCardRenderer.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
import { Chip, Icon, IconButton, Icons, Text, color } from 'folds';
import { TUploadAtom, UploadStatus, UploadSuccess, useBindUploadAtom } from '$state/upload';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/upload-card/UploadCard.tsx b/src/app/components/upload-card/UploadCard.tsx
index 400f0a7b..47933a8e 100644
--- a/src/app/components/upload-card/UploadCard.tsx
+++ b/src/app/components/upload-card/UploadCard.tsx
@@ -1,5 +1,5 @@
import { Badge, Box, Icon, Icons, ProgressBar, Text, percent } from 'folds';
-import React, { ReactNode, forwardRef } from 'react';
+import { ReactNode, forwardRef } from 'react';
import { bytesToSize } from '$appUtils/common';
import * as css from './UploadCard.css';
diff --git a/src/app/components/upload-card/UploadCardRenderer.tsx b/src/app/components/upload-card/UploadCardRenderer.tsx
index d4193953..b47f6501 100644
--- a/src/app/components/upload-card/UploadCardRenderer.tsx
+++ b/src/app/components/upload-card/UploadCardRenderer.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useEffect } from 'react';
+import { ReactNode, useEffect } from 'react';
import { Box, Chip, Icon, IconButton, Icons, Text, color, config, toRem } from 'folds';
import { UploadStatus, UploadSuccess, useBindUploadAtom } from '$state/upload';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/url-preview/UrlPreview.tsx b/src/app/components/url-preview/UrlPreview.tsx
index 4ba3e4e2..ae970b0e 100644
--- a/src/app/components/url-preview/UrlPreview.tsx
+++ b/src/app/components/url-preview/UrlPreview.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import classNames from 'classnames';
import { Box, as } from 'folds';
import * as css from './UrlPreview.css';
diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx
index b0a76685..1d58207a 100644
--- a/src/app/components/url-preview/UrlPreviewCard.tsx
+++ b/src/app/components/url-preview/UrlPreviewCard.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
import { IPreviewUrlResponse } from '$types/matrix-sdk';
import { Box, Icon, IconButton, Icons, Scroll, Spinner, Text, as, color, config } from 'folds';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
diff --git a/src/app/components/user-avatar/UserAvatar.tsx b/src/app/components/user-avatar/UserAvatar.tsx
index af5c7870..51dc2d87 100644
--- a/src/app/components/user-avatar/UserAvatar.tsx
+++ b/src/app/components/user-avatar/UserAvatar.tsx
@@ -1,5 +1,5 @@
import { AvatarFallback, AvatarImage, color } from 'folds';
-import React, { ReactEventHandler, ReactNode, useState } from 'react';
+import { ReactEventHandler, ReactNode, useState } from 'react';
import classNames from 'classnames';
import colorMXID from '$util/colorMXID';
import * as css from './UserAvatar.css';
diff --git a/src/app/components/user-profile/CreatorChip.tsx b/src/app/components/user-profile/CreatorChip.tsx
index 30a30d85..530833ed 100644
--- a/src/app/components/user-profile/CreatorChip.tsx
+++ b/src/app/components/user-profile/CreatorChip.tsx
@@ -1,5 +1,5 @@
import { Chip, config, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
-import React, { MouseEventHandler, useState } from 'react';
+import { MouseEventHandler, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { isKeyHotkey } from 'is-hotkey';
import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
diff --git a/src/app/components/user-profile/PowerChip.tsx b/src/app/components/user-profile/PowerChip.tsx
index 258bef7a..6346b19c 100644
--- a/src/app/components/user-profile/PowerChip.tsx
+++ b/src/app/components/user-profile/PowerChip.tsx
@@ -20,7 +20,7 @@ import {
Text,
toRem,
} from 'folds';
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEventHandler, useCallback, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { isKeyHotkey } from 'is-hotkey';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/user-profile/UserChips.tsx b/src/app/components/user-profile/UserChips.tsx
index 162f02ce..d70411d7 100644
--- a/src/app/components/user-profile/UserChips.tsx
+++ b/src/app/components/user-profile/UserChips.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
KeyboardEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/components/user-profile/UserHero.tsx b/src/app/components/user-profile/UserHero.tsx
index 216ae795..6f89effe 100644
--- a/src/app/components/user-profile/UserHero.tsx
+++ b/src/app/components/user-profile/UserHero.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import {
Avatar,
Box,
diff --git a/src/app/components/user-profile/UserModeration.tsx b/src/app/components/user-profile/UserModeration.tsx
index 2ca0314c..9fed6780 100644
--- a/src/app/components/user-profile/UserModeration.tsx
+++ b/src/app/components/user-profile/UserModeration.tsx
@@ -1,5 +1,5 @@
import { Box, Button, color, config, Icon, Icons, Spinner, Text, Input } from 'folds';
-import React, { useCallback, useRef } from 'react';
+import { useCallback, useRef } from 'react';
import { useRoom } from '$hooks/useRoom';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/components/user-profile/UserRoomProfile.tsx b/src/app/components/user-profile/UserRoomProfile.tsx
index 693027fe..ffb99917 100644
--- a/src/app/components/user-profile/UserRoomProfile.tsx
+++ b/src/app/components/user-profile/UserRoomProfile.tsx
@@ -1,5 +1,5 @@
import { Box, Button, config, Icon, Icons, Scroll, Text } from 'folds';
-import React, { useCallback, useMemo, useState } from 'react';
+import { SyntheticEvent, useCallback, useMemo, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { useAtomValue } from 'jotai';
import { Opts as LinkifyOpts } from 'linkifyjs';
@@ -268,7 +268,7 @@ export function UserRoomProfile({ userId, initialProfile }: UserRoomProfileProps
};
// Todo eventually maybe
- const mentionClickHandler = useCallback((e: React.SyntheticEvent) => {
+ const mentionClickHandler = useCallback((e: SyntheticEvent) => {
e.preventDefault();
}, []);
diff --git a/src/app/components/virtualizer/VirtualTile.tsx b/src/app/components/virtualizer/VirtualTile.tsx
index 0c6a5bd3..b92add55 100644
--- a/src/app/components/virtualizer/VirtualTile.tsx
+++ b/src/app/components/virtualizer/VirtualTile.tsx
@@ -1,6 +1,5 @@
import { VirtualItem } from '@tanstack/react-virtual';
import { as } from 'folds';
-import React from 'react';
import classNames from 'classnames';
import * as css from './style.css';
diff --git a/src/app/features/add-existing/AddExisting.tsx b/src/app/features/add-existing/AddExisting.tsx
index 8e7c8a2f..605457b5 100644
--- a/src/app/features/add-existing/AddExisting.tsx
+++ b/src/app/features/add-existing/AddExisting.tsx
@@ -19,7 +19,7 @@ import {
Spinner,
Text,
} from 'folds';
-import React, {
+import {
ChangeEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/features/call/CallView.tsx b/src/app/features/call/CallView.tsx
index f4883613..f42175d7 100644
--- a/src/app/features/call/CallView.tsx
+++ b/src/app/features/call/CallView.tsx
@@ -1,5 +1,6 @@
import { EventType, Room } from '$types/matrix-sdk';
-import React, {
+import {
+ Children,
useContext,
useCallback,
useEffect,
@@ -46,7 +47,7 @@ export function CallViewUserGrid({ children }: { children: ReactNode }) {
{children}
diff --git a/src/app/features/call/CallViewUser.tsx b/src/app/features/call/CallViewUser.tsx
index f8f49197..e4e18c1c 100644
--- a/src/app/features/call/CallViewUser.tsx
+++ b/src/app/features/call/CallViewUser.tsx
@@ -1,5 +1,5 @@
import { as, Avatar, Box, Icon, Icons, Text } from 'folds';
-import React from 'react';
+import { MouseEventHandler } from 'react';
import classNames from 'classnames';
import { Room, CallMembership } from '$types/matrix-sdk';
import { UserAvatar } from '$components/user-avatar';
@@ -47,7 +47,7 @@ export function CallViewUser({ room, callMembership }: CallViewUserProps) {
const nicknames = useAtomValue(nicknamesAtom);
const getName = getMemberDisplayName(room, userId, nicknames) ?? getMxIdLocalPart(userId);
- const handleUserClick: React.MouseEventHandler = (evt) => {
+ const handleUserClick: MouseEventHandler = (evt) => {
openProfile(room.roomId, space?.roomId, userId, evt.currentTarget.getBoundingClientRect());
};
diff --git a/src/app/features/common-settings/cosmetics/Cosmetics.tsx b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
index 355e456b..91141a09 100644
--- a/src/app/features/common-settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll, Switch } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
index 1b0d7519..98972bad 100644
--- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
index 373ea224..478f0519 100644
--- a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
+++ b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useRef, useState, FormEventHandler, useEffect } from 'react';
+import { useCallback, useRef, useState, FormEventHandler, useEffect } from 'react';
import { MatrixError } from '$types/matrix-sdk';
import {
Box,
diff --git a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
index 6579f190..d44f2b69 100644
--- a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
+++ b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
index 63a0dd00..0ee350a6 100644
--- a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
+++ b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { ImagePack } from '$plugins/custom-emoji';
diff --git a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
index d9205e78..e3edb6a9 100644
--- a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
+++ b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useMemo, useState } from 'react';
+import { FormEventHandler, useCallback, useMemo, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/common-settings/general/RoomAddress.tsx b/src/app/features/common-settings/general/RoomAddress.tsx
index 62d7f4d7..2138acf7 100644
--- a/src/app/features/common-settings/general/RoomAddress.tsx
+++ b/src/app/features/common-settings/general/RoomAddress.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useState } from 'react';
+import { FormEventHandler, useCallback, useState } from 'react';
import {
Badge,
Box,
diff --git a/src/app/features/common-settings/general/RoomEncryption.tsx b/src/app/features/common-settings/general/RoomEncryption.tsx
index 183aaf22..25ea12aa 100644
--- a/src/app/features/common-settings/general/RoomEncryption.tsx
+++ b/src/app/features/common-settings/general/RoomEncryption.tsx
@@ -15,7 +15,7 @@ import {
Spinner,
Text,
} from 'folds';
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { MatrixError } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx
index 3d2b30c8..b0064793 100644
--- a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx
+++ b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useMemo, useState } from 'react';
+import { MouseEventHandler, useCallback, useMemo, useState } from 'react';
import {
Button,
color,
diff --git a/src/app/features/common-settings/general/RoomJoinRules.tsx b/src/app/features/common-settings/general/RoomJoinRules.tsx
index 2d25860a..f2b09374 100644
--- a/src/app/features/common-settings/general/RoomJoinRules.tsx
+++ b/src/app/features/common-settings/general/RoomJoinRules.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { color, Text } from 'folds';
import {
JoinRule,
diff --git a/src/app/features/common-settings/general/RoomProfile.tsx b/src/app/features/common-settings/general/RoomProfile.tsx
index c06d7639..e3a0daf7 100644
--- a/src/app/features/common-settings/general/RoomProfile.tsx
+++ b/src/app/features/common-settings/general/RoomProfile.tsx
@@ -11,7 +11,7 @@ import {
Text,
TextArea,
} from 'folds';
-import React, { FormEventHandler, useCallback, useMemo, useState } from 'react';
+import { FormEventHandler, useCallback, useMemo, useState } from 'react';
import { useAtomValue } from 'jotai';
import Linkify from 'linkify-react';
import classNames from 'classnames';
diff --git a/src/app/features/common-settings/general/RoomPublish.tsx b/src/app/features/common-settings/general/RoomPublish.tsx
index 6e789fe9..a4aa47d2 100644
--- a/src/app/features/common-settings/general/RoomPublish.tsx
+++ b/src/app/features/common-settings/general/RoomPublish.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, color, Spinner, Switch, Text } from 'folds';
import { JoinRule, MatrixError, RoomJoinRulesEventContent } from '$types/matrix-sdk';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/common-settings/general/RoomUpgrade.tsx b/src/app/features/common-settings/general/RoomUpgrade.tsx
index bbbf54c2..e3a6a641 100644
--- a/src/app/features/common-settings/general/RoomUpgrade.tsx
+++ b/src/app/features/common-settings/general/RoomUpgrade.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
import {
Button,
color,
diff --git a/src/app/features/common-settings/members/Members.tsx b/src/app/features/common-settings/members/Members.tsx
index 66d79356..743e40b4 100644
--- a/src/app/features/common-settings/members/Members.tsx
+++ b/src/app/features/common-settings/members/Members.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/features/common-settings/permissions/PermissionGroups.tsx b/src/app/features/common-settings/permissions/PermissionGroups.tsx
index 6337ef99..4bc360e9 100644
--- a/src/app/features/common-settings/permissions/PermissionGroups.tsx
+++ b/src/app/features/common-settings/permissions/PermissionGroups.tsx
@@ -1,5 +1,5 @@
/* eslint-disable react/no-array-index-key */
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
import { Badge, Box, Button, Chip, config, Icon, Icons, Menu, Spinner, Text } from 'folds';
import { produce } from 'immer';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/common-settings/permissions/Powers.tsx b/src/app/features/common-settings/permissions/Powers.tsx
index 1803d5e0..1059a95a 100644
--- a/src/app/features/common-settings/permissions/Powers.tsx
+++ b/src/app/features/common-settings/permissions/Powers.tsx
@@ -1,5 +1,5 @@
/* eslint-disable react/no-array-index-key */
-import React, { useState, MouseEventHandler, ReactNode } from 'react';
+import { useState, MouseEventHandler, ReactNode } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Box,
diff --git a/src/app/features/common-settings/permissions/PowersEditor.tsx b/src/app/features/common-settings/permissions/PowersEditor.tsx
index e8e97fe8..8797138a 100644
--- a/src/app/features/common-settings/permissions/PowersEditor.tsx
+++ b/src/app/features/common-settings/permissions/PowersEditor.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, MouseEventHandler, useCallback, useMemo, useState } from 'react';
+import { FormEventHandler, MouseEventHandler, useCallback, useMemo, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/create-chat/CreateChat.tsx b/src/app/features/create-chat/CreateChat.tsx
index 312b2f39..979d6494 100644
--- a/src/app/features/create-chat/CreateChat.tsx
+++ b/src/app/features/create-chat/CreateChat.tsx
@@ -1,5 +1,5 @@
import { Box, Button, color, config, Icon, Icons, Input, Spinner, Switch, Text } from 'folds';
-import React, { FormEventHandler, useCallback, useState } from 'react';
+import { FormEventHandler, useCallback, useState } from 'react';
import { ICreateRoomStateEvent, MatrixError, Preset, Visibility } from '$types/matrix-sdk';
import { useNavigate } from 'react-router-dom';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/create-room/CreateRoom.tsx b/src/app/features/create-room/CreateRoom.tsx
index 2e2806dd..da1d98f6 100644
--- a/src/app/features/create-room/CreateRoom.tsx
+++ b/src/app/features/create-room/CreateRoom.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useState } from 'react';
import { MatrixError, Room, JoinRule } from '$types/matrix-sdk';
import {
Box,
diff --git a/src/app/features/create-room/CreateRoomModal.tsx b/src/app/features/create-room/CreateRoomModal.tsx
index 90acb5d9..4385b539 100644
--- a/src/app/features/create-room/CreateRoomModal.tsx
+++ b/src/app/features/create-room/CreateRoomModal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import {
Box,
config,
diff --git a/src/app/features/create-space/CreateSpace.tsx b/src/app/features/create-space/CreateSpace.tsx
index 6571ead7..c5fdf0d3 100644
--- a/src/app/features/create-space/CreateSpace.tsx
+++ b/src/app/features/create-space/CreateSpace.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useState } from 'react';
import { MatrixError, Room } from '$types/matrix-sdk';
import {
Box,
diff --git a/src/app/features/create-space/CreateSpaceModal.tsx b/src/app/features/create-space/CreateSpaceModal.tsx
index bb708100..ffd6c35a 100644
--- a/src/app/features/create-space/CreateSpaceModal.tsx
+++ b/src/app/features/create-space/CreateSpaceModal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import {
Box,
config,
diff --git a/src/app/features/join-before-navigate/JoinBeforeNavigate.tsx b/src/app/features/join-before-navigate/JoinBeforeNavigate.tsx
index babac537..c11ea99f 100644
--- a/src/app/features/join-before-navigate/JoinBeforeNavigate.tsx
+++ b/src/app/features/join-before-navigate/JoinBeforeNavigate.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text, toRem } from 'folds';
import { useAtomValue } from 'jotai';
import { RoomCard } from '$components/room-card';
diff --git a/src/app/features/lobby/DnD.tsx b/src/app/features/lobby/DnD.tsx
index 6835ddb2..71c6bf8e 100644
--- a/src/app/features/lobby/DnD.tsx
+++ b/src/app/features/lobby/DnD.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject, useEffect, useRef, useState } from 'react';
+import { RefObject, useEffect, useRef, useState } from 'react';
import {
dropTargetForElements,
draggable,
diff --git a/src/app/features/lobby/HierarchyItemMenu.tsx b/src/app/features/lobby/HierarchyItemMenu.tsx
index f67e5ff0..b598a6a5 100644
--- a/src/app/features/lobby/HierarchyItemMenu.tsx
+++ b/src/app/features/lobby/HierarchyItemMenu.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useEffect, useState } from 'react';
+import { MouseEventHandler, useCallback, useEffect, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Box,
diff --git a/src/app/features/lobby/Lobby.tsx b/src/app/features/lobby/Lobby.tsx
index 06c13f5f..e54f5ee9 100644
--- a/src/app/features/lobby/Lobby.tsx
+++ b/src/app/features/lobby/Lobby.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useMemo, useRef, useState } from 'react';
+import { MouseEventHandler, useCallback, useMemo, useRef, useState } from 'react';
import { Box, Chip, Icon, IconButton, Icons, Line, Scroll, Spinner, Text, config } from 'folds';
import { useVirtualizer } from '@tanstack/react-virtual';
import { useAtom, useAtomValue } from 'jotai';
diff --git a/src/app/features/lobby/LobbyHeader.tsx b/src/app/features/lobby/LobbyHeader.tsx
index 756aec64..00c5485e 100644
--- a/src/app/features/lobby/LobbyHeader.tsx
+++ b/src/app/features/lobby/LobbyHeader.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useState } from 'react';
import {
Avatar,
Box,
diff --git a/src/app/features/lobby/LobbyHero.tsx b/src/app/features/lobby/LobbyHero.tsx
index 7c42a6f2..08d238a0 100644
--- a/src/app/features/lobby/LobbyHero.tsx
+++ b/src/app/features/lobby/LobbyHero.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Avatar, Overlay, OverlayBackdrop, OverlayCenter, Text } from 'folds';
import FocusTrap from 'focus-trap-react';
import { useRoomAvatar, useRoomName, useRoomTopic } from '$hooks/useRoomMeta';
diff --git a/src/app/features/lobby/RoomItem.tsx b/src/app/features/lobby/RoomItem.tsx
index 9607a3ba..67055b37 100644
--- a/src/app/features/lobby/RoomItem.tsx
+++ b/src/app/features/lobby/RoomItem.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, ReactNode, useCallback, useRef } from 'react';
+import { MouseEventHandler, ReactNode, useCallback, useRef } from 'react';
import {
Avatar,
Badge,
diff --git a/src/app/features/lobby/SpaceHierarchy.tsx b/src/app/features/lobby/SpaceHierarchy.tsx
index bcc56d1c..c617fe7d 100644
--- a/src/app/features/lobby/SpaceHierarchy.tsx
+++ b/src/app/features/lobby/SpaceHierarchy.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, MouseEventHandler, useEffect, useMemo } from 'react';
+import { forwardRef, MouseEventHandler, useEffect, useMemo } from 'react';
import { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { Box, config, Text } from 'folds';
import {
diff --git a/src/app/features/lobby/SpaceItem.tsx b/src/app/features/lobby/SpaceItem.tsx
index 131980a7..7c0fbe89 100644
--- a/src/app/features/lobby/SpaceItem.tsx
+++ b/src/app/features/lobby/SpaceItem.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, ReactNode, useCallback, useRef, useState } from 'react';
+import { MouseEventHandler, ReactNode, useCallback, useRef, useState } from 'react';
import {
Box,
Avatar,
diff --git a/src/app/features/message-search/MessageSearch.tsx b/src/app/features/message-search/MessageSearch.tsx
index b990d52a..3b61856e 100644
--- a/src/app/features/message-search/MessageSearch.tsx
+++ b/src/app/features/message-search/MessageSearch.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject, useEffect, useMemo, useRef } from 'react';
+import { RefObject, useEffect, useMemo, useRef } from 'react';
import { Text, Box, Icon, Icons, config, Spinner, IconButton, Line, toRem } from 'folds';
import { useAtomValue } from 'jotai';
import { useVirtualizer } from '@tanstack/react-virtual';
diff --git a/src/app/features/message-search/SearchFilters.tsx b/src/app/features/message-search/SearchFilters.tsx
index d395b62b..7b08150c 100644
--- a/src/app/features/message-search/SearchFilters.tsx
+++ b/src/app/features/message-search/SearchFilters.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/features/message-search/SearchInput.tsx b/src/app/features/message-search/SearchInput.tsx
index 533eb5fd..ad1ca593 100644
--- a/src/app/features/message-search/SearchInput.tsx
+++ b/src/app/features/message-search/SearchInput.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, RefObject } from 'react';
+import { FormEventHandler, RefObject } from 'react';
import { Box, Text, Input, Icon, Icons, Spinner, Chip, config } from 'folds';
type SearchProps = {
diff --git a/src/app/features/message-search/SearchResultGroup.tsx b/src/app/features/message-search/SearchResultGroup.tsx
index 2124a9cd..8ad37ce9 100644
--- a/src/app/features/message-search/SearchResultGroup.tsx
+++ b/src/app/features/message-search/SearchResultGroup.tsx
@@ -1,5 +1,5 @@
/* eslint-disable react/destructuring-assignment */
-import React, { MouseEventHandler, useMemo } from 'react';
+import { MouseEventHandler, useMemo } from 'react';
import { IEventWithRoomId, JoinRule, RelationType, Room } from '$types/matrix-sdk';
import { HTMLReactParserOptions } from 'html-react-parser';
import { Avatar, Box, Chip, Header, Icon, Icons, Text, config } from 'folds';
diff --git a/src/app/features/room-nav/RoomCallNavStatus.tsx b/src/app/features/room-nav/RoomCallNavStatus.tsx
index b02b10bd..63073d4d 100644
--- a/src/app/features/room-nav/RoomCallNavStatus.tsx
+++ b/src/app/features/room-nav/RoomCallNavStatus.tsx
@@ -11,7 +11,6 @@ import {
TooltipProvider,
color,
} from 'folds';
-import React from 'react';
import { useCallState } from '$pages/client/call/CallProvider';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import * as css from './RoomCallNavStatus.css';
diff --git a/src/app/features/room-nav/RoomNavCategoryButton.tsx b/src/app/features/room-nav/RoomNavCategoryButton.tsx
index 3af8aeac..7adc6dcb 100644
--- a/src/app/features/room-nav/RoomNavCategoryButton.tsx
+++ b/src/app/features/room-nav/RoomNavCategoryButton.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { as, Chip, Icon, Icons, Text } from 'folds';
import classNames from 'classnames';
import * as css from './styles.css';
diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx
index 29b501fe..511c7bb6 100644
--- a/src/app/features/room-nav/RoomNavItem.tsx
+++ b/src/app/features/room-nav/RoomNavItem.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useState, MouseEvent } from 'react';
+import { MouseEventHandler, forwardRef, useState, MouseEvent } from 'react';
import { EventType, Room } from '$types/matrix-sdk';
import {
Avatar,
diff --git a/src/app/features/room-nav/RoomNavUser.tsx b/src/app/features/room-nav/RoomNavUser.tsx
index 99d57430..997a2e65 100644
--- a/src/app/features/room-nav/RoomNavUser.tsx
+++ b/src/app/features/room-nav/RoomNavUser.tsx
@@ -1,5 +1,5 @@
import { Avatar, Box, Icon, Icons, Text } from 'folds';
-import React from 'react';
+import { MouseEventHandler } from 'react';
import { Room, CallMembership } from '$types/matrix-sdk';
import { NavButton, NavItem, NavItemContent } from '$components/nav';
import { UserAvatar } from '$components/user-avatar';
@@ -33,7 +33,7 @@ export function RoomNavUser({ room, callMembership }: RoomNavUserProps) {
const name = getMemberDisplayName(room, userId, nicknames) ?? getMxIdLocalPart(userId);
const isCallParticipant = isActiveCall && userId !== mx.getUserId();
- const handleNavUserClick: React.MouseEventHandler = (evt) => {
+ const handleNavUserClick: MouseEventHandler = (evt) => {
openProfile(room.roomId, space?.roomId, userId, evt.currentTarget.getBoundingClientRect());
};
diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx
index 9b54a1a2..56704b46 100644
--- a/src/app/features/room-settings/RoomSettings.tsx
+++ b/src/app/features/room-settings/RoomSettings.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
import { useAtomValue } from 'jotai';
import { Avatar, Box, config, Icon, IconButton, Icons, IconSrc, MenuItem, Text } from 'folds';
import { JoinRule } from '$types/matrix-sdk';
diff --git a/src/app/features/room-settings/RoomSettingsRenderer.tsx b/src/app/features/room-settings/RoomSettingsRenderer.tsx
index 1f22a244..7f2e53e7 100644
--- a/src/app/features/room-settings/RoomSettingsRenderer.tsx
+++ b/src/app/features/room-settings/RoomSettingsRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Modal500 } from '$components/Modal500';
import { useCloseRoomSettings, useRoomSettingsState } from '$state/hooks/roomSettings';
import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
diff --git a/src/app/features/room-settings/general/General.tsx b/src/app/features/room-settings/general/General.tsx
index 76187545..c4546b60 100644
--- a/src/app/features/room-settings/general/General.tsx
+++ b/src/app/features/room-settings/general/General.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { usePowerLevels } from '$hooks/usePowerLevels';
diff --git a/src/app/features/room-settings/permissions/Permissions.tsx b/src/app/features/room-settings/permissions/Permissions.tsx
index 7e0dc627..7fd6f7be 100644
--- a/src/app/features/room-settings/permissions/Permissions.tsx
+++ b/src/app/features/room-settings/permissions/Permissions.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { useRoom } from '$hooks/useRoom';
diff --git a/src/app/features/room/CommandAutocomplete.tsx b/src/app/features/room/CommandAutocomplete.tsx
index cb3b09fb..dc51ae6f 100644
--- a/src/app/features/room/CommandAutocomplete.tsx
+++ b/src/app/features/room/CommandAutocomplete.tsx
@@ -1,4 +1,4 @@
-import React, { KeyboardEvent as ReactKeyboardEvent, useCallback, useEffect, useMemo } from 'react';
+import { KeyboardEvent as ReactKeyboardEvent, useCallback, useEffect, useMemo } from 'react';
import { Editor } from 'slate';
import { Box, config, MenuItem, Text } from 'folds';
import { Room } from '$types/matrix-sdk';
diff --git a/src/app/features/room/MembersDrawer.tsx b/src/app/features/room/MembersDrawer.tsx
index d9c0848b..b78d91fd 100644
--- a/src/app/features/room/MembersDrawer.tsx
+++ b/src/app/features/room/MembersDrawer.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
MouseEventHandler,
useCallback,
diff --git a/src/app/features/room/Room.tsx b/src/app/features/room/Room.tsx
index 3e360e45..7f104684 100644
--- a/src/app/features/room/Room.tsx
+++ b/src/app/features/room/Room.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { Box, Line } from 'folds';
import { useParams } from 'react-router-dom';
import { isKeyHotkey } from 'is-hotkey';
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index 1c613eff..8e700d51 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -1,7 +1,9 @@
-import React, {
+import {
forwardRef,
KeyboardEventHandler,
+ MouseEvent,
RefObject,
+ ReactNode,
useCallback,
useEffect,
useRef,
@@ -220,7 +222,7 @@ export const RoomInput = forwardRef(
format: replyFormat,
} = replyEvent?.getContent() ?? {};
- let replyBodyJSX: React.ReactNode = replyDraft ? trimReplyFromBody(replyDraft.body) : null;
+ let replyBodyJSX: ReactNode = replyDraft ? trimReplyFromBody(replyDraft.body) : null;
if (replyFormat === 'org.matrix.custom.html' && replyFormattedBody) {
const strippedHtml = trimReplyFromFormattedBody(replyFormattedBody)
@@ -692,7 +694,7 @@ export const RoomInput = forwardRef(
e.preventDefault()}
+ onMouseDown={(e: MouseEvent) => e.preventDefault()}
variant="SurfaceVariant"
size="300"
radii="300"
diff --git a/src/app/features/room/RoomInputPlaceholder.tsx b/src/app/features/room/RoomInputPlaceholder.tsx
index 77c7ccf3..fc923d19 100644
--- a/src/app/features/room/RoomInputPlaceholder.tsx
+++ b/src/app/features/room/RoomInputPlaceholder.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentProps } from 'react';
+import { ComponentProps } from 'react';
import { Box, as } from 'folds';
import classNames from 'classnames';
diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
index cc679e45..9040135a 100644
--- a/src/app/features/room/RoomTimeline.tsx
+++ b/src/app/features/room/RoomTimeline.tsx
@@ -1,4 +1,5 @@
-import React, {
+import {
+ Fragment,
Dispatch,
MouseEventHandler,
RefObject,
@@ -1800,11 +1801,11 @@ export function RoomTimeline({
if (dayDividerJSX) dayDivider = false;
return (
-
+
{newDividerJSX}
{dayDividerJSX}
{eventJSX}
-
+
);
}
diff --git a/src/app/features/room/RoomTombstone.tsx b/src/app/features/room/RoomTombstone.tsx
index 50a6b283..593a7e9a 100644
--- a/src/app/features/room/RoomTombstone.tsx
+++ b/src/app/features/room/RoomTombstone.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { Box, Button, Spinner, Text, color } from 'folds';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/features/room/RoomView.tsx b/src/app/features/room/RoomView.tsx
index 53543758..0bb08964 100644
--- a/src/app/features/room/RoomView.tsx
+++ b/src/app/features/room/RoomView.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useRef, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
import { Box, Text, config, toRem } from 'folds';
import { EventType, Room } from '$types/matrix-sdk';
import { ReactEditor } from 'slate-react';
diff --git a/src/app/features/room/RoomViewFollowing.tsx b/src/app/features/room/RoomViewFollowing.tsx
index 54d31115..55253348 100644
--- a/src/app/features/room/RoomViewFollowing.tsx
+++ b/src/app/features/room/RoomViewFollowing.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import {
Box,
Icon,
diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx
index 657a2e5d..47e403a1 100644
--- a/src/app/features/room/RoomViewHeader.tsx
+++ b/src/app/features/room/RoomViewHeader.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useEffect, useState } from 'react';
+import { MouseEventHandler, forwardRef, useEffect, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Box,
diff --git a/src/app/features/room/RoomViewTyping.tsx b/src/app/features/room/RoomViewTyping.tsx
index 7b5da42a..6b267869 100644
--- a/src/app/features/room/RoomViewTyping.tsx
+++ b/src/app/features/room/RoomViewTyping.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Text, as } from 'folds';
import { Room } from '$types/matrix-sdk';
import classNames from 'classnames';
diff --git a/src/app/features/room/jump-to-time/JumpToTime.tsx b/src/app/features/room/jump-to-time/JumpToTime.tsx
index e6f7201a..5aa99c0c 100644
--- a/src/app/features/room/jump-to-time/JumpToTime.tsx
+++ b/src/app/features/room/jump-to-time/JumpToTime.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useMemo, useState } from 'react';
+import { MouseEventHandler, useCallback, useMemo, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import {
Dialog,
diff --git a/src/app/features/room/message/EncryptedContent.tsx b/src/app/features/room/message/EncryptedContent.tsx
index 79db79e7..e0084d08 100644
--- a/src/app/features/room/message/EncryptedContent.tsx
+++ b/src/app/features/room/message/EncryptedContent.tsx
@@ -1,5 +1,5 @@
import { MatrixEvent, MatrixEventEvent, MatrixEventHandlerMap } from '$types/matrix-sdk';
-import React, { ReactNode, useEffect, useState } from 'react';
+import { ReactNode, useEffect, useState } from 'react';
import { MessageEvent } from '$types/matrix/room';
type EncryptedContentProps = {
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index e9fdfc04..3d0a769e 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -13,9 +13,13 @@ import {
as,
config,
} from 'folds';
-import React, {
+
+import {
MouseEventHandler,
+ MouseEvent,
+ PointerEvent,
ReactNode,
+ memo,
useCallback,
useRef,
useState,
@@ -71,7 +75,7 @@ import * as css from './styles.css';
export type ReactionHandler = (keyOrMxc: string, shortcode: string) => void;
-const MemoizedBody = React.memo(({ children }: { children: ReactNode }) => <>{children}>);
+const MemoizedBody = memo(({ children }: { children: ReactNode }) => <>{children}>);
type MessageQuickReactionsProps = {
onReaction: ReactionHandler;
};
@@ -225,7 +229,7 @@ function useMobileDoubleTap(callback: () => void, delay = 300) {
const lastTapRef = useRef(0);
return useCallback(
- (e: React.PointerEvent) => {
+ (e: PointerEvent) => {
if (!mobileOrTablet()) return;
const now = Date.now();
@@ -509,7 +513,7 @@ function MessageInternal(
currentTarget: {
getAttribute: (attr: string) => (attr === 'data-event-id' ? targetId : null),
},
- } as unknown as React.MouseEvent;
+ } as unknown as MouseEvent;
onReplyClick(mockEvent);
};
@@ -872,7 +876,7 @@ function MessageInternal(
}
const MessageAs = as<'div', MessageProps>(MessageInternal);
-export const Message = React.memo(MessageAs);
+export const Message = memo(MessageAs);
export type EventProps = {
room: Room;
diff --git a/src/app/features/room/message/MessageEditor.tsx b/src/app/features/room/message/MessageEditor.tsx
index d257662a..bc6c95df 100644
--- a/src/app/features/room/message/MessageEditor.tsx
+++ b/src/app/features/room/message/MessageEditor.tsx
@@ -1,10 +1,4 @@
-import React, {
- KeyboardEventHandler,
- MouseEventHandler,
- useCallback,
- useEffect,
- useState,
-} from 'react';
+import { KeyboardEventHandler, MouseEventHandler, useCallback, useEffect, useState } from 'react';
import {
Box,
Chip,
diff --git a/src/app/features/room/message/Reactions.tsx b/src/app/features/room/message/Reactions.tsx
index 6d9b268e..c716acf5 100644
--- a/src/app/features/room/message/Reactions.tsx
+++ b/src/app/features/room/message/Reactions.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEventHandler, useCallback, useState } from 'react';
import {
Box,
Modal,
diff --git a/src/app/features/room/reaction-viewer/ReactionViewer.tsx b/src/app/features/room/reaction-viewer/ReactionViewer.tsx
index ce4a25c4..764f2328 100644
--- a/src/app/features/room/reaction-viewer/ReactionViewer.tsx
+++ b/src/app/features/room/reaction-viewer/ReactionViewer.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import classNames from 'classnames';
import {
Avatar,
diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
index 1f2a5e7c..959e24f7 100644
--- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
+++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, MouseEventHandler, useCallback, useMemo, useRef } from 'react';
+import { forwardRef, MouseEventHandler, ReactNode, useCallback, useMemo, useRef } from 'react';
import { MatrixEvent, Room, RoomPinnedEventsEventContent } from '$types/matrix-sdk';
import {
Avatar,
@@ -104,7 +104,7 @@ type PinnedMessageProps = {
function PinnedMessageActiveContent(
props: PinnedMessageProps & {
pinnedEvent: MatrixEvent;
- renderOptions: () => React.ReactNode;
+ renderOptions: () => ReactNode;
handleOpenClick: MouseEventHandler;
}
) {
diff --git a/src/app/features/search/Search.tsx b/src/app/features/search/Search.tsx
index a48b4e14..a33bda54 100644
--- a/src/app/features/search/Search.tsx
+++ b/src/app/features/search/Search.tsx
@@ -15,7 +15,7 @@ import {
Text,
toRem,
} from 'folds';
-import React, {
+import {
ChangeEventHandler,
KeyboardEventHandler,
MouseEventHandler,
diff --git a/src/app/features/settings/Settings.tsx b/src/app/features/settings/Settings.tsx
index e51c7ca1..b1a34bec 100644
--- a/src/app/features/settings/Settings.tsx
+++ b/src/app/features/settings/Settings.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
import {
Avatar,
Box,
diff --git a/src/app/features/settings/about/About.tsx b/src/app/features/settings/about/About.tsx
index f868f083..ea279ded 100644
--- a/src/app/features/settings/about/About.tsx
+++ b/src/app/features/settings/about/About.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll, Button, config, toRem } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/account/Account.tsx b/src/app/features/settings/account/Account.tsx
index 225a9309..c6c3aa8f 100644
--- a/src/app/features/settings/account/Account.tsx
+++ b/src/app/features/settings/account/Account.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { MatrixId } from './MatrixId';
diff --git a/src/app/features/settings/account/BioEditor.tsx b/src/app/features/settings/account/BioEditor.tsx
index 31d77049..ce83140e 100644
--- a/src/app/features/settings/account/BioEditor.tsx
+++ b/src/app/features/settings/account/BioEditor.tsx
@@ -1,4 +1,4 @@
-import React, { KeyboardEventHandler, useCallback, useEffect, useState, useRef } from 'react';
+import { KeyboardEventHandler, useCallback, useEffect, useState, useRef } from 'react';
import {
Box,
Chip,
diff --git a/src/app/features/settings/account/ContactInfo.tsx b/src/app/features/settings/account/ContactInfo.tsx
index d530434e..83bb3c6e 100644
--- a/src/app/features/settings/account/ContactInfo.tsx
+++ b/src/app/features/settings/account/ContactInfo.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import { Box, Text, Chip } from 'folds';
import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/settings/account/IgnoredUserList.tsx b/src/app/features/settings/account/IgnoredUserList.tsx
index 9e9d7541..08829dfe 100644
--- a/src/app/features/settings/account/IgnoredUserList.tsx
+++ b/src/app/features/settings/account/IgnoredUserList.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEventHandler, FormEventHandler, useCallback, useState } from 'react';
+import { ChangeEventHandler, FormEventHandler, useCallback, useState } from 'react';
import { Box, Button, Chip, Icon, IconButton, Icons, Input, Spinner, Text, config } from 'folds';
import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/settings/account/MatrixId.tsx b/src/app/features/settings/account/MatrixId.tsx
index 192c0e9d..1da5650f 100644
--- a/src/app/features/settings/account/MatrixId.tsx
+++ b/src/app/features/settings/account/MatrixId.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, Chip } from 'folds';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/account/NameColorEditor.tsx b/src/app/features/settings/account/NameColorEditor.tsx
index 4f3da4fc..1bfa060c 100644
--- a/src/app/features/settings/account/NameColorEditor.tsx
+++ b/src/app/features/settings/account/NameColorEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
import { Box, Button, config, Text, Input, IconButton, Icon, Icons } from 'folds';
import { HexColorPicker } from 'react-colorful';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx
index 21384e6c..12a04f43 100644
--- a/src/app/features/settings/account/Profile.tsx
+++ b/src/app/features/settings/account/Profile.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
FormEventHandler,
useCallback,
diff --git a/src/app/features/settings/account/PronounEditor.tsx b/src/app/features/settings/account/PronounEditor.tsx
index bdad2fc7..9edfd1c9 100644
--- a/src/app/features/settings/account/PronounEditor.tsx
+++ b/src/app/features/settings/account/PronounEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, ChangeEvent } from 'react';
+import { useState, useEffect, ChangeEvent } from 'react';
import { Input } from 'folds';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/settings/account/TimezoneEditor.tsx b/src/app/features/settings/account/TimezoneEditor.tsx
index e17b0516..7f85c974 100644
--- a/src/app/features/settings/account/TimezoneEditor.tsx
+++ b/src/app/features/settings/account/TimezoneEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState, useEffect, ChangeEvent } from 'react';
+import { useMemo, useState, useEffect, ChangeEvent } from 'react';
import { Box, IconButton, Icon, Icons, Input } from 'folds';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/settings/cosmetics/Cosmetics.tsx b/src/app/features/settings/cosmetics/Cosmetics.tsx
index bdd54d35..bf6cbdb3 100644
--- a/src/app/features/settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/settings/cosmetics/Cosmetics.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useState } from 'react';
+import { MouseEventHandler, useState } from 'react';
import {
Box,
Button,
diff --git a/src/app/features/settings/cosmetics/Themes.tsx b/src/app/features/settings/cosmetics/Themes.tsx
index ae1a1118..5d15f302 100644
--- a/src/app/features/settings/cosmetics/Themes.tsx
+++ b/src/app/features/settings/cosmetics/Themes.tsx
@@ -1,9 +1,4 @@
-import React, {
- ChangeEventHandler,
- KeyboardEventHandler,
- MouseEventHandler,
- useState,
-} from 'react';
+import { ChangeEventHandler, KeyboardEventHandler, MouseEventHandler, useState } from 'react';
import {
as,
Box,
diff --git a/src/app/features/settings/developer-tools/AccountData.tsx b/src/app/features/settings/developer-tools/AccountData.tsx
index 34945a7e..8429c24b 100644
--- a/src/app/features/settings/developer-tools/AccountData.tsx
+++ b/src/app/features/settings/developer-tools/AccountData.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Box, Text, Icon, Icons, Button, MenuItem } from 'folds';
import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
diff --git a/src/app/features/settings/developer-tools/DevelopTools.tsx b/src/app/features/settings/developer-tools/DevelopTools.tsx
index adfb1132..94da14c2 100644
--- a/src/app/features/settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/settings/developer-tools/DevelopTools.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll, Switch, Button } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/devices/DeviceTile.tsx b/src/app/features/settings/devices/DeviceTile.tsx
index 8ea7e997..49250917 100644
--- a/src/app/features/settings/devices/DeviceTile.tsx
+++ b/src/app/features/settings/devices/DeviceTile.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, ReactNode, useCallback, useEffect, useState } from 'react';
+import { FormEventHandler, ReactNode, useCallback, useEffect, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/settings/devices/Devices.tsx b/src/app/features/settings/devices/Devices.tsx
index 331c5785..0377ae92 100644
--- a/src/app/features/settings/devices/Devices.tsx
+++ b/src/app/features/settings/devices/Devices.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/devices/LocalBackup.tsx b/src/app/features/settings/devices/LocalBackup.tsx
index 50f1d673..d1ba2e6b 100644
--- a/src/app/features/settings/devices/LocalBackup.tsx
+++ b/src/app/features/settings/devices/LocalBackup.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useState } from 'react';
import { Box, Button, color, Icon, Icons, Spinner, Text, toRem } from 'folds';
import FileSaver from 'file-saver';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/devices/OtherDevices.tsx b/src/app/features/settings/devices/OtherDevices.tsx
index 2ee25d10..396488a2 100644
--- a/src/app/features/settings/devices/OtherDevices.tsx
+++ b/src/app/features/settings/devices/OtherDevices.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Box, Button, config, Menu, Spinner, Text } from 'folds';
import { AuthDict, IMyDevice, MatrixError } from '$types/matrix-sdk';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/devices/Verification.tsx b/src/app/features/settings/devices/Verification.tsx
index ac9c5af1..adea4d61 100644
--- a/src/app/features/settings/devices/Verification.tsx
+++ b/src/app/features/settings/devices/Verification.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEventHandler, useCallback, useState } from 'react';
import {
Badge,
Box,
diff --git a/src/app/features/settings/emojis-stickers/EmojisStickers.tsx b/src/app/features/settings/emojis-stickers/EmojisStickers.tsx
index 84653df1..d8708907 100644
--- a/src/app/features/settings/emojis-stickers/EmojisStickers.tsx
+++ b/src/app/features/settings/emojis-stickers/EmojisStickers.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { ImagePack } from '$plugins/custom-emoji';
diff --git a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
index 7b6cb42c..7a1e424a 100644
--- a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
+++ b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
+import { MouseEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
import {
Box,
Text,
diff --git a/src/app/features/settings/emojis-stickers/UserPack.tsx b/src/app/features/settings/emojis-stickers/UserPack.tsx
index 91eda5c8..ba11b062 100644
--- a/src/app/features/settings/emojis-stickers/UserPack.tsx
+++ b/src/app/features/settings/emojis-stickers/UserPack.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Avatar, AvatarFallback, AvatarImage, Box, Button, Icon, Icons, Text } from 'folds';
import { useUserImagePack } from '$hooks/useImagePacks';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx
index fc78c8cf..84d0c039 100644
--- a/src/app/features/settings/general/General.tsx
+++ b/src/app/features/settings/general/General.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
FormEventHandler,
MouseEventHandler,
diff --git a/src/app/features/settings/notifications/AllMessages.tsx b/src/app/features/settings/notifications/AllMessages.tsx
index 83dac401..f9344ba7 100644
--- a/src/app/features/settings/notifications/AllMessages.tsx
+++ b/src/app/features/settings/notifications/AllMessages.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { Badge, Box, Text } from 'folds';
import {
ConditionKind,
diff --git a/src/app/features/settings/notifications/KeywordMessages.tsx b/src/app/features/settings/notifications/KeywordMessages.tsx
index 8eb29c0d..b9dff525 100644
--- a/src/app/features/settings/notifications/KeywordMessages.tsx
+++ b/src/app/features/settings/notifications/KeywordMessages.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEventHandler, FormEventHandler, useCallback, useMemo, useState } from 'react';
+import { ChangeEventHandler, FormEventHandler, useCallback, useMemo, useState } from 'react';
import { IPushRule, IPushRules, PushRuleKind } from '$types/matrix-sdk';
import { Box, Text, Badge, Button, Input, config, IconButton, Icons, Icon, Spinner } from 'folds';
import { useAccountData } from '$hooks/useAccountData';
diff --git a/src/app/features/settings/notifications/NotificationModeSwitcher.tsx b/src/app/features/settings/notifications/NotificationModeSwitcher.tsx
index 18a24adc..e9a7e182 100644
--- a/src/app/features/settings/notifications/NotificationModeSwitcher.tsx
+++ b/src/app/features/settings/notifications/NotificationModeSwitcher.tsx
@@ -12,7 +12,7 @@ import {
Text,
} from 'folds';
import { IPushRule } from '$types/matrix-sdk';
-import React, { MouseEventHandler, useMemo, useState } from 'react';
+import { MouseEventHandler, useMemo, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { NotificationMode, useNotificationActionsMode } from '$hooks/useNotificationMode';
import { stopPropagation } from '$appUtils/keyboard';
diff --git a/src/app/features/settings/notifications/Notifications.tsx b/src/app/features/settings/notifications/Notifications.tsx
index 6669cfba..94b71382 100644
--- a/src/app/features/settings/notifications/Notifications.tsx
+++ b/src/app/features/settings/notifications/Notifications.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/settings/notifications/SpecialMessages.tsx b/src/app/features/settings/notifications/SpecialMessages.tsx
index 1feb7564..7bc70a52 100644
--- a/src/app/features/settings/notifications/SpecialMessages.tsx
+++ b/src/app/features/settings/notifications/SpecialMessages.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { ConditionKind, IPushRules, PushRuleKind, RuleId } from '$types/matrix-sdk';
import { Box, Text, Badge } from 'folds';
import { useAccountData } from '$hooks/useAccountData';
diff --git a/src/app/features/settings/notifications/SystemNotification.tsx b/src/app/features/settings/notifications/SystemNotification.tsx
index 1ae74465..feefba4c 100644
--- a/src/app/features/settings/notifications/SystemNotification.tsx
+++ b/src/app/features/settings/notifications/SystemNotification.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { Box, Text, Switch, Button, color, Spinner } from 'folds';
import { IPusherRequest } from '$types/matrix-sdk';
import { SequenceCard } from '$components/sequence-card';
diff --git a/src/app/features/space-settings/SpaceSettings.tsx b/src/app/features/space-settings/SpaceSettings.tsx
index a116cd61..43e55526 100644
--- a/src/app/features/space-settings/SpaceSettings.tsx
+++ b/src/app/features/space-settings/SpaceSettings.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
import { useAtomValue } from 'jotai';
import { Avatar, Box, config, Icon, IconButton, Icons, IconSrc, MenuItem, Text } from 'folds';
import { JoinRule } from '$types/matrix-sdk';
diff --git a/src/app/features/space-settings/SpaceSettingsRenderer.tsx b/src/app/features/space-settings/SpaceSettingsRenderer.tsx
index 78de9ff4..42542868 100644
--- a/src/app/features/space-settings/SpaceSettingsRenderer.tsx
+++ b/src/app/features/space-settings/SpaceSettingsRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Modal500 } from '$components/Modal500';
import { useCloseSpaceSettings, useSpaceSettingsState } from '$state/hooks/spaceSettings';
import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
diff --git a/src/app/features/space-settings/general/General.tsx b/src/app/features/space-settings/general/General.tsx
index 2c305fe3..8cee28c6 100644
--- a/src/app/features/space-settings/general/General.tsx
+++ b/src/app/features/space-settings/general/General.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { usePowerLevels } from '$hooks/usePowerLevels';
diff --git a/src/app/features/space-settings/permissions/Permissions.tsx b/src/app/features/space-settings/permissions/Permissions.tsx
index a12ca201..9e463a66 100644
--- a/src/app/features/space-settings/permissions/Permissions.tsx
+++ b/src/app/features/space-settings/permissions/Permissions.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { useRoom } from '$hooks/useRoom';
diff --git a/src/app/features/widgets/IntegrationManager.tsx b/src/app/features/widgets/IntegrationManager.tsx
index 982b15b9..4bf242a4 100644
--- a/src/app/features/widgets/IntegrationManager.tsx
+++ b/src/app/features/widgets/IntegrationManager.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
import {
Box,
Header,
diff --git a/src/app/features/widgets/WidgetIframe.tsx b/src/app/features/widgets/WidgetIframe.tsx
index 44d868c7..0017ebb1 100644
--- a/src/app/features/widgets/WidgetIframe.tsx
+++ b/src/app/features/widgets/WidgetIframe.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
import { ClientWidgetApi, IWidget, IRoomEvent, Widget, WidgetKind } from 'matrix-widget-api';
import {
ClientEvent,
diff --git a/src/app/features/widgets/WidgetsDrawer.tsx b/src/app/features/widgets/WidgetsDrawer.tsx
index d8f7529e..bf26625c 100644
--- a/src/app/features/widgets/WidgetsDrawer.tsx
+++ b/src/app/features/widgets/WidgetsDrawer.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, MouseEventHandler, useState } from 'react';
+import { FormEventHandler, MouseEventHandler, useState } from 'react';
import {
Box,
Header,
diff --git a/src/app/hooks/useAsyncCallback.ts b/src/app/hooks/useAsyncCallback.ts
index 85215784..70831bea 100644
--- a/src/app/hooks/useAsyncCallback.ts
+++ b/src/app/hooks/useAsyncCallback.ts
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { Dispatch, SetStateAction, useCallback, useEffect, useRef, useState } from 'react';
import { flushSync } from 'react-dom';
import { useAlive } from './useAlive';
@@ -96,7 +96,7 @@ export const useAsyncCallback = (
): [
AsyncState,
AsyncCallback,
- React.Dispatch>>,
+ Dispatch>>,
] => {
const [state, setState] = useState>({
status: AsyncStatus.Idle,
diff --git a/src/app/hooks/useMemberEventParser.tsx b/src/app/hooks/useMemberEventParser.tsx
index 963bfd94..81887806 100644
--- a/src/app/hooks/useMemberEventParser.tsx
+++ b/src/app/hooks/useMemberEventParser.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { IconSrc, Icons } from 'folds';
import { MatrixEvent } from '$types/matrix-sdk';
import { IMemberContent, Membership } from '$types/matrix/room';
diff --git a/src/app/pages/App.tsx b/src/app/pages/App.tsx
index 52ec7f20..09bccf1d 100644
--- a/src/app/pages/App.tsx
+++ b/src/app/pages/App.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Provider as JotaiProvider } from 'jotai';
import { OverlayContainerProvider, PopOutContainerProvider, TooltipContainerProvider } from 'folds';
import { RouterProvider } from 'react-router-dom';
diff --git a/src/app/pages/ConfigConfig.tsx b/src/app/pages/ConfigConfig.tsx
index 464b1cc3..b002ebad 100644
--- a/src/app/pages/ConfigConfig.tsx
+++ b/src/app/pages/ConfigConfig.tsx
@@ -1,5 +1,4 @@
import { Box, Button, Dialog, Spinner, Text, color, config } from 'folds';
-import React from 'react';
import { SplashScreen } from '../components/splash-screen';
export function ConfigConfigLoading() {
diff --git a/src/app/pages/FeatureCheck.tsx b/src/app/pages/FeatureCheck.tsx
index abb366a8..8fea23d6 100644
--- a/src/app/pages/FeatureCheck.tsx
+++ b/src/app/pages/FeatureCheck.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useEffect } from 'react';
+import { ReactNode, useEffect } from 'react';
import { Box, Dialog, Text, config } from 'folds';
import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
import { checkIndexedDBSupport } from '../utils/featureCheck';
diff --git a/src/app/pages/Router.tsx b/src/app/pages/Router.tsx
index 3dbac649..bcf159d0 100644
--- a/src/app/pages/Router.tsx
+++ b/src/app/pages/Router.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import {
Outlet,
Route,
diff --git a/src/app/pages/ThemeManager.tsx b/src/app/pages/ThemeManager.tsx
index 69d50cdb..f86cacc1 100644
--- a/src/app/pages/ThemeManager.tsx
+++ b/src/app/pages/ThemeManager.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useEffect } from 'react';
+import { ReactNode, useEffect } from 'react';
import { configClass, varsClass } from 'folds';
import {
DarkTheme,
diff --git a/src/app/pages/auth/AuthFooter.tsx b/src/app/pages/auth/AuthFooter.tsx
index 2df5281c..9283f4aa 100644
--- a/src/app/pages/auth/AuthFooter.tsx
+++ b/src/app/pages/auth/AuthFooter.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text } from 'folds';
import * as css from './styles.css';
diff --git a/src/app/pages/auth/AuthLayout.tsx b/src/app/pages/auth/AuthLayout.tsx
index f756d8c2..a73ee644 100644
--- a/src/app/pages/auth/AuthLayout.tsx
+++ b/src/app/pages/auth/AuthLayout.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import { Box, Header, Scroll, Spinner, Text, color } from 'folds';
import {
Outlet,
diff --git a/src/app/pages/auth/FiledError.tsx b/src/app/pages/auth/FiledError.tsx
index d96fc872..eddd65b6 100644
--- a/src/app/pages/auth/FiledError.tsx
+++ b/src/app/pages/auth/FiledError.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, Icons, color, Text } from 'folds';
export function FieldError({ message }: { message: string }) {
diff --git a/src/app/pages/auth/OrDivider.tsx b/src/app/pages/auth/OrDivider.tsx
index 629d3f52..db13a7ab 100644
--- a/src/app/pages/auth/OrDivider.tsx
+++ b/src/app/pages/auth/OrDivider.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Line, Text } from 'folds';
export function OrDivider() {
diff --git a/src/app/pages/auth/SSOLogin.tsx b/src/app/pages/auth/SSOLogin.tsx
index 4ef20e1e..eabb2360 100644
--- a/src/app/pages/auth/SSOLogin.tsx
+++ b/src/app/pages/auth/SSOLogin.tsx
@@ -1,6 +1,6 @@
import { Avatar, AvatarImage, Box, Button, Text } from 'folds';
import { IIdentityProvider, SSOAction, createClient } from '$types/matrix-sdk';
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
type SSOLoginProps = {
diff --git a/src/app/pages/auth/ServerPicker.tsx b/src/app/pages/auth/ServerPicker.tsx
index 8eb9dafc..2f605b83 100644
--- a/src/app/pages/auth/ServerPicker.tsx
+++ b/src/app/pages/auth/ServerPicker.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
KeyboardEventHandler,
MouseEventHandler,
diff --git a/src/app/pages/auth/login/Login.tsx b/src/app/pages/auth/login/Login.tsx
index ce0d9339..a9cd1c29 100644
--- a/src/app/pages/auth/login/Login.tsx
+++ b/src/app/pages/auth/login/Login.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { Box, Text, color } from 'folds';
import { Link, useSearchParams } from 'react-router-dom';
import { SSOAction } from '$types/matrix-sdk';
diff --git a/src/app/pages/auth/login/PasswordLoginForm.tsx b/src/app/pages/auth/login/PasswordLoginForm.tsx
index dd324976..6b28fc70 100644
--- a/src/app/pages/auth/login/PasswordLoginForm.tsx
+++ b/src/app/pages/auth/login/PasswordLoginForm.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, MouseEventHandler, useCallback, useState } from 'react';
+import { FormEventHandler, MouseEventHandler, useCallback, useState } from 'react';
import {
Box,
Button,
diff --git a/src/app/pages/auth/login/TokenLogin.tsx b/src/app/pages/auth/login/TokenLogin.tsx
index c6efb86e..984cf89f 100644
--- a/src/app/pages/auth/login/TokenLogin.tsx
+++ b/src/app/pages/auth/login/TokenLogin.tsx
@@ -10,7 +10,7 @@ import {
color,
config,
} from 'folds';
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import { MatrixError } from '$types/matrix-sdk';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
diff --git a/src/app/pages/auth/register/PasswordRegisterForm.tsx b/src/app/pages/auth/register/PasswordRegisterForm.tsx
index e547634c..1d7f23c4 100644
--- a/src/app/pages/auth/register/PasswordRegisterForm.tsx
+++ b/src/app/pages/auth/register/PasswordRegisterForm.tsx
@@ -10,7 +10,7 @@ import {
Text,
color,
} from 'folds';
-import React, { ChangeEventHandler, useCallback, useMemo, useState } from 'react';
+import { ChangeEventHandler, useCallback, useMemo, useState } from 'react';
import {
AuthDict,
AuthType,
diff --git a/src/app/pages/auth/register/Register.tsx b/src/app/pages/auth/register/Register.tsx
index 97d17af0..f0cf4c17 100644
--- a/src/app/pages/auth/register/Register.tsx
+++ b/src/app/pages/auth/register/Register.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { Box, Text, color } from 'folds';
import { Link, useSearchParams } from 'react-router-dom';
import { SSOAction } from '$types/matrix-sdk';
diff --git a/src/app/pages/auth/reset-password/PasswordResetForm.tsx b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
index 6277eaad..fb05edf9 100644
--- a/src/app/pages/auth/reset-password/PasswordResetForm.tsx
+++ b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
import {
Box,
Button,
diff --git a/src/app/pages/auth/reset-password/ResetPassword.tsx b/src/app/pages/auth/reset-password/ResetPassword.tsx
index cc70b1e1..718101fa 100644
--- a/src/app/pages/auth/reset-password/ResetPassword.tsx
+++ b/src/app/pages/auth/reset-password/ResetPassword.tsx
@@ -1,5 +1,5 @@
import { Box, Text } from 'folds';
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { Link, useSearchParams } from 'react-router-dom';
import { getLoginPath } from '$pages/pathUtils';
import { useAuthServer } from '$hooks/useAuthServer';
diff --git a/src/app/pages/client/ClientInitStorageAtom.tsx b/src/app/pages/client/ClientInitStorageAtom.tsx
index ead77eb5..80b263e9 100644
--- a/src/app/pages/client/ClientInitStorageAtom.tsx
+++ b/src/app/pages/client/ClientInitStorageAtom.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useMemo } from 'react';
+import { ReactNode, useMemo } from 'react';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { makeClosedNavCategoriesAtom } from '$state/closedNavCategories';
import { ClosedNavCategoriesProvider } from '$state/hooks/closedNavCategories';
diff --git a/src/app/pages/client/ClientLayout.tsx b/src/app/pages/client/ClientLayout.tsx
index 4a077ba6..4bbd4068 100644
--- a/src/app/pages/client/ClientLayout.tsx
+++ b/src/app/pages/client/ClientLayout.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box } from 'folds';
type ClientLayoutProps = {
diff --git a/src/app/pages/client/ClientNonUIFeatures.tsx b/src/app/pages/client/ClientNonUIFeatures.tsx
index aeee2e6c..c68bf9ac 100644
--- a/src/app/pages/client/ClientNonUIFeatures.tsx
+++ b/src/app/pages/client/ClientNonUIFeatures.tsx
@@ -1,5 +1,5 @@
import { useAtomValue, useSetAtom } from 'jotai';
-import React, { ReactNode, useCallback, useEffect, useRef } from 'react';
+import { ReactNode, useCallback, useEffect, useRef } from 'react';
import { useNavigate } from 'react-router-dom';
import { RoomEvent, RoomEventHandlerMap } from '$types/matrix-sdk';
import { roomToUnreadAtom, unreadEqual, unreadInfoToUnread } from '$state/room/roomToUnread';
diff --git a/src/app/pages/client/ClientRoomsNotificationPreferences.tsx b/src/app/pages/client/ClientRoomsNotificationPreferences.tsx
index 3881f2e9..c6ef04a4 100644
--- a/src/app/pages/client/ClientRoomsNotificationPreferences.tsx
+++ b/src/app/pages/client/ClientRoomsNotificationPreferences.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import {
RoomsNotificationPreferencesProvider,
useRoomsNotificationPreferences,
diff --git a/src/app/pages/client/ClientRoot.tsx b/src/app/pages/client/ClientRoot.tsx
index 8d9e2abf..ab082b2f 100644
--- a/src/app/pages/client/ClientRoot.tsx
+++ b/src/app/pages/client/ClientRoot.tsx
@@ -15,7 +15,7 @@ import {
} from 'folds';
import { HttpApiEvent, HttpApiEventHandlerMap, MatrixClient } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
-import React, { MouseEventHandler, ReactNode, useCallback, useEffect, useState } from 'react';
+import { useRef, MouseEventHandler, ReactNode, useCallback, useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { useAtom, useAtomValue, useSetAtom } from 'jotai';
import {
@@ -167,7 +167,7 @@ export function ClientRoot({ children }: ClientRootProps) {
const { baseUrl } = activeSession ?? {};
- const loadedUserIdRef = React.useRef(undefined);
+ const loadedUserIdRef = useRef(undefined);
const [loadState, loadMatrix, setLoadState] = useAsyncCallback(
useCallback(async () => {
diff --git a/src/app/pages/client/SidebarNav.tsx b/src/app/pages/client/SidebarNav.tsx
index f521106e..7bb47408 100644
--- a/src/app/pages/client/SidebarNav.tsx
+++ b/src/app/pages/client/SidebarNav.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import { useRef } from 'react';
import { Scroll } from 'folds';
import { Sidebar, SidebarContent, SidebarStackSeparator, SidebarStack } from '$components/sidebar';
diff --git a/src/app/pages/client/SpecVersions.tsx b/src/app/pages/client/SpecVersions.tsx
index b3552cf6..75cb3caf 100644
--- a/src/app/pages/client/SpecVersions.tsx
+++ b/src/app/pages/client/SpecVersions.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, Dialog, config, Text, Button, Spinner } from 'folds';
import { SpecVersionsLoader } from '$components/SpecVersionsLoader';
import { SpecVersionsProvider } from '$hooks/useSpecVersions';
diff --git a/src/app/pages/client/SyncStatus.tsx b/src/app/pages/client/SyncStatus.tsx
index 63c7b400..818d7700 100644
--- a/src/app/pages/client/SyncStatus.tsx
+++ b/src/app/pages/client/SyncStatus.tsx
@@ -1,5 +1,5 @@
import { MatrixClient, SyncState } from '$types/matrix-sdk';
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Box, config, Line, Text } from 'folds';
import { useSyncState } from '$hooks/useSyncState';
import { ContainerColor } from '$styles/ContainerColor.css';
diff --git a/src/app/pages/client/WelcomePage.tsx b/src/app/pages/client/WelcomePage.tsx
index ef227ee5..88d3fc80 100644
--- a/src/app/pages/client/WelcomePage.tsx
+++ b/src/app/pages/client/WelcomePage.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Button, Icon, Icons, Text, config, toRem } from 'folds';
import { Page, PageHero, PageHeroSection } from '$components/page';
import CinnySVG from '$public/res/svg/cinny.svg';
diff --git a/src/app/pages/client/call/CallProvider.tsx b/src/app/pages/client/call/CallProvider.tsx
index 2056e636..f2b98192 100644
--- a/src/app/pages/client/call/CallProvider.tsx
+++ b/src/app/pages/client/call/CallProvider.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
createContext,
useState,
useContext,
diff --git a/src/app/pages/client/call/PersistentCallContainer.tsx b/src/app/pages/client/call/PersistentCallContainer.tsx
index 86c8ad3a..31809786 100644
--- a/src/app/pages/client/call/PersistentCallContainer.tsx
+++ b/src/app/pages/client/call/PersistentCallContainer.tsx
@@ -1,4 +1,12 @@
-import React, { createContext, ReactNode, useCallback, useEffect, useMemo, useRef } from 'react';
+import {
+ createContext,
+ MutableRefObject,
+ ReactNode,
+ useCallback,
+ useEffect,
+ useMemo,
+ useRef,
+} from 'react';
import { ClientWidgetApi } from 'matrix-widget-api';
import { Box } from 'folds';
import {
@@ -17,8 +25,9 @@ interface PersistentCallContainerProps {
children: ReactNode;
}
-export const CallRefContext =
- createContext | null>(null);
+export const CallRefContext = createContext | null>(
+ null
+);
export function PersistentCallContainer({ children }: PersistentCallContainerProps) {
const callIframeRef = useRef(null);
@@ -43,9 +52,9 @@ export function PersistentCallContainer({ children }: PersistentCallContainerPro
const setupWidget = useCallback(
(
- widgetApiRef: React.MutableRefObject,
- smallWidgetRef: React.MutableRefObject,
- iframeRef: React.MutableRefObject,
+ widgetApiRef: MutableRefObject,
+ smallWidgetRef: MutableRefObject,
+ iframeRef: MutableRefObject,
skipLobby: boolean,
themeKind: ThemeKind | null
) => {
diff --git a/src/app/pages/client/create/Create.tsx b/src/app/pages/client/create/Create.tsx
index 6e81d203..4fb78183 100644
--- a/src/app/pages/client/create/Create.tsx
+++ b/src/app/pages/client/create/Create.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageContentCenter, PageHero, PageHeroSection } from '$components/page';
import { CreateSpaceForm } from '$features/create-space';
diff --git a/src/app/pages/client/direct/Direct.tsx b/src/app/pages/client/direct/Direct.tsx
index 64fc2914..7ae665a7 100644
--- a/src/app/pages/client/direct/Direct.tsx
+++ b/src/app/pages/client/direct/Direct.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
import { useAtom, useAtomValue } from 'jotai';
import {
Avatar,
diff --git a/src/app/pages/client/direct/DirectCreate.tsx b/src/app/pages/client/direct/DirectCreate.tsx
index d1ebcc80..52f711fd 100644
--- a/src/app/pages/client/direct/DirectCreate.tsx
+++ b/src/app/pages/client/direct/DirectCreate.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
import { useNavigate, useSearchParams } from 'react-router-dom';
import { Box, Icon, IconButton, Icons, Scroll } from 'folds';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/pages/client/direct/RoomProvider.tsx b/src/app/pages/client/direct/RoomProvider.tsx
index b1bddcf3..1780fa72 100644
--- a/src/app/pages/client/direct/RoomProvider.tsx
+++ b/src/app/pages/client/direct/RoomProvider.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { IsDirectRoomProvider, RoomProvider } from '$hooks/useRoom';
diff --git a/src/app/pages/client/explore/Explore.tsx b/src/app/pages/client/explore/Explore.tsx
index a546bcbb..08aed17e 100644
--- a/src/app/pages/client/explore/Explore.tsx
+++ b/src/app/pages/client/explore/Explore.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useRef, useState } from 'react';
+import { FormEventHandler, useCallback, useRef, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import FocusTrap from 'focus-trap-react';
import {
diff --git a/src/app/pages/client/explore/Featured.tsx b/src/app/pages/client/explore/Featured.tsx
index 05d567e7..e7095772 100644
--- a/src/app/pages/client/explore/Featured.tsx
+++ b/src/app/pages/client/explore/Featured.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { useAtomValue } from 'jotai';
import { useClientConfig } from '$hooks/useClientConfig';
diff --git a/src/app/pages/client/explore/Server.tsx b/src/app/pages/client/explore/Server.tsx
index 48756b2c..d62253c5 100644
--- a/src/app/pages/client/explore/Server.tsx
+++ b/src/app/pages/client/explore/Server.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
FormEventHandler,
MouseEventHandler,
RefObject,
diff --git a/src/app/pages/client/home/CreateRoom.tsx b/src/app/pages/client/home/CreateRoom.tsx
index b1a01e63..30dc6b52 100644
--- a/src/app/pages/client/home/CreateRoom.tsx
+++ b/src/app/pages/client/home/CreateRoom.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, Icons, Scroll, IconButton } from 'folds';
import {
Page,
diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx
index 039a263b..2a9e664b 100644
--- a/src/app/pages/client/home/Home.tsx
+++ b/src/app/pages/client/home/Home.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import {
Avatar,
diff --git a/src/app/pages/client/home/RoomProvider.tsx b/src/app/pages/client/home/RoomProvider.tsx
index 2866f105..b6f7ba7e 100644
--- a/src/app/pages/client/home/RoomProvider.tsx
+++ b/src/app/pages/client/home/RoomProvider.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { IsDirectRoomProvider, RoomProvider } from '$hooks/useRoom';
diff --git a/src/app/pages/client/home/Search.tsx b/src/app/pages/client/home/Search.tsx
index 1e70149d..0deca3e1 100644
--- a/src/app/pages/client/home/Search.tsx
+++ b/src/app/pages/client/home/Search.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import { useRef } from 'react';
import { Box, Icon, Icons, Text, Scroll, IconButton } from 'folds';
import { Page, PageContent, PageContentCenter, PageHeader } from '$components/page';
import { MessageSearch } from '$features/message-search';
diff --git a/src/app/pages/client/inbox/Inbox.tsx b/src/app/pages/client/inbox/Inbox.tsx
index f63555ce..66143551 100644
--- a/src/app/pages/client/inbox/Inbox.tsx
+++ b/src/app/pages/client/inbox/Inbox.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Avatar, Box, Icon, Icons, Text } from 'folds';
import { useAtomValue } from 'jotai';
import { NavCategory, NavItem, NavItemContent, NavLink } from '$components/nav';
diff --git a/src/app/pages/client/inbox/Invites.tsx b/src/app/pages/client/inbox/Invites.tsx
index 451064a6..0329e687 100644
--- a/src/app/pages/client/inbox/Invites.tsx
+++ b/src/app/pages/client/inbox/Invites.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useRef, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
import {
Avatar,
Badge,
diff --git a/src/app/pages/client/inbox/Notifications.tsx b/src/app/pages/client/inbox/Notifications.tsx
index 697486dd..edfdae61 100644
--- a/src/app/pages/client/inbox/Notifications.tsx
+++ b/src/app/pages/client/inbox/Notifications.tsx
@@ -1,5 +1,5 @@
/* eslint-disable react/destructuring-assignment */
-import React, { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Avatar,
Box,
diff --git a/src/app/pages/client/sidebar/AccountSwitcherTab.tsx b/src/app/pages/client/sidebar/AccountSwitcherTab.tsx
index 0e3dd8c9..56d9864b 100644
--- a/src/app/pages/client/sidebar/AccountSwitcherTab.tsx
+++ b/src/app/pages/client/sidebar/AccountSwitcherTab.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEvent, MouseEventHandler, useCallback, useState } from 'react';
import {
Box,
Icon,
@@ -88,7 +88,7 @@ function AccountRow({
fill="None"
size="400"
radii="300"
- onClick={(e: React.MouseEvent) => {
+ onClick={(e: MouseEvent) => {
e.stopPropagation();
onSignOut(session);
}}
diff --git a/src/app/pages/client/sidebar/CreateTab.tsx b/src/app/pages/client/sidebar/CreateTab.tsx
index e213d329..c008b19d 100644
--- a/src/app/pages/client/sidebar/CreateTab.tsx
+++ b/src/app/pages/client/sidebar/CreateTab.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useState } from 'react';
+import { MouseEventHandler, useState } from 'react';
import { Box, config, Icon, Icons, Menu, PopOut, RectCords, Text } from 'folds';
import FocusTrap from 'focus-trap-react';
import { useNavigate } from 'react-router-dom';
diff --git a/src/app/pages/client/sidebar/DirectTab.tsx b/src/app/pages/client/sidebar/DirectTab.tsx
index c04e778d..415d73cc 100644
--- a/src/app/pages/client/sidebar/DirectTab.tsx
+++ b/src/app/pages/client/sidebar/DirectTab.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Box, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
import FocusTrap from 'focus-trap-react';
diff --git a/src/app/pages/client/sidebar/ExploreTab.tsx b/src/app/pages/client/sidebar/ExploreTab.tsx
index d1c1c147..c0d9e1cb 100644
--- a/src/app/pages/client/sidebar/ExploreTab.tsx
+++ b/src/app/pages/client/sidebar/ExploreTab.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Icon, Icons } from 'folds';
import { useNavigate } from 'react-router-dom';
import { useAtomValue } from 'jotai';
diff --git a/src/app/pages/client/sidebar/HomeTab.tsx b/src/app/pages/client/sidebar/HomeTab.tsx
index 9dfe0576..aad308db 100644
--- a/src/app/pages/client/sidebar/HomeTab.tsx
+++ b/src/app/pages/client/sidebar/HomeTab.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Box, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
import { useAtomValue } from 'jotai';
diff --git a/src/app/pages/client/sidebar/InboxTab.tsx b/src/app/pages/client/sidebar/InboxTab.tsx
index c2ffbe20..ec3bb21d 100644
--- a/src/app/pages/client/sidebar/InboxTab.tsx
+++ b/src/app/pages/client/sidebar/InboxTab.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { useNavigate } from 'react-router-dom';
import { Icon, Icons } from 'folds';
import { useAtomValue } from 'jotai';
diff --git a/src/app/pages/client/sidebar/SearchTab.tsx b/src/app/pages/client/sidebar/SearchTab.tsx
index ed75ff06..c3ef38c5 100644
--- a/src/app/pages/client/sidebar/SearchTab.tsx
+++ b/src/app/pages/client/sidebar/SearchTab.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Icon, Icons } from 'folds';
import { useAtom } from 'jotai';
import { SidebarAvatar, SidebarItem, SidebarItemTooltip } from '$components/sidebar';
diff --git a/src/app/pages/client/sidebar/SpaceTabs.tsx b/src/app/pages/client/sidebar/SpaceTabs.tsx
index f5dd04b4..ad8adc6d 100644
--- a/src/app/pages/client/sidebar/SpaceTabs.tsx
+++ b/src/app/pages/client/sidebar/SpaceTabs.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
MouseEventHandler,
ReactNode,
RefObject,
diff --git a/src/app/pages/client/sidebar/UnverifiedTab.tsx b/src/app/pages/client/sidebar/UnverifiedTab.tsx
index a75d47f2..3aca6655 100644
--- a/src/app/pages/client/sidebar/UnverifiedTab.tsx
+++ b/src/app/pages/client/sidebar/UnverifiedTab.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Badge, color, Icon, Icons, Text } from 'folds';
import {
SidebarAvatar,
diff --git a/src/app/pages/client/space/RoomProvider.tsx b/src/app/pages/client/space/RoomProvider.tsx
index 6320bc48..1e7de08f 100644
--- a/src/app/pages/client/space/RoomProvider.tsx
+++ b/src/app/pages/client/space/RoomProvider.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { useAtom, useAtomValue } from 'jotai';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
diff --git a/src/app/pages/client/space/Search.tsx b/src/app/pages/client/space/Search.tsx
index 83162ef4..c2b4c15c 100644
--- a/src/app/pages/client/space/Search.tsx
+++ b/src/app/pages/client/space/Search.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import { useRef } from 'react';
import { Box, Icon, Icons, Text, Scroll, IconButton } from 'folds';
import { useAtomValue } from 'jotai';
import { Page, PageContent, PageContentCenter, PageHeader } from '$components/page';
diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx
index 4f181c36..f93a15a5 100644
--- a/src/app/pages/client/space/Space.tsx
+++ b/src/app/pages/client/space/Space.tsx
@@ -1,11 +1,4 @@
-import React, {
- MouseEventHandler,
- forwardRef,
- useCallback,
- useMemo,
- useRef,
- useState,
-} from 'react';
+import { MouseEventHandler, forwardRef, useCallback, useMemo, useRef, useState } from 'react';
import { useAtom, useAtomValue } from 'jotai';
import {
Avatar,
diff --git a/src/app/pages/client/space/SpaceProvider.tsx b/src/app/pages/client/space/SpaceProvider.tsx
index f279eb7d..cc2eb5bd 100644
--- a/src/app/pages/client/space/SpaceProvider.tsx
+++ b/src/app/pages/client/space/SpaceProvider.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useSpaces } from '$state/hooks/roomList';
diff --git a/src/app/plugins/react-custom-html-parser.tsx b/src/app/plugins/react-custom-html-parser.tsx
index f1fb3ee1..2d0c54b7 100644
--- a/src/app/plugins/react-custom-html-parser.tsx
+++ b/src/app/plugins/react-custom-html-parser.tsx
@@ -1,5 +1,5 @@
/* eslint-disable jsx-a11y/alt-text */
-import React, {
+import {
ComponentPropsWithoutRef,
lazy,
ReactEventHandler,
diff --git a/src/app/plugins/react-prism/ReactPrism.tsx b/src/app/plugins/react-prism/ReactPrism.tsx
index d18c2910..1d3bb90f 100644
--- a/src/app/plugins/react-prism/ReactPrism.tsx
+++ b/src/app/plugins/react-prism/ReactPrism.tsx
@@ -1,4 +1,4 @@
-import React, { MutableRefObject, ReactNode, useEffect, useRef } from 'react';
+import { MutableRefObject, ReactNode, useEffect, useRef } from 'react';
import Prism from 'prismjs';
From 600f22ff72ddba7690665a65d41a65f84f11360c Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 14:46:23 +0100
Subject: [PATCH 11/59] fix: add missing react hook dependencies
---
src/app/components/BackRouteHandler.tsx | 2 +-
src/app/hooks/useMemberSort.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/components/BackRouteHandler.tsx b/src/app/components/BackRouteHandler.tsx
index 42a3ffe9..2808226d 100644
--- a/src/app/components/BackRouteHandler.tsx
+++ b/src/app/components/BackRouteHandler.tsx
@@ -107,7 +107,7 @@ export function BackRouteHandler({ children }: BackRouteHandlerProps) {
) {
navigate(getInboxPath());
}
- }, [navigate, location]);
+ }, [navigate, location, setLastRoomId]);
return children(goBack);
}
diff --git a/src/app/hooks/useMemberSort.ts b/src/app/hooks/useMemberSort.ts
index 562921e9..72e0581d 100644
--- a/src/app/hooks/useMemberSort.ts
+++ b/src/app/hooks/useMemberSort.ts
@@ -61,7 +61,7 @@ export const useMemberPowerSort = (
return getPowerLevel(b.userId) - getPowerLevel(a.userId);
},
- [creators]
+ [creators, getPowerLevel]
);
return sort;
From e92ebbf9f91db396e2b893b61c8bcf2071765fd7 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 15:17:00 +0100
Subject: [PATCH 12/59] chore(deps): drop unused lint packages
---
package-lock.json | 57 -----------------------------------------------
package.json | 5 -----
2 files changed, 62 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index c9df2f0b..a1764195 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,7 +71,6 @@
"@element-hq/element-call-embedded": "0.16.3",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@eslint/compat": "2.0.2",
- "@eslint/css": "^0.14.1",
"@eslint/js": "9.39.3",
"@rollup/plugin-inject": "^5.0.5",
"@rollup/plugin-wasm": "^6.2.2",
@@ -92,16 +91,12 @@
"eslint-config-prettier": "10.1.8",
"eslint-import-resolver-typescript": "4.4.4",
"eslint-plugin-import-x": "4.16.1",
- "eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-prettier": "5.5.5",
"eslint-plugin-react": "^7.37.5",
- "eslint-plugin-react-hooks": "^7.0.1",
- "eslint-plugin-unused-imports": "4.4.1",
"globals": "17.3.0",
"knip": "5.85.0",
"prettier": "3.8.1",
"typescript": "^5.9.3",
- "typescript-eslint": "^8.56.1",
"vite": "^7.3.1",
"vite-plugin-pwa": "^1.2.0",
"vite-plugin-static-copy": "^3.2.0",
@@ -2361,35 +2356,6 @@
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
}
},
- "node_modules/@eslint/css": {
- "version": "0.14.1",
- "resolved": "https://registry.npmjs.org/@eslint/css/-/css-0.14.1.tgz",
- "integrity": "sha512-NXiteSacmpaXqgyIW3+GcNzexXyfC0kd+gig6WTjD4A74kBGJeNx1tV0Hxa0v7x0+mnIyKfGPhGNs1uhRFdh+w==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "@eslint/core": "^0.17.0",
- "@eslint/css-tree": "^3.6.6",
- "@eslint/plugin-kit": "^0.4.1"
- },
- "engines": {
- "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
- }
- },
- "node_modules/@eslint/css-tree": {
- "version": "3.6.9",
- "resolved": "https://registry.npmjs.org/@eslint/css-tree/-/css-tree-3.6.9.tgz",
- "integrity": "sha512-3D5/OHibNEGk+wKwNwMbz63NMf367EoR4mVNNpxddCHKEb2Nez7z62J2U6YjtErSsZDoY0CsccmoUpdEbkogNA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "mdn-data": "2.23.0",
- "source-map-js": "^1.0.1"
- },
- "engines": {
- "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
- }
- },
"node_modules/@eslint/eslintrc": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.4.tgz",
@@ -10023,22 +9989,6 @@
"semver": "bin/semver.js"
}
},
- "node_modules/eslint-plugin-unused-imports": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.4.1.tgz",
- "integrity": "sha512-oZGYUz1X3sRMGUB+0cZyK2VcvRX5lm/vB56PgNNcU+7ficUCKm66oZWKUubXWnOuPjQ8PvmXtCViXBMONPe7tQ==",
- "dev": true,
- "license": "MIT",
- "peerDependencies": {
- "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
- "eslint": "^10.0.0 || ^9.0.0 || ^8.0.0"
- },
- "peerDependenciesMeta": {
- "@typescript-eslint/eslint-plugin": {
- "optional": true
- }
- }
- },
"node_modules/eslint-scope": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
@@ -12181,13 +12131,6 @@
"events": "^3.2.0"
}
},
- "node_modules/mdn-data": {
- "version": "2.23.0",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.23.0.tgz",
- "integrity": "sha512-786vq1+4079JSeu2XdcDjrhi/Ry7BWtjDl9WtGPWLiIHb2T66GvIVflZTBoSNZ5JqTtJGYEVMuFA/lbQlMOyDQ==",
- "dev": true,
- "license": "CC0-1.0"
- },
"node_modules/media-query-parser": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/media-query-parser/-/media-query-parser-2.0.2.tgz",
diff --git a/package.json b/package.json
index ed3a15a8..c99ef3f7 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
"@element-hq/element-call-embedded": "0.16.3",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@eslint/compat": "2.0.2",
- "@eslint/css": "^0.14.1",
"@eslint/js": "9.39.3",
"@rollup/plugin-inject": "^5.0.5",
"@rollup/plugin-wasm": "^6.2.2",
@@ -106,16 +105,12 @@
"eslint-config-prettier": "10.1.8",
"eslint-import-resolver-typescript": "4.4.4",
"eslint-plugin-import-x": "4.16.1",
- "eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-prettier": "5.5.5",
"eslint-plugin-react": "^7.37.5",
- "eslint-plugin-react-hooks": "^7.0.1",
- "eslint-plugin-unused-imports": "4.4.1",
"globals": "17.3.0",
"knip": "5.85.0",
"prettier": "3.8.1",
"typescript": "^5.9.3",
- "typescript-eslint": "^8.56.1",
"vite": "^7.3.1",
"vite-plugin-pwa": "^1.2.0",
"vite-plugin-static-copy": "^3.2.0",
From 8653a8f326ee3d6ab1a2b66f434513f288261e90 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 15:25:15 +0100
Subject: [PATCH 13/59] chore(lint): drop react/prop-types rule
---
eslint.config.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/eslint.config.js b/eslint.config.js
index 4246f577..80678142 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -83,6 +83,8 @@ const projectOverrides = defineConfig([
extensions: ['.tsx', '.jsx'],
},
],
+ // obsolete in a React 19
+ 'react/prop-types': 'off',
'react/require-default-props': 'off',
'react/jsx-props-no-spreading': 'off',
'react-hooks/rules-of-hooks': 'error',
From 73c914f3118c8d35b5a65061b311ea5c9318ebd0 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 15:27:45 +0100
Subject: [PATCH 14/59] chore(lint): fix react/jsx-no-useless-fragment lint
errors
---
src/app/components/SwipeableMessageWrapper.tsx | 2 +-
src/app/features/room/message/Message.tsx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/components/SwipeableMessageWrapper.tsx b/src/app/components/SwipeableMessageWrapper.tsx
index 07da1056..3cd72d6e 100644
--- a/src/app/components/SwipeableMessageWrapper.tsx
+++ b/src/app/components/SwipeableMessageWrapper.tsx
@@ -83,7 +83,7 @@ export function SwipeableMessageWrapper({
);
if (!isSwipeToReplyEnabled) {
- return <>{children}>;
+ return children;
}
return {children};
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 3d0a769e..0e1934f1 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -75,7 +75,7 @@ import * as css from './styles.css';
export type ReactionHandler = (keyOrMxc: string, shortcode: string) => void;
-const MemoizedBody = memo(({ children }: { children: ReactNode }) => <>{children}>);
+const MemoizedBody = memo(({ children }: { children: ReactNode }) => children);
type MessageQuickReactionsProps = {
onReaction: ReactionHandler;
};
@@ -271,7 +271,7 @@ const Pronouns = as<
);
}
- return <>{display}>;
+ return display;
});
function MessageInternal(
From 10d23b7b034dce94c74d16366052a1126df9f7c4 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 15:39:50 +0100
Subject: [PATCH 15/59] fix: restore pronouns component wrapper
---
src/app/features/room/message/Message.tsx | 29 ++++++++++-------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 0e1934f1..79d4efe4 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -229,6 +229,7 @@ function useMobileDoubleTap(callback: () => void, delay = 300) {
const lastTapRef = useRef(0);
return useCallback(
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
(e: PointerEvent) => {
if (!mobileOrTablet()) return;
@@ -247,31 +248,27 @@ function useMobileDoubleTap(callback: () => void, delay = 300) {
}
const Pronouns = as<
- 'div',
+ 'span',
{
pronouns?: any[];
tagColor: string;
}
->(({ pronouns, tagColor, ...props }, ref) => {
+>(({ as: AsPronouns = 'span', pronouns, tagColor, ...props }, ref) => {
if (!pronouns || pronouns.length === 0) return null;
const clamp = (str: string, len: number) => (str.length > len ? `${str.slice(0, len)}...` : str);
const limit = mobileOrTablet() ? 1 : 3;
- const display = pronouns.slice(0, limit).map((p) => (
-
- {clamp(p.summary, 16)}
-
- ));
-
- if (pronouns.length > limit) {
- display.push(
-
- ...
-
- );
- }
- return display;
+ return (
+
+ {pronouns.slice(0, limit).map((p) => (
+
+ {clamp(p.summary, 16)}
+
+ ))}
+ {pronouns.length > limit && ...}
+
+ );
});
function MessageInternal(
From 1eb477b4b4696e68fbc5ecf2c3547aa7dde3e42a Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 16:17:22 +0100
Subject: [PATCH 16/59] fix: address eslint no-console and no-void issues
---
src/app/components/ServerConfigsLoader.tsx | 6 +++++-
src/app/features/call/SmallWidget.ts | 11 +++++++++--
.../common-settings/cosmetics/Cosmetics.tsx | 5 ++++-
src/app/features/room/RoomViewHeader.tsx | 17 ++++++++++++++---
src/app/features/room/msgContent.ts | 9 ++++++---
.../features/room/room-pin-menu/RoomPinMenu.tsx | 8 +++++++-
src/app/features/widgets/WidgetIframe.tsx | 7 ++++++-
src/app/features/widgets/WidgetsDrawer.tsx | 12 +++++++-----
src/app/pages/client/call/CallProvider.tsx | 2 +-
src/app/utils/ASCIILexicalTable.ts | 6 +++++-
src/index.tsx | 13 +++++++++++--
src/sw.ts | 6 +++---
12 files changed, 78 insertions(+), 24 deletions(-)
diff --git a/src/app/components/ServerConfigsLoader.tsx b/src/app/components/ServerConfigsLoader.tsx
index 59f75a47..e4a240c5 100644
--- a/src/app/components/ServerConfigsLoader.tsx
+++ b/src/app/components/ServerConfigsLoader.tsx
@@ -4,6 +4,7 @@ import { AsyncStatus, useAsyncCallbackValue } from '../hooks/useAsyncCallback';
import { useMatrixClient } from '../hooks/useMatrixClient';
import { MediaConfig } from '../hooks/useMediaConfig';
import { promiseFulfilledResult } from '../utils/common';
+import { createLogger } from '../utils/debug';
export type ServerConfigs = {
capabilities?: Capabilities;
@@ -14,6 +15,9 @@ export type ServerConfigs = {
type ServerConfigsLoaderProps = {
children: (configs: ServerConfigs) => ReactNode;
};
+
+const log = createLogger('ServerConfigsLoader');
+
export function ServerConfigsLoader({ children }: ServerConfigsLoaderProps) {
const mx = useMatrixClient();
const fallbackConfigs = useMemo(() => ({}), []);
@@ -34,7 +38,7 @@ export function ServerConfigsLoader({ children }: ServerConfigsLoaderProps) {
try {
validatedAuthMetadata = validateAuthMetadata(authMetadata);
} catch (e) {
- console.error(e);
+ log.error('Failed to validate auth metadata:', e);
}
return {
diff --git a/src/app/features/call/SmallWidget.ts b/src/app/features/call/SmallWidget.ts
index b90c1a2a..6257af7b 100644
--- a/src/app/features/call/SmallWidget.ts
+++ b/src/app/features/call/SmallWidget.ts
@@ -27,9 +27,12 @@ import {
WidgetApiFromWidgetAction,
WidgetKind,
} from 'matrix-widget-api';
+import { createLogger } from '$appUtils/debug';
import { CinnyWidget } from './CinnyWidget';
import { SmallWidgetDriver } from './SmallWidgetDriver';
+const log = createLogger('SmallWidget');
+
/**
* Generates the URL for the Element Call widget.
* @param mx - The MatrixClient instance.
@@ -215,7 +218,9 @@ export class SmallWidget extends EventEmitter {
private onStateUpdate = (ev: MatrixEvent): void => {
if (this.messaging === null || !ev.isState()) return;
const raw = ev.getEffectiveEvent();
- this.messaging.feedStateUpdate(raw as IRoomEvent).catch(() => null);
+ this.messaging.feedStateUpdate(raw as IRoomEvent).catch((err) => {
+ log.warn('Failed to feed widget state update:', err);
+ });
};
private onToDeviceEvent = async (ev: MatrixEvent): Promise => {
@@ -326,7 +331,9 @@ export class SmallWidget extends EventEmitter {
this.eventsToFeed.add(ev);
} else {
const raw = ev.getEffectiveEvent();
- this.messaging.feedEvent(raw as IRoomEvent).catch(() => null);
+ this.messaging.feedEvent(raw as IRoomEvent).catch((err) => {
+ log.warn('Failed to feed widget event:', err);
+ });
}
}
}
diff --git a/src/app/features/common-settings/cosmetics/Cosmetics.tsx b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
index 91141a09..343fae56 100644
--- a/src/app/features/common-settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
@@ -9,12 +9,15 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { StateEvent } from '$types/matrix/room';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
+import { createLogger } from '$appUtils/debug';
import { SequenceCardStyle } from '../styles.css';
type CosmeticsProps = {
requestClose: () => void;
};
+const log = createLogger('Cosmetics');
+
export function Cosmetics({ requestClose }: CosmeticsProps) {
const mx = useMatrixClient();
const room = useRoom();
@@ -41,7 +44,7 @@ export function Cosmetics({ requestClose }: CosmeticsProps) {
try {
await mx.sendStateEvent(room.roomId, StateEvent.RoomPowerLevels as any, newContent, '');
} catch (e) {
- console.error(`Failed to update permissions for ${eventType}:`, e);
+ log.error(`Failed to update permissions for ${eventType}:`, e);
}
},
[mx, room.roomId, powerLevels]
diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx
index 47e403a1..2ea1bbce 100644
--- a/src/app/features/room/RoomViewHeader.tsx
+++ b/src/app/features/room/RoomViewHeader.tsx
@@ -37,6 +37,7 @@ import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { useSpaceOptionally } from '$hooks/useSpace';
import { getHomeSearchPath, getSpaceSearchPath, withSearchParam } from '$pages/pathUtils';
+import { createLogger } from '$appUtils/debug';
import { getCanonicalAliasOrRoomId, isRoomAlias, mxcUrlToHttp } from '$appUtils/matrix';
import { _SearchPathSearchParams } from '$pages/paths';
import { useRoomUnread } from '$state/hooks/unread';
@@ -72,6 +73,8 @@ import { JumpToTime } from './jump-to-time';
import { RoomPinMenu } from './room-pin-menu';
import * as css from './RoomViewHeader.css';
+const log = createLogger('RoomViewHeader');
+
async function getPinsHash(pinnedIds: string[]): Promise {
const sorted = [...pinnedIds].sort().join(',');
const encoder = new TextEncoder();
@@ -306,7 +309,11 @@ export function RoomViewHeader() {
const [currentHash, setCurrentHash] = useState('');
useEffect(() => {
- void getPinsHash(pinnedIds).then(setCurrentHash);
+ getPinsHash(pinnedIds)
+ .then(setCurrentHash)
+ .catch((err) => {
+ log.warn('Failed to compute pins hash:', err);
+ });
}, [pinnedIds]);
useEffect(() => {
@@ -334,7 +341,9 @@ export function RoomViewHeader() {
setUnreadPinsCount(Math.max(0, newCount));
}
};
- void checkUnreads();
+ checkUnreads().catch((err) => {
+ log.warn('Failed to check unread pins:', err);
+ });
}, [pinnedIds, pinMarker]);
const handleSearchClick = () => {
@@ -365,7 +374,9 @@ export function RoomViewHeader() {
});
};
- void updateMarker();
+ updateMarker().catch((err) => {
+ log.warn('Failed to update pin marker:', err);
+ });
};
return (
diff --git a/src/app/features/room/msgContent.ts b/src/app/features/room/msgContent.ts
index 4691704b..028148d8 100644
--- a/src/app/features/room/msgContent.ts
+++ b/src/app/features/room/msgContent.ts
@@ -17,6 +17,9 @@ import { encryptFile, getImageInfo, getThumbnailContent, getVideoInfo } from '$a
import { TUploadItem } from '$state/room/roomInputDrafts';
import { encodeBlurHash } from '$appUtils/blurHash';
import { scaleYDimension } from '$appUtils/common';
+import { createLogger } from '$appUtils/debug';
+
+const log = createLogger('msgContent');
const generateThumbnailContent = async (
mx: MatrixClient,
@@ -50,7 +53,7 @@ export const getImageMsgContent = async (
): Promise => {
const { file, originalFile, encInfo, metadata } = item;
const [imgError, imgEl] = await to(loadImageElement(getImageFileUrl(originalFile)));
- if (imgError) console.warn(imgError);
+ if (imgError) log.warn('Failed to load image element:', imgError);
const content: IContent = {
msgtype: MsgType.Image,
@@ -85,7 +88,7 @@ export const getVideoMsgContent = async (
const { file, originalFile, encInfo, metadata } = item;
const [videoError, videoEl] = await to(loadVideoElement(getVideoFileUrl(originalFile)));
- if (videoError) console.warn(videoError);
+ if (videoError) log.warn('Failed to load video element:', videoError);
const content: IContent = {
msgtype: MsgType.Video,
@@ -109,7 +112,7 @@ export const getVideoMsgContent = async (
scaleYDimension(videoEl.videoWidth, 512, videoEl.videoHeight)
);
}
- if (thumbError) console.warn(thumbError);
+ if (thumbError) log.warn('Failed to generate video thumbnail:', thumbError);
content.info = {
...getVideoInfo(videoEl, file),
...thumbContent,
diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
index 959e24f7..4900414f 100644
--- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
+++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react/no-unused-prop-types */
import { forwardRef, MouseEventHandler, ReactNode, useCallback, useMemo, useRef } from 'react';
import { MatrixEvent, Room, RoomPinnedEventsEventContent } from '$types/matrix-sdk';
import {
@@ -20,6 +21,7 @@ import { Opts as LinkifyOpts } from 'linkifyjs';
import { HTMLReactParserOptions } from 'html-react-parser';
import { useAtomValue } from 'jotai';
import { useVirtualizer } from '@tanstack/react-virtual';
+import { createLogger } from '$appUtils/debug';
import { useRoomPinnedEvents } from '$hooks/useRoomPinnedEvents';
import { SequenceCard } from '$components/sequence-card';
import { useRoomEvent } from '$hooks/useRoomEvent';
@@ -88,6 +90,8 @@ import { EncryptedContent } from '../message';
import * as css from './RoomPinMenu.css';
import { PinReadMarker } from '../RoomViewHeader';
+const log = createLogger('RoomPinMenu');
+
type PinnedMessageProps = {
room: Room;
eventId: string;
@@ -215,7 +219,9 @@ function PinnedMessage(props: PinnedMessageProps) {
const handleUnpinClick: MouseEventHandler = useCallback(
(evt) => {
evt.stopPropagation();
- void unpin();
+ unpin().catch((err) => {
+ log.warn('Failed to unpin room event:', err);
+ });
},
[unpin]
);
diff --git a/src/app/features/widgets/WidgetIframe.tsx b/src/app/features/widgets/WidgetIframe.tsx
index 0017ebb1..2fd4c2ad 100644
--- a/src/app/features/widgets/WidgetIframe.tsx
+++ b/src/app/features/widgets/WidgetIframe.tsx
@@ -8,9 +8,12 @@ import {
MatrixEvent,
MatrixEventEvent,
} from '$types/matrix-sdk';
+import { createLogger } from '$appUtils/debug';
import { resolveWidgetUrl } from '$hooks/useRoomWidgets';
import { GenericWidgetDriver, CapabilityApprovalCallback } from './GenericWidgetDriver';
+const log = createLogger('WidgetIframe');
+
interface WidgetIframeProps {
widget: IWidget;
roomId: string;
@@ -95,7 +98,9 @@ export function WidgetIframe({ widget, roomId, mx, onCapabilityRequest }: Widget
if (!messagingRef.current) return;
if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
const raw = ev.getEffectiveEvent();
- messagingRef.current.feedEvent(raw as IRoomEvent).catch(() => null);
+ messagingRef.current.feedEvent(raw as IRoomEvent).catch((err) => {
+ log.warn('Failed to feed widget iframe event:', err);
+ });
};
const onEvent = (ev: MatrixEvent): void => {
diff --git a/src/app/features/widgets/WidgetsDrawer.tsx b/src/app/features/widgets/WidgetsDrawer.tsx
index bf26625c..06993f12 100644
--- a/src/app/features/widgets/WidgetsDrawer.tsx
+++ b/src/app/features/widgets/WidgetsDrawer.tsx
@@ -25,17 +25,19 @@ import { usePowerLevelsContext } from '$hooks/usePowerLevels';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
import { StateEvent } from '$types/matrix/room';
+import { createLogger } from '$appUtils/debug';
import { WidgetIframe } from './WidgetIframe';
import * as css from './WidgetsDrawer.css';
import { IntegrationManager } from './IntegrationManager';
type WidgetsDrawerHeaderProps = {
- room: Room;
activeWidget: RoomWidget | null;
onBack: () => void;
};
-function WidgetDrawerHeader({ room, activeWidget, onBack }: WidgetsDrawerHeaderProps) {
+const log = createLogger('WidgetsDrawer');
+
+function WidgetDrawerHeader({ activeWidget, onBack }: WidgetsDrawerHeaderProps) {
const setWidgetDrawer = useSetSetting(settingsAtom, 'isWidgetDrawer');
return (
@@ -114,7 +116,7 @@ function AddWidgetForm({ room, onAdded }: AddWidgetFormProps) {
setUrl('');
onAdded();
} catch (err) {
- console.error('Failed to add widget:', err);
+ log.error('Failed to add widget:', err);
} finally {
setAdding(false);
}
@@ -231,7 +233,7 @@ export function WidgetsDrawer({ room }: WidgetsDrawerProps) {
setActiveWidget(null);
}
} catch (err) {
- console.error('Failed to remove widget:', err);
+ log.error('Failed to remove widget:', err);
}
};
@@ -239,7 +241,7 @@ export function WidgetsDrawer({ room }: WidgetsDrawerProps) {
return (
-
+
{activeWidget ? (
diff --git a/src/app/pages/client/call/CallProvider.tsx b/src/app/pages/client/call/CallProvider.tsx
index f2b98192..15eca53c 100644
--- a/src/app/pages/client/call/CallProvider.tsx
+++ b/src/app/pages/client/call/CallProvider.tsx
@@ -255,7 +255,7 @@ export function CallProvider({ children }: CallProviderProps) {
setIsActiveCallReady(true);
};
- void sendWidgetAction(WIDGET_MEDIA_STATE_UPDATE_ACTION, {
+ sendWidgetAction(WIDGET_MEDIA_STATE_UPDATE_ACTION, {
audio_enabled: isAudioEnabled,
video_enabled: isVideoEnabled,
}).catch(() => {
diff --git a/src/app/utils/ASCIILexicalTable.ts b/src/app/utils/ASCIILexicalTable.ts
index 61b2481a..3dcd43d0 100644
--- a/src/app/utils/ASCIILexicalTable.ts
+++ b/src/app/utils/ASCIILexicalTable.ts
@@ -1,3 +1,7 @@
+import { createLogger } from './debug';
+
+const log = createLogger('ASCIILexicalTable');
+
export class ASCIILexicalTable {
readonly startCode: number;
@@ -36,7 +40,7 @@ export class ASCIILexicalTable {
this.populateWidthToSize();
if (this.size() > Number.MAX_SAFE_INTEGER) {
- console.warn(
+ log.warn(
`[!] Warning: ASCIILexicalTable size is larger than the Number.MAX_SAFE_INTEGER: ${this.size()} > ${
Number.MAX_SAFE_INTEGER
}`
diff --git a/src/index.tsx b/src/index.tsx
index 556bea62..3c64f7a3 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -26,9 +26,11 @@ import {
Sessions,
ACTIVE_SESSION_KEY,
} from './app/state/sessions';
+import { createLogger } from './app/utils/debug';
import { getLocalStorageItem } from './app/state/utils/atomWithLocalStorage';
enableMapSet();
+const log = createLogger('index');
document.body.classList.add(configClass, varsClass);
@@ -48,8 +50,15 @@ if ('serviceWorker' in navigator) {
pushSessionToSW(active?.baseUrl, active?.accessToken);
};
- void navigator.serviceWorker.register(swUrl).then(sendSessionToSW);
- void navigator.serviceWorker.ready.then(sendSessionToSW);
+ navigator.serviceWorker
+ .register(swUrl)
+ .then(sendSessionToSW)
+ .catch((err) => {
+ log.warn('SW registration failed:', err);
+ });
+ navigator.serviceWorker.ready.then(sendSessionToSW).catch((err) => {
+ log.warn('SW ready failed:', err);
+ });
navigator.serviceWorker.addEventListener('message', (ev) => {
const { data } = ev;
diff --git a/src/sw.ts b/src/sw.ts
index e7cc6d9d..afd2e07a 100644
--- a/src/sw.ts
+++ b/src/sw.ts
@@ -76,8 +76,8 @@ async function requestSessionWithTimeout(
return Promise.race([sessionPromise, timeout]);
}
-self.addEventListener('install', () => {
- void self.skipWaiting();
+self.addEventListener('install', (event: ExtendableEvent) => {
+ event.waitUntil(self.skipWaiting());
});
self.addEventListener('activate', (event: ExtendableEvent) => {
@@ -102,7 +102,7 @@ self.addEventListener('message', (event: ExtendableMessageEvent) => {
if (type === 'setSession') {
setSession(client.id, accessToken, baseUrl);
- void cleanupDeadClients();
+ event.waitUntil(cleanupDeadClients());
}
});
From ee712e74c55375062cbfd22606a88bd08a3804c6 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 17:59:53 +0100
Subject: [PATCH 17/59] refactor: align megolm export encryption with
element-web
---
.../features/settings/devices/LocalBackup.tsx | 24 +-
...ERoomKeys.js => MegolmExportEncryption.ts} | 277 ++++++++++--------
2 files changed, 173 insertions(+), 128 deletions(-)
rename src/util/{cryptE2ERoomKeys.js => MegolmExportEncryption.ts} (64%)
diff --git a/src/app/features/settings/devices/LocalBackup.tsx b/src/app/features/settings/devices/LocalBackup.tsx
index d1ba2e6b..ec8e5417 100644
--- a/src/app/features/settings/devices/LocalBackup.tsx
+++ b/src/app/features/settings/devices/LocalBackup.tsx
@@ -7,16 +7,30 @@ import { PasswordInput } from '$components/password-input';
import { ConfirmPasswordMatch } from '$components/ConfirmPasswordMatch';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { decryptMegolmKeyFile, encryptMegolmKeyFile } from '$util/cryptE2ERoomKeys';
+import {
+ decryptMegolmKeyFile,
+ encryptMegolmKeyFile,
+ type FriendlyError,
+} from '$util/MegolmExportEncryption';
import { useAlive } from '$hooks/useAlive';
import { useFilePicker } from '$hooks/useFilePicker';
import { SequenceCardStyle } from '../styles.css';
+type LocalBackupError = Error | FriendlyError;
+
+function getErrorMessage(error: LocalBackupError): string {
+ if ('friendlyText' in error) {
+ return error.friendlyText;
+ }
+
+ return error.message;
+}
+
function ExportKeys() {
const mx = useMatrixClient();
const alive = useAlive();
- const [exportState, exportKeys] = useAsyncCallback(
+ const [exportState, exportKeys] = useAsyncCallback(
useCallback(
async (password) => {
const crypto = mx.getCrypto();
@@ -113,7 +127,7 @@ function ExportKeys() {
{exportState.status === AsyncStatus.Error && (
- {exportState.error.message}
+ {getErrorMessage(exportState.error)}
)}
@@ -163,7 +177,7 @@ function ImportKeys({ file, onDone }: ImportKeysProps) {
const mx = useMatrixClient();
const alive = useAlive();
- const [decryptState, decryptFile] = useAsyncCallback(
+ const [decryptState, decryptFile] = useAsyncCallback(
useCallback(
async (password) => {
const crypto = mx.getCrypto();
@@ -237,7 +251,7 @@ function ImportKeys({ file, onDone }: ImportKeysProps) {
{decryptState.status === AsyncStatus.Error && (
- {decryptState.error.message}
+ {getErrorMessage(decryptState.error)}
)}
diff --git a/src/util/cryptE2ERoomKeys.js b/src/util/MegolmExportEncryption.ts
similarity index 64%
rename from src/util/cryptE2ERoomKeys.js
rename to src/util/MegolmExportEncryption.ts
index bfa0101d..7a427771 100644
--- a/src/util/cryptE2ERoomKeys.js
+++ b/src/util/MegolmExportEncryption.ts
@@ -1,109 +1,38 @@
-// https://github.com/matrix-org/matrix-react-sdk/blob/e78a1adb6f1af2ea425b0bae9034fb7344a4b2e8/src/utils/MegolmExportEncryption.js
+/* eslint-disable no-bitwise */
+/* eslint-disable no-plusplus */
+// https://github.com/element-hq/element-web/blob/a5b63d582fde59ea4dd3c7fdcad7266ab70dd695/apps/web/src/utils/MegolmExportEncryption.ts
-const subtleCrypto = window.crypto.subtle || window.crypto.webkitSubtle;
+import { createLogger } from '$appUtils/debug';
+
+const logger = createLogger('MegolmExportEncryption');
+const subtleCrypto = window.crypto.subtle;
+
+export type FriendlyError = {
+ message: string;
+ friendlyText: string;
+};
/**
* Make an Error object which has a friendlyText property which is already
* translated and suitable for showing to the user.
*
- * @param {string} msg message for the exception
+ * @param {string} message message for the exception
* @param {string} friendlyText
- * @returns {Error}
+ * @returns {{message: string, friendlyText: string}}
*/
-function friendlyError(msg, friendlyText) {
- const e = new Error(msg);
- e.friendlyText = friendlyText;
- return e;
+function friendlyError(message: string, friendlyText: string): FriendlyError {
+ return { message, friendlyText };
}
-function cryptoFailMsg() {
+function cryptoFailMsg(): string {
return 'Your browser does not support the required cryptography extensions';
}
-/**
- * Derive the AES and HMAC-SHA-256 keys for the file
- *
- * @param {Unit8Array} salt salt for pbkdf
- * @param {Number} iterations number of pbkdf iterations
- * @param {String} password password
- * @return {Promise<[CryptoKey, CryptoKey]>} promise for [aes key, hmac key]
- */
-async function deriveKeys(salt, iterations, password) {
- const start = new Date();
- let key;
- try {
- key = await subtleCrypto.importKey(
- 'raw',
- new TextEncoder().encode(password),
- { name: 'PBKDF2' },
- false,
- ['deriveBits']
- );
- } catch (e) {
- throw friendlyError(`subtleCrypto.importKey failed: ${e}`, cryptoFailMsg());
- }
-
- let keybits;
- try {
- keybits = await subtleCrypto.deriveBits(
- {
- name: 'PBKDF2',
- salt,
- iterations,
- hash: 'SHA-512',
- },
- key,
- 512
- );
- } catch (e) {
- throw friendlyError(`subtleCrypto.deriveBits failed: ${e}`, cryptoFailMsg());
- }
-
- const now = new Date();
- console.log(`E2e import/export: deriveKeys took ${now - start}ms`);
-
- const aesKey = keybits.slice(0, 32);
- const hmacKey = keybits.slice(32);
-
- const aesProm = subtleCrypto
- .importKey('raw', aesKey, { name: 'AES-CTR' }, false, ['encrypt', 'decrypt'])
- .catch((e) => {
- throw friendlyError(`subtleCrypto.importKey failed for AES key: ${e}`, cryptoFailMsg());
- });
-
- const hmacProm = subtleCrypto
- .importKey(
- 'raw',
- hmacKey,
- {
- name: 'HMAC',
- hash: { name: 'SHA-256' },
- },
- false,
- ['sign', 'verify']
- )
- .catch((e) => {
- throw friendlyError(`subtleCrypto.importKey failed for HMAC key: ${e}`, cryptoFailMsg());
- });
-
- // eslint-disable-next-line no-return-await
- return await Promise.all([aesProm, hmacProm]);
-}
-
-/**
- * Decode a base64 string to a typed array of uint8.
- * @param {string} base64 The base64 to decode.
- * @return {Uint8Array} The decoded data.
- */
-function decodeBase64(base64) {
- // window.atob returns a unicode string with codepoints in the range 0-255.
- const latin1String = window.atob(base64);
- // Encode the string as a Uint8Array
- const uint8Array = new Uint8Array(latin1String.length);
- for (let i = 0; i < latin1String.length; i += 1) {
- uint8Array[i] = latin1String.charCodeAt(i);
- }
- return uint8Array;
+function toArrayBufferView(data: Uint8Array): Uint8Array {
+ const buffer = new ArrayBuffer(data.byteLength);
+ const view = new Uint8Array(buffer);
+ view.set(data);
+ return view;
}
/**
@@ -111,14 +40,30 @@ function decodeBase64(base64) {
* @param {Uint8Array} uint8Array The data to encode.
* @return {string} The base64.
*/
-function encodeBase64(uint8Array) {
+function encodeBase64(uint8Array: Uint8Array): string {
// Misinterpt the Uint8Array as Latin-1.
// window.btoa expects a unicode string with codepoints in the range 0-255.
- const latin1String = String.fromCharCode.apply(null, uint8Array);
+ const latin1String = String.fromCharCode.apply(null, Array.from(uint8Array));
// Use the builtin base64 encoder.
return window.btoa(latin1String);
}
+/**
+ * Decode a base64 string to a typed array of uint8.
+ * @param {string} base64 The base64 to decode.
+ * @return {Uint8Array} The decoded data.
+ */
+function decodeBase64(base64: string): Uint8Array {
+ // window.atob returns a unicode string with codepoints in the range 0-255.
+ const latin1String = window.atob(base64);
+ // Encode the string as a Uint8Array
+ const uint8Array = new Uint8Array(new ArrayBuffer(latin1String.length));
+ for (let i = 0; i < latin1String.length; i += 1) {
+ uint8Array[i] = latin1String.charCodeAt(i);
+ }
+ return uint8Array;
+}
+
const HEADER_LINE = '-----BEGIN MEGOLM SESSION DATA-----';
const TRAILER_LINE = '-----END MEGOLM SESSION DATA-----';
@@ -130,7 +75,7 @@ const TRAILER_LINE = '-----END MEGOLM SESSION DATA-----';
* @param {ArrayBuffer} data input file
* @return {Uint8Array} unbase64ed content
*/
-function unpackMegolmKeyFile(data) {
+function unpackMegolmKeyFile(data: ArrayBuffer): Uint8Array {
// parse the file as a great big String. This should be safe, because there
// should be no non-ASCII characters, and it means that we can do string
// comparisons to find the header and footer, and feed it into window.atob.
@@ -138,6 +83,7 @@ function unpackMegolmKeyFile(data) {
// look for the start line
let lineStart = 0;
+ // eslint-disable-next-line no-constant-condition
while (1) {
const lineEnd = fileStr.indexOf('\n', lineStart);
if (lineEnd < 0) {
@@ -156,6 +102,7 @@ function unpackMegolmKeyFile(data) {
const dataStart = lineStart;
// look for the end line
+ // eslint-disable-next-line no-constant-condition
while (1) {
const lineEnd = fileStr.indexOf('\n', lineStart);
const line = fileStr.slice(lineStart, lineEnd < 0 ? undefined : lineEnd).trim();
@@ -183,12 +130,12 @@ function unpackMegolmKeyFile(data) {
* @param {Uint8Array} data raw data
* @return {ArrayBuffer} formatted file
*/
-function packMegolmKeyFile(data) {
+function packMegolmKeyFile(data: Uint8Array): ArrayBuffer {
// we split into lines before base64ing, because encodeBase64 doesn't deal
// terribly well with large arrays.
const LINE_LENGTH = (72 * 4) / 3;
const nLines = Math.ceil(data.length / LINE_LENGTH);
- const lines = new Array(nLines + 3);
+ const lines = new Array(nLines + 3);
lines[0] = HEADER_LINE;
let o = 0;
let i;
@@ -196,13 +143,93 @@ function packMegolmKeyFile(data) {
lines[i] = encodeBase64(data.subarray(o, o + LINE_LENGTH));
o += LINE_LENGTH;
}
- lines[i] = TRAILER_LINE;
- i += 1;
+ lines[i++] = TRAILER_LINE;
lines[i] = '';
return new TextEncoder().encode(lines.join('\n')).buffer;
}
-export async function decryptMegolmKeyFile(data, password) {
+/**
+ * Derive the AES and HMAC-SHA-256 keys for the file
+ *
+ * @param {Unit8Array} salt salt for pbkdf
+ * @param {Number} iterations number of pbkdf iterations
+ * @param {String} password password
+ * @return {Promise<[CryptoKey, CryptoKey]>} promise for [aes key, hmac key]
+ */
+async function deriveKeys(
+ salt: Uint8Array,
+ iterations: number,
+ password: string
+): Promise<[CryptoKey, CryptoKey]> {
+ const start = new Date();
+
+ let key;
+ try {
+ key = await subtleCrypto.importKey(
+ 'raw',
+ new TextEncoder().encode(password),
+ { name: 'PBKDF2' },
+ false,
+ ['deriveBits']
+ );
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.importKey failed: ${error}`, cryptoFailMsg());
+ }
+
+ let keyBits;
+ try {
+ keyBits = await subtleCrypto.deriveBits(
+ {
+ name: 'PBKDF2',
+ salt,
+ iterations,
+ hash: 'SHA-512',
+ },
+ key,
+ 512
+ );
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.deriveBits failed: ${error}`, cryptoFailMsg());
+ }
+
+ const now = new Date();
+ logger.log(`E2e import/export: deriveKeys took ${now.getTime() - start.getTime()}ms`);
+
+ const aesKey = keyBits.slice(0, 32);
+ const hmacKey = keyBits.slice(32);
+
+ const aesProm = subtleCrypto
+ .importKey('raw', aesKey, { name: 'AES-CTR' }, false, ['encrypt', 'decrypt'])
+ .catch((error) => {
+ throw friendlyError(`subtleCrypto.importKey failed for AES key: ${error}`, cryptoFailMsg());
+ });
+
+ const hmacProm = subtleCrypto
+ .importKey(
+ 'raw',
+ hmacKey,
+ {
+ name: 'HMAC',
+ hash: { name: 'SHA-256' },
+ },
+ false,
+ ['sign', 'verify']
+ )
+ .catch((error) => {
+ throw friendlyError(`subtleCrypto.importKey failed for HMAC key: ${error}`, cryptoFailMsg());
+ });
+
+ return Promise.all([aesProm, hmacProm]);
+}
+
+/**
+ * Decrypt a megolm key file
+ *
+ * @param {ArrayBuffer} data file to decrypt
+ * @param {String} password
+ * @return {Promise} promise for decrypted output
+ */
+export async function decryptMegolmKeyFile(data: ArrayBuffer, password: string): Promise {
const body = unpackMegolmKeyFile(data);
// check we have a version byte
@@ -220,20 +247,20 @@ export async function decryptMegolmKeyFile(data, password) {
throw friendlyError('Invalid file: too short', 'Not a valid keyfile');
}
- const salt = body.subarray(1, 1 + 16);
- const iv = body.subarray(17, 17 + 16);
- const iterations = (body[33] << 24) | (body[34] << 16) | (body[35] << 8) | body[36];
- const ciphertext = body.subarray(37, 37 + ciphertextLength);
- const hmac = body.subarray(-32);
+ const salt = toArrayBufferView(body.subarray(1, 17));
+ const iv = toArrayBufferView(body.subarray(17, 33));
+ const iterations = new DataView(body.buffer, body.byteOffset + 33, 4).getInt32(0);
+ const ciphertext = toArrayBufferView(body.subarray(37, 37 + ciphertextLength));
+ const hmac = toArrayBufferView(body.subarray(-32));
const [aesKey, hmacKey] = await deriveKeys(salt, iterations, password);
- const toVerify = body.subarray(0, -32);
+ const toVerify = toArrayBufferView(body.subarray(0, -32));
let isValid;
try {
isValid = await subtleCrypto.verify({ name: 'HMAC' }, hmacKey, hmac, toVerify);
- } catch (e) {
- throw friendlyError(`subtleCrypto.verify failed: ${e}`, cryptoFailMsg());
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.verify failed: ${error}`, cryptoFailMsg());
}
if (!isValid) {
throw friendlyError('hmac mismatch', 'Authentication check failed: Incorrect password?');
@@ -250,8 +277,8 @@ export async function decryptMegolmKeyFile(data, password) {
aesKey,
ciphertext
);
- } catch (e) {
- throw friendlyError(`subtleCrypto.decrypt failed: ${e}`, cryptoFailMsg());
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.decrypt failed: ${error}`, cryptoFailMsg());
}
return new TextDecoder().decode(new Uint8Array(plaintext));
@@ -267,14 +294,18 @@ export async function decryptMegolmKeyFile(data, password) {
* key-derivation function.
* @return {Promise} promise for encrypted output
*/
-export async function encryptMegolmKeyFile(data, password, options) {
- options = options || {};
- const kdfRounds = options.kdf_rounds || 500000;
+export async function encryptMegolmKeyFile(
+ data: string,
+ password: string,
+ options?: { kdf_rounds?: number }
+): Promise {
+ const normalizedOptions = options ?? {};
+ const kdfRounds = normalizedOptions.kdf_rounds || 500000;
- const salt = new Uint8Array(16);
+ const salt = new Uint8Array(new ArrayBuffer(16));
window.crypto.getRandomValues(salt);
- const iv = new Uint8Array(16);
+ const iv = new Uint8Array(new ArrayBuffer(16));
window.crypto.getRandomValues(iv);
// clear bit 63 of the IV to stop us hitting the 64-bit counter boundary
@@ -283,7 +314,7 @@ export async function encryptMegolmKeyFile(data, password, options) {
iv[8] &= 0x7f;
const [aesKey, hmacKey] = await deriveKeys(salt, kdfRounds, password);
- const encodedData = new TextEncoder().encode(data);
+ const encodedData = toArrayBufferView(new TextEncoder().encode(data));
let ciphertext;
try {
@@ -296,13 +327,13 @@ export async function encryptMegolmKeyFile(data, password, options) {
aesKey,
encodedData
);
- } catch (e) {
- throw friendlyError(`subtleCrypto.encrypt failed: ${e}`, cryptoFailMsg());
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.encrypt failed: ${error}`, cryptoFailMsg());
}
const cipherArray = new Uint8Array(ciphertext);
const bodyLength = 1 + salt.length + iv.length + 4 + cipherArray.length + 32;
- const resultBuffer = new Uint8Array(bodyLength);
+ const resultBuffer = new Uint8Array(new ArrayBuffer(bodyLength));
let idx = 0;
resultBuffer[idx++] = 1; // version
resultBuffer.set(salt, idx);
@@ -316,13 +347,13 @@ export async function encryptMegolmKeyFile(data, password, options) {
resultBuffer.set(cipherArray, idx);
idx += cipherArray.length;
- const toSign = resultBuffer.subarray(0, idx);
+ const toSign = toArrayBufferView(resultBuffer.subarray(0, idx));
let hmac;
try {
hmac = await subtleCrypto.sign({ name: 'HMAC' }, hmacKey, toSign);
- } catch (e) {
- throw friendlyError(`subtleCrypto.sign failed: ${e}`, cryptoFailMsg());
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.sign failed: ${error}`, cryptoFailMsg());
}
const hmacArray = new Uint8Array(hmac);
From 3a5b3e2b51d878518256b00397d0d0dd9f5a2f5d Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 18:03:10 +0100
Subject: [PATCH 18/59] refactor: convert colorMXID util to TypeScript
---
src/util/{colorMXID.js => colorMXID.ts} | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
rename src/util/{colorMXID.js => colorMXID.ts} (63%)
diff --git a/src/util/colorMXID.js b/src/util/colorMXID.ts
similarity index 63%
rename from src/util/colorMXID.js
rename to src/util/colorMXID.ts
index fedc313c..6b40b959 100644
--- a/src/util/colorMXID.js
+++ b/src/util/colorMXID.ts
@@ -1,14 +1,12 @@
// https://github.com/cloudrac3r/cadencegq/blob/master/pug/mxid.pug
-function hashCode(str) {
+function hashCode(str?: string): number {
let hash = 0;
- let i;
- let chr;
- if (str == undefined || str.length === 0) {
+ if (str === undefined || str.length === 0) {
return hash;
}
- for (i = 0; i < str.length; i += 1) {
- chr = str.charCodeAt(i);
+ for (let i = 0; i < str.length; i += 1) {
+ const chr = str.charCodeAt(i);
// eslint-disable-next-line no-bitwise
hash = (hash << 5) - hash + chr;
// eslint-disable-next-line no-bitwise
@@ -17,12 +15,12 @@ function hashCode(str) {
return Math.abs(hash);
}
-export function cssColorMXID(userId) {
+export function cssColorMXID(userId?: string): string {
const colorNumber = hashCode(userId) % 8;
return `--mx-uc-${colorNumber + 1}`;
}
-export default function colorMXID(userId) {
+export default function colorMXID(userId?: string): string {
const hash = hashCode(userId);
const h = hash % 360;
From fa4777b1a62d65e34f0879b920b6c2dfb6d3a4d8 Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 18:06:03 +0100
Subject: [PATCH 19/59] refactor: move shared utils into app utils
---
src/app/components/room-avatar/RoomAvatar.tsx | 2 +-
src/app/components/user-avatar/UserAvatar.tsx | 2 +-
src/app/components/user-profile/UserHero.tsx | 2 +-
src/app/features/message-search/SearchResultGroup.tsx | 2 +-
src/app/features/settings/devices/LocalBackup.tsx | 2 +-
src/app/hooks/useUserProfile.ts | 2 +-
src/app/pages/client/inbox/Notifications.tsx | 2 +-
src/{util => app/utils}/MegolmExportEncryption.ts | 2 +-
src/{util => app/utils}/colorMXID.ts | 0
9 files changed, 8 insertions(+), 8 deletions(-)
rename src/{util => app/utils}/MegolmExportEncryption.ts (99%)
rename src/{util => app/utils}/colorMXID.ts (100%)
diff --git a/src/app/components/room-avatar/RoomAvatar.tsx b/src/app/components/room-avatar/RoomAvatar.tsx
index ecf85972..856ce62a 100644
--- a/src/app/components/room-avatar/RoomAvatar.tsx
+++ b/src/app/components/room-avatar/RoomAvatar.tsx
@@ -2,7 +2,7 @@ import { JoinRule } from '$types/matrix-sdk';
import { AvatarFallback, AvatarImage, Icon, Icons, color } from 'folds';
import { ComponentProps, ReactEventHandler, ReactNode, forwardRef, useState } from 'react';
import { getRoomIconSrc } from '$appUtils/room';
-import colorMXID from '$util/colorMXID';
+import colorMXID from '$appUtils/colorMXID';
import * as css from './RoomAvatar.css';
type RoomAvatarProps = {
diff --git a/src/app/components/user-avatar/UserAvatar.tsx b/src/app/components/user-avatar/UserAvatar.tsx
index 51dc2d87..cdc5194b 100644
--- a/src/app/components/user-avatar/UserAvatar.tsx
+++ b/src/app/components/user-avatar/UserAvatar.tsx
@@ -1,7 +1,7 @@
import { AvatarFallback, AvatarImage, color } from 'folds';
import { ReactEventHandler, ReactNode, useState } from 'react';
import classNames from 'classnames';
-import colorMXID from '$util/colorMXID';
+import colorMXID from '$appUtils/colorMXID';
import * as css from './UserAvatar.css';
type UserAvatarProps = {
diff --git a/src/app/components/user-profile/UserHero.tsx b/src/app/components/user-profile/UserHero.tsx
index 6f89effe..43b90d08 100644
--- a/src/app/components/user-profile/UserHero.tsx
+++ b/src/app/components/user-profile/UserHero.tsx
@@ -12,7 +12,7 @@ import {
} from 'folds';
import classNames from 'classnames';
import FocusTrap from 'focus-trap-react';
-import colorMXID from '$util/colorMXID';
+import colorMXID from '$appUtils/colorMXID';
import { getMxIdLocalPart } from '$appUtils/matrix';
import { BreakWord, LineClamp3 } from '$styles/Text.css';
import { UserPresence } from '$hooks/useUserPresence';
diff --git a/src/app/features/message-search/SearchResultGroup.tsx b/src/app/features/message-search/SearchResultGroup.tsx
index 8ad37ce9..7fa39fd4 100644
--- a/src/app/features/message-search/SearchResultGroup.tsx
+++ b/src/app/features/message-search/SearchResultGroup.tsx
@@ -44,7 +44,7 @@ import { usePowerLevels } from '$hooks/usePowerLevels';
import { usePowerLevelTags } from '$hooks/usePowerLevelTags';
import { useTheme } from '$hooks/useTheme';
import { PowerIcon } from '$components/power';
-import colorMXID from '$util/colorMXID';
+import colorMXID from '$appUtils/colorMXID';
import {
getPowerTagIconSrc,
useAccessiblePowerTagColors,
diff --git a/src/app/features/settings/devices/LocalBackup.tsx b/src/app/features/settings/devices/LocalBackup.tsx
index ec8e5417..c2275ba7 100644
--- a/src/app/features/settings/devices/LocalBackup.tsx
+++ b/src/app/features/settings/devices/LocalBackup.tsx
@@ -11,7 +11,7 @@ import {
decryptMegolmKeyFile,
encryptMegolmKeyFile,
type FriendlyError,
-} from '$util/MegolmExportEncryption';
+} from '$appUtils/MegolmExportEncryption';
import { useAlive } from '$hooks/useAlive';
import { useFilePicker } from '$hooks/useFilePicker';
import { SequenceCardStyle } from '../styles.css';
diff --git a/src/app/hooks/useUserProfile.ts b/src/app/hooks/useUserProfile.ts
index 5cf5b730..3945ac0f 100644
--- a/src/app/hooks/useUserProfile.ts
+++ b/src/app/hooks/useUserProfile.ts
@@ -3,7 +3,7 @@ import { useAtomValue, useSetAtom } from 'jotai';
import { selectAtom } from 'jotai/utils';
import { EventTimeline, Room } from '$types/matrix-sdk';
import { StateEvent } from '$types/matrix/room';
-import colorMXID from '$util/colorMXID';
+import colorMXID from '$appUtils/colorMXID';
import { useMatrixClient } from './useMatrixClient';
import { profilesCacheAtom } from '../state/userRoomProfile';
import { useSetting } from '../state/hooks/settings';
diff --git a/src/app/pages/client/inbox/Notifications.tsx b/src/app/pages/client/inbox/Notifications.tsx
index edfdae61..34d81c4f 100644
--- a/src/app/pages/client/inbox/Notifications.tsx
+++ b/src/app/pages/client/inbox/Notifications.tsx
@@ -89,7 +89,7 @@ import { usePowerLevels } from '$hooks/usePowerLevels';
import { usePowerLevelTags } from '$hooks/usePowerLevelTags';
import { useTheme } from '$hooks/useTheme';
import { PowerIcon } from '$components/power';
-import colorMXID from '$util/colorMXID';
+import colorMXID from '$appUtils/colorMXID';
import { mDirectAtom } from '$state/mDirectList';
import {
getPowerTagIconSrc,
diff --git a/src/util/MegolmExportEncryption.ts b/src/app/utils/MegolmExportEncryption.ts
similarity index 99%
rename from src/util/MegolmExportEncryption.ts
rename to src/app/utils/MegolmExportEncryption.ts
index 7a427771..896a8d9d 100644
--- a/src/util/MegolmExportEncryption.ts
+++ b/src/app/utils/MegolmExportEncryption.ts
@@ -2,7 +2,7 @@
/* eslint-disable no-plusplus */
// https://github.com/element-hq/element-web/blob/a5b63d582fde59ea4dd3c7fdcad7266ab70dd695/apps/web/src/utils/MegolmExportEncryption.ts
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from './debug';
const logger = createLogger('MegolmExportEncryption');
const subtleCrypto = window.crypto.subtle;
diff --git a/src/util/colorMXID.ts b/src/app/utils/colorMXID.ts
similarity index 100%
rename from src/util/colorMXID.ts
rename to src/app/utils/colorMXID.ts
From 7ec08c346ebfc6ab0c3b0ae3dd309d97dbef9ddf Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 19:09:26 +0100
Subject: [PATCH 20/59] chore: migrate ESLint config to airbnb-extended flat
preset
---
eslint.config.js | 41 +++++++++++----
package-lock.json | 126 ++--------------------------------------------
package.json | 4 +-
3 files changed, 37 insertions(+), 134 deletions(-)
diff --git a/eslint.config.js b/eslint.config.js
index 80678142..9fa0c87b 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -3,8 +3,7 @@ import path from 'node:path';
import { includeIgnoreFile } from '@eslint/compat';
import js from '@eslint/js';
import { defineConfig } from 'eslint/config';
-import { helpers } from 'eslint-config-airbnb-extended';
-import { configs } from 'eslint-config-airbnb-extended/legacy';
+import { configs, helpers, plugins } from 'eslint-config-airbnb-extended';
import { rules as prettierConfigRules } from 'eslint-config-prettier';
import prettierPlugin from 'eslint-plugin-prettier';
import reactPlugin from 'eslint-plugin-react';
@@ -19,18 +18,32 @@ const jsConfig = defineConfig([
name: 'js/config',
...js.configs.recommended,
},
+ // Stylistic plugin
+ plugins.stylistic,
+ // Import X plugin
+ plugins.importX,
+ // Airbnb base recommended config
+ ...configs.base.recommended,
]);
const reactConfig = defineConfig([
+ // React plugin
+ plugins.react,
+ // React hooks plugin
+ plugins.reactHooks,
+ // React JSX A11y plugin
+ plugins.reactA11y,
// Airbnb React recommended config
...configs.react.recommended,
- // Airbnb React hooks config
- ...configs.react.hooks,
// React 17+ automatic JSX runtime
reactPlugin.configs.flat['jsx-runtime'],
]);
const typescriptConfig = defineConfig([
+ // TypeScript ESLint plugin
+ plugins.typescriptEslint,
+ // Airbnb base TypeScript config
+ ...configs.base.typescript,
// Airbnb React TypeScript config
...configs.react.typescript,
]);
@@ -55,7 +68,7 @@ const prettierConfig = defineConfig([
const projectOverrides = defineConfig([
{
- name: 'project/legacy-rule-overrides',
+ name: 'project/rule-overrides',
files: [...jsFiles, ...tsFiles],
languageOptions: {
globals: {
@@ -67,13 +80,16 @@ const projectOverrides = defineConfig([
'linebreak-style': 'off',
'no-underscore-dangle': 'off',
'no-shadow': 'off',
- 'import/prefer-default-export': 'off',
- 'import/extensions': 'off',
- 'import/no-unresolved': 'off',
- 'import/no-extraneous-dependencies': [
+ 'import-x/prefer-default-export': 'off',
+ 'import-x/extensions': 'off',
+ 'import-x/no-unresolved': 'off',
+ 'import-x/no-extraneous-dependencies': [
'error',
{
devDependencies: true,
+ optionalDependencies: false,
+ peerDependencies: true,
+ bundledDependencies: true,
},
],
'react/no-unstable-nested-components': ['error', { allowAsProps: true }],
@@ -92,9 +108,14 @@ const projectOverrides = defineConfig([
},
},
{
- name: 'project/typescript-legacy-rule-overrides',
+ name: 'project/typescript-rule-overrides',
files: tsFiles,
rules: {
+ // disabled for now to get eslint to pass
+ '@typescript-eslint/consistent-type-definitions': 'off',
+ '@typescript-eslint/no-unsafe-enum-comparison': 'off',
+ '@typescript-eslint/only-throw-error': 'off',
+ '@typescript-eslint/array-type': 'off',
'@typescript-eslint/no-unused-vars': [
'error',
{
diff --git a/package-lock.json b/package-lock.json
index a1764195..b1b1177d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,7 @@
"domhandler": "^5.0.3",
"emojibase": "^15.3.1",
"emojibase-data": "^15.3.2",
+ "eslint-plugin-react": "7.37.5",
"file-saver": "^2.0.5",
"focus-trap-react": "^10.3.1",
"folds": "^2.6.1",
@@ -89,10 +90,7 @@
"eslint": "9.39.3",
"eslint-config-airbnb-extended": "3.0.1",
"eslint-config-prettier": "10.1.8",
- "eslint-import-resolver-typescript": "4.4.4",
- "eslint-plugin-import-x": "4.16.1",
"eslint-plugin-prettier": "5.5.5",
- "eslint-plugin-react": "^7.37.5",
"globals": "17.3.0",
"knip": "5.85.0",
"prettier": "3.8.1",
@@ -8034,7 +8032,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
"integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"is-array-buffer": "^3.0.5"
@@ -8050,7 +8047,6 @@
"version": "3.1.9",
"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
"integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.8",
@@ -8073,7 +8069,6 @@
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
"integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.7",
@@ -8116,7 +8111,6 @@
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
"integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"define-properties": "^1.2.1",
@@ -8134,7 +8128,6 @@
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
"integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"define-properties": "^1.2.1",
@@ -8152,7 +8145,6 @@
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
"integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"define-properties": "^1.2.1",
@@ -8168,7 +8160,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
"integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
- "dev": true,
"dependencies": {
"array-buffer-byte-length": "^1.0.1",
"call-bind": "^1.0.8",
@@ -8213,7 +8204,6 @@
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
"integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
- "dev": true,
"dependencies": {
"possible-typed-array-names": "^1.0.0"
},
@@ -8313,8 +8303,7 @@
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
- "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
- "dev": true
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
},
"node_modules/base-x": {
"version": "5.0.1",
@@ -8378,7 +8367,6 @@
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
"dependencies": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -8487,7 +8475,6 @@
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
"integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
- "dev": true,
"dependencies": {
"call-bind-apply-helpers": "^1.0.0",
"es-define-property": "^1.0.0",
@@ -8505,7 +8492,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"es-errors": "^1.3.0",
@@ -8519,7 +8505,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
"integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind-apply-helpers": "^1.0.2",
@@ -8714,8 +8699,7 @@
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
- "dev": true
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
},
"node_modules/confbox": {
"version": "0.1.8",
@@ -8849,7 +8833,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
"integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"es-errors": "^1.3.0",
@@ -8866,7 +8849,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
"integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"es-errors": "^1.3.0",
@@ -8883,7 +8865,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
"integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"es-errors": "^1.3.0",
@@ -8962,7 +8943,6 @@
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
- "dev": true,
"dependencies": {
"es-define-property": "^1.0.0",
"es-errors": "^1.3.0",
@@ -8979,7 +8959,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
- "dev": true,
"dependencies": {
"define-data-property": "^1.0.1",
"has-property-descriptors": "^1.0.0",
@@ -9008,7 +8987,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
- "dev": true,
"license": "Apache-2.0",
"dependencies": {
"esutils": "^2.0.2"
@@ -9083,7 +9061,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
- "dev": true,
"dependencies": {
"call-bind-apply-helpers": "^1.0.1",
"es-errors": "^1.3.0",
@@ -9184,7 +9161,6 @@
"version": "1.24.1",
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.1.tgz",
"integrity": "sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==",
- "dev": true,
"license": "MIT",
"dependencies": {
"array-buffer-byte-length": "^1.0.2",
@@ -9253,7 +9229,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -9262,7 +9237,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -9271,7 +9245,6 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.2.tgz",
"integrity": "sha512-BrUQ0cPTB/IwXj23HtwHjS9n7O4h9FX94b4xc5zlTHxeLgTAdzYUDyy6KdExAl9lbN5rtfe44xpjpmj9grxs5w==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.8",
@@ -9299,7 +9272,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0"
},
@@ -9311,7 +9283,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
"integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"get-intrinsic": "^1.2.6",
@@ -9326,7 +9297,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
"integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
- "dev": true,
"license": "MIT",
"dependencies": {
"hasown": "^2.0.2"
@@ -9339,7 +9309,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
"integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
- "dev": true,
"dependencies": {
"is-callable": "^1.2.7",
"is-date-object": "^1.0.5",
@@ -9914,7 +9883,6 @@
"version": "7.37.5",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
"integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
- "dev": true,
"license": "MIT",
"dependencies": {
"array-includes": "^3.1.8",
@@ -9967,7 +9935,6 @@
"version": "2.0.0-next.5",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
"integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
- "dev": true,
"dependencies": {
"is-core-module": "^2.13.0",
"path-parse": "^1.0.7",
@@ -9984,7 +9951,6 @@
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
- "dev": true,
"bin": {
"semver": "bin/semver.js"
}
@@ -10103,7 +10069,6 @@
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
- "dev": true,
"engines": {
"node": ">=4.0"
}
@@ -10118,7 +10083,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -10394,7 +10358,6 @@
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
"integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
- "dev": true,
"license": "MIT",
"dependencies": {
"is-callable": "^1.2.7"
@@ -10484,7 +10447,6 @@
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
- "dev": true,
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@@ -10493,7 +10455,6 @@
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
"integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -10513,7 +10474,6 @@
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
- "dev": true,
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@@ -10538,7 +10498,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
"integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind-apply-helpers": "^1.0.2",
@@ -10570,7 +10529,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
- "dev": true,
"dependencies": {
"dunder-proto": "^1.0.1",
"es-object-atoms": "^1.0.0"
@@ -10583,7 +10541,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
"integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"es-errors": "^1.3.0",
@@ -10705,7 +10662,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
"integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
- "dev": true,
"dependencies": {
"define-properties": "^1.2.1",
"gopd": "^1.0.1"
@@ -10728,7 +10684,6 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -10746,7 +10701,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
"integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -10768,7 +10722,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
- "dev": true,
"dependencies": {
"es-define-property": "^1.0.0"
},
@@ -10780,7 +10733,6 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
"integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
- "dev": true,
"dependencies": {
"dunder-proto": "^1.0.0"
},
@@ -10795,7 +10747,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -10807,7 +10758,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
- "dev": true,
"dependencies": {
"has-symbols": "^1.0.3"
},
@@ -10822,7 +10772,6 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
- "dev": true,
"dependencies": {
"function-bind": "^1.1.2"
},
@@ -11112,7 +11061,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
"integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"hasown": "^2.0.2",
@@ -11138,7 +11086,6 @@
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
"integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -11162,7 +11109,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.0.tgz",
"integrity": "sha512-GExz9MtyhlZyXYLxzlJRj5WUCE661zhDa1Yna52CN57AJsymh+DvXXjyveSioqSRdxvUrdKdvqB1b5cVKsNpWQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"get-proto": "^1.0.1",
@@ -11180,7 +11126,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
"integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
- "dev": true,
"dependencies": {
"has-bigints": "^1.0.2"
},
@@ -11207,7 +11152,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz",
"integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"has-tostringtag": "^1.0.2"
@@ -11233,7 +11177,6 @@
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -11245,7 +11188,6 @@
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
- "dev": true,
"dependencies": {
"hasown": "^2.0.2"
},
@@ -11260,7 +11202,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
"integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"get-intrinsic": "^1.2.6",
@@ -11277,7 +11218,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
"integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"has-tostringtag": "^1.0.2"
@@ -11302,7 +11242,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
"integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3"
},
@@ -11325,7 +11264,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
"integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"get-proto": "^1.0.0",
@@ -11361,7 +11299,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
"integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -11380,7 +11317,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
"integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
- "dev": true,
"license": "MIT",
"engines": {
"node": ">= 0.4"
@@ -11414,7 +11350,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
"integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"has-tostringtag": "^1.0.2"
@@ -11448,7 +11383,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
"integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"gopd": "^1.2.0",
@@ -11476,7 +11410,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
"integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -11488,7 +11421,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
"integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3"
},
@@ -11516,7 +11448,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
"integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"has-tostringtag": "^1.0.2"
@@ -11532,7 +11463,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
"integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"has-symbols": "^1.1.0",
@@ -11549,7 +11479,6 @@
"version": "1.1.15",
"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
"integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
- "dev": true,
"dependencies": {
"which-typed-array": "^1.1.16"
},
@@ -11564,7 +11493,6 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
"integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -11576,7 +11504,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
"integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bound": "^1.0.3"
@@ -11592,7 +11519,6 @@
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
"integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"get-intrinsic": "^1.2.6"
@@ -11607,8 +11533,7 @@
"node_modules/isarray": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
- "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
- "dev": true
+ "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
},
"node_modules/isexe": {
"version": "2.0.0",
@@ -11620,7 +11545,6 @@
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
"integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
- "dev": true,
"license": "MIT",
"dependencies": {
"define-data-property": "^1.1.4",
@@ -11813,7 +11737,6 @@
"version": "3.3.5",
"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
"integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
- "dev": true,
"dependencies": {
"array-includes": "^3.1.6",
"array.prototype.flat": "^1.3.1",
@@ -12072,7 +11995,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -12191,7 +12113,6 @@
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
- "dev": true,
"license": "ISC",
"dependencies": {
"brace-expansion": "^1.1.7"
@@ -12361,7 +12282,6 @@
"version": "1.13.4",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
"integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
- "dev": true,
"license": "MIT",
"engines": {
"node": ">= 0.4"
@@ -12374,7 +12294,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -12383,7 +12302,6 @@
"version": "4.1.7",
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
"integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -12403,7 +12321,6 @@
"version": "1.1.9",
"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz",
"integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.8",
@@ -12419,7 +12336,6 @@
"version": "2.0.8",
"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
"integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"define-properties": "^1.2.1",
@@ -12452,7 +12368,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
"integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -12505,7 +12420,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
"integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
- "dev": true,
"dependencies": {
"get-intrinsic": "^1.2.6",
"object-keys": "^1.1.1",
@@ -12670,8 +12584,7 @@
"node_modules/path-parse": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
- "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
- "dev": true
+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
},
"node_modules/path-scurry": {
"version": "2.0.1",
@@ -12762,7 +12675,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
"integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -13198,7 +13110,6 @@
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
"integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"define-properties": "^1.2.1",
@@ -13240,7 +13151,6 @@
"version": "1.5.4",
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
"integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"define-properties": "^1.2.1",
@@ -13444,7 +13354,6 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
"integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.2",
@@ -13484,7 +13393,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
"integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"isarray": "^2.0.5"
@@ -13500,7 +13408,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
"integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"es-errors": "^1.3.0",
@@ -13581,7 +13488,6 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
- "dev": true,
"dependencies": {
"define-data-property": "^1.1.4",
"es-errors": "^1.3.0",
@@ -13598,7 +13504,6 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
"integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
- "dev": true,
"dependencies": {
"define-data-property": "^1.1.4",
"es-errors": "^1.3.0",
@@ -13613,7 +13518,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
"integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
- "dev": true,
"dependencies": {
"dunder-proto": "^1.0.1",
"es-errors": "^1.3.0",
@@ -13648,7 +13552,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
"integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"object-inspect": "^1.13.3",
@@ -13667,7 +13570,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
"integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"object-inspect": "^1.13.3"
@@ -13683,7 +13585,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
"integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"es-errors": "^1.3.0",
@@ -13701,7 +13602,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
"integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"es-errors": "^1.3.0",
@@ -13913,7 +13813,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
"integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"es-errors": "^1.3.0",
@@ -13960,7 +13859,6 @@
"version": "4.0.12",
"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
"integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -13987,7 +13885,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
"integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
- "dev": true,
"license": "MIT",
"dependencies": {
"define-properties": "^1.1.3",
@@ -13998,7 +13895,6 @@
"version": "1.2.10",
"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
"integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.2",
@@ -14019,7 +13915,6 @@
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
"integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.2",
@@ -14037,7 +13932,6 @@
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
"integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"define-properties": "^1.2.1",
@@ -14144,7 +14038,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -14380,7 +14273,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
"integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"es-errors": "^1.3.0",
@@ -14394,7 +14286,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
"integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"for-each": "^0.3.3",
@@ -14413,7 +14304,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
"integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
- "dev": true,
"dependencies": {
"available-typed-arrays": "^1.0.7",
"call-bind": "^1.0.8",
@@ -14434,7 +14324,6 @@
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
"integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"for-each": "^0.3.3",
@@ -14524,7 +14413,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
"integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"has-bigints": "^1.0.2",
@@ -15428,7 +15316,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
"integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
- "dev": true,
"dependencies": {
"is-bigint": "^1.1.0",
"is-boolean-object": "^1.2.1",
@@ -15447,7 +15334,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
"integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"function.prototype.name": "^1.1.6",
@@ -15474,7 +15360,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
"integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
- "dev": true,
"dependencies": {
"is-map": "^2.0.3",
"is-set": "^2.0.3",
@@ -15492,7 +15377,6 @@
"version": "1.1.20",
"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
"integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==",
- "dev": true,
"license": "MIT",
"dependencies": {
"available-typed-arrays": "^1.0.7",
diff --git a/package.json b/package.json
index c99ef3f7..40638344 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
"domhandler": "^5.0.3",
"emojibase": "^15.3.1",
"emojibase-data": "^15.3.2",
+ "eslint-plugin-react": "7.37.5",
"file-saver": "^2.0.5",
"focus-trap-react": "^10.3.1",
"folds": "^2.6.1",
@@ -103,10 +104,7 @@
"eslint": "9.39.3",
"eslint-config-airbnb-extended": "3.0.1",
"eslint-config-prettier": "10.1.8",
- "eslint-import-resolver-typescript": "4.4.4",
- "eslint-plugin-import-x": "4.16.1",
"eslint-plugin-prettier": "5.5.5",
- "eslint-plugin-react": "^7.37.5",
"globals": "17.3.0",
"knip": "5.85.0",
"prettier": "3.8.1",
From 837275884319d43ec2ee83810de2572c57911e3e Mon Sep 17 00:00:00 2001
From: hazre
Date: Sun, 1 Mar 2026 19:10:02 +0100
Subject: [PATCH 21/59] refactor: rename shared utils alias to $utils
---
src/app/components/Pdf-viewer/PdfViewer.tsx | 2 +-
.../create-room/AdditionalCreatorInput.tsx | 4 ++--
.../components/create-room/CreateRoomAliasInput.tsx | 4 ++--
.../components/create-room/RoomVersionSelector.tsx | 2 +-
src/app/components/create-room/utils.ts | 2 +-
src/app/components/editor/Editor.tsx | 2 +-
src/app/components/editor/Elements.tsx | 2 +-
src/app/components/editor/Toolbar.tsx | 6 +++---
.../editor/autocomplete/AutocompleteMenu.tsx | 2 +-
.../editor/autocomplete/EmoticonAutocomplete.tsx | 4 ++--
.../editor/autocomplete/RoomMentionAutocomplete.tsx | 8 ++++----
.../editor/autocomplete/UserMentionAutocomplete.tsx | 6 +++---
src/app/components/editor/input.ts | 2 +-
src/app/components/editor/output.ts | 8 ++++----
src/app/components/emoji-board/EmojiBoard.tsx | 6 +++---
src/app/components/emoji-board/components/Item.tsx | 2 +-
.../components/emoji-board/components/Preview.tsx | 2 +-
.../emoji-board/components/SearchInput.tsx | 2 +-
src/app/components/event-readers/EventReaders.tsx | 6 +++---
.../components/image-pack-view/ImagePackContent.tsx | 8 ++++----
src/app/components/image-pack-view/ImageTile.tsx | 4 ++--
src/app/components/image-pack-view/PackMeta.tsx | 4 ++--
src/app/components/image-pack-view/RoomImagePack.tsx | 2 +-
src/app/components/image-pack-view/UsageSwitcher.tsx | 2 +-
src/app/components/image-viewer/ImageViewer.tsx | 2 +-
.../invite-user-prompt/InviteUserPrompt.tsx | 4 ++--
.../join-address-prompt/JoinAddressPrompt.tsx | 4 ++--
.../components/leave-room-prompt/LeaveRoomPrompt.tsx | 2 +-
.../leave-space-prompt/LeaveSpacePrompt.tsx | 2 +-
src/app/components/member-tile/MemberTile.tsx | 4 ++--
src/app/components/message/FileHeader.tsx | 4 ++--
src/app/components/message/MsgTypeRenderers.tsx | 8 ++++----
src/app/components/message/Reaction.tsx | 4 ++--
src/app/components/message/RenderBody.tsx | 2 +-
src/app/components/message/Reply.tsx | 10 +++-------
src/app/components/message/Time.tsx | 2 +-
src/app/components/message/content/AudioContent.tsx | 4 ++--
src/app/components/message/content/FileContent.tsx | 8 ++++----
src/app/components/message/content/ImageContent.tsx | 10 +++++-----
.../components/message/content/ThumbnailContent.tsx | 4 ++--
src/app/components/message/content/VideoContent.tsx | 6 +++---
.../components/message/modals/GlobalModalManager.tsx | 2 +-
src/app/components/message/modals/MessageSource.tsx | 2 +-
.../message/placeholder/CompactPlaceholder.tsx | 2 +-
.../message/placeholder/DefaultPlaceholder.tsx | 2 +-
src/app/components/power/PowerIcon.tsx | 2 +-
src/app/components/power/PowerSelector.tsx | 2 +-
src/app/components/room-avatar/RoomAvatar.tsx | 4 ++--
src/app/components/room-card/RoomCard.tsx | 8 ++++----
src/app/components/room-intro/RoomIntro.tsx | 8 ++++----
src/app/components/text-viewer/TextViewer.tsx | 2 +-
src/app/components/time-date/DatePicker.tsx | 2 +-
src/app/components/time-date/TimePicker.tsx | 2 +-
.../upload-card/CompactUploadCardRenderer.tsx | 4 ++--
src/app/components/upload-card/UploadCard.tsx | 2 +-
.../components/upload-card/UploadCardRenderer.tsx | 4 ++--
src/app/components/url-preview/UrlPreviewCard.tsx | 2 +-
src/app/components/user-avatar/UserAvatar.tsx | 2 +-
src/app/components/user-profile/CreatorChip.tsx | 2 +-
src/app/components/user-profile/PowerChip.tsx | 2 +-
src/app/components/user-profile/UserChips.tsx | 12 ++++++------
src/app/components/user-profile/UserHero.tsx | 6 +++---
src/app/components/user-profile/UserModeration.tsx | 2 +-
src/app/components/user-profile/UserRoomProfile.tsx | 4 ++--
src/app/features/add-existing/AddExisting.tsx | 10 +++++-----
src/app/features/call/CallView.tsx | 4 ++--
src/app/features/call/CallViewUser.tsx | 4 ++--
src/app/features/call/SmallWidget.ts | 2 +-
.../features/common-settings/cosmetics/Cosmetics.tsx | 2 +-
.../common-settings/developer-tools/DevelopTools.tsx | 2 +-
.../developer-tools/SendRoomEvent.tsx | 2 +-
.../developer-tools/StateEventEditor.tsx | 2 +-
.../common-settings/emojis-stickers/RoomPacks.tsx | 4 ++--
.../features/common-settings/general/RoomAddress.tsx | 4 ++--
.../common-settings/general/RoomEncryption.tsx | 2 +-
.../general/RoomHistoryVisibility.tsx | 2 +-
.../common-settings/general/RoomJoinRules.tsx | 4 ++--
.../features/common-settings/general/RoomProfile.tsx | 2 +-
.../features/common-settings/general/RoomUpgrade.tsx | 4 ++--
src/app/features/common-settings/members/Members.tsx | 6 +++---
.../features/common-settings/permissions/Powers.tsx | 2 +-
.../common-settings/permissions/PowersEditor.tsx | 2 +-
src/app/features/create-chat/CreateChat.tsx | 4 ++--
src/app/features/create-room/CreateRoom.tsx | 6 +++---
src/app/features/create-room/CreateRoomModal.tsx | 2 +-
src/app/features/create-space/CreateSpace.tsx | 4 ++--
src/app/features/create-space/CreateSpaceModal.tsx | 2 +-
src/app/features/lobby/HierarchyItemMenu.tsx | 2 +-
src/app/features/lobby/Lobby.tsx | 6 +++---
src/app/features/lobby/LobbyHeader.tsx | 6 +++---
src/app/features/lobby/LobbyHero.tsx | 6 +++---
src/app/features/lobby/RoomItem.tsx | 6 +++---
src/app/features/lobby/SpaceItem.tsx | 8 ++++----
src/app/features/message-search/SearchFilters.tsx | 6 +++---
.../features/message-search/SearchResultGroup.tsx | 6 +++---
src/app/features/room-nav/RoomNavItem.tsx | 12 ++++++------
src/app/features/room-nav/RoomNavUser.tsx | 4 ++--
src/app/features/room-settings/RoomSettings.tsx | 2 +-
src/app/features/room/CommandAutocomplete.tsx | 2 +-
src/app/features/room/MembersDrawer.tsx | 4 ++--
src/app/features/room/Room.tsx | 2 +-
src/app/features/room/RoomInput.tsx | 12 ++++++------
src/app/features/room/RoomTimeline.tsx | 10 +++++-----
src/app/features/room/RoomView.tsx | 2 +-
src/app/features/room/RoomViewFollowing.tsx | 6 +++---
src/app/features/room/RoomViewHeader.tsx | 10 +++++-----
src/app/features/room/RoomViewTyping.tsx | 4 ++--
src/app/features/room/jump-to-time/JumpToTime.tsx | 4 ++--
src/app/features/room/message/Message.tsx | 10 +++++-----
src/app/features/room/message/MessageEditor.tsx | 4 ++--
src/app/features/room/message/Reactions.tsx | 4 ++--
src/app/features/room/msgContent.ts | 10 +++++-----
.../features/room/reaction-viewer/ReactionViewer.tsx | 6 +++---
src/app/features/room/room-pin-menu/RoomPinMenu.tsx | 6 +++---
src/app/features/search/Search.tsx | 12 ++++++------
src/app/features/settings/Settings.tsx | 6 +++---
src/app/features/settings/account/BioEditor.tsx | 2 +-
.../features/settings/account/IgnoredUserList.tsx | 2 +-
src/app/features/settings/account/MatrixId.tsx | 2 +-
src/app/features/settings/account/Profile.tsx | 6 +++---
src/app/features/settings/cosmetics/Cosmetics.tsx | 2 +-
src/app/features/settings/cosmetics/Themes.tsx | 2 +-
.../settings/developer-tools/DevelopTools.tsx | 2 +-
src/app/features/settings/devices/DeviceTile.tsx | 4 ++--
src/app/features/settings/devices/LocalBackup.tsx | 2 +-
src/app/features/settings/devices/Verification.tsx | 2 +-
.../settings/emojis-stickers/GlobalPacks.tsx | 4 ++--
.../features/settings/emojis-stickers/UserPack.tsx | 2 +-
src/app/features/settings/general/General.tsx | 6 +++---
.../notifications/NotificationModeSwitcher.tsx | 2 +-
.../settings/notifications/SpecialMessages.tsx | 2 +-
src/app/features/space-settings/SpaceSettings.tsx | 2 +-
src/app/features/widgets/WidgetIframe.tsx | 2 +-
src/app/features/widgets/WidgetsDrawer.tsx | 2 +-
src/app/hooks/router/useSelectedRoom.ts | 2 +-
src/app/hooks/router/useSelectedSpace.ts | 2 +-
src/app/hooks/useUserProfile.ts | 2 +-
src/app/pages/auth/ServerPicker.tsx | 2 +-
src/app/pages/auth/login/PasswordLoginForm.tsx | 6 +++---
src/app/pages/auth/login/loginUtil.ts | 2 +-
src/app/pages/auth/register/PasswordRegisterForm.tsx | 2 +-
src/app/pages/auth/register/registerUtil.ts | 2 +-
.../pages/auth/reset-password/PasswordResetForm.tsx | 2 +-
src/app/pages/client/BackgroundNotifications.tsx | 6 +++---
src/app/pages/client/ClientNonUIFeatures.tsx | 6 +++---
src/app/pages/client/ClientRoot.tsx | 4 ++--
src/app/pages/client/direct/Direct.tsx | 8 ++++----
src/app/pages/client/direct/DirectCreate.tsx | 2 +-
src/app/pages/client/explore/Explore.tsx | 4 ++--
src/app/pages/client/explore/Server.tsx | 4 ++--
src/app/pages/client/home/Home.tsx | 8 ++++----
src/app/pages/client/inbox/Invites.tsx | 8 ++++----
src/app/pages/client/inbox/Notifications.tsx | 8 ++++----
src/app/pages/client/sidebar/AccountSwitcherTab.tsx | 8 ++++----
src/app/pages/client/sidebar/CreateTab.tsx | 2 +-
src/app/pages/client/sidebar/DirectTab.tsx | 4 ++--
src/app/pages/client/sidebar/ExploreTab.tsx | 2 +-
src/app/pages/client/sidebar/HomeTab.tsx | 4 ++--
src/app/pages/client/sidebar/SpaceTabs.tsx | 12 ++++++------
src/app/pages/client/space/RoomProvider.tsx | 2 +-
src/app/pages/client/space/Space.tsx | 10 +++++-----
src/app/plugins/custom-emoji/utils.ts | 2 +-
src/app/plugins/markdown/utils.ts | 2 +-
src/app/state/hooks/roomList.ts | 2 +-
src/app/state/room/roomInputDrafts.ts | 2 +-
src/app/state/room/roomToParents.ts | 2 +-
src/app/state/room/roomToUnread.ts | 2 +-
tsconfig.json | 3 +--
vite.config.ts | 3 +--
169 files changed, 346 insertions(+), 352 deletions(-)
diff --git a/src/app/components/Pdf-viewer/PdfViewer.tsx b/src/app/components/Pdf-viewer/PdfViewer.tsx
index c9457ff5..e3072e6f 100644
--- a/src/app/components/Pdf-viewer/PdfViewer.tsx
+++ b/src/app/components/Pdf-viewer/PdfViewer.tsx
@@ -25,7 +25,7 @@ import FileSaver from 'file-saver';
import { AsyncStatus } from '$hooks/useAsyncCallback';
import { useImageGestures } from '$hooks/useImageGestures';
import { createPage, usePdfDocumentLoader, usePdfJSLoader } from '$plugins/pdfjs-dist';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import * as css from './PdfViewer.css';
export type PdfViewerProps = {
diff --git a/src/app/components/create-room/AdditionalCreatorInput.tsx b/src/app/components/create-room/AdditionalCreatorInput.tsx
index 5437dd4e..50e65c7b 100644
--- a/src/app/components/create-room/AdditionalCreatorInput.tsx
+++ b/src/app/components/create-room/AdditionalCreatorInput.tsx
@@ -24,10 +24,10 @@ import {
useMemo,
useState,
} from 'react';
-import { getMxIdLocalPart, getMxIdServer, isUserId } from '$appUtils/matrix';
+import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix';
import { useDirectUsers } from '$hooks/useDirectUsers';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useAsyncSearch, UseAsyncSearchOptions } from '$hooks/useAsyncSearch';
import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser';
import { SettingTile } from '../setting-tile';
diff --git a/src/app/components/create-room/CreateRoomAliasInput.tsx b/src/app/components/create-room/CreateRoomAliasInput.tsx
index 4e7f099b..0460717a 100644
--- a/src/app/components/create-room/CreateRoomAliasInput.tsx
+++ b/src/app/components/create-room/CreateRoomAliasInput.tsx
@@ -9,9 +9,9 @@ import {
import { MatrixError } from '$types/matrix-sdk';
import { Box, color, Icon, Icons, Input, Spinner, Text, toRem } from 'folds';
import { isKeyHotkey } from 'is-hotkey';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { replaceSpaceWithDash } from '$appUtils/common';
+import { replaceSpaceWithDash } from '$utils/common';
import { AsyncState, AsyncStatus, useAsync } from '$hooks/useAsyncCallback';
import { useDebounce } from '$hooks/useDebounce';
diff --git a/src/app/components/create-room/RoomVersionSelector.tsx b/src/app/components/create-room/RoomVersionSelector.tsx
index 908565c6..b0b67b7e 100644
--- a/src/app/components/create-room/RoomVersionSelector.tsx
+++ b/src/app/components/create-room/RoomVersionSelector.tsx
@@ -13,7 +13,7 @@ import {
toRem,
} from 'folds';
import FocusTrap from 'focus-trap-react';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { SettingTile } from '../setting-tile';
import { SequenceCard } from '../sequence-card';
diff --git a/src/app/components/create-room/utils.ts b/src/app/components/create-room/utils.ts
index 6aeaa171..d0322682 100644
--- a/src/app/components/create-room/utils.ts
+++ b/src/app/components/create-room/utils.ts
@@ -9,7 +9,7 @@ import {
} from '$types/matrix-sdk';
import { RoomType, StateEvent } from '$types/matrix/room';
import { getViaServers } from '$plugins/via-servers';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
import { CreateRoomAccess } from './types';
export const createRoomCreationContent = (
diff --git a/src/app/components/editor/Editor.tsx b/src/app/components/editor/Editor.tsx
index 22afffb6..32121685 100644
--- a/src/app/components/editor/Editor.tsx
+++ b/src/app/components/editor/Editor.tsx
@@ -19,7 +19,7 @@ import {
ReactEditor,
} from 'slate-react';
import { withHistory } from 'slate-history';
-import { mobileOrTablet } from '$appUtils/user-agent';
+import { mobileOrTablet } from '$utils/user-agent';
import { BlockType } from './types';
import { RenderElement, RenderLeaf } from './Elements';
import { CustomElement } from './slate';
diff --git a/src/app/components/editor/Elements.tsx b/src/app/components/editor/Elements.tsx
index 72a791fd..7e350081 100644
--- a/src/app/components/editor/Elements.tsx
+++ b/src/app/components/editor/Elements.tsx
@@ -10,7 +10,7 @@ import { useAtomValue } from 'jotai';
import * as css from '$styles/CustomHtml.css';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { nicknamesAtom } from '$state/nicknames';
import { BlockType } from './types';
diff --git a/src/app/components/editor/Toolbar.tsx b/src/app/components/editor/Toolbar.tsx
index a5413c04..62cd9356 100644
--- a/src/app/components/editor/Toolbar.tsx
+++ b/src/app/components/editor/Toolbar.tsx
@@ -19,11 +19,11 @@ import {
} from 'folds';
import { MouseEventHandler, ReactNode, useState } from 'react';
import { ReactEditor, useSlate } from 'slate-react';
-import { isMacOS } from '$appUtils/user-agent';
-import { KeySymbol } from '$appUtils/key-symbol';
+import { isMacOS } from '$utils/user-agent';
+import { KeySymbol } from '$utils/key-symbol';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { floatingToolbar } from '$styles/overrides/Composer.css';
import { HeadingLevel } from './slate';
import { BlockType, MarkType } from './types';
diff --git a/src/app/components/editor/autocomplete/AutocompleteMenu.tsx b/src/app/components/editor/autocomplete/AutocompleteMenu.tsx
index 08ac980f..18853ee1 100644
--- a/src/app/components/editor/autocomplete/AutocompleteMenu.tsx
+++ b/src/app/components/editor/autocomplete/AutocompleteMenu.tsx
@@ -3,7 +3,7 @@ import FocusTrap from 'focus-trap-react';
import { isKeyHotkey } from 'is-hotkey';
import { Header, Menu, Scroll, config } from 'folds';
-import { preventScrollWithArrowKey, stopPropagation } from '$appUtils/keyboard';
+import { preventScrollWithArrowKey, stopPropagation } from '$utils/keyboard';
import { useAlive } from '$hooks/useAlive';
import * as css from './AutocompleteMenu.css';
diff --git a/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx b/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
index 40425bd6..55328a57 100644
--- a/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
@@ -5,12 +5,12 @@ import { Room } from '$types/matrix-sdk';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { UseAsyncSearchOptions, useAsyncSearch } from '$hooks/useAsyncSearch';
-import { onTabPress } from '$appUtils/keyboard';
+import { onTabPress } from '$utils/keyboard';
import { useRecentEmoji } from '$hooks/useRecentEmoji';
import { useRelevantImagePacks } from '$hooks/useImagePacks';
import { IEmoji, emojis } from '$plugins/emoji';
import { useKeyDown } from '$hooks/useKeyDown';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { ImageUsage, PackImageReader } from '$plugins/custom-emoji';
import { getEmoticonSearchStr } from '$plugins/utils';
diff --git a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
index 8be44bc9..53c6a546 100644
--- a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
@@ -4,15 +4,15 @@ import { Avatar, Icon, Icons, MenuItem, Text } from 'folds';
import { JoinRule, MatrixClient } from '$types/matrix-sdk';
import { useAtomValue } from 'jotai';
-import { getDirectRoomAvatarUrl } from '$appUtils/room';
+import { getDirectRoomAvatarUrl } from '$utils/room';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdServer, isRoomAlias } from '$appUtils/matrix';
+import { getMxIdServer, isRoomAlias } from '$utils/matrix';
import { UseAsyncSearchOptions, useAsyncSearch } from '$hooks/useAsyncSearch';
-import { onTabPress } from '$appUtils/keyboard';
+import { onTabPress } from '$utils/keyboard';
import { useKeyDown } from '$hooks/useKeyDown';
import { mDirectAtom } from '$state/mDirectList';
import { allRoomsAtom } from '$state/room-list/roomList';
-import { factoryRoomIdByActivity } from '$appUtils/sort';
+import { factoryRoomIdByActivity } from '$utils/sort';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
import { getViaServers } from '$plugins/via-servers';
import { AutocompleteMenu } from './AutocompleteMenu';
diff --git a/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
index 06260104..32082f5a 100644
--- a/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
@@ -6,10 +6,10 @@ import { MatrixClient, Room, RoomMember } from '$types/matrix-sdk';
import { useRoomMembers } from '$hooks/useRoomMembers';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { SearchItemStrGetter, UseAsyncSearchOptions, useAsyncSearch } from '$hooks/useAsyncSearch';
-import { onTabPress } from '$appUtils/keyboard';
+import { onTabPress } from '$utils/keyboard';
import { useKeyDown } from '$hooks/useKeyDown';
-import { getMxIdLocalPart, getMxIdServer, isUserId } from '$appUtils/matrix';
-import { getMemberDisplayName, getMemberSearchStr } from '$appUtils/room';
+import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix';
+import { getMemberDisplayName, getMemberSearchStr } from '$utils/room';
import { UserAvatar } from '$components/user-avatar';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { Membership } from '$types/matrix/room';
diff --git a/src/app/components/editor/input.ts b/src/app/components/editor/input.ts
index 35851105..8a743136 100644
--- a/src/app/components/editor/input.ts
+++ b/src/app/components/editor/input.ts
@@ -2,7 +2,7 @@ import { Descendant, Text } from 'slate';
import parse from 'html-dom-parser';
import { ChildNode, Element, isText, isTag } from 'domhandler';
-import { sanitizeCustomHtml } from '$appUtils/sanitize';
+import { sanitizeCustomHtml } from '$utils/sanitize';
import {
parseMatrixToRoom,
parseMatrixToRoomEvent,
diff --git a/src/app/components/editor/output.ts b/src/app/components/editor/output.ts
index 49302991..fba2937b 100644
--- a/src/app/components/editor/output.ts
+++ b/src/app/components/editor/output.ts
@@ -1,15 +1,15 @@
import { Descendant, Editor, Text } from 'slate';
import { MatrixClient } from '$types/matrix-sdk';
-import { sanitizeText } from '$appUtils/sanitize';
+import { sanitizeText } from '$utils/sanitize';
import {
parseBlockMD,
parseInlineMD,
unescapeMarkdownBlockSequences,
unescapeMarkdownInlineSequences,
} from '$plugins/markdown';
-import { findAndReplace } from '$appUtils/findAndReplace';
-import { sanitizeForRegex } from '$appUtils/regex';
-import { isUserId } from '$appUtils/matrix';
+import { findAndReplace } from '$utils/findAndReplace';
+import { sanitizeForRegex } from '$utils/regex';
+import { isUserId } from '$utils/matrix';
import { CustomElement } from './slate';
import { BlockType } from './types';
diff --git a/src/app/components/emoji-board/EmojiBoard.tsx b/src/app/components/emoji-board/EmojiBoard.tsx
index e17252ad..0c062a4f 100644
--- a/src/app/components/emoji-board/EmojiBoard.tsx
+++ b/src/app/components/emoji-board/EmojiBoard.tsx
@@ -16,12 +16,12 @@ import { Room } from '$types/matrix-sdk';
import { atom, PrimitiveAtom, useAtom, useSetAtom } from 'jotai';
import { useVirtualizer } from '@tanstack/react-virtual';
import { IEmoji, emojiGroups, emojis } from '$plugins/emoji';
-import { preventScrollWithArrowKey, stopPropagation } from '$appUtils/keyboard';
+import { preventScrollWithArrowKey, stopPropagation } from '$utils/keyboard';
import { useRelevantImagePacks } from '$hooks/useImagePacks';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRecentEmoji } from '$hooks/useRecentEmoji';
-import { isUserId, mxcUrlToHttp } from '$appUtils/matrix';
-import { editableActiveElement, targetFromEvent } from '$appUtils/dom';
+import { isUserId, mxcUrlToHttp } from '$utils/matrix';
+import { editableActiveElement, targetFromEvent } from '$utils/dom';
import { useAsyncSearch, UseAsyncSearchOptions } from '$hooks/useAsyncSearch';
import { useDebounce } from '$hooks/useDebounce';
import { useThrottle } from '$hooks/useThrottle';
diff --git a/src/app/components/emoji-board/components/Item.tsx b/src/app/components/emoji-board/components/Item.tsx
index 3cde2ca7..44a1a722 100644
--- a/src/app/components/emoji-board/components/Item.tsx
+++ b/src/app/components/emoji-board/components/Item.tsx
@@ -2,7 +2,7 @@ import { Box } from 'folds';
import { MatrixClient } from '$types/matrix-sdk';
import { PackImageReader } from '$plugins/custom-emoji';
import { IEmoji } from '$plugins/emoji';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import * as css from './styles.css';
import { EmojiItemInfo, EmojiType } from '../types';
diff --git a/src/app/components/emoji-board/components/Preview.tsx b/src/app/components/emoji-board/components/Preview.tsx
index 7525fe46..1f7cef28 100644
--- a/src/app/components/emoji-board/components/Preview.tsx
+++ b/src/app/components/emoji-board/components/Preview.tsx
@@ -2,7 +2,7 @@ import { Box, Text } from 'folds';
import { Atom, atom, useAtomValue } from 'jotai';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import * as css from './styles.css';
export type PreviewData = {
diff --git a/src/app/components/emoji-board/components/SearchInput.tsx b/src/app/components/emoji-board/components/SearchInput.tsx
index bf3ef608..c3c80e93 100644
--- a/src/app/components/emoji-board/components/SearchInput.tsx
+++ b/src/app/components/emoji-board/components/SearchInput.tsx
@@ -1,6 +1,6 @@
import { ChangeEventHandler, useRef } from 'react';
import { Input, Chip, Icon, Icons, Text } from 'folds';
-import { mobileOrTablet } from '$appUtils/user-agent';
+import { mobileOrTablet } from '$utils/user-agent';
type SearchInputProps = {
query?: string;
diff --git a/src/app/components/event-readers/EventReaders.tsx b/src/app/components/event-readers/EventReaders.tsx
index 96eab263..188eaf8d 100644
--- a/src/app/components/event-readers/EventReaders.tsx
+++ b/src/app/components/event-readers/EventReaders.tsx
@@ -14,13 +14,13 @@ import {
} from 'folds';
import { Room } from '$types/matrix-sdk';
import { useRoomEventReaders } from '$hooks/useRoomEventReaders';
-import { getMemberDisplayName } from '$appUtils/room';
-import { getMxIdLocalPart } from '$appUtils/matrix';
+import { getMemberDisplayName } from '$utils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
import { useSpaceOptionally } from '$hooks/useSpace';
-import { getMouseEventCords } from '$appUtils/dom';
+import { getMouseEventCords } from '$utils/dom';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
import { UserAvatar } from '../user-avatar';
diff --git a/src/app/components/image-pack-view/ImagePackContent.tsx b/src/app/components/image-pack-view/ImagePackContent.tsx
index 64c5874a..e9b75b26 100644
--- a/src/app/components/image-pack-view/ImagePackContent.tsx
+++ b/src/app/components/image-pack-view/ImagePackContent.tsx
@@ -12,10 +12,10 @@ import {
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useFilePicker } from '$hooks/useFilePicker';
import { UploadSuccess } from '$state/upload';
-import { getImageInfo, TUploadContent } from '$appUtils/matrix';
-import { getImageFileUrl, loadImageElement, renameFile } from '$appUtils/dom';
-import { replaceSpaceWithDash, suffixRename } from '$appUtils/common';
-import { getFileNameWithoutExt } from '$appUtils/mimeTypes';
+import { getImageInfo, TUploadContent } from '$utils/matrix';
+import { getImageFileUrl, loadImageElement, renameFile } from '$utils/dom';
+import { replaceSpaceWithDash, suffixRename } from '$utils/common';
+import { getFileNameWithoutExt } from '$utils/mimeTypes';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { SequenceCard } from '../sequence-card';
import { ImageTile, ImageTileEdit, ImageTileUpload } from './ImageTile';
diff --git a/src/app/components/image-pack-view/ImageTile.tsx b/src/app/components/image-pack-view/ImageTile.tsx
index c766a150..e9a4b257 100644
--- a/src/app/components/image-pack-view/ImageTile.tsx
+++ b/src/app/components/image-pack-view/ImageTile.tsx
@@ -1,11 +1,11 @@
import { FormEventHandler, ReactNode, useMemo, useState } from 'react';
import { Badge, Box, Button, Chip, Icon, Icons, Input, Text } from 'folds';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { ImageUsage, imageUsageEqual, PackImageReader } from '$plugins/custom-emoji';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useObjectURL } from '$hooks/useObjectURL';
import { createUploadAtom, TUploadAtom } from '$state/upload';
-import { replaceSpaceWithDash } from '$appUtils/common';
+import { replaceSpaceWithDash } from '$utils/common';
import { SettingTile } from '../setting-tile';
import * as css from './style.css';
import { UsageSwitcher, useUsageStr } from './UsageSwitcher';
diff --git a/src/app/components/image-pack-view/PackMeta.tsx b/src/app/components/image-pack-view/PackMeta.tsx
index 0fefb69a..76c7da21 100644
--- a/src/app/components/image-pack-view/PackMeta.tsx
+++ b/src/app/components/image-pack-view/PackMeta.tsx
@@ -13,9 +13,9 @@ import {
Chip,
} from 'folds';
import Linkify from 'linkify-react';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { nameInitials } from '$appUtils/common';
+import { nameInitials } from '$utils/common';
import { BreakWord } from '$styles/Text.css';
import { LINKIFY_OPTS } from '$plugins/react-custom-html-parser';
import { ContainerColor } from '$styles/ContainerColor.css';
diff --git a/src/app/components/image-pack-view/RoomImagePack.tsx b/src/app/components/image-pack-view/RoomImagePack.tsx
index f4ad1dd8..01f0f7dd 100644
--- a/src/app/components/image-pack-view/RoomImagePack.tsx
+++ b/src/app/components/image-pack-view/RoomImagePack.tsx
@@ -5,7 +5,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { ImagePack, PackContent } from '$plugins/custom-emoji';
import { StateEvent } from '$types/matrix/room';
import { useRoomImagePack } from '$hooks/useImagePacks';
-import { randomStr } from '$appUtils/common';
+import { randomStr } from '$utils/common';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { ImagePackContent } from './ImagePackContent';
diff --git a/src/app/components/image-pack-view/UsageSwitcher.tsx b/src/app/components/image-pack-view/UsageSwitcher.tsx
index 31d9fae3..201a40aa 100644
--- a/src/app/components/image-pack-view/UsageSwitcher.tsx
+++ b/src/app/components/image-pack-view/UsageSwitcher.tsx
@@ -2,7 +2,7 @@ import { MouseEventHandler, useMemo, useState } from 'react';
import { Box, Button, config, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
import FocusTrap from 'focus-trap-react';
import { ImageUsage } from '$plugins/custom-emoji';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
export const useUsageStr = (): ((usage: ImageUsage[]) => string) => {
const getUsageStr = (usage: ImageUsage[]): string => {
diff --git a/src/app/components/image-viewer/ImageViewer.tsx b/src/app/components/image-viewer/ImageViewer.tsx
index 1d690f4a..e08430f1 100644
--- a/src/app/components/image-viewer/ImageViewer.tsx
+++ b/src/app/components/image-viewer/ImageViewer.tsx
@@ -3,7 +3,7 @@ import FileSaver from 'file-saver';
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Text, as } from 'folds';
import { useImageGestures } from '$hooks/useImageGestures';
-import { downloadMedia } from '$appUtils/matrix';
+import { downloadMedia } from '$utils/matrix';
import * as css from './ImageViewer.css';
export type ImageViewerProps = {
diff --git a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
index cdcee398..c8fbabef 100644
--- a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
+++ b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx
@@ -32,9 +32,9 @@ import {
import { Room } from '$types/matrix-sdk';
import { isKeyHotkey } from 'is-hotkey';
import FocusTrap from 'focus-trap-react';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useDirectUsers } from '$hooks/useDirectUsers';
-import { getMxIdLocalPart, getMxIdServer, isUserId } from '$appUtils/matrix';
+import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix';
import { Membership } from '$types/matrix/room';
import { useAsyncSearch, UseAsyncSearchOptions } from '$hooks/useAsyncSearch';
import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser';
diff --git a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
index dbf31778..d6a6478d 100644
--- a/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
+++ b/src/app/components/join-address-prompt/JoinAddressPrompt.tsx
@@ -16,8 +16,8 @@ import {
Input,
color,
} from 'folds';
-import { stopPropagation } from '$appUtils/keyboard';
-import { isRoomAlias, isRoomId } from '$appUtils/matrix';
+import { stopPropagation } from '$utils/keyboard';
+import { isRoomAlias, isRoomId } from '$utils/matrix';
import { parseMatrixToRoom, parseMatrixToRoomEvent, testMatrixTo } from '$plugins/matrix-to';
type JoinAddressProps = {
diff --git a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
index a7cabfe9..21b108e6 100644
--- a/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
+++ b/src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx
@@ -19,7 +19,7 @@ import {
import { MatrixError } from '$types/matrix-sdk';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
type LeaveRoomPromptProps = {
roomId: string;
diff --git a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
index f7f674c4..5bee7af2 100644
--- a/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
+++ b/src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx
@@ -19,7 +19,7 @@ import {
import { MatrixError } from '$types/matrix-sdk';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
type LeaveSpacePromptProps = {
roomId: string;
diff --git a/src/app/components/member-tile/MemberTile.tsx b/src/app/components/member-tile/MemberTile.tsx
index d3e4f230..3565c8f0 100644
--- a/src/app/components/member-tile/MemberTile.tsx
+++ b/src/app/components/member-tile/MemberTile.tsx
@@ -1,8 +1,8 @@
import { ReactNode } from 'react';
import { as, Avatar, Box, Icon, Icons, Text } from 'folds';
import { MatrixClient, Room, RoomMember } from '$types/matrix-sdk';
-import { getMemberDisplayName } from '$appUtils/room';
-import { getMxIdLocalPart } from '$appUtils/matrix';
+import { getMemberDisplayName } from '$utils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
diff --git a/src/app/components/message/FileHeader.tsx b/src/app/components/message/FileHeader.tsx
index f0d8273d..36d8adeb 100644
--- a/src/app/components/message/FileHeader.tsx
+++ b/src/app/components/message/FileHeader.tsx
@@ -2,11 +2,11 @@ import { Badge, Box, Icon, IconButton, Icons, Spinner, Text, as, toRem } from 'f
import { ReactNode, useCallback } from 'react';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import FileSaver from 'file-saver';
-import { mimeTypeToExt } from '$appUtils/mimeTypes';
+import { mimeTypeToExt } from '$utils/mimeTypes';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { decryptFile, downloadEncryptedMedia, downloadMedia, mxcUrlToHttp } from '$appUtils/matrix';
+import { decryptFile, downloadEncryptedMedia, downloadMedia, mxcUrlToHttp } from '$utils/matrix';
const badgeStyles = { maxWidth: toRem(100) };
diff --git a/src/app/components/message/MsgTypeRenderers.tsx b/src/app/components/message/MsgTypeRenderers.tsx
index d3e26eb0..dc738c0a 100644
--- a/src/app/components/message/MsgTypeRenderers.tsx
+++ b/src/app/components/message/MsgTypeRenderers.tsx
@@ -1,8 +1,8 @@
import { CSSProperties, ReactNode, useMemo } from 'react';
import { Box, Chip, Icon, Icons, Text, toRem } from 'folds';
import { IContent } from '$types/matrix-sdk';
-import { JUMBO_EMOJI_REG, URL_REG } from '$appUtils/regex';
-import { trimReplyFromBody } from '$appUtils/room';
+import { JUMBO_EMOJI_REG, URL_REG } from '$utils/regex';
+import { trimReplyFromBody } from '$utils/room';
import {
IAudioContent,
IAudioInfo,
@@ -17,8 +17,8 @@ import {
MATRIX_SPOILER_PROPERTY_NAME,
MATRIX_SPOILER_REASON_PROPERTY_NAME,
} from '$types/matrix/common';
-import { FALLBACK_MIMETYPE, getBlobSafeMimeType } from '$appUtils/mimeTypes';
-import { parseGeoUri, scaleYDimension } from '$appUtils/common';
+import { FALLBACK_MIMETYPE, getBlobSafeMimeType } from '$utils/mimeTypes';
+import { parseGeoUri, scaleYDimension } from '$utils/common';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { Attachment, AttachmentBox, AttachmentContent, AttachmentHeader } from './attachment';
diff --git a/src/app/components/message/Reaction.tsx b/src/app/components/message/Reaction.tsx
index 85223ce5..edc8640b 100644
--- a/src/app/components/message/Reaction.tsx
+++ b/src/app/components/message/Reaction.tsx
@@ -2,8 +2,8 @@ import { Box, Text, as } from 'folds';
import classNames from 'classnames';
import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
import { getHexcodeForEmoji, getShortcodeFor } from '$plugins/emoji';
-import { getMemberDisplayName } from '$appUtils/room';
-import { eventWithShortcode, getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMemberDisplayName } from '$utils/room';
+import { eventWithShortcode, getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
import * as css from './Reaction.css';
diff --git a/src/app/components/message/RenderBody.tsx b/src/app/components/message/RenderBody.tsx
index 40fa84d0..8a4c268b 100644
--- a/src/app/components/message/RenderBody.tsx
+++ b/src/app/components/message/RenderBody.tsx
@@ -1,7 +1,7 @@
import parse, { HTMLReactParserOptions } from 'html-react-parser';
import Linkify from 'linkify-react';
import { Opts } from 'linkifyjs';
-import { sanitizeCustomHtml } from '$appUtils/sanitize';
+import { sanitizeCustomHtml } from '$utils/sanitize';
import { highlightText, scaleSystemEmoji } from '$plugins/react-custom-html-parser';
import { MessageEmptyContent } from './content';
diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx
index ca3190b4..520b64ed 100644
--- a/src/app/components/message/Reply.tsx
+++ b/src/app/components/message/Reply.tsx
@@ -4,13 +4,9 @@ import { MouseEventHandler, ReactNode, useCallback, useMemo } from 'react';
import classNames from 'classnames';
import parse from 'html-react-parser';
import { useAtomValue } from 'jotai';
-import {
- getMemberDisplayName,
- trimReplyFromBody,
- trimReplyFromFormattedBody,
-} from '$appUtils/room';
-import { getMxIdLocalPart } from '$appUtils/matrix';
-import { randomNumberBetween } from '$appUtils/common';
+import { getMemberDisplayName, trimReplyFromBody, trimReplyFromFormattedBody } from '$utils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
+import { randomNumberBetween } from '$utils/common';
import {
getReactCustomHtmlParser,
scaleSystemEmoji,
diff --git a/src/app/components/message/Time.tsx b/src/app/components/message/Time.tsx
index 44265698..f30325c7 100644
--- a/src/app/components/message/Time.tsx
+++ b/src/app/components/message/Time.tsx
@@ -6,7 +6,7 @@ import {
timeHourMinuteSecond,
today,
yesterday,
-} from '$appUtils/time';
+} from '$utils/time';
export type TimeProps = {
compact?: boolean;
diff --git a/src/app/components/message/content/AudioContent.tsx b/src/app/components/message/content/AudioContent.tsx
index 97668806..6ef9349b 100644
--- a/src/app/components/message/content/AudioContent.tsx
+++ b/src/app/components/message/content/AudioContent.tsx
@@ -15,8 +15,8 @@ import {
useMediaVolume,
} from '$hooks/media';
import { useThrottle } from '$hooks/useThrottle';
-import { secondsToMinutesAndSeconds } from '$appUtils/common';
-import { decryptFile, downloadEncryptedMedia, downloadMedia, mxcUrlToHttp } from '$appUtils/matrix';
+import { secondsToMinutesAndSeconds } from '$utils/common';
+import { decryptFile, downloadEncryptedMedia, downloadMedia, mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
const PLAY_TIME_THROTTLE_OPS = {
diff --git a/src/app/components/message/content/FileContent.tsx b/src/app/components/message/content/FileContent.tsx
index 6da0abde..af802d46 100644
--- a/src/app/components/message/content/FileContent.tsx
+++ b/src/app/components/message/content/FileContent.tsx
@@ -20,15 +20,15 @@ import FocusTrap from 'focus-trap-react';
import { IFileInfo } from '$types/matrix/common';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { bytesToSize } from '$appUtils/common';
+import { bytesToSize } from '$utils/common';
import {
READABLE_EXT_TO_MIME_TYPE,
READABLE_TEXT_MIME_TYPES,
getFileNameExt,
mimeTypeToExt,
-} from '$appUtils/mimeTypes';
-import { stopPropagation } from '$appUtils/keyboard';
-import { decryptFile, downloadEncryptedMedia, downloadMedia, mxcUrlToHttp } from '$appUtils/matrix';
+} from '$utils/mimeTypes';
+import { stopPropagation } from '$utils/keyboard';
+import { decryptFile, downloadEncryptedMedia, downloadMedia, mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { ModalWide } from '$styles/Modal.css';
diff --git a/src/app/components/message/content/ImageContent.tsx b/src/app/components/message/content/ImageContent.tsx
index ca66d07f..01756966 100644
--- a/src/app/components/message/content/ImageContent.tsx
+++ b/src/app/components/message/content/ImageContent.tsx
@@ -23,13 +23,13 @@ import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import { IImageInfo, MATRIX_BLUR_HASH_PROPERTY_NAME } from '$types/matrix/common';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { bytesToSize } from '$appUtils/common';
-import { FALLBACK_MIMETYPE } from '$appUtils/mimeTypes';
-import { stopPropagation } from '$appUtils/keyboard';
-import { decryptFile, downloadEncryptedMedia, mxcUrlToHttp } from '$appUtils/matrix';
+import { bytesToSize } from '$utils/common';
+import { FALLBACK_MIMETYPE } from '$utils/mimeTypes';
+import { stopPropagation } from '$utils/keyboard';
+import { decryptFile, downloadEncryptedMedia, mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { ModalWide } from '$styles/Modal.css';
-import { validBlurHash } from '$appUtils/blurHash';
+import { validBlurHash } from '$utils/blurHash';
import * as css from './style.css';
type RenderViewerProps = {
diff --git a/src/app/components/message/content/ThumbnailContent.tsx b/src/app/components/message/content/ThumbnailContent.tsx
index b543aed5..2d0510be 100644
--- a/src/app/components/message/content/ThumbnailContent.tsx
+++ b/src/app/components/message/content/ThumbnailContent.tsx
@@ -2,9 +2,9 @@ import { ReactNode, useCallback, useEffect } from 'react';
import { IThumbnailContent } from '$types/matrix/common';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { decryptFile, downloadEncryptedMedia, mxcUrlToHttp } from '$appUtils/matrix';
+import { decryptFile, downloadEncryptedMedia, mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { FALLBACK_MIMETYPE } from '$appUtils/mimeTypes';
+import { FALLBACK_MIMETYPE } from '$utils/mimeTypes';
export type ThumbnailContentProps = {
info: IThumbnailContent;
diff --git a/src/app/components/message/content/VideoContent.tsx b/src/app/components/message/content/VideoContent.tsx
index 5c24b765..bb267d70 100644
--- a/src/app/components/message/content/VideoContent.tsx
+++ b/src/app/components/message/content/VideoContent.tsx
@@ -22,10 +22,10 @@ import {
} from '$types/matrix/common';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { bytesToSize, millisecondsToMinutesAndSeconds } from '$appUtils/common';
-import { decryptFile, downloadEncryptedMedia, downloadMedia, mxcUrlToHttp } from '$appUtils/matrix';
+import { bytesToSize, millisecondsToMinutesAndSeconds } from '$utils/common';
+import { decryptFile, downloadEncryptedMedia, downloadMedia, mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { validBlurHash } from '$appUtils/blurHash';
+import { validBlurHash } from '$utils/blurHash';
import * as css from './style.css';
type RenderVideoProps = {
diff --git a/src/app/components/message/modals/GlobalModalManager.tsx b/src/app/components/message/modals/GlobalModalManager.tsx
index ec827f76..e01c73bb 100644
--- a/src/app/components/message/modals/GlobalModalManager.tsx
+++ b/src/app/components/message/modals/GlobalModalManager.tsx
@@ -1,7 +1,7 @@
import { useAtom } from 'jotai';
import { Overlay, OverlayBackdrop, OverlayCenter, Box, Modal } from 'folds';
import FocusTrap from 'focus-trap-react';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { modalAtom, ModalType } from '$state/modal';
import { MessageReportInternal } from './MessageReport';
import { MessageDeleteInternal } from './MessageDelete';
diff --git a/src/app/components/message/modals/MessageSource.tsx b/src/app/components/message/modals/MessageSource.tsx
index 7de45b73..eff8e1e5 100644
--- a/src/app/components/message/modals/MessageSource.tsx
+++ b/src/app/components/message/modals/MessageSource.tsx
@@ -3,7 +3,7 @@ import { Room, MatrixEvent } from '$types/matrix-sdk';
import { useSetAtom } from 'jotai';
import { MenuItem, Icon, Icons, Text } from 'folds';
import { TextViewer } from '$components/text-viewer';
-import { getEventEdits } from '$appUtils/room';
+import { getEventEdits } from '$utils/room';
import { modalAtom, ModalType } from '$state/modal';
import * as css from '$features/room/message/styles.css';
diff --git a/src/app/components/message/placeholder/CompactPlaceholder.tsx b/src/app/components/message/placeholder/CompactPlaceholder.tsx
index 62d9ca23..6702a045 100644
--- a/src/app/components/message/placeholder/CompactPlaceholder.tsx
+++ b/src/app/components/message/placeholder/CompactPlaceholder.tsx
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
import { as, ContainerColor, toRem } from 'folds';
-import { randomNumberBetween } from '$appUtils/common';
+import { randomNumberBetween } from '$utils/common';
import { LinePlaceholder } from './LinePlaceholder';
import { CompactLayout } from '../layout';
diff --git a/src/app/components/message/placeholder/DefaultPlaceholder.tsx b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
index 21fbc6e2..33db0adf 100644
--- a/src/app/components/message/placeholder/DefaultPlaceholder.tsx
+++ b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
@@ -1,6 +1,6 @@
import { CSSProperties, useMemo } from 'react';
import { Avatar, Box, ContainerColor, as, color, toRem } from 'folds';
-import { randomNumberBetween } from '$appUtils/common';
+import { randomNumberBetween } from '$utils/common';
import { LinePlaceholder } from './LinePlaceholder';
import { ModernLayout } from '../layout';
diff --git a/src/app/components/power/PowerIcon.tsx b/src/app/components/power/PowerIcon.tsx
index d62b8c12..f8633103 100644
--- a/src/app/components/power/PowerIcon.tsx
+++ b/src/app/components/power/PowerIcon.tsx
@@ -1,4 +1,4 @@
-import { JUMBO_EMOJI_REG } from '$appUtils/regex';
+import { JUMBO_EMOJI_REG } from '$utils/regex';
import * as css from './style.css';
type PowerIconProps = css.PowerIconVariants & {
diff --git a/src/app/components/power/PowerSelector.tsx b/src/app/components/power/PowerSelector.tsx
index 1134bb51..23188aea 100644
--- a/src/app/components/power/PowerSelector.tsx
+++ b/src/app/components/power/PowerSelector.tsx
@@ -2,7 +2,7 @@ import { forwardRef, MouseEventHandler, ReactNode, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { Box, config, Menu, MenuItem, PopOut, Scroll, Text, toRem, RectCords } from 'folds';
import { getPowers, PowerLevelTags } from '$hooks/usePowerLevelTags';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { PowerColorBadge } from './PowerColorBadge';
type PowerSelectorProps = {
diff --git a/src/app/components/room-avatar/RoomAvatar.tsx b/src/app/components/room-avatar/RoomAvatar.tsx
index 856ce62a..8a8c1372 100644
--- a/src/app/components/room-avatar/RoomAvatar.tsx
+++ b/src/app/components/room-avatar/RoomAvatar.tsx
@@ -1,8 +1,8 @@
import { JoinRule } from '$types/matrix-sdk';
import { AvatarFallback, AvatarImage, Icon, Icons, color } from 'folds';
import { ComponentProps, ReactEventHandler, ReactNode, forwardRef, useState } from 'react';
-import { getRoomIconSrc } from '$appUtils/room';
-import colorMXID from '$appUtils/colorMXID';
+import { getRoomIconSrc } from '$utils/room';
+import colorMXID from '$utils/colorMXID';
import * as css from './RoomAvatar.css';
type RoomAvatarProps = {
diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx
index 5f117b2f..aca8070c 100644
--- a/src/app/components/room-card/RoomCard.tsx
+++ b/src/app/components/room-card/RoomCard.tsx
@@ -19,16 +19,16 @@ import {
} from 'folds';
import classNames from 'classnames';
import FocusTrap from 'focus-trap-react';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
-import { nameInitials } from '$appUtils/common';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
+import { nameInitials } from '$utils/common';
import { millify } from '$plugins/millify';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { onEnterOrSpace, stopPropagation } from '$appUtils/keyboard';
+import { onEnterOrSpace, stopPropagation } from '$utils/keyboard';
import { RoomType, StateEvent } from '$types/matrix/room';
import { useJoinedRoomId } from '$hooks/useJoinedRoomId';
import { useElementSizeObserver } from '$hooks/useElementSizeObserver';
-import { getRoomAvatarUrl, getStateEvent } from '$appUtils/room';
+import { getRoomAvatarUrl, getStateEvent } from '$utils/room';
import { useStateEventCallback } from '$hooks/useStateEventCallback';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { RoomAvatar } from '../room-avatar';
diff --git a/src/app/components/room-intro/RoomIntro.tsx b/src/app/components/room-intro/RoomIntro.tsx
index eccfbc0d..980eb183 100644
--- a/src/app/components/room-intro/RoomIntro.tsx
+++ b/src/app/components/room-intro/RoomIntro.tsx
@@ -3,14 +3,14 @@ import { Avatar, Box, Button, Spinner, Text, as } from 'folds';
import { Room } from '$types/matrix-sdk';
import { useAtomValue } from 'jotai';
import { IRoomCreateContent, Membership, StateEvent } from '$types/matrix/room';
-import { getMemberDisplayName, getStateEvent } from '$appUtils/room';
+import { getMemberDisplayName, getStateEvent } from '$utils/room';
import { nicknamesAtom } from '$state/nicknames';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { timeDayMonthYear, timeHourMinute } from '$appUtils/time';
+import { timeDayMonthYear, timeHourMinute } from '$utils/time';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
-import { nameInitials } from '$appUtils/common';
+import { nameInitials } from '$utils/common';
import { useRoomAvatar, useRoomName, useRoomTopic } from '$hooks/useRoomMeta';
import { mDirectAtom } from '$state/mDirectList';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
diff --git a/src/app/components/text-viewer/TextViewer.tsx b/src/app/components/text-viewer/TextViewer.tsx
index 9a353bbf..317d510f 100644
--- a/src/app/components/text-viewer/TextViewer.tsx
+++ b/src/app/components/text-viewer/TextViewer.tsx
@@ -2,7 +2,7 @@ import { ComponentProps, HTMLAttributes, Suspense, forwardRef, lazy } from 'reac
import classNames from 'classnames';
import { Box, Chip, Header, Icon, IconButton, Icons, Scroll, Text, as } from 'folds';
import { ErrorBoundary } from 'react-error-boundary';
-import { copyToClipboard } from '$appUtils/dom';
+import { copyToClipboard } from '$utils/dom';
import * as css from './TextViewer.css';
const ReactPrism = lazy(() => import('$plugins/react-prism/ReactPrism'));
diff --git a/src/app/components/time-date/DatePicker.tsx b/src/app/components/time-date/DatePicker.tsx
index 68407faa..c2daca42 100644
--- a/src/app/components/time-date/DatePicker.tsx
+++ b/src/app/components/time-date/DatePicker.tsx
@@ -1,7 +1,7 @@
import { forwardRef } from 'react';
import { Menu, Box, Text, Chip } from 'folds';
import dayjs from 'dayjs';
-import { dateFor, daysInMonth, daysToMs } from '$appUtils/time';
+import { dateFor, daysInMonth, daysToMs } from '$utils/time';
import * as css from './styles.css';
import { PickerColumn } from './PickerColumn';
diff --git a/src/app/components/time-date/TimePicker.tsx b/src/app/components/time-date/TimePicker.tsx
index d2f013ad..b90b7834 100644
--- a/src/app/components/time-date/TimePicker.tsx
+++ b/src/app/components/time-date/TimePicker.tsx
@@ -1,7 +1,7 @@
import { forwardRef } from 'react';
import { Menu, Box, Text, Chip } from 'folds';
import dayjs from 'dayjs';
-import { hour12to24, hour24to12, hoursToMs, inSameDay, minutesToMs } from '$appUtils/time';
+import { hour12to24, hour24to12, hoursToMs, inSameDay, minutesToMs } from '$utils/time';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { PickerColumn } from './PickerColumn';
diff --git a/src/app/components/upload-card/CompactUploadCardRenderer.tsx b/src/app/components/upload-card/CompactUploadCardRenderer.tsx
index 59107431..c4f5cdfa 100644
--- a/src/app/components/upload-card/CompactUploadCardRenderer.tsx
+++ b/src/app/components/upload-card/CompactUploadCardRenderer.tsx
@@ -2,8 +2,8 @@ import { useEffect } from 'react';
import { Chip, Icon, IconButton, Icons, Text, color } from 'folds';
import { TUploadAtom, UploadStatus, UploadSuccess, useBindUploadAtom } from '$state/upload';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { TUploadContent } from '$appUtils/matrix';
-import { bytesToSize, getFileTypeIcon } from '$appUtils/common';
+import { TUploadContent } from '$utils/matrix';
+import { bytesToSize, getFileTypeIcon } from '$utils/common';
import { useMediaConfig } from '$hooks/useMediaConfig';
import { UploadCard, UploadCardError, CompactUploadCardProgress } from './UploadCard';
diff --git a/src/app/components/upload-card/UploadCard.tsx b/src/app/components/upload-card/UploadCard.tsx
index 47933a8e..bfe11d47 100644
--- a/src/app/components/upload-card/UploadCard.tsx
+++ b/src/app/components/upload-card/UploadCard.tsx
@@ -1,7 +1,7 @@
import { Badge, Box, Icon, Icons, ProgressBar, Text, percent } from 'folds';
import { ReactNode, forwardRef } from 'react';
-import { bytesToSize } from '$appUtils/common';
+import { bytesToSize } from '$utils/common';
import * as css from './UploadCard.css';
type UploadCardProps = {
diff --git a/src/app/components/upload-card/UploadCardRenderer.tsx b/src/app/components/upload-card/UploadCardRenderer.tsx
index b47f6501..8ff54ff0 100644
--- a/src/app/components/upload-card/UploadCardRenderer.tsx
+++ b/src/app/components/upload-card/UploadCardRenderer.tsx
@@ -2,8 +2,8 @@ import { ReactNode, useEffect } from 'react';
import { Box, Chip, Icon, IconButton, Icons, Text, color, config, toRem } from 'folds';
import { UploadStatus, UploadSuccess, useBindUploadAtom } from '$state/upload';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { TUploadContent } from '$appUtils/matrix';
-import { bytesToSize, getFileTypeIcon } from '$appUtils/common';
+import { TUploadContent } from '$utils/matrix';
+import { bytesToSize, getFileTypeIcon } from '$utils/common';
import { roomUploadAtomFamily, TUploadItem, TUploadMetadata } from '$state/room/roomInputDrafts';
import { useObjectURL } from '$hooks/useObjectURL';
import { useMediaConfig } from '$hooks/useMediaConfig';
diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx
index 1d58207a..6ac2b0e5 100644
--- a/src/app/components/url-preview/UrlPreviewCard.tsx
+++ b/src/app/components/url-preview/UrlPreviewCard.tsx
@@ -7,7 +7,7 @@ import {
getIntersectionObserverEntry,
useIntersectionObserver,
} from '$hooks/useIntersectionObserver';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import * as css from './UrlPreviewCard.css';
import { UrlPreview, UrlPreviewContent, UrlPreviewDescription, UrlPreviewImg } from './UrlPreview';
diff --git a/src/app/components/user-avatar/UserAvatar.tsx b/src/app/components/user-avatar/UserAvatar.tsx
index cdc5194b..3659cb30 100644
--- a/src/app/components/user-avatar/UserAvatar.tsx
+++ b/src/app/components/user-avatar/UserAvatar.tsx
@@ -1,7 +1,7 @@
import { AvatarFallback, AvatarImage, color } from 'folds';
import { ReactEventHandler, ReactNode, useState } from 'react';
import classNames from 'classnames';
-import colorMXID from '$appUtils/colorMXID';
+import colorMXID from '$utils/colorMXID';
import * as css from './UserAvatar.css';
type UserAvatarProps = {
diff --git a/src/app/components/user-profile/CreatorChip.tsx b/src/app/components/user-profile/CreatorChip.tsx
index 530833ed..5c66079d 100644
--- a/src/app/components/user-profile/CreatorChip.tsx
+++ b/src/app/components/user-profile/CreatorChip.tsx
@@ -6,7 +6,7 @@ import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useRoom } from '$hooks/useRoom';
import { useSpaceOptionally } from '$hooks/useSpace';
import { useOpenRoomSettings } from '$state/hooks/roomSettings';
diff --git a/src/app/components/user-profile/PowerChip.tsx b/src/app/components/user-profile/PowerChip.tsx
index 6346b19c..391b94a0 100644
--- a/src/app/components/user-profile/PowerChip.tsx
+++ b/src/app/components/user-profile/PowerChip.tsx
@@ -27,7 +27,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useGetMemberPowerLevel, usePowerLevels } from '$hooks/usePowerLevels';
import { getPowers, usePowerLevelTags } from '$hooks/usePowerLevelTags';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { StateEvent } from '$types/matrix/room';
import { useOpenRoomSettings } from '$state/hooks/roomSettings';
import { RoomSettingsPage } from '$state/roomSettings';
diff --git a/src/app/components/user-profile/UserChips.tsx b/src/app/components/user-profile/UserChips.tsx
index d70411d7..f2df0207 100644
--- a/src/app/components/user-profile/UserChips.tsx
+++ b/src/app/components/user-profile/UserChips.tsx
@@ -28,20 +28,20 @@ import {
Avatar,
} from 'folds';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
import { useCloseUserRoomProfile } from '$state/hooks/userRoomProfile';
-import { stopPropagation } from '$appUtils/keyboard';
-import { copyToClipboard } from '$appUtils/dom';
+import { stopPropagation } from '$utils/keyboard';
+import { copyToClipboard } from '$utils/dom';
import { getExploreServerPath } from '$pages/pathUtils';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { factoryRoomIdByAtoZ } from '$appUtils/sort';
+import { factoryRoomIdByAtoZ } from '$utils/sort';
import { useMutualRooms, useMutualRoomsSupport } from '$hooks/useMutualRooms';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { useDirectRooms } from '$pages/client/direct/useDirectRooms';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
-import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$appUtils/room';
-import { nameInitials } from '$appUtils/common';
+import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$utils/room';
+import { nameInitials } from '$utils/common';
import { getMatrixToUser } from '$plugins/matrix-to';
import { useTimeoutToggle } from '$hooks/useTimeoutToggle';
import { useIgnoredUsers } from '$hooks/useIgnoredUsers';
diff --git a/src/app/components/user-profile/UserHero.tsx b/src/app/components/user-profile/UserHero.tsx
index 43b90d08..c696e316 100644
--- a/src/app/components/user-profile/UserHero.tsx
+++ b/src/app/components/user-profile/UserHero.tsx
@@ -12,11 +12,11 @@ import {
} from 'folds';
import classNames from 'classnames';
import FocusTrap from 'focus-trap-react';
-import colorMXID from '$appUtils/colorMXID';
-import { getMxIdLocalPart } from '$appUtils/matrix';
+import colorMXID from '$utils/colorMXID';
+import { getMxIdLocalPart } from '$utils/matrix';
import { BreakWord, LineClamp3 } from '$styles/Text.css';
import { UserPresence } from '$hooks/useUserPresence';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useRoom } from '$hooks/useRoom';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
import { useNickname } from '$hooks/useNickname';
diff --git a/src/app/components/user-profile/UserModeration.tsx b/src/app/components/user-profile/UserModeration.tsx
index 9fed6780..8c202f8e 100644
--- a/src/app/components/user-profile/UserModeration.tsx
+++ b/src/app/components/user-profile/UserModeration.tsx
@@ -6,7 +6,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { BreakWord } from '$styles/Text.css';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
-import { timeDayMonYear, timeHourMinute } from '$appUtils/time';
+import { timeDayMonYear, timeHourMinute } from '$utils/time';
import { SettingTile } from '../setting-tile';
import { CutoutCard } from '../cutout-card';
diff --git a/src/app/components/user-profile/UserRoomProfile.tsx b/src/app/components/user-profile/UserRoomProfile.tsx
index ffb99917..e5e26e6b 100644
--- a/src/app/components/user-profile/UserRoomProfile.tsx
+++ b/src/app/components/user-profile/UserRoomProfile.tsx
@@ -4,8 +4,8 @@ import { useNavigate } from 'react-router-dom';
import { useAtomValue } from 'jotai';
import { Opts as LinkifyOpts } from 'linkifyjs';
import { HTMLReactParserOptions } from 'html-react-parser';
-import { getMxIdServer, mxcUrlToHttp } from '$appUtils/matrix';
-import { getMemberAvatarMxc, getMemberDisplayName } from '$appUtils/room';
+import { getMxIdServer, mxcUrlToHttp } from '$utils/matrix';
+import { getMemberAvatarMxc, getMemberDisplayName } from '$utils/room';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { usePowerLevels } from '$hooks/usePowerLevels';
diff --git a/src/app/features/add-existing/AddExisting.tsx b/src/app/features/add-existing/AddExisting.tsx
index 605457b5..c6ba336a 100644
--- a/src/app/features/add-existing/AddExisting.tsx
+++ b/src/app/features/add-existing/AddExisting.tsx
@@ -30,7 +30,7 @@ import {
import { useAtomValue } from 'jotai';
import { useVirtualizer } from '@tanstack/react-virtual';
import { Room } from '$types/matrix-sdk';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useDirects, useRooms, useSpaces } from '$state/hooks/roomList';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { allRoomsAtom } from '$state/room-list/roomList';
@@ -38,17 +38,17 @@ import { mDirectAtom } from '$state/mDirectList';
import { roomToParentsAtom } from '$state/room/roomToParents';
import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
import { VirtualTile } from '$components/virtualizer';
-import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$appUtils/room';
+import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$utils/room';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
-import { nameInitials } from '$appUtils/common';
+import { nameInitials } from '$utils/common';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { factoryRoomIdByAtoZ } from '$appUtils/sort';
+import { factoryRoomIdByAtoZ } from '$utils/sort';
import { SearchItemStrGetter, useAsyncSearch, UseAsyncSearchOptions } from '$hooks/useAsyncSearch';
import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { StateEvent } from '$types/matrix/room';
import { getViaServers } from '$plugins/via-servers';
-import { rateLimitedActions } from '$appUtils/matrix';
+import { rateLimitedActions } from '$utils/matrix';
import { useAlive } from '$hooks/useAlive';
const SEARCH_OPTS: UseAsyncSearchOptions = {
diff --git a/src/app/features/call/CallView.tsx b/src/app/features/call/CallView.tsx
index f42175d7..485cd331 100644
--- a/src/app/features/call/CallView.tsx
+++ b/src/app/features/call/CallView.tsx
@@ -18,8 +18,8 @@ import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useDebounce } from '$hooks/useDebounce';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
-import { getMemberDisplayName } from '$appUtils/room';
-import { getMxIdLocalPart } from '$appUtils/matrix';
+import { getMemberDisplayName } from '$utils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
diff --git a/src/app/features/call/CallViewUser.tsx b/src/app/features/call/CallViewUser.tsx
index e4e18c1c..2de556b5 100644
--- a/src/app/features/call/CallViewUser.tsx
+++ b/src/app/features/call/CallViewUser.tsx
@@ -4,8 +4,8 @@ import classNames from 'classnames';
import { Room, CallMembership } from '$types/matrix-sdk';
import { UserAvatar } from '$components/user-avatar';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdLocalPart } from '$appUtils/matrix';
-import { getMemberAvatarMxc, getMemberDisplayName } from '$appUtils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
+import { getMemberAvatarMxc, getMemberDisplayName } from '$utils/room';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
diff --git a/src/app/features/call/SmallWidget.ts b/src/app/features/call/SmallWidget.ts
index 6257af7b..bf17bf22 100644
--- a/src/app/features/call/SmallWidget.ts
+++ b/src/app/features/call/SmallWidget.ts
@@ -27,7 +27,7 @@ import {
WidgetApiFromWidgetAction,
WidgetKind,
} from 'matrix-widget-api';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import { CinnyWidget } from './CinnyWidget';
import { SmallWidgetDriver } from './SmallWidgetDriver';
diff --git a/src/app/features/common-settings/cosmetics/Cosmetics.tsx b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
index 343fae56..b309befa 100644
--- a/src/app/features/common-settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
@@ -9,7 +9,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { StateEvent } from '$types/matrix/room';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import { SequenceCardStyle } from '../styles.css';
type CosmeticsProps = {
diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
index 98972bad..adabc321 100644
--- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
@@ -17,7 +17,7 @@ import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
-import { copyToClipboard } from '$appUtils/dom';
+import { copyToClipboard } from '$utils/dom';
import { useRoom } from '$hooks/useRoom';
import { useRoomState } from '$hooks/useRoomState';
import { useRoomAccountData } from '$hooks/useRoomAccountData';
diff --git a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
index 478f0519..b246b14b 100644
--- a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
+++ b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx
@@ -20,7 +20,7 @@ import { useRoom } from '$hooks/useRoom';
import { useAlive } from '$hooks/useAlive';
import { useTextAreaCodeEditor } from '$hooks/useTextAreaCodeEditor';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { syntaxErrorPosition } from '$appUtils/dom';
+import { syntaxErrorPosition } from '$utils/dom';
import { Cursor } from '$plugins/text-area';
const EDITOR_INTENT_SPACE_COUNT = 2;
diff --git a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
index d44f2b69..76037012 100644
--- a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
+++ b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
@@ -24,7 +24,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { useAlive } from '$hooks/useAlive';
import { Cursor } from '$plugins/text-area';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { syntaxErrorPosition } from '$appUtils/dom';
+import { syntaxErrorPosition } from '$utils/dom';
import { SettingTile } from '$components/setting-tile';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { useTextAreaCodeEditor } from '$hooks/useTextAreaCodeEditor';
diff --git a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
index e3edb6a9..57cc250c 100644
--- a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
+++ b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
@@ -30,11 +30,11 @@ import { useRoomImagePacks } from '$hooks/useImagePacks';
import { LineClamp2 } from '$styles/Text.css';
import { SettingTile } from '$components/setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { StateEvent } from '$types/matrix/room';
-import { suffixRename } from '$appUtils/common';
+import { suffixRename } from '$utils/common';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAlive } from '$hooks/useAlive';
import { useRoomCreators } from '$hooks/useRoomCreators';
diff --git a/src/app/features/common-settings/general/RoomAddress.tsx b/src/app/features/common-settings/general/RoomAddress.tsx
index 2138acf7..f1ae6696 100644
--- a/src/app/features/common-settings/general/RoomAddress.tsx
+++ b/src/app/features/common-settings/general/RoomAddress.tsx
@@ -28,11 +28,11 @@ import {
} from '$hooks/useRoomAliases';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { CutoutCard } from '$components/cutout-card';
-import { replaceSpaceWithDash } from '$appUtils/common';
+import { replaceSpaceWithDash } from '$utils/common';
import { useAlive } from '$hooks/useAlive';
import { StateEvent } from '$types/matrix/room';
import { RoomPermissionsAPI } from '$hooks/useRoomPermissions';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
type RoomPublishedAddressesProps = {
permissions: RoomPermissionsAPI;
diff --git a/src/app/features/common-settings/general/RoomEncryption.tsx b/src/app/features/common-settings/general/RoomEncryption.tsx
index 25ea12aa..3dc87f84 100644
--- a/src/app/features/common-settings/general/RoomEncryption.tsx
+++ b/src/app/features/common-settings/general/RoomEncryption.tsx
@@ -26,7 +26,7 @@ import { StateEvent } from '$types/matrix/room';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useRoom } from '$hooks/useRoom';
import { useStateEvent } from '$hooks/useStateEvent';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { RoomPermissionsAPI } from '$hooks/useRoomPermissions';
const ROOM_ENC_ALGO = 'm.megolm.v1.aes-sha2';
diff --git a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx
index b0064793..2f93472e 100644
--- a/src/app/features/common-settings/general/RoomHistoryVisibility.tsx
+++ b/src/app/features/common-settings/general/RoomHistoryVisibility.tsx
@@ -26,7 +26,7 @@ import { useRoom } from '$hooks/useRoom';
import { StateEvent } from '$types/matrix/room';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useStateEvent } from '$hooks/useStateEvent';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { RoomPermissionsAPI } from '$hooks/useRoomPermissions';
const useVisibilityStr = () =>
diff --git a/src/app/features/common-settings/general/RoomJoinRules.tsx b/src/app/features/common-settings/general/RoomJoinRules.tsx
index f2b09374..5a6c3697 100644
--- a/src/app/features/common-settings/general/RoomJoinRules.tsx
+++ b/src/app/features/common-settings/general/RoomJoinRules.tsx
@@ -22,11 +22,11 @@ import { StateEvent } from '$types/matrix/room';
import { useStateEvent } from '$hooks/useStateEvent';
import { useSpaceOptionally } from '$hooks/useSpace';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { getStateEvents } from '$appUtils/room';
+import { getStateEvents } from '$utils/room';
import { useRecursiveChildSpaceScopeFactory, useSpaceChildren } from '$state/hooks/roomList';
import { allRoomsAtom } from '$state/room-list/roomList';
import { roomToParentsAtom } from '$state/room/roomToParents';
-import { knockRestrictedSupported, knockSupported, restrictedSupported } from '$appUtils/matrix';
+import { knockRestrictedSupported, knockSupported, restrictedSupported } from '$utils/matrix';
import { RoomPermissionsAPI } from '$hooks/useRoomPermissions';
type RestrictedRoomAllowContent = {
diff --git a/src/app/features/common-settings/general/RoomProfile.tsx b/src/app/features/common-settings/general/RoomProfile.tsx
index e3a0daf7..cd523f32 100644
--- a/src/app/features/common-settings/general/RoomProfile.tsx
+++ b/src/app/features/common-settings/general/RoomProfile.tsx
@@ -24,7 +24,7 @@ import { mDirectAtom } from '$state/mDirectList';
import { BreakWord, LineClamp3 } from '$styles/Text.css';
import { LINKIFY_OPTS } from '$plugins/react-custom-html-parser';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { StateEvent } from '$types/matrix/room';
diff --git a/src/app/features/common-settings/general/RoomUpgrade.tsx b/src/app/features/common-settings/general/RoomUpgrade.tsx
index e3a6a641..07346568 100644
--- a/src/app/features/common-settings/general/RoomUpgrade.tsx
+++ b/src/app/features/common-settings/general/RoomUpgrade.tsx
@@ -27,7 +27,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { useStateEvent } from '$hooks/useStateEvent';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { useCapabilities } from '$hooks/useCapabilities';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { RoomPermissionsAPI } from '$hooks/useRoomPermissions';
import {
AdditionalCreatorInput,
@@ -35,7 +35,7 @@ import {
useAdditionalCreators,
} from '$components/create-room';
import { useAlive } from '$hooks/useAlive';
-import { creatorsSupported } from '$appUtils/matrix';
+import { creatorsSupported } from '$utils/matrix';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { BreakWord } from '$styles/Text.css';
diff --git a/src/app/features/common-settings/members/Members.tsx b/src/app/features/common-settings/members/Members.tsx
index 743e40b4..19b8ffc4 100644
--- a/src/app/features/common-settings/members/Members.tsx
+++ b/src/app/features/common-settings/members/Members.tsx
@@ -31,11 +31,11 @@ import { useGetMemberPowerLevel, usePowerLevels } from '$hooks/usePowerLevels';
import { VirtualTile } from '$components/virtualizer';
import { MemberTile } from '$components/member-tile';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { getMxIdLocalPart, getMxIdServer } from '$appUtils/matrix';
+import { getMxIdLocalPart, getMxIdServer } from '$utils/matrix';
import { ServerBadge } from '$components/server-badge';
import { useDebounce } from '$hooks/useDebounce';
import { SearchItemStrGetter, useAsyncSearch, UseAsyncSearchOptions } from '$hooks/useAsyncSearch';
-import { getMemberSearchStr } from '$appUtils/room';
+import { getMemberSearchStr } from '$utils/room';
import { useMembershipFilter, useMembershipFilterMenu } from '$hooks/useMemberFilter';
import { useMemberPowerSort, useMemberSort, useMemberSortMenu } from '$hooks/useMemberSort';
import { settingsAtom } from '$state/settings';
@@ -48,7 +48,7 @@ import { useOpenUserRoomProfile, useUserRoomProfileState } from '$state/hooks/us
import { useSpaceOptionally } from '$hooks/useSpace';
import { useFlattenPowerTagMembers, useGetMemberPowerTag } from '$hooks/useMemberPowerTag';
import { useRoomCreators } from '$hooks/useRoomCreators';
-import { getMouseEventCords } from '$appUtils/dom';
+import { getMouseEventCords } from '$utils/dom';
const SEARCH_OPTIONS: UseAsyncSearchOptions = {
limit: 1000,
diff --git a/src/app/features/common-settings/permissions/Powers.tsx b/src/app/features/common-settings/permissions/Powers.tsx
index 1059a95a..1bbe4a2e 100644
--- a/src/app/features/common-settings/permissions/Powers.tsx
+++ b/src/app/features/common-settings/permissions/Powers.tsx
@@ -22,7 +22,7 @@ import { useRoom } from '$hooks/useRoom';
import { PowerColorBadge, PowerIcon } from '$components/power';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag';
import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
import { useRoomCreators } from '$hooks/useRoomCreators';
diff --git a/src/app/features/common-settings/permissions/PowersEditor.tsx b/src/app/features/common-settings/permissions/PowersEditor.tsx
index 8797138a..214b172c 100644
--- a/src/app/features/common-settings/permissions/PowersEditor.tsx
+++ b/src/app/features/common-settings/permissions/PowersEditor.tsx
@@ -47,7 +47,7 @@ import { MemberPowerTag, MemberPowerTagIcon, StateEvent } from '$types/matrix/ro
import { useAlive } from '$hooks/useAlive';
import { BetaNoticeBadge } from '$components/BetaNoticeBadge';
import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag';
-import { creatorsSupported } from '$appUtils/matrix';
+import { creatorsSupported } from '$utils/matrix';
import { SequenceCardStyle } from '../styles.css';
type EditPowerProps = {
diff --git a/src/app/features/create-chat/CreateChat.tsx b/src/app/features/create-chat/CreateChat.tsx
index 979d6494..225ef9b6 100644
--- a/src/app/features/create-chat/CreateChat.tsx
+++ b/src/app/features/create-chat/CreateChat.tsx
@@ -4,10 +4,10 @@ import { ICreateRoomStateEvent, MatrixError, Preset, Visibility } from '$types/m
import { useNavigate } from 'react-router-dom';
import { SettingTile } from '$components/setting-tile';
import { SequenceCard } from '$components/sequence-card';
-import { addRoomIdToMDirect, isUserId } from '$appUtils/matrix';
+import { addRoomIdToMDirect, isUserId } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { millisecondsToMinutes } from '$appUtils/common';
+import { millisecondsToMinutes } from '$utils/common';
import { createRoomEncryptionState } from '$components/create-room';
import { useAlive } from '$hooks/useAlive';
import { getDirectRoomPath } from '$pages/pathUtils';
diff --git a/src/app/features/create-room/CreateRoom.tsx b/src/app/features/create-room/CreateRoom.tsx
index da1d98f6..38716c45 100644
--- a/src/app/features/create-room/CreateRoom.tsx
+++ b/src/app/features/create-room/CreateRoom.tsx
@@ -21,9 +21,9 @@ import {
knockRestrictedSupported,
knockSupported,
restrictedSupported,
-} from '$appUtils/matrix';
+} from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { millisecondsToMinutes, replaceSpaceWithDash } from '$appUtils/common';
+import { millisecondsToMinutes, replaceSpaceWithDash } from '$utils/common';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useCapabilities } from '$hooks/useCapabilities';
import { useAlive } from '$hooks/useAlive';
@@ -40,7 +40,7 @@ import {
} from '$components/create-room';
import { RoomType } from '$types/matrix/room';
import { CreateRoomTypeSelector } from '$components/create-room/CreateRoomTypeSelector';
-import { getRoomIconSrc } from '$appUtils/room';
+import { getRoomIconSrc } from '$utils/room';
import { ErrorCode } from '../../cs-errorcode';
const getCreateRoomAccessToIcon = (access: CreateRoomAccess, type?: CreateRoomType) => {
diff --git a/src/app/features/create-room/CreateRoomModal.tsx b/src/app/features/create-room/CreateRoomModal.tsx
index 4385b539..d17922c0 100644
--- a/src/app/features/create-room/CreateRoomModal.tsx
+++ b/src/app/features/create-room/CreateRoomModal.tsx
@@ -17,7 +17,7 @@ import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
import { SpaceProvider } from '$hooks/useSpace';
import { useCloseCreateRoomModal, useCreateRoomModalState } from '$state/hooks/createRoomModal';
import { CreateRoomModalState } from '$state/createRoomModal';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { CreateRoomType } from '$components/create-room/types';
import { CreateRoomForm } from './CreateRoom';
diff --git a/src/app/features/create-space/CreateSpace.tsx b/src/app/features/create-space/CreateSpace.tsx
index c5fdf0d3..2fbeb198 100644
--- a/src/app/features/create-space/CreateSpace.tsx
+++ b/src/app/features/create-space/CreateSpace.tsx
@@ -21,9 +21,9 @@ import {
knockRestrictedSupported,
knockSupported,
restrictedSupported,
-} from '$appUtils/matrix';
+} from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { millisecondsToMinutes, replaceSpaceWithDash } from '$appUtils/common';
+import { millisecondsToMinutes, replaceSpaceWithDash } from '$utils/common';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useCapabilities } from '$hooks/useCapabilities';
import { useAlive } from '$hooks/useAlive';
diff --git a/src/app/features/create-space/CreateSpaceModal.tsx b/src/app/features/create-space/CreateSpaceModal.tsx
index ffd6c35a..3ef0da51 100644
--- a/src/app/features/create-space/CreateSpaceModal.tsx
+++ b/src/app/features/create-space/CreateSpaceModal.tsx
@@ -17,7 +17,7 @@ import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
import { SpaceProvider } from '$hooks/useSpace';
import { useCloseCreateSpaceModal, useCreateSpaceModalState } from '$state/hooks/createSpaceModal';
import { CreateSpaceModalState } from '$state/createSpaceModal';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { CreateSpaceForm } from './CreateSpace';
type CreateSpaceModalProps = {
diff --git a/src/app/features/lobby/HierarchyItemMenu.tsx b/src/app/features/lobby/HierarchyItemMenu.tsx
index b598a6a5..bbaf3885 100644
--- a/src/app/features/lobby/HierarchyItemMenu.tsx
+++ b/src/app/features/lobby/HierarchyItemMenu.tsx
@@ -22,7 +22,7 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { UseStateProvider } from '$components/UseStateProvider';
import { LeaveSpacePrompt } from '$components/leave-space-prompt';
import { LeaveRoomPrompt } from '$components/leave-room-prompt';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useOpenRoomSettings } from '$state/hooks/roomSettings';
import { useSpaceOptionally } from '$hooks/useSpace';
import { useOpenSpaceSettings } from '$state/hooks/spaceSettings';
diff --git a/src/app/features/lobby/Lobby.tsx b/src/app/features/lobby/Lobby.tsx
index e54f5ee9..605a735e 100644
--- a/src/app/features/lobby/Lobby.tsx
+++ b/src/app/features/lobby/Lobby.tsx
@@ -32,11 +32,11 @@ import { makeLobbyCategoryId } from '$state/closedLobbyCategories';
import { useCategoryHandler } from '$hooks/useCategoryHandler';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { allRoomsAtom } from '$state/room-list/roomList';
-import { getCanonicalAliasOrRoomId, rateLimitedActions } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId, rateLimitedActions } from '$utils/matrix';
import { getSpaceRoomPath } from '$pages/pathUtils';
import { StateEvent } from '$types/matrix/room';
-import { ASCIILexicalTable, orderKeys } from '$appUtils/ASCIILexicalTable';
-import { getStateEvent } from '$appUtils/room';
+import { ASCIILexicalTable, orderKeys } from '$utils/ASCIILexicalTable';
+import { getStateEvent } from '$utils/room';
import { useClosedLobbyCategoriesAtom } from '$state/hooks/closedLobbyCategories';
import {
makeCinnySpacesContent,
diff --git a/src/app/features/lobby/LobbyHeader.tsx b/src/app/features/lobby/LobbyHeader.tsx
index 00c5485e..4c3ba744 100644
--- a/src/app/features/lobby/LobbyHeader.tsx
+++ b/src/app/features/lobby/LobbyHeader.tsx
@@ -24,14 +24,14 @@ import { useRoomAvatar, useRoomName } from '$hooks/useRoomMeta';
import { useSpace } from '$hooks/useSpace';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { RoomAvatar } from '$components/room-avatar';
-import { nameInitials } from '$appUtils/common';
+import { nameInitials } from '$utils/common';
import { IPowerLevels } from '$hooks/usePowerLevels';
import { UseStateProvider } from '$components/UseStateProvider';
import { LeaveSpacePrompt } from '$components/leave-space-prompt';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { BackRouteHandler } from '$components/BackRouteHandler';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useOpenSpaceSettings } from '$state/hooks/spaceSettings';
import { useRoomCreators } from '$hooks/useRoomCreators';
diff --git a/src/app/features/lobby/LobbyHero.tsx b/src/app/features/lobby/LobbyHero.tsx
index 08d238a0..6fe92839 100644
--- a/src/app/features/lobby/LobbyHero.tsx
+++ b/src/app/features/lobby/LobbyHero.tsx
@@ -4,12 +4,12 @@ import { useRoomAvatar, useRoomName, useRoomTopic } from '$hooks/useRoomMeta';
import { useSpace } from '$hooks/useSpace';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { RoomAvatar } from '$components/room-avatar';
-import { nameInitials } from '$appUtils/common';
+import { nameInitials } from '$utils/common';
import { UseStateProvider } from '$components/UseStateProvider';
import { RoomTopicViewer } from '$components/room-topic-viewer';
import { PageHero } from '$components/page';
-import { onEnterOrSpace, stopPropagation } from '$appUtils/keyboard';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { onEnterOrSpace, stopPropagation } from '$utils/keyboard';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import * as css from './LobbyHero.css';
diff --git a/src/app/features/lobby/RoomItem.tsx b/src/app/features/lobby/RoomItem.tsx
index 67055b37..0d512285 100644
--- a/src/app/features/lobby/RoomItem.tsx
+++ b/src/app/features/lobby/RoomItem.tsx
@@ -28,11 +28,11 @@ import { millify } from '$plugins/millify';
import { LocalRoomSummaryLoader } from '$components/RoomSummaryLoader';
import { UseStateProvider } from '$components/UseStateProvider';
import { RoomTopicViewer } from '$components/room-topic-viewer';
-import { onEnterOrSpace, stopPropagation } from '$appUtils/keyboard';
+import { onEnterOrSpace, stopPropagation } from '$utils/keyboard';
import { Membership } from '$types/matrix/room';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$appUtils/room';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$utils/room';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { ItemDraggableTarget, useDraggableItem } from './DnD';
import * as styleCss from './style.css';
diff --git a/src/app/features/lobby/SpaceItem.tsx b/src/app/features/lobby/SpaceItem.tsx
index 7c0fbe89..b3454e54 100644
--- a/src/app/features/lobby/SpaceItem.tsx
+++ b/src/app/features/lobby/SpaceItem.tsx
@@ -22,12 +22,12 @@ import { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { HierarchyItem } from '$hooks/useSpaceHierarchy';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { RoomAvatar } from '$components/room-avatar';
-import { nameInitials } from '$appUtils/common';
+import { nameInitials } from '$utils/common';
import { LocalRoomSummaryLoader } from '$components/RoomSummaryLoader';
-import { getRoomAvatarUrl } from '$appUtils/room';
+import { getRoomAvatarUrl } from '$utils/room';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { stopPropagation } from '$appUtils/keyboard';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { stopPropagation } from '$utils/keyboard';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useOpenCreateRoomModal } from '$state/hooks/createRoomModal';
import { useOpenCreateSpaceModal } from '$state/hooks/createSpaceModal';
diff --git a/src/app/features/message-search/SearchFilters.tsx b/src/app/features/message-search/SearchFilters.tsx
index 7b08150c..b4a8de6b 100644
--- a/src/app/features/message-search/SearchFilters.tsx
+++ b/src/app/features/message-search/SearchFilters.tsx
@@ -29,12 +29,12 @@ import { SearchOrderBy } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
import { useVirtualizer } from '@tanstack/react-virtual';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getRoomIconSrc } from '$appUtils/room';
-import { factoryRoomIdByAtoZ } from '$appUtils/sort';
+import { getRoomIconSrc } from '$utils/room';
+import { factoryRoomIdByAtoZ } from '$utils/sort';
import { SearchItemStrGetter, UseAsyncSearchOptions, useAsyncSearch } from '$hooks/useAsyncSearch';
import { DebounceOptions, useDebounce } from '$hooks/useDebounce';
import { VirtualTile } from '$components/virtualizer';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
type OrderButtonProps = {
order?: string;
diff --git a/src/app/features/message-search/SearchResultGroup.tsx b/src/app/features/message-search/SearchResultGroup.tsx
index 7fa39fd4..e6bf2c27 100644
--- a/src/app/features/message-search/SearchResultGroup.tsx
+++ b/src/app/features/message-search/SearchResultGroup.tsx
@@ -13,7 +13,7 @@ import {
makeMentionCustomProps,
renderMatrixMention,
} from '$plugins/react-custom-html-parser';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { useMatrixEventRenderer } from '$hooks/useMatrixEventRenderer';
import { GetContentCallback, MessageEvent, StateEvent } from '$types/matrix/room';
import {
@@ -32,7 +32,7 @@ import { Image } from '$components/media';
import { ImageViewer } from '$components/image-viewer';
import * as customHtmlCss from '$styles/CustomHtml.css';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
-import { getMemberAvatarMxc, getMemberDisplayName, getRoomAvatarUrl } from '$appUtils/room';
+import { getMemberAvatarMxc, getMemberDisplayName, getRoomAvatarUrl } from '$utils/room';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
import { SequenceCard } from '$components/sequence-card';
@@ -44,7 +44,7 @@ import { usePowerLevels } from '$hooks/usePowerLevels';
import { usePowerLevelTags } from '$hooks/usePowerLevelTags';
import { useTheme } from '$hooks/useTheme';
import { PowerIcon } from '$components/power';
-import colorMXID from '$appUtils/colorMXID';
+import colorMXID from '$utils/colorMXID';
import {
getPowerTagIconSrc,
useAccessiblePowerTagColors,
diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx
index 511c7bb6..11eaa84f 100644
--- a/src/app/features/room-nav/RoomNavItem.tsx
+++ b/src/app/features/room-nav/RoomNavItem.tsx
@@ -25,21 +25,21 @@ import { useNavigate } from 'react-router-dom';
import { NavButton, NavItem, NavItemContent, NavItemOptions } from '$components/nav';
import { UnreadBadge, UnreadBadgeCenter } from '$components/unread-badge';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
-import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$appUtils/room';
-import { nameInitials } from '$appUtils/common';
+import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$utils/room';
+import { nameInitials } from '$utils/common';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRoomUnread } from '$state/hooks/unread';
import { roomToUnreadAtom } from '$state/room/roomToUnread';
import { usePowerLevels } from '$hooks/usePowerLevels';
-import { copyToClipboard } from '$appUtils/dom';
-import { markAsRead } from '$appUtils/notifications';
+import { copyToClipboard } from '$utils/dom';
+import { markAsRead } from '$utils/notifications';
import { UseStateProvider } from '$components/UseStateProvider';
import { LeaveRoomPrompt } from '$components/leave-room-prompt';
import { useRoomTypingMember } from '$hooks/useRoomTypingMembers';
import { TypingIndicator } from '$components/typing-indicator';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { getMatrixToRoom } from '$plugins/matrix-to';
-import { getCanonicalAliasOrRoomId, isRoomAlias } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId, isRoomAlias } from '$utils/matrix';
import { getViaServers } from '$plugins/via-servers';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useSetting } from '$state/hooks/settings';
diff --git a/src/app/features/room-nav/RoomNavUser.tsx b/src/app/features/room-nav/RoomNavUser.tsx
index 997a2e65..c16ea696 100644
--- a/src/app/features/room-nav/RoomNavUser.tsx
+++ b/src/app/features/room-nav/RoomNavUser.tsx
@@ -5,8 +5,8 @@ import { NavButton, NavItem, NavItemContent } from '$components/nav';
import { UserAvatar } from '$components/user-avatar';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useCallState } from '$pages/client/call/CallProvider';
-import { getMxIdLocalPart } from '$appUtils/matrix';
-import { getMemberAvatarMxc, getMemberDisplayName } from '$appUtils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
+import { getMemberAvatarMxc, getMemberDisplayName } from '$utils/room';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
import { useSpaceOptionally } from '$hooks/useSpace';
diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx
index 56704b46..ef31cca0 100644
--- a/src/app/features/room-settings/RoomSettings.tsx
+++ b/src/app/features/room-settings/RoomSettings.tsx
@@ -5,7 +5,7 @@ import { JoinRule } from '$types/matrix-sdk';
import { PageNav, PageNavContent, PageNavHeader, PageRoot } from '$components/page';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useRoomAvatar, useRoomJoinRule, useRoomName } from '$hooks/useRoomMeta';
import { mDirectAtom } from '$state/mDirectList';
diff --git a/src/app/features/room/CommandAutocomplete.tsx b/src/app/features/room/CommandAutocomplete.tsx
index dc51ae6f..39f5e67b 100644
--- a/src/app/features/room/CommandAutocomplete.tsx
+++ b/src/app/features/room/CommandAutocomplete.tsx
@@ -13,7 +13,7 @@ import {
import { UseAsyncSearchOptions, useAsyncSearch } from '$hooks/useAsyncSearch';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useKeyDown } from '$hooks/useKeyDown';
-import { onTabPress } from '$appUtils/keyboard';
+import { onTabPress } from '$utils/keyboard';
type CommandAutoCompleteHandler = (commandName: string) => void;
diff --git a/src/app/features/room/MembersDrawer.tsx b/src/app/features/room/MembersDrawer.tsx
index b78d91fd..40c14f26 100644
--- a/src/app/features/room/MembersDrawer.tsx
+++ b/src/app/features/room/MembersDrawer.tsx
@@ -35,8 +35,8 @@ import { UseStateProvider } from '$components/UseStateProvider';
import { SearchItemStrGetter, UseAsyncSearchOptions, useAsyncSearch } from '$hooks/useAsyncSearch';
import { useDebounce } from '$hooks/useDebounce';
import { TypingIndicator } from '$components/typing-indicator';
-import { getMemberDisplayName, getMemberSearchStr } from '$appUtils/room';
-import { getMxIdLocalPart } from '$appUtils/matrix';
+import { getMemberDisplayName, getMemberSearchStr } from '$utils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
import { useSetSetting, useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { useAtomValue } from 'jotai';
diff --git a/src/app/features/room/Room.tsx b/src/app/features/room/Room.tsx
index 7f104684..c6983eb4 100644
--- a/src/app/features/room/Room.tsx
+++ b/src/app/features/room/Room.tsx
@@ -8,7 +8,7 @@ import { settingsAtom } from '$state/settings';
import { PowerLevelsContextProvider, usePowerLevels } from '$hooks/usePowerLevels';
import { useRoom } from '$hooks/useRoom';
import { useKeyDown } from '$hooks/useKeyDown';
-import { markAsRead } from '$appUtils/notifications';
+import { markAsRead } from '$utils/notifications';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRoomMembers } from '$hooks/useRoomMembers';
import { CallView } from '$features/call/CallView';
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index 8e700d51..bb005aa2 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -71,7 +71,7 @@ import {
getImageInfo,
getMxIdLocalPart,
mxcUrlToHttp,
-} from '$appUtils/matrix';
+} from '$utils/matrix';
import { useTypingStatusUpdater } from '$hooks/useTypingStatusUpdater';
import { useFilePicker } from '$hooks/useFilePicker';
import { useFilePasteHandler } from '$hooks/useFilePasteHandler';
@@ -92,9 +92,9 @@ import {
UploadBoardImperativeHandlers,
} from '$components/upload-board';
import { Upload, UploadStatus, UploadSuccess, createUploadFamilyObserverAtom } from '$state/upload';
-import { getImageUrlBlob, loadImageElement } from '$appUtils/dom';
-import { safeFile } from '$appUtils/mimeTypes';
-import { fulfilledPromiseSettledResult } from '$appUtils/common';
+import { getImageUrlBlob, loadImageElement } from '$utils/dom';
+import { safeFile } from '$utils/mimeTypes';
+import { fulfilledPromiseSettledResult } from '$utils/common';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import {
@@ -102,9 +102,9 @@ import {
getMentionContent,
trimReplyFromBody,
trimReplyFromFormattedBody,
-} from '$appUtils/room';
+} from '$utils/room';
import { Command, SHRUG, TABLEFLIP, UNFLIP, useCommands } from '$hooks/useCommands';
-import { mobileOrTablet } from '$appUtils/user-agent';
+import { mobileOrTablet } from '$utils/user-agent';
import { useElementSizeObserver } from '$hooks/useElementSizeObserver';
import { ReplyLayout, ThreadIndicator } from '$components/message';
import { roomToParentsAtom } from '$state/room/roomToParents';
diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
index 9040135a..1561057d 100644
--- a/src/app/features/room/RoomTimeline.tsx
+++ b/src/app/features/room/RoomTimeline.tsx
@@ -48,11 +48,11 @@ import {
import { isKeyHotkey } from 'is-hotkey';
import { Opts as LinkifyOpts } from 'linkifyjs';
import { useTranslation } from 'react-i18next';
-import { eventWithShortcode, factoryEventSentBy, getMxIdLocalPart } from '$appUtils/matrix';
+import { eventWithShortcode, factoryEventSentBy, getMxIdLocalPart } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { ItemRange, useVirtualPaginator } from '$hooks/useVirtualPaginator';
import { useAlive } from '$hooks/useAlive';
-import { editableActiveElement, scrollToBottom } from '$appUtils/dom';
+import { editableActiveElement, scrollToBottom } from '$utils/dom';
import {
CompactPlaceholder,
DefaultPlaceholder,
@@ -83,7 +83,7 @@ import {
getReactionContent,
isMembershipChanged,
reactionOrEditEvent,
-} from '$appUtils/room';
+} from '$utils/room';
import { useSetting } from '$state/hooks/settings';
import { MessageLayout, settingsAtom } from '$state/settings';
import { nicknamesAtom } from '$state/nicknames';
@@ -95,10 +95,10 @@ import {
getIntersectionObserverEntry,
useIntersectionObserver,
} from '$hooks/useIntersectionObserver';
-import { markAsRead } from '$appUtils/notifications';
+import { markAsRead } from '$utils/notifications';
import { useDebounce } from '$hooks/useDebounce';
import { getResizeObserverEntry, useResizeObserver } from '$hooks/useResizeObserver';
-import { inSameDay, minuteDifference, timeDayMonthYear, today, yesterday } from '$appUtils/time';
+import { inSameDay, minuteDifference, timeDayMonthYear, today, yesterday } from '$utils/time';
import { createMentionElement, isEmptyEditor, moveCursor } from '$components/editor';
import { roomIdToReplyDraftAtomFamily } from '$state/room/roomInputDrafts';
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
diff --git a/src/app/features/room/RoomView.tsx b/src/app/features/room/RoomView.tsx
index 0bb08964..80d6d04e 100644
--- a/src/app/features/room/RoomView.tsx
+++ b/src/app/features/room/RoomView.tsx
@@ -10,7 +10,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { useEditor } from '$components/editor';
import { Page } from '$components/page';
import { useKeyDown } from '$hooks/useKeyDown';
-import { editableActiveElement } from '$appUtils/dom';
+import { editableActiveElement } from '$utils/dom';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
diff --git a/src/app/features/room/RoomViewFollowing.tsx b/src/app/features/room/RoomViewFollowing.tsx
index 55253348..f9b45754 100644
--- a/src/app/features/room/RoomViewFollowing.tsx
+++ b/src/app/features/room/RoomViewFollowing.tsx
@@ -16,13 +16,13 @@ import classNames from 'classnames';
import FocusTrap from 'focus-trap-react';
import { useAtomValue } from 'jotai';
-import { getMemberDisplayName } from '$appUtils/room';
-import { getMxIdLocalPart } from '$appUtils/matrix';
+import { getMemberDisplayName } from '$utils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRoomLatestRenderedEvent } from '$hooks/useRoomLatestRenderedEvent';
import { useRoomEventReaders } from '$hooks/useRoomEventReaders';
import { EventReaders } from '$components/event-readers';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { nicknamesAtom } from '$state/nicknames';
import * as css from './RoomViewFollowing.css';
diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx
index 2ea1bbce..6bdd615c 100644
--- a/src/app/features/room/RoomViewHeader.tsx
+++ b/src/app/features/room/RoomViewHeader.tsx
@@ -37,18 +37,18 @@ import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { useSpaceOptionally } from '$hooks/useSpace';
import { getHomeSearchPath, getSpaceSearchPath, withSearchParam } from '$pages/pathUtils';
-import { createLogger } from '$appUtils/debug';
-import { getCanonicalAliasOrRoomId, isRoomAlias, mxcUrlToHttp } from '$appUtils/matrix';
+import { createLogger } from '$utils/debug';
+import { getCanonicalAliasOrRoomId, isRoomAlias, mxcUrlToHttp } from '$utils/matrix';
import { _SearchPathSearchParams } from '$pages/paths';
import { useRoomUnread } from '$state/hooks/unread';
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
-import { markAsRead } from '$appUtils/notifications';
+import { markAsRead } from '$utils/notifications';
import { roomToUnreadAtom } from '$state/room/roomToUnread';
-import { copyToClipboard } from '$appUtils/dom';
+import { copyToClipboard } from '$utils/dom';
import { LeaveRoomPrompt } from '$components/leave-room-prompt';
import { useRoomAvatar, useRoomName, useRoomTopic } from '$hooks/useRoomMeta';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { getMatrixToRoom } from '$plugins/matrix-to';
import { getViaServers } from '$plugins/via-servers';
import { BackRouteHandler } from '$components/BackRouteHandler';
diff --git a/src/app/features/room/RoomViewTyping.tsx b/src/app/features/room/RoomViewTyping.tsx
index 6b267869..8a3c7a71 100644
--- a/src/app/features/room/RoomViewTyping.tsx
+++ b/src/app/features/room/RoomViewTyping.tsx
@@ -4,8 +4,8 @@ import classNames from 'classnames';
import { useSetAtom, useAtomValue } from 'jotai';
import { roomIdToTypingMembersAtom } from '$state/typingMembers';
import { TypingIndicator } from '$components/typing-indicator';
-import { getMemberDisplayName } from '$appUtils/room';
-import { getMxIdLocalPart } from '$appUtils/matrix';
+import { getMemberDisplayName } from '$utils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRoomTypingMember } from '$hooks/useRoomTypingMembers';
import { nicknamesAtom } from '$state/nicknames';
diff --git a/src/app/features/room/jump-to-time/JumpToTime.tsx b/src/app/features/room/jump-to-time/JumpToTime.tsx
index 5aa99c0c..9ebd5a7a 100644
--- a/src/app/features/room/jump-to-time/JumpToTime.tsx
+++ b/src/app/features/room/jump-to-time/JumpToTime.tsx
@@ -22,12 +22,12 @@ import {
import { Direction, MatrixError } from '$types/matrix-sdk';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useAlive } from '$hooks/useAlive';
import { useStateEvent } from '$hooks/useStateEvent';
import { useRoom } from '$hooks/useRoom';
import { StateEvent } from '$types/matrix/room';
-import { getToday, getYesterday, timeDayMonthYear, timeHourMinute } from '$appUtils/time';
+import { getToday, getYesterday, timeDayMonthYear, timeHourMinute } from '$utils/time';
import { DatePicker, TimePicker } from '$components/time-date';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 79d4efe4..febf6960 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -42,16 +42,16 @@ import {
Username,
UsernameBold,
} from '$components/message';
-import { canEditEvent, getMemberAvatarMxc } from '$appUtils/room';
-import { getCanonicalAliasOrRoomId, isRoomAlias, mxcUrlToHttp } from '$appUtils/matrix';
+import { canEditEvent, getMemberAvatarMxc } from '$utils/room';
+import { getCanonicalAliasOrRoomId, isRoomAlias, mxcUrlToHttp } from '$utils/matrix';
import { MessageLayout, MessageSpacing, settingsAtom } from '$state/settings';
import { nicknamesAtom, setNicknameAtom } from '$state/nicknames';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRecentEmoji } from '$hooks/useRecentEmoji';
import { EmojiBoard } from '$components/emoji-board';
import { UserAvatar } from '$components/user-avatar';
-import { copyToClipboard } from '$appUtils/dom';
-import { stopPropagation } from '$appUtils/keyboard';
+import { copyToClipboard } from '$utils/dom';
+import { stopPropagation } from '$utils/keyboard';
import { getMatrixToRoomEvent } from '$plugins/matrix-to';
import { getViaServers } from '$plugins/via-servers';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
@@ -61,7 +61,7 @@ import { PowerIcon } from '$components/power';
import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
import { SwipeableMessageWrapper } from '$components/SwipeableMessageWrapper';
-import { mobileOrTablet } from '$appUtils/user-agent';
+import { mobileOrTablet } from '$utils/user-agent';
import { useUserProfile } from '$hooks/useUserProfile';
import { useSetting } from '$state/hooks/settings';
import { useBlobCache } from '$hooks/useBlobCache';
diff --git a/src/app/features/room/message/MessageEditor.tsx b/src/app/features/room/message/MessageEditor.tsx
index bc6c95df..476bf0ca 100644
--- a/src/app/features/room/message/MessageEditor.tsx
+++ b/src/app/features/room/message/MessageEditor.tsx
@@ -54,8 +54,8 @@ import { UseStateProvider } from '$components/UseStateProvider';
import { EmojiBoard } from '$components/emoji-board';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getEditedEvent, getMentionContent, trimReplyFromFormattedBody } from '$appUtils/room';
-import { mobileOrTablet } from '$appUtils/user-agent';
+import { getEditedEvent, getMentionContent, trimReplyFromFormattedBody } from '$utils/room';
+import { mobileOrTablet } from '$utils/user-agent';
import { useComposingCheck } from '$hooks/useComposingCheck';
import { floatingEditor } from '$styles/overrides/Composer.css';
diff --git a/src/app/features/room/message/Reactions.tsx b/src/app/features/room/message/Reactions.tsx
index c716acf5..1035130e 100644
--- a/src/app/features/room/message/Reactions.tsx
+++ b/src/app/features/room/message/Reactions.tsx
@@ -16,10 +16,10 @@ import { Room } from '$types/matrix-sdk';
import { type Relations } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { factoryEventSentBy } from '$appUtils/matrix';
+import { factoryEventSentBy } from '$utils/matrix';
import { Reaction, ReactionTooltipMsg } from '$components/message';
import { useRelations } from '$hooks/useRelations';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import * as css from './styles.css';
import { ReactionViewer } from '../reaction-viewer';
diff --git a/src/app/features/room/msgContent.ts b/src/app/features/room/msgContent.ts
index 028148d8..fa3b94cb 100644
--- a/src/app/features/room/msgContent.ts
+++ b/src/app/features/room/msgContent.ts
@@ -12,12 +12,12 @@ import {
getVideoFileUrl,
loadImageElement,
loadVideoElement,
-} from '$appUtils/dom';
-import { encryptFile, getImageInfo, getThumbnailContent, getVideoInfo } from '$appUtils/matrix';
+} from '$utils/dom';
+import { encryptFile, getImageInfo, getThumbnailContent, getVideoInfo } from '$utils/matrix';
import { TUploadItem } from '$state/room/roomInputDrafts';
-import { encodeBlurHash } from '$appUtils/blurHash';
-import { scaleYDimension } from '$appUtils/common';
-import { createLogger } from '$appUtils/debug';
+import { encodeBlurHash } from '$utils/blurHash';
+import { scaleYDimension } from '$utils/common';
+import { createLogger } from '$utils/debug';
const log = createLogger('msgContent');
diff --git a/src/app/features/room/reaction-viewer/ReactionViewer.tsx b/src/app/features/room/reaction-viewer/ReactionViewer.tsx
index 764f2328..9065cfb6 100644
--- a/src/app/features/room/reaction-viewer/ReactionViewer.tsx
+++ b/src/app/features/room/reaction-viewer/ReactionViewer.tsx
@@ -15,8 +15,8 @@ import {
config,
} from 'folds';
import { MatrixEvent, Room, RoomMember, Relations } from '$types/matrix-sdk';
-import { getMemberDisplayName } from '$appUtils/room';
-import { eventWithShortcode, getMxIdLocalPart } from '$appUtils/matrix';
+import { getMemberDisplayName } from '$utils/room';
+import { eventWithShortcode, getMxIdLocalPart } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useRelations } from '$hooks/useRelations';
import { Reaction } from '$components/message';
@@ -27,7 +27,7 @@ import { UserAvatar } from '$components/user-avatar';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
import { useSpaceOptionally } from '$hooks/useSpace';
-import { getMouseEventCords } from '$appUtils/dom';
+import { getMouseEventCords } from '$utils/dom';
import * as css from './ReactionViewer.css';
export type ReactionViewerProps = {
diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
index 4900414f..bad79cee 100644
--- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
+++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
@@ -21,7 +21,7 @@ import { Opts as LinkifyOpts } from 'linkifyjs';
import { HTMLReactParserOptions } from 'html-react-parser';
import { useAtomValue } from 'jotai';
import { useVirtualizer } from '@tanstack/react-virtual';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import { useRoomPinnedEvents } from '$hooks/useRoomPinnedEvents';
import { SequenceCard } from '$components/sequence-card';
import { useRoomEvent } from '$hooks/useRoomEvent';
@@ -41,14 +41,14 @@ import {
UsernameBold,
} from '$components/message';
import { UserAvatar } from '$components/user-avatar';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
import {
getEditedEvent,
getMemberAvatarMxc,
getMemberDisplayName,
getStateEvent,
-} from '$appUtils/room';
+} from '$utils/room';
import { GetContentCallback, MessageEvent, StateEvent } from '$types/matrix/room';
import { useMentionClickHandler } from '$hooks/useMentionClickHandler';
import { useSpoilerClickHandler } from '$hooks/useSpoilerClickHandler';
diff --git a/src/app/features/search/Search.tsx b/src/app/features/search/Search.tsx
index a33bda54..e326bf04 100644
--- a/src/app/features/search/Search.tsx
+++ b/src/app/features/search/Search.tsx
@@ -40,21 +40,21 @@ import {
getDirectRoomAvatarUrl,
getRoomAvatarUrl,
guessPerfectParent,
-} from '$appUtils/room';
+} from '$utils/room';
import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser';
-import { factoryRoomIdByActivity } from '$appUtils/sort';
-import { nameInitials } from '$appUtils/common';
+import { factoryRoomIdByActivity } from '$utils/sort';
+import { nameInitials } from '$utils/common';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { useListFocusIndex } from '$hooks/useListFocusIndex';
-import { getMxIdLocalPart, getMxIdServer, guessDmRoomUserId } from '$appUtils/matrix';
+import { getMxIdLocalPart, getMxIdServer, guessDmRoomUserId } from '$utils/matrix';
import { roomToParentsAtom } from '$state/room/roomToParents';
import { roomToUnreadAtom } from '$state/room/roomToUnread';
import { UnreadBadge, UnreadBadgeCenter } from '$components/unread-badge';
import { searchModalAtom } from '$state/searchModal';
import { useKeyDown } from '$hooks/useKeyDown';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { KeySymbol } from '$appUtils/key-symbol';
-import { isMacOS } from '$appUtils/user-agent';
+import { KeySymbol } from '$utils/key-symbol';
+import { isMacOS } from '$utils/user-agent';
enum SearchRoomType {
Rooms = '#',
diff --git a/src/app/features/settings/Settings.tsx b/src/app/features/settings/Settings.tsx
index b1a34bec..f8c69baa 100644
--- a/src/app/features/settings/Settings.tsx
+++ b/src/app/features/settings/Settings.tsx
@@ -19,12 +19,12 @@ import { PageNav, PageNavContent, PageNavHeader, PageRoot } from '$components/pa
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useUserProfile } from '$hooks/useUserProfile';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { UserAvatar } from '$components/user-avatar';
-import { nameInitials } from '$appUtils/common';
+import { nameInitials } from '$utils/common';
import { UseStateProvider } from '$components/UseStateProvider';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { LogoutDialog } from '$components/LogoutDialog';
import { Notifications } from './notifications';
import { Devices } from './devices';
diff --git a/src/app/features/settings/account/BioEditor.tsx b/src/app/features/settings/account/BioEditor.tsx
index ce83140e..3bb33467 100644
--- a/src/app/features/settings/account/BioEditor.tsx
+++ b/src/app/features/settings/account/BioEditor.tsx
@@ -37,7 +37,7 @@ import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { UseStateProvider } from '$components/UseStateProvider';
import { EmojiBoard } from '$components/emoji-board';
-import { mobileOrTablet } from '$appUtils/user-agent';
+import { mobileOrTablet } from '$utils/user-agent';
import { SettingTile } from '$components/setting-tile';
import * as css from './BioEditor.css';
diff --git a/src/app/features/settings/account/IgnoredUserList.tsx b/src/app/features/settings/account/IgnoredUserList.tsx
index 08829dfe..493ef67b 100644
--- a/src/app/features/settings/account/IgnoredUserList.tsx
+++ b/src/app/features/settings/account/IgnoredUserList.tsx
@@ -4,7 +4,7 @@ import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { isUserId } from '$appUtils/matrix';
+import { isUserId } from '$utils/matrix';
import { useIgnoredUsers } from '$hooks/useIgnoredUsers';
import { useAlive } from '$hooks/useAlive';
import { SequenceCardStyle } from '../styles.css';
diff --git a/src/app/features/settings/account/MatrixId.tsx b/src/app/features/settings/account/MatrixId.tsx
index 1da5650f..28476b75 100644
--- a/src/app/features/settings/account/MatrixId.tsx
+++ b/src/app/features/settings/account/MatrixId.tsx
@@ -2,7 +2,7 @@ import { Box, Text, Chip } from 'folds';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
-import { copyToClipboard } from '$appUtils/dom';
+import { copyToClipboard } from '$utils/dom';
import { SequenceCardStyle } from '../styles.css';
export function MatrixId() {
diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx
index 12a04f43..2133f1f6 100644
--- a/src/app/features/settings/account/Profile.tsx
+++ b/src/app/features/settings/account/Profile.tsx
@@ -30,14 +30,14 @@ import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { UserProfile, useUserProfile } from '$hooks/useUserProfile';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { UserAvatar } from '$components/user-avatar';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { nameInitials } from '$appUtils/common';
+import { nameInitials } from '$utils/common';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useFilePicker } from '$hooks/useFilePicker';
import { useObjectURL } from '$hooks/useObjectURL';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { ImageEditor } from '$components/image-editor';
import { ModalWide } from '$styles/Modal.css';
import { createUploadAtom, UploadSuccess } from '$state/upload';
diff --git a/src/app/features/settings/cosmetics/Cosmetics.tsx b/src/app/features/settings/cosmetics/Cosmetics.tsx
index bf6cbdb3..7e9b2787 100644
--- a/src/app/features/settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/settings/cosmetics/Cosmetics.tsx
@@ -20,7 +20,7 @@ import { SequenceCard } from '$components/sequence-card';
import { useSetting } from '$state/hooks/settings';
import { JumboEmojiSize, settingsAtom } from '$state/settings';
import { SettingTile } from '$components/setting-tile';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { SequenceCardStyle } from '../styles.css';
import { Appearance } from './Themes';
diff --git a/src/app/features/settings/cosmetics/Themes.tsx b/src/app/features/settings/cosmetics/Themes.tsx
index 5d15f302..3fc28502 100644
--- a/src/app/features/settings/cosmetics/Themes.tsx
+++ b/src/app/features/settings/cosmetics/Themes.tsx
@@ -31,7 +31,7 @@ import {
useThemeNames,
useThemes,
} from '$hooks/useTheme';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { SequenceCardStyle } from '../styles.css';
type ThemeSelectorProps = {
diff --git a/src/app/features/settings/developer-tools/DevelopTools.tsx b/src/app/features/settings/developer-tools/DevelopTools.tsx
index 94da14c2..d1638a41 100644
--- a/src/app/features/settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/settings/developer-tools/DevelopTools.tsx
@@ -7,7 +7,7 @@ import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AccountDataEditor, AccountDataSubmitCallback } from '$components/AccountDataEditor';
-import { copyToClipboard } from '$appUtils/dom';
+import { copyToClipboard } from '$utils/dom';
import { SequenceCardStyle } from '../styles.css';
import { AccountData } from './AccountData';
diff --git a/src/app/features/settings/devices/DeviceTile.tsx b/src/app/features/settings/devices/DeviceTile.tsx
index 49250917..84e0ef20 100644
--- a/src/app/features/settings/devices/DeviceTile.tsx
+++ b/src/app/features/settings/devices/DeviceTile.tsx
@@ -19,12 +19,12 @@ import { CryptoApi, IMyDevice, MatrixError } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
import { SettingTile } from '$components/setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { timeDayMonYear, timeHourMinute, today, yesterday } from '$appUtils/time';
+import { timeDayMonYear, timeHourMinute, today, yesterday } from '$utils/time';
import { BreakWord } from '$styles/Text.css';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { SequenceCard } from '$components/sequence-card';
import { LogoutDialog } from '$components/LogoutDialog';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { SequenceCardStyle } from '../styles.css';
diff --git a/src/app/features/settings/devices/LocalBackup.tsx b/src/app/features/settings/devices/LocalBackup.tsx
index c2275ba7..5983aa1c 100644
--- a/src/app/features/settings/devices/LocalBackup.tsx
+++ b/src/app/features/settings/devices/LocalBackup.tsx
@@ -11,7 +11,7 @@ import {
decryptMegolmKeyFile,
encryptMegolmKeyFile,
type FriendlyError,
-} from '$appUtils/MegolmExportEncryption';
+} from '$utils/MegolmExportEncryption';
import { useAlive } from '$hooks/useAlive';
import { useFilePicker } from '$hooks/useFilePicker';
import { SequenceCardStyle } from '../styles.css';
diff --git a/src/app/features/settings/devices/Verification.tsx b/src/app/features/settings/devices/Verification.tsx
index adea4d61..34dccf48 100644
--- a/src/app/features/settings/devices/Verification.tsx
+++ b/src/app/features/settings/devices/Verification.tsx
@@ -31,7 +31,7 @@ import {
DeviceVerificationReset,
DeviceVerificationSetup,
} from '$components/DeviceVerificationSetup';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useAuthMetadata } from '$hooks/useAuthMetadata';
import { withSearchParam } from '$pages/pathUtils';
import { useAccountManagementActions } from '$hooks/useAccountManagement';
diff --git a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
index 7a1e424a..e7cd9de4 100644
--- a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
+++ b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
@@ -27,7 +27,7 @@ import { Room } from '$types/matrix-sdk';
import { useGlobalImagePacks, useRoomsImagePacks } from '$hooks/useImagePacks';
import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useMatrixClient } from '$hooks/useMatrixClient';
import {
@@ -41,7 +41,7 @@ import { LineClamp2 } from '$styles/Text.css';
import { allRoomsAtom } from '$state/room-list/roomList';
import { AccountDataEvent } from '$types/matrix/accountData';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { SequenceCardStyle } from '../styles.css';
function GlobalPackSelector({
diff --git a/src/app/features/settings/emojis-stickers/UserPack.tsx b/src/app/features/settings/emojis-stickers/UserPack.tsx
index ba11b062..fbe2629b 100644
--- a/src/app/features/settings/emojis-stickers/UserPack.tsx
+++ b/src/app/features/settings/emojis-stickers/UserPack.tsx
@@ -4,7 +4,7 @@ import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
import { ImagePack, ImageUsage } from '$plugins/custom-emoji';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { SequenceCardStyle } from '../styles.css';
diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx
index 84d0c039..5e58fab9 100644
--- a/src/app/features/settings/general/General.tsx
+++ b/src/app/features/settings/general/General.tsx
@@ -35,9 +35,9 @@ import {
settingsAtom,
} from '$state/settings';
import { SettingTile } from '$components/setting-tile';
-import { KeySymbol } from '$appUtils/key-symbol';
-import { isMacOS, mobileOrTablet } from '$appUtils/user-agent';
-import { stopPropagation } from '$appUtils/keyboard';
+import { KeySymbol } from '$utils/key-symbol';
+import { isMacOS, mobileOrTablet } from '$utils/user-agent';
+import { stopPropagation } from '$utils/keyboard';
import { useMessageLayoutItems } from '$hooks/useMessageLayout';
import { useMessageSpacingItems } from '$hooks/useMessageSpacing';
import { useDateFormatItems } from '$hooks/useDateFormat';
diff --git a/src/app/features/settings/notifications/NotificationModeSwitcher.tsx b/src/app/features/settings/notifications/NotificationModeSwitcher.tsx
index e9a7e182..608bd507 100644
--- a/src/app/features/settings/notifications/NotificationModeSwitcher.tsx
+++ b/src/app/features/settings/notifications/NotificationModeSwitcher.tsx
@@ -15,7 +15,7 @@ import { IPushRule } from '$types/matrix-sdk';
import { MouseEventHandler, useMemo, useState } from 'react';
import FocusTrap from 'focus-trap-react';
import { NotificationMode, useNotificationActionsMode } from '$hooks/useNotificationMode';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
export const useNotificationModes = (): NotificationMode[] =>
diff --git a/src/app/features/settings/notifications/SpecialMessages.tsx b/src/app/features/settings/notifications/SpecialMessages.tsx
index 7bc70a52..96d78069 100644
--- a/src/app/features/settings/notifications/SpecialMessages.tsx
+++ b/src/app/features/settings/notifications/SpecialMessages.tsx
@@ -7,7 +7,7 @@ import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useUserProfile } from '$hooks/useUserProfile';
-import { getMxIdLocalPart } from '$appUtils/matrix';
+import { getMxIdLocalPart } from '$utils/matrix';
import { makePushRuleData, PushRuleData, usePushRule } from '$hooks/usePushRule';
import {
getNotificationModeActions,
diff --git a/src/app/features/space-settings/SpaceSettings.tsx b/src/app/features/space-settings/SpaceSettings.tsx
index 43e55526..3321d7ac 100644
--- a/src/app/features/space-settings/SpaceSettings.tsx
+++ b/src/app/features/space-settings/SpaceSettings.tsx
@@ -5,7 +5,7 @@ import { JoinRule } from '$types/matrix-sdk';
import { PageNav, PageNavContent, PageNavHeader, PageRoot } from '$components/page';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { mxcUrlToHttp } from '$appUtils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useRoomAvatar, useRoomJoinRule, useRoomName } from '$hooks/useRoomMeta';
import { mDirectAtom } from '$state/mDirectList';
diff --git a/src/app/features/widgets/WidgetIframe.tsx b/src/app/features/widgets/WidgetIframe.tsx
index 2fd4c2ad..20cccf48 100644
--- a/src/app/features/widgets/WidgetIframe.tsx
+++ b/src/app/features/widgets/WidgetIframe.tsx
@@ -8,7 +8,7 @@ import {
MatrixEvent,
MatrixEventEvent,
} from '$types/matrix-sdk';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import { resolveWidgetUrl } from '$hooks/useRoomWidgets';
import { GenericWidgetDriver, CapabilityApprovalCallback } from './GenericWidgetDriver';
diff --git a/src/app/features/widgets/WidgetsDrawer.tsx b/src/app/features/widgets/WidgetsDrawer.tsx
index 06993f12..ade7699e 100644
--- a/src/app/features/widgets/WidgetsDrawer.tsx
+++ b/src/app/features/widgets/WidgetsDrawer.tsx
@@ -25,7 +25,7 @@ import { usePowerLevelsContext } from '$hooks/usePowerLevels';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
import { StateEvent } from '$types/matrix/room';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import { WidgetIframe } from './WidgetIframe';
import * as css from './WidgetsDrawer.css';
import { IntegrationManager } from './IntegrationManager';
diff --git a/src/app/hooks/router/useSelectedRoom.ts b/src/app/hooks/router/useSelectedRoom.ts
index 3e9b39cf..59b8ac33 100644
--- a/src/app/hooks/router/useSelectedRoom.ts
+++ b/src/app/hooks/router/useSelectedRoom.ts
@@ -1,5 +1,5 @@
import { useParams } from 'react-router-dom';
-import { getCanonicalAliasRoomId, isRoomAlias } from '$appUtils/matrix';
+import { getCanonicalAliasRoomId, isRoomAlias } from '$utils/matrix';
import { useMatrixClient } from '../useMatrixClient';
export const useSelectedRoom = (): string | undefined => {
diff --git a/src/app/hooks/router/useSelectedSpace.ts b/src/app/hooks/router/useSelectedSpace.ts
index f9e85b84..769d8c8a 100644
--- a/src/app/hooks/router/useSelectedSpace.ts
+++ b/src/app/hooks/router/useSelectedSpace.ts
@@ -1,5 +1,5 @@
import { useMatch, useParams } from 'react-router-dom';
-import { getCanonicalAliasRoomId, isRoomAlias } from '$appUtils/matrix';
+import { getCanonicalAliasRoomId, isRoomAlias } from '$utils/matrix';
import { getSpaceLobbyPath, getSpaceSearchPath } from '$pages/pathUtils';
import { useMatrixClient } from '../useMatrixClient';
diff --git a/src/app/hooks/useUserProfile.ts b/src/app/hooks/useUserProfile.ts
index 3945ac0f..dfd29f24 100644
--- a/src/app/hooks/useUserProfile.ts
+++ b/src/app/hooks/useUserProfile.ts
@@ -3,7 +3,7 @@ import { useAtomValue, useSetAtom } from 'jotai';
import { selectAtom } from 'jotai/utils';
import { EventTimeline, Room } from '$types/matrix-sdk';
import { StateEvent } from '$types/matrix/room';
-import colorMXID from '$appUtils/colorMXID';
+import colorMXID from '$utils/colorMXID';
import { useMatrixClient } from './useMatrixClient';
import { profilesCacheAtom } from '../state/userRoomProfile';
import { useSetting } from '../state/hooks/settings';
diff --git a/src/app/pages/auth/ServerPicker.tsx b/src/app/pages/auth/ServerPicker.tsx
index 2f605b83..e66d92a1 100644
--- a/src/app/pages/auth/ServerPicker.tsx
+++ b/src/app/pages/auth/ServerPicker.tsx
@@ -22,7 +22,7 @@ import {
import FocusTrap from 'focus-trap-react';
import { useDebounce } from '$hooks/useDebounce';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
export function ServerPicker({
server,
diff --git a/src/app/pages/auth/login/PasswordLoginForm.tsx b/src/app/pages/auth/login/PasswordLoginForm.tsx
index 6b28fc70..08a3f027 100644
--- a/src/app/pages/auth/login/PasswordLoginForm.tsx
+++ b/src/app/pages/auth/login/PasswordLoginForm.tsx
@@ -20,15 +20,15 @@ import {
import FocusTrap from 'focus-trap-react';
import { Link } from 'react-router-dom';
import { MatrixError } from '$types/matrix-sdk';
-import { getMxIdLocalPart, getMxIdServer, isUserId } from '$appUtils/matrix';
-import { EMAIL_REGEX } from '$appUtils/regex';
+import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix';
+import { EMAIL_REGEX } from '$utils/regex';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAuthServer } from '$hooks/useAuthServer';
import { useClientConfig } from '$hooks/useClientConfig';
import { PasswordInput } from '$components/password-input';
import { getResetPasswordPath } from '$pages/pathUtils';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { FieldError } from '../FiledError';
import {
CustomLoginResponse,
diff --git a/src/app/pages/auth/login/loginUtil.ts b/src/app/pages/auth/login/loginUtil.ts
index 39c1c4b9..1659e547 100644
--- a/src/app/pages/auth/login/loginUtil.ts
+++ b/src/app/pages/auth/login/loginUtil.ts
@@ -10,7 +10,7 @@ import {
} from '$pages/afterLoginRedirectPath';
import { getHomePath } from '$pages/pathUtils';
import { activeSessionIdAtom, sessionsAtom } from '$state/sessions';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import { ErrorCode } from '../../../cs-errorcode';
import { autoDiscovery, specVersions } from '../../../cs-api';
diff --git a/src/app/pages/auth/register/PasswordRegisterForm.tsx b/src/app/pages/auth/register/PasswordRegisterForm.tsx
index 1d7f23c4..896e7318 100644
--- a/src/app/pages/auth/register/PasswordRegisterForm.tsx
+++ b/src/app/pages/auth/register/PasswordRegisterForm.tsx
@@ -26,7 +26,7 @@ import {
getUIAFlowForStages,
hasStageInFlows,
requiredStageInFlows,
-} from '$appUtils/matrix-uia';
+} from '$utils/matrix-uia';
import { useUIACompleted, useUIAFlow, useUIAParams } from '$hooks/useUIAFlows';
import { AsyncState, AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
diff --git a/src/app/pages/auth/register/registerUtil.ts b/src/app/pages/auth/register/registerUtil.ts
index 11dfc1f4..ff82ccca 100644
--- a/src/app/pages/auth/register/registerUtil.ts
+++ b/src/app/pages/auth/register/registerUtil.ts
@@ -14,7 +14,7 @@ import {
getAfterLoginRedirectPath,
} from '$pages/afterLoginRedirectPath';
import { getHomePath, getLoginPath, withSearchParam } from '$pages/pathUtils';
-import { getMxIdLocalPart, getMxIdServer } from '$appUtils/matrix';
+import { getMxIdLocalPart, getMxIdServer } from '$utils/matrix';
import { setFallbackSession } from '$state/sessions';
import { ErrorCode } from '../../../cs-errorcode';
diff --git a/src/app/pages/auth/reset-password/PasswordResetForm.tsx b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
index fb05edf9..596e5369 100644
--- a/src/app/pages/auth/reset-password/PasswordResetForm.tsx
+++ b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
@@ -25,7 +25,7 @@ import { UIAFlowOverlay } from '$components/UIAFlowOverlay';
import { EmailStageDialog } from '$components/uia-stages';
import { getLoginPath, withSearchParam } from '$pages/pathUtils';
import { LoginPathSearchParams } from '$pages/paths';
-import { getUIAError, getUIAErrorCode } from '$appUtils/matrix-uia';
+import { getUIAError, getUIAErrorCode } from '$utils/matrix-uia';
import { ResetPasswordResult, resetPassword } from './resetPasswordUtil';
import { FieldError } from '../FiledError';
diff --git a/src/app/pages/client/BackgroundNotifications.tsx b/src/app/pages/client/BackgroundNotifications.tsx
index 8d87ce7d..1b6c7354 100644
--- a/src/app/pages/client/BackgroundNotifications.tsx
+++ b/src/app/pages/client/BackgroundNotifications.tsx
@@ -18,10 +18,10 @@ import {
} from '$state/sessions';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
-import { getMemberDisplayName, getNotificationType, isNotificationEvent } from '$appUtils/room';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
+import { getMemberDisplayName, getNotificationType, isNotificationEvent } from '$utils/room';
import { NotificationType } from '$types/matrix/room';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import LogoSVG from '$public/res/svg/cinny.svg';
import { nicknamesAtom } from '$state/nicknames';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/pages/client/ClientNonUIFeatures.tsx b/src/app/pages/client/ClientNonUIFeatures.tsx
index c68bf9ac..d6584093 100644
--- a/src/app/pages/client/ClientNonUIFeatures.tsx
+++ b/src/app/pages/client/ClientNonUIFeatures.tsx
@@ -8,7 +8,7 @@ import LogoUnreadSVG from '$public/res/svg/cinny-unread.svg';
import LogoHighlightSVG from '$public/res/svg/cinny-highlight.svg';
import NotificationSound from '$public/sound/notification.ogg';
import InviteSound from '$public/sound/invite.ogg';
-import { notificationPermission, setFavicon } from '$appUtils/dom';
+import { notificationPermission, setFavicon } from '$utils/dom';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { nicknamesAtom } from '$state/nicknames';
@@ -20,9 +20,9 @@ import {
getNotificationType,
getUnreadInfo,
isNotificationEvent,
-} from '$appUtils/room';
+} from '$utils/room';
import { NotificationType, UnreadInfo } from '$types/matrix/room';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { useInboxNotificationsSelected } from '$hooks/router/useInbox';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
diff --git a/src/app/pages/client/ClientRoot.tsx b/src/app/pages/client/ClientRoot.tsx
index ab082b2f..61185fe4 100644
--- a/src/app/pages/client/ClientRoot.tsx
+++ b/src/app/pages/client/ClientRoot.tsx
@@ -33,10 +33,10 @@ import { MediaConfigProvider } from '$hooks/useMediaConfig';
import { MatrixClientProvider } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useSyncState } from '$hooks/useSyncState';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { AuthMetadataProvider } from '$hooks/useAuthMetadata';
import { sessionsAtom, activeSessionIdAtom, Session, SessionsAction } from '$state/sessions';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import { useSyncNicknames } from '$hooks/useNickname';
import { getHomePath } from '../pathUtils';
import { pushSessionToSW } from '../../../sw-session';
diff --git a/src/app/pages/client/direct/Direct.tsx b/src/app/pages/client/direct/Direct.tsx
index 7ae665a7..8915d5f7 100644
--- a/src/app/pages/client/direct/Direct.tsx
+++ b/src/app/pages/client/direct/Direct.tsx
@@ -19,7 +19,7 @@ import { useVirtualizer } from '@tanstack/react-virtual';
import FocusTrap from 'focus-trap-react';
import { useNavigate } from 'react-router-dom';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { factoryRoomIdByActivity } from '$appUtils/sort';
+import { factoryRoomIdByActivity } from '$utils/sort';
import {
NavButton,
NavCategory,
@@ -30,7 +30,7 @@ import {
NavItemContent,
} from '$components/nav';
import { getDirectCreatePath, getDirectRoomPath } from '$pages/pathUtils';
-import { getCanonicalAliasOrRoomId } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId } from '$utils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { VirtualTile } from '$components/virtualizer';
import { RoomNavCategoryButton, RoomNavItem } from '$features/room-nav';
@@ -41,8 +41,8 @@ import { useNavToActivePathMapper } from '$hooks/useNavToActivePathMapper';
import { PageNav, PageNavContent, PageNavHeader } from '$components/page';
import { useClosedNavCategoriesAtom } from '$state/hooks/closedNavCategories';
import { useRoomsUnread } from '$state/hooks/unread';
-import { markAsRead } from '$appUtils/notifications';
-import { stopPropagation } from '$appUtils/keyboard';
+import { markAsRead } from '$utils/notifications';
+import { stopPropagation } from '$utils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import {
diff --git a/src/app/pages/client/direct/DirectCreate.tsx b/src/app/pages/client/direct/DirectCreate.tsx
index 52f711fd..19b278bc 100644
--- a/src/app/pages/client/direct/DirectCreate.tsx
+++ b/src/app/pages/client/direct/DirectCreate.tsx
@@ -4,7 +4,7 @@ import { Box, Icon, IconButton, Icons, Scroll } from 'folds';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { getDirectCreateSearchParams } from '$pages/pathSearchParam';
import { getDirectRoomPath } from '$pages/pathUtils';
-import { getDMRoomFor } from '$appUtils/matrix';
+import { getDMRoomFor } from '$utils/matrix';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import {
Page,
diff --git a/src/app/pages/client/explore/Explore.tsx b/src/app/pages/client/explore/Explore.tsx
index 08aed17e..9ac55e2d 100644
--- a/src/app/pages/client/explore/Explore.tsx
+++ b/src/app/pages/client/explore/Explore.tsx
@@ -23,11 +23,11 @@ import { getExploreFeaturedPath, getExploreServerPath } from '$pages/pathUtils';
import { useClientConfig } from '$hooks/useClientConfig';
import { useExploreFeaturedSelected, useExploreServer } from '$hooks/router/useExploreSelected';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useNavToActivePathMapper } from '$hooks/useNavToActivePathMapper';
import { PageNav, PageNavContent, PageNavHeader } from '$components/page';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
export function AddServer() {
const mx = useMatrixClient();
diff --git a/src/app/pages/client/explore/Server.tsx b/src/app/pages/client/explore/Server.tsx
index d62253c5..84fd8f36 100644
--- a/src/app/pages/client/explore/Server.tsx
+++ b/src/app/pages/client/explore/Server.tsx
@@ -40,8 +40,8 @@ import { ExploreServerPathSearchParams } from '$pages/paths';
import { getExploreServerPath, withSearchParam } from '$pages/pathUtils';
import { allRoomsAtom } from '$state/room-list/roomList';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
-import { getMxIdServer } from '$appUtils/matrix';
-import { stopPropagation } from '$appUtils/keyboard';
+import { getMxIdServer } from '$utils/matrix';
+import { stopPropagation } from '$utils/keyboard';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { BackRouteHandler } from '$components/BackRouteHandler';
import * as css from './style.css';
diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx
index 2a9e664b..f6be7121 100644
--- a/src/app/pages/client/home/Home.tsx
+++ b/src/app/pages/client/home/Home.tsx
@@ -18,7 +18,7 @@ import {
import { useVirtualizer } from '@tanstack/react-virtual';
import { useAtom, useAtomValue } from 'jotai';
import FocusTrap from 'focus-trap-react';
-import { factoryRoomIdByActivity, factoryRoomIdByAtoZ } from '$appUtils/sort';
+import { factoryRoomIdByActivity, factoryRoomIdByAtoZ } from '$utils/sort';
import {
NavButton,
NavCategory,
@@ -37,7 +37,7 @@ import {
getHomeSearchPath,
withSearchParam,
} from '$pages/pathUtils';
-import { getCanonicalAliasOrRoomId } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId } from '$utils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { useHomeCreateSelected, useHomeSearchSelected } from '$hooks/router/useHomeSelected';
import { useMatrixClient } from '$hooks/useMatrixClient';
@@ -49,9 +49,9 @@ import { useCategoryHandler } from '$hooks/useCategoryHandler';
import { useNavToActivePathMapper } from '$hooks/useNavToActivePathMapper';
import { PageNav, PageNavHeader, PageNavContent } from '$components/page';
import { useRoomsUnread } from '$state/hooks/unread';
-import { markAsRead } from '$appUtils/notifications';
+import { markAsRead } from '$utils/notifications';
import { useClosedNavCategoriesAtom } from '$state/hooks/closedNavCategories';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import {
diff --git a/src/app/pages/client/inbox/Invites.tsx b/src/app/pages/client/inbox/Invites.tsx
index 0329e687..8eeff6ad 100644
--- a/src/app/pages/client/inbox/Invites.tsx
+++ b/src/app/pages/client/inbox/Invites.tsx
@@ -42,18 +42,18 @@ import {
getStateEvent,
isDirectInvite,
isSpace,
-} from '$appUtils/room';
-import { nameInitials } from '$appUtils/common';
+} from '$utils/room';
+import { nameInitials } from '$utils/common';
import { RoomAvatar } from '$components/room-avatar';
import {
addRoomIdToMDirect,
getMxIdLocalPart,
guessDmRoomUserId,
rateLimitedActions,
-} from '$appUtils/matrix';
+} from '$utils/matrix';
import { Time } from '$components/message';
import { useElementSizeObserver } from '$hooks/useElementSizeObserver';
-import { onEnterOrSpace, stopPropagation } from '$appUtils/keyboard';
+import { onEnterOrSpace, stopPropagation } from '$utils/keyboard';
import { RoomTopicViewer } from '$components/room-topic-viewer';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
diff --git a/src/app/pages/client/inbox/Notifications.tsx b/src/app/pages/client/inbox/Notifications.tsx
index 34d81c4f..49d94335 100644
--- a/src/app/pages/client/inbox/Notifications.tsx
+++ b/src/app/pages/client/inbox/Notifications.tsx
@@ -30,7 +30,7 @@ import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
import { Page, PageContent, PageContentCenter, PageHeader } from '$components/page';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { InboxNotificationsPathSearchParams } from '$pages/paths';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { SequenceCard } from '$components/sequence-card';
@@ -40,7 +40,7 @@ import {
getMemberAvatarMxc,
getMemberDisplayName,
getRoomAvatarUrl,
-} from '$appUtils/room';
+} from '$utils/room';
import { ScrollTopContainer } from '$components/scroll-top-container';
import { useInterval } from '$hooks/useInterval';
import {
@@ -74,7 +74,7 @@ import * as customHtmlCss from '$styles/CustomHtml.css';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { useRoomUnread } from '$state/hooks/unread';
import { roomToUnreadAtom } from '$state/room/roomToUnread';
-import { markAsRead } from '$appUtils/notifications';
+import { markAsRead } from '$utils/notifications';
import { ContainerColor } from '$styles/ContainerColor.css';
import { VirtualTile } from '$components/virtualizer';
import { UserAvatar } from '$components/user-avatar';
@@ -89,7 +89,7 @@ import { usePowerLevels } from '$hooks/usePowerLevels';
import { usePowerLevelTags } from '$hooks/usePowerLevelTags';
import { useTheme } from '$hooks/useTheme';
import { PowerIcon } from '$components/power';
-import colorMXID from '$appUtils/colorMXID';
+import colorMXID from '$utils/colorMXID';
import { mDirectAtom } from '$state/mDirectList';
import {
getPowerTagIconSrc,
diff --git a/src/app/pages/client/sidebar/AccountSwitcherTab.tsx b/src/app/pages/client/sidebar/AccountSwitcherTab.tsx
index 56d9864b..a41e7172 100644
--- a/src/app/pages/client/sidebar/AccountSwitcherTab.tsx
+++ b/src/app/pages/client/sidebar/AccountSwitcherTab.tsx
@@ -20,9 +20,9 @@ import { useNavigate } from 'react-router-dom';
import { sessionsAtom, activeSessionIdAtom, Session } from '$state/sessions';
import { SidebarItem, SidebarItemTooltip, SidebarAvatar } from '$components/sidebar';
import { UserAvatar } from '$components/user-avatar';
-import { nameInitials } from '$appUtils/common';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
-import { stopPropagation } from '$appUtils/keyboard';
+import { nameInitials } from '$utils/common';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
+import { stopPropagation } from '$utils/keyboard';
import { getHomePath, getLoginPath, withSearchParam } from '$pages/pathUtils';
import { logoutClient, initClient } from '$client/initMatrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
@@ -31,7 +31,7 @@ import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useSessionProfiles } from '$hooks/useSessionProfiles';
import { Settings } from '$features/settings';
import { Modal500 } from '$components/Modal500';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import { useClientConfig } from '$hooks/useClientConfig';
const log = createLogger('AccountSwitcherTab');
diff --git a/src/app/pages/client/sidebar/CreateTab.tsx b/src/app/pages/client/sidebar/CreateTab.tsx
index c008b19d..6ffab094 100644
--- a/src/app/pages/client/sidebar/CreateTab.tsx
+++ b/src/app/pages/client/sidebar/CreateTab.tsx
@@ -3,7 +3,7 @@ import { Box, config, Icon, Icons, Menu, PopOut, RectCords, Text } from 'folds';
import FocusTrap from 'focus-trap-react';
import { useNavigate } from 'react-router-dom';
import { SidebarAvatar, SidebarItem, SidebarItemTooltip } from '$components/sidebar';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
import { ContainerColor } from '$styles/ContainerColor.css';
diff --git a/src/app/pages/client/sidebar/DirectTab.tsx b/src/app/pages/client/sidebar/DirectTab.tsx
index 415d73cc..79c4b01f 100644
--- a/src/app/pages/client/sidebar/DirectTab.tsx
+++ b/src/app/pages/client/sidebar/DirectTab.tsx
@@ -20,8 +20,8 @@ import { useDirectSelected } from '$hooks/router/useDirectSelected';
import { UnreadBadge } from '$components/unread-badge';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useNavToActivePathAtom } from '$state/hooks/navToActivePath';
-import { markAsRead } from '$appUtils/notifications';
-import { stopPropagation } from '$appUtils/keyboard';
+import { markAsRead } from '$utils/notifications';
+import { stopPropagation } from '$utils/keyboard';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
import { useDirectRooms } from '../direct/useDirectRooms';
diff --git a/src/app/pages/client/sidebar/ExploreTab.tsx b/src/app/pages/client/sidebar/ExploreTab.tsx
index c0d9e1cb..ee65975e 100644
--- a/src/app/pages/client/sidebar/ExploreTab.tsx
+++ b/src/app/pages/client/sidebar/ExploreTab.tsx
@@ -11,7 +11,7 @@ import {
} from '$pages/pathUtils';
import { useClientConfig } from '$hooks/useClientConfig';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useNavToActivePathAtom } from '$state/hooks/navToActivePath';
diff --git a/src/app/pages/client/sidebar/HomeTab.tsx b/src/app/pages/client/sidebar/HomeTab.tsx
index aad308db..0e5f8eb8 100644
--- a/src/app/pages/client/sidebar/HomeTab.tsx
+++ b/src/app/pages/client/sidebar/HomeTab.tsx
@@ -21,8 +21,8 @@ import { useHomeSelected } from '$hooks/router/useHomeSelected';
import { UnreadBadge } from '$components/unread-badge';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useNavToActivePathAtom } from '$state/hooks/navToActivePath';
-import { markAsRead } from '$appUtils/notifications';
-import { stopPropagation } from '$appUtils/keyboard';
+import { markAsRead } from '$utils/notifications';
+import { stopPropagation } from '$utils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { useHomeRooms } from '../home/useHomeRooms';
diff --git a/src/app/pages/client/sidebar/SpaceTabs.tsx b/src/app/pages/client/sidebar/SpaceTabs.tsx
index ad8adc6d..8c93de42 100644
--- a/src/app/pages/client/sidebar/SpaceTabs.tsx
+++ b/src/app/pages/client/sidebar/SpaceTabs.tsx
@@ -61,9 +61,9 @@ import {
import { RoomUnreadProvider, RoomsUnreadProvider } from '$components/RoomUnreadProvider';
import { useSelectedSpace } from '$hooks/router/useSelectedSpace';
import { UnreadBadge } from '$components/unread-badge';
-import { getCanonicalAliasOrRoomId, isRoomAlias } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId, isRoomAlias } from '$utils/matrix';
import { RoomAvatar } from '$components/room-avatar';
-import { nameInitials, randomStr } from '$appUtils/common';
+import { nameInitials, randomStr } from '$utils/common';
import {
ISidebarFolder,
SidebarItems,
@@ -80,12 +80,12 @@ import { useOpenedSidebarFolderAtom } from '$state/hooks/openedSidebarFolder';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { useRoomsUnread } from '$state/hooks/unread';
import { roomToUnreadAtom } from '$state/room/roomToUnread';
-import { markAsRead } from '$appUtils/notifications';
-import { copyToClipboard } from '$appUtils/dom';
-import { stopPropagation } from '$appUtils/keyboard';
+import { markAsRead } from '$utils/notifications';
+import { copyToClipboard } from '$utils/dom';
+import { stopPropagation } from '$utils/keyboard';
import { getMatrixToRoom } from '$plugins/matrix-to';
import { getViaServers } from '$plugins/via-servers';
-import { getRoomAvatarUrl } from '$appUtils/room';
+import { getRoomAvatarUrl } from '$utils/room';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
diff --git a/src/app/pages/client/space/RoomProvider.tsx b/src/app/pages/client/space/RoomProvider.tsx
index 1e7de08f..411efc16 100644
--- a/src/app/pages/client/space/RoomProvider.tsx
+++ b/src/app/pages/client/space/RoomProvider.tsx
@@ -6,7 +6,7 @@ import { IsDirectRoomProvider, RoomProvider } from '$hooks/useRoom';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { JoinBeforeNavigate } from '$features/join-before-navigate';
import { useSpace } from '$hooks/useSpace';
-import { getAllParents, getSpaceChildren } from '$appUtils/room';
+import { getAllParents, getSpaceChildren } from '$utils/room';
import { roomToParentsAtom } from '$state/room/roomToParents';
import { allRoomsAtom } from '$state/room-list/roomList';
import { useSearchParamsViaServers } from '$hooks/router/useSearchParamsViaServers';
diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx
index f93a15a5..93a7de2d 100644
--- a/src/app/pages/client/space/Space.tsx
+++ b/src/app/pages/client/space/Space.tsx
@@ -25,7 +25,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { mDirectAtom } from '$state/mDirectList';
import { NavCategory, NavCategoryHeader, NavItem, NavItemContent, NavLink } from '$components/nav';
import { getSpaceLobbyPath, getSpaceRoomPath, getSpaceSearchPath } from '$pages/pathUtils';
-import { getCanonicalAliasOrRoomId, isRoomAlias } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId, isRoomAlias } from '$utils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { useSpaceLobbySelected, useSpaceSearchSelected } from '$hooks/router/useSelectedSpace';
import { useSpace } from '$hooks/useSpace';
@@ -42,15 +42,15 @@ import { PageNav, PageNavContent, PageNavHeader } from '$components/page';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { useRecursiveChildScopeFactory, useSpaceChildren } from '$state/hooks/roomList';
import { roomToParentsAtom } from '$state/room/roomToParents';
-import { markAsRead } from '$appUtils/notifications';
+import { markAsRead } from '$utils/notifications';
import { useRoomsUnread } from '$state/hooks/unread';
import { UseStateProvider } from '$components/UseStateProvider';
import { LeaveSpacePrompt } from '$components/leave-space-prompt';
-import { copyToClipboard } from '$appUtils/dom';
+import { copyToClipboard } from '$utils/dom';
import { useClosedNavCategoriesAtom } from '$state/hooks/closedNavCategories';
import { useStateEvent } from '$hooks/useStateEvent';
import { Membership, StateEvent } from '$types/matrix/room';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { getMatrixToRoom } from '$plugins/matrix-to';
import { getViaServers } from '$plugins/via-servers';
import { useSetting } from '$state/hooks/settings';
@@ -68,7 +68,7 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { BreakWord } from '$styles/Text.css';
import { InviteUserPrompt } from '$components/invite-user-prompt';
import { CallNavStatus } from '$features/room-nav/RoomCallNavStatus';
-import { mobileOrTablet } from '$appUtils/user-agent';
+import { mobileOrTablet } from '$utils/user-agent';
import { useNavigate } from 'react-router-dom';
import { lastVisitedRoomIdAtom } from '$state/room/lastRoom';
import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper';
diff --git a/src/app/plugins/custom-emoji/utils.ts b/src/app/plugins/custom-emoji/utils.ts
index ab5ebfd2..9d453018 100644
--- a/src/app/plugins/custom-emoji/utils.ts
+++ b/src/app/plugins/custom-emoji/utils.ts
@@ -1,6 +1,6 @@
import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
import { StateEvent } from '$types/matrix/room';
-import { getAccountData, getStateEvent, getStateEvents } from '$appUtils/room';
+import { getAccountData, getStateEvent, getStateEvents } from '$utils/room';
import { AccountDataEvent } from '$types/matrix/accountData';
import { EmoteRoomsContent, ImageUsage } from './types';
import { ImagePack } from './ImagePack';
diff --git a/src/app/plugins/markdown/utils.ts b/src/app/plugins/markdown/utils.ts
index 29b4eab6..8a0de61b 100644
--- a/src/app/plugins/markdown/utils.ts
+++ b/src/app/plugins/markdown/utils.ts
@@ -1,4 +1,4 @@
-import { findAndReplace } from '$appUtils/findAndReplace';
+import { findAndReplace } from '$utils/findAndReplace';
import { ESC_BLOCK_SEQ, UN_ESC_BLOCK_SEQ } from './block/rules';
import { EscapeRule, CAP_INLINE_SEQ } from './inline/rules';
import { runInlineRule } from './inline/runner';
diff --git a/src/app/state/hooks/roomList.ts b/src/app/state/hooks/roomList.ts
index 045b7547..d3db6bf1 100644
--- a/src/app/state/hooks/roomList.ts
+++ b/src/app/state/hooks/roomList.ts
@@ -2,7 +2,7 @@ import { Atom, useAtomValue } from 'jotai';
import { selectAtom } from 'jotai/utils';
import { MatrixClient } from '$types/matrix-sdk';
import { useCallback, useMemo } from 'react';
-import { getAllParents, isRoom, isSpace, isUnsupportedRoom } from '$appUtils/room';
+import { getAllParents, isRoom, isSpace, isUnsupportedRoom } from '$utils/room';
import { RoomToParents } from '$types/matrix/room';
import { compareRoomsEqual } from '../room-list/utils';
diff --git a/src/app/state/room/roomInputDrafts.ts b/src/app/state/room/roomInputDrafts.ts
index 72a418ed..5286b69c 100644
--- a/src/app/state/room/roomInputDrafts.ts
+++ b/src/app/state/room/roomInputDrafts.ts
@@ -3,7 +3,7 @@ import { atomFamily } from 'jotai/utils';
import { Descendant } from 'slate';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import { IEventRelation } from '$types/matrix-sdk';
-import { TUploadContent } from '$appUtils/matrix';
+import { TUploadContent } from '$utils/matrix';
import { createUploadAtomFamily } from '../upload';
import { createListAtom } from '../list';
diff --git a/src/app/state/room/roomToParents.ts b/src/app/state/room/roomToParents.ts
index 418c5622..0b40eb9c 100644
--- a/src/app/state/room/roomToParents.ts
+++ b/src/app/state/room/roomToParents.ts
@@ -16,7 +16,7 @@ import {
isSpace,
isValidChild,
mapParentWithChildren,
-} from '$appUtils/room';
+} from '$utils/room';
export type RoomToParentsAction =
| {
diff --git a/src/app/state/room/roomToUnread.ts b/src/app/state/room/roomToUnread.ts
index df6b5212..38100de6 100644
--- a/src/app/state/room/roomToUnread.ts
+++ b/src/app/state/room/roomToUnread.ts
@@ -25,7 +25,7 @@ import {
getUnreadInfo,
getUnreadInfos,
isNotificationEvent,
-} from '$appUtils/room';
+} from '$utils/room';
import { useStateEventCallback } from '$hooks/useStateEventCallback';
import { useSyncState } from '$hooks/useSyncState';
import { useRoomsNotificationPreferencesContext } from '$hooks/useRoomsNotificationPreferences';
diff --git a/tsconfig.json b/tsconfig.json
index ad45a66c..839ef9d3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,11 +17,10 @@
"$features/*": ["src/app/features/*"],
"$state/*": ["src/app/state/*"],
"$styles/*": ["src/app/styles/*"],
- "$appUtils/*": ["src/app/utils/*"],
+ "$utils/*": ["src/app/utils/*"],
"$pages/*": ["src/app/pages/*"],
"$types/*": ["src/types/*"],
"$public/*": ["public/*"],
- "$util/*": ["src/util/*"],
"$client/*": ["src/client/*"]
},
"moduleResolution": "bundler",
diff --git a/vite.config.ts b/vite.config.ts
index 7f47191a..d99b9184 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -88,11 +88,10 @@ export default defineConfig({
$features: path.resolve(__dirname, 'src/app/features'),
$state: path.resolve(__dirname, 'src/app/state'),
$styles: path.resolve(__dirname, 'src/app/styles'),
- $appUtils: path.resolve(__dirname, 'src/app/utils'),
+ $utils: path.resolve(__dirname, 'src/app/utils'),
$pages: path.resolve(__dirname, 'src/app/pages'),
$types: path.resolve(__dirname, 'src/types'),
$public: path.resolve(__dirname, 'public'),
- $util: path.resolve(__dirname, 'src/util'),
$client: path.resolve(__dirname, 'src/client'),
},
},
From 9a9c4efc4ffdaa8bbbb3fd266ea51014c77a3dd6 Mon Sep 17 00:00:00 2001
From: 7w1
Date: Sun, 1 Mar 2026 19:38:09 -0600
Subject: [PATCH 22/59] fix firefox being stupid
---
src/app/components/room-avatar/AvatarImage.tsx | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/app/components/room-avatar/AvatarImage.tsx b/src/app/components/room-avatar/AvatarImage.tsx
index 533c85d1..b904d87f 100644
--- a/src/app/components/room-avatar/AvatarImage.tsx
+++ b/src/app/components/room-avatar/AvatarImage.tsx
@@ -28,6 +28,7 @@ export function AvatarImage({ src, alt, uniformIcons, onError }: AvatarImageProp
className={css.RoomAvatar}
style={{ backgroundColor: useUniformIcons ? normalizedBg : undefined }}
src={src}
+ crossOrigin="anonymous"
alt={alt}
onError={() => {
setImage(undefined);
From 5f13069489173a435fe1f9b207d7680338068dea Mon Sep 17 00:00:00 2001
From: 7w1
Date: Sun, 1 Mar 2026 20:26:59 -0600
Subject: [PATCH 23/59] fix #46 for real this time
---
CHANGELOG.md | 8 ++++++++
src/app/hooks/useUserProfile.ts | 5 +++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f45682b..3b6528db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Sable Client Changelog
+## 1.2.3 - in dev
+
+- Actually fix quotes around colors for tuwunel homeservers ([#46](https://github.com/7w1/sable/issues/46))
+
+## 1.2.2 v2
+
+- hotfix for stupid firefox cors crash
+
## 1.2.2 - 3/1/2026
- Fixed/updated unknown extended profile keys rendering.
diff --git a/src/app/hooks/useUserProfile.ts b/src/app/hooks/useUserProfile.ts
index 75db1e72..5ad68654 100644
--- a/src/app/hooks/useUserProfile.ts
+++ b/src/app/hooks/useUserProfile.ts
@@ -154,11 +154,12 @@ export const useUserProfile = (
)?.getContent()?.font;
}
}
+ const validGlobalVal = isValidHex(data?.nameColor);
- const hasGlobalColor = data?.nameColor && isValidHex(data.nameColor);
+ const hasGlobalColor = !!validGlobalVal;
const validGlobal =
(renderGlobalColors || userId === mx.getUserId()) && hasGlobalColor
- ? data.nameColor
+ ? validGlobalVal
: undefined;
const validLocal = localColor && isValidHex(localColor) ? localColor : undefined;
const validSpace = spaceColor && isValidHex(spaceColor) ? spaceColor : undefined;
From 6f2d63046a57908b7d5d8c21c6eefe3dff160e43 Mon Sep 17 00:00:00 2001
From: cecelia hingston
Date: Mon, 2 Mar 2026 16:16:01 +1300
Subject: [PATCH 24/59] gruvbox theme
---
src/app/hooks/useTheme.ts | 11 ++++-
src/app/styles/themes.css | 89 +++++++++++++++++++++++++++++++++++++++
src/colors.css.ts | 1 +
src/index.css | 16 +++++++
4 files changed, 116 insertions(+), 1 deletion(-)
diff --git a/src/app/hooks/useTheme.ts b/src/app/hooks/useTheme.ts
index 8d5660a1..08804c62 100644
--- a/src/app/hooks/useTheme.ts
+++ b/src/app/hooks/useTheme.ts
@@ -7,6 +7,7 @@ import {
lightTheme,
rosePineTheme,
silverTheme,
+ gruvdarkTheme
} from '../../colors.css';
import { settingsAtom } from '../state/settings';
import { useSetting } from '../state/hooks/settings';
@@ -48,6 +49,13 @@ export const RosePineTheme: Theme = {
kind: ThemeKind.Dark,
classNames: ['rose-pine-theme', rosePineTheme, onDarkFontWeight, 'prism-dark'],
};
+
+export const GruvdarkTheme: Theme = {
+ id: 'gruvdark-theme',
+ kind: ThemeKind.Dark,
+ classNames: ['gruvdark-theme', gruvdarkTheme, onDarkFontWeight, 'prism-dark'],
+};
+
export const CinnyDarkTheme: Theme = {
id: 'cinny-dark-theme',
kind: ThemeKind.Dark,
@@ -56,7 +64,7 @@ export const CinnyDarkTheme: Theme = {
export const useThemes = (): Theme[] => {
const themes: Theme[] = useMemo(
- () => [LightTheme, SilverTheme, DarkTheme, ButterTheme, RosePineTheme, CinnyDarkTheme],
+ () => [LightTheme, SilverTheme, DarkTheme, ButterTheme, RosePineTheme, CinnyDarkTheme, GruvdarkTheme],
[]
);
@@ -72,6 +80,7 @@ export const useThemeNames = (): Record =>
[ButterTheme.id]: 'Butter',
[CinnyDarkTheme.id]: 'Cinny Dark',
[RosePineTheme.id]: 'Rose Pine',
+ [GruvdarkTheme.id]: 'GruvDark',
}),
[]
);
diff --git a/src/app/styles/themes.css b/src/app/styles/themes.css
index a23c8798..94a9cf7f 100644
--- a/src/app/styles/themes.css
+++ b/src/app/styles/themes.css
@@ -532,3 +532,92 @@
--sable-shadow: rgba(0, 0, 0, 1);
--sable-overlay: rgba(0, 0, 0, 0.8);
}
+
+/* --- Gruvdark --- */
+.gruvdark-theme {
+ /* Background */
+ --sable-bg-container: #282828;
+ --sable-bg-container-hover: #3c3836;
+ --sable-bg-container-active: #504945;
+ --sable-bg-container-line: #665c54;
+ --sable-bg-on-container: #fbf1c7;
+
+ /* Surface */
+ --sable-surface-container: #3c3836;
+ --sable-surface-container-hover: #32302f;
+ --sable-surface-container-active: #504945;
+ --sable-surface-container-line: #665c54;
+ --sable-surface-on-container: #fbf1c7;
+
+ /* Surface Variant */
+ --sable-surface-var-container: #282828;
+ --sable-surface-var-container-hover: #1d2021;
+ --sable-surface-var-container-active: #3c3836;
+ --sable-surface-var-container-line: #a89984;
+ --sable-surface-var-on-container: #ebdbb2;
+
+ /* Primary */
+ --sable-primary-main: #fbf1c7;
+ --sable-primary-main-hover: #ebdbb2;
+ --sable-primary-main-active: #d5c4a1;
+ --sable-primary-main-line: #bdae93;
+ --sable-primary-on-main: #1d2021;
+ --sable-primary-container: #fe8019;
+ --sable-primary-container-hover: #d65d0e;
+ --sable-primary-container-active: #e67111;
+ --sable-primary-container-line: #fbf1c7;
+ --sable-primary-on-container: #fbf1c7;
+
+ /* Secondary */
+ --sable-sec-main: #fbf1c7;
+ --sable-sec-main-hover: #ebdbb2;
+ --sable-sec-main-active: #d5c4a1;
+ --sable-sec-main-line: #bdae93;
+ --sable-sec-on-main: #1d2021;
+ --sable-sec-container: #282828;
+ --sable-sec-container-hover: #3c3836;
+ --sable-sec-container-active: #4d483d;
+ --sable-sec-container-line: #a89984;
+ --sable-sec-on-container: #fbf1c7;
+
+ /* Success */
+ --sable-success-main: #6e981a;
+ --sable-success-main-hover: #6e981a;
+ --sable-success-main-active: #6e981a;
+ --sable-success-main-line: #6e981a;
+ --sable-success-on-main: #c2c455;
+ --sable-success-container: #c2c455;
+ --sable-success-container-hover: #c2c455;
+ --sable-success-container-active: #c2c455;
+ --sable-success-container-line: #c2c455;
+ --sable-success-on-container: #fbf1c7;
+
+ /* Warning */
+ --sable-warn-main: #fe8019;
+ --sable-warn-main-hover: #fe8019;
+ --sable-warn-main-active: #fe8019;
+ --sable-warn-main-line: #fe8019;
+ --sable-warn-on-main: #d65d0e;
+ --sable-warn-container: #d65d0e;
+ --sable-warn-container-hover: #d65d0e;
+ --sable-warn-container-active: #d65d0e;
+ --sable-warn-container-line: #d65d0e;
+ --sable-warn-on-container: #fbf1c7;
+
+ /* Critical */
+ --sable-crit-main: #fb4834;
+ --sable-crit-main-hover: #fb4834;
+ --sable-crit-main-active: #fb4834;
+ --sable-crit-main-line: #fb4834;
+ --sable-crit-on-main: #cc241d;
+ --sable-crit-container: #4c1a18;
+ --sable-crit-container-hover: #4c1a18;
+ --sable-crit-container-active: #763333;
+ --sable-crit-container-line: #803737;
+ --sable-crit-on-container: #fbf1c7;
+
+ /* Other */
+ --sable-focus-ring: rgba(227, 186, 145, 0.5);
+ --sable-shadow: rgba(0, 0, 0, 0.6);
+ --sable-overlay: rgba(15, 14, 12, 0.9);
+}
diff --git a/src/colors.css.ts b/src/colors.css.ts
index 3e57daf8..2243e818 100644
--- a/src/colors.css.ts
+++ b/src/colors.css.ts
@@ -95,5 +95,6 @@ export const silverTheme = createTheme(color, sableThemeMapping);
export const darkTheme = createTheme(color, sableThemeMapping);
export const butterTheme = createTheme(color, sableThemeMapping);
export const lightTheme = createTheme(color, sableThemeMapping);
+export const gruvdarkTheme = createTheme(color, sableThemeMapping);
export const rosePineTheme = createTheme(color, sableThemeMapping);
export const cinnyDarkTheme = createTheme(color, sableThemeMapping);
diff --git a/src/index.css b/src/index.css
index 39e9bc7d..e799f6d5 100644
--- a/src/index.css
+++ b/src/index.css
@@ -41,6 +41,22 @@
--font-monospace: 'Space Mono', monospace;
}
+.gruvdark-theme {
+ --tc-link: #83a598;
+
+ --mx-uc-1: #d3869b;
+ --mx-uc-2: #fb4934;
+ --mx-uc-3: #458588;
+ --mx-uc-4: #8ec07c;
+ --mx-uc-5: #689d6a;
+ --mx-uc-6: #b16286;
+ --mx-uc-7: #fabd2f;
+ --mx-uc-8: #cc241d;
+
+ --font-secondary: 'Nunito Variable', var(--font-emoji), sans-serif;
+ --font-monospace: 'Space Mono', monospace;
+}
+
html {
height: 100%;
overflow: hidden;
From 94c43a69f868cc932b058a81595a9bf0d06324b7 Mon Sep 17 00:00:00 2001
From: Shea Duma
Date: Mon, 2 Mar 2026 06:19:21 +0200
Subject: [PATCH 25/59] base functionality
---
src/app/features/room/RoomInput.tsx | 52 +++++++++++++++++++-------
src/app/features/room/RoomTimeline.tsx | 12 ++++++
2 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index 379dc4a6..556444e3 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -36,6 +36,7 @@ import {
scaleSystemEmoji,
} from '$plugins/react-custom-html-parser';
+import { StickerEventContent } from 'matrix-js-sdk/lib/types';
import { useMatrixClient } from '$hooks/useMatrixClient';
import {
AUTOCOMPLETE_PREFIXES,
@@ -126,6 +127,26 @@ import { usePowerLevelTags } from '$hooks/usePowerLevelTags';
import { useComposingCheck } from '$hooks/useComposingCheck';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
+const getReplyContent = (replyDraft: IReplyDraft | undefined): IEventRelation => {
+ if (!replyDraft) return {};
+
+ const relatesTo: IEventRelation = {};
+
+ relatesTo['m.in_reply_to'] = {
+ event_id: replyDraft.eventId,
+ };
+
+ if (replyDraft.relation?.rel_type === RelationType.Thread) {
+ relatesTo.event_id = replyDraft.relation.event_id;
+ relatesTo.rel_type = RelationType.Thread;
+ relatesTo.is_falling_back = false;
+ }
+ return relatesTo;
+};
+interface ReplyEventContent {
+ 'm.relates_to'?: IEventRelation;
+}
+
interface RoomInputProps {
editor: Editor;
fileDropContainerRef: RefObject;
@@ -316,6 +337,15 @@ export const RoomInput = forwardRef(
});
handleCancelUpload(uploads);
const contents = fulfilledPromiseSettledResult(await Promise.allSettled(contentsPromises));
+
+ if (contents.length > 0) {
+ console.log(editor.children);
+ const plaintext = toPlainText(editor.children, isMarkdown).trim();
+ const replyContent = plaintext.length === 0 ? getReplyContent(replyDraft) : undefined;
+ if (replyContent) contents[0]['m.relates_to'] = replyContent;
+ setReplyDraft(undefined);
+ }
+
contents.forEach((content) => mx.sendMessage(roomId, content as any));
};
@@ -384,16 +414,8 @@ export const RoomInput = forwardRef(
content.formatted_body = formattedBody;
}
if (replyDraft) {
- content['m.relates_to'] = {
- 'm.in_reply_to': {
- event_id: replyDraft.eventId,
- },
- };
- if (replyDraft.relation?.rel_type === RelationType.Thread) {
- content['m.relates_to'].event_id = replyDraft.relation.event_id;
- content['m.relates_to'].rel_type = RelationType.Thread;
- content['m.relates_to'].is_falling_back = false;
- }
+ content['m.relates_to'] = getReplyContent(replyDraft);
+ setReplyDraft(undefined);
}
mx.sendMessage(roomId, content as any);
@@ -402,7 +424,6 @@ export const RoomInput = forwardRef(
setInputKey((prev) => prev + 1);
- setReplyDraft(undefined);
sendTypingStatus(false);
}, [mx, roomId, editor, replyDraft, sendTypingStatus, setReplyDraft, isMarkdown, commands]);
@@ -466,11 +487,16 @@ export const RoomInput = forwardRef(
await getImageUrlBlob(stickerUrl)
);
- mx.sendEvent(roomId, EventType.Sticker, {
+ const content: StickerEventContent & ReplyEventContent = {
body: label,
url: mxc,
info,
- });
+ };
+ if (replyDraft) {
+ content['m.relates_to'] = getReplyContent(replyDraft);
+ setReplyDraft(undefined);
+ }
+ mx.sendEvent(roomId, EventType.Sticker, content);
};
return (
diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
index 42a9005d..fd444ee0 100644
--- a/src/app/features/room/RoomTimeline.tsx
+++ b/src/app/features/room/RoomTimeline.tsx
@@ -1378,6 +1378,7 @@ export function RoomTimeline({
const reactionRelations = getEventReactions(timelineSet, mEventId);
const reactions = reactionRelations && reactionRelations.getSortedAnnotationsByKey();
const hasReactions = reactions && reactions.length > 0;
+ const { replyEventId, threadRootId } = mEvent;
const highlighted = focusItem?.index === item && focusItem.highlight;
const senderId = mEvent.getSender() ?? '';
const senderDisplayName =
@@ -1406,6 +1407,17 @@ export function RoomTimeline({
senderId={senderId}
activeReplyId={activeReplyId}
senderDisplayName={senderDisplayName}
+ reply={
+ replyEventId && (
+
+ )
+ }
reactions={
reactionRelations && (
Date: Mon, 2 Mar 2026 07:30:12 +0200
Subject: [PATCH 26/59] fixed difference between prs
---
src/app/features/room/RoomInput.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index 556444e3..09e257dc 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -320,6 +320,7 @@ export const RoomInput = forwardRef(
};
const handleSendUpload = async (uploads: UploadSuccess[]) => {
+ const plaintext = toPlainText(editor.children, isMarkdown).trim();
const contentsPromises = uploads.map(async (upload) => {
const fileItem = selectedFiles.find((f) => f.file === upload.file);
if (!fileItem) throw new Error('Broken upload');
@@ -340,7 +341,6 @@ export const RoomInput = forwardRef(
if (contents.length > 0) {
console.log(editor.children);
- const plaintext = toPlainText(editor.children, isMarkdown).trim();
const replyContent = plaintext.length === 0 ? getReplyContent(replyDraft) : undefined;
if (replyContent) contents[0]['m.relates_to'] = replyContent;
setReplyDraft(undefined);
From 5c1b1e96814ff861954940e178befa8a091bb23e Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 00:33:33 -0600
Subject: [PATCH 27/59] fix #38 option for messages to be right aligned in
bubble layout
---
CHANGELOG.md | 5 +-
src/app/components/message/layout/Bubble.tsx | 86 ++++++++++++++-----
.../components/message/layout/layout.css.ts | 14 +++
src/app/features/room/message/Message.tsx | 8 +-
.../features/settings/cosmetics/Cosmetics.tsx | 8 ++
src/app/state/settings.ts | 2 +
6 files changed, 98 insertions(+), 25 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b6528db..f2ac2029 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,11 @@
# Sable Client Changelog
-## 1.2.3 - in dev
+## 1.2.3 - 3/2/2026
- Actually fix quotes around colors for tuwunel homeservers ([#46](https://github.com/7w1/sable/issues/46))
+- Option to have your own message bubbles in bubble layout right aligned ([#38](https://github.com/7w1/sable/issues/38))
+- Allow responding to and rendering replies with files ([#54](https://github.com/7w1/sable/pull/54)) - [nushea](https://github.com/nushea)
+- Added Gruvbox theme ([#51](https://github.com/7w1/sable/pull/51)) - [dollth.ing](https://github.com/dollth-ing)
## 1.2.2 v2
diff --git a/src/app/components/message/layout/Bubble.tsx b/src/app/components/message/layout/Bubble.tsx
index 93ff84bc..32f341f2 100644
--- a/src/app/components/message/layout/Bubble.tsx
+++ b/src/app/components/message/layout/Bubble.tsx
@@ -25,39 +25,79 @@ function BubbleLeftArrow({ variant }: BubbleArrowProps) {
);
}
+function BubbleRightArrow({ variant }: BubbleArrowProps) {
+ return (
+
+ );
+}
type BubbleLayoutProps = {
hideBubble?: boolean;
before?: ReactNode;
header?: ReactNode;
+ align?: 'left' | 'right';
};
export const BubbleLayout = as<'div', BubbleLayoutProps>(
- ({ hideBubble, before, header, children, ...props }, ref) => (
-
-
- {before}
-
-
- {header}
- {hideBubble ? (
- children
- ) : (
-
-
- {before ? : null}
- {children}
+ ({ hideBubble, before, header, align = 'left', children, ...props }, ref) => {
+ const isRight = align === 'right';
+
+ return (
+
+ {!isRight && (
+
+ {before}
+
+ )}
+
+
+ {header}
+ {hideBubble ? (
+ children
+ ) : (
+
+
+ {before && !isRight ? : null}
+ {before && isRight ? : null}
+
+ {children}
+
+ )}
+
+
+ {isRight && (
+
+ {before}
)}
-
- )
+ );
+ }
);
diff --git a/src/app/components/message/layout/layout.css.ts b/src/app/components/message/layout/layout.css.ts
index ffc7d172..1070c843 100644
--- a/src/app/components/message/layout/layout.css.ts
+++ b/src/app/components/message/layout/layout.css.ts
@@ -153,6 +153,10 @@ export const BubbleContentArrowLeft = style({
borderTopLeftRadius: 0,
});
+export const BubbleContentArrowRight = style({
+ borderTopRightRadius: 0,
+});
+
export const BubbleLeftArrow = style({
width: toRem(9),
height: toRem(8),
@@ -163,6 +167,16 @@ export const BubbleLeftArrow = style({
zIndex: 1,
});
+export const BubbleRightArrow = style({
+ width: toRem(9),
+ height: toRem(8),
+
+ position: 'absolute',
+ top: 0,
+ right: toRem(-8),
+ zIndex: 1,
+});
+
export const Username = style({
overflow: 'hidden',
whiteSpace: 'nowrap',
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 7e266f91..e379d054 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -356,6 +356,7 @@ function MessageInternal(
const [mobileOptionsOpen, setMobileOptionsOpen] = useState(false);
const optionsRef = useRef(null);
const [showPronouns] = useSetting(settingsAtom, 'showPronouns');
+ const [useRightBubbles] = useSetting(settingsAtom, 'useRightBubbles');
useEffect(() => {
if (!mobileOptionsOpen) return undefined;
@@ -862,7 +863,12 @@ function MessageInternal(
)}
{messageLayout === MessageLayout.Bubble && (
-
+
{msgContentJSX}
diff --git a/src/app/features/settings/cosmetics/Cosmetics.tsx b/src/app/features/settings/cosmetics/Cosmetics.tsx
index 262e766c..8c0c6aca 100644
--- a/src/app/features/settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/settings/cosmetics/Cosmetics.tsx
@@ -170,6 +170,7 @@ function IdentityCosmetics() {
'renderGlobalNameColors'
);
const [uniformIcons, setUniformIcons] = useSetting(settingsAtom, 'uniformIcons');
+ const [rightBubbles, setRightBubbles] = useSetting(settingsAtom, 'useRightBubbles');
return (
@@ -210,6 +211,13 @@ function IdentityCosmetics() {
after={}
/>
+
+ }
+ />
+
);
}
diff --git a/src/app/state/settings.ts b/src/app/state/settings.ts
index fe98b7a4..ca442e53 100644
--- a/src/app/state/settings.ts
+++ b/src/app/state/settings.ts
@@ -63,6 +63,7 @@ export interface Settings {
mobileGestures: boolean;
rightSwipeAction: RightSwipeAction;
hideMembershipInReadOnly: boolean;
+ useRightBubbles: boolean;
}
const defaultSettings: Settings = {
@@ -112,6 +113,7 @@ const defaultSettings: Settings = {
mobileGestures: true,
rightSwipeAction: RightSwipeAction.Reply,
hideMembershipInReadOnly: true,
+ useRightBubbles: false,
};
export const getSettings = () => {
From 90dd4c721a71cd1365372481ef250b8b39c7ec39 Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 00:34:35 -0600
Subject: [PATCH 28/59] bump version
---
package-lock.json | 4 ++--
package.json | 2 +-
src/app/features/settings/about/About.tsx | 2 +-
src/app/pages/auth/AuthFooter.tsx | 2 +-
src/app/pages/client/WelcomePage.tsx | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 351a7880..eb740057 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "sable",
- "version": "1.2.2",
+ "version": "1.2.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "sable",
- "version": "1.2.2",
+ "version": "1.2.3",
"license": "AGPL-3.0-only",
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.7.7",
diff --git a/package.json b/package.json
index e7326695..ec35525f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sable",
- "version": "1.2.2",
+ "version": "1.2.3",
"description": "Yet another matrix client fork",
"main": "index.js",
"type": "module",
diff --git a/src/app/features/settings/about/About.tsx b/src/app/features/settings/about/About.tsx
index 10e8f79f..b1bb6cd5 100644
--- a/src/app/features/settings/about/About.tsx
+++ b/src/app/features/settings/about/About.tsx
@@ -46,7 +46,7 @@ export function About({ requestClose }: AboutProps) {
Sable
- v1.2.2
+ v1.2.3
Yet another matrix client fork(ed from cinny).
diff --git a/src/app/pages/auth/AuthFooter.tsx b/src/app/pages/auth/AuthFooter.tsx
index 3b35da11..5eeff81c 100644
--- a/src/app/pages/auth/AuthFooter.tsx
+++ b/src/app/pages/auth/AuthFooter.tsx
@@ -15,7 +15,7 @@ export function AuthFooter() {
target="_blank"
rel="noreferrer"
>
- v1.2.2
+ v1.2.3
Twitter
diff --git a/src/app/pages/client/WelcomePage.tsx b/src/app/pages/client/WelcomePage.tsx
index 453abfa3..b92bc040 100644
--- a/src/app/pages/client/WelcomePage.tsx
+++ b/src/app/pages/client/WelcomePage.tsx
@@ -20,7 +20,7 @@ export function WelcomePage() {
Yet another matrix client fork.{' '}
- v1.2.2
+ v1.2.3
}
From ff28e18d4bf399cab255e9ae544ae8a93c830d75 Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 09:35:07 +0100
Subject: [PATCH 29/59] chore(lint): lint autofix
---
src/app/components/RoomUnreadProvider.tsx | 4 ++--
src/app/components/UseStateProvider.tsx | 2 +-
.../direct-invite-prompt/DirectInvitePrompt.tsx | 12 +++++++++---
.../editor/autocomplete/UserMentionAutocomplete.tsx | 2 +-
src/app/components/editor/keyboard.ts | 2 +-
src/app/components/upload-board/UploadBoard.tsx | 4 +---
src/app/features/call/SmallWidget.ts | 4 ++--
src/app/features/call/SmallWidgetDriver.ts | 4 ++--
src/app/features/lobby/Lobby.tsx | 2 +-
src/app/features/room/RoomInput.tsx | 1 +
src/app/features/room/RoomTimeline.tsx | 2 +-
.../settings/developer-tools/AccountData.tsx | 9 ++++-----
src/app/features/widgets/GenericWidgetDriver.ts | 6 +++---
src/app/features/widgets/WidgetIframe.tsx | 2 +-
src/app/hooks/useMutualRooms.ts | 2 +-
src/app/hooks/useTheme.ts | 12 ++++++++++--
src/app/hooks/useVirtualPaginator.ts | 8 ++++----
src/app/pages/client/ClientRoot.tsx | 2 +-
src/app/pages/client/call/CallProvider.tsx | 11 +++--------
src/app/plugins/custom-emoji/utils.ts | 6 ++----
src/ext.d.ts | 4 +---
21 files changed, 52 insertions(+), 49 deletions(-)
diff --git a/src/app/components/RoomUnreadProvider.tsx b/src/app/components/RoomUnreadProvider.tsx
index a74b291c..055a0832 100644
--- a/src/app/components/RoomUnreadProvider.tsx
+++ b/src/app/components/RoomUnreadProvider.tsx
@@ -5,7 +5,7 @@ import { roomToUnreadAtom } from '../state/room/roomToUnread';
type RoomUnreadProviderProps = {
roomId: string;
- children: (unread?: Unread) => ReactElement;
+ children: (unread?: Unread) => ReactElement;
};
export function RoomUnreadProvider({ roomId, children }: RoomUnreadProviderProps) {
const unread = useRoomUnread(roomId, roomToUnreadAtom);
@@ -15,7 +15,7 @@ export function RoomUnreadProvider({ roomId, children }: RoomUnreadProviderProps
type RoomsUnreadProviderProps = {
rooms: string[];
- children: (unread?: Unread) => ReactElement;
+ children: (unread?: Unread) => ReactElement;
};
export function RoomsUnreadProvider({ rooms, children }: RoomsUnreadProviderProps) {
const unread = useRoomsUnread(rooms, roomToUnreadAtom);
diff --git a/src/app/components/UseStateProvider.tsx b/src/app/components/UseStateProvider.tsx
index 4e5b8332..21e5b3ca 100644
--- a/src/app/components/UseStateProvider.tsx
+++ b/src/app/components/UseStateProvider.tsx
@@ -2,7 +2,7 @@ import { Dispatch, ReactElement, SetStateAction, useState } from 'react';
type UseStateProviderProps = {
initial: T | (() => T);
- children: (value: T, setter: Dispatch>) => ReactElement;
+ children: (value: T, setter: Dispatch>) => ReactElement;
};
export function UseStateProvider({ initial, children }: UseStateProviderProps) {
return children(...useState(initial));
diff --git a/src/app/components/direct-invite-prompt/DirectInvitePrompt.tsx b/src/app/components/direct-invite-prompt/DirectInvitePrompt.tsx
index 1cba4931..ca11a641 100644
--- a/src/app/components/direct-invite-prompt/DirectInvitePrompt.tsx
+++ b/src/app/components/direct-invite-prompt/DirectInvitePrompt.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import FocusTrap from 'focus-trap-react';
import {
Box,
@@ -82,9 +81,16 @@ export function DirectInvitePrompt({
}
aria-disabled={converting}
>
- {converting ? 'Converting...' : 'Convert to Group Chat and Invite'}
+
+ {converting ? 'Converting...' : 'Convert to Group Chat and Invite'}
+
- } requestClose={requestClose}>
{query.text === 'room' && (
diff --git a/src/app/components/editor/input.ts b/src/app/components/editor/input.ts
index 8a743136..1b5da1b2 100644
--- a/src/app/components/editor/input.ts
+++ b/src/app/components/editor/input.ts
@@ -83,12 +83,7 @@ const getInlineMarkElement = (
children.push({ text: mdSequence });
return children;
}
- children.forEach((child) => {
- if (Text.isText(child)) {
- child[markType] = true;
- }
- });
- return children;
+ return children.map((child) => (Text.isText(child) ? { ...child, [markType]: true } : child));
};
const getInlineNonMarkElement = (node: Element): MentionElement | EmoticonElement | undefined => {
diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx
index 520b64ed..b9e6408b 100644
--- a/src/app/components/message/Reply.tsx
+++ b/src/app/components/message/Reply.tsx
@@ -77,7 +77,7 @@ export const Reply = as<'div', ReplyProps>(
const mx = useMatrixClient();
- const { body, formatted_body, format } = replyEvent?.getContent() ?? {};
+ const { body, formatted_body: formattedBody, format } = replyEvent?.getContent() ?? {};
const sender = replyEvent?.getSender();
const { color: usernameColor, font: usernameFont } = useSableCosmetics(sender ?? '', room);
@@ -92,8 +92,8 @@ export const Reply = as<'div', ReplyProps>(
const badEncryption = replyEvent?.getContent().msgtype === 'm.bad.encrypted';
let bodyJSX: ReactNode = fallbackBody;
- if (format === 'org.matrix.custom.html' && formatted_body) {
- const strippedHtml = trimReplyFromFormattedBody(formatted_body)
+ if (format === 'org.matrix.custom.html' && formattedBody) {
+ const strippedHtml = trimReplyFromFormattedBody(formattedBody)
.replace(/
/gi, ' ')
.replace(/<\/p>\s*]*>/gi, ' ')
.replace(/<\/?p[^>]*>/gi, '')
diff --git a/src/app/components/message/Time.tsx b/src/app/components/message/Time.tsx
index 43ef7f70..dc190d93 100644
--- a/src/app/components/message/Time.tsx
+++ b/src/app/components/message/Time.tsx
@@ -28,7 +28,7 @@ export type TimeProps = {
* @returns {React.ReactElement} A element with the formatted date/time.
*/
export const Time = as<'span', TimeProps & ComponentProps>(
- ({ compact, hour24Clock, dateFormatString, ts, ...props }, ref) => {
+ ({ compact, hour24Clock, dateFormatString, ts, ...props }) => {
const formattedTime = timeHourMinute(ts, hour24Clock);
let time = '';
diff --git a/src/app/components/room-intro/RoomIntro.tsx b/src/app/components/room-intro/RoomIntro.tsx
index 8522fd6c..e964ceef 100644
--- a/src/app/components/room-intro/RoomIntro.tsx
+++ b/src/app/components/room-intro/RoomIntro.tsx
@@ -145,7 +145,9 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) =>
) : (
void joinPrevRoom(prevRoomId)}
+ onClick={() => {
+ joinPrevRoom(prevRoomId);
+ }}
variant="Secondary"
size="300"
fill="Soft"
diff --git a/src/app/features/call/SmallWidgetDriver.ts b/src/app/features/call/SmallWidgetDriver.ts
index 0418a912..29f441cf 100644
--- a/src/app/features/call/SmallWidgetDriver.ts
+++ b/src/app/features/call/SmallWidgetDriver.ts
@@ -391,7 +391,7 @@ export class SmallWidgetDriver extends WidgetDriver {
if (room === null) return [];
const results: MatrixEvent[] = [];
const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
- for (let i = events.length - 1; i >= 0; i--) {
+ for (let i = events.length - 1; i >= 0; i -= 1) {
const ev = events[i];
if (results.length >= limit) break;
if (since !== undefined && ev.getId() === since) break;
diff --git a/src/app/features/message-search/MessageSearch.tsx b/src/app/features/message-search/MessageSearch.tsx
index 3b61856e..46c948f6 100644
--- a/src/app/features/message-search/MessageSearch.tsx
+++ b/src/app/features/message-search/MessageSearch.tsx
@@ -7,7 +7,7 @@ import { useSearchParams } from 'react-router-dom';
import { SearchOrderBy } from '$types/matrix-sdk';
import { PageHero, PageHeroEmpty, PageHeroSection } from '$components/page';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { _SearchPathSearchParams } from '$pages/paths';
+import { SearchPathSearchParams } from '$pages/paths';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { SequenceCard } from '$components/sequence-card';
@@ -24,7 +24,7 @@ import { SearchResultGroup } from './SearchResultGroup';
import { SearchInput } from './SearchInput';
import { SearchFilters } from './SearchFilters';
-const useSearchPathSearchParams = (searchParams: URLSearchParams): _SearchPathSearchParams =>
+const useSearchPathSearchParams = (searchParams: URLSearchParams): SearchPathSearchParams =>
useMemo(
() => ({
global: searchParams.get('global') ?? undefined,
diff --git a/src/app/features/message-search/SearchFilters.tsx b/src/app/features/message-search/SearchFilters.tsx
index b4a8de6b..4c1abd75 100644
--- a/src/app/features/message-search/SearchFilters.tsx
+++ b/src/app/features/message-search/SearchFilters.tsx
@@ -133,7 +133,7 @@ function SelectRoomButton({ roomList, selectedRooms, onChange }: SelectRoomButto
[mx]
);
- const [searchResult, _searchRoom, resetSearch] = useAsyncSearch(
+ const [searchResult, searchRoomRaw, resetSearch] = useAsyncSearch(
roomList,
getRoomNameStr,
SEARCH_OPTS
@@ -148,7 +148,7 @@ function SelectRoomButton({ roomList, selectedRooms, onChange }: SelectRoomButto
});
const vItems = virtualizer.getVirtualItems();
- const searchRoom = useDebounce(_searchRoom, SEARCH_DEBOUNCE_OPTS);
+ const searchRoom = useDebounce(searchRoomRaw, SEARCH_DEBOUNCE_OPTS);
const handleSearchChange: ChangeEventHandler = (evt) => {
const value = evt.currentTarget.value.trim();
if (!value) {
diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx
index 433e5646..2c3e25be 100644
--- a/src/app/features/room/RoomViewHeader.tsx
+++ b/src/app/features/room/RoomViewHeader.tsx
@@ -44,7 +44,7 @@ import {
mxcUrlToHttp,
removeRoomIdFromMDirect,
} from '$utils/matrix';
-import { _SearchPathSearchParams } from '$pages/paths';
+import { SearchPathSearchParams } from '$pages/paths';
import { useRoomUnread } from '$state/hooks/unread';
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
import { markAsRead } from '$utils/notifications';
@@ -123,7 +123,7 @@ const RoomMenu = forwardRef(({ room, requestClose
const [directInvitePrompt, setDirectInvitePrompt] = useState(false);
const handleMarkAsRead = () => {
- void markAsRead(mx, room.roomId, hideActivity);
+ markAsRead(mx, room.roomId, hideActivity);
requestClose();
};
@@ -401,7 +401,7 @@ export function RoomViewHeader() {
}, [pinnedIds, pinMarker]);
const handleSearchClick = () => {
- const searchParams: _SearchPathSearchParams = {
+ const searchParams: SearchPathSearchParams = {
rooms: room.roomId,
};
const path = space
@@ -664,7 +664,13 @@ export function RoomViewHeader() {
}
>
{(triggerRef) => (
-
+ {
+ toggleChat();
+ }}
+ >
)}
diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx
index 2133f1f6..49af9912 100644
--- a/src/app/features/settings/account/Profile.tsx
+++ b/src/app/features/settings/account/Profile.tsx
@@ -216,6 +216,7 @@ function ProfileAvatar({ profile, userId }: ProfileProps) {
);
}
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
function ProfileBanner({ profile, userId }: ProfileProps) {
const mx = useMatrixClient();
const useAuthentication = useMediaAuthentication();
diff --git a/src/app/hooks/useBlobCache.ts b/src/app/hooks/useBlobCache.ts
index 9a76a31e..a3d5493c 100644
--- a/src/app/hooks/useBlobCache.ts
+++ b/src/app/hooks/useBlobCache.ts
@@ -17,7 +17,7 @@ export function useBlobCache(url?: string): string | undefined {
}
useEffect(() => {
- if (!url || imageBlobCache.has(url)) return;
+ if (!url || imageBlobCache.has(url)) return undefined;
let isMounted = true;
@@ -50,7 +50,7 @@ export function useBlobCache(url?: string): string | undefined {
if (isMounted) {
setCacheState({ sourceUrl: url, blobUrl: finalBlobUrl });
}
- } catch (err) {
+ } catch {
// silency fail... mrow
} finally {
inflightRequests.delete(url);
diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts
index 8a047949..113ec28c 100644
--- a/src/app/hooks/useCommands.ts
+++ b/src/app/hooks/useCommands.ts
@@ -778,8 +778,9 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
return;
}
+ let parsedUrl: URL;
try {
- new URL(url);
+ parsedUrl = new URL(url);
} catch {
sendFeedback('Invalid URL. Please provide a valid widget URL.');
return;
@@ -792,7 +793,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
StateEvent.RoomWidget as any,
{
type: 'm.custom',
- url: enrichWidgetUrl(url),
+ url: enrichWidgetUrl(parsedUrl.toString()),
name,
id: widgetId,
creatorUserId: userId,
diff --git a/src/app/hooks/useIntegrationManager.ts b/src/app/hooks/useIntegrationManager.ts
index 5c9a70ae..00feba38 100644
--- a/src/app/hooks/useIntegrationManager.ts
+++ b/src/app/hooks/useIntegrationManager.ts
@@ -34,7 +34,9 @@ async function discoverManagers(mx: MatrixClient): Promise
});
}
}
- } catch {}
+ } catch {
+ // ignore malformed or unavailable .well-known data
+ }
try {
const widgetsEvent = mx.getAccountData('m.widgets' as never);
@@ -52,7 +54,9 @@ async function discoverManagers(mx: MatrixClient): Promise
}
});
}
- } catch {}
+ } catch {
+ // ignore malformed widget account data
+ }
if (managers.length === 0) {
return DEFAULT_MANAGERS;
diff --git a/src/app/hooks/useMentionClickHandler.ts b/src/app/hooks/useMentionClickHandler.ts
index 9dc81d4e..a431d5a2 100644
--- a/src/app/hooks/useMentionClickHandler.ts
+++ b/src/app/hooks/useMentionClickHandler.ts
@@ -4,7 +4,7 @@ import { useRoomNavigate } from './useRoomNavigate';
import { useMatrixClient } from './useMatrixClient';
import { isRoomId, isUserId } from '../utils/matrix';
import { getHomeRoomPath, withSearchParam } from '../pages/pathUtils';
-import { _RoomSearchParams } from '../pages/paths';
+import { RoomSearchParams } from '../pages/paths';
import { useOpenUserRoomProfile } from '../state/hooks/userRoomProfile';
import { useSpaceOptionally } from './useSpace';
@@ -38,7 +38,7 @@ export const useMentionClickHandler = (roomId: string): ReactEventHandler(path, { viaServers }) : path);
+ navigate(viaServers ? withSearchParam(path, { viaServers }) : path);
},
[mx, navigate, navigateRoom, navigateSpace, roomId, space, openProfile]
);
diff --git a/src/app/hooks/useUserProfile.ts b/src/app/hooks/useUserProfile.ts
index 1e7aad5a..bcecc16c 100644
--- a/src/app/hooks/useUserProfile.ts
+++ b/src/app/hooks/useUserProfile.ts
@@ -81,7 +81,7 @@ export const useUserProfile = (
const needsFetch = !!userId && userId !== 'undefined' && !cached?._fetched;
useEffect(() => {
- if (!needsFetch) return;
+ if (!needsFetch) return undefined;
let fetchPromise = inFlightProfiles.get(userId);
diff --git a/src/app/pages/Router.tsx b/src/app/pages/Router.tsx
index bcf159d0..1a65fe05 100644
--- a/src/app/pages/Router.tsx
+++ b/src/app/pages/Router.tsx
@@ -18,15 +18,15 @@ import {
REGISTER_PATH,
RESET_PASSWORD_PATH,
SPACE_PATH,
- _CREATE_PATH,
- _FEATURED_PATH,
- _INVITES_PATH,
- _JOIN_PATH,
- _LOBBY_PATH,
- _NOTIFICATIONS_PATH,
- _ROOM_PATH,
- _SEARCH_PATH,
- _SERVER_PATH,
+ CREATE_PATH_SEGMENT,
+ FEATURED_PATH_SEGMENT,
+ INVITES_PATH_SEGMENT,
+ JOIN_PATH_SEGMENT,
+ LOBBY_PATH_SEGMENT,
+ NOTIFICATIONS_PATH_SEGMENT,
+ ROOM_PATH_SEGMENT,
+ SEARCH_PATH_SEGMENT,
+ SERVER_PATH_SEGMENT,
CREATE_PATH,
} from './paths';
import {
@@ -189,11 +189,11 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize)
}
>
{mobile ? null : } />}
- } />
- join
} />
- } />
+ } />
+ join
} />
+ } />
@@ -216,9 +216,9 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize)
}
>
{mobile ? null : } />}
- } />
+ } />
@@ -258,10 +258,10 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize)
element={}
/>
)}
- } />
- } />
+ } />
+ } />
@@ -290,8 +290,8 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize)
element={}
/>
)}
- } />
- } />
+ } />
+ } />
} />
}
/>
)}
- } />
- } />
+ } />
+ } />
Page not found} />
diff --git a/src/app/pages/client/ClientRoot.tsx b/src/app/pages/client/ClientRoot.tsx
index c3fd7919..950d7198 100644
--- a/src/app/pages/client/ClientRoot.tsx
+++ b/src/app/pages/client/ClientRoot.tsx
@@ -58,7 +58,6 @@ function ClientRootLoading() {
type ClientRootOptionsProps = {
mx?: MatrixClient;
- session?: Session;
onLogout: () => void;
};
function ClientRootOptions({ mx, onLogout }: ClientRootOptionsProps) {
@@ -260,7 +259,7 @@ export function ClientRoot({ children }: ClientRootProps) {
return (
{mx && }
- {loading && }
+ {loading && }
{(loadState.status === AsyncStatus.Error || startState.status === AsyncStatus.Error) && (
diff --git a/src/app/pages/client/call/CallProvider.tsx b/src/app/pages/client/call/CallProvider.tsx
index b69032bb..69aa3bdb 100644
--- a/src/app/pages/client/call/CallProvider.tsx
+++ b/src/app/pages/client/call/CallProvider.tsx
@@ -204,13 +204,13 @@ export function CallProvider({ children }: CallProviderProps) {
if (!isActiveCallReady) return;
ev.preventDefault();
- const { audio_enabled, video_enabled } = ev.detail.data ?? {};
+ const { audio_enabled: audioEnabled, video_enabled: videoEnabled } = ev.detail.data ?? {};
- if (typeof audio_enabled === 'boolean' && audio_enabled !== isAudioEnabled) {
- setIsAudioEnabledState(audio_enabled);
+ if (typeof audioEnabled === 'boolean' && audioEnabled !== isAudioEnabled) {
+ setIsAudioEnabledState(audioEnabled);
}
- if (typeof video_enabled === 'boolean' && video_enabled !== isVideoEnabled) {
- setIsVideoEnabledState(video_enabled);
+ if (typeof videoEnabled === 'boolean' && videoEnabled !== isVideoEnabled) {
+ setIsVideoEnabledState(videoEnabled);
}
};
diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx
index f6be7121..fec44d6c 100644
--- a/src/app/pages/client/home/Home.tsx
+++ b/src/app/pages/client/home/Home.tsx
@@ -60,7 +60,7 @@ import {
} from '$hooks/useRoomsNotificationPreferences';
import { UseStateProvider } from '$components/UseStateProvider';
import { JoinAddressPrompt } from '$components/join-address-prompt';
-import { _RoomSearchParams } from '$pages/paths';
+import { RoomSearchParams } from '$pages/paths';
import { CallNavStatus } from '$features/room-nav/RoomCallNavStatus';
import { useHomeRooms } from './useHomeRooms';
@@ -282,7 +282,7 @@ export function Home() {
const path = getHomeRoomPath(roomIdOrAlias, eventId);
navigate(
viaServers
- ? withSearchParam<_RoomSearchParams>(path, {
+ ? withSearchParam(path, {
viaServers: encodeSearchParamValueArray(viaServers),
})
: path
diff --git a/src/app/pages/client/inbox/Notifications.tsx b/src/app/pages/client/inbox/Notifications.tsx
index 49d94335..7a05f3a3 100644
--- a/src/app/pages/client/inbox/Notifications.tsx
+++ b/src/app/pages/client/inbox/Notifications.tsx
@@ -593,11 +593,11 @@ export function Notifications() {
setSearchParams();
};
- const [notificationTimeline, _loadTimeline, silentReloadTimeline] = useNotificationTimeline(
+ const [notificationTimeline, loadTimelineRaw, silentReloadTimeline] = useNotificationTimeline(
24,
onlyHighlight
);
- const [timelineState, loadTimeline] = useAsyncCallback(_loadTimeline);
+ const [timelineState, loadTimeline] = useAsyncCallback(loadTimelineRaw);
const virtualizer = useVirtualizer({
count: notificationTimeline.groups.length,
diff --git a/src/app/pages/client/sidebar/CreateTab.tsx b/src/app/pages/client/sidebar/CreateTab.tsx
index 6ffab094..0d93621a 100644
--- a/src/app/pages/client/sidebar/CreateTab.tsx
+++ b/src/app/pages/client/sidebar/CreateTab.tsx
@@ -15,7 +15,7 @@ import {
} from '$pages/pathUtils';
import { useCreateSelected } from '$hooks/router/useCreateSelected';
import { JoinAddressPrompt } from '$components/join-address-prompt';
-import { _RoomSearchParams } from '$pages/paths';
+import { RoomSearchParams } from '$pages/paths';
export function CreateTab() {
const createSelected = useCreateSelected();
@@ -118,7 +118,7 @@ export function CreateTab() {
const path = getSpacePath(roomIdOrAlias);
navigate(
viaServers
- ? withSearchParam<_RoomSearchParams>(path, {
+ ? withSearchParam(path, {
viaServers: encodeSearchParamValueArray(viaServers),
})
: path
diff --git a/src/app/pages/pathSearchParam.ts b/src/app/pages/pathSearchParam.ts
index 8e4c93e5..813abc3d 100644
--- a/src/app/pages/pathSearchParam.ts
+++ b/src/app/pages/pathSearchParam.ts
@@ -1,8 +1,8 @@
-import { _RoomSearchParams, DirectCreateSearchParams } from './paths';
+import { RoomSearchParams, DirectCreateSearchParams } from './paths';
type SearchParamsGetter = (searchParams: URLSearchParams) => T;
-export const getRoomSearchParams: SearchParamsGetter<_RoomSearchParams> = (searchParams) => ({
+export const getRoomSearchParams: SearchParamsGetter = (searchParams) => ({
viaServers: searchParams.get('viaServers') ?? undefined,
});
diff --git a/src/app/pages/paths.ts b/src/app/pages/paths.ts
index 9cf4bfb9..d8dfd23b 100644
--- a/src/app/pages/paths.ts
+++ b/src/app/pages/paths.ts
@@ -19,51 +19,51 @@ export type ResetPasswordPathSearchParams = {
};
export const RESET_PASSWORD_PATH = '/reset-password/:server?/';
-export const _CREATE_PATH = 'create/';
-export const _JOIN_PATH = 'join/';
-export const _LOBBY_PATH = 'lobby/';
+export const CREATE_PATH_SEGMENT = 'create/';
+export const JOIN_PATH_SEGMENT = 'join/';
+export const LOBBY_PATH_SEGMENT = 'lobby/';
/**
* array of rooms and senders mxId assigned
* to search param as string should be "," separated
* Like: url?rooms=!one:server,!two:server
*/
-export type _SearchPathSearchParams = {
+export type SearchPathSearchParams = {
global?: string;
term?: string;
order?: string;
rooms?: string;
senders?: string;
};
-export const _SEARCH_PATH = 'search/';
+export const SEARCH_PATH_SEGMENT = 'search/';
-export type _RoomSearchParams = {
+export type RoomSearchParams = {
/* comma separated string of servers */
viaServers?: string;
};
-export const _ROOM_PATH = ':roomIdOrAlias/:eventId?/';
+export const ROOM_PATH_SEGMENT = ':roomIdOrAlias/:eventId?/';
export const HOME_PATH = '/home/';
-export const HOME_CREATE_PATH = `/home/${_CREATE_PATH}`;
-export const HOME_JOIN_PATH = `/home/${_JOIN_PATH}`;
-export const HOME_SEARCH_PATH = `/home/${_SEARCH_PATH}`;
-export const HOME_ROOM_PATH = `/home/${_ROOM_PATH}`;
+export const HOME_CREATE_PATH = `/home/${CREATE_PATH_SEGMENT}`;
+export const HOME_JOIN_PATH = `/home/${JOIN_PATH_SEGMENT}`;
+export const HOME_SEARCH_PATH = `/home/${SEARCH_PATH_SEGMENT}`;
+export const HOME_ROOM_PATH = `/home/${ROOM_PATH_SEGMENT}`;
export const DIRECT_PATH = '/direct/';
export type DirectCreateSearchParams = {
userId?: string;
};
-export const DIRECT_CREATE_PATH = `/direct/${_CREATE_PATH}`;
-export const DIRECT_ROOM_PATH = `/direct/${_ROOM_PATH}`;
+export const DIRECT_CREATE_PATH = `/direct/${CREATE_PATH_SEGMENT}`;
+export const DIRECT_ROOM_PATH = `/direct/${ROOM_PATH_SEGMENT}`;
export const SPACE_PATH = '/:spaceIdOrAlias/';
-export const SPACE_LOBBY_PATH = `/:spaceIdOrAlias/${_LOBBY_PATH}`;
-export const SPACE_SEARCH_PATH = `/:spaceIdOrAlias/${_SEARCH_PATH}`;
-export const SPACE_ROOM_PATH = `/:spaceIdOrAlias/${_ROOM_PATH}`;
+export const SPACE_LOBBY_PATH = `/:spaceIdOrAlias/${LOBBY_PATH_SEGMENT}`;
+export const SPACE_SEARCH_PATH = `/:spaceIdOrAlias/${SEARCH_PATH_SEGMENT}`;
+export const SPACE_ROOM_PATH = `/:spaceIdOrAlias/${ROOM_PATH_SEGMENT}`;
-export const _FEATURED_PATH = 'featured/';
-export const _SERVER_PATH = ':server/';
+export const FEATURED_PATH_SEGMENT = 'featured/';
+export const SERVER_PATH_SEGMENT = ':server/';
export const EXPLORE_PATH = '/explore/';
-export const EXPLORE_FEATURED_PATH = `/explore/${_FEATURED_PATH}`;
+export const EXPLORE_FEATURED_PATH = `/explore/${FEATURED_PATH_SEGMENT}`;
export type ExploreServerPathSearchParams = {
limit?: string;
@@ -72,18 +72,18 @@ export type ExploreServerPathSearchParams = {
type?: string;
instance?: string;
};
-export const EXPLORE_SERVER_PATH = `/explore/${_SERVER_PATH}`;
+export const EXPLORE_SERVER_PATH = `/explore/${SERVER_PATH_SEGMENT}`;
export const CREATE_PATH = '/create';
-export const _NOTIFICATIONS_PATH = 'notifications/';
-export const _INVITES_PATH = 'invites/';
+export const NOTIFICATIONS_PATH_SEGMENT = 'notifications/';
+export const INVITES_PATH_SEGMENT = 'invites/';
export const INBOX_PATH = '/inbox/';
export type InboxNotificationsPathSearchParams = {
only?: string;
};
-export const INBOX_NOTIFICATIONS_PATH = `/inbox/${_NOTIFICATIONS_PATH}`;
-export const INBOX_INVITES_PATH = `/inbox/${_INVITES_PATH}`;
+export const INBOX_NOTIFICATIONS_PATH = `/inbox/${NOTIFICATIONS_PATH_SEGMENT}`;
+export const INBOX_INVITES_PATH = `/inbox/${INVITES_PATH_SEGMENT}`;
export const SPACE_SETTINGS_PATH = '/space-settings/';
From 3dec377aae351a36979cdd1535ed3ee8e4bd130d Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 19:00:22 +0100
Subject: [PATCH 40/59] fix: render Text children explicitly in wrapper
components
---
src/app/components/message/layout/Base.tsx | 9 +++++++--
src/app/components/nav/NavItemContent.tsx | 6 ++++--
src/app/components/room-card/RoomCard.tsx | 12 ++++++++----
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/app/components/message/layout/Base.tsx b/src/app/components/message/layout/Base.tsx
index f0c65f46..008c9e41 100644
--- a/src/app/components/message/layout/Base.tsx
+++ b/src/app/components/message/layout/Base.tsx
@@ -34,7 +34,10 @@ export const PronounPill = as<'span'>(
);
export const MessageTextBody = as<'div', css.MessageTextBodyVariants & { notice?: boolean }>(
- ({ as: asComp = 'div', className, preWrap, jumboEmoji, emote, notice, ...props }, ref) => (
+ (
+ { as: asComp = 'div', children, className, preWrap, jumboEmoji, emote, notice, ...props },
+ ref
+ ) => (
+ >
+ {children}
+
)
);
diff --git a/src/app/components/nav/NavItemContent.tsx b/src/app/components/nav/NavItemContent.tsx
index 22a45881..eaf8f113 100644
--- a/src/app/components/nav/NavItemContent.tsx
+++ b/src/app/components/nav/NavItemContent.tsx
@@ -4,7 +4,9 @@ import classNames from 'classnames';
import * as css from './styles.css';
export const NavItemContent = as<'p', ComponentProps>(
- ({ className, ...props }, ref) => (
-
+ ({ children, className, ...props }, ref) => (
+
+ {children}
+
)
);
diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx
index aca8070c..79036340 100644
--- a/src/app/components/room-card/RoomCard.tsx
+++ b/src/app/components/room-card/RoomCard.tsx
@@ -70,11 +70,13 @@ export const RoomCardBase = as<'div'>(({ className, ...props }, ref) => (
/>
));
-export const RoomCardName = as<'h6'>(({ ...props }, ref) => (
-
+export const RoomCardName = as<'h6'>(({ children, ...props }, ref) => (
+
+ {children}
+
));
-export const RoomCardTopic = as<'p'>(({ className, ...props }, ref) => (
+export const RoomCardTopic = as<'p'>(({ children, className, ...props }, ref) => (
(({ className, ...props }, ref) => (
{...props}
priority="400"
ref={ref}
- />
+ >
+ {children}
+
));
function ErrorDialog({
From 017ba4ff3643c6b19c5644af480cc4161d025fe1 Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 19:01:33 +0100
Subject: [PATCH 41/59] fix: focus nickname input imperatively in user chips
---
src/app/components/user-profile/UserChips.tsx | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/app/components/user-profile/UserChips.tsx b/src/app/components/user-profile/UserChips.tsx
index f2df0207..950474a9 100644
--- a/src/app/components/user-profile/UserChips.tsx
+++ b/src/app/components/user-profile/UserChips.tsx
@@ -2,6 +2,7 @@ import {
KeyboardEventHandler,
MouseEventHandler,
useCallback,
+ useEffect,
useMemo,
useRef,
useState,
@@ -447,6 +448,8 @@ export function IgnoredUserAlert() {
export function OptionsChip({ userId }: { userId: string }) {
const mx = useMatrixClient();
const [cords, setCords] = useState();
+ const [editingNick, setEditingNick] = useState(false);
+ const nickInputRef = useRef(null);
const open: MouseEventHandler = (evt) => {
setCords(evt.currentTarget.getBoundingClientRect());
@@ -471,8 +474,12 @@ export function OptionsChip({ userId }: { userId: string }) {
const currentNick = useNickname(userId);
const setNickname = useSetNickname();
- const [editingNick, setEditingNick] = useState(false);
- const nickInputRef = useRef(null);
+
+ useEffect(() => {
+ if (editingNick) {
+ nickInputRef.current?.focus();
+ }
+ }, [editingNick]);
const handleSaveNick = () => {
const value = nickInputRef.current?.value ?? '';
@@ -513,7 +520,6 @@ export function OptionsChip({ userId }: { userId: string }) {
Nickname
Date: Mon, 2 Mar 2026 19:11:43 +0100
Subject: [PATCH 42/59] fix(UrlPreviewCard): remove dead code and make eslint
happy
---
.../components/url-preview/UrlPreviewCard.tsx | 61 +++++++++----------
1 file changed, 30 insertions(+), 31 deletions(-)
diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx
index 6ac2b0e5..590d06e5 100644
--- a/src/app/components/url-preview/UrlPreviewCard.tsx
+++ b/src/app/components/url-preview/UrlPreviewCard.tsx
@@ -13,7 +13,6 @@ import * as css from './UrlPreviewCard.css';
import { UrlPreview, UrlPreviewContent, UrlPreviewDescription, UrlPreviewImg } from './UrlPreview';
const linkStyles = { color: color.Success.Main };
-const TARGET_HEIGHT = 300;
export const UrlPreviewCard = as<'div', { url: string; ts: number; mediaType?: string | null }>(
({ url, ts, mediaType, ...props }, ref) => {
@@ -22,11 +21,6 @@ export const UrlPreviewCard = as<'div', { url: string; ts: number; mediaType?: s
const isDirect = !!mediaType;
- const [mediaDim, setMediaDim] = useState<{ w: number; h: number } | null>(null);
- const calculatedWidth = mediaDim
- ? Math.ceil((TARGET_HEIGHT * mediaDim.w) / mediaDim.h)
- : undefined;
-
const [previewStatus, loadPreview] = useAsyncCallback(
useCallback(() => {
if (isDirect) return Promise.resolve(null);
@@ -100,6 +94,34 @@ export const UrlPreviewCard = as<'div', { url: string; ts: number; mediaType?: s
);
};
+ let previewContent;
+ if (previewStatus.status === AsyncStatus.Success) {
+ previewContent = previewStatus.data ? (
+ renderContent(previewStatus.data)
+ ) : (
+
+
+ {decodeURIComponent(url)}
+
+
+ );
+ } else {
+ previewContent = (
+
+
+
+ );
+ }
+
return (
- {previewStatus.status === AsyncStatus.Success ? (
- previewStatus.data ? (
- renderContent(previewStatus.data)
- ) : (
-
-
- {decodeURIComponent(url)}
-
-
- )
- ) : (
-
-
-
- )}
+ {previewContent}
);
}
From 4f0286a3c32afda2dbc22238c78ff13f23d8a9b2 Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 12:22:12 -0600
Subject: [PATCH 43/59] Validate timezones before render and update changelog
---
CHANGELOG.md | 2 ++
.../components/user-profile/UserRoomProfile.tsx | 17 +++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index be5e499a..2a0a7a54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
- Add validation to timezones before rendering.
- Fix invalid matrix.to event link generation ([cinnyapp#2717](https://github.com/cinnyapp/cinny/pull/2717)) - [tulir](https://github.com/tulir)
+- Fix Call Rooms' chat button ([#58](https://github.com/7w1/sable/pull/58)) - [Rosy-iso](https://github.com/Rosy-iso)
+- Strip quotes for mxc urls converted to http for tuwunel ([#56](https://github.com/7w1/sable/pull/56)) - [Rosy-iso](https://github.com/Rosy-iso)
## 1.2.3 - 3/2/2026
diff --git a/src/app/components/user-profile/UserRoomProfile.tsx b/src/app/components/user-profile/UserRoomProfile.tsx
index 6a9682bc..eefb449d 100644
--- a/src/app/components/user-profile/UserRoomProfile.tsx
+++ b/src/app/components/user-profile/UserRoomProfile.tsx
@@ -74,14 +74,19 @@ function UserExtendedSection({
};
const pronouns = profile.pronouns?.map((p: any) => clamp(p.summary, 16)).join(', ');
- const timezone = profile.timezone ? clamp(profile.timezone, 64) : null;
- const localTime = timezone
- ? new Intl.DateTimeFormat([], {
+ const localTime = useMemo(() => {
+ if (!profile.timezone) return null;
+
+ try {
+ return new Intl.DateTimeFormat([], {
hour: 'numeric',
minute: '2-digit',
- timeZone: timezone,
- }).format(new Date())
- : null;
+ timeZone: profile.timezone,
+ }).format(new Date());
+ } catch {
+ return null;
+ }
+ }, [profile.timezone]);
const bioContent = useMemo(() => {
let rawBio =
From 36a747cb7a589da1362781b998e2fbeabb93d29c Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 19:24:48 +0100
Subject: [PATCH 44/59] refactor: address GenericWidgetDriver lint issues
without changing behavior
---
.../features/widgets/GenericWidgetDriver.ts | 55 +++++++++++--------
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/src/app/features/widgets/GenericWidgetDriver.ts b/src/app/features/widgets/GenericWidgetDriver.ts
index 1b03b9c1..979d873c 100644
--- a/src/app/features/widgets/GenericWidgetDriver.ts
+++ b/src/app/features/widgets/GenericWidgetDriver.ts
@@ -174,13 +174,14 @@ export class GenericWidgetDriver extends WidgetDriver {
const crypto = client.getCrypto();
if (!crypto) throw new Error('E2EE not enabled');
const invertedContentMap: Record = {};
- for (const userId of Object.keys(contentMap)) {
- for (const deviceId of Object.keys(contentMap[userId])) {
- const key = JSON.stringify(contentMap[userId][deviceId]);
- invertedContentMap[key] = invertedContentMap[key] || [];
- invertedContentMap[key].push({ userId, deviceId });
- }
- }
+ Object.entries(contentMap).forEach(([userId, userContentMap]) => {
+ Object.entries(userContentMap).forEach(([deviceId, content]) => {
+ const key = JSON.stringify(content);
+ const recipients = invertedContentMap[key] ?? [];
+ recipients.push({ userId, deviceId });
+ invertedContentMap[key] = recipients;
+ });
+ });
await Promise.all(
Object.entries(invertedContentMap).map(async ([str, recipients]) => {
const batch = await crypto.encryptToDeviceMessages(
@@ -213,23 +214,32 @@ export class GenericWidgetDriver extends WidgetDriver {
limit: number,
since: string | undefined
): Promise {
- limit = limit > 0 ? Math.min(limit, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER;
+ const eventLimit =
+ limit > 0 ? Math.min(limit, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER;
const room = this.mxClient.getRoom(roomId);
if (!room) return [];
const results: MatrixEvent[] = [];
const events = room.getLiveTimeline().getEvents();
- for (let i = events.length - 1; i >= 0; i--) {
+
+ for (let i = events.length - 1; i >= 0; i -= 1) {
const ev = events[i];
- if (results.length >= limit) break;
- if (since !== undefined && ev.getId() === since) break;
- if (ev.getType() !== eventType || ev.isState()) continue;
- if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent().msgtype)
- continue;
- if (ev.getStateKey() !== undefined && stateKey !== undefined && ev.getStateKey() !== stateKey)
- continue;
- results.push(ev);
+ const reachedLimit = results.length >= eventLimit;
+ const reachedSince = since !== undefined && ev.getId() === since;
+ if (reachedLimit || reachedSince) break;
+
+ const matchesEventType = ev.getType() === eventType && !ev.isState();
+ const matchesMsgType =
+ eventType !== EventType.RoomMessage || !msgtype || msgtype === ev.getContent().msgtype;
+ const eventStateKey = ev.getStateKey();
+ const matchesStateKey =
+ eventStateKey === undefined || stateKey === undefined || eventStateKey === stateKey;
+
+ if (matchesEventType && matchesMsgType && matchesStateKey) {
+ results.push(ev);
+ }
}
- return results.map((e) => e.getEffectiveEvent() as IRoomEvent);
+
+ return results.map((ev) => ev.getEffectiveEvent() as IRoomEvent);
}
public async askOpenID(observer: SimpleObservable): Promise {
@@ -266,10 +276,10 @@ export class GenericWidgetDriver extends WidgetDriver {
limit?: number,
direction?: 'f' | 'b'
): Promise {
- roomId = roomId ?? this.inRoomId ?? undefined;
- if (typeof roomId !== 'string') throw new Error('Error while reading the current room');
+ const resolvedRoomId = roomId ?? this.inRoomId;
+ if (typeof resolvedRoomId !== 'string') throw new Error('Error while reading the current room');
const { events, nextBatch, prevBatch } = await this.mxClient.relations(
- roomId,
+ resolvedRoomId,
eventId,
relationType ?? null,
eventType ?? null,
@@ -313,9 +323,10 @@ export class GenericWidgetDriver extends WidgetDriver {
return this.mxClient.getVisibleRooms().map((r: Room) => r.roomId);
}
+ // eslint-disable-next-line class-methods-use-this -- WidgetDriver requires an instance override
public processError(error: unknown): IWidgetApiErrorResponseDataDetails | undefined {
return error instanceof MatrixError
- ? { matrix_api_error: (error as any).asWidgetApiErrorData() }
+ ? { matrix_api_error: error.asWidgetApiErrorData() }
: undefined;
}
}
From 26f63e0e2558a4ea9681e6a35baf5cbc38b21357 Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 12:27:44 -0600
Subject: [PATCH 45/59] add sable space and announcements room to featured
communities
---
CHANGELOG.md | 1 +
config.json | 2 ++
2 files changed, 3 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a0a7a54..3a568bf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
- Fix invalid matrix.to event link generation ([cinnyapp#2717](https://github.com/cinnyapp/cinny/pull/2717)) - [tulir](https://github.com/tulir)
- Fix Call Rooms' chat button ([#58](https://github.com/7w1/sable/pull/58)) - [Rosy-iso](https://github.com/Rosy-iso)
- Strip quotes for mxc urls converted to http for tuwunel ([#56](https://github.com/7w1/sable/pull/56)) - [Rosy-iso](https://github.com/Rosy-iso)
+- Add sable space and announcements room to featured communities.
## 1.2.3 - 3/2/2026
diff --git a/config.json b/config.json
index f3e2614a..26bae5bf 100644
--- a/config.json
+++ b/config.json
@@ -9,6 +9,7 @@
"featuredCommunities": {
"openAsDefault": false,
"spaces": [
+ "#sable:sable.moe",
"#community:matrix.org",
"#space:unredacted.org",
"#science-space:matrix.org",
@@ -16,6 +17,7 @@
"#mathematics-on:matrix.org"
],
"rooms": [
+ "#announcements:sable.moe",
"#freesoftware:matrix.org",
"#pcapdroid:matrix.org",
"#gentoo:matrix.org",
From 9f4204bc371b9fe9c3ac38df0695f77264dce77c Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 19:30:05 +0100
Subject: [PATCH 46/59] fix: remove unused vars from Message
---
src/app/features/room/message/Message.tsx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 940d9ac4..a05a5de8 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -43,7 +43,7 @@ import {
UsernameBold,
} from '$components/message';
import { canEditEvent, getMemberAvatarMxc } from '$utils/room';
-import { getCanonicalAliasOrRoomId, isRoomAlias, mxcUrlToHttp } from '$utils/matrix';
+import { mxcUrlToHttp } from '$utils/matrix';
import { MessageLayout, MessageSpacing, settingsAtom } from '$state/settings';
import { nicknamesAtom, setNicknameAtom } from '$state/nicknames';
import { useMatrixClient } from '$hooks/useMatrixClient';
@@ -124,8 +124,6 @@ export const MessageCopyLinkItem = as<
onClose?: () => void;
}
>(({ room, mEvent, onClose, ...props }, ref) => {
- const mx = useMatrixClient();
-
const handleCopy = () => {
const eventId = mEvent.getId();
if (!eventId) return;
From bde1505ad4ca465262544f3143046faba5672660 Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 20:00:26 +0100
Subject: [PATCH 47/59] refactor: normalize parent-relative imports to aliases
---
scripts/normalize-imports.js | 2 +-
src/app/components/AccountDataEditor.tsx | 10 +++---
src/app/components/ActionUIA.tsx | 6 ++--
src/app/components/AuthFlowsLoader.tsx | 8 ++---
src/app/components/BackRouteHandler.tsx | 6 ++--
src/app/components/BackupRestore.tsx | 10 +++---
src/app/components/ClientConfigLoader.tsx | 6 ++--
src/app/components/ConfirmPasswordMatch.tsx | 2 +-
src/app/components/DeviceVerification.tsx | 6 ++--
.../components/DeviceVerificationSetup.tsx | 10 +++---
.../components/DeviceVerificationStatus.ts | 2 +-
src/app/components/HexColorPickerPopOut.tsx | 2 +-
src/app/components/JoinRulesSwitcher.tsx | 4 +--
src/app/components/LogoutDialog.tsx | 8 ++---
src/app/components/ManualVerification.tsx | 6 ++--
src/app/components/MemberSortMenu.tsx | 4 +--
src/app/components/MembershipFilterMenu.tsx | 4 +--
src/app/components/Modal500.tsx | 2 +-
src/app/components/RenderMessageContent.tsx | 2 +-
.../components/RoomNotificationSwitcher.tsx | 6 ++--
src/app/components/RoomSummaryLoader.tsx | 6 ++--
src/app/components/RoomUnreadProvider.tsx | 4 +--
src/app/components/SecretStorage.tsx | 6 ++--
src/app/components/ServerConfigsLoader.tsx | 10 +++---
src/app/components/SpecVersionsLoader.tsx | 2 +-
.../components/SupportedUIAFlowsLoader.tsx | 2 +-
src/app/components/SwipeableChatWrapper.tsx | 4 +--
.../components/SwipeableMessageWrapper.tsx | 4 +--
.../components/SwipeableOverlayWrapper.tsx | 4 +--
.../components/UserRoomProfileRenderer.tsx | 12 +++----
.../create-room/AdditionalCreatorInput.tsx | 2 +-
.../create-room/CreateRoomAccessSelector.tsx | 4 +--
.../create-room/CreateRoomTypeSelector.tsx | 4 +--
.../create-room/RoomVersionSelector.tsx | 4 +--
.../autocomplete/EmoticonAutocomplete.tsx | 2 +-
.../autocomplete/RoomMentionAutocomplete.tsx | 2 +-
.../autocomplete/UserMentionAutocomplete.tsx | 2 +-
src/app/components/emoji-board/EmojiBoard.tsx | 2 +-
.../emoji-board/components/Item.tsx | 2 +-
.../emoji-board/components/Tabs.tsx | 2 +-
.../components/event-readers/EventReaders.tsx | 2 +-
.../image-pack-view/ImagePackContent.tsx | 6 ++--
.../image-pack-view/ImagePackView.tsx | 2 +-
.../components/image-pack-view/ImageTile.tsx | 2 +-
.../components/image-pack-view/PackMeta.tsx | 2 +-
src/app/components/member-tile/MemberTile.tsx | 2 +-
.../message/content/EventContent.tsx | 2 +-
.../placeholder/CompactPlaceholder.tsx | 2 +-
.../placeholder/DefaultPlaceholder.tsx | 2 +-
.../password-input/PasswordInput.tsx | 2 +-
src/app/components/room-card/RoomCard.tsx | 2 +-
src/app/components/room-intro/RoomIntro.tsx | 8 ++---
src/app/components/time-date/PickerColumn.tsx | 2 +-
.../components/uia-stages/PasswordStage.tsx | 2 +-
.../components/user-profile/CreatorChip.tsx | 2 +-
src/app/components/user-profile/PowerChip.tsx | 4 +--
src/app/components/user-profile/UserChips.tsx | 6 ++--
src/app/components/user-profile/UserHero.tsx | 6 ++--
.../user-profile/UserModeration.tsx | 4 +--
.../user-profile/UserRoomProfile.tsx | 2 +-
.../common-settings/cosmetics/Cosmetics.tsx | 2 +-
.../developer-tools/DevelopTools.tsx | 2 +-
.../developer-tools/StateEventEditor.tsx | 2 +-
.../emojis-stickers/RoomPacks.tsx | 2 +-
.../permissions/PermissionGroups.tsx | 2 +-
.../common-settings/permissions/Powers.tsx | 2 +-
.../permissions/PowersEditor.tsx | 2 +-
src/app/features/lobby/Lobby.tsx | 2 +-
src/app/features/lobby/SpaceItem.tsx | 2 +-
.../features/room-settings/RoomSettings.tsx | 8 ++---
src/app/features/room/message/Reactions.tsx | 2 +-
.../room/room-pin-menu/RoomPinMenu.tsx | 4 +--
src/app/features/settings/about/About.tsx | 2 +-
.../features/settings/account/ContactInfo.tsx | 2 +-
.../settings/account/IgnoredUserList.tsx | 2 +-
.../features/settings/account/MatrixId.tsx | 2 +-
src/app/features/settings/account/Profile.tsx | 2 +-
.../features/settings/cosmetics/Cosmetics.tsx | 2 +-
.../features/settings/cosmetics/Themes.tsx | 2 +-
.../settings/developer-tools/AccountData.tsx | 2 +-
.../settings/developer-tools/DevelopTools.tsx | 2 +-
.../features/settings/devices/DeviceTile.tsx | 2 +-
src/app/features/settings/devices/Devices.tsx | 2 +-
.../features/settings/devices/LocalBackup.tsx | 2 +-
.../settings/devices/OtherDevices.tsx | 2 +-
.../settings/emojis-stickers/GlobalPacks.tsx | 2 +-
.../settings/emojis-stickers/UserPack.tsx | 2 +-
src/app/features/settings/general/General.tsx | 2 +-
.../settings/notifications/AllMessages.tsx | 2 +-
.../notifications/KeywordMessages.tsx | 2 +-
.../settings/notifications/Notifications.tsx | 2 +-
.../notifications/SpecialMessages.tsx | 2 +-
.../notifications/SystemNotification.tsx | 2 +-
.../features/space-settings/SpaceSettings.tsx | 8 ++---
src/app/hooks/router/useSelectedRoom.ts | 2 +-
src/app/hooks/router/useSelectedSpace.ts | 2 +-
src/app/hooks/useAsyncSearch.ts | 4 +--
src/app/hooks/useCommands.ts | 8 ++---
src/app/hooks/useComposingCheck.ts | 2 +-
src/app/hooks/useDateFormat.ts | 2 +-
src/app/hooks/useDeviceVerificationStatus.ts | 4 +--
src/app/hooks/useFileDrop.ts | 2 +-
src/app/hooks/useFilePasteHandler.ts | 2 +-
src/app/hooks/useFilePicker.ts | 2 +-
src/app/hooks/useGetRoom.ts | 2 +-
src/app/hooks/useImagePackRooms.ts | 2 +-
src/app/hooks/useImagePacks.ts | 2 +-
src/app/hooks/useJoinedRoomId.ts | 2 +-
src/app/hooks/useLocalRoomSummary.ts | 2 +-
src/app/hooks/useMemberEventParser.tsx | 4 +--
src/app/hooks/useMemberPowerTag.ts | 2 +-
src/app/hooks/useMentionClickHandler.ts | 8 ++---
src/app/hooks/useMessageLayout.ts | 2 +-
src/app/hooks/useMessageSpacing.ts | 2 +-
src/app/hooks/useNavToActivePathMapper.ts | 2 +-
src/app/hooks/useNickname.ts | 2 +-
src/app/hooks/useNotificationJumper.ts | 4 +--
src/app/hooks/usePathWithOrigin.ts | 2 +-
src/app/hooks/usePowerLevels.ts | 2 +-
src/app/hooks/useRecentEmoji.ts | 4 +--
.../hooks/useRestoreBackupOnVerification.ts | 2 +-
src/app/hooks/useRoomAliases.ts | 2 +-
src/app/hooks/useRoomCreators.ts | 4 +--
src/app/hooks/useRoomLatestRenderedEvent.ts | 6 ++--
src/app/hooks/useRoomNavigate.ts | 14 ++++----
src/app/hooks/useRoomTypingMembers.ts | 2 +-
src/app/hooks/useRoomWidgets.ts | 2 +-
.../hooks/useRoomsNotificationPreferences.ts | 2 +-
src/app/hooks/useSessionProfiles.ts | 2 +-
src/app/hooks/useSidebarItems.ts | 2 +-
src/app/hooks/useSpaceHierarchy.ts | 8 ++---
src/app/hooks/useStateEvent.ts | 2 +-
src/app/hooks/useTextAreaCodeEditor.ts | 4 +--
src/app/hooks/useTextAreaIntent.ts | 2 +-
src/app/hooks/useTheme.ts | 4 +--
src/app/hooks/useTypingStatusUpdater.ts | 2 +-
src/app/hooks/useUIAFlows.ts | 2 +-
src/app/hooks/useUserProfile.ts | 6 ++--
src/app/hooks/useVirtualPaginator.ts | 2 +-
src/app/pages/App.tsx | 8 ++---
src/app/pages/ConfigConfig.tsx | 2 +-
src/app/pages/FeatureCheck.tsx | 6 ++--
src/app/pages/MobileFriendly.tsx | 2 +-
src/app/pages/Router.tsx | 32 +++++++++----------
src/app/pages/ThemeManager.tsx | 6 ++--
src/app/pages/auth/AuthLayout.tsx | 2 +-
src/app/pages/auth/login/Login.tsx | 4 +--
.../pages/auth/login/PasswordLoginForm.tsx | 2 +-
.../auth/register/PasswordRegisterForm.tsx | 2 +-
src/app/pages/auth/register/Register.tsx | 4 +--
.../auth/reset-password/PasswordResetForm.tsx | 2 +-
src/app/pages/client/ClientNonUIFeatures.tsx | 2 +-
src/app/pages/client/ClientRoot.tsx | 2 +-
src/app/pages/client/sidebar/DirectTab.tsx | 2 +-
src/app/pages/client/sidebar/HomeTab.tsx | 2 +-
src/app/pages/client/space/Space.tsx | 2 +-
src/app/pages/pathUtils.ts | 4 +--
src/app/plugins/bad-words.ts | 2 +-
src/app/plugins/color.ts | 2 +-
src/app/plugins/markdown/block/parser.ts | 2 +-
src/app/plugins/markdown/block/runner.ts | 2 +-
src/app/plugins/markdown/block/type.ts | 2 +-
src/app/plugins/markdown/inline/runner.ts | 2 +-
src/app/plugins/markdown/inline/type.ts | 2 +-
src/app/plugins/pdfjs-dist.ts | 4 +--
src/app/plugins/react-custom-html-parser.tsx | 18 +++++------
src/app/plugins/recent-emoji.ts | 2 +-
src/app/plugins/text-area/mods/Intent.ts | 6 ++--
src/app/plugins/utils.ts | 2 +-
src/app/plugins/via-servers.ts | 6 ++--
src/app/state/createRoomModal.ts | 2 +-
src/app/state/hooks/closedLobbyCategories.ts | 2 +-
src/app/state/hooks/closedNavCategories.ts | 2 +-
src/app/state/hooks/createRoomModal.ts | 2 +-
src/app/state/hooks/createSpaceModal.ts | 2 +-
src/app/state/hooks/navToActivePath.ts | 2 +-
src/app/state/hooks/openedSidebarFolder.ts | 2 +-
src/app/state/hooks/roomList.ts | 2 +-
src/app/state/hooks/roomSettings.ts | 2 +-
src/app/state/hooks/settings.ts | 2 +-
src/app/state/hooks/spaceSettings.ts | 2 +-
src/app/state/hooks/unread.ts | 2 +-
src/app/state/hooks/useBindAtoms.ts | 12 +++----
src/app/state/hooks/userRoomProfile.ts | 2 +-
src/app/state/mDirectList.ts | 2 +-
src/app/state/room/roomInputDrafts.ts | 4 +--
src/app/state/sessions.ts | 2 +-
src/app/state/upload.ts | 4 +--
src/app/state/userRoomProfile.ts | 2 +-
src/client/initMatrix.ts | 8 ++---
src/types/matrix-sdk-events.d.ts | 6 ++--
191 files changed, 339 insertions(+), 339 deletions(-)
diff --git a/scripts/normalize-imports.js b/scripts/normalize-imports.js
index 96c4430f..dd803af3 100644
--- a/scripts/normalize-imports.js
+++ b/scripts/normalize-imports.js
@@ -147,7 +147,7 @@ function getRewrittenSpecifier(filePath, specifier, aliases, projectRoot) {
return `$types/matrix-sdk${suffix}`;
}
- if (!bare.startsWith('.') || !/^(\.\.\/){2,}/.test(bare)) {
+ if (!/^\.\.(?:\/|$)/.test(bare)) {
return null;
}
diff --git a/src/app/components/AccountDataEditor.tsx b/src/app/components/AccountDataEditor.tsx
index 0e424604..9d6809a1 100644
--- a/src/app/components/AccountDataEditor.tsx
+++ b/src/app/components/AccountDataEditor.tsx
@@ -15,14 +15,14 @@ import {
config,
} from 'folds';
import { MatrixError } from '$types/matrix-sdk';
-import { Cursor } from '../plugins/text-area';
-import { syntaxErrorPosition } from '../utils/dom';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
+import { Cursor } from '$plugins/text-area';
+import { syntaxErrorPosition } from '$utils/dom';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { Page, PageHeader } from './page';
-import { useAlive } from '../hooks/useAlive';
+import { useAlive } from '$hooks/useAlive';
import { SequenceCard } from './sequence-card';
import { TextViewerContent } from './text-viewer';
-import { useTextAreaCodeEditor } from '../hooks/useTextAreaCodeEditor';
+import { useTextAreaCodeEditor } from '$hooks/useTextAreaCodeEditor';
const EDITOR_INTENT_SPACE_COUNT = 2;
diff --git a/src/app/components/ActionUIA.tsx b/src/app/components/ActionUIA.tsx
index ab5a33db..3be4912b 100644
--- a/src/app/components/ActionUIA.tsx
+++ b/src/app/components/ActionUIA.tsx
@@ -1,10 +1,10 @@
import { ReactNode } from 'react';
import { AuthDict, AuthType, IAuthData, UIAFlow } from '$types/matrix-sdk';
-import { getUIAFlowForStages } from '../utils/matrix-uia';
-import { useSupportedUIAFlows, useUIACompleted, useUIAFlow } from '../hooks/useUIAFlows';
+import { getUIAFlowForStages } from '$utils/matrix-uia';
+import { useSupportedUIAFlows, useUIACompleted, useUIAFlow } from '$hooks/useUIAFlows';
import { UIAFlowOverlay } from './UIAFlowOverlay';
import { PasswordStage, SSOStage } from './uia-stages';
-import { useMatrixClient } from '../hooks/useMatrixClient';
+import { useMatrixClient } from '$hooks/useMatrixClient';
export const SUPPORTED_IN_APP_UIA_STAGES = [AuthType.Password, AuthType.Sso];
diff --git a/src/app/components/AuthFlowsLoader.tsx b/src/app/components/AuthFlowsLoader.tsx
index 95d9d40c..4ea21b92 100644
--- a/src/app/components/AuthFlowsLoader.tsx
+++ b/src/app/components/AuthFlowsLoader.tsx
@@ -1,14 +1,14 @@
import { ReactNode, useCallback, useEffect, useMemo } from 'react';
import { MatrixError, createClient } from '$types/matrix-sdk';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { useAutoDiscoveryInfo } from '../hooks/useAutoDiscoveryInfo';
-import { promiseFulfilledResult, promiseRejectedResult } from '../utils/common';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
+import { promiseFulfilledResult, promiseRejectedResult } from '$utils/common';
import {
AuthFlows,
RegisterFlowStatus,
RegisterFlowsResponse,
parseRegisterErrResp,
-} from '../hooks/useAuthFlows';
+} from '$hooks/useAuthFlows';
type AuthFlowsLoaderProps = {
fallback?: () => ReactNode;
diff --git a/src/app/components/BackRouteHandler.tsx b/src/app/components/BackRouteHandler.tsx
index 2808226d..a6e91bcd 100644
--- a/src/app/components/BackRouteHandler.tsx
+++ b/src/app/components/BackRouteHandler.tsx
@@ -7,7 +7,7 @@ import {
getHomePath,
getInboxPath,
getSpacePath,
-} from '../pages/pathUtils';
+} from '$pages/pathUtils';
import {
DIRECT_PATH,
EXPLORE_PATH,
@@ -17,8 +17,8 @@ import {
HOME_ROOM_PATH,
DIRECT_ROOM_PATH,
SPACE_ROOM_PATH,
-} from '../pages/paths';
-import { lastVisitedRoomIdAtom } from '../state/room/lastRoom';
+} from '$pages/paths';
+import { lastVisitedRoomIdAtom } from '$state/room/lastRoom';
type BackRouteHandlerProps = {
children: (onBack: () => void) => ReactNode;
diff --git a/src/app/components/BackupRestore.tsx b/src/app/components/BackupRestore.tsx
index f12d3ef9..5071c87b 100644
--- a/src/app/components/BackupRestore.tsx
+++ b/src/app/components/BackupRestore.tsx
@@ -19,17 +19,17 @@ import {
Text,
} from 'folds';
import FocusTrap from 'focus-trap-react';
-import { BackupProgressStatus, backupRestoreProgressAtom } from '../state/backupRestore';
+import { BackupProgressStatus, backupRestoreProgressAtom } from '$state/backupRestore';
import { InfoCard } from './info-card';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import {
useKeyBackupInfo,
useKeyBackupStatus,
useKeyBackupSync,
useKeyBackupTrust,
-} from '../hooks/useKeyBackup';
-import { stopPropagation } from '../utils/keyboard';
-import { useRestoreBackupOnVerification } from '../hooks/useRestoreBackupOnVerification';
+} from '$hooks/useKeyBackup';
+import { stopPropagation } from '$utils/keyboard';
+import { useRestoreBackupOnVerification } from '$hooks/useRestoreBackupOnVerification';
type BackupStatusProps = {
enabled: boolean;
diff --git a/src/app/components/ClientConfigLoader.tsx b/src/app/components/ClientConfigLoader.tsx
index 72d367c0..92af0c14 100644
--- a/src/app/components/ClientConfigLoader.tsx
+++ b/src/app/components/ClientConfigLoader.tsx
@@ -1,7 +1,7 @@
import { ReactNode, useCallback, useEffect, useState } from 'react';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { ClientConfig } from '../hooks/useClientConfig';
-import { trimTrailingSlash } from '../utils/common';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { ClientConfig } from '$hooks/useClientConfig';
+import { trimTrailingSlash } from '$utils/common';
const getClientConfig = async (): Promise => {
const url = `${trimTrailingSlash(import.meta.env.BASE_URL)}/config.json`;
diff --git a/src/app/components/ConfirmPasswordMatch.tsx b/src/app/components/ConfirmPasswordMatch.tsx
index bb50eb60..dea22892 100644
--- a/src/app/components/ConfirmPasswordMatch.tsx
+++ b/src/app/components/ConfirmPasswordMatch.tsx
@@ -1,5 +1,5 @@
import { ReactNode, RefObject, useCallback, useRef, useState } from 'react';
-import { useDebounce } from '../hooks/useDebounce';
+import { useDebounce } from '$hooks/useDebounce';
type ConfirmPasswordMatchProps = {
initialValue: boolean;
diff --git a/src/app/components/DeviceVerification.tsx b/src/app/components/DeviceVerification.tsx
index cd4db9a6..642125e8 100644
--- a/src/app/components/DeviceVerification.tsx
+++ b/src/app/components/DeviceVerification.tsx
@@ -27,9 +27,9 @@ import {
useVerificationRequestReceived,
useVerifierCancel,
useVerifierShowSas,
-} from '../hooks/useVerificationRequest';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { ContainerColor } from '../styles/ContainerColor.css';
+} from '$hooks/useVerificationRequest';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { ContainerColor } from '$styles/ContainerColor.css';
const DialogHeaderStyles: CSSProperties = {
padding: `0 ${config.space.S200} 0 ${config.space.S400}`,
diff --git a/src/app/components/DeviceVerificationSetup.tsx b/src/app/components/DeviceVerificationSetup.tsx
index 7dbe46eb..e98ec6ec 100644
--- a/src/app/components/DeviceVerificationSetup.tsx
+++ b/src/app/components/DeviceVerificationSetup.tsx
@@ -18,12 +18,12 @@ import to from 'await-to-js';
import { AuthDict, IAuthData, MatrixError, UIAuthCallback } from '$types/matrix-sdk';
import { clearSecretStorageKeys } from '$client/secretStorageKeys';
import { PasswordInput } from './password-input';
-import { ContainerColor } from '../styles/ContainerColor.css';
-import { copyToClipboard } from '../utils/dom';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
+import { ContainerColor } from '$styles/ContainerColor.css';
+import { copyToClipboard } from '$utils/dom';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { ActionUIA, ActionUIAFlowsLoader } from './ActionUIA';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { useAlive } from '../hooks/useAlive';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { useAlive } from '$hooks/useAlive';
import { UseStateProvider } from './UseStateProvider';
type UIACallback = (
diff --git a/src/app/components/DeviceVerificationStatus.ts b/src/app/components/DeviceVerificationStatus.ts
index b1eb3b8b..f69c64ac 100644
--- a/src/app/components/DeviceVerificationStatus.ts
+++ b/src/app/components/DeviceVerificationStatus.ts
@@ -3,7 +3,7 @@ import { CryptoApi } from '$types/matrix-sdk';
import {
useDeviceVerificationStatus,
VerificationStatus,
-} from '../hooks/useDeviceVerificationStatus';
+} from '$hooks/useDeviceVerificationStatus';
type DeviceVerificationStatusProps = {
crypto?: CryptoApi;
diff --git a/src/app/components/HexColorPickerPopOut.tsx b/src/app/components/HexColorPickerPopOut.tsx
index e8fb1196..25c5d661 100644
--- a/src/app/components/HexColorPickerPopOut.tsx
+++ b/src/app/components/HexColorPickerPopOut.tsx
@@ -1,7 +1,7 @@
import FocusTrap from 'focus-trap-react';
import { Box, Button, config, Menu, PopOut, RectCords, Text } from 'folds';
import { MouseEventHandler, ReactNode, useState } from 'react';
-import { stopPropagation } from '../utils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
type HexColorPickerPopOutProps = {
children: (onOpen: MouseEventHandler, opened: boolean) => ReactNode;
diff --git a/src/app/components/JoinRulesSwitcher.tsx b/src/app/components/JoinRulesSwitcher.tsx
index e3054822..5b33b397 100644
--- a/src/app/components/JoinRulesSwitcher.tsx
+++ b/src/app/components/JoinRulesSwitcher.tsx
@@ -15,8 +15,8 @@ import {
} from 'folds';
import { JoinRule } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
-import { stopPropagation } from '../utils/keyboard';
-import { getRoomIconSrc } from '../utils/room';
+import { stopPropagation } from '$utils/keyboard';
+import { getRoomIconSrc } from '$utils/room';
export type ExtraJoinRules = 'knock_restricted';
export type ExtendedJoinRules = JoinRule | ExtraJoinRules;
diff --git a/src/app/components/LogoutDialog.tsx b/src/app/components/LogoutDialog.tsx
index bded57e9..1eb27d70 100644
--- a/src/app/components/LogoutDialog.tsx
+++ b/src/app/components/LogoutDialog.tsx
@@ -1,14 +1,14 @@
import { forwardRef, useCallback } from 'react';
import { Dialog, Header, config, Box, Text, Button, Spinner, color } from 'folds';
import { logoutClient } from '$client/initMatrix';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { useCrossSigningActive } from '../hooks/useCrossSigning';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { useCrossSigningActive } from '$hooks/useCrossSigning';
import { InfoCard } from './info-card';
import {
useDeviceVerificationStatus,
VerificationStatus,
-} from '../hooks/useDeviceVerificationStatus';
+} from '$hooks/useDeviceVerificationStatus';
type LogoutDialogProps = {
handleClose: () => void;
diff --git a/src/app/components/ManualVerification.tsx b/src/app/components/ManualVerification.tsx
index f0367997..b2df9f03 100644
--- a/src/app/components/ManualVerification.tsx
+++ b/src/app/components/ManualVerification.tsx
@@ -15,11 +15,11 @@ import {
import FocusTrap from 'focus-trap-react';
import { SecretStorageKeyContent } from '$types/matrix/accountData';
import { storePrivateKey } from '$client/secretStorageKeys';
-import { stopPropagation } from '../utils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { SettingTile } from './setting-tile';
import { SecretStorageRecoveryKey, SecretStorageRecoveryPassphrase } from './SecretStorage';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
export enum ManualVerificationMethod {
RecoveryPassphrase = 'passphrase',
diff --git a/src/app/components/MemberSortMenu.tsx b/src/app/components/MemberSortMenu.tsx
index f3088482..e25569cf 100644
--- a/src/app/components/MemberSortMenu.tsx
+++ b/src/app/components/MemberSortMenu.tsx
@@ -1,7 +1,7 @@
import FocusTrap from 'focus-trap-react';
import { config, Menu, MenuItem, Text } from 'folds';
-import { stopPropagation } from '../utils/keyboard';
-import { useMemberSortMenu } from '../hooks/useMemberSort';
+import { stopPropagation } from '$utils/keyboard';
+import { useMemberSortMenu } from '$hooks/useMemberSort';
type MemberSortMenuProps = {
requestClose: () => void;
diff --git a/src/app/components/MembershipFilterMenu.tsx b/src/app/components/MembershipFilterMenu.tsx
index 8dc80392..1c279823 100644
--- a/src/app/components/MembershipFilterMenu.tsx
+++ b/src/app/components/MembershipFilterMenu.tsx
@@ -1,7 +1,7 @@
import FocusTrap from 'focus-trap-react';
import { config, Menu, MenuItem, Text } from 'folds';
-import { stopPropagation } from '../utils/keyboard';
-import { useMembershipFilterMenu } from '../hooks/useMemberFilter';
+import { stopPropagation } from '$utils/keyboard';
+import { useMembershipFilterMenu } from '$hooks/useMemberFilter';
type MembershipFilterMenuProps = {
requestClose: () => void;
diff --git a/src/app/components/Modal500.tsx b/src/app/components/Modal500.tsx
index 6e068e8f..260baa6d 100644
--- a/src/app/components/Modal500.tsx
+++ b/src/app/components/Modal500.tsx
@@ -1,7 +1,7 @@
import { ReactNode } from 'react';
import FocusTrap from 'focus-trap-react';
import { Modal, Overlay, OverlayBackdrop, OverlayCenter } from 'folds';
-import { stopPropagation } from '../utils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
type Modal500Props = {
requestClose: () => void;
diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx
index 8b8eb7df..53bfa6b8 100644
--- a/src/app/components/RenderMessageContent.tsx
+++ b/src/app/components/RenderMessageContent.tsx
@@ -29,7 +29,7 @@ import { Image, MediaControl, Video } from './media';
import { ImageViewer } from './image-viewer';
import { PdfViewer } from './Pdf-viewer';
import { TextViewer } from './text-viewer';
-import { testMatrixTo } from '../plugins/matrix-to';
+import { testMatrixTo } from '$plugins/matrix-to';
type RenderMessageContentProps = {
displayName: string;
diff --git a/src/app/components/RoomNotificationSwitcher.tsx b/src/app/components/RoomNotificationSwitcher.tsx
index 86fc3b2b..f62c41a4 100644
--- a/src/app/components/RoomNotificationSwitcher.tsx
+++ b/src/app/components/RoomNotificationSwitcher.tsx
@@ -1,13 +1,13 @@
import { Box, config, Icon, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
import { MouseEventHandler, ReactNode, useMemo, useState } from 'react';
import FocusTrap from 'focus-trap-react';
-import { stopPropagation } from '../utils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import {
getRoomNotificationModeIcon,
RoomNotificationMode,
useSetRoomNotificationPreference,
-} from '../hooks/useRoomsNotificationPreferences';
-import { AsyncStatus } from '../hooks/useAsyncCallback';
+} from '$hooks/useRoomsNotificationPreferences';
+import { AsyncStatus } from '$hooks/useAsyncCallback';
const useRoomNotificationModes = (): RoomNotificationMode[] =>
useMemo(
diff --git a/src/app/components/RoomSummaryLoader.tsx b/src/app/components/RoomSummaryLoader.tsx
index 78896917..93baa572 100644
--- a/src/app/components/RoomSummaryLoader.tsx
+++ b/src/app/components/RoomSummaryLoader.tsx
@@ -1,9 +1,9 @@
import { ReactNode, useCallback, useState } from 'react';
import { MatrixClient, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { useQuery } from '@tanstack/react-query';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { LocalRoomSummary, useLocalRoomSummary } from '../hooks/useLocalRoomSummary';
-import { AsyncState, AsyncStatus } from '../hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { LocalRoomSummary, useLocalRoomSummary } from '$hooks/useLocalRoomSummary';
+import { AsyncState, AsyncStatus } from '$hooks/useAsyncCallback';
export type IRoomSummary = Awaited>;
diff --git a/src/app/components/RoomUnreadProvider.tsx b/src/app/components/RoomUnreadProvider.tsx
index 055a0832..5a1fc13a 100644
--- a/src/app/components/RoomUnreadProvider.tsx
+++ b/src/app/components/RoomUnreadProvider.tsx
@@ -1,7 +1,7 @@
import { ReactElement } from 'react';
import { Unread } from '$types/matrix/room';
-import { useRoomUnread, useRoomsUnread } from '../state/hooks/unread';
-import { roomToUnreadAtom } from '../state/room/roomToUnread';
+import { useRoomUnread, useRoomsUnread } from '$state/hooks/unread';
+import { roomToUnreadAtom } from '$state/room/roomToUnread';
type RoomUnreadProviderProps = {
roomId: string;
diff --git a/src/app/components/SecretStorage.tsx b/src/app/components/SecretStorage.tsx
index b3e91dff..15231682 100644
--- a/src/app/components/SecretStorage.tsx
+++ b/src/app/components/SecretStorage.tsx
@@ -3,9 +3,9 @@ import { Box, Text, Button, Spinner, color } from 'folds';
import { decodeRecoveryKey, deriveRecoveryKeyFromPassphrase } from '$types/matrix-sdk';
import { SecretStorageKeyContent, SecretStoragePassphraseContent } from '$types/matrix/accountData';
import { PasswordInput } from './password-input';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { useAlive } from '../hooks/useAlive';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { useAlive } from '$hooks/useAlive';
type SecretStorageRecoveryPassphraseProps = {
processing?: boolean;
diff --git a/src/app/components/ServerConfigsLoader.tsx b/src/app/components/ServerConfigsLoader.tsx
index e4a240c5..3f7b395e 100644
--- a/src/app/components/ServerConfigsLoader.tsx
+++ b/src/app/components/ServerConfigsLoader.tsx
@@ -1,10 +1,10 @@
import { ReactNode, useCallback, useMemo } from 'react';
import { Capabilities, validateAuthMetadata, ValidatedAuthMetadata } from '$types/matrix-sdk';
-import { AsyncStatus, useAsyncCallbackValue } from '../hooks/useAsyncCallback';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { MediaConfig } from '../hooks/useMediaConfig';
-import { promiseFulfilledResult } from '../utils/common';
-import { createLogger } from '../utils/debug';
+import { AsyncStatus, useAsyncCallbackValue } from '$hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { MediaConfig } from '$hooks/useMediaConfig';
+import { promiseFulfilledResult } from '$utils/common';
+import { createLogger } from '$utils/debug';
export type ServerConfigs = {
capabilities?: Capabilities;
diff --git a/src/app/components/SpecVersionsLoader.tsx b/src/app/components/SpecVersionsLoader.tsx
index 5ee47bdf..2bbbff27 100644
--- a/src/app/components/SpecVersionsLoader.tsx
+++ b/src/app/components/SpecVersionsLoader.tsx
@@ -1,5 +1,5 @@
import { ReactNode, useCallback, useEffect, useState } from 'react';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { SpecVersions, specVersions } from '../cs-api';
type SpecVersionsLoaderProps = {
diff --git a/src/app/components/SupportedUIAFlowsLoader.tsx b/src/app/components/SupportedUIAFlowsLoader.tsx
index dff000fa..cd3f8149 100644
--- a/src/app/components/SupportedUIAFlowsLoader.tsx
+++ b/src/app/components/SupportedUIAFlowsLoader.tsx
@@ -1,6 +1,6 @@
import { ReactNode } from 'react';
import { UIAFlow } from '$types/matrix-sdk';
-import { useSupportedUIAFlows } from '../hooks/useUIAFlows';
+import { useSupportedUIAFlows } from '$hooks/useUIAFlows';
export function SupportedUIAFlowsLoader({
flows,
diff --git a/src/app/components/SwipeableChatWrapper.tsx b/src/app/components/SwipeableChatWrapper.tsx
index 820517e4..2eba0d01 100644
--- a/src/app/components/SwipeableChatWrapper.tsx
+++ b/src/app/components/SwipeableChatWrapper.tsx
@@ -2,8 +2,8 @@ import { ReactNode } from 'react';
import { motion, useMotionValue, useSpring } from 'framer-motion';
import { useDrag } from '@use-gesture/react';
import { useAtomValue } from 'jotai';
-import { settingsAtom, RightSwipeAction } from '../state/settings';
-import { mobileOrTablet } from '../utils/user-agent';
+import { settingsAtom, RightSwipeAction } from '$state/settings';
+import { mobileOrTablet } from '$utils/user-agent';
interface SwipeableChatWrapperProps {
children: ReactNode;
diff --git a/src/app/components/SwipeableMessageWrapper.tsx b/src/app/components/SwipeableMessageWrapper.tsx
index 3cd72d6e..4b219355 100644
--- a/src/app/components/SwipeableMessageWrapper.tsx
+++ b/src/app/components/SwipeableMessageWrapper.tsx
@@ -3,8 +3,8 @@ import { useDrag } from '@use-gesture/react';
import { ReactNode, useMemo, useState } from 'react';
import { useAtomValue } from 'jotai';
import { config, Icon, Icons } from 'folds';
-import { mobileOrTablet } from '../utils/user-agent';
-import { RightSwipeAction, settingsAtom } from '../state/settings';
+import { mobileOrTablet } from '$utils/user-agent';
+import { RightSwipeAction, settingsAtom } from '$state/settings';
function ActiveSwipeWrapper({ children, onReply }: { children: ReactNode; onReply: () => void }) {
const x = useMotionValue(0);
diff --git a/src/app/components/SwipeableOverlayWrapper.tsx b/src/app/components/SwipeableOverlayWrapper.tsx
index 9f555c68..15521bb1 100644
--- a/src/app/components/SwipeableOverlayWrapper.tsx
+++ b/src/app/components/SwipeableOverlayWrapper.tsx
@@ -2,8 +2,8 @@ import { ReactNode } from 'react';
import { motion, useMotionValue, useSpring } from 'framer-motion';
import { useDrag } from '@use-gesture/react';
import { useAtomValue } from 'jotai';
-import { settingsAtom } from '../state/settings';
-import { mobileOrTablet } from '../utils/user-agent';
+import { settingsAtom } from '$state/settings';
+import { mobileOrTablet } from '$utils/user-agent';
interface SwipeableOverlayWrapperProps {
children: ReactNode;
diff --git a/src/app/components/UserRoomProfileRenderer.tsx b/src/app/components/UserRoomProfileRenderer.tsx
index 8f151c68..eeae40ca 100644
--- a/src/app/components/UserRoomProfileRenderer.tsx
+++ b/src/app/components/UserRoomProfileRenderer.tsx
@@ -1,12 +1,12 @@
import { Menu, PopOut, toRem } from 'folds';
import FocusTrap from 'focus-trap-react';
-import { useCloseUserRoomProfile, useUserRoomProfileState } from '../state/hooks/userRoomProfile';
+import { useCloseUserRoomProfile, useUserRoomProfileState } from '$state/hooks/userRoomProfile';
import { UserRoomProfile } from './user-profile';
-import { UserRoomProfileState } from '../state/userRoomProfile';
-import { useAllJoinedRoomsSet, useGetRoom } from '../hooks/useGetRoom';
-import { stopPropagation } from '../utils/keyboard';
-import { SpaceProvider } from '../hooks/useSpace';
-import { RoomProvider } from '../hooks/useRoom';
+import { UserRoomProfileState } from '$state/userRoomProfile';
+import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
+import { stopPropagation } from '$utils/keyboard';
+import { SpaceProvider } from '$hooks/useSpace';
+import { RoomProvider } from '$hooks/useRoom';
function UserRoomProfileContextMenu({ state }: { state: UserRoomProfileState }) {
const { roomId, spaceId, userId, cords, position, initialProfile } = state;
diff --git a/src/app/components/create-room/AdditionalCreatorInput.tsx b/src/app/components/create-room/AdditionalCreatorInput.tsx
index 50e65c7b..f362122a 100644
--- a/src/app/components/create-room/AdditionalCreatorInput.tsx
+++ b/src/app/components/create-room/AdditionalCreatorInput.tsx
@@ -30,7 +30,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { stopPropagation } from '$utils/keyboard';
import { useAsyncSearch, UseAsyncSearchOptions } from '$hooks/useAsyncSearch';
import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser';
-import { SettingTile } from '../setting-tile';
+import { SettingTile } from '$components/setting-tile';
export const useAdditionalCreators = (defaultCreators?: string[]) => {
const mx = useMatrixClient();
diff --git a/src/app/components/create-room/CreateRoomAccessSelector.tsx b/src/app/components/create-room/CreateRoomAccessSelector.tsx
index 00025cfa..6dd04983 100644
--- a/src/app/components/create-room/CreateRoomAccessSelector.tsx
+++ b/src/app/components/create-room/CreateRoomAccessSelector.tsx
@@ -1,6 +1,6 @@
import { Box, Text, Icon, Icons, config, IconSrc } from 'folds';
-import { SequenceCard } from '../sequence-card';
-import { SettingTile } from '../setting-tile';
+import { SequenceCard } from '$components/sequence-card';
+import { SettingTile } from '$components/setting-tile';
import { CreateRoomAccess } from './types';
type CreateRoomAccessSelectorProps = {
diff --git a/src/app/components/create-room/CreateRoomTypeSelector.tsx b/src/app/components/create-room/CreateRoomTypeSelector.tsx
index 941d1762..ff40c983 100644
--- a/src/app/components/create-room/CreateRoomTypeSelector.tsx
+++ b/src/app/components/create-room/CreateRoomTypeSelector.tsx
@@ -1,6 +1,6 @@
import { Box, Text, Icon, Icons, config, IconSrc } from 'folds';
-import { SequenceCard } from '../sequence-card';
-import { SettingTile } from '../setting-tile';
+import { SequenceCard } from '$components/sequence-card';
+import { SettingTile } from '$components/setting-tile';
import { CreateRoomType } from './types';
type CreateRoomTypeSelectorProps = {
diff --git a/src/app/components/create-room/RoomVersionSelector.tsx b/src/app/components/create-room/RoomVersionSelector.tsx
index b0b67b7e..a86b1d2d 100644
--- a/src/app/components/create-room/RoomVersionSelector.tsx
+++ b/src/app/components/create-room/RoomVersionSelector.tsx
@@ -14,8 +14,8 @@ import {
} from 'folds';
import FocusTrap from 'focus-trap-react';
import { stopPropagation } from '$utils/keyboard';
-import { SettingTile } from '../setting-tile';
-import { SequenceCard } from '../sequence-card';
+import { SettingTile } from '$components/setting-tile';
+import { SequenceCard } from '$components/sequence-card';
export function RoomVersionSelector({
versions,
diff --git a/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx b/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
index 55328a57..a6c7b3b6 100644
--- a/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
@@ -14,7 +14,7 @@ import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { ImageUsage, PackImageReader } from '$plugins/custom-emoji';
import { getEmoticonSearchStr } from '$plugins/utils';
-import { createEmoticonElement, moveCursor, replaceWithElement } from '../utils';
+import { createEmoticonElement, moveCursor, replaceWithElement } from '$components/editor/utils';
import { AutocompleteMenu } from './AutocompleteMenu';
import { AutocompleteQuery } from './autocompleteQuery';
diff --git a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
index 53c6a546..a3be8cf3 100644
--- a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
@@ -17,7 +17,7 @@ import { RoomAvatar, RoomIcon } from '$components/room-avatar';
import { getViaServers } from '$plugins/via-servers';
import { AutocompleteMenu } from './AutocompleteMenu';
import { AutocompleteQuery } from './autocompleteQuery';
-import { createMentionElement, moveCursor, replaceWithElement } from '../utils';
+import { createMentionElement, moveCursor, replaceWithElement } from '$components/editor/utils';
type MentionAutoCompleteHandler = (roomAliasOrId: string, name: string) => void;
diff --git a/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
index fecdf245..919b5c87 100644
--- a/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
@@ -15,7 +15,7 @@ import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { Membership } from '$types/matrix/room';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
-import { createMentionElement, moveCursor, replaceWithElement } from '../utils';
+import { createMentionElement, moveCursor, replaceWithElement } from '$components/editor/utils';
import { AutocompleteMenu } from './AutocompleteMenu';
import { AutocompleteQuery } from './autocompleteQuery';
diff --git a/src/app/components/emoji-board/EmojiBoard.tsx b/src/app/components/emoji-board/EmojiBoard.tsx
index 0c062a4f..9a603b97 100644
--- a/src/app/components/emoji-board/EmojiBoard.tsx
+++ b/src/app/components/emoji-board/EmojiBoard.tsx
@@ -51,7 +51,7 @@ import {
EmojiBoardLayout,
} from './components';
import { EmojiBoardTab, EmojiType } from './types';
-import { VirtualTile } from '../virtualizer';
+import { VirtualTile } from '$components/virtualizer';
const RECENT_GROUP_ID = 'recent_group';
const SEARCH_GROUP_ID = 'search_group';
diff --git a/src/app/components/emoji-board/components/Item.tsx b/src/app/components/emoji-board/components/Item.tsx
index 44a1a722..ca564494 100644
--- a/src/app/components/emoji-board/components/Item.tsx
+++ b/src/app/components/emoji-board/components/Item.tsx
@@ -4,7 +4,7 @@ import { PackImageReader } from '$plugins/custom-emoji';
import { IEmoji } from '$plugins/emoji';
import { mxcUrlToHttp } from '$utils/matrix';
import * as css from './styles.css';
-import { EmojiItemInfo, EmojiType } from '../types';
+import { EmojiItemInfo, EmojiType } from '$components/emoji-board/types';
export const getEmojiItemInfo = (element: Element): EmojiItemInfo | undefined => {
const label = element.getAttribute('title');
diff --git a/src/app/components/emoji-board/components/Tabs.tsx b/src/app/components/emoji-board/components/Tabs.tsx
index fc3386d2..bef95c14 100644
--- a/src/app/components/emoji-board/components/Tabs.tsx
+++ b/src/app/components/emoji-board/components/Tabs.tsx
@@ -1,6 +1,6 @@
import { CSSProperties } from 'react';
import { Badge, Box, Text } from 'folds';
-import { EmojiBoardTab } from '../types';
+import { EmojiBoardTab } from '$components/emoji-board/types';
const styles: CSSProperties = {
cursor: 'pointer',
diff --git a/src/app/components/event-readers/EventReaders.tsx b/src/app/components/event-readers/EventReaders.tsx
index 188eaf8d..6bb1737b 100644
--- a/src/app/components/event-readers/EventReaders.tsx
+++ b/src/app/components/event-readers/EventReaders.tsx
@@ -23,7 +23,7 @@ import { useSpaceOptionally } from '$hooks/useSpace';
import { getMouseEventCords } from '$utils/dom';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
-import { UserAvatar } from '../user-avatar';
+import { UserAvatar } from '$components/user-avatar';
import * as css from './EventReaders.css';
export type EventReadersProps = {
diff --git a/src/app/components/image-pack-view/ImagePackContent.tsx b/src/app/components/image-pack-view/ImagePackContent.tsx
index e9b75b26..de5b5000 100644
--- a/src/app/components/image-pack-view/ImagePackContent.tsx
+++ b/src/app/components/image-pack-view/ImagePackContent.tsx
@@ -17,13 +17,13 @@ import { getImageFileUrl, loadImageElement, renameFile } from '$utils/dom';
import { replaceSpaceWithDash, suffixRename } from '$utils/common';
import { getFileNameWithoutExt } from '$utils/mimeTypes';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { SequenceCard } from '../sequence-card';
+import { SequenceCard } from '$components/sequence-card';
import { ImageTile, ImageTileEdit, ImageTileUpload } from './ImageTile';
-import { SettingTile } from '../setting-tile';
+import { SettingTile } from '$components/setting-tile';
import { UsageSwitcher } from './UsageSwitcher';
import { ImagePackProfile, ImagePackProfileEdit } from './PackMeta';
import * as css from './style.css';
-import { CompactUploadCardRenderer } from '../upload-card';
+import { CompactUploadCardRenderer } from '$components/upload-card';
export type ImagePackContentProps = {
imagePack: ImagePack;
diff --git a/src/app/components/image-pack-view/ImagePackView.tsx b/src/app/components/image-pack-view/ImagePackView.tsx
index 7a6ebc9f..304275e5 100644
--- a/src/app/components/image-pack-view/ImagePackView.tsx
+++ b/src/app/components/image-pack-view/ImagePackView.tsx
@@ -1,7 +1,7 @@
import { Box, IconButton, Text, Icon, Icons, Scroll, Chip } from 'folds';
import { PackAddress } from '$plugins/custom-emoji';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { Page, PageHeader, PageContent } from '../page';
+import { Page, PageHeader, PageContent } from '$components/page';
import { RoomImagePack } from './RoomImagePack';
import { UserImagePack } from './UserImagePack';
diff --git a/src/app/components/image-pack-view/ImageTile.tsx b/src/app/components/image-pack-view/ImageTile.tsx
index e9a4b257..2070f00e 100644
--- a/src/app/components/image-pack-view/ImageTile.tsx
+++ b/src/app/components/image-pack-view/ImageTile.tsx
@@ -6,7 +6,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { useObjectURL } from '$hooks/useObjectURL';
import { createUploadAtom, TUploadAtom } from '$state/upload';
import { replaceSpaceWithDash } from '$utils/common';
-import { SettingTile } from '../setting-tile';
+import { SettingTile } from '$components/setting-tile';
import * as css from './style.css';
import { UsageSwitcher, useUsageStr } from './UsageSwitcher';
diff --git a/src/app/components/image-pack-view/PackMeta.tsx b/src/app/components/image-pack-view/PackMeta.tsx
index 76c7da21..77e8a42f 100644
--- a/src/app/components/image-pack-view/PackMeta.tsx
+++ b/src/app/components/image-pack-view/PackMeta.tsx
@@ -24,7 +24,7 @@ import { useObjectURL } from '$hooks/useObjectURL';
import { createUploadAtom, UploadSuccess } from '$state/upload';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { PackMetaReader } from '$plugins/custom-emoji';
-import { CompactUploadCardRenderer } from '../upload-card';
+import { CompactUploadCardRenderer } from '$components/upload-card';
type ImagePackAvatarProps = {
url?: string;
diff --git a/src/app/components/member-tile/MemberTile.tsx b/src/app/components/member-tile/MemberTile.tsx
index 3565c8f0..111af3ed 100644
--- a/src/app/components/member-tile/MemberTile.tsx
+++ b/src/app/components/member-tile/MemberTile.tsx
@@ -7,7 +7,7 @@ import { useSableCosmetics } from '$hooks/useSableCosmetics';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
import * as css from './style.css';
-import { UserAvatar } from '../user-avatar';
+import { UserAvatar } from '$components/user-avatar';
const getName = (room: Room, member: RoomMember, nicknames: Record) =>
getMemberDisplayName(room, member.userId, nicknames) ??
diff --git a/src/app/components/message/content/EventContent.tsx b/src/app/components/message/content/EventContent.tsx
index 6a24ec83..35449e1b 100644
--- a/src/app/components/message/content/EventContent.tsx
+++ b/src/app/components/message/content/EventContent.tsx
@@ -1,7 +1,7 @@
import { Box, Icon, IconSrc } from 'folds';
import { ReactNode } from 'react';
import { MessageLayout } from '$state/settings';
-import { BubbleLayout, CompactLayout, ModernLayout } from '../layout';
+import { BubbleLayout, CompactLayout, ModernLayout } from '$components/message/layout';
export type EventContentProps = {
messageLayout: number;
diff --git a/src/app/components/message/placeholder/CompactPlaceholder.tsx b/src/app/components/message/placeholder/CompactPlaceholder.tsx
index 6702a045..86b6c662 100644
--- a/src/app/components/message/placeholder/CompactPlaceholder.tsx
+++ b/src/app/components/message/placeholder/CompactPlaceholder.tsx
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
import { as, ContainerColor, toRem } from 'folds';
import { randomNumberBetween } from '$utils/common';
import { LinePlaceholder } from './LinePlaceholder';
-import { CompactLayout } from '../layout';
+import { CompactLayout } from '$components/message/layout';
export const CompactPlaceholder = as<'div', { variant?: ContainerColor }>(
({ variant, ...props }, ref) => {
diff --git a/src/app/components/message/placeholder/DefaultPlaceholder.tsx b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
index 33db0adf..98301d2e 100644
--- a/src/app/components/message/placeholder/DefaultPlaceholder.tsx
+++ b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
@@ -2,7 +2,7 @@ import { CSSProperties, useMemo } from 'react';
import { Avatar, Box, ContainerColor, as, color, toRem } from 'folds';
import { randomNumberBetween } from '$utils/common';
import { LinePlaceholder } from './LinePlaceholder';
-import { ModernLayout } from '../layout';
+import { ModernLayout } from '$components/message/layout';
const contentMargin: CSSProperties = { marginTop: toRem(3) };
diff --git a/src/app/components/password-input/PasswordInput.tsx b/src/app/components/password-input/PasswordInput.tsx
index 16aa1f16..d1fdea24 100644
--- a/src/app/components/password-input/PasswordInput.tsx
+++ b/src/app/components/password-input/PasswordInput.tsx
@@ -1,6 +1,6 @@
import { ComponentProps, forwardRef } from 'react';
import { Icon, IconButton, Input, config, Icons } from 'folds';
-import { UseStateProvider } from '../UseStateProvider';
+import { UseStateProvider } from '$components/UseStateProvider';
type PasswordInputProps = Omit, 'type' | 'size'> & {
size: '400' | '500';
diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx
index 79036340..afd66d3c 100644
--- a/src/app/components/room-card/RoomCard.tsx
+++ b/src/app/components/room-card/RoomCard.tsx
@@ -31,7 +31,7 @@ import { useElementSizeObserver } from '$hooks/useElementSizeObserver';
import { getRoomAvatarUrl, getStateEvent } from '$utils/room';
import { useStateEventCallback } from '$hooks/useStateEventCallback';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { RoomAvatar } from '../room-avatar';
+import { RoomAvatar } from '$components/room-avatar';
import * as css from './style.css';
type GridColumnCount = '1' | '2' | '3';
diff --git a/src/app/components/room-intro/RoomIntro.tsx b/src/app/components/room-intro/RoomIntro.tsx
index e964ceef..3ad39546 100644
--- a/src/app/components/room-intro/RoomIntro.tsx
+++ b/src/app/components/room-intro/RoomIntro.tsx
@@ -16,10 +16,10 @@ import { mDirectAtom } from '$state/mDirectList';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
-import { RoomAvatar } from '../room-avatar';
-import { InviteUserPrompt } from '../invite-user-prompt';
-import { InfoCard } from '../info-card';
-import { DirectInvitePrompt } from '../direct-invite-prompt';
+import { RoomAvatar } from '$components/room-avatar';
+import { InviteUserPrompt } from '$components/invite-user-prompt';
+import { InfoCard } from '$components/info-card';
+import { DirectInvitePrompt } from '$components/direct-invite-prompt';
export type RoomIntroProps = {
room: Room;
diff --git a/src/app/components/time-date/PickerColumn.tsx b/src/app/components/time-date/PickerColumn.tsx
index cf227a82..a1fbcb34 100644
--- a/src/app/components/time-date/PickerColumn.tsx
+++ b/src/app/components/time-date/PickerColumn.tsx
@@ -1,6 +1,6 @@
import { ReactNode } from 'react';
import { Box, Text, Scroll } from 'folds';
-import { CutoutCard } from '../cutout-card';
+import { CutoutCard } from '$components/cutout-card';
import * as css from './styles.css';
export function PickerColumn({ title, children }: { title: string; children: ReactNode }) {
diff --git a/src/app/components/uia-stages/PasswordStage.tsx b/src/app/components/uia-stages/PasswordStage.tsx
index d168ddcc..582758a0 100644
--- a/src/app/components/uia-stages/PasswordStage.tsx
+++ b/src/app/components/uia-stages/PasswordStage.tsx
@@ -3,7 +3,7 @@ import { FormEventHandler } from 'react';
import { AuthType } from '$types/matrix-sdk';
import { StageComponentProps } from './types';
import { ErrorCode } from '../../cs-errorcode';
-import { PasswordInput } from '../password-input';
+import { PasswordInput } from '$components/password-input';
export function PasswordStage({
stageData,
diff --git a/src/app/components/user-profile/CreatorChip.tsx b/src/app/components/user-profile/CreatorChip.tsx
index 5c66079d..f517581c 100644
--- a/src/app/components/user-profile/CreatorChip.tsx
+++ b/src/app/components/user-profile/CreatorChip.tsx
@@ -13,7 +13,7 @@ import { useOpenRoomSettings } from '$state/hooks/roomSettings';
import { useOpenSpaceSettings } from '$state/hooks/spaceSettings';
import { SpaceSettingsPage } from '$state/spaceSettings';
import { RoomSettingsPage } from '$state/roomSettings';
-import { PowerColorBadge, PowerIcon } from '../power';
+import { PowerColorBadge, PowerIcon } from '$components/power';
export function CreatorChip() {
const mx = useMatrixClient();
diff --git a/src/app/components/user-profile/PowerChip.tsx b/src/app/components/user-profile/PowerChip.tsx
index 391b94a0..d1e4dbfa 100644
--- a/src/app/components/user-profile/PowerChip.tsx
+++ b/src/app/components/user-profile/PowerChip.tsx
@@ -41,8 +41,8 @@ import { getPowerTagIconSrc, useGetMemberPowerTag } from '$hooks/useMemberPowerT
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
import { useMemberPowerCompare } from '$hooks/useMemberPowerCompare';
-import { CutoutCard } from '../cutout-card';
-import { PowerColorBadge, PowerIcon } from '../power';
+import { CutoutCard } from '$components/cutout-card';
+import { PowerColorBadge, PowerIcon } from '$components/power';
type SelfDemoteAlertProps = {
power: number;
diff --git a/src/app/components/user-profile/UserChips.tsx b/src/app/components/user-profile/UserChips.tsx
index 950474a9..27f962d1 100644
--- a/src/app/components/user-profile/UserChips.tsx
+++ b/src/app/components/user-profile/UserChips.tsx
@@ -47,9 +47,9 @@ import { getMatrixToUser } from '$plugins/matrix-to';
import { useTimeoutToggle } from '$hooks/useTimeoutToggle';
import { useIgnoredUsers } from '$hooks/useIgnoredUsers';
import { useNickname, useSetNickname } from '$hooks/useNickname';
-import { CutoutCard } from '../cutout-card';
-import { SettingTile } from '../setting-tile';
-import { RoomAvatar, RoomIcon } from '../room-avatar';
+import { CutoutCard } from '$components/cutout-card';
+import { SettingTile } from '$components/setting-tile';
+import { RoomAvatar, RoomIcon } from '$components/room-avatar';
export function ServerChip({ server }: { server: string }) {
const mx = useMatrixClient();
diff --git a/src/app/components/user-profile/UserHero.tsx b/src/app/components/user-profile/UserHero.tsx
index c696e316..2f6eb84d 100644
--- a/src/app/components/user-profile/UserHero.tsx
+++ b/src/app/components/user-profile/UserHero.tsx
@@ -21,9 +21,9 @@ import { useRoom } from '$hooks/useRoom';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
import { useNickname } from '$hooks/useNickname';
import { useBlobCache } from '$hooks/useBlobCache';
-import { ImageViewer } from '../image-viewer';
-import { AvatarPresence, PresenceBadge } from '../presence';
-import { UserAvatar } from '../user-avatar';
+import { ImageViewer } from '$components/image-viewer';
+import { AvatarPresence, PresenceBadge } from '$components/presence';
+import { UserAvatar } from '$components/user-avatar';
import * as css from './styles.css';
type UserHeroProps = {
diff --git a/src/app/components/user-profile/UserModeration.tsx b/src/app/components/user-profile/UserModeration.tsx
index 8c202f8e..a6f8c796 100644
--- a/src/app/components/user-profile/UserModeration.tsx
+++ b/src/app/components/user-profile/UserModeration.tsx
@@ -7,8 +7,8 @@ import { BreakWord } from '$styles/Text.css';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { timeDayMonYear, timeHourMinute } from '$utils/time';
-import { SettingTile } from '../setting-tile';
-import { CutoutCard } from '../cutout-card';
+import { SettingTile } from '$components/setting-tile';
+import { CutoutCard } from '$components/cutout-card';
type UserKickAlertProps = {
reason?: string;
diff --git a/src/app/components/user-profile/UserRoomProfile.tsx b/src/app/components/user-profile/UserRoomProfile.tsx
index cd09fed9..a746dfe1 100644
--- a/src/app/components/user-profile/UserRoomProfile.tsx
+++ b/src/app/components/user-profile/UserRoomProfile.tsx
@@ -30,7 +30,7 @@ import {
renderMatrixMention,
} from '$plugins/react-custom-html-parser';
import { useSpoilerClickHandler } from '$hooks/useSpoilerClickHandler';
-import { RenderBody } from '../message';
+import { RenderBody } from '$components/message';
import { CreatorChip } from './CreatorChip';
import { UserInviteAlert, UserBanAlert, UserModeration, UserKickAlert } from './UserModeration';
import { PowerChip } from './PowerChip';
diff --git a/src/app/features/common-settings/cosmetics/Cosmetics.tsx b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
index b309befa..fbca8b1e 100644
--- a/src/app/features/common-settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/common-settings/cosmetics/Cosmetics.tsx
@@ -10,7 +10,7 @@ import { StateEvent } from '$types/matrix/room';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
import { createLogger } from '$utils/debug';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/common-settings/styles.css';
type CosmeticsProps = {
requestClose: () => void;
diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
index adabc321..5f8bc077 100644
--- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
@@ -26,7 +26,7 @@ import { AccountDataEditor, AccountDataSubmitCallback } from '$components/Accoun
import { useMatrixClient } from '$hooks/useMatrixClient';
import { SendRoomEvent } from './SendRoomEvent';
import { StateEventEditor, StateEventInfo } from './StateEventEditor';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/common-settings/styles.css';
type DeveloperToolsProps = {
requestClose: () => void;
diff --git a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
index 76037012..00bbd112 100644
--- a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
+++ b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx
@@ -30,7 +30,7 @@ import { usePowerLevels } from '$hooks/usePowerLevels';
import { useTextAreaCodeEditor } from '$hooks/useTextAreaCodeEditor';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/common-settings/styles.css';
const EDITOR_INTENT_SPACE_COUNT = 2;
diff --git a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
index 57cc250c..4aacd518 100644
--- a/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
+++ b/src/app/features/common-settings/emojis-stickers/RoomPacks.tsx
@@ -39,7 +39,7 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAlive } from '$hooks/useAlive';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/common-settings/styles.css';
type CreatePackTileProps = {
packs: ImagePack[];
diff --git a/src/app/features/common-settings/permissions/PermissionGroups.tsx b/src/app/features/common-settings/permissions/PermissionGroups.tsx
index 4bc360e9..1abe3a82 100644
--- a/src/app/features/common-settings/permissions/PermissionGroups.tsx
+++ b/src/app/features/common-settings/permissions/PermissionGroups.tsx
@@ -18,7 +18,7 @@ import { PowerSwitcher } from '$components/power';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAlive } from '$hooks/useAlive';
import { PermissionGroup } from './types';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/common-settings/styles.css';
const USER_DEFAULT_LOCATION: PermissionLocation = {
user: true,
diff --git a/src/app/features/common-settings/permissions/Powers.tsx b/src/app/features/common-settings/permissions/Powers.tsx
index 1bbe4a2e..78e2351d 100644
--- a/src/app/features/common-settings/permissions/Powers.tsx
+++ b/src/app/features/common-settings/permissions/Powers.tsx
@@ -27,7 +27,7 @@ import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag';
import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
import { useRoomCreators } from '$hooks/useRoomCreators';
import { PermissionGroup } from './types';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/common-settings/styles.css';
type PeekPermissionsProps = {
powerLevels: IPowerLevels;
diff --git a/src/app/features/common-settings/permissions/PowersEditor.tsx b/src/app/features/common-settings/permissions/PowersEditor.tsx
index 214b172c..6388a54c 100644
--- a/src/app/features/common-settings/permissions/PowersEditor.tsx
+++ b/src/app/features/common-settings/permissions/PowersEditor.tsx
@@ -48,7 +48,7 @@ import { useAlive } from '$hooks/useAlive';
import { BetaNoticeBadge } from '$components/BetaNoticeBadge';
import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag';
import { creatorsSupported } from '$utils/matrix';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/common-settings/styles.css';
type EditPowerProps = {
maxPower: number;
diff --git a/src/app/features/lobby/Lobby.tsx b/src/app/features/lobby/Lobby.tsx
index a03d1a61..a57a1d5f 100644
--- a/src/app/features/lobby/Lobby.tsx
+++ b/src/app/features/lobby/Lobby.tsx
@@ -55,7 +55,7 @@ import { SpaceHierarchy } from './SpaceHierarchy';
import { CanDropCallback, useDnDMonitor } from './DnD';
import { LobbyHero } from './LobbyHero';
import { LobbyHeader } from './LobbyHeader';
-import { MembersDrawer } from '../room/MembersDrawer';
+import { MembersDrawer } from '$features/room/MembersDrawer';
const useCanDropLobbyItem = (
space: Room,
diff --git a/src/app/features/lobby/SpaceItem.tsx b/src/app/features/lobby/SpaceItem.tsx
index b3454e54..61422d41 100644
--- a/src/app/features/lobby/SpaceItem.tsx
+++ b/src/app/features/lobby/SpaceItem.tsx
@@ -32,7 +32,7 @@ import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useOpenCreateRoomModal } from '$state/hooks/createRoomModal';
import { useOpenCreateSpaceModal } from '$state/hooks/createSpaceModal';
import { CreateRoomType } from '$components/create-room/types';
-import { AddExistingModal } from '../add-existing';
+import { AddExistingModal } from '$features/add-existing';
import { useDraggableItem } from './DnD';
import * as styleCss from './style.css';
import * as css from './SpaceItem.css';
diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx
index ef31cca0..16f5ea7a 100644
--- a/src/app/features/room-settings/RoomSettings.tsx
+++ b/src/app/features/room-settings/RoomSettings.tsx
@@ -14,11 +14,11 @@ import { RoomSettingsPage } from '$state/roomSettings';
import { useRoom } from '$hooks/useRoom';
import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper';
import { General } from './general';
-import { Members } from '../common-settings/members';
-import { EmojisStickers } from '../common-settings/emojis-stickers';
+import { Members } from '$features/common-settings/members';
+import { EmojisStickers } from '$features/common-settings/emojis-stickers';
import { Permissions } from './permissions';
-import { DeveloperTools } from '../common-settings/developer-tools';
-import { Cosmetics } from '../common-settings/cosmetics/Cosmetics';
+import { DeveloperTools } from '$features/common-settings/developer-tools';
+import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics';
type RoomSettingsMenuItem = {
page: RoomSettingsPage;
diff --git a/src/app/features/room/message/Reactions.tsx b/src/app/features/room/message/Reactions.tsx
index 1035130e..6152f7c2 100644
--- a/src/app/features/room/message/Reactions.tsx
+++ b/src/app/features/room/message/Reactions.tsx
@@ -22,7 +22,7 @@ import { useRelations } from '$hooks/useRelations';
import { stopPropagation } from '$utils/keyboard';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import * as css from './styles.css';
-import { ReactionViewer } from '../reaction-viewer';
+import { ReactionViewer } from '$features/room/reaction-viewer';
export type ReactionsProps = {
room: Room;
diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
index 94302121..eaff34d1 100644
--- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
+++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
@@ -86,9 +86,9 @@ import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
import { nicknamesAtom } from '$state/nicknames';
import { AccountDataEvent } from '$types/matrix/accountData';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
-import { EncryptedContent } from '../message';
+import { EncryptedContent } from '$features/room/message';
import * as css from './RoomPinMenu.css';
-import type { PinReadMarker } from '../RoomViewHeader';
+import type { PinReadMarker } from '$features/room/RoomViewHeader';
const log = createLogger('RoomPinMenu');
diff --git a/src/app/features/settings/about/About.tsx b/src/app/features/settings/about/About.tsx
index 9f153f41..3eb07593 100644
--- a/src/app/features/settings/about/About.tsx
+++ b/src/app/features/settings/about/About.tsx
@@ -5,7 +5,7 @@ import { SettingTile } from '$components/setting-tile';
import CinnySVG from '$public/res/svg/cinny.svg';
import { clearCacheAndReload } from '$client/initMatrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
type AboutProps = {
requestClose: () => void;
diff --git a/src/app/features/settings/account/ContactInfo.tsx b/src/app/features/settings/account/ContactInfo.tsx
index 83bb3c6e..e6e4515a 100644
--- a/src/app/features/settings/account/ContactInfo.tsx
+++ b/src/app/features/settings/account/ContactInfo.tsx
@@ -4,7 +4,7 @@ import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
export function ContactInformation() {
const mx = useMatrixClient();
diff --git a/src/app/features/settings/account/IgnoredUserList.tsx b/src/app/features/settings/account/IgnoredUserList.tsx
index 493ef67b..0b3b3470 100644
--- a/src/app/features/settings/account/IgnoredUserList.tsx
+++ b/src/app/features/settings/account/IgnoredUserList.tsx
@@ -7,7 +7,7 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { isUserId } from '$utils/matrix';
import { useIgnoredUsers } from '$hooks/useIgnoredUsers';
import { useAlive } from '$hooks/useAlive';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
function IgnoreUserInput({ userList }: { userList: string[] }) {
const mx = useMatrixClient();
diff --git a/src/app/features/settings/account/MatrixId.tsx b/src/app/features/settings/account/MatrixId.tsx
index 28476b75..64043752 100644
--- a/src/app/features/settings/account/MatrixId.tsx
+++ b/src/app/features/settings/account/MatrixId.tsx
@@ -3,7 +3,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
import { copyToClipboard } from '$utils/dom';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
export function MatrixId() {
const mx = useMatrixClient();
diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx
index 49af9912..a94aaa60 100644
--- a/src/app/features/settings/account/Profile.tsx
+++ b/src/app/features/settings/account/Profile.tsx
@@ -48,7 +48,7 @@ import { TimezoneEditor } from './TimezoneEditor';
import { PronounEditor } from './PronounEditor';
import { BioEditor } from './BioEditor';
import { NameColorEditor } from './NameColorEditor';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
type PronounSet = {
summary: string;
diff --git a/src/app/features/settings/cosmetics/Cosmetics.tsx b/src/app/features/settings/cosmetics/Cosmetics.tsx
index 4e53a8be..722d501c 100644
--- a/src/app/features/settings/cosmetics/Cosmetics.tsx
+++ b/src/app/features/settings/cosmetics/Cosmetics.tsx
@@ -21,7 +21,7 @@ import { useSetting } from '$state/hooks/settings';
import { JumboEmojiSize, settingsAtom } from '$state/settings';
import { SettingTile } from '$components/setting-tile';
import { stopPropagation } from '$utils/keyboard';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
import { Appearance } from './Themes';
const emojiSizeItems = [
diff --git a/src/app/features/settings/cosmetics/Themes.tsx b/src/app/features/settings/cosmetics/Themes.tsx
index 3fc28502..ac666bdc 100644
--- a/src/app/features/settings/cosmetics/Themes.tsx
+++ b/src/app/features/settings/cosmetics/Themes.tsx
@@ -32,7 +32,7 @@ import {
useThemes,
} from '$hooks/useTheme';
import { stopPropagation } from '$utils/keyboard';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
type ThemeSelectorProps = {
themeNames: Record;
diff --git a/src/app/features/settings/developer-tools/AccountData.tsx b/src/app/features/settings/developer-tools/AccountData.tsx
index 6c8b95b2..6cd68e9b 100644
--- a/src/app/features/settings/developer-tools/AccountData.tsx
+++ b/src/app/features/settings/developer-tools/AccountData.tsx
@@ -5,7 +5,7 @@ import { SettingTile } from '$components/setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useAccountDataCallback } from '$hooks/useAccountDataCallback';
import { CutoutCard } from '$components/cutout-card';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
type AccountDataProps = {
expand: boolean;
diff --git a/src/app/features/settings/developer-tools/DevelopTools.tsx b/src/app/features/settings/developer-tools/DevelopTools.tsx
index d1638a41..e9bc3de8 100644
--- a/src/app/features/settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/settings/developer-tools/DevelopTools.tsx
@@ -8,7 +8,7 @@ import { settingsAtom } from '$state/settings';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AccountDataEditor, AccountDataSubmitCallback } from '$components/AccountDataEditor';
import { copyToClipboard } from '$utils/dom';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
import { AccountData } from './AccountData';
type DeveloperToolsProps = {
diff --git a/src/app/features/settings/devices/DeviceTile.tsx b/src/app/features/settings/devices/DeviceTile.tsx
index 84e0ef20..b77be8ac 100644
--- a/src/app/features/settings/devices/DeviceTile.tsx
+++ b/src/app/features/settings/devices/DeviceTile.tsx
@@ -27,7 +27,7 @@ import { LogoutDialog } from '$components/LogoutDialog';
import { stopPropagation } from '$utils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
export function DeviceTilePlaceholder() {
return (
diff --git a/src/app/features/settings/devices/Devices.tsx b/src/app/features/settings/devices/Devices.tsx
index 0377ae92..fc7eb4bb 100644
--- a/src/app/features/settings/devices/Devices.tsx
+++ b/src/app/features/settings/devices/Devices.tsx
@@ -21,7 +21,7 @@ import {
VerificationStatusBadge,
VerifyCurrentDeviceTile,
} from './Verification';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
function DevicesPlaceholder() {
return (
diff --git a/src/app/features/settings/devices/LocalBackup.tsx b/src/app/features/settings/devices/LocalBackup.tsx
index 5983aa1c..eaefc7ff 100644
--- a/src/app/features/settings/devices/LocalBackup.tsx
+++ b/src/app/features/settings/devices/LocalBackup.tsx
@@ -14,7 +14,7 @@ import {
} from '$utils/MegolmExportEncryption';
import { useAlive } from '$hooks/useAlive';
import { useFilePicker } from '$hooks/useFilePicker';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
type LocalBackupError = Error | FriendlyError;
diff --git a/src/app/features/settings/devices/OtherDevices.tsx b/src/app/features/settings/devices/OtherDevices.tsx
index 396488a2..7970bf77 100644
--- a/src/app/features/settings/devices/OtherDevices.tsx
+++ b/src/app/features/settings/devices/OtherDevices.tsx
@@ -14,7 +14,7 @@ import { useAccountManagementActions } from '$hooks/useAccountManagement';
import { SettingTile } from '$components/setting-tile';
import { VerifyOtherDeviceTile } from './Verification';
import { DeviceDeleteBtn, DeviceTile } from './DeviceTile';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
type OtherDevicesProps = {
devices: IMyDevice[];
diff --git a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
index e7cd9de4..1c66d4c6 100644
--- a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
+++ b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx
@@ -42,7 +42,7 @@ import { allRoomsAtom } from '$state/room-list/roomList';
import { AccountDataEvent } from '$types/matrix/accountData';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { stopPropagation } from '$utils/keyboard';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
function GlobalPackSelector({
packs,
diff --git a/src/app/features/settings/emojis-stickers/UserPack.tsx b/src/app/features/settings/emojis-stickers/UserPack.tsx
index fbe2629b..03c80da2 100644
--- a/src/app/features/settings/emojis-stickers/UserPack.tsx
+++ b/src/app/features/settings/emojis-stickers/UserPack.tsx
@@ -6,7 +6,7 @@ import { ImagePack, ImageUsage } from '$plugins/custom-emoji';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { mxcUrlToHttp } from '$utils/matrix';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
type UserPackProps = {
onViewPack: (imagePack: ImagePack) => void;
diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx
index 5e58fab9..37cae403 100644
--- a/src/app/features/settings/general/General.tsx
+++ b/src/app/features/settings/general/General.tsx
@@ -41,7 +41,7 @@ import { stopPropagation } from '$utils/keyboard';
import { useMessageLayoutItems } from '$hooks/useMessageLayout';
import { useMessageSpacingItems } from '$hooks/useMessageSpacing';
import { useDateFormatItems } from '$hooks/useDateFormat';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
type DateHintProps = {
hasChanges: boolean;
diff --git a/src/app/features/settings/notifications/AllMessages.tsx b/src/app/features/settings/notifications/AllMessages.tsx
index f9344ba7..e750cc7d 100644
--- a/src/app/features/settings/notifications/AllMessages.tsx
+++ b/src/app/features/settings/notifications/AllMessages.tsx
@@ -18,7 +18,7 @@ import {
useNotificationModeActions,
} from '$hooks/useNotificationMode';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
import { NotificationModeSwitcher } from './NotificationModeSwitcher';
const getAllMessageDefaultRule = (
diff --git a/src/app/features/settings/notifications/KeywordMessages.tsx b/src/app/features/settings/notifications/KeywordMessages.tsx
index b9dff525..a2852284 100644
--- a/src/app/features/settings/notifications/KeywordMessages.tsx
+++ b/src/app/features/settings/notifications/KeywordMessages.tsx
@@ -14,7 +14,7 @@ import {
} from '$hooks/useNotificationMode';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { NotificationModeSwitcher } from './NotificationModeSwitcher';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
const NOTIFY_MODE_OPS: NotificationModeOptions = {
highlight: true,
diff --git a/src/app/features/settings/notifications/Notifications.tsx b/src/app/features/settings/notifications/Notifications.tsx
index 94b71382..f74f8604 100644
--- a/src/app/features/settings/notifications/Notifications.tsx
+++ b/src/app/features/settings/notifications/Notifications.tsx
@@ -6,7 +6,7 @@ import { SystemNotification } from './SystemNotification';
import { AllMessagesNotifications } from './AllMessages';
import { SpecialMessagesNotifications } from './SpecialMessages';
import { KeywordMessagesNotifications } from './KeywordMessages';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
type NotificationsProps = {
requestClose: () => void;
diff --git a/src/app/features/settings/notifications/SpecialMessages.tsx b/src/app/features/settings/notifications/SpecialMessages.tsx
index 96d78069..92d559d3 100644
--- a/src/app/features/settings/notifications/SpecialMessages.tsx
+++ b/src/app/features/settings/notifications/SpecialMessages.tsx
@@ -15,7 +15,7 @@ import {
NotificationModeOptions,
useNotificationModeActions,
} from '$hooks/useNotificationMode';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
import { NotificationModeSwitcher } from './NotificationModeSwitcher';
const NOTIFY_MODE_OPS: NotificationModeOptions = {
diff --git a/src/app/features/settings/notifications/SystemNotification.tsx b/src/app/features/settings/notifications/SystemNotification.tsx
index feefba4c..6612b406 100644
--- a/src/app/features/settings/notifications/SystemNotification.tsx
+++ b/src/app/features/settings/notifications/SystemNotification.tsx
@@ -9,7 +9,7 @@ import { getNotificationState, usePermissionState } from '$hooks/usePermission';
import { useEmailNotifications } from '$hooks/useEmailNotifications';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { SequenceCardStyle } from '../styles.css';
+import { SequenceCardStyle } from '$features/settings/styles.css';
function EmailNotification() {
const mx = useMatrixClient();
diff --git a/src/app/features/space-settings/SpaceSettings.tsx b/src/app/features/space-settings/SpaceSettings.tsx
index 3321d7ac..ffdd6d42 100644
--- a/src/app/features/space-settings/SpaceSettings.tsx
+++ b/src/app/features/space-settings/SpaceSettings.tsx
@@ -12,12 +12,12 @@ import { mDirectAtom } from '$state/mDirectList';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
import { SpaceSettingsPage } from '$state/spaceSettings';
import { useRoom } from '$hooks/useRoom';
-import { EmojisStickers } from '../common-settings/emojis-stickers';
-import { Members } from '../common-settings/members';
-import { DeveloperTools } from '../common-settings/developer-tools';
+import { EmojisStickers } from '$features/common-settings/emojis-stickers';
+import { Members } from '$features/common-settings/members';
+import { DeveloperTools } from '$features/common-settings/developer-tools';
import { General } from './general';
import { Permissions } from './permissions';
-import { Cosmetics } from '../common-settings/cosmetics/Cosmetics';
+import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics';
type SpaceSettingsMenuItem = {
page: SpaceSettingsPage;
diff --git a/src/app/hooks/router/useSelectedRoom.ts b/src/app/hooks/router/useSelectedRoom.ts
index 59b8ac33..3aba7483 100644
--- a/src/app/hooks/router/useSelectedRoom.ts
+++ b/src/app/hooks/router/useSelectedRoom.ts
@@ -1,6 +1,6 @@
import { useParams } from 'react-router-dom';
import { getCanonicalAliasRoomId, isRoomAlias } from '$utils/matrix';
-import { useMatrixClient } from '../useMatrixClient';
+import { useMatrixClient } from '$hooks/useMatrixClient';
export const useSelectedRoom = (): string | undefined => {
const mx = useMatrixClient();
diff --git a/src/app/hooks/router/useSelectedSpace.ts b/src/app/hooks/router/useSelectedSpace.ts
index 769d8c8a..33bbe430 100644
--- a/src/app/hooks/router/useSelectedSpace.ts
+++ b/src/app/hooks/router/useSelectedSpace.ts
@@ -1,7 +1,7 @@
import { useMatch, useParams } from 'react-router-dom';
import { getCanonicalAliasRoomId, isRoomAlias } from '$utils/matrix';
import { getSpaceLobbyPath, getSpaceSearchPath } from '$pages/pathUtils';
-import { useMatrixClient } from '../useMatrixClient';
+import { useMatrixClient } from '$hooks/useMatrixClient';
export const useSelectedSpace = (): string | undefined => {
const mx = useMatrixClient();
diff --git a/src/app/hooks/useAsyncSearch.ts b/src/app/hooks/useAsyncSearch.ts
index 3852d3b9..ebf78b8b 100644
--- a/src/app/hooks/useAsyncSearch.ts
+++ b/src/app/hooks/useAsyncSearch.ts
@@ -9,8 +9,8 @@ import {
normalize,
matchQuery,
ResultHandler,
-} from '../utils/AsyncSearch';
-import { sanitizeForRegex } from '../utils/regex';
+} from '$utils/AsyncSearch';
+import { sanitizeForRegex } from '$utils/regex';
export type UseAsyncSearchOptions = AsyncSearchOption & {
matchOptions?: MatchQueryOption;
diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts
index 113ec28c..d9c4e7d6 100644
--- a/src/app/hooks/useCommands.ts
+++ b/src/app/hooks/useCommands.ts
@@ -22,11 +22,11 @@ import {
isUserId,
rateLimitedActions,
removeRoomIdFromMDirect,
-} from '../utils/matrix';
+} from '$utils/matrix';
import { useRoomNavigate } from './useRoomNavigate';
-import { getStateEvent } from '../utils/room';
-import { splitWithSpace } from '../utils/common';
-import { createRoomEncryptionState } from '../components/create-room';
+import { getStateEvent } from '$utils/room';
+import { splitWithSpace } from '$utils/common';
+import { createRoomEncryptionState } from '$components/create-room';
import { enrichWidgetUrl } from './useRoomWidgets';
export const SHRUG = '¯\\_(ツ)_/¯';
diff --git a/src/app/hooks/useComposingCheck.ts b/src/app/hooks/useComposingCheck.ts
index 687a4927..9208fcf3 100644
--- a/src/app/hooks/useComposingCheck.ts
+++ b/src/app/hooks/useComposingCheck.ts
@@ -1,6 +1,6 @@
import { useCallback, useEffect } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
-import { lastCompositionEndAtom } from '../state/lastCompositionEnd';
+import { lastCompositionEndAtom } from '$state/lastCompositionEnd';
interface TimeStamped {
readonly timeStamp: number;
diff --git a/src/app/hooks/useDateFormat.ts b/src/app/hooks/useDateFormat.ts
index 520d4b0d..49717310 100644
--- a/src/app/hooks/useDateFormat.ts
+++ b/src/app/hooks/useDateFormat.ts
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { DateFormat } from '../state/settings';
+import { DateFormat } from '$state/settings';
export type DateFormatItem = {
name: string;
diff --git a/src/app/hooks/useDeviceVerificationStatus.ts b/src/app/hooks/useDeviceVerificationStatus.ts
index d0b3d42b..f6102fe6 100644
--- a/src/app/hooks/useDeviceVerificationStatus.ts
+++ b/src/app/hooks/useDeviceVerificationStatus.ts
@@ -1,8 +1,8 @@
import { useCallback, useEffect, useState } from 'react';
import { CryptoApi } from '$types/matrix-sdk';
-import { verifiedDevice } from '../utils/matrix-crypto';
+import { verifiedDevice } from '$utils/matrix-crypto';
import { useAlive } from './useAlive';
-import { fulfilledPromiseSettledResult } from '../utils/common';
+import { fulfilledPromiseSettledResult } from '$utils/common';
import { useMatrixClient } from './useMatrixClient';
import { useDeviceListChange } from './useDeviceList';
diff --git a/src/app/hooks/useFileDrop.ts b/src/app/hooks/useFileDrop.ts
index bead203f..7922c336 100644
--- a/src/app/hooks/useFileDrop.ts
+++ b/src/app/hooks/useFileDrop.ts
@@ -1,5 +1,5 @@
import { useCallback, DragEventHandler, RefObject, useState, useEffect, useRef } from 'react';
-import { getDataTransferFiles } from '../utils/dom';
+import { getDataTransferFiles } from '$utils/dom';
export const useFileDropHandler = (onDrop: (file: File[]) => void): DragEventHandler =>
useCallback(
diff --git a/src/app/hooks/useFilePasteHandler.ts b/src/app/hooks/useFilePasteHandler.ts
index 0f63b750..253ad9b3 100644
--- a/src/app/hooks/useFilePasteHandler.ts
+++ b/src/app/hooks/useFilePasteHandler.ts
@@ -1,5 +1,5 @@
import { useCallback, ClipboardEventHandler } from 'react';
-import { getDataTransferFiles } from '../utils/dom';
+import { getDataTransferFiles } from '$utils/dom';
export const useFilePasteHandler = (onPaste: (file: File[]) => void): ClipboardEventHandler =>
useCallback(
diff --git a/src/app/hooks/useFilePicker.ts b/src/app/hooks/useFilePicker.ts
index e772d660..ccdd10ed 100644
--- a/src/app/hooks/useFilePicker.ts
+++ b/src/app/hooks/useFilePicker.ts
@@ -1,5 +1,5 @@
import { useCallback } from 'react';
-import { selectFile } from '../utils/dom';
+import { selectFile } from '$utils/dom';
export const useFilePicker = (
onSelect: (file: M extends true ? File[] : File) => void,
diff --git a/src/app/hooks/useGetRoom.ts b/src/app/hooks/useGetRoom.ts
index 758ef6f3..6ab37b79 100644
--- a/src/app/hooks/useGetRoom.ts
+++ b/src/app/hooks/useGetRoom.ts
@@ -1,7 +1,7 @@
import { Room } from '$types/matrix-sdk';
import { useAtomValue } from 'jotai';
import { useCallback, useMemo } from 'react';
-import { allRoomsAtom } from '../state/room-list/roomList';
+import { allRoomsAtom } from '$state/room-list/roomList';
import { useMatrixClient } from './useMatrixClient';
export const useAllJoinedRoomsSet = () => {
diff --git a/src/app/hooks/useImagePackRooms.ts b/src/app/hooks/useImagePackRooms.ts
index 711d7bd7..b2163a72 100644
--- a/src/app/hooks/useImagePackRooms.ts
+++ b/src/app/hooks/useImagePackRooms.ts
@@ -1,6 +1,6 @@
import { Room } from '$types/matrix-sdk';
import { useMemo } from 'react';
-import { getAllParents } from '../utils/room';
+import { getAllParents } from '$utils/room';
import { useMatrixClient } from './useMatrixClient';
export const useImagePackRooms = (
diff --git a/src/app/hooks/useImagePacks.ts b/src/app/hooks/useImagePacks.ts
index 28d7abe6..68bfbf52 100644
--- a/src/app/hooks/useImagePacks.ts
+++ b/src/app/hooks/useImagePacks.ts
@@ -9,7 +9,7 @@ import {
getUserImagePack,
ImagePack,
ImageUsage,
-} from '../plugins/custom-emoji';
+} from '$plugins/custom-emoji';
import { useMatrixClient } from './useMatrixClient';
import { useAccountDataCallback } from './useAccountDataCallback';
import { useStateEventCallback } from './useStateEventCallback';
diff --git a/src/app/hooks/useJoinedRoomId.ts b/src/app/hooks/useJoinedRoomId.ts
index 857defa8..96085031 100644
--- a/src/app/hooks/useJoinedRoomId.ts
+++ b/src/app/hooks/useJoinedRoomId.ts
@@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { useMatrixClient } from './useMatrixClient';
-import { getCanonicalAliasRoomId, isRoomAlias } from '../utils/matrix';
+import { getCanonicalAliasRoomId, isRoomAlias } from '$utils/matrix';
export const useJoinedRoomId = (allRooms: string[], roomIdOrAlias: string): string | undefined => {
const mx = useMatrixClient();
diff --git a/src/app/hooks/useLocalRoomSummary.ts b/src/app/hooks/useLocalRoomSummary.ts
index 2c6f0257..043d09f7 100644
--- a/src/app/hooks/useLocalRoomSummary.ts
+++ b/src/app/hooks/useLocalRoomSummary.ts
@@ -1,6 +1,6 @@
import { GuestAccess, HistoryVisibility, JoinRule, Room } from '$types/matrix-sdk';
import { StateEvent } from '$types/matrix/room';
-import { getStateEvent } from '../utils/room';
+import { getStateEvent } from '$utils/room';
export type LocalRoomSummary = {
roomId: string;
diff --git a/src/app/hooks/useMemberEventParser.tsx b/src/app/hooks/useMemberEventParser.tsx
index 81887806..05d5cc40 100644
--- a/src/app/hooks/useMemberEventParser.tsx
+++ b/src/app/hooks/useMemberEventParser.tsx
@@ -2,8 +2,8 @@ import { ReactNode } from 'react';
import { IconSrc, Icons } from 'folds';
import { MatrixEvent } from '$types/matrix-sdk';
import { IMemberContent, Membership } from '$types/matrix/room';
-import { getMxIdLocalPart } from '../utils/matrix';
-import { isMembershipChanged } from '../utils/room';
+import { getMxIdLocalPart } from '$utils/matrix';
+import { isMembershipChanged } from '$utils/room';
export type ParsedResult = {
icon: IconSrc;
diff --git a/src/app/hooks/useMemberPowerTag.ts b/src/app/hooks/useMemberPowerTag.ts
index 6d13cae2..f8c862c0 100644
--- a/src/app/hooks/useMemberPowerTag.ts
+++ b/src/app/hooks/useMemberPowerTag.ts
@@ -5,7 +5,7 @@ import { getPowerLevelTag, PowerLevelTags, usePowerLevelTags } from './usePowerL
import { IPowerLevels, readPowerLevel } from './usePowerLevels';
import { useRoomCreatorsTag } from './useRoomCreatorsTag';
import { ThemeKind } from './useTheme';
-import { accessibleColor } from '../plugins/color';
+import { accessibleColor } from '$plugins/color';
export type GetMemberPowerTag = (userId: string) => MemberPowerTag;
diff --git a/src/app/hooks/useMentionClickHandler.ts b/src/app/hooks/useMentionClickHandler.ts
index a431d5a2..25d7a828 100644
--- a/src/app/hooks/useMentionClickHandler.ts
+++ b/src/app/hooks/useMentionClickHandler.ts
@@ -2,10 +2,10 @@ import { ReactEventHandler, useCallback } from 'react';
import { useNavigate } from 'react-router-dom';
import { useRoomNavigate } from './useRoomNavigate';
import { useMatrixClient } from './useMatrixClient';
-import { isRoomId, isUserId } from '../utils/matrix';
-import { getHomeRoomPath, withSearchParam } from '../pages/pathUtils';
-import { RoomSearchParams } from '../pages/paths';
-import { useOpenUserRoomProfile } from '../state/hooks/userRoomProfile';
+import { isRoomId, isUserId } from '$utils/matrix';
+import { getHomeRoomPath, withSearchParam } from '$pages/pathUtils';
+import { RoomSearchParams } from '$pages/paths';
+import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
import { useSpaceOptionally } from './useSpace';
export const useMentionClickHandler = (roomId: string): ReactEventHandler => {
diff --git a/src/app/hooks/useMessageLayout.ts b/src/app/hooks/useMessageLayout.ts
index 06fb9a5d..cf81aafb 100644
--- a/src/app/hooks/useMessageLayout.ts
+++ b/src/app/hooks/useMessageLayout.ts
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { MessageLayout } from '../state/settings';
+import { MessageLayout } from '$state/settings';
export type MessageLayoutItem = {
name: string;
diff --git a/src/app/hooks/useMessageSpacing.ts b/src/app/hooks/useMessageSpacing.ts
index 62325b1e..aab6cb53 100644
--- a/src/app/hooks/useMessageSpacing.ts
+++ b/src/app/hooks/useMessageSpacing.ts
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { MessageSpacing } from '../state/settings';
+import { MessageSpacing } from '$state/settings';
export type MessageSpacingItem = {
name: string;
diff --git a/src/app/hooks/useNavToActivePathMapper.ts b/src/app/hooks/useNavToActivePathMapper.ts
index d3cec08e..4d155fce 100644
--- a/src/app/hooks/useNavToActivePathMapper.ts
+++ b/src/app/hooks/useNavToActivePathMapper.ts
@@ -1,7 +1,7 @@
import { useEffect } from 'react';
import { useSetAtom } from 'jotai';
import { useLocation } from 'react-router-dom';
-import { useNavToActivePathAtom } from '../state/hooks/navToActivePath';
+import { useNavToActivePathAtom } from '$state/hooks/navToActivePath';
export const useNavToActivePathMapper = (navId: string) => {
const location = useLocation();
diff --git a/src/app/hooks/useNickname.ts b/src/app/hooks/useNickname.ts
index 968cd17b..999a668d 100644
--- a/src/app/hooks/useNickname.ts
+++ b/src/app/hooks/useNickname.ts
@@ -2,7 +2,7 @@ import { useAtomValue, useSetAtom } from 'jotai';
import { useCallback, useEffect } from 'react';
import { MatrixClient } from '$types/matrix-sdk';
import { AccountDataEvent } from '$types/matrix/accountData';
-import { nicknamesAtom, setNicknameAtom } from '../state/nicknames';
+import { nicknamesAtom, setNicknameAtom } from '$state/nicknames';
import { useAccountDataCallback } from './useAccountDataCallback';
import { useMatrixClient } from './useMatrixClient';
diff --git a/src/app/hooks/useNotificationJumper.ts b/src/app/hooks/useNotificationJumper.ts
index f5e0707a..da35a81a 100644
--- a/src/app/hooks/useNotificationJumper.ts
+++ b/src/app/hooks/useNotificationJumper.ts
@@ -1,11 +1,11 @@
import { useCallback, useEffect } from 'react';
import { useAtom } from 'jotai';
import { SyncState, ClientEvent } from '$types/matrix-sdk';
-import { pendingNotificationAtom } from '../state/sessions';
+import { pendingNotificationAtom } from '$state/sessions';
import { useSyncState } from './useSyncState';
import { useMatrixClient } from './useMatrixClient';
import { useRoomNavigate } from './useRoomNavigate';
-import { createLogger } from '../utils/debug';
+import { createLogger } from '$utils/debug';
export function NotificationJumper() {
const [pending, setPending] = useAtom(pendingNotificationAtom);
diff --git a/src/app/hooks/usePathWithOrigin.ts b/src/app/hooks/usePathWithOrigin.ts
index 4430d06c..1565364b 100644
--- a/src/app/hooks/usePathWithOrigin.ts
+++ b/src/app/hooks/usePathWithOrigin.ts
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
import { useClientConfig } from './useClientConfig';
-import { trimLeadingSlash, trimSlash, trimTrailingSlash } from '../utils/common';
+import { trimLeadingSlash, trimSlash, trimTrailingSlash } from '$utils/common';
export const usePathWithOrigin = (path: string): string => {
const { hashRouter } = useClientConfig();
diff --git a/src/app/hooks/usePowerLevels.ts b/src/app/hooks/usePowerLevels.ts
index 11c8cf98..79fa8fc3 100644
--- a/src/app/hooks/usePowerLevels.ts
+++ b/src/app/hooks/usePowerLevels.ts
@@ -5,7 +5,7 @@ import { StateEvent } from '$types/matrix/room';
import { useStateEvent } from './useStateEvent';
import { useStateEventCallback } from './useStateEventCallback';
import { useMatrixClient } from './useMatrixClient';
-import { getStateEvent } from '../utils/room';
+import { getStateEvent } from '$utils/room';
export type PowerLevelActions = 'invite' | 'redact' | 'kick' | 'ban' | 'historical';
export type PowerLevelNotificationsAction = 'room';
diff --git a/src/app/hooks/useRecentEmoji.ts b/src/app/hooks/useRecentEmoji.ts
index c7f9fa5c..09c35679 100644
--- a/src/app/hooks/useRecentEmoji.ts
+++ b/src/app/hooks/useRecentEmoji.ts
@@ -1,8 +1,8 @@
import { useEffect, useState } from 'react';
import { ClientEvent, MatrixClient, MatrixEvent } from '$types/matrix-sdk';
import { AccountDataEvent } from '$types/matrix/accountData';
-import { getRecentEmojis } from '../plugins/recent-emoji';
-import { IEmoji } from '../plugins/emoji';
+import { getRecentEmojis } from '$plugins/recent-emoji';
+import { IEmoji } from '$plugins/emoji';
export const useRecentEmoji = (mx: MatrixClient, limit?: number): IEmoji[] => {
const [recentEmoji, setRecentEmoji] = useState(() => getRecentEmojis(mx, limit));
diff --git a/src/app/hooks/useRestoreBackupOnVerification.ts b/src/app/hooks/useRestoreBackupOnVerification.ts
index 74497b0a..8a8cf93d 100644
--- a/src/app/hooks/useRestoreBackupOnVerification.ts
+++ b/src/app/hooks/useRestoreBackupOnVerification.ts
@@ -1,6 +1,6 @@
import { useSetAtom } from 'jotai';
import { useCallback } from 'react';
-import { backupRestoreProgressAtom } from '../state/backupRestore';
+import { backupRestoreProgressAtom } from '$state/backupRestore';
import { useMatrixClient } from './useMatrixClient';
import { useKeyBackupDecryptionKeyCached } from './useKeyBackup';
diff --git a/src/app/hooks/useRoomAliases.ts b/src/app/hooks/useRoomAliases.ts
index a497465e..fb51b375 100644
--- a/src/app/hooks/useRoomAliases.ts
+++ b/src/app/hooks/useRoomAliases.ts
@@ -5,7 +5,7 @@ import { AsyncState, useAsyncCallback } from './useAsyncCallback';
import { useMatrixClient } from './useMatrixClient';
import { useAlive } from './useAlive';
import { useStateEvent } from './useStateEvent';
-import { getStateEvent } from '../utils/room';
+import { getStateEvent } from '$utils/room';
export const usePublishedAliases = (room: Room): [string | undefined, string[]] => {
const aliasContent = useStateEvent(
diff --git a/src/app/hooks/useRoomCreators.ts b/src/app/hooks/useRoomCreators.ts
index 4c31bc17..1ee0740c 100644
--- a/src/app/hooks/useRoomCreators.ts
+++ b/src/app/hooks/useRoomCreators.ts
@@ -2,8 +2,8 @@ import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
import { useMemo } from 'react';
import { IRoomCreateContent, StateEvent } from '$types/matrix/room';
import { useStateEvent } from './useStateEvent';
-import { creatorsSupported } from '../utils/matrix';
-import { getStateEvent } from '../utils/room';
+import { creatorsSupported } from '$utils/matrix';
+import { getStateEvent } from '$utils/room';
export const getRoomCreators = (createEvent: MatrixEvent): Set => {
const createContent = createEvent.getContent();
diff --git a/src/app/hooks/useRoomLatestRenderedEvent.ts b/src/app/hooks/useRoomLatestRenderedEvent.ts
index 792619cd..07b2a28d 100644
--- a/src/app/hooks/useRoomLatestRenderedEvent.ts
+++ b/src/app/hooks/useRoomLatestRenderedEvent.ts
@@ -2,9 +2,9 @@
import { MatrixEvent, Room, RoomEvent, RoomEventHandlerMap } from '$types/matrix-sdk';
import { useEffect, useState } from 'react';
import { MessageEvent, StateEvent } from '$types/matrix/room';
-import { settingsAtom } from '../state/settings';
-import { useSetting } from '../state/hooks/settings';
-import { isMembershipChanged, reactionOrEditEvent } from '../utils/room';
+import { settingsAtom } from '$state/settings';
+import { useSetting } from '$state/hooks/settings';
+import { isMembershipChanged, reactionOrEditEvent } from '$utils/room';
export const useRoomLatestRenderedEvent = (room: Room) => {
const [hideMembershipEvents] = useSetting(settingsAtom, 'hideMembershipEvents');
diff --git a/src/app/hooks/useRoomNavigate.ts b/src/app/hooks/useRoomNavigate.ts
index b2d7a91a..8cc6344f 100644
--- a/src/app/hooks/useRoomNavigate.ts
+++ b/src/app/hooks/useRoomNavigate.ts
@@ -1,20 +1,20 @@
import { useCallback } from 'react';
import { NavigateOptions, useNavigate } from 'react-router-dom';
import { useAtomValue } from 'jotai';
-import { getCanonicalAliasOrRoomId } from '../utils/matrix';
+import { getCanonicalAliasOrRoomId } from '$utils/matrix';
import {
getDirectRoomPath,
getHomeRoomPath,
getSpacePath,
getSpaceRoomPath,
-} from '../pages/pathUtils';
+} from '$pages/pathUtils';
import { useMatrixClient } from './useMatrixClient';
-import { getOrphanParents, guessPerfectParent } from '../utils/room';
-import { roomToParentsAtom } from '../state/room/roomToParents';
-import { mDirectAtom } from '../state/mDirectList';
+import { getOrphanParents, guessPerfectParent } from '$utils/room';
+import { roomToParentsAtom } from '$state/room/roomToParents';
+import { mDirectAtom } from '$state/mDirectList';
import { useSelectedSpace } from './router/useSelectedSpace';
-import { settingsAtom } from '../state/settings';
-import { useSetting } from '../state/hooks/settings';
+import { settingsAtom } from '$state/settings';
+import { useSetting } from '$state/hooks/settings';
export const useRoomNavigate = () => {
const navigate = useNavigate();
diff --git a/src/app/hooks/useRoomTypingMembers.ts b/src/app/hooks/useRoomTypingMembers.ts
index f526cbf1..5d06bade 100644
--- a/src/app/hooks/useRoomTypingMembers.ts
+++ b/src/app/hooks/useRoomTypingMembers.ts
@@ -5,7 +5,7 @@ import {
IRoomIdToTypingMembers,
TypingReceipt,
roomIdToTypingMembersAtom,
-} from '../state/typingMembers';
+} from '$state/typingMembers';
const typingReceiptEqual = (a: TypingReceipt, b: TypingReceipt): boolean =>
a.userId === b.userId && a.ts === b.ts;
diff --git a/src/app/hooks/useRoomWidgets.ts b/src/app/hooks/useRoomWidgets.ts
index c365fb15..857da6aa 100644
--- a/src/app/hooks/useRoomWidgets.ts
+++ b/src/app/hooks/useRoomWidgets.ts
@@ -4,7 +4,7 @@ import { IWidget } from 'matrix-widget-api';
import { StateEvent } from '$types/matrix/room';
import { useStateEventCallback } from './useStateEventCallback';
import { useForceUpdate } from './useForceUpdate';
-import { getStateEvents } from '../utils/room';
+import { getStateEvents } from '$utils/room';
export interface RoomWidget extends IWidget {
eventId?: string;
diff --git a/src/app/hooks/useRoomsNotificationPreferences.ts b/src/app/hooks/useRoomsNotificationPreferences.ts
index f56dafe1..cba04e61 100644
--- a/src/app/hooks/useRoomsNotificationPreferences.ts
+++ b/src/app/hooks/useRoomsNotificationPreferences.ts
@@ -3,7 +3,7 @@ import { ConditionKind, IPushRules, MatrixClient, PushRuleKind } from '$types/ma
import { Icons, IconSrc } from 'folds';
import { AccountDataEvent } from '$types/matrix/accountData';
import { useAccountData } from './useAccountData';
-import { isRoomId } from '../utils/matrix';
+import { isRoomId } from '$utils/matrix';
import {
getNotificationMode,
getNotificationModeActions,
diff --git a/src/app/hooks/useSessionProfiles.ts b/src/app/hooks/useSessionProfiles.ts
index c98d0543..2cb03c35 100644
--- a/src/app/hooks/useSessionProfiles.ts
+++ b/src/app/hooks/useSessionProfiles.ts
@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from 'react';
-import { Session } from '../state/sessions';
+import { Session } from '$state/sessions';
export type SessionProfile = {
displayName?: string;
diff --git a/src/app/hooks/useSidebarItems.ts b/src/app/hooks/useSidebarItems.ts
index c0d50076..c3e525c4 100644
--- a/src/app/hooks/useSidebarItems.ts
+++ b/src/app/hooks/useSidebarItems.ts
@@ -3,7 +3,7 @@ import { MatrixClient } from '$types/matrix-sdk';
import { AccountDataEvent } from '$types/matrix/accountData';
import { Membership } from '$types/matrix/room';
import { useMatrixClient } from './useMatrixClient';
-import { getAccountData, isSpace } from '../utils/room';
+import { getAccountData, isSpace } from '$utils/room';
import { useAccountDataCallback } from './useAccountDataCallback';
export type ISidebarFolder = {
diff --git a/src/app/hooks/useSpaceHierarchy.ts b/src/app/hooks/useSpaceHierarchy.ts
index e21120fc..793bd70f 100644
--- a/src/app/hooks/useSpaceHierarchy.ts
+++ b/src/app/hooks/useSpaceHierarchy.ts
@@ -4,10 +4,10 @@ import { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { QueryFunction, useInfiniteQuery } from '@tanstack/react-query';
import { MSpaceChildContent, StateEvent } from '$types/matrix/room';
import { useMatrixClient } from './useMatrixClient';
-import { roomToParentsAtom } from '../state/room/roomToParents';
-import { getAllParents, getStateEvents, isValidChild } from '../utils/room';
-import { isRoomId } from '../utils/matrix';
-import { SortFunc, byOrderKey, byTsOldToNew, factoryRoomIdByActivity } from '../utils/sort';
+import { roomToParentsAtom } from '$state/room/roomToParents';
+import { getAllParents, getStateEvents, isValidChild } from '$utils/room';
+import { isRoomId } from '$utils/matrix';
+import { SortFunc, byOrderKey, byTsOldToNew, factoryRoomIdByActivity } from '$utils/sort';
import { useStateEventCallback } from './useStateEventCallback';
import { ErrorCode } from '../cs-errorcode';
diff --git a/src/app/hooks/useStateEvent.ts b/src/app/hooks/useStateEvent.ts
index 07f51a14..10afec0b 100644
--- a/src/app/hooks/useStateEvent.ts
+++ b/src/app/hooks/useStateEvent.ts
@@ -3,7 +3,7 @@ import { useCallback, useMemo } from 'react';
import { StateEvent } from '$types/matrix/room';
import { useStateEventCallback } from './useStateEventCallback';
import { useForceUpdate } from './useForceUpdate';
-import { getStateEvent } from '../utils/room';
+import { getStateEvent } from '$utils/room';
export const useStateEvent = (room: Room, eventType: StateEvent, stateKey = '') => {
const [updateCount, forceUpdate] = useForceUpdate();
diff --git a/src/app/hooks/useTextAreaCodeEditor.ts b/src/app/hooks/useTextAreaCodeEditor.ts
index 34c12f28..5c95a191 100644
--- a/src/app/hooks/useTextAreaCodeEditor.ts
+++ b/src/app/hooks/useTextAreaCodeEditor.ts
@@ -1,8 +1,8 @@
import { useMemo, useCallback, KeyboardEventHandler, MutableRefObject } from 'react';
import { isKeyHotkey } from 'is-hotkey';
-import { TextArea, Intent, TextAreaOperations, Cursor } from '../plugins/text-area';
+import { TextArea, Intent, TextAreaOperations, Cursor } from '$plugins/text-area';
import { useTextAreaIntentHandler } from './useTextAreaIntent';
-import { GetTarget } from '../plugins/text-area/type';
+import { GetTarget } from '$plugins/text-area/type';
export const useTextAreaCodeEditor = (
textAreaRef: MutableRefObject,
diff --git a/src/app/hooks/useTextAreaIntent.ts b/src/app/hooks/useTextAreaIntent.ts
index 113316ec..e3e35514 100644
--- a/src/app/hooks/useTextAreaIntent.ts
+++ b/src/app/hooks/useTextAreaIntent.ts
@@ -1,6 +1,6 @@
import { isKeyHotkey } from 'is-hotkey';
import { KeyboardEventHandler, useCallback } from 'react';
-import { Cursor, Intent, Operations, TextArea } from '../plugins/text-area';
+import { Cursor, Intent, Operations, TextArea } from '$plugins/text-area';
export const useTextAreaIntentHandler = (
textArea: TextArea,
diff --git a/src/app/hooks/useTheme.ts b/src/app/hooks/useTheme.ts
index e1020adf..fbfdc68f 100644
--- a/src/app/hooks/useTheme.ts
+++ b/src/app/hooks/useTheme.ts
@@ -9,8 +9,8 @@ import {
silverTheme,
gruvdarkTheme,
} from '../../colors.css';
-import { settingsAtom } from '../state/settings';
-import { useSetting } from '../state/hooks/settings';
+import { settingsAtom } from '$state/settings';
+import { useSetting } from '$state/hooks/settings';
export enum ThemeKind {
Light = 'light',
diff --git a/src/app/hooks/useTypingStatusUpdater.ts b/src/app/hooks/useTypingStatusUpdater.ts
index 8beb237d..9bbda090 100644
--- a/src/app/hooks/useTypingStatusUpdater.ts
+++ b/src/app/hooks/useTypingStatusUpdater.ts
@@ -1,6 +1,6 @@
import { MatrixClient } from '$types/matrix-sdk';
import { useMemo, useRef } from 'react';
-import { TYPING_TIMEOUT_MS } from '../state/typingMembers';
+import { TYPING_TIMEOUT_MS } from '$state/typingMembers';
type TypingStatusUpdater = (typing: boolean) => void;
diff --git a/src/app/hooks/useUIAFlows.ts b/src/app/hooks/useUIAFlows.ts
index 8fae0fa0..f7e04f2e 100644
--- a/src/app/hooks/useUIAFlows.ts
+++ b/src/app/hooks/useUIAFlows.ts
@@ -7,7 +7,7 @@ import {
getUIAErrorCode,
getUIAParams,
getUIASession,
-} from '../utils/matrix-uia';
+} from '$utils/matrix-uia';
export const SUPPORTED_FLOW_TYPES = [
AuthType.Dummy,
diff --git a/src/app/hooks/useUserProfile.ts b/src/app/hooks/useUserProfile.ts
index bcecc16c..4afab6a4 100644
--- a/src/app/hooks/useUserProfile.ts
+++ b/src/app/hooks/useUserProfile.ts
@@ -5,9 +5,9 @@ import { EventTimeline, Room } from '$types/matrix-sdk';
import { StateEvent } from '$types/matrix/room';
import colorMXID from '$utils/colorMXID';
import { useMatrixClient } from './useMatrixClient';
-import { profilesCacheAtom } from '../state/userRoomProfile';
-import { useSetting } from '../state/hooks/settings';
-import { settingsAtom } from '../state/settings';
+import { profilesCacheAtom } from '$state/userRoomProfile';
+import { useSetting } from '$state/hooks/settings';
+import { settingsAtom } from '$state/settings';
const inFlightProfiles = new Map>();
diff --git a/src/app/hooks/useVirtualPaginator.ts b/src/app/hooks/useVirtualPaginator.ts
index 14aa105c..aedef122 100644
--- a/src/app/hooks/useVirtualPaginator.ts
+++ b/src/app/hooks/useVirtualPaginator.ts
@@ -5,7 +5,7 @@ import {
getScrollInfo,
isInScrollView,
isIntersectingScrollView,
-} from '../utils/dom';
+} from '$utils/dom';
const PAGINATOR_ANCHOR_ATTR = 'data-paginator-anchor';
diff --git a/src/app/pages/App.tsx b/src/app/pages/App.tsx
index 09bccf1d..6263723f 100644
--- a/src/app/pages/App.tsx
+++ b/src/app/pages/App.tsx
@@ -4,13 +4,13 @@ import { RouterProvider } from 'react-router-dom';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
-import { ClientConfigLoader } from '../components/ClientConfigLoader';
-import { ClientConfigProvider } from '../hooks/useClientConfig';
+import { ClientConfigLoader } from '$components/ClientConfigLoader';
+import { ClientConfigProvider } from '$hooks/useClientConfig';
import { ConfigConfigError, ConfigConfigLoading } from './ConfigConfig';
import { FeatureCheck } from './FeatureCheck';
import { createRouter } from './Router';
-import { ScreenSizeProvider, useScreenSize } from '../hooks/useScreenSize';
-import { useCompositionEndTracking } from '../hooks/useComposingCheck';
+import { ScreenSizeProvider, useScreenSize } from '$hooks/useScreenSize';
+import { useCompositionEndTracking } from '$hooks/useComposingCheck';
const queryClient = new QueryClient();
diff --git a/src/app/pages/ConfigConfig.tsx b/src/app/pages/ConfigConfig.tsx
index b002ebad..2c2df830 100644
--- a/src/app/pages/ConfigConfig.tsx
+++ b/src/app/pages/ConfigConfig.tsx
@@ -1,5 +1,5 @@
import { Box, Button, Dialog, Spinner, Text, color, config } from 'folds';
-import { SplashScreen } from '../components/splash-screen';
+import { SplashScreen } from '$components/splash-screen';
export function ConfigConfigLoading() {
return (
diff --git a/src/app/pages/FeatureCheck.tsx b/src/app/pages/FeatureCheck.tsx
index 8fea23d6..df408d61 100644
--- a/src/app/pages/FeatureCheck.tsx
+++ b/src/app/pages/FeatureCheck.tsx
@@ -1,8 +1,8 @@
import { ReactNode, useEffect } from 'react';
import { Box, Dialog, Text, config } from 'folds';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { checkIndexedDBSupport } from '../utils/featureCheck';
-import { SplashScreen } from '../components/splash-screen';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { checkIndexedDBSupport } from '$utils/featureCheck';
+import { SplashScreen } from '$components/splash-screen';
export function FeatureCheck({ children }: { children: ReactNode }) {
const [idbSupportState, checkIDBSupport] = useAsyncCallback(checkIndexedDBSupport);
diff --git a/src/app/pages/MobileFriendly.tsx b/src/app/pages/MobileFriendly.tsx
index ca947ac6..2fe174fe 100644
--- a/src/app/pages/MobileFriendly.tsx
+++ b/src/app/pages/MobileFriendly.tsx
@@ -1,6 +1,6 @@
import { ReactNode } from 'react';
import { useMatch } from 'react-router-dom';
-import { ScreenSize, useScreenSizeContext } from '../hooks/useScreenSize';
+import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { DIRECT_PATH, EXPLORE_PATH, HOME_PATH, INBOX_PATH, SPACE_PATH } from './paths';
type MobileFriendlyClientNavProps = {
diff --git a/src/app/pages/Router.tsx b/src/app/pages/Router.tsx
index 1a65fe05..0d79b8e0 100644
--- a/src/app/pages/Router.tsx
+++ b/src/app/pages/Router.tsx
@@ -7,7 +7,7 @@ import {
redirect,
} from 'react-router-dom';
-import { ClientConfig } from '../hooks/useClientConfig';
+import { ClientConfig } from '$hooks/useClientConfig';
import { AuthLayout, Login, Register, ResetPassword } from './auth';
import {
DIRECT_PATH,
@@ -45,32 +45,32 @@ import { RouteSpaceProvider, Space, SpaceRouteRoomProvider, SpaceSearch } from '
import { Explore, FeaturedRooms, PublicRooms } from './client/explore';
import { Notifications, Inbox, Invites } from './client/inbox';
import { setAfterLoginRedirectPath } from './afterLoginRedirectPath';
-import { Room } from '../features/room';
-import { Lobby } from '../features/lobby';
+import { Room } from '$features/room';
+import { Lobby } from '$features/lobby';
import { WelcomePage } from './client/WelcomePage';
import { SidebarNav } from './client/SidebarNav';
-import { PageRoot } from '../components/page';
-import { ScreenSize } from '../hooks/useScreenSize';
+import { PageRoot } from '$components/page';
+import { ScreenSize } from '$hooks/useScreenSize';
import { MobileFriendlyPageNav, MobileFriendlyClientNav } from './MobileFriendly';
import { ClientInitStorageAtom } from './client/ClientInitStorageAtom';
import { ClientNonUIFeatures } from './client/ClientNonUIFeatures';
import { AuthRouteThemeManager, UnAuthRouteThemeManager } from './ThemeManager';
-import { ReceiveSelfDeviceVerification } from '../components/DeviceVerification';
-import { AutoRestoreBackupOnVerification } from '../components/BackupRestore';
-import { RoomSettingsRenderer } from '../features/room-settings';
+import { ReceiveSelfDeviceVerification } from '$components/DeviceVerification';
+import { AutoRestoreBackupOnVerification } from '$components/BackupRestore';
+import { RoomSettingsRenderer } from '$features/room-settings';
import { ClientRoomsNotificationPreferences } from './client/ClientRoomsNotificationPreferences';
-import { SpaceSettingsRenderer } from '../features/space-settings';
-import { UserRoomProfileRenderer } from '../components/UserRoomProfileRenderer';
-import { CreateRoomModalRenderer } from '../features/create-room';
+import { SpaceSettingsRenderer } from '$features/space-settings';
+import { UserRoomProfileRenderer } from '$components/UserRoomProfileRenderer';
+import { CreateRoomModalRenderer } from '$features/create-room';
import { HomeCreateRoom } from './client/home/CreateRoom';
import { Create } from './client/create';
-import { CreateSpaceModalRenderer } from '../features/create-space';
-import { SearchModalRenderer } from '../features/search';
-import { getFallbackSession, MATRIX_SESSIONS_KEY, Sessions } from '../state/sessions';
-import { getLocalStorageItem } from '../state/utils/atomWithLocalStorage';
+import { CreateSpaceModalRenderer } from '$features/create-space';
+import { SearchModalRenderer } from '$features/search';
+import { getFallbackSession, MATRIX_SESSIONS_KEY, Sessions } from '$state/sessions';
+import { getLocalStorageItem } from '$state/utils/atomWithLocalStorage';
import { CallProvider } from './client/call/CallProvider';
import { PersistentCallContainer } from './client/call/PersistentCallContainer';
-import { NotificationJumper } from '../hooks/useNotificationJumper';
+import { NotificationJumper } from '$hooks/useNotificationJumper';
/**
* Returns true if there is at least one stored session.
diff --git a/src/app/pages/ThemeManager.tsx b/src/app/pages/ThemeManager.tsx
index f86cacc1..dea860f9 100644
--- a/src/app/pages/ThemeManager.tsx
+++ b/src/app/pages/ThemeManager.tsx
@@ -7,9 +7,9 @@ import {
ThemeKind,
useActiveTheme,
useSystemThemeKind,
-} from '../hooks/useTheme';
-import { useSetting } from '../state/hooks/settings';
-import { settingsAtom } from '../state/settings';
+} from '$hooks/useTheme';
+import { useSetting } from '$state/hooks/settings';
+import { settingsAtom } from '$state/settings';
export function UnAuthRouteThemeManager() {
const systemThemeKind = useSystemThemeKind();
diff --git a/src/app/pages/auth/AuthLayout.tsx b/src/app/pages/auth/AuthLayout.tsx
index a73ee644..387b2e98 100644
--- a/src/app/pages/auth/AuthLayout.tsx
+++ b/src/app/pages/auth/AuthLayout.tsx
@@ -23,7 +23,7 @@ import { AuthFlowsProvider } from '$hooks/useAuthFlows';
import { AuthServerProvider } from '$hooks/useAuthServer';
import { AutoDiscoveryAction, autoDiscovery } from '../../cs-api';
import { ServerPicker } from './ServerPicker';
-import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '../paths';
+import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '$pages/paths';
import * as css from './styles.css';
import { AuthFooter } from './AuthFooter';
diff --git a/src/app/pages/auth/login/Login.tsx b/src/app/pages/auth/login/Login.tsx
index a9cd1c29..cb60dc4b 100644
--- a/src/app/pages/auth/login/Login.tsx
+++ b/src/app/pages/auth/login/Login.tsx
@@ -10,9 +10,9 @@ import { usePathWithOrigin } from '$hooks/usePathWithOrigin';
import { LoginPathSearchParams } from '$pages/paths';
import { useClientConfig } from '$hooks/useClientConfig';
import { PasswordLoginForm } from './PasswordLoginForm';
-import { SSOLogin } from '../SSOLogin';
+import { SSOLogin } from '$pages/auth/SSOLogin';
import { TokenLogin } from './TokenLogin';
-import { OrDivider } from '../OrDivider';
+import { OrDivider } from '$pages/auth/OrDivider';
const getLoginTokenSearchParam = () => {
// when using hasRouter query params in existing route
diff --git a/src/app/pages/auth/login/PasswordLoginForm.tsx b/src/app/pages/auth/login/PasswordLoginForm.tsx
index 08a3f027..bbbb5f35 100644
--- a/src/app/pages/auth/login/PasswordLoginForm.tsx
+++ b/src/app/pages/auth/login/PasswordLoginForm.tsx
@@ -29,7 +29,7 @@ import { useClientConfig } from '$hooks/useClientConfig';
import { PasswordInput } from '$components/password-input';
import { getResetPasswordPath } from '$pages/pathUtils';
import { stopPropagation } from '$utils/keyboard';
-import { FieldError } from '../FiledError';
+import { FieldError } from '$pages/auth/FiledError';
import {
CustomLoginResponse,
LoginError,
diff --git a/src/app/pages/auth/register/PasswordRegisterForm.tsx b/src/app/pages/auth/register/PasswordRegisterForm.tsx
index 896e7318..7dacb7f0 100644
--- a/src/app/pages/auth/register/PasswordRegisterForm.tsx
+++ b/src/app/pages/auth/register/PasswordRegisterForm.tsx
@@ -41,7 +41,7 @@ import { useRegisterEmail } from '$hooks/useRegisterEmail';
import { ConfirmPasswordMatch } from '$components/ConfirmPasswordMatch';
import { UIAFlowOverlay } from '$components/UIAFlowOverlay';
import { RequestEmailTokenCallback, RequestEmailTokenResponse } from '$hooks/types';
-import { FieldError } from '../FiledError';
+import { FieldError } from '$pages/auth/FiledError';
import { RegisterError, RegisterResult, register, useRegisterComplete } from './registerUtil';
export const SUPPORTED_REGISTER_STAGES = [
diff --git a/src/app/pages/auth/register/Register.tsx b/src/app/pages/auth/register/Register.tsx
index f0cf4c17..11bee338 100644
--- a/src/app/pages/auth/register/Register.tsx
+++ b/src/app/pages/auth/register/Register.tsx
@@ -9,8 +9,8 @@ import { SupportedUIAFlowsLoader } from '$components/SupportedUIAFlowsLoader';
import { getLoginPath } from '$pages/pathUtils';
import { usePathWithOrigin } from '$hooks/usePathWithOrigin';
import { RegisterPathSearchParams } from '$pages/paths';
-import { SSOLogin } from '../SSOLogin';
-import { OrDivider } from '../OrDivider';
+import { SSOLogin } from '$pages/auth/SSOLogin';
+import { OrDivider } from '$pages/auth/OrDivider';
import { PasswordRegisterForm, SUPPORTED_REGISTER_STAGES } from './PasswordRegisterForm';
const useRegisterSearchParams = (searchParams: URLSearchParams): RegisterPathSearchParams =>
diff --git a/src/app/pages/auth/reset-password/PasswordResetForm.tsx b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
index 596e5369..a973a393 100644
--- a/src/app/pages/auth/reset-password/PasswordResetForm.tsx
+++ b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
@@ -27,7 +27,7 @@ import { getLoginPath, withSearchParam } from '$pages/pathUtils';
import { LoginPathSearchParams } from '$pages/paths';
import { getUIAError, getUIAErrorCode } from '$utils/matrix-uia';
import { ResetPasswordResult, resetPassword } from './resetPasswordUtil';
-import { FieldError } from '../FiledError';
+import { FieldError } from '$pages/auth/FiledError';
type FormData = {
email: string;
diff --git a/src/app/pages/client/ClientNonUIFeatures.tsx b/src/app/pages/client/ClientNonUIFeatures.tsx
index d6584093..70881a59 100644
--- a/src/app/pages/client/ClientNonUIFeatures.tsx
+++ b/src/app/pages/client/ClientNonUIFeatures.tsx
@@ -28,7 +28,7 @@ import { useInboxNotificationsSelected } from '$hooks/router/useInbox';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { pendingNotificationAtom } from '$state/sessions';
import { BackgroundNotifications } from './BackgroundNotifications';
-import { getInboxInvitesPath } from '../pathUtils';
+import { getInboxInvitesPath } from '$pages/pathUtils';
function SystemEmojiFeature() {
const [twitterEmoji] = useSetting(settingsAtom, 'twitterEmoji');
diff --git a/src/app/pages/client/ClientRoot.tsx b/src/app/pages/client/ClientRoot.tsx
index 950d7198..8d815648 100644
--- a/src/app/pages/client/ClientRoot.tsx
+++ b/src/app/pages/client/ClientRoot.tsx
@@ -38,7 +38,7 @@ import { AuthMetadataProvider } from '$hooks/useAuthMetadata';
import { sessionsAtom, activeSessionIdAtom, Session, SessionsAction } from '$state/sessions';
import { createLogger } from '$utils/debug';
import { useSyncNicknames } from '$hooks/useNickname';
-import { getHomePath } from '../pathUtils';
+import { getHomePath } from '$pages/pathUtils';
import { pushSessionToSW } from '../../../sw-session';
import { SyncStatus } from './SyncStatus';
import { SpecVersions } from './SpecVersions';
diff --git a/src/app/pages/client/sidebar/DirectTab.tsx b/src/app/pages/client/sidebar/DirectTab.tsx
index 79c4b01f..01d7ce3f 100644
--- a/src/app/pages/client/sidebar/DirectTab.tsx
+++ b/src/app/pages/client/sidebar/DirectTab.tsx
@@ -24,7 +24,7 @@ import { markAsRead } from '$utils/notifications';
import { stopPropagation } from '$utils/keyboard';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
-import { useDirectRooms } from '../direct/useDirectRooms';
+import { useDirectRooms } from '$pages/client/direct/useDirectRooms';
type DirectMenuProps = {
requestClose: () => void;
diff --git a/src/app/pages/client/sidebar/HomeTab.tsx b/src/app/pages/client/sidebar/HomeTab.tsx
index 0e5f8eb8..74f7adfa 100644
--- a/src/app/pages/client/sidebar/HomeTab.tsx
+++ b/src/app/pages/client/sidebar/HomeTab.tsx
@@ -25,7 +25,7 @@ import { markAsRead } from '$utils/notifications';
import { stopPropagation } from '$utils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
-import { useHomeRooms } from '../home/useHomeRooms';
+import { useHomeRooms } from '$pages/client/home/useHomeRooms';
type HomeMenuProps = {
requestClose: () => void;
diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx
index 93a7de2d..a774c8fa 100644
--- a/src/app/pages/client/space/Space.tsx
+++ b/src/app/pages/client/space/Space.tsx
@@ -72,7 +72,7 @@ import { mobileOrTablet } from '$utils/user-agent';
import { useNavigate } from 'react-router-dom';
import { lastVisitedRoomIdAtom } from '$state/room/lastRoom';
import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper';
-import { useCallState } from '../call/CallProvider';
+import { useCallState } from '$pages/client/call/CallProvider';
type SpaceMenuProps = {
room: Room;
diff --git a/src/app/pages/pathUtils.ts b/src/app/pages/pathUtils.ts
index 817d21d1..05e92b63 100644
--- a/src/app/pages/pathUtils.ts
+++ b/src/app/pages/pathUtils.ts
@@ -24,8 +24,8 @@ import {
SPACE_SEARCH_PATH,
CREATE_PATH,
} from './paths';
-import { trimLeadingSlash, trimTrailingSlash } from '../utils/common';
-import { HashRouterConfig } from '../hooks/useClientConfig';
+import { trimLeadingSlash, trimTrailingSlash } from '$utils/common';
+import { HashRouterConfig } from '$hooks/useClientConfig';
export const joinPathComponent = (path: Path): string => path.pathname + path.search + path.hash;
diff --git a/src/app/plugins/bad-words.ts b/src/app/plugins/bad-words.ts
index bb6073d8..74fcaddb 100644
--- a/src/app/plugins/bad-words.ts
+++ b/src/app/plugins/bad-words.ts
@@ -1,5 +1,5 @@
import * as badWords from 'badwords-list';
-import { sanitizeForRegex } from '../utils/regex';
+import { sanitizeForRegex } from '$utils/regex';
const additionalBadWords: string[] = ['torture', 't0rture'];
diff --git a/src/app/plugins/color.ts b/src/app/plugins/color.ts
index 47c73170..97b756e3 100644
--- a/src/app/plugins/color.ts
+++ b/src/app/plugins/color.ts
@@ -1,5 +1,5 @@
import chroma from 'chroma-js';
-import { ThemeKind } from '../hooks/useTheme';
+import { ThemeKind } from '$hooks/useTheme';
export const accessibleColor = (themeKind: ThemeKind, color: string): string => {
if (!chroma.valid(color)) return color;
diff --git a/src/app/plugins/markdown/block/parser.ts b/src/app/plugins/markdown/block/parser.ts
index a86ccb0e..b56d3e3b 100644
--- a/src/app/plugins/markdown/block/parser.ts
+++ b/src/app/plugins/markdown/block/parser.ts
@@ -1,4 +1,4 @@
-import { replaceMatch } from '../internal';
+import { replaceMatch } from '$plugins/markdown/internal';
import {
BlockQuoteRule,
CodeBlockRule,
diff --git a/src/app/plugins/markdown/block/runner.ts b/src/app/plugins/markdown/block/runner.ts
index 1dc8d8b8..8e80c95f 100644
--- a/src/app/plugins/markdown/block/runner.ts
+++ b/src/app/plugins/markdown/block/runner.ts
@@ -1,4 +1,4 @@
-import { replaceMatch } from '../internal';
+import { replaceMatch } from '$plugins/markdown/internal';
import { BlockMDParser, BlockMDRule } from './type';
/**
diff --git a/src/app/plugins/markdown/block/type.ts b/src/app/plugins/markdown/block/type.ts
index 0949eb70..9462e1d5 100644
--- a/src/app/plugins/markdown/block/type.ts
+++ b/src/app/plugins/markdown/block/type.ts
@@ -1,4 +1,4 @@
-import { MatchResult, MatchRule } from '../internal';
+import { MatchResult, MatchRule } from '$plugins/markdown/internal';
/**
* Type for a function that parses block-level markdown into HTML.
diff --git a/src/app/plugins/markdown/inline/runner.ts b/src/app/plugins/markdown/inline/runner.ts
index 3a794d25..62aef0e2 100644
--- a/src/app/plugins/markdown/inline/runner.ts
+++ b/src/app/plugins/markdown/inline/runner.ts
@@ -1,4 +1,4 @@
-import { MatchResult, replaceMatch } from '../internal';
+import { MatchResult, replaceMatch } from '$plugins/markdown/internal';
import { InlineMDParser, InlineMDRule } from './type';
/**
diff --git a/src/app/plugins/markdown/inline/type.ts b/src/app/plugins/markdown/inline/type.ts
index a65ad276..9b53d045 100644
--- a/src/app/plugins/markdown/inline/type.ts
+++ b/src/app/plugins/markdown/inline/type.ts
@@ -1,4 +1,4 @@
-import { MatchResult, MatchRule } from '../internal';
+import { MatchResult, MatchRule } from '$plugins/markdown/internal';
/**
* Type for a function that parses inline markdown into HTML.
diff --git a/src/app/plugins/pdfjs-dist.ts b/src/app/plugins/pdfjs-dist.ts
index aad6e362..d23a7bcc 100644
--- a/src/app/plugins/pdfjs-dist.ts
+++ b/src/app/plugins/pdfjs-dist.ts
@@ -1,8 +1,8 @@
import { useCallback } from 'react';
import type * as PdfJsDist from 'pdfjs-dist';
import type { GetViewportParameters } from 'pdfjs-dist/types/src/display/api';
-import { useAsyncCallback } from '../hooks/useAsyncCallback';
-import { trimTrailingSlash } from '../utils/common';
+import { useAsyncCallback } from '$hooks/useAsyncCallback';
+import { trimTrailingSlash } from '$utils/common';
export const usePdfJSLoader = () =>
useAsyncCallback(
diff --git a/src/app/plugins/react-custom-html-parser.tsx b/src/app/plugins/react-custom-html-parser.tsx
index 2d0c54b7..bdbba2bd 100644
--- a/src/app/plugins/react-custom-html-parser.tsx
+++ b/src/app/plugins/react-custom-html-parser.tsx
@@ -21,27 +21,27 @@ import { IntermediateRepresentation, OptFn, Opts as LinkifyOpts } from 'linkifyj
import Linkify from 'linkify-react';
import { ErrorBoundary } from 'react-error-boundary';
import { ChildNode } from 'domhandler';
-import * as css from '../styles/CustomHtml.css';
+import * as css from '$styles/CustomHtml.css';
import {
getCanonicalAliasRoomId,
getMxIdLocalPart,
isRoomAlias,
mxcUrlToHttp,
-} from '../utils/matrix';
-import { getMemberDisplayName } from '../utils/room';
-import { Nicknames } from '../state/nicknames';
-import { EMOJI_PATTERN, sanitizeForRegex, URL_NEG_LB } from '../utils/regex';
+} from '$utils/matrix';
+import { getMemberDisplayName } from '$utils/room';
+import { Nicknames } from '$state/nicknames';
+import { EMOJI_PATTERN, sanitizeForRegex, URL_NEG_LB } from '$utils/regex';
import { getHexcodeForEmoji, getShortcodeFor } from './emoji';
-import { findAndReplace } from '../utils/findAndReplace';
+import { findAndReplace } from '$utils/findAndReplace';
import {
parseMatrixToRoom,
parseMatrixToRoomEvent,
parseMatrixToUser,
testMatrixTo,
} from './matrix-to';
-import { onEnterOrSpace } from '../utils/keyboard';
-import { copyToClipboard } from '../utils/dom';
-import { useTimeoutToggle } from '../hooks/useTimeoutToggle';
+import { onEnterOrSpace } from '$utils/keyboard';
+import { copyToClipboard } from '$utils/dom';
+import { useTimeoutToggle } from '$hooks/useTimeoutToggle';
const ReactPrism = lazy(() => import('./react-prism/ReactPrism'));
diff --git a/src/app/plugins/recent-emoji.ts b/src/app/plugins/recent-emoji.ts
index 8b2080fa..c511159d 100644
--- a/src/app/plugins/recent-emoji.ts
+++ b/src/app/plugins/recent-emoji.ts
@@ -1,6 +1,6 @@
import { MatrixClient } from '$types/matrix-sdk';
import { AccountDataEvent } from '$types/matrix/accountData';
-import { getAccountData } from '../utils/room';
+import { getAccountData } from '$utils/room';
import { IEmoji, emojis } from './emoji';
type EmojiUnicode = string;
diff --git a/src/app/plugins/text-area/mods/Intent.ts b/src/app/plugins/text-area/mods/Intent.ts
index 35212b95..9ad8533d 100644
--- a/src/app/plugins/text-area/mods/Intent.ts
+++ b/src/app/plugins/text-area/mods/Intent.ts
@@ -1,6 +1,6 @@
-import { Cursor } from '../Cursor';
-import { Operations } from '../Operations';
-import { TextArea } from '../TextArea';
+import { Cursor } from '$plugins/text-area/Cursor';
+import { Operations } from '$plugins/text-area/Operations';
+import { TextArea } from '$plugins/text-area/TextArea';
export class Intent {
public readonly textArea: TextArea;
diff --git a/src/app/plugins/utils.ts b/src/app/plugins/utils.ts
index 27d27e7a..fc84b392 100644
--- a/src/app/plugins/utils.ts
+++ b/src/app/plugins/utils.ts
@@ -1,4 +1,4 @@
-import { SearchItemStrGetter } from '../hooks/useAsyncSearch';
+import { SearchItemStrGetter } from '$hooks/useAsyncSearch';
import { PackImageReader } from './custom-emoji';
import { IEmoji } from './emoji';
diff --git a/src/app/plugins/via-servers.ts b/src/app/plugins/via-servers.ts
index cd630a4e..e789e5f8 100644
--- a/src/app/plugins/via-servers.ts
+++ b/src/app/plugins/via-servers.ts
@@ -1,8 +1,8 @@
import { Room } from '$types/matrix-sdk';
import { IRoomCreateContent, StateEvent } from '$types/matrix/room';
-import { IPowerLevels } from '../hooks/usePowerLevels';
-import { creatorsSupported, getMxIdServer } from '../utils/matrix';
-import { getStateEvent } from '../utils/room';
+import { IPowerLevels } from '$hooks/usePowerLevels';
+import { creatorsSupported, getMxIdServer } from '$utils/matrix';
+import { getStateEvent } from '$utils/room';
export const getViaServers = (room: Room): string[] => {
const getHighestPowerUserId = (): string | undefined => {
diff --git a/src/app/state/createRoomModal.ts b/src/app/state/createRoomModal.ts
index f32e7665..16757ec7 100644
--- a/src/app/state/createRoomModal.ts
+++ b/src/app/state/createRoomModal.ts
@@ -1,5 +1,5 @@
import { atom } from 'jotai';
-import { CreateRoomType } from '../components/create-room/types';
+import { CreateRoomType } from '$components/create-room/types';
export type CreateRoomModalState = {
spaceId?: string;
diff --git a/src/app/state/hooks/closedLobbyCategories.ts b/src/app/state/hooks/closedLobbyCategories.ts
index 1545254f..19843b6e 100644
--- a/src/app/state/hooks/closedLobbyCategories.ts
+++ b/src/app/state/hooks/closedLobbyCategories.ts
@@ -1,5 +1,5 @@
import { createContext, useContext } from 'react';
-import { ClosedLobbyCategoriesAtom } from '../closedLobbyCategories';
+import { ClosedLobbyCategoriesAtom } from '$state/closedLobbyCategories';
const ClosedLobbyCategoriesAtomContext = createContext(null);
export const ClosedLobbyCategoriesProvider = ClosedLobbyCategoriesAtomContext.Provider;
diff --git a/src/app/state/hooks/closedNavCategories.ts b/src/app/state/hooks/closedNavCategories.ts
index ed34c1e6..38a962e4 100644
--- a/src/app/state/hooks/closedNavCategories.ts
+++ b/src/app/state/hooks/closedNavCategories.ts
@@ -1,5 +1,5 @@
import { createContext, useContext } from 'react';
-import { ClosedNavCategoriesAtom } from '../closedNavCategories';
+import { ClosedNavCategoriesAtom } from '$state/closedNavCategories';
const ClosedNavCategoriesAtomContext = createContext(null);
export const ClosedNavCategoriesProvider = ClosedNavCategoriesAtomContext.Provider;
diff --git a/src/app/state/hooks/createRoomModal.ts b/src/app/state/hooks/createRoomModal.ts
index c7d2ffac..8c1ec8b7 100644
--- a/src/app/state/hooks/createRoomModal.ts
+++ b/src/app/state/hooks/createRoomModal.ts
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
import { CreateRoomType } from '$components/create-room/types';
-import { createRoomModalAtom, CreateRoomModalState } from '../createRoomModal';
+import { createRoomModalAtom, CreateRoomModalState } from '$state/createRoomModal';
export const useCreateRoomModalState = (): CreateRoomModalState | undefined => {
const data = useAtomValue(createRoomModalAtom);
diff --git a/src/app/state/hooks/createSpaceModal.ts b/src/app/state/hooks/createSpaceModal.ts
index ea7cb47a..4661712d 100644
--- a/src/app/state/hooks/createSpaceModal.ts
+++ b/src/app/state/hooks/createSpaceModal.ts
@@ -1,6 +1,6 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
-import { createSpaceModalAtom, CreateSpaceModalState } from '../createSpaceModal';
+import { createSpaceModalAtom, CreateSpaceModalState } from '$state/createSpaceModal';
export const useCreateSpaceModalState = (): CreateSpaceModalState | undefined => {
const data = useAtomValue(createSpaceModalAtom);
diff --git a/src/app/state/hooks/navToActivePath.ts b/src/app/state/hooks/navToActivePath.ts
index 5f8798f2..41224760 100644
--- a/src/app/state/hooks/navToActivePath.ts
+++ b/src/app/state/hooks/navToActivePath.ts
@@ -1,5 +1,5 @@
import { createContext, useContext } from 'react';
-import { NavToActivePathAtom } from '../navToActivePath';
+import { NavToActivePathAtom } from '$state/navToActivePath';
const NavToActivePathAtomContext = createContext(null);
export const NavToActivePathProvider = NavToActivePathAtomContext.Provider;
diff --git a/src/app/state/hooks/openedSidebarFolder.ts b/src/app/state/hooks/openedSidebarFolder.ts
index 3a165334..6a5e61f9 100644
--- a/src/app/state/hooks/openedSidebarFolder.ts
+++ b/src/app/state/hooks/openedSidebarFolder.ts
@@ -1,5 +1,5 @@
import { createContext, useContext } from 'react';
-import { OpenedSidebarFolderAtom } from '../openedSidebarFolder';
+import { OpenedSidebarFolderAtom } from '$state/openedSidebarFolder';
const OpenedSidebarFolderAtomContext = createContext(null);
export const OpenedSidebarFolderProvider = OpenedSidebarFolderAtomContext.Provider;
diff --git a/src/app/state/hooks/roomList.ts b/src/app/state/hooks/roomList.ts
index d3db6bf1..70890926 100644
--- a/src/app/state/hooks/roomList.ts
+++ b/src/app/state/hooks/roomList.ts
@@ -4,7 +4,7 @@ import { MatrixClient } from '$types/matrix-sdk';
import { useCallback, useMemo } from 'react';
import { getAllParents, isRoom, isSpace, isUnsupportedRoom } from '$utils/room';
import { RoomToParents } from '$types/matrix/room';
-import { compareRoomsEqual } from '../room-list/utils';
+import { compareRoomsEqual } from '$state/room-list/utils';
export type RoomsAtom = Atom;
export type RoomSelector = (roomId: string) => boolean | undefined;
diff --git a/src/app/state/hooks/roomSettings.ts b/src/app/state/hooks/roomSettings.ts
index 4d764916..8a078487 100644
--- a/src/app/state/hooks/roomSettings.ts
+++ b/src/app/state/hooks/roomSettings.ts
@@ -1,6 +1,6 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
-import { roomSettingsAtom, RoomSettingsPage, RoomSettingsState } from '../roomSettings';
+import { roomSettingsAtom, RoomSettingsPage, RoomSettingsState } from '$state/roomSettings';
export const useRoomSettingsState = (): RoomSettingsState | undefined => {
const data = useAtomValue(roomSettingsAtom);
diff --git a/src/app/state/hooks/settings.ts b/src/app/state/hooks/settings.ts
index d90c7664..d28c4833 100644
--- a/src/app/state/hooks/settings.ts
+++ b/src/app/state/hooks/settings.ts
@@ -1,7 +1,7 @@
import { atom, useAtomValue, useSetAtom } from 'jotai';
import { selectAtom } from 'jotai/utils';
import { useMemo } from 'react';
-import { Settings, settingsAtom as sAtom } from '../settings';
+import { Settings, settingsAtom as sAtom } from '$state/settings';
export type SettingSetter =
| Settings[K]
diff --git a/src/app/state/hooks/spaceSettings.ts b/src/app/state/hooks/spaceSettings.ts
index e589d65d..ab3b8da2 100644
--- a/src/app/state/hooks/spaceSettings.ts
+++ b/src/app/state/hooks/spaceSettings.ts
@@ -1,6 +1,6 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
-import { spaceSettingsAtom, SpaceSettingsPage, SpaceSettingsState } from '../spaceSettings';
+import { spaceSettingsAtom, SpaceSettingsPage, SpaceSettingsState } from '$state/spaceSettings';
export const useSpaceSettingsState = (): SpaceSettingsState | undefined => {
const data = useAtomValue(spaceSettingsAtom);
diff --git a/src/app/state/hooks/unread.ts b/src/app/state/hooks/unread.ts
index 76093b31..ac94bb6a 100644
--- a/src/app/state/hooks/unread.ts
+++ b/src/app/state/hooks/unread.ts
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
import { useAtomValue } from 'jotai';
import { selectAtom } from 'jotai/utils';
import { RoomToUnread, Unread } from '$types/matrix/room';
-import { roomToUnreadAtom, unreadEqual } from '../room/roomToUnread';
+import { roomToUnreadAtom, unreadEqual } from '$state/room/roomToUnread';
const compareUnreadEqual = (u1?: Unread, u2?: Unread): boolean => {
if (!u1 || !u2) return false;
diff --git a/src/app/state/hooks/useBindAtoms.ts b/src/app/state/hooks/useBindAtoms.ts
index 31f9e15a..1d68295d 100644
--- a/src/app/state/hooks/useBindAtoms.ts
+++ b/src/app/state/hooks/useBindAtoms.ts
@@ -1,10 +1,10 @@
import { MatrixClient } from '$types/matrix-sdk';
-import { allInvitesAtom, useBindAllInvitesAtom } from '../room-list/inviteList';
-import { allRoomsAtom, useBindAllRoomsAtom } from '../room-list/roomList';
-import { mDirectAtom, useBindMDirectAtom } from '../mDirectList';
-import { roomToUnreadAtom, useBindRoomToUnreadAtom } from '../room/roomToUnread';
-import { roomToParentsAtom, useBindRoomToParentsAtom } from '../room/roomToParents';
-import { roomIdToTypingMembersAtom, useBindRoomIdToTypingMembersAtom } from '../typingMembers';
+import { allInvitesAtom, useBindAllInvitesAtom } from '$state/room-list/inviteList';
+import { allRoomsAtom, useBindAllRoomsAtom } from '$state/room-list/roomList';
+import { mDirectAtom, useBindMDirectAtom } from '$state/mDirectList';
+import { roomToUnreadAtom, useBindRoomToUnreadAtom } from '$state/room/roomToUnread';
+import { roomToParentsAtom, useBindRoomToParentsAtom } from '$state/room/roomToParents';
+import { roomIdToTypingMembersAtom, useBindRoomIdToTypingMembersAtom } from '$state/typingMembers';
export const useBindAtoms = (mx: MatrixClient) => {
useBindMDirectAtom(mx, mDirectAtom);
diff --git a/src/app/state/hooks/userRoomProfile.ts b/src/app/state/hooks/userRoomProfile.ts
index 5d1dd865..c0e8edcb 100644
--- a/src/app/state/hooks/userRoomProfile.ts
+++ b/src/app/state/hooks/userRoomProfile.ts
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
import { Position, RectCords } from 'folds';
import { UserProfile } from '$hooks/useUserProfile';
-import { userRoomProfileAtom, UserRoomProfileState } from '../userRoomProfile';
+import { userRoomProfileAtom, UserRoomProfileState } from '$state/userRoomProfile';
export const useUserRoomProfileState = (): UserRoomProfileState | undefined => {
const data = useAtomValue(userRoomProfileAtom);
diff --git a/src/app/state/mDirectList.ts b/src/app/state/mDirectList.ts
index 3ff62e7e..89b3721f 100644
--- a/src/app/state/mDirectList.ts
+++ b/src/app/state/mDirectList.ts
@@ -2,7 +2,7 @@ import { atom, useSetAtom } from 'jotai';
import { ClientEvent, MatrixClient, MatrixEvent } from '$types/matrix-sdk';
import { useEffect } from 'react';
import { AccountDataEvent } from '$types/matrix/accountData';
-import { getAccountData, getMDirects } from '../utils/room';
+import { getAccountData, getMDirects } from '$utils/room';
export type MDirectAction = {
type: 'INITIALIZE' | 'UPDATE';
diff --git a/src/app/state/room/roomInputDrafts.ts b/src/app/state/room/roomInputDrafts.ts
index 5286b69c..f5cdd84a 100644
--- a/src/app/state/room/roomInputDrafts.ts
+++ b/src/app/state/room/roomInputDrafts.ts
@@ -4,8 +4,8 @@ import { Descendant } from 'slate';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import { IEventRelation } from '$types/matrix-sdk';
import { TUploadContent } from '$utils/matrix';
-import { createUploadAtomFamily } from '../upload';
-import { createListAtom } from '../list';
+import { createUploadAtomFamily } from '$state/upload';
+import { createListAtom } from '$state/list';
export type TUploadMetadata = {
markedAsSpoiler: boolean;
diff --git a/src/app/state/sessions.ts b/src/app/state/sessions.ts
index 7c49bc47..93f1f2fa 100644
--- a/src/app/state/sessions.ts
+++ b/src/app/state/sessions.ts
@@ -4,7 +4,7 @@ import {
getLocalStorageItem,
setLocalStorageItem,
} from './utils/atomWithLocalStorage';
-import { createLogger } from '../utils/debug';
+import { createLogger } from '$utils/debug';
const log = createLogger('sessions');
diff --git a/src/app/state/upload.ts b/src/app/state/upload.ts
index 7ad172e5..827e4bfd 100644
--- a/src/app/state/upload.ts
+++ b/src/app/state/upload.ts
@@ -2,8 +2,8 @@ import { atom, useAtom } from 'jotai';
import { atomFamily } from 'jotai/utils';
import { MatrixClient, UploadResponse, UploadProgress, MatrixError } from '$types/matrix-sdk';
import { useCallback } from 'react';
-import { useThrottle } from '../hooks/useThrottle';
-import { uploadContent, TUploadContent } from '../utils/matrix';
+import { useThrottle } from '$hooks/useThrottle';
+import { uploadContent, TUploadContent } from '$utils/matrix';
export enum UploadStatus {
Idle = 'idle',
diff --git a/src/app/state/userRoomProfile.ts b/src/app/state/userRoomProfile.ts
index 3f30a02e..04540fcd 100644
--- a/src/app/state/userRoomProfile.ts
+++ b/src/app/state/userRoomProfile.ts
@@ -1,6 +1,6 @@
import { Position, RectCords } from 'folds';
import { atom } from 'jotai';
-import type { UserProfile } from '../hooks/useUserProfile';
+import type { UserProfile } from '$hooks/useUserProfile';
export type UserRoomProfileState = {
userId: string;
diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts
index 0f6d290b..8999f84e 100644
--- a/src/client/initMatrix.ts
+++ b/src/client/initMatrix.ts
@@ -6,7 +6,7 @@ import {
} from '$types/matrix-sdk';
import { cryptoCallbacks } from './secretStorageKeys';
-import { clearNavToActivePathStore } from '../app/state/navToActivePath';
+import { clearNavToActivePathStore } from '$state/navToActivePath';
import { pushSessionToSW } from '../sw-session';
import {
Session,
@@ -14,9 +14,9 @@ import {
SessionStoreName,
getSessionStoreName,
MATRIX_SESSIONS_KEY,
-} from '../app/state/sessions';
-import { getLocalStorageItem } from '../app/state/utils/atomWithLocalStorage';
-import { createLogger } from '../app/utils/debug';
+} from '$state/sessions';
+import { getLocalStorageItem } from '$state/utils/atomWithLocalStorage';
+import { createLogger } from '$utils/debug';
const log = createLogger('initMatrix');
diff --git a/src/types/matrix-sdk-events.d.ts b/src/types/matrix-sdk-events.d.ts
index a007774d..532170e0 100644
--- a/src/types/matrix-sdk-events.d.ts
+++ b/src/types/matrix-sdk-events.d.ts
@@ -1,6 +1,6 @@
-import type { PackContent, EmoteRoomsContent } from '../app/plugins/custom-emoji/types';
-import type { IRecentEmojiContent } from '../app/plugins/recent-emoji';
-import type { InCinnySpacesContent } from '../app/hooks/useSidebarItems';
+import type { PackContent, EmoteRoomsContent } from '$plugins/custom-emoji/types';
+import type { IRecentEmojiContent } from '$plugins/recent-emoji';
+import type { InCinnySpacesContent } from '$hooks/useSidebarItems';
declare module 'matrix-js-sdk/lib/@types/event' {
interface StateEvents {
From 09812237d5fc8372ffecaf681d3a7552134257db Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 20:14:21 +0100
Subject: [PATCH 48/59] ci: add format, lint, and typecheck quality checks
---
.github/workflows/quality-checks.yml | 66 ++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 .github/workflows/quality-checks.yml
diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml
new file mode 100644
index 00000000..aeaa45bd
--- /dev/null
+++ b/.github/workflows/quality-checks.yml
@@ -0,0 +1,66 @@
+name: Quality checks
+
+on:
+ pull_request:
+ push:
+
+jobs:
+ format:
+ name: Format check
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+ - name: Setup node
+ uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+ with:
+ node-version-file: '.node-version'
+ cache: 'npm'
+ - name: Install dependencies
+ run: npm ci
+ - name: Check formatting
+ run: npm run fmt:check
+
+ lint:
+ name: Lint
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+ - name: Setup node
+ uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+ with:
+ node-version-file: '.node-version'
+ cache: 'npm'
+ - name: Install dependencies
+ run: npm ci
+ - name: Run ESLint
+ run: npm run lint
+
+ typecheck:
+ name: Typecheck
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+ - name: Setup node
+ uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+ with:
+ node-version-file: '.node-version'
+ cache: 'npm'
+ - name: Install dependencies
+ run: npm ci
+ - name: Run TypeScript typecheck
+ run: npm run typecheck -- --pretty false
From 1cfecbb816e4a7dd51265b0d1185dac9cf1e80c7 Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 20:29:43 +0100
Subject: [PATCH 49/59] docs: require quality checks before merging pull
requests
---
CONTRIBUTING.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b9812722..62a49325 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,6 +37,13 @@ It is not always possible to phrase every change in such a manner, but it is des
Also, we use [ESLint](https://eslint.org/) for clean and stylistically consistent code syntax, so make sure your pull request follow it.
+**Pull requests are not merged unless all quality checks are passing.** At minimum, `format`, `lint`, `typecheck`, and `knip` must all be green before a pull request can be merged. Run these locally before opening or updating a pull request:
+
+- `npm run fmt:check`
+- `npm run lint`
+- `npm run typecheck`
+- `npm run knip`
+
**For any query or design discussion, join our [Matrix room](https://matrix.to/#/#sable:sable.moe).**
## Helpful links
From d68003d8dcad9ca783792749cd1a30ff1aac5626 Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 20:30:04 +0100
Subject: [PATCH 50/59] ci: add knip to quality checks workflow
---
.github/workflows/quality-checks.yml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml
index aeaa45bd..fb8e582c 100644
--- a/.github/workflows/quality-checks.yml
+++ b/.github/workflows/quality-checks.yml
@@ -64,3 +64,23 @@ jobs:
run: npm ci
- name: Run TypeScript typecheck
run: npm run typecheck -- --pretty false
+
+ knip:
+ name: Knip
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+ - name: Setup node
+ uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+ with:
+ node-version-file: '.node-version'
+ cache: 'npm'
+ - name: Install dependencies
+ run: npm ci --ignore-scripts
+ - name: Run Knip
+ run: npm run knip
From dda00a0d03fb916430485d252056c295a6833b94 Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 14:30:36 -0600
Subject: [PATCH 51/59] Delete .github/workflows/netlify-dev.yml
---
.github/workflows/netlify-dev.yml | 44 -------------------------------
1 file changed, 44 deletions(-)
delete mode 100644 .github/workflows/netlify-dev.yml
diff --git a/.github/workflows/netlify-dev.yml b/.github/workflows/netlify-dev.yml
deleted file mode 100644
index 69a99042..00000000
--- a/.github/workflows/netlify-dev.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Deploy to Netlify (dev)
-
-on:
- push:
- branches:
- - dev
-
-jobs:
- deploy-to-netlify:
- name: Deploy to Netlify
- runs-on: ubuntu-latest
- permissions:
- contents: read
- deployments: write
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Setup node
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- with:
- node-version-file: '.node-version'
- cache: 'npm'
- - name: Install dependencies
- run: npm ci
- - name: Build app
- env:
- NODE_OPTIONS: '--max_old_space_size=4096'
- run: npm run build
- - name: Deploy to Netlify
- uses: nwtgck/actions-netlify@4cbaf4c08f1a7bfa537d6113472ef4424e4eb654 # v3.0.0
- with:
- publish-dir: dist
- deploy-message: 'Dev deploy ${{ github.sha }}'
- enable-commit-comment: false
- github-token: ${{ secrets.GITHUB_TOKEN }}
- production-deploy: true
- github-deployment-environment: nightly
- github-deployment-description: 'Nightly deployment on each commit to dev branch'
- env:
- NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
- NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_DEV }}
- timeout-minutes: 1
From 7b54999173768a25ecd04ad1088303e6b900d0a1 Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 14:33:56 -0600
Subject: [PATCH 52/59] Delete .github/workflows/build-pull-request.yml
---
.github/workflows/build-pull-request.yml | 44 ------------------------
1 file changed, 44 deletions(-)
delete mode 100644 .github/workflows/build-pull-request.yml
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
deleted file mode 100644
index b6956730..00000000
--- a/.github/workflows/build-pull-request.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Build pull request
-
-on:
- pull_request:
- types: ['opened', 'synchronize']
-
-jobs:
- build-pull-request:
- name: Build pull request
- runs-on: ubuntu-latest
- permissions:
- contents: read
- env:
- PR_NUMBER: ${{github.event.number}}
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Setup node
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- with:
- node-version-file: '.node-version'
- cache: 'npm'
- - name: Install dependencies
- run: npm ci
- - name: Build app
- env:
- NODE_OPTIONS: '--max_old_space_size=4096'
- run: npm run build
- - name: Upload artifact
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
- with:
- name: preview
- path: dist
- retention-days: 1
- - name: Save pr number
- run: echo ${PR_NUMBER} > ./pr.txt
- - name: Upload pr number
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
- with:
- name: pr
- path: ./pr.txt
- retention-days: 1
From dd52b6b79dcf08bc8ad7ff5b505867c39940051a Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 14:34:06 -0600
Subject: [PATCH 53/59] Delete .github/workflows/deploy-pull-request.yml
---
.github/workflows/deploy-pull-request.yml | 57 -----------------------
1 file changed, 57 deletions(-)
delete mode 100644 .github/workflows/deploy-pull-request.yml
diff --git a/.github/workflows/deploy-pull-request.yml b/.github/workflows/deploy-pull-request.yml
deleted file mode 100644
index 19c11b29..00000000
--- a/.github/workflows/deploy-pull-request.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Deploy PR to Netlify
-
-on:
- workflow_run:
- workflows: ['Build pull request']
- types: [completed]
-
-jobs:
- deploy-pull-request:
- name: Deploy pull request
- runs-on: ubuntu-latest
- permissions:
- actions: read
- contents: read
- pull-requests: write
- if: ${{ github.event.workflow_run.conclusion == 'success' }}
- steps:
- - name: Download pr number
- uses: dawidd6/action-download-artifact@fe9d59ce33ce92db8a6ac90b2c8be6b6d90417c8
- with:
- workflow: ${{ github.event.workflow.id }}
- run_id: ${{ github.event.workflow_run.id }}
- name: pr
- - name: Output pr number
- id: pr
- run: echo "id=$(> $GITHUB_OUTPUT
- - name: Download artifact
- uses: dawidd6/action-download-artifact@fe9d59ce33ce92db8a6ac90b2c8be6b6d90417c8
- with:
- workflow: ${{ github.event.workflow.id }}
- run_id: ${{ github.event.workflow_run.id }}
- name: preview
- path: dist
- - name: Deploy to Netlify
- id: netlify
- uses: nwtgck/actions-netlify@4cbaf4c08f1a7bfa537d6113472ef4424e4eb654 # v3.0.0
- with:
- publish-dir: dist
- deploy-message: 'Deploy PR ${{ steps.pr.outputs.id }}'
- alias: ${{ steps.pr.outputs.id }}
- # These don't work because we're in workflow_run
- enable-pull-request-comment: false
- enable-commit-comment: false
- env:
- NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
- NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_PR_CINNY }}
- timeout-minutes: 1
- - name: Comment preview on PR
- uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b #v3.0.1
- env:
- github-token: ${{ secrets.GITHUB_TOKEN }}
- with:
- pr-number: ${{ steps.pr.outputs.id }}
- comment-tag: ${{ steps.pr.outputs.id }}
- message: |
- Preview: ${{ steps.netlify.outputs.deploy-url }}
- ⚠️ Exercise caution. Use test accounts. ⚠️
From dde39066ce0410c42a5d4a7c5d859afec6f72fd5 Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 14:34:15 -0600
Subject: [PATCH 54/59] Delete .github/workflows/docker-pr.yml
---
.github/workflows/docker-pr.yml | 24 ------------------------
1 file changed, 24 deletions(-)
delete mode 100644 .github/workflows/docker-pr.yml
diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
deleted file mode 100644
index cfa196e8..00000000
--- a/.github/workflows/docker-pr.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: 'Docker check'
-
-on:
- pull_request:
- paths:
- - 'Dockerfile'
- - '.github/workflows/docker-pr.yml'
- - '.github/workflows/prod-deploy.yml'
-
-jobs:
- docker-build:
- runs-on: ubuntu-latest
- permissions:
- contents: read
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Build Docker image
- uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
- with:
- context: .
- push: false
From 36de70e991b4c4e686ba2d408c78037fa868da9d Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 14:34:40 -0600
Subject: [PATCH 55/59] Delete .github/workflows/prod-deploy.yml
---
.github/workflows/prod-deploy.yml | 110 ------------------------------
1 file changed, 110 deletions(-)
delete mode 100644 .github/workflows/prod-deploy.yml
diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml
deleted file mode 100644
index 074b6026..00000000
--- a/.github/workflows/prod-deploy.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-name: Production deploy
-
-on:
- release:
- types: [published]
-
-jobs:
- deploy-and-tarball:
- name: Netlify deploy and tarball
- runs-on: ubuntu-latest
- permissions:
- contents: write
- deployments: write
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Setup node
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- with:
- node-version-file: '.node-version'
- package-manager-cache: false
- - name: Install dependencies
- run: npm ci
- - name: Build app
- env:
- NODE_OPTIONS: '--max_old_space_size=4096'
- run: npm run build
- - name: Deploy to Netlify
- uses: nwtgck/actions-netlify@4cbaf4c08f1a7bfa537d6113472ef4424e4eb654 # v3.0.0
- with:
- publish-dir: dist
- deploy-message: 'Prod deploy ${{ github.ref_name }}'
- enable-commit-comment: false
- github-token: ${{ secrets.GITHUB_TOKEN }}
- production-deploy: true
- github-deployment-environment: stable
- github-deployment-description: 'Stable deployment on each release'
- env:
- NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
- NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_APP }}
- timeout-minutes: 1
- - name: Get version from tag
- id: vars
- run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
- - name: Create tar.gz
- env:
- RELEASE_TAG: ${{ steps.vars.outputs.tag }}
- run: tar -czvf "cinny-${RELEASE_TAG}.tar.gz" dist
- - name: Sign tar.gz
- env:
- RELEASE_TAG: ${{ steps.vars.outputs.tag }}
- run: |
- echo '${{ secrets.GNUPG_KEY }}' | gpg --batch --import
- # Sadly a few lines in the private key match a few lines in the public key,
- # As a result just --export --armor gives us a few lines replaced with ***
- # making it useless for importing the signing key. Instead, we dump it as
- # non-armored and hex-encode it so that its printable.
- echo "PGP Signing key, in raw PGP format in hex. Import with cat ... | xxd -r -p - | gpg --import"
- gpg --export | xxd -p
- echo '${{ secrets.GNUPG_PASSPHRASE }}' | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --armor --detach-sign "cinny-${RELEASE_TAG}.tar.gz"
- - name: Upload tagged release
- uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
- with:
- files: |
- cinny-${{ steps.vars.outputs.tag }}.tar.gz
- cinny-${{ steps.vars.outputs.tag }}.tar.gz.asc
-
- publish-image:
- name: Push Docker image to Docker Hub, ghcr
- runs-on: ubuntu-latest
- permissions:
- contents: read
- packages: write
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Set up QEMU
- uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
- - name: Login to Docker Hub
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
- with:
- username: ${{ secrets.DOCKER_USERNAME }}
- password: ${{ secrets.DOCKER_PASSWORD }}
- - name: Login to the Container registry
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Extract metadata (tags, labels) for Docker
- id: meta
- uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
- with:
- images: |
- ${{ secrets.DOCKER_USERNAME }}/cinny
- ghcr.io/${{ github.repository }}
- - name: Build and push Docker image
- uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
- with:
- context: .
- platforms: linux/amd64,linux/arm64
- push: true
- tags: ${{ steps.meta.outputs.tags }}
- labels: ${{ steps.meta.outputs.labels }}
From c970dc3271ea1dbef36041dafbc5322e213d9d5b Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 14:49:47 -0600
Subject: [PATCH 56/59] test push
---
config.json | 1 +
src/app/hooks/useClientConfig.ts | 1 +
2 files changed, 2 insertions(+)
diff --git a/config.json b/config.json
index 26bae5bf..e9bf691f 100644
--- a/config.json
+++ b/config.json
@@ -5,6 +5,7 @@
"elementCallUrl": null,
"disableAccountSwitcher": false,
+ "matrixToBaseUrl": "https://matrix.to",
"featuredCommunities": {
"openAsDefault": false,
diff --git a/src/app/hooks/useClientConfig.ts b/src/app/hooks/useClientConfig.ts
index 97079219..53484997 100644
--- a/src/app/hooks/useClientConfig.ts
+++ b/src/app/hooks/useClientConfig.ts
@@ -12,6 +12,7 @@ export type ClientConfig = {
elementCallUrl?: string;
disableAccountSwitcher?: boolean;
+ matrixToBaseUrl?: string;
featuredCommunities?: {
openAsDefault?: boolean;
From 74b367ce0655503ae10e2b12a7742ad606c6d0ea Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 14:54:40 -0600
Subject: [PATCH 57/59] fix import order
---
src/app/components/AccountDataEditor.tsx | 4 ++--
src/app/components/ActionUIA.tsx | 2 +-
src/app/components/BackupRestore.tsx | 2 +-
src/app/components/DeviceVerificationSetup.tsx | 4 ++--
src/app/components/LogoutDialog.tsx | 2 +-
src/app/components/ManualVerification.tsx | 4 ++--
src/app/components/RenderMessageContent.tsx | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/app/components/AccountDataEditor.tsx b/src/app/components/AccountDataEditor.tsx
index 9d6809a1..f8fd8445 100644
--- a/src/app/components/AccountDataEditor.tsx
+++ b/src/app/components/AccountDataEditor.tsx
@@ -18,11 +18,11 @@ import { MatrixError } from '$types/matrix-sdk';
import { Cursor } from '$plugins/text-area';
import { syntaxErrorPosition } from '$utils/dom';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { Page, PageHeader } from './page';
import { useAlive } from '$hooks/useAlive';
+import { useTextAreaCodeEditor } from '$hooks/useTextAreaCodeEditor';
+import { Page, PageHeader } from './page';
import { SequenceCard } from './sequence-card';
import { TextViewerContent } from './text-viewer';
-import { useTextAreaCodeEditor } from '$hooks/useTextAreaCodeEditor';
const EDITOR_INTENT_SPACE_COUNT = 2;
diff --git a/src/app/components/ActionUIA.tsx b/src/app/components/ActionUIA.tsx
index 3be4912b..caffb032 100644
--- a/src/app/components/ActionUIA.tsx
+++ b/src/app/components/ActionUIA.tsx
@@ -2,9 +2,9 @@ import { ReactNode } from 'react';
import { AuthDict, AuthType, IAuthData, UIAFlow } from '$types/matrix-sdk';
import { getUIAFlowForStages } from '$utils/matrix-uia';
import { useSupportedUIAFlows, useUIACompleted, useUIAFlow } from '$hooks/useUIAFlows';
+import { useMatrixClient } from '$hooks/useMatrixClient';
import { UIAFlowOverlay } from './UIAFlowOverlay';
import { PasswordStage, SSOStage } from './uia-stages';
-import { useMatrixClient } from '$hooks/useMatrixClient';
export const SUPPORTED_IN_APP_UIA_STAGES = [AuthType.Password, AuthType.Sso];
diff --git a/src/app/components/BackupRestore.tsx b/src/app/components/BackupRestore.tsx
index 5071c87b..78d65dff 100644
--- a/src/app/components/BackupRestore.tsx
+++ b/src/app/components/BackupRestore.tsx
@@ -20,7 +20,6 @@ import {
} from 'folds';
import FocusTrap from 'focus-trap-react';
import { BackupProgressStatus, backupRestoreProgressAtom } from '$state/backupRestore';
-import { InfoCard } from './info-card';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import {
useKeyBackupInfo,
@@ -30,6 +29,7 @@ import {
} from '$hooks/useKeyBackup';
import { stopPropagation } from '$utils/keyboard';
import { useRestoreBackupOnVerification } from '$hooks/useRestoreBackupOnVerification';
+import { InfoCard } from './info-card';
type BackupStatusProps = {
enabled: boolean;
diff --git a/src/app/components/DeviceVerificationSetup.tsx b/src/app/components/DeviceVerificationSetup.tsx
index e98ec6ec..83c7187c 100644
--- a/src/app/components/DeviceVerificationSetup.tsx
+++ b/src/app/components/DeviceVerificationSetup.tsx
@@ -17,13 +17,13 @@ import FileSaver from 'file-saver';
import to from 'await-to-js';
import { AuthDict, IAuthData, MatrixError, UIAuthCallback } from '$types/matrix-sdk';
import { clearSecretStorageKeys } from '$client/secretStorageKeys';
-import { PasswordInput } from './password-input';
import { ContainerColor } from '$styles/ContainerColor.css';
import { copyToClipboard } from '$utils/dom';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { ActionUIA, ActionUIAFlowsLoader } from './ActionUIA';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useAlive } from '$hooks/useAlive';
+import { PasswordInput } from './password-input';
+import { ActionUIA, ActionUIAFlowsLoader } from './ActionUIA';
import { UseStateProvider } from './UseStateProvider';
type UIACallback = (
diff --git a/src/app/components/LogoutDialog.tsx b/src/app/components/LogoutDialog.tsx
index 1eb27d70..c1cf9d1c 100644
--- a/src/app/components/LogoutDialog.tsx
+++ b/src/app/components/LogoutDialog.tsx
@@ -4,11 +4,11 @@ import { logoutClient } from '$client/initMatrix';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useCrossSigningActive } from '$hooks/useCrossSigning';
-import { InfoCard } from './info-card';
import {
useDeviceVerificationStatus,
VerificationStatus,
} from '$hooks/useDeviceVerificationStatus';
+import { InfoCard } from './info-card';
type LogoutDialogProps = {
handleClose: () => void;
diff --git a/src/app/components/ManualVerification.tsx b/src/app/components/ManualVerification.tsx
index b2df9f03..31903f95 100644
--- a/src/app/components/ManualVerification.tsx
+++ b/src/app/components/ManualVerification.tsx
@@ -16,10 +16,10 @@ import FocusTrap from 'focus-trap-react';
import { SecretStorageKeyContent } from '$types/matrix/accountData';
import { storePrivateKey } from '$client/secretStorageKeys';
import { stopPropagation } from '$utils/keyboard';
-import { SettingTile } from './setting-tile';
-import { SecretStorageRecoveryKey, SecretStorageRecoveryPassphrase } from './SecretStorage';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { SettingTile } from './setting-tile';
+import { SecretStorageRecoveryKey, SecretStorageRecoveryPassphrase } from './SecretStorage';
export enum ManualVerificationMethod {
RecoveryPassphrase = 'passphrase',
diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx
index 53bfa6b8..8ba8f6dc 100644
--- a/src/app/components/RenderMessageContent.tsx
+++ b/src/app/components/RenderMessageContent.tsx
@@ -1,5 +1,6 @@
import { memo, useMemo, useCallback } from 'react';
import { MsgType } from '$types/matrix-sdk';
+import { testMatrixTo } from '$plugins/matrix-to';
import { HTMLReactParserOptions } from 'html-react-parser';
import { Opts } from 'linkifyjs';
import { config } from 'folds';
@@ -29,7 +30,6 @@ import { Image, MediaControl, Video } from './media';
import { ImageViewer } from './image-viewer';
import { PdfViewer } from './Pdf-viewer';
import { TextViewer } from './text-viewer';
-import { testMatrixTo } from '$plugins/matrix-to';
type RenderMessageContentProps = {
displayName: string;
From 08fa7cd67fea41cf5d44796d94b0224e03ef1fb1 Mon Sep 17 00:00:00 2001
From: 7w1
Date: Mon, 2 Mar 2026 15:10:21 -0600
Subject: [PATCH 58/59] make eslint happy
---
src/app/components/SecretStorage.tsx | 2 +-
.../components/UserRoomProfileRenderer.tsx | 2 +-
.../autocomplete/RoomMentionAutocomplete.tsx | 2 +-
src/app/components/emoji-board/EmojiBoard.tsx | 2 +-
.../emoji-board/components/Item.tsx | 2 +-
.../image-pack-view/ImagePackContent.tsx | 4 +--
src/app/components/member-tile/MemberTile.tsx | 2 +-
.../placeholder/CompactPlaceholder.tsx | 2 +-
.../placeholder/DefaultPlaceholder.tsx | 2 +-
.../components/uia-stages/PasswordStage.tsx | 2 +-
.../developer-tools/DevelopTools.tsx | 2 +-
.../permissions/PermissionGroups.tsx | 2 +-
.../common-settings/permissions/Powers.tsx | 2 +-
src/app/features/lobby/Lobby.tsx | 2 +-
.../features/room-settings/RoomSettings.tsx | 4 +--
src/app/features/room/message/Reactions.tsx | 2 +-
.../room/room-pin-menu/RoomPinMenu.tsx | 2 +-
src/app/features/settings/account/Profile.tsx | 2 +-
src/app/features/settings/devices/Devices.tsx | 2 +-
.../settings/devices/OtherDevices.tsx | 2 +-
.../notifications/KeywordMessages.tsx | 2 +-
.../settings/notifications/Notifications.tsx | 2 +-
.../features/space-settings/SpaceSettings.tsx | 2 +-
src/app/hooks/useCommands.ts | 2 +-
src/app/hooks/useDeviceVerificationStatus.ts | 2 +-
src/app/hooks/useJoinedRoomId.ts | 3 +-
src/app/hooks/useMemberPowerTag.ts | 2 +-
src/app/hooks/useMentionClickHandler.ts | 4 +--
src/app/hooks/useNotificationJumper.ts | 2 +-
src/app/hooks/usePathWithOrigin.ts | 2 +-
src/app/hooks/usePowerLevels.ts | 2 +-
src/app/hooks/useRoomAliases.ts | 2 +-
src/app/hooks/useRoomCreators.ts | 2 +-
src/app/hooks/useRoomNavigate.ts | 4 +--
src/app/hooks/useRoomWidgets.ts | 2 +-
.../hooks/useRoomsNotificationPreferences.ts | 2 +-
src/app/hooks/useSidebarItems.ts | 2 +-
src/app/hooks/useSpaceHierarchy.ts | 2 +-
src/app/hooks/useStateEvent.ts | 2 +-
src/app/hooks/useTextAreaCodeEditor.ts | 2 +-
src/app/hooks/useTheme.ts | 4 +--
src/app/hooks/useUserProfile.ts | 2 +-
src/app/hooks/useVirtualPaginator.ts | 2 +-
src/app/pages/App.tsx | 4 +--
src/app/pages/Router.tsx | 30 +++++++++----------
src/app/pages/auth/AuthLayout.tsx | 2 +-
src/app/pages/auth/login/Login.tsx | 4 +--
.../auth/reset-password/PasswordResetForm.tsx | 2 +-
src/app/pages/client/ClientNonUIFeatures.tsx | 2 +-
src/app/pages/pathUtils.ts | 4 +--
src/app/plugins/react-custom-html-parser.tsx | 8 ++---
src/app/state/sessions.ts | 2 +-
src/client/initMatrix.ts | 4 +--
53 files changed, 79 insertions(+), 80 deletions(-)
diff --git a/src/app/components/SecretStorage.tsx b/src/app/components/SecretStorage.tsx
index 15231682..07b2e15d 100644
--- a/src/app/components/SecretStorage.tsx
+++ b/src/app/components/SecretStorage.tsx
@@ -2,10 +2,10 @@ import { FormEventHandler, useCallback } from 'react';
import { Box, Text, Button, Spinner, color } from 'folds';
import { decodeRecoveryKey, deriveRecoveryKeyFromPassphrase } from '$types/matrix-sdk';
import { SecretStorageKeyContent, SecretStoragePassphraseContent } from '$types/matrix/accountData';
-import { PasswordInput } from './password-input';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useAlive } from '$hooks/useAlive';
+import { PasswordInput } from './password-input';
type SecretStorageRecoveryPassphraseProps = {
processing?: boolean;
diff --git a/src/app/components/UserRoomProfileRenderer.tsx b/src/app/components/UserRoomProfileRenderer.tsx
index eeae40ca..97489d27 100644
--- a/src/app/components/UserRoomProfileRenderer.tsx
+++ b/src/app/components/UserRoomProfileRenderer.tsx
@@ -1,12 +1,12 @@
import { Menu, PopOut, toRem } from 'folds';
import FocusTrap from 'focus-trap-react';
import { useCloseUserRoomProfile, useUserRoomProfileState } from '$state/hooks/userRoomProfile';
-import { UserRoomProfile } from './user-profile';
import { UserRoomProfileState } from '$state/userRoomProfile';
import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
import { stopPropagation } from '$utils/keyboard';
import { SpaceProvider } from '$hooks/useSpace';
import { RoomProvider } from '$hooks/useRoom';
+import { UserRoomProfile } from './user-profile';
function UserRoomProfileContextMenu({ state }: { state: UserRoomProfileState }) {
const { roomId, spaceId, userId, cords, position, initialProfile } = state;
diff --git a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
index a3be8cf3..0d2e9693 100644
--- a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
@@ -15,9 +15,9 @@ import { allRoomsAtom } from '$state/room-list/roomList';
import { factoryRoomIdByActivity } from '$utils/sort';
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
import { getViaServers } from '$plugins/via-servers';
+import { createMentionElement, moveCursor, replaceWithElement } from '$components/editor/utils';
import { AutocompleteMenu } from './AutocompleteMenu';
import { AutocompleteQuery } from './autocompleteQuery';
-import { createMentionElement, moveCursor, replaceWithElement } from '$components/editor/utils';
type MentionAutoCompleteHandler = (roomAliasOrId: string, name: string) => void;
diff --git a/src/app/components/emoji-board/EmojiBoard.tsx b/src/app/components/emoji-board/EmojiBoard.tsx
index 9a603b97..2190a53f 100644
--- a/src/app/components/emoji-board/EmojiBoard.tsx
+++ b/src/app/components/emoji-board/EmojiBoard.tsx
@@ -29,6 +29,7 @@ import { addRecentEmoji } from '$plugins/recent-emoji';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { ImagePack, ImageUsage, PackImageReader } from '$plugins/custom-emoji';
import { getEmoticonSearchStr } from '$plugins/utils';
+import { VirtualTile } from '$components/virtualizer';
import { useEmojiGroupIcons } from './useEmojiGroupIcons';
import { useEmojiGroupLabels } from './useEmojiGroupLabels';
import {
@@ -51,7 +52,6 @@ import {
EmojiBoardLayout,
} from './components';
import { EmojiBoardTab, EmojiType } from './types';
-import { VirtualTile } from '$components/virtualizer';
const RECENT_GROUP_ID = 'recent_group';
const SEARCH_GROUP_ID = 'search_group';
diff --git a/src/app/components/emoji-board/components/Item.tsx b/src/app/components/emoji-board/components/Item.tsx
index ca564494..09179357 100644
--- a/src/app/components/emoji-board/components/Item.tsx
+++ b/src/app/components/emoji-board/components/Item.tsx
@@ -3,8 +3,8 @@ import { MatrixClient } from '$types/matrix-sdk';
import { PackImageReader } from '$plugins/custom-emoji';
import { IEmoji } from '$plugins/emoji';
import { mxcUrlToHttp } from '$utils/matrix';
-import * as css from './styles.css';
import { EmojiItemInfo, EmojiType } from '$components/emoji-board/types';
+import * as css from './styles.css';
export const getEmojiItemInfo = (element: Element): EmojiItemInfo | undefined => {
const label = element.getAttribute('title');
diff --git a/src/app/components/image-pack-view/ImagePackContent.tsx b/src/app/components/image-pack-view/ImagePackContent.tsx
index de5b5000..6f56d70f 100644
--- a/src/app/components/image-pack-view/ImagePackContent.tsx
+++ b/src/app/components/image-pack-view/ImagePackContent.tsx
@@ -18,12 +18,12 @@ import { replaceSpaceWithDash, suffixRename } from '$utils/common';
import { getFileNameWithoutExt } from '$utils/mimeTypes';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { SequenceCard } from '$components/sequence-card';
-import { ImageTile, ImageTileEdit, ImageTileUpload } from './ImageTile';
import { SettingTile } from '$components/setting-tile';
+import { CompactUploadCardRenderer } from '$components/upload-card';
+import { ImageTile, ImageTileEdit, ImageTileUpload } from './ImageTile';
import { UsageSwitcher } from './UsageSwitcher';
import { ImagePackProfile, ImagePackProfileEdit } from './PackMeta';
import * as css from './style.css';
-import { CompactUploadCardRenderer } from '$components/upload-card';
export type ImagePackContentProps = {
imagePack: ImagePack;
diff --git a/src/app/components/member-tile/MemberTile.tsx b/src/app/components/member-tile/MemberTile.tsx
index 111af3ed..9af782ee 100644
--- a/src/app/components/member-tile/MemberTile.tsx
+++ b/src/app/components/member-tile/MemberTile.tsx
@@ -6,8 +6,8 @@ import { getMxIdLocalPart } from '$utils/matrix';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
-import * as css from './style.css';
import { UserAvatar } from '$components/user-avatar';
+import * as css from './style.css';
const getName = (room: Room, member: RoomMember, nicknames: Record) =>
getMemberDisplayName(room, member.userId, nicknames) ??
diff --git a/src/app/components/message/placeholder/CompactPlaceholder.tsx b/src/app/components/message/placeholder/CompactPlaceholder.tsx
index 86b6c662..c6e6dda0 100644
--- a/src/app/components/message/placeholder/CompactPlaceholder.tsx
+++ b/src/app/components/message/placeholder/CompactPlaceholder.tsx
@@ -1,8 +1,8 @@
import { useMemo } from 'react';
import { as, ContainerColor, toRem } from 'folds';
import { randomNumberBetween } from '$utils/common';
-import { LinePlaceholder } from './LinePlaceholder';
import { CompactLayout } from '$components/message/layout';
+import { LinePlaceholder } from './LinePlaceholder';
export const CompactPlaceholder = as<'div', { variant?: ContainerColor }>(
({ variant, ...props }, ref) => {
diff --git a/src/app/components/message/placeholder/DefaultPlaceholder.tsx b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
index 98301d2e..444990ac 100644
--- a/src/app/components/message/placeholder/DefaultPlaceholder.tsx
+++ b/src/app/components/message/placeholder/DefaultPlaceholder.tsx
@@ -1,8 +1,8 @@
import { CSSProperties, useMemo } from 'react';
import { Avatar, Box, ContainerColor, as, color, toRem } from 'folds';
import { randomNumberBetween } from '$utils/common';
-import { LinePlaceholder } from './LinePlaceholder';
import { ModernLayout } from '$components/message/layout';
+import { LinePlaceholder } from './LinePlaceholder';
const contentMargin: CSSProperties = { marginTop: toRem(3) };
diff --git a/src/app/components/uia-stages/PasswordStage.tsx b/src/app/components/uia-stages/PasswordStage.tsx
index 582758a0..8ebc923a 100644
--- a/src/app/components/uia-stages/PasswordStage.tsx
+++ b/src/app/components/uia-stages/PasswordStage.tsx
@@ -1,9 +1,9 @@
import { Box, Button, color, config, Dialog, Header, Icon, IconButton, Icons, Text } from 'folds';
import { FormEventHandler } from 'react';
import { AuthType } from '$types/matrix-sdk';
+import { PasswordInput } from '$components/password-input';
import { StageComponentProps } from './types';
import { ErrorCode } from '../../cs-errorcode';
-import { PasswordInput } from '$components/password-input';
export function PasswordStage({
stageData,
diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
index 5f8bc077..7925d44a 100644
--- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
@@ -24,9 +24,9 @@ import { useRoomAccountData } from '$hooks/useRoomAccountData';
import { CutoutCard } from '$components/cutout-card';
import { AccountDataEditor, AccountDataSubmitCallback } from '$components/AccountDataEditor';
import { useMatrixClient } from '$hooks/useMatrixClient';
+import { SequenceCardStyle } from '$features/common-settings/styles.css';
import { SendRoomEvent } from './SendRoomEvent';
import { StateEventEditor, StateEventInfo } from './StateEventEditor';
-import { SequenceCardStyle } from '$features/common-settings/styles.css';
type DeveloperToolsProps = {
requestClose: () => void;
diff --git a/src/app/features/common-settings/permissions/PermissionGroups.tsx b/src/app/features/common-settings/permissions/PermissionGroups.tsx
index 1abe3a82..32400581 100644
--- a/src/app/features/common-settings/permissions/PermissionGroups.tsx
+++ b/src/app/features/common-settings/permissions/PermissionGroups.tsx
@@ -17,8 +17,8 @@ import { StateEvent } from '$types/matrix/room';
import { PowerSwitcher } from '$components/power';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAlive } from '$hooks/useAlive';
-import { PermissionGroup } from './types';
import { SequenceCardStyle } from '$features/common-settings/styles.css';
+import { PermissionGroup } from './types';
const USER_DEFAULT_LOCATION: PermissionLocation = {
user: true,
diff --git a/src/app/features/common-settings/permissions/Powers.tsx b/src/app/features/common-settings/permissions/Powers.tsx
index 78e2351d..a029ac78 100644
--- a/src/app/features/common-settings/permissions/Powers.tsx
+++ b/src/app/features/common-settings/permissions/Powers.tsx
@@ -26,8 +26,8 @@ import { stopPropagation } from '$utils/keyboard';
import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag';
import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
import { useRoomCreators } from '$hooks/useRoomCreators';
-import { PermissionGroup } from './types';
import { SequenceCardStyle } from '$features/common-settings/styles.css';
+import { PermissionGroup } from './types';
type PeekPermissionsProps = {
powerLevels: IPowerLevels;
diff --git a/src/app/features/lobby/Lobby.tsx b/src/app/features/lobby/Lobby.tsx
index a57a1d5f..0bc47426 100644
--- a/src/app/features/lobby/Lobby.tsx
+++ b/src/app/features/lobby/Lobby.tsx
@@ -51,11 +51,11 @@ import { useGetRoom } from '$hooks/useGetRoom';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { getRoomPermissionsAPI } from '$hooks/useRoomPermissions';
import { getRoomCreatorsForRoomId } from '$hooks/useRoomCreators';
+import { MembersDrawer } from '$features/room/MembersDrawer';
import { SpaceHierarchy } from './SpaceHierarchy';
import { CanDropCallback, useDnDMonitor } from './DnD';
import { LobbyHero } from './LobbyHero';
import { LobbyHeader } from './LobbyHeader';
-import { MembersDrawer } from '$features/room/MembersDrawer';
const useCanDropLobbyItem = (
space: Room,
diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx
index 16f5ea7a..d79cfd77 100644
--- a/src/app/features/room-settings/RoomSettings.tsx
+++ b/src/app/features/room-settings/RoomSettings.tsx
@@ -13,12 +13,12 @@ import { RoomAvatar, RoomIcon } from '$components/room-avatar';
import { RoomSettingsPage } from '$state/roomSettings';
import { useRoom } from '$hooks/useRoom';
import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper';
-import { General } from './general';
import { Members } from '$features/common-settings/members';
import { EmojisStickers } from '$features/common-settings/emojis-stickers';
-import { Permissions } from './permissions';
import { DeveloperTools } from '$features/common-settings/developer-tools';
import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics';
+import { Permissions } from './permissions';
+import { General } from './general';
type RoomSettingsMenuItem = {
page: RoomSettingsPage;
diff --git a/src/app/features/room/message/Reactions.tsx b/src/app/features/room/message/Reactions.tsx
index 6152f7c2..19c920c6 100644
--- a/src/app/features/room/message/Reactions.tsx
+++ b/src/app/features/room/message/Reactions.tsx
@@ -21,8 +21,8 @@ import { Reaction, ReactionTooltipMsg } from '$components/message';
import { useRelations } from '$hooks/useRelations';
import { stopPropagation } from '$utils/keyboard';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import * as css from './styles.css';
import { ReactionViewer } from '$features/room/reaction-viewer';
+import * as css from './styles.css';
export type ReactionsProps = {
room: Room;
diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
index eaff34d1..d05284da 100644
--- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
+++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx
@@ -87,8 +87,8 @@ import { nicknamesAtom } from '$state/nicknames';
import { AccountDataEvent } from '$types/matrix/accountData';
import { useSableCosmetics } from '$hooks/useSableCosmetics';
import { EncryptedContent } from '$features/room/message';
-import * as css from './RoomPinMenu.css';
import type { PinReadMarker } from '$features/room/RoomViewHeader';
+import * as css from './RoomPinMenu.css';
const log = createLogger('RoomPinMenu');
diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx
index a94aaa60..ce6b855a 100644
--- a/src/app/features/settings/account/Profile.tsx
+++ b/src/app/features/settings/account/Profile.tsx
@@ -44,11 +44,11 @@ import { createUploadAtom, UploadSuccess } from '$state/upload';
import { CompactUploadCardRenderer } from '$components/upload-card';
import { useCapabilities } from '$hooks/useCapabilities';
import { profilesCacheAtom } from '$state/userRoomProfile';
+import { SequenceCardStyle } from '$features/settings/styles.css';
import { TimezoneEditor } from './TimezoneEditor';
import { PronounEditor } from './PronounEditor';
import { BioEditor } from './BioEditor';
import { NameColorEditor } from './NameColorEditor';
-import { SequenceCardStyle } from '$features/settings/styles.css';
type PronounSet = {
summary: string;
diff --git a/src/app/features/settings/devices/Devices.tsx b/src/app/features/settings/devices/Devices.tsx
index fc7eb4bb..03e3ed66 100644
--- a/src/app/features/settings/devices/Devices.tsx
+++ b/src/app/features/settings/devices/Devices.tsx
@@ -12,6 +12,7 @@ import {
import { useSecretStorageDefaultKeyId, useSecretStorageKeyContent } from '$hooks/useSecretStorage';
import { useCrossSigningActive } from '$hooks/useCrossSigning';
import { BackupRestoreTile } from '$components/BackupRestore';
+import { SequenceCardStyle } from '$features/settings/styles.css';
import { LocalBackup } from './LocalBackup';
import { DeviceLogoutBtn, DeviceKeyDetails, DeviceTile, DeviceTilePlaceholder } from './DeviceTile';
import { OtherDevices } from './OtherDevices';
@@ -21,7 +22,6 @@ import {
VerificationStatusBadge,
VerifyCurrentDeviceTile,
} from './Verification';
-import { SequenceCardStyle } from '$features/settings/styles.css';
function DevicesPlaceholder() {
return (
diff --git a/src/app/features/settings/devices/OtherDevices.tsx b/src/app/features/settings/devices/OtherDevices.tsx
index 7970bf77..e044201d 100644
--- a/src/app/features/settings/devices/OtherDevices.tsx
+++ b/src/app/features/settings/devices/OtherDevices.tsx
@@ -12,9 +12,9 @@ import { useAuthMetadata } from '$hooks/useAuthMetadata';
import { withSearchParam } from '$pages/pathUtils';
import { useAccountManagementActions } from '$hooks/useAccountManagement';
import { SettingTile } from '$components/setting-tile';
+import { SequenceCardStyle } from '$features/settings/styles.css';
import { VerifyOtherDeviceTile } from './Verification';
import { DeviceDeleteBtn, DeviceTile } from './DeviceTile';
-import { SequenceCardStyle } from '$features/settings/styles.css';
type OtherDevicesProps = {
devices: IMyDevice[];
diff --git a/src/app/features/settings/notifications/KeywordMessages.tsx b/src/app/features/settings/notifications/KeywordMessages.tsx
index a2852284..fba9b53a 100644
--- a/src/app/features/settings/notifications/KeywordMessages.tsx
+++ b/src/app/features/settings/notifications/KeywordMessages.tsx
@@ -13,8 +13,8 @@ import {
useNotificationModeActions,
} from '$hooks/useNotificationMode';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { NotificationModeSwitcher } from './NotificationModeSwitcher';
import { SequenceCardStyle } from '$features/settings/styles.css';
+import { NotificationModeSwitcher } from './NotificationModeSwitcher';
const NOTIFY_MODE_OPS: NotificationModeOptions = {
highlight: true,
diff --git a/src/app/features/settings/notifications/Notifications.tsx b/src/app/features/settings/notifications/Notifications.tsx
index f74f8604..ef84ae59 100644
--- a/src/app/features/settings/notifications/Notifications.tsx
+++ b/src/app/features/settings/notifications/Notifications.tsx
@@ -2,11 +2,11 @@ import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageHeader } from '$components/page';
import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
+import { SequenceCardStyle } from '$features/settings/styles.css';
import { SystemNotification } from './SystemNotification';
import { AllMessagesNotifications } from './AllMessages';
import { SpecialMessagesNotifications } from './SpecialMessages';
import { KeywordMessagesNotifications } from './KeywordMessages';
-import { SequenceCardStyle } from '$features/settings/styles.css';
type NotificationsProps = {
requestClose: () => void;
diff --git a/src/app/features/space-settings/SpaceSettings.tsx b/src/app/features/space-settings/SpaceSettings.tsx
index ffdd6d42..79ab8442 100644
--- a/src/app/features/space-settings/SpaceSettings.tsx
+++ b/src/app/features/space-settings/SpaceSettings.tsx
@@ -15,9 +15,9 @@ import { useRoom } from '$hooks/useRoom';
import { EmojisStickers } from '$features/common-settings/emojis-stickers';
import { Members } from '$features/common-settings/members';
import { DeveloperTools } from '$features/common-settings/developer-tools';
+import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics';
import { General } from './general';
import { Permissions } from './permissions';
-import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics';
type SpaceSettingsMenuItem = {
page: SpaceSettingsPage;
diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts
index d9c4e7d6..c12f3f6e 100644
--- a/src/app/hooks/useCommands.ts
+++ b/src/app/hooks/useCommands.ts
@@ -23,10 +23,10 @@ import {
rateLimitedActions,
removeRoomIdFromMDirect,
} from '$utils/matrix';
-import { useRoomNavigate } from './useRoomNavigate';
import { getStateEvent } from '$utils/room';
import { splitWithSpace } from '$utils/common';
import { createRoomEncryptionState } from '$components/create-room';
+import { useRoomNavigate } from './useRoomNavigate';
import { enrichWidgetUrl } from './useRoomWidgets';
export const SHRUG = '¯\\_(ツ)_/¯';
diff --git a/src/app/hooks/useDeviceVerificationStatus.ts b/src/app/hooks/useDeviceVerificationStatus.ts
index f6102fe6..4d2ea071 100644
--- a/src/app/hooks/useDeviceVerificationStatus.ts
+++ b/src/app/hooks/useDeviceVerificationStatus.ts
@@ -1,8 +1,8 @@
import { useCallback, useEffect, useState } from 'react';
import { CryptoApi } from '$types/matrix-sdk';
import { verifiedDevice } from '$utils/matrix-crypto';
-import { useAlive } from './useAlive';
import { fulfilledPromiseSettledResult } from '$utils/common';
+import { useAlive } from './useAlive';
import { useMatrixClient } from './useMatrixClient';
import { useDeviceListChange } from './useDeviceList';
diff --git a/src/app/hooks/useJoinedRoomId.ts b/src/app/hooks/useJoinedRoomId.ts
index 96085031..d52f4f5b 100644
--- a/src/app/hooks/useJoinedRoomId.ts
+++ b/src/app/hooks/useJoinedRoomId.ts
@@ -1,7 +1,6 @@
import { useMemo } from 'react';
-import { useMatrixClient } from './useMatrixClient';
-
import { getCanonicalAliasRoomId, isRoomAlias } from '$utils/matrix';
+import { useMatrixClient } from './useMatrixClient';
export const useJoinedRoomId = (allRooms: string[], roomIdOrAlias: string): string | undefined => {
const mx = useMatrixClient();
diff --git a/src/app/hooks/useMemberPowerTag.ts b/src/app/hooks/useMemberPowerTag.ts
index f8c862c0..ac2df17c 100644
--- a/src/app/hooks/useMemberPowerTag.ts
+++ b/src/app/hooks/useMemberPowerTag.ts
@@ -1,11 +1,11 @@
import { useCallback, useMemo } from 'react';
import { MatrixClient, Room, RoomMember } from '$types/matrix-sdk';
import { MemberPowerTag, MemberPowerTagIcon } from '$types/matrix/room';
+import { accessibleColor } from '$plugins/color';
import { getPowerLevelTag, PowerLevelTags, usePowerLevelTags } from './usePowerLevelTags';
import { IPowerLevels, readPowerLevel } from './usePowerLevels';
import { useRoomCreatorsTag } from './useRoomCreatorsTag';
import { ThemeKind } from './useTheme';
-import { accessibleColor } from '$plugins/color';
export type GetMemberPowerTag = (userId: string) => MemberPowerTag;
diff --git a/src/app/hooks/useMentionClickHandler.ts b/src/app/hooks/useMentionClickHandler.ts
index 25d7a828..aadfb982 100644
--- a/src/app/hooks/useMentionClickHandler.ts
+++ b/src/app/hooks/useMentionClickHandler.ts
@@ -1,11 +1,11 @@
import { ReactEventHandler, useCallback } from 'react';
import { useNavigate } from 'react-router-dom';
-import { useRoomNavigate } from './useRoomNavigate';
-import { useMatrixClient } from './useMatrixClient';
import { isRoomId, isUserId } from '$utils/matrix';
import { getHomeRoomPath, withSearchParam } from '$pages/pathUtils';
import { RoomSearchParams } from '$pages/paths';
import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
+import { useMatrixClient } from './useMatrixClient';
+import { useRoomNavigate } from './useRoomNavigate';
import { useSpaceOptionally } from './useSpace';
export const useMentionClickHandler = (roomId: string): ReactEventHandler => {
diff --git a/src/app/hooks/useNotificationJumper.ts b/src/app/hooks/useNotificationJumper.ts
index da35a81a..507f9669 100644
--- a/src/app/hooks/useNotificationJumper.ts
+++ b/src/app/hooks/useNotificationJumper.ts
@@ -2,10 +2,10 @@ import { useCallback, useEffect } from 'react';
import { useAtom } from 'jotai';
import { SyncState, ClientEvent } from '$types/matrix-sdk';
import { pendingNotificationAtom } from '$state/sessions';
+import { createLogger } from '$utils/debug';
import { useSyncState } from './useSyncState';
import { useMatrixClient } from './useMatrixClient';
import { useRoomNavigate } from './useRoomNavigate';
-import { createLogger } from '$utils/debug';
export function NotificationJumper() {
const [pending, setPending] = useAtom(pendingNotificationAtom);
diff --git a/src/app/hooks/usePathWithOrigin.ts b/src/app/hooks/usePathWithOrigin.ts
index 1565364b..956153dc 100644
--- a/src/app/hooks/usePathWithOrigin.ts
+++ b/src/app/hooks/usePathWithOrigin.ts
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
-import { useClientConfig } from './useClientConfig';
import { trimLeadingSlash, trimSlash, trimTrailingSlash } from '$utils/common';
+import { useClientConfig } from './useClientConfig';
export const usePathWithOrigin = (path: string): string => {
const { hashRouter } = useClientConfig();
diff --git a/src/app/hooks/usePowerLevels.ts b/src/app/hooks/usePowerLevels.ts
index 79fa8fc3..4b1b874b 100644
--- a/src/app/hooks/usePowerLevels.ts
+++ b/src/app/hooks/usePowerLevels.ts
@@ -2,10 +2,10 @@ import { MatrixEvent, Room } from '$types/matrix-sdk';
import { createContext, useCallback, useContext, useMemo, useState } from 'react';
import { produce } from 'immer';
import { StateEvent } from '$types/matrix/room';
+import { getStateEvent } from '$utils/room';
import { useStateEvent } from './useStateEvent';
import { useStateEventCallback } from './useStateEventCallback';
import { useMatrixClient } from './useMatrixClient';
-import { getStateEvent } from '$utils/room';
export type PowerLevelActions = 'invite' | 'redact' | 'kick' | 'ban' | 'historical';
export type PowerLevelNotificationsAction = 'room';
diff --git a/src/app/hooks/useRoomAliases.ts b/src/app/hooks/useRoomAliases.ts
index fb51b375..36fff1ad 100644
--- a/src/app/hooks/useRoomAliases.ts
+++ b/src/app/hooks/useRoomAliases.ts
@@ -1,11 +1,11 @@
import { useCallback, useEffect, useMemo } from 'react';
import { MatrixError, Room, RoomCanonicalAliasEventContent } from '$types/matrix-sdk';
import { StateEvent } from '$types/matrix/room';
+import { getStateEvent } from '$utils/room';
import { AsyncState, useAsyncCallback } from './useAsyncCallback';
import { useMatrixClient } from './useMatrixClient';
import { useAlive } from './useAlive';
import { useStateEvent } from './useStateEvent';
-import { getStateEvent } from '$utils/room';
export const usePublishedAliases = (room: Room): [string | undefined, string[]] => {
const aliasContent = useStateEvent(
diff --git a/src/app/hooks/useRoomCreators.ts b/src/app/hooks/useRoomCreators.ts
index 1ee0740c..6c4f740c 100644
--- a/src/app/hooks/useRoomCreators.ts
+++ b/src/app/hooks/useRoomCreators.ts
@@ -1,9 +1,9 @@
import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
import { useMemo } from 'react';
import { IRoomCreateContent, StateEvent } from '$types/matrix/room';
-import { useStateEvent } from './useStateEvent';
import { creatorsSupported } from '$utils/matrix';
import { getStateEvent } from '$utils/room';
+import { useStateEvent } from './useStateEvent';
export const getRoomCreators = (createEvent: MatrixEvent): Set => {
const createContent = createEvent.getContent();
diff --git a/src/app/hooks/useRoomNavigate.ts b/src/app/hooks/useRoomNavigate.ts
index 8cc6344f..51555125 100644
--- a/src/app/hooks/useRoomNavigate.ts
+++ b/src/app/hooks/useRoomNavigate.ts
@@ -8,13 +8,13 @@ import {
getSpacePath,
getSpaceRoomPath,
} from '$pages/pathUtils';
-import { useMatrixClient } from './useMatrixClient';
import { getOrphanParents, guessPerfectParent } from '$utils/room';
import { roomToParentsAtom } from '$state/room/roomToParents';
import { mDirectAtom } from '$state/mDirectList';
-import { useSelectedSpace } from './router/useSelectedSpace';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
+import { useSelectedSpace } from './router/useSelectedSpace';
+import { useMatrixClient } from './useMatrixClient';
export const useRoomNavigate = () => {
const navigate = useNavigate();
diff --git a/src/app/hooks/useRoomWidgets.ts b/src/app/hooks/useRoomWidgets.ts
index 857da6aa..a424e2ec 100644
--- a/src/app/hooks/useRoomWidgets.ts
+++ b/src/app/hooks/useRoomWidgets.ts
@@ -2,9 +2,9 @@ import { Room, MatrixEvent, MatrixClient } from '$types/matrix-sdk';
import { useCallback, useMemo } from 'react';
import { IWidget } from 'matrix-widget-api';
import { StateEvent } from '$types/matrix/room';
+import { getStateEvents } from '$utils/room';
import { useStateEventCallback } from './useStateEventCallback';
import { useForceUpdate } from './useForceUpdate';
-import { getStateEvents } from '$utils/room';
export interface RoomWidget extends IWidget {
eventId?: string;
diff --git a/src/app/hooks/useRoomsNotificationPreferences.ts b/src/app/hooks/useRoomsNotificationPreferences.ts
index cba04e61..65626bc1 100644
--- a/src/app/hooks/useRoomsNotificationPreferences.ts
+++ b/src/app/hooks/useRoomsNotificationPreferences.ts
@@ -2,8 +2,8 @@ import { createContext, useCallback, useContext, useMemo } from 'react';
import { ConditionKind, IPushRules, MatrixClient, PushRuleKind } from '$types/matrix-sdk';
import { Icons, IconSrc } from 'folds';
import { AccountDataEvent } from '$types/matrix/accountData';
-import { useAccountData } from './useAccountData';
import { isRoomId } from '$utils/matrix';
+import { useAccountData } from './useAccountData';
import {
getNotificationMode,
getNotificationModeActions,
diff --git a/src/app/hooks/useSidebarItems.ts b/src/app/hooks/useSidebarItems.ts
index c3e525c4..dba7b2f2 100644
--- a/src/app/hooks/useSidebarItems.ts
+++ b/src/app/hooks/useSidebarItems.ts
@@ -2,8 +2,8 @@ import { Dispatch, SetStateAction, useCallback, useEffect, useState } from 'reac
import { MatrixClient } from '$types/matrix-sdk';
import { AccountDataEvent } from '$types/matrix/accountData';
import { Membership } from '$types/matrix/room';
-import { useMatrixClient } from './useMatrixClient';
import { getAccountData, isSpace } from '$utils/room';
+import { useMatrixClient } from './useMatrixClient';
import { useAccountDataCallback } from './useAccountDataCallback';
export type ISidebarFolder = {
diff --git a/src/app/hooks/useSpaceHierarchy.ts b/src/app/hooks/useSpaceHierarchy.ts
index 793bd70f..af8c8019 100644
--- a/src/app/hooks/useSpaceHierarchy.ts
+++ b/src/app/hooks/useSpaceHierarchy.ts
@@ -3,11 +3,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { QueryFunction, useInfiniteQuery } from '@tanstack/react-query';
import { MSpaceChildContent, StateEvent } from '$types/matrix/room';
-import { useMatrixClient } from './useMatrixClient';
import { roomToParentsAtom } from '$state/room/roomToParents';
import { getAllParents, getStateEvents, isValidChild } from '$utils/room';
import { isRoomId } from '$utils/matrix';
import { SortFunc, byOrderKey, byTsOldToNew, factoryRoomIdByActivity } from '$utils/sort';
+import { useMatrixClient } from './useMatrixClient';
import { useStateEventCallback } from './useStateEventCallback';
import { ErrorCode } from '../cs-errorcode';
diff --git a/src/app/hooks/useStateEvent.ts b/src/app/hooks/useStateEvent.ts
index 10afec0b..ba99eff5 100644
--- a/src/app/hooks/useStateEvent.ts
+++ b/src/app/hooks/useStateEvent.ts
@@ -1,9 +1,9 @@
import { Room } from '$types/matrix-sdk';
import { useCallback, useMemo } from 'react';
import { StateEvent } from '$types/matrix/room';
+import { getStateEvent } from '$utils/room';
import { useStateEventCallback } from './useStateEventCallback';
import { useForceUpdate } from './useForceUpdate';
-import { getStateEvent } from '$utils/room';
export const useStateEvent = (room: Room, eventType: StateEvent, stateKey = '') => {
const [updateCount, forceUpdate] = useForceUpdate();
diff --git a/src/app/hooks/useTextAreaCodeEditor.ts b/src/app/hooks/useTextAreaCodeEditor.ts
index 5c95a191..ff44e934 100644
--- a/src/app/hooks/useTextAreaCodeEditor.ts
+++ b/src/app/hooks/useTextAreaCodeEditor.ts
@@ -1,8 +1,8 @@
import { useMemo, useCallback, KeyboardEventHandler, MutableRefObject } from 'react';
import { isKeyHotkey } from 'is-hotkey';
import { TextArea, Intent, TextAreaOperations, Cursor } from '$plugins/text-area';
-import { useTextAreaIntentHandler } from './useTextAreaIntent';
import { GetTarget } from '$plugins/text-area/type';
+import { useTextAreaIntentHandler } from './useTextAreaIntent';
export const useTextAreaCodeEditor = (
textAreaRef: MutableRefObject,
diff --git a/src/app/hooks/useTheme.ts b/src/app/hooks/useTheme.ts
index fbfdc68f..f053d900 100644
--- a/src/app/hooks/useTheme.ts
+++ b/src/app/hooks/useTheme.ts
@@ -1,4 +1,6 @@
import { createContext, useContext, useEffect, useMemo, useState } from 'react';
+import { settingsAtom } from '$state/settings';
+import { useSetting } from '$state/hooks/settings';
import { onDarkFontWeight, onLightFontWeight } from '../../config.css';
import {
butterTheme,
@@ -9,8 +11,6 @@ import {
silverTheme,
gruvdarkTheme,
} from '../../colors.css';
-import { settingsAtom } from '$state/settings';
-import { useSetting } from '$state/hooks/settings';
export enum ThemeKind {
Light = 'light',
diff --git a/src/app/hooks/useUserProfile.ts b/src/app/hooks/useUserProfile.ts
index 4afab6a4..2b546b55 100644
--- a/src/app/hooks/useUserProfile.ts
+++ b/src/app/hooks/useUserProfile.ts
@@ -4,10 +4,10 @@ import { selectAtom } from 'jotai/utils';
import { EventTimeline, Room } from '$types/matrix-sdk';
import { StateEvent } from '$types/matrix/room';
import colorMXID from '$utils/colorMXID';
-import { useMatrixClient } from './useMatrixClient';
import { profilesCacheAtom } from '$state/userRoomProfile';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
+import { useMatrixClient } from './useMatrixClient';
const inFlightProfiles = new Map>();
diff --git a/src/app/hooks/useVirtualPaginator.ts b/src/app/hooks/useVirtualPaginator.ts
index aedef122..3b5ae870 100644
--- a/src/app/hooks/useVirtualPaginator.ts
+++ b/src/app/hooks/useVirtualPaginator.ts
@@ -1,11 +1,11 @@
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from 'react';
-import { OnIntersectionCallback, useIntersectionObserver } from './useIntersectionObserver';
import {
canFitInScrollView,
getScrollInfo,
isInScrollView,
isIntersectingScrollView,
} from '$utils/dom';
+import { OnIntersectionCallback, useIntersectionObserver } from './useIntersectionObserver';
const PAGINATOR_ANCHOR_ATTR = 'data-paginator-anchor';
diff --git a/src/app/pages/App.tsx b/src/app/pages/App.tsx
index 6263723f..bfe51f2a 100644
--- a/src/app/pages/App.tsx
+++ b/src/app/pages/App.tsx
@@ -6,11 +6,11 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import { ClientConfigLoader } from '$components/ClientConfigLoader';
import { ClientConfigProvider } from '$hooks/useClientConfig';
+import { ScreenSizeProvider, useScreenSize } from '$hooks/useScreenSize';
+import { useCompositionEndTracking } from '$hooks/useComposingCheck';
import { ConfigConfigError, ConfigConfigLoading } from './ConfigConfig';
import { FeatureCheck } from './FeatureCheck';
import { createRouter } from './Router';
-import { ScreenSizeProvider, useScreenSize } from '$hooks/useScreenSize';
-import { useCompositionEndTracking } from '$hooks/useComposingCheck';
const queryClient = new QueryClient();
diff --git a/src/app/pages/Router.tsx b/src/app/pages/Router.tsx
index 0d79b8e0..5d755772 100644
--- a/src/app/pages/Router.tsx
+++ b/src/app/pages/Router.tsx
@@ -8,6 +8,21 @@ import {
} from 'react-router-dom';
import { ClientConfig } from '$hooks/useClientConfig';
+import { Room } from '$features/room';
+import { Lobby } from '$features/lobby';
+import { PageRoot } from '$components/page';
+import { ScreenSize } from '$hooks/useScreenSize';
+import { ReceiveSelfDeviceVerification } from '$components/DeviceVerification';
+import { AutoRestoreBackupOnVerification } from '$components/BackupRestore';
+import { RoomSettingsRenderer } from '$features/room-settings';
+import { SpaceSettingsRenderer } from '$features/space-settings';
+import { UserRoomProfileRenderer } from '$components/UserRoomProfileRenderer';
+import { CreateRoomModalRenderer } from '$features/create-room';
+import { CreateSpaceModalRenderer } from '$features/create-space';
+import { getFallbackSession, MATRIX_SESSIONS_KEY, Sessions } from '$state/sessions';
+import { getLocalStorageItem } from '$state/utils/atomWithLocalStorage';
+import { NotificationJumper } from '$hooks/useNotificationJumper';
+import { SearchModalRenderer } from '$features/search';
import { AuthLayout, Login, Register, ResetPassword } from './auth';
import {
DIRECT_PATH,
@@ -45,32 +60,17 @@ import { RouteSpaceProvider, Space, SpaceRouteRoomProvider, SpaceSearch } from '
import { Explore, FeaturedRooms, PublicRooms } from './client/explore';
import { Notifications, Inbox, Invites } from './client/inbox';
import { setAfterLoginRedirectPath } from './afterLoginRedirectPath';
-import { Room } from '$features/room';
-import { Lobby } from '$features/lobby';
import { WelcomePage } from './client/WelcomePage';
import { SidebarNav } from './client/SidebarNav';
-import { PageRoot } from '$components/page';
-import { ScreenSize } from '$hooks/useScreenSize';
import { MobileFriendlyPageNav, MobileFriendlyClientNav } from './MobileFriendly';
import { ClientInitStorageAtom } from './client/ClientInitStorageAtom';
import { ClientNonUIFeatures } from './client/ClientNonUIFeatures';
import { AuthRouteThemeManager, UnAuthRouteThemeManager } from './ThemeManager';
-import { ReceiveSelfDeviceVerification } from '$components/DeviceVerification';
-import { AutoRestoreBackupOnVerification } from '$components/BackupRestore';
-import { RoomSettingsRenderer } from '$features/room-settings';
import { ClientRoomsNotificationPreferences } from './client/ClientRoomsNotificationPreferences';
-import { SpaceSettingsRenderer } from '$features/space-settings';
-import { UserRoomProfileRenderer } from '$components/UserRoomProfileRenderer';
-import { CreateRoomModalRenderer } from '$features/create-room';
import { HomeCreateRoom } from './client/home/CreateRoom';
import { Create } from './client/create';
-import { CreateSpaceModalRenderer } from '$features/create-space';
-import { SearchModalRenderer } from '$features/search';
-import { getFallbackSession, MATRIX_SESSIONS_KEY, Sessions } from '$state/sessions';
-import { getLocalStorageItem } from '$state/utils/atomWithLocalStorage';
import { CallProvider } from './client/call/CallProvider';
import { PersistentCallContainer } from './client/call/PersistentCallContainer';
-import { NotificationJumper } from '$hooks/useNotificationJumper';
/**
* Returns true if there is at least one stored session.
diff --git a/src/app/pages/auth/AuthLayout.tsx b/src/app/pages/auth/AuthLayout.tsx
index 387b2e98..edc913a6 100644
--- a/src/app/pages/auth/AuthLayout.tsx
+++ b/src/app/pages/auth/AuthLayout.tsx
@@ -21,9 +21,9 @@ import { AutoDiscoveryInfoProvider } from '$hooks/useAutoDiscoveryInfo';
import { AuthFlowsLoader } from '$components/AuthFlowsLoader';
import { AuthFlowsProvider } from '$hooks/useAuthFlows';
import { AuthServerProvider } from '$hooks/useAuthServer';
+import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '$pages/paths';
import { AutoDiscoveryAction, autoDiscovery } from '../../cs-api';
import { ServerPicker } from './ServerPicker';
-import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '$pages/paths';
import * as css from './styles.css';
import { AuthFooter } from './AuthFooter';
diff --git a/src/app/pages/auth/login/Login.tsx b/src/app/pages/auth/login/Login.tsx
index cb60dc4b..11df22a8 100644
--- a/src/app/pages/auth/login/Login.tsx
+++ b/src/app/pages/auth/login/Login.tsx
@@ -9,10 +9,10 @@ import { getLoginPath, getRegisterPath, withSearchParam } from '$pages/pathUtils
import { usePathWithOrigin } from '$hooks/usePathWithOrigin';
import { LoginPathSearchParams } from '$pages/paths';
import { useClientConfig } from '$hooks/useClientConfig';
-import { PasswordLoginForm } from './PasswordLoginForm';
import { SSOLogin } from '$pages/auth/SSOLogin';
-import { TokenLogin } from './TokenLogin';
import { OrDivider } from '$pages/auth/OrDivider';
+import { PasswordLoginForm } from './PasswordLoginForm';
+import { TokenLogin } from './TokenLogin';
const getLoginTokenSearchParam = () => {
// when using hasRouter query params in existing route
diff --git a/src/app/pages/auth/reset-password/PasswordResetForm.tsx b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
index a973a393..af4c5752 100644
--- a/src/app/pages/auth/reset-password/PasswordResetForm.tsx
+++ b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
@@ -26,8 +26,8 @@ import { EmailStageDialog } from '$components/uia-stages';
import { getLoginPath, withSearchParam } from '$pages/pathUtils';
import { LoginPathSearchParams } from '$pages/paths';
import { getUIAError, getUIAErrorCode } from '$utils/matrix-uia';
-import { ResetPasswordResult, resetPassword } from './resetPasswordUtil';
import { FieldError } from '$pages/auth/FiledError';
+import { ResetPasswordResult, resetPassword } from './resetPasswordUtil';
type FormData = {
email: string;
diff --git a/src/app/pages/client/ClientNonUIFeatures.tsx b/src/app/pages/client/ClientNonUIFeatures.tsx
index 70881a59..1c1b0e58 100644
--- a/src/app/pages/client/ClientNonUIFeatures.tsx
+++ b/src/app/pages/client/ClientNonUIFeatures.tsx
@@ -27,8 +27,8 @@ import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { useInboxNotificationsSelected } from '$hooks/router/useInbox';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { pendingNotificationAtom } from '$state/sessions';
-import { BackgroundNotifications } from './BackgroundNotifications';
import { getInboxInvitesPath } from '$pages/pathUtils';
+import { BackgroundNotifications } from './BackgroundNotifications';
function SystemEmojiFeature() {
const [twitterEmoji] = useSetting(settingsAtom, 'twitterEmoji');
diff --git a/src/app/pages/pathUtils.ts b/src/app/pages/pathUtils.ts
index 05e92b63..3872c929 100644
--- a/src/app/pages/pathUtils.ts
+++ b/src/app/pages/pathUtils.ts
@@ -1,4 +1,6 @@
import { generatePath, Path } from 'react-router-dom';
+import { trimLeadingSlash, trimTrailingSlash } from '$utils/common';
+import { HashRouterConfig } from '$hooks/useClientConfig';
import {
DIRECT_CREATE_PATH,
DIRECT_PATH,
@@ -24,8 +26,6 @@ import {
SPACE_SEARCH_PATH,
CREATE_PATH,
} from './paths';
-import { trimLeadingSlash, trimTrailingSlash } from '$utils/common';
-import { HashRouterConfig } from '$hooks/useClientConfig';
export const joinPathComponent = (path: Path): string => path.pathname + path.search + path.hash;
diff --git a/src/app/plugins/react-custom-html-parser.tsx b/src/app/plugins/react-custom-html-parser.tsx
index bdbba2bd..c02fc6b2 100644
--- a/src/app/plugins/react-custom-html-parser.tsx
+++ b/src/app/plugins/react-custom-html-parser.tsx
@@ -31,17 +31,17 @@ import {
import { getMemberDisplayName } from '$utils/room';
import { Nicknames } from '$state/nicknames';
import { EMOJI_PATTERN, sanitizeForRegex, URL_NEG_LB } from '$utils/regex';
-import { getHexcodeForEmoji, getShortcodeFor } from './emoji';
import { findAndReplace } from '$utils/findAndReplace';
+import { onEnterOrSpace } from '$utils/keyboard';
+import { copyToClipboard } from '$utils/dom';
+import { useTimeoutToggle } from '$hooks/useTimeoutToggle';
import {
parseMatrixToRoom,
parseMatrixToRoomEvent,
parseMatrixToUser,
testMatrixTo,
} from './matrix-to';
-import { onEnterOrSpace } from '$utils/keyboard';
-import { copyToClipboard } from '$utils/dom';
-import { useTimeoutToggle } from '$hooks/useTimeoutToggle';
+import { getHexcodeForEmoji, getShortcodeFor } from './emoji';
const ReactPrism = lazy(() => import('./react-prism/ReactPrism'));
diff --git a/src/app/state/sessions.ts b/src/app/state/sessions.ts
index 93f1f2fa..3a9b222a 100644
--- a/src/app/state/sessions.ts
+++ b/src/app/state/sessions.ts
@@ -1,10 +1,10 @@
import { atom } from 'jotai';
+import { createLogger } from '$utils/debug';
import {
atomWithLocalStorage,
getLocalStorageItem,
setLocalStorageItem,
} from './utils/atomWithLocalStorage';
-import { createLogger } from '$utils/debug';
const log = createLogger('sessions');
diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts
index 8999f84e..40f1c283 100644
--- a/src/client/initMatrix.ts
+++ b/src/client/initMatrix.ts
@@ -5,9 +5,7 @@ import {
IndexedDBCryptoStore,
} from '$types/matrix-sdk';
-import { cryptoCallbacks } from './secretStorageKeys';
import { clearNavToActivePathStore } from '$state/navToActivePath';
-import { pushSessionToSW } from '../sw-session';
import {
Session,
Sessions,
@@ -17,6 +15,8 @@ import {
} from '$state/sessions';
import { getLocalStorageItem } from '$state/utils/atomWithLocalStorage';
import { createLogger } from '$utils/debug';
+import { pushSessionToSW } from '../sw-session';
+import { cryptoCallbacks } from './secretStorageKeys';
const log = createLogger('initMatrix');
From 3e0207110804d75a639d9a0d87e8f96a129979a1 Mon Sep 17 00:00:00 2001
From: hazre
Date: Mon, 2 Mar 2026 23:46:12 +0100
Subject: [PATCH 59/59] ci: add docker image workflow
---
.github/workflows/docker-publish.yml | 76 ++++++++++++++++++++++++++++
README.md | 36 ++++++++++++-
2 files changed, 111 insertions(+), 1 deletion(-)
create mode 100644 .github/workflows/docker-publish.yml
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
new file mode 100644
index 00000000..ff7656b9
--- /dev/null
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,76 @@
+name: Build and publish Docker image
+
+on:
+ push:
+ branches: [dev]
+ tags:
+ - '+([0-9]).+([0-9]).+([0-9])'
+
+env:
+ REGISTRY: ghcr.io
+ IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+ build-and-push:
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ packages: write
+ attestations: write
+ artifact-metadata: write
+ id-token: write
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+
+ - name: Log in to GitHub Container Registry
+ uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+ with:
+ registry: ${{ env.REGISTRY }}
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Extract metadata
+ id: meta
+ uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+ with:
+ images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ flavor: |
+ latest=false
+ tags: |
+ # dev branch: short commit SHA + latest
+ type=sha,prefix=,format=short,enable=${{ github.ref == 'refs/heads/dev' }}
+ type=raw,value=latest,enable=${{ github.ref == 'refs/heads/dev' }}
+
+ # git tags: semver breakdown
+ type=semver,pattern={{version}}
+ type=semver,pattern={{major}}.{{minor}}
+ type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/0.') }}
+
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+
+ - name: Build and push Docker image
+ id: push
+ uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+ with:
+ context: .
+ push: true
+ platforms: linux/amd64,linux/arm64,linux/arm/v7
+ tags: ${{ steps.meta.outputs.tags }}
+ labels: ${{ steps.meta.outputs.labels }}
+ cache-from: type=gha
+ cache-to: type=gha,mode=max
+
+ - name: Generate artifact attestation
+ uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
+ with:
+ subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ subject-digest: ${{ steps.push.outputs.digest }}
+ push-to-registry: true
diff --git a/README.md b/README.md
index a893884f..f8998a50 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,41 @@ The web app is available at [app.sable.moe](https://app.sable.moe/) and gets upd
You can also download our desktop app for windows and linux from [releases](https://github.com/7w1/sable/releases/latest).
## Self-hosting
-To host Sable on your own, download this repo and built with nginx.
+You can either run the prebuilt container image or build Sable yourself.
+
+### Docker
+
+Prebuilt images are published to `ghcr.io/7w1/sable`.
+
+- `latest` tracks the current `dev` branch image.
+- `X.Y.Z` tags are versioned releases.
+- `X.Y` tags float within a release line.
+- Pushes to `dev` also publish a short commit SHA tag.
+
+Run the latest image with:
+
+```sh
+docker run --rm -p 8080:80 ghcr.io/7w1/sable:latest
+```
+
+Then open `http://localhost:8080`.
+
+If you want to override the bundled [`config.json`](config.json), mount your own
+file at `/app/config.json`:
+
+```yaml
+services:
+ sable:
+ image: ghcr.io/7w1/sable:latest
+ ports:
+ - '8080:80'
+ volumes:
+ - ./config.json:/app/config.json:ro
+```
+
+### Build it yourself
+
+To build and serve Sable yourself with nginx, clone this repo and build it:
```sh
npm ci # Installs all dependencies