Merge upstream tag 'v4.2.3'

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.eslintrc.cjs

@@ -61,4 +61,12 @@ module.exports = {
     "@typescript-eslint/no-unused-vars": "error",
     "@typescript-eslint/no-shadow": "error"
   },
+  overrides: [
+    {
+      files: ['*.ts'],
+      rules: {
+        'no-undef': 'off',
+      },
+    },
+  ],
 };

.github/workflows/build-pull-request.yml

@@ -12,9 +12,9 @@ jobs:
       PR_NUMBER: ${{github.event.number}}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.2.0
       - name: Setup node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.4
         with:
           node-version: 20.12.2
           cache: 'npm'
@@ -25,7 +25,7 @@ jobs:
           NODE_OPTIONS: '--max_old_space_size=4096'
         run: npm run build
       - name: Upload artifact
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: preview
           path: dist
@@ -33,7 +33,7 @@ jobs:
       - name: Save pr number
         run: echo ${PR_NUMBER} > ./pr.txt
       - name: Upload pr number
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: pr
           path: ./pr.txt

.github/workflows/cla.yml

@@ -12,7 +12,7 @@ jobs:
       - name: 'CLA Assistant'
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Beta Release
-        uses: cla-assistant/github-action@v2.4.0
+        uses: cla-assistant/github-action@v2.6.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret

.github/workflows/deploy-pull-request.yml

@@ -15,7 +15,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Download pr number
-        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
+        uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11
         with:
           workflow: ${{ github.event.workflow.id }}
           run_id: ${{ github.event.workflow_run.id }}
@@ -24,7 +24,7 @@ jobs:
         id: pr
         run: echo "id=$(<pr.txt)" >> $GITHUB_OUTPUT
       - name: Download artifact
-        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
+        uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11
         with:
           workflow: ${{ github.event.workflow.id }}
           run_id: ${{ github.event.workflow_run.id }}

.github/workflows/docker-pr.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.2.0
       - name: Build Docker image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.9.0
         with:
           context: .
           push: false

.github/workflows/lockfile.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.2.0
       - name: NPM Lockfile Changes
         uses: codepunkt/npm-lockfile-changes@b40543471c36394409466fdb277a73a0856d7891
         with:

.github/workflows/netlify-dev.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.2.0
       - name: Setup node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.4
         with:
           node-version: 20.12.2
           cache: 'npm'

.github/workflows/prod-deploy.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.2.0
       - name: Setup node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.4
         with:
           node-version: 20.12.2
           cache: 'npm'
@@ -52,7 +52,7 @@ jobs:
           gpg --export | xxd -p
           echo '${{ secrets.GNUPG_PASSPHRASE }}' | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --armor --detach-sign cinny-${{ steps.vars.outputs.tag }}.tar.gz
       - name: Upload tagged release
-        uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
         with:
           files: |
             cinny-${{ steps.vars.outputs.tag }}.tar.gz
@@ -66,18 +66,18 @@ jobs:
       packages: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.2.0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.2.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.3.0
+        uses: docker/setup-buildx-action@v3.6.1
       - name: Login to Docker Hub
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login to the Container registry
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -90,7 +90,7 @@ jobs:
             ${{ secrets.DOCKER_USERNAME }}/cinny
             ghcr.io/${{ github.repository }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.9.0
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.gitignore

@@ -4,3 +4,4 @@ node_modules
 devAssets
 
 .DS_Store
+.idea

.npmrc

@@ -1,3 +1,2 @@
 legacy-peer-deps=true
 save-exact=true
-@matrix-org:registry=https://gitlab.matrix.org/api/v4/projects/27/packages/npm/

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+cinnyapp@gmail.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Dockerfile

@@ -11,9 +11,10 @@ RUN npm run build
 
 
 ## App
-FROM nginx:1.26.0-alpine
+FROM nginx:1.27.0-alpine
 
 COPY --from=builder /src/dist /app
+COPY --from=builder /src/docker-nginx.conf /etc/nginx/conf.d/default.conf
 
 RUN rm -rf /usr/share/nginx/html \
   && ln -s /app /usr/share/nginx/html

README.md

@@ -19,22 +19,24 @@ A Matrix client focusing primarily on simple, elegant and secure interface. The
 <img align="center" src="https://raw.githubusercontent.com/cinnyapp/cinny-site/main/assets/preview2-light.png" height="380">
 
 ## Getting started
-Web app is available at https://app.cinny.in and gets updated on each new release. The `dev` branch is continuously deployed at https://dev.cinny.in but keep in mind that it could have things broken.
+* Web app is available at https://app.cinny.in and gets updated on each new release. The `dev` branch is continuously deployed at https://dev.cinny.in but keep in mind that it could have things broken.
 
-You can also download our desktop app from [cinny-desktop repository](https://github.com/cinnyapp/cinny-desktop).
+* You can also download our desktop app from [cinny-desktop repository](https://github.com/cinnyapp/cinny-desktop).
 
-To host Cinny on your own, download tarball of the app from [GitHub release](https://github.com/cinnyapp/cinny/releases/latest).
+* To host Cinny on your own, download tarball of the app from [GitHub release](https://github.com/cinnyapp/cinny/releases/latest).
 You can serve the application with a webserver of your choice by simply copying `dist/` directory to the webroot. 
-To set default Homeserver on login and register page, place a customized [`config.json`](config.json) in webroot of your choice.
+To set default Homeserver on login, register and Explore Community page, place a customized [`config.json`](config.json) in webroot of your choice.
+You will also need to setup redirects to serve the assests. An example setting of redirects for netlify is done in [`netlify.toml`](netlify.toml). You can also set `hashRouter.enabled = true` in [`config.json`](config.json) if you have trouble setting redirects.
+To deploy on subdirectory, you need to rebuild the app youself after updating the `base` path in [`build.config.ts`](build.config.ts). For example, if you want to deploy on `https://cinny.in/app`, then change `base: '/app'`.
 
-Alternatively you can just pull the [DockerHub image](https://hub.docker.com/r/ajbura/cinny) by:
+* Alternatively you can just pull the [DockerHub image](https://hub.docker.com/r/ajbura/cinny) by:
-```
+    ```
-docker pull ajbura/cinny
+    docker pull ajbura/cinny
-```
+    ```
-or [ghcr image](https://github.com/cinnyapp/cinny/pkgs/container/cinny) by:
+    or [ghcr image](https://github.com/cinnyapp/cinny/pkgs/container/cinny) by:
-```
+    ```
-docker pull ghcr.io/cinnyapp/cinny:latest
+    docker pull ghcr.io/cinnyapp/cinny:latest
-```
+    ```
 
 <details>
 <summary>PGP Public Key to verify tarball</summary>
@@ -51,16 +53,16 @@ Frn9ttCEzV55Y+so4X2e4ZnB+5gOnNw+ecifGVdj/+UyWnqvqqDvLrEjjK890nLb
 Pil4siecNMEpiwAN6WSmKpWaCwQAHEGDVeZCc/kT0iYfj5FBcsTVqWiO6eaxkUlm
 jnulqWqRrlB8CJQQvih/g//uSEBdzIibo+ro+3Jpe120U/XVUH62i9HoRQEm6ADG
 4zS5hIq4xyA8fL8AEQEAAbQdQ2lubnlBcHAgPGNpbm55YXBwQGdtYWlsLmNvbT6J
-AdQEEwEIAD4WIQSRri2MHidaaZv+vvuUMwx6UK/M8wUCYnD+DQIbAwUJA8JnAAUL
+AdQEEwEIAD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQSRri2MHidaaZv+
-CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCUMwx6UK/M88ApC/9HAdbum1lYBC0s
+vvuUMwx6UK/M8wUCZqEDwAUJFvwIswAKCRCUMwx6UK/M877qC/4lxXOQIoWnLLkK
-1k7GwP2A7B4sQtBWjy771BzybWlHeaeG+BGJwg4YiuowXZMm5dubFJFoI/CfeY07
+YiRCTkGsH6NdxgeYr6wpXT4xuQ45ZxCytwHpOGQmO/5up5961TxWW8D1frRIJHjj
-B5aK40/bmT6Xcfkp0VA74c1wUpubBUEJN7tH5HG/OGd9BKeq9E/HHtVaJLVT1k3w
+AZGoRCL3EKEuY8nt3D99fpf3DvZrs1uoVAhiyn737hRlZAg+QsJheeGCmdSJ0hX5
-Rhv9VuHO6nR30EEp7IDthftotl5S4lio3+W0pKk4TAKV8vjaCNp3y/lAHzoP1BU9
+Yud8SE+9zxLS1+CEjMrsUd/RGre/phme+wNXfaHfREAC9ewolgVChPIbMxG2f+vs
-bUSao+7GXVeArKBjuqxN+t1uuiaxPH4L0oe2pMVjTig04zGJM5fTVoly859MEcC/
+K8Xv52BFng7ta9fgsl1XuOjpuaSbQv6g+4ONk/lxKF0SmnhEGM3dmIYPONxW47Yf
-R7Taq9RWGfXFmgCXy8Dviz3eOD90vqpCzhX4+ypK0cp2X0UwhMH4dpKUzExmdbhl
+atnIjRra/YhPTNwrNBGMmG4IFKaOsMbjW/eakjWTWOVKKJNBMoDdRcYYWIMCpLy8
-eBO5GcHB4VxvloRBNf9/Lr7YOTgWejMUw+MlhZE2RE8unfW1LnM/cjL4dhXzO/XB
+AQUrMtQEsHSnqCwrw818S5A6rrhcfVGk36RGm0nOy6LS5g5jmqaYsvbCcBGY9B2c
-FUHHNq8d6d4e02rfWqw7mZo2/NVJgFRcvzw2rgx7w7CKtCNwF4lNjUetB2waZzDb
+SUAVNm17oo7TtEajk8hcSXoZod1t++pyjcVKEmSn3nFK7v5m3V+cPhNTxZMK459P
-fAE0kwhK4Iuwvy12JOBzL0Yy9MxANtwUryr/LQz9AmdT4Rwnp0S5AY0EYnD+DQEM
+3x1Ucqj/kTqrxKw6s2Uknuk0ajmw0ljV+BQwgL6maguo9BKgCNW5AY0EYnD+DQEM
 ANOu/d6ZMF8bW+Df9RDCUQKytbaZfa+ZbIHBus7whCD/SQMOhPKntv3HX7SmMCs+
 5i27kJMu4YN623JCS7hdCoXVO1R5kXCEcneW/rPBMDutaM472YvIWMIqK9Wwl5+0
 Piu2N+uTkKhe9uS2u7eN+Khef3d7xfjGRxoppM+xI9dZO+jhYiy8LuC0oBohTjJq
@@ -69,17 +71,17 @@ s1+eh00n/tVpi2Jj9pCm7S0csSXvXj8v2OTdK1jt4YjpzR0/rwh4+/xlOjDjZEqH
 vMPhpzpbgnwkxZ3X8BFne9dJ3maC5zQ3LAeCP5m1W0hXzagYhfyjo74slJgD1O8c
 LDf2Oxc5MyM8Y/UK497zfqSPfgT3NhQmhHzk83DjXw3I6Z3A3U+Jp61w0eBRI1nx
 H1UIG+gldcAKUTcfwL0lghoT3nmi9JAbvek0Smhz00Bbo8/dx8vwQRxDUxlt7Exx
-NwARAQABiQG8BBgBCAAmFiEEka4tjB4nWmmb/r77lDMMelCvzPMFAmJw/g0CGwwF
+NwARAQABiQG8BBgBCAAmAhsMFiEEka4tjB4nWmmb/r77lDMMelCvzPMFAmahA9IF
-CQPCZwAACgkQlDMMelCvzPPT7Qv8CjXUEhphZFLwpBfaNOzRNfIXJST9aDit8zHW
+CRb8CMUACgkQlDMMelCvzPPQgQv/d5/z+fxgKqgfhQX+V49X4WgTVxZ/CzztDoJ1
-IMmfSpORVfpU71IyIB3o/DtTUPwCeb8nvNJs7aj1QT1ZUSsqFa3yY2S16V/g8+WN
+XAq1dzTNEy8AFguXIo6eVXPSpMxec7ZreN3+UPQBnCf3eR5YxWNYOYKmk0G4E8D2
-sHca6oDSc1J+A0eEpEL1HbG1b5OPBC0AeGvvMOoqrbqThBZVKg1Jc/0SD3cvKElv
+KGUJept7TSA42/8N2ov6tToXFg4CgzKZj0fYLwgutly7K8eiWmSU6ptaO8aEQBHB
-aHeCZCNNmfcZ2Ib4HYhhc8//ZtC9TeI+5J/YesctY1M12EoWMxMrc27Y3P5Pa0BI
+gTGIOO3h6vJMGVycmoeRnHjv4wV84YWSVFSoJ7cY0he4Z9UznJBbE/KHZjrkXsPo
-Uc3qxWggPq1vOFYsEshL0w99HyJvREJmQA7Fa0crV+rICxyrBxJeNnEvjH/0KCBU
+N+Gg5lDuOP5xjKzM5SogV9lhxBAhMWAg3URUF15yruZBiA8uV1FOK8sal/9C1G7V
-LCkEonLY1QwrxyeeV3VpxGE3zHHE3azOdAjTIoAdzX5f/qhbgYlM68GL2f8xdDkp
+M6ygA6uOZqXlZtcdA94RoSsW2pZ9eLVPsxz2B3Zko7tu11MpNP/wYmfGTI3KxZBj
-O0igSGHWhO4F8BfmE7IOTx1Bi7daczp8nCFxh73cKpKB0RUsd9xxrqYpovjmEAlo
+n/eodvwjJSgHpGOFSmbNzvPJo3to5nNlp7wH1KxIMc6Uuu9hgfDfwkFZgV2bnFIa
-w7aHpdzt64NQcsrbK10OSVDF3gFa9Vz20/NQvdUrp8jGmAb/8+nYqI94Jsc28H36
+Q6gyF548Ub48z7Dz83+WwLgbX19ve4oZx+dqSdczP6ILHRQomtrzrkkP2LU52oI5
-UeGsouhyuITLwEhScounZDqop+Dx
+mxFo+ioe/ABCufSmyqFye0psX3Sp
-=Zg+6
+=WtqZ
 -----END PGP PUBLIC KEY BLOCK-----
 ```
 </details>

config.json

@@ -10,6 +10,27 @@
   ],
   "allowCustomHomeservers": true,
 
+  "featuredCommunities": {
+    "openAsDefault": false,
+    "spaces": [
+      "#cinny-space:matrix.org",
+      "#community:matrix.org",
+      "#space:envs.net",
+      "#science-space:matrix.org",
+      "#libregaming-games:tchncs.de",
+      "#mathematics-on:matrix.org"
+    ],
+    "rooms": [
+      "#cinny:matrix.org",
+      "#freesoftware:matrix.org",
+      "#pcapdroid:matrix.org",
+      "#gentoo:matrix.org",
+      "#PrivSec.dev:arcticfoxes.net",
+      "#disroot:aria-net.org"
+    ],
+    "servers": ["envs.net", "matrix.org", "monero.social", "mozilla.org"]
+  },
+
   "hashRouter": {
     "enabled": false,
     "basename": "/"

contrib/nginx/cinny.domain.tld.conf

@@ -19,9 +19,17 @@ server {
 
 	location / {
 		root /opt/cinny/dist/;
-		index index.html;
+
-	}
+		rewrite ^/config.json$ /config.json break;
-	location ~* ^\/(login|register) {
+    rewrite ^/manifest.json$ /manifest.json break;
-		try_files $uri $uri/ /index.html;
+
+    rewrite ^.*/olm.wasm$ /olm.wasm break;
+    rewrite ^/sw.js$ /sw.js break;
+    rewrite ^/pdf.worker.min.js$ /pdf.worker.min.js break;
+
+    rewrite ^/public/(.*)$ /public/$1 break;
+    rewrite ^/assets/(.*)$ /assets/$1 break;
+
+    rewrite ^(.+)$ /index.html break;
 	}
 }

docker-nginx.conf

@@ -0,0 +1,20 @@
+server {
+  listen 80;
+  listen [::]:80;
+
+  location / {
+    root /usr/share/nginx/html;
+
+    rewrite ^/config.json$ /config.json break;
+    rewrite ^/manifest.json$ /manifest.json break;
+
+    rewrite ^.*/olm.wasm$ /olm.wasm break;
+    rewrite ^/sw.js$ /sw.js break;
+    rewrite ^/pdf.worker.min.js$ /pdf.worker.min.js break;
+
+    rewrite ^/public/(.*)$ /public/$1 break;
+    rewrite ^/assets/(.*)$ /assets/$1 break;
+
+    rewrite ^(.+)$ /index.html break;
+  }
+}

index.html

@@ -90,12 +90,6 @@
       window.global ||= window;
     </script>
     <div id="root"></div>
-    <audio id="notificationSound">
-      <source src="./public/sound/notification.ogg" type="audio/ogg" />
-    </audio>
-    <audio id="inviteSound">
-      <source src="./public/sound/invite.ogg" type="audio/ogg" />
-    </audio>
     <script type="module" src="./src/index.tsx"></script>
   </body>
 </html>

netlify.toml

@@ -9,9 +9,15 @@
   status = 200
 
 [[redirects]]
-  from = "/olm.wasm"
+  from = "/sw.js"
+  to = "/sw.js"
+  status = 200
+
+[[redirects]]
+  from = "*/olm.wasm"
   to = "/olm.wasm"
   status = 200
+  force = true
   
 [[redirects]]
   from = "/pdf.worker.min.js"
@@ -32,3 +38,4 @@
   from = "/*"
   to = "/index.html"
   status = 200
+  force = true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cinny",
-  "version": "3.2.0",
+  "version": "4.2.3",
   "description": "Yet another matrix client",
   "main": "index.js",
   "type": "module",
@@ -20,10 +20,14 @@
   "author": "Ajay Bura",
   "license": "AGPL-3.0-only",
   "dependencies": {
+    "@atlaskit/pragmatic-drag-and-drop": "1.1.6",
+    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "1.3.0",
+    "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.0.3",
     "@fontsource/inter": "4.5.14",
-    "@khanacademy/simple-markdown": "0.8.6",
+    "@matrix-org/olm": "3.2.15",
-    "@matrix-org/olm": "3.2.14",
+    "@tanstack/react-query": "5.24.1",
-    "@tanstack/react-virtual": "3.0.0-beta.54",
+    "@tanstack/react-query-devtools": "5.24.1",
+    "@tanstack/react-virtual": "3.2.0",
     "@tippyjs/react": "4.2.6",
     "@vanilla-extract/css": "1.9.3",
     "@vanilla-extract/recipes": "0.3.0",
@@ -40,18 +44,19 @@
     "file-saver": "2.0.5",
     "flux": "4.0.3",
     "focus-trap-react": "10.0.2",
-    "folds": "1.5.1",
+    "folds": "2.0.0",
-    "formik": "2.2.9",
+    "formik": "2.4.6",
     "html-dom-parser": "4.0.0",
     "html-react-parser": "4.2.0",
+    "i18next": "23.12.2",
+    "i18next-browser-languagedetector": "8.0.0",
+    "i18next-http-backend": "2.5.2",
     "immer": "9.0.16",
     "is-hotkey": "0.2.0",
     "jotai": "2.6.0",
-    "katex": "0.16.10",
+    "linkify-react": "4.1.3",
-    "linkify-html": "4.0.2",
+    "linkifyjs": "4.1.3",
-    "linkify-react": "4.1.1",
+    "matrix-js-sdk": "34.11.1",
-    "linkifyjs": "4.0.2",
-    "matrix-js-sdk": "29.1.0",
     "millify": "6.1.0",
     "pdfjs-dist": "4.2.67",
     "prismjs": "1.29.0",
@@ -60,11 +65,10 @@
     "react-aria": "3.29.1",
     "react-autosize-textarea": "7.1.0",
     "react-blurhash": "0.2.0",
-    "react-dnd": "16.0.1",
-    "react-dnd-html5-backend": "16.0.1",
     "react-dom": "18.2.0",
-    "react-error-boundary": "4.0.10",
+    "react-error-boundary": "4.0.13",
     "react-google-recaptcha": "2.1.0",
+    "react-i18next": "15.0.0",
     "react-modal": "3.16.1",
     "react-range": "1.8.14",
     "react-router-dom": "6.20.0",
@@ -102,6 +106,7 @@
     "sass": "1.56.2",
     "typescript": "4.9.4",
     "vite": "5.0.13",
+    "vite-plugin-pwa": "0.20.5",
     "vite-plugin-static-copy": "1.0.4",
     "vite-plugin-top-level-await": "1.4.1"
   }

public/locales/de.json

@@ -0,0 +1,7 @@
+{
+  "Organisms": {
+    "RoomCommon": {
+      "changed_room_name": " hat den Raum Name geändert"
+    }
+  }
+}

public/locales/en.json

@@ -0,0 +1,7 @@
+{
+  "Organisms": {
+    "RoomCommon": {
+      "changed_room_name": " changed room name"
+    }
+  }
+}

src/app/atoms/avatar/Avatar.jsx

@@ -2,17 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './Avatar.scss';
 
-import { twemojify } from '../../../util/twemojify';
-
 import Text from '../text/Text';
 import RawIcon from '../system-icons/RawIcon';
 
 import ImageBrokenSVG from '../../../../public/res/svg/image-broken.svg';
 import { avatarInitials } from '../../../util/common';
 
-const Avatar = React.forwardRef(({
+const Avatar = React.forwardRef(({ text, bgColor, iconSrc, iconColor, imageSrc, size }, ref) => {
-  text, bgColor, iconSrc, iconColor, imageSrc, size,
-}, ref) => {
   let textSize = 's1';
   if (size === 'large') textSize = 'h1';
   if (size === 'small') textSize = 'b1';
@@ -20,34 +16,34 @@ const Avatar = React.forwardRef(({
 
   return (
     <div ref={ref} className={`avatar-container avatar-container__${size} noselect`}>
-      {
+      {imageSrc !== null ? (
-        imageSrc !== null
-          ? (
         <img
           draggable="false"
           src={imageSrc}
-              onLoad={(e) => { e.target.style.backgroundColor = 'transparent'; }}
+          onLoad={(e) => {
-              onError={(e) => { e.target.src = ImageBrokenSVG; }}
+            e.target.style.backgroundColor = 'transparent';
+          }}
+          onError={(e) => {
+            e.target.src = ImageBrokenSVG;
+          }}
           alt=""
         />
-          )
+      ) : (
-          : (
         <span
           style={{ backgroundColor: iconSrc === null ? bgColor : 'transparent' }}
           className={`avatar__border${iconSrc !== null ? '--active' : ''}`}
         >
-              {
+          {iconSrc !== null ? (
-                iconSrc !== null
+            <RawIcon size={size} src={iconSrc} color={iconColor} />
-                  ? <RawIcon size={size} src={iconSrc} color={iconColor} />
+          ) : (
-                  : text !== null && (
+            text !== null && (
               <Text variant={textSize} primary>
-                      {twemojify(avatarInitials(text))}
+                {avatarInitials(text)}
               </Text>
             )
-              }
+          )}
         </span>
-          )
+      )}
-      }
     </div>
   );
 });

src/app/atoms/button/Toggle.scss

@@ -22,8 +22,7 @@
     height: 16px;
     background-color: var(--tc-surface-low);
     border-radius: calc(var(--bo-radius) / 2);
-    transition: transform 200ms ease-in-out,
+    transition: transform 200ms ease-in-out, opacity 200ms ease-in-out;
-      opacity 200ms ease-in-out;
     opacity: 0.6;
   }
 
@@ -36,7 +35,7 @@
       @include dir.prop(transform, var(--ltr), var(--rtl));
 
       transform: translateX(calc(125%));
-      background-color: white;
+      background-color: var(--bg-surface);
       opacity: 1;
     }
   }

src/app/atoms/divider/Divider.jsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import './Divider.scss';
+
+import Text from '../text/Text';
+
+function Divider({ text, variant, align }) {
+  const dividerClass = ` divider--${variant} divider--${align}`;
+  return (
+    <div className={`divider${dividerClass}`}>
+      {text !== null && <Text className="divider__text" variant="b3" weight="bold">{text}</Text>}
+    </div>
+  );
+}
+
+Divider.defaultProps = {
+  text: null,
+  variant: 'surface',
+  align: 'center',
+};
+
+Divider.propTypes = {
+  text: PropTypes.string,
+  variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
+  align: PropTypes.oneOf(['left', 'center', 'right']),
+};
+
+export default Divider;

src/app/atoms/math/Math.scss

@@ -1,3 +0,0 @@
-.katex-display {
-  margin: 0 !important;
-}

src/app/components/BackRouteHandler.tsx

@@ -0,0 +1,86 @@
+import { ReactNode, useCallback } from 'react';
+import { matchPath, useLocation, useNavigate } from 'react-router-dom';
+import {
+  getDirectPath,
+  getExplorePath,
+  getHomePath,
+  getInboxPath,
+  getSpacePath,
+} from '../pages/pathUtils';
+import { DIRECT_PATH, EXPLORE_PATH, HOME_PATH, INBOX_PATH, SPACE_PATH } from '../pages/paths';
+
+type BackRouteHandlerProps = {
+  children: (onBack: () => void) => ReactNode;
+};
+export function BackRouteHandler({ children }: BackRouteHandlerProps) {
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  const goBack = useCallback(() => {
+    if (
+      matchPath(
+        {
+          path: HOME_PATH,
+          caseSensitive: true,
+          end: false,
+        },
+        location.pathname
+      )
+    ) {
+      navigate(getHomePath());
+      return;
+    }
+    if (
+      matchPath(
+        {
+          path: DIRECT_PATH,
+          caseSensitive: true,
+          end: false,
+        },
+        location.pathname
+      )
+    ) {
+      navigate(getDirectPath());
+      return;
+    }
+    const spaceMatch = matchPath(
+      {
+        path: SPACE_PATH,
+        caseSensitive: true,
+        end: false,
+      },
+      location.pathname
+    );
+    if (spaceMatch?.params.spaceIdOrAlias) {
+      navigate(getSpacePath(spaceMatch.params.spaceIdOrAlias));
+      return;
+    }
+    if (
+      matchPath(
+        {
+          path: EXPLORE_PATH,
+          caseSensitive: true,
+          end: false,
+        },
+        location.pathname
+      )
+    ) {
+      navigate(getExplorePath());
+      return;
+    }
+    if (
+      matchPath(
+        {
+          path: INBOX_PATH,
+          caseSensitive: true,
+          end: false,
+        },
+        location.pathname
+      )
+    ) {
+      navigate(getInboxPath());
+    }
+  }, [navigate, location]);
+
+  return children(goBack);
+}

src/app/components/CapabilitiesAndMediaConfigLoader.tsx

@@ -0,0 +1,36 @@
+import { ReactNode, useCallback, useEffect } from 'react';
+import { Capabilities } from 'matrix-js-sdk';
+import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
+import { useMatrixClient } from '../hooks/useMatrixClient';
+import { MediaConfig } from '../hooks/useMediaConfig';
+import { promiseFulfilledResult } from '../utils/common';
+
+type CapabilitiesAndMediaConfigLoaderProps = {
+  children: (capabilities?: Capabilities, mediaConfig?: MediaConfig) => ReactNode;
+};
+export function CapabilitiesAndMediaConfigLoader({
+  children,
+}: CapabilitiesAndMediaConfigLoaderProps) {
+  const mx = useMatrixClient();
+
+  const [state, load] = useAsyncCallback<
+    [Capabilities | undefined, MediaConfig | undefined],
+    unknown,
+    []
+  >(
+    useCallback(async () => {
+      const result = await Promise.allSettled([mx.getCapabilities(true), mx.getMediaConfig()]);
+      const capabilities = promiseFulfilledResult(result[0]);
+      const mediaConfig = promiseFulfilledResult(result[1]);
+      return [capabilities, mediaConfig];
+    }, [mx])
+  );
+
+  useEffect(() => {
+    load();
+  }, [load]);
+
+  const [capabilities, mediaConfig] =
+    state.status === AsyncStatus.Success ? state.data : [undefined, undefined];
+  return children(capabilities, mediaConfig);
+}

src/app/components/CapabilitiesLoader.tsx

@@ -0,0 +1,19 @@
+import { ReactNode, useCallback, useEffect } from 'react';
+import { Capabilities } from 'matrix-js-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(true), [mx]));
+
+  useEffect(() => {
+    load();
+  }, [load]);
+
+  return children(state.status === AsyncStatus.Success ? state.data : undefined);
+}

src/app/components/MediaConfigLoader.tsx

@@ -0,0 +1,19 @@
+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);
+}

src/app/components/Pdf-viewer/PdfViewer.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
-import React, { FormEventHandler, useEffect, useRef, useState } from 'react';
+import React, { FormEventHandler, MouseEventHandler, useEffect, useRef, useState } from 'react';
 import classNames from 'classnames';
 import {
   Box,
@@ -13,6 +13,7 @@ import {
   Input,
   Menu,
   PopOut,
+  RectCords,
   Scroll,
   Spinner,
   Text,
@@ -25,6 +26,7 @@ import * as css from './PdfViewer.css';
 import { AsyncStatus } from '../../hooks/useAsyncCallback';
 import { useZoom } from '../../hooks/useZoom';
 import { createPage, usePdfDocumentLoader, usePdfJSLoader } from '../../plugins/pdfjs-dist';
+import { stopPropagation } from '../../utils/keyboard';
 
 export type PdfViewerProps = {
   name: string;
@@ -48,7 +50,7 @@ export const PdfViewer = as<'div', PdfViewerProps>(
     const isError =
       pdfJSState.status === AsyncStatus.Error || docState.status === AsyncStatus.Error;
     const [pageNo, setPageNo] = useState(1);
-    const [openJump, setOpenJump] = useState(false);
+    const [jumpAnchor, setJumpAnchor] = useState<RectCords>();
 
     useEffect(() => {
       loadPdfJS();
@@ -86,7 +88,7 @@ export const PdfViewer = as<'div', PdfViewerProps>(
       if (!jumpInput) return;
       const jumpTo = parseInt(jumpInput.value, 10);
       setPageNo(Math.max(1, Math.min(docState.data.numPages, jumpTo)));
-      setOpenJump(false);
+      setJumpAnchor(undefined);
     };
 
     const handlePrevPage = () => {
@@ -98,6 +100,10 @@ export const PdfViewer = as<'div', PdfViewerProps>(
       setPageNo((n) => Math.min(n + 1, docState.data.numPages));
     };
 
+    const handleOpenJump: MouseEventHandler<HTMLButtonElement> = (evt) => {
+      setJumpAnchor(evt.currentTarget.getBoundingClientRect());
+    };
+
     return (
       <Box className={classNames(css.PdfViewer, className)} direction="Column" {...props} ref={ref}>
         <Header className={css.PdfViewerHeader} size="400">
@@ -187,15 +193,16 @@ export const PdfViewer = as<'div', PdfViewerProps>(
             </Chip>
             <Box grow="Yes" justifyContent="Center" alignItems="Center" gap="200">
               <PopOut
-                open={openJump}
+                anchor={jumpAnchor}
                 align="Center"
                 position="Top"
                 content={
                   <FocusTrap
                     focusTrapOptions={{
                       initialFocus: false,
-                      onDeactivate: () => setOpenJump(false),
+                      onDeactivate: () => setJumpAnchor(undefined),
                       clickOutsideDeactivates: true,
+                      escapeDeactivates: stopPropagation,
                     }}
                   >
                     <Menu variant="Surface">
@@ -227,17 +234,14 @@ export const PdfViewer = as<'div', PdfViewerProps>(
                   </FocusTrap>
                 }
               >
-                {(anchorRef) => (
                 <Chip
-                    onClick={() => setOpenJump(!openJump)}
+                  onClick={handleOpenJump}
-                    ref={anchorRef}
                   variant="SurfaceVariant"
                   radii="300"
-                    aria-pressed={openJump}
+                  aria-pressed={jumpAnchor !== undefined}
                 >
                   <Text size="B300">{`${pageNo}/${docState.data.numPages}`}</Text>
                 </Chip>
-                )}
               </PopOut>
             </Box>
             <Chip

src/app/components/RenderMessageContent.tsx

@@ -0,0 +1,234 @@
+import React from 'react';
+import { MsgType } from 'matrix-js-sdk';
+import { HTMLReactParserOptions } from 'html-react-parser';
+import { Opts } from 'linkifyjs';
+import {
+  AudioContent,
+  DownloadFile,
+  FileContent,
+  ImageContent,
+  MAudio,
+  MBadEncrypted,
+  MEmote,
+  MFile,
+  MImage,
+  MLocation,
+  MNotice,
+  MText,
+  MVideo,
+  ReadPdfFile,
+  ReadTextFile,
+  RenderBody,
+  ThumbnailContent,
+  UnsupportedContent,
+  VideoContent,
+} from './message';
+import { UrlPreviewCard, UrlPreviewHolder } from './url-preview';
+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;
+  msgType: string;
+  ts: number;
+  edited?: boolean;
+  getContent: <T>() => T;
+  mediaAutoLoad?: boolean;
+  urlPreview?: boolean;
+  highlightRegex?: RegExp;
+  htmlReactParserOptions: HTMLReactParserOptions;
+  linkifyOpts: Opts;
+  outlineAttachment?: boolean;
+};
+export function RenderMessageContent({
+  displayName,
+  msgType,
+  ts,
+  edited,
+  getContent,
+  mediaAutoLoad,
+  urlPreview,
+  highlightRegex,
+  htmlReactParserOptions,
+  linkifyOpts,
+  outlineAttachment,
+}: RenderMessageContentProps) {
+  const renderUrlsPreview = (urls: string[]) => {
+    const filteredUrls = urls.filter((url) => !testMatrixTo(url));
+    if (filteredUrls.length === 0) return undefined;
+    return (
+      <UrlPreviewHolder>
+        {filteredUrls.map((url) => (
+          <UrlPreviewCard key={url} url={url} ts={ts} />
+        ))}
+      </UrlPreviewHolder>
+    );
+  };
+
+  const renderFile = () => (
+    <MFile
+      content={getContent()}
+      renderFileContent={({ body, mimeType, info, encInfo, url }) => (
+        <FileContent
+          body={body}
+          mimeType={mimeType}
+          renderAsPdfFile={() => (
+            <ReadPdfFile
+              body={body}
+              mimeType={mimeType}
+              url={url}
+              encInfo={encInfo}
+              renderViewer={(p) => <PdfViewer {...p} />}
+            />
+          )}
+          renderAsTextFile={() => (
+            <ReadTextFile
+              body={body}
+              mimeType={mimeType}
+              url={url}
+              encInfo={encInfo}
+              renderViewer={(p) => <TextViewer {...p} />}
+            />
+          )}
+        >
+          <DownloadFile body={body} mimeType={mimeType} url={url} encInfo={encInfo} info={info} />
+        </FileContent>
+      )}
+      outlined={outlineAttachment}
+    />
+  );
+
+  if (msgType === MsgType.Text) {
+    return (
+      <MText
+        edited={edited}
+        content={getContent()}
+        renderBody={(props) => (
+          <RenderBody
+            {...props}
+            highlightRegex={highlightRegex}
+            htmlReactParserOptions={htmlReactParserOptions}
+            linkifyOpts={linkifyOpts}
+          />
+        )}
+        renderUrlsPreview={urlPreview ? renderUrlsPreview : undefined}
+      />
+    );
+  }
+
+  if (msgType === MsgType.Emote) {
+    return (
+      <MEmote
+        displayName={displayName}
+        edited={edited}
+        content={getContent()}
+        renderBody={(props) => (
+          <RenderBody
+            {...props}
+            highlightRegex={highlightRegex}
+            htmlReactParserOptions={htmlReactParserOptions}
+            linkifyOpts={linkifyOpts}
+          />
+        )}
+        renderUrlsPreview={urlPreview ? renderUrlsPreview : undefined}
+      />
+    );
+  }
+
+  if (msgType === MsgType.Notice) {
+    return (
+      <MNotice
+        edited={edited}
+        content={getContent()}
+        renderBody={(props) => (
+          <RenderBody
+            {...props}
+            highlightRegex={highlightRegex}
+            htmlReactParserOptions={htmlReactParserOptions}
+            linkifyOpts={linkifyOpts}
+          />
+        )}
+        renderUrlsPreview={urlPreview ? renderUrlsPreview : undefined}
+      />
+    );
+  }
+
+  if (msgType === MsgType.Image) {
+    return (
+      <MImage
+        content={getContent()}
+        renderImageContent={(props) => (
+          <ImageContent
+            {...props}
+            autoPlay={mediaAutoLoad}
+            renderImage={(p) => <Image {...p} loading="lazy" />}
+            renderViewer={(p) => <ImageViewer {...p} />}
+          />
+        )}
+        outlined={outlineAttachment}
+      />
+    );
+  }
+
+  if (msgType === MsgType.Video) {
+    return (
+      <MVideo
+        content={getContent()}
+        renderAsFile={renderFile}
+        renderVideoContent={({ body, info, mimeType, url, encInfo }) => (
+          <VideoContent
+            body={body}
+            info={info}
+            mimeType={mimeType}
+            url={url}
+            encInfo={encInfo}
+            renderThumbnail={
+              mediaAutoLoad
+                ? () => (
+                    <ThumbnailContent
+                      info={info}
+                      renderImage={(src) => (
+                        <Image alt={body} title={body} src={src} loading="lazy" />
+                      )}
+                    />
+                  )
+                : undefined
+            }
+            renderVideo={(p) => <Video {...p} />}
+          />
+        )}
+        outlined={outlineAttachment}
+      />
+    );
+  }
+
+  if (msgType === MsgType.Audio) {
+    return (
+      <MAudio
+        content={getContent()}
+        renderAsFile={renderFile}
+        renderAudioContent={(props) => (
+          <AudioContent {...props} renderMediaControl={(p) => <MediaControl {...p} />} />
+        )}
+        outlined={outlineAttachment}
+      />
+    );
+  }
+
+  if (msgType === MsgType.File) {
+    return renderFile();
+  }
+
+  if (msgType === MsgType.Location) {
+    return <MLocation content={getContent()} />;
+  }
+
+  if (msgType === 'm.bad.encrypted') {
+    return <MBadEncrypted />;
+  }
+
+  return <UnsupportedContent />;
+}

src/app/components/RoomSummaryLoader.tsx

@@ -0,0 +1,90 @@
+import { ReactNode, useCallback, useState } from 'react';
+import { MatrixClient, Room } from 'matrix-js-sdk';
+import { useQuery } from '@tanstack/react-query';
+import { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces';
+import { useMatrixClient } from '../hooks/useMatrixClient';
+import { LocalRoomSummary, useLocalRoomSummary } from '../hooks/useLocalRoomSummary';
+import { AsyncState, AsyncStatus } from '../hooks/useAsyncCallback';
+
+export type IRoomSummary = Awaited<ReturnType<MatrixClient['getRoomSummary']>>;
+
+type RoomSummaryLoaderProps = {
+  roomIdOrAlias: string;
+  children: (roomSummary?: IRoomSummary) => ReactNode;
+};
+
+export function RoomSummaryLoader({ roomIdOrAlias, children }: RoomSummaryLoaderProps) {
+  const mx = useMatrixClient();
+
+  const fetchSummary = useCallback(() => mx.getRoomSummary(roomIdOrAlias), [mx, roomIdOrAlias]);
+
+  const { data } = useQuery({
+    queryKey: [roomIdOrAlias, `summary`],
+    queryFn: fetchSummary,
+  });
+
+  return children(data);
+}
+
+export function LocalRoomSummaryLoader({
+  room,
+  children,
+}: {
+  room: Room;
+  children: (roomSummary: LocalRoomSummary) => ReactNode;
+}) {
+  const summary = useLocalRoomSummary(room);
+
+  return children(summary);
+}
+
+export function HierarchyRoomSummaryLoader({
+  roomId,
+  children,
+}: {
+  roomId: string;
+  children: (state: AsyncState<IHierarchyRoom, Error>) => ReactNode;
+}) {
+  const mx = useMatrixClient();
+
+  const fetchSummary = useCallback(() => mx.getRoomHierarchy(roomId, 1, 1), [mx, roomId]);
+  const [errorMemo, setError] = useState<Error>();
+
+  const { data, error } = useQuery({
+    queryKey: [roomId, `hierarchy`],
+    queryFn: fetchSummary,
+    retryOnMount: false,
+    refetchOnWindowFocus: false,
+    retry: (failureCount, err) => {
+      setError(err);
+      if (failureCount > 3) return false;
+      return true;
+    },
+  });
+
+  let state: AsyncState<IHierarchyRoom, Error> = {
+    status: AsyncStatus.Loading,
+  };
+  if (error) {
+    state = {
+      status: AsyncStatus.Error,
+      error,
+    };
+  }
+  if (errorMemo) {
+    state = {
+      status: AsyncStatus.Error,
+      error: errorMemo,
+    };
+  }
+
+  const summary = data?.rooms[0] ?? undefined;
+  if (summary) {
+    state = {
+      status: AsyncStatus.Success,
+      data: summary,
+    };
+  }
+
+  return children(state);
+}

src/app/components/RoomUnreadProvider.tsx

@@ -0,0 +1,24 @@
+import { ReactElement } from 'react';
+import { Unread } from '../../types/matrix/room';
+import { useRoomUnread, useRoomsUnread } from '../state/hooks/unread';
+import { roomToUnreadAtom } from '../state/room/roomToUnread';
+
+type RoomUnreadProviderProps = {
+  roomId: string;
+  children: (unread?: Unread) => ReactElement;
+};
+export function RoomUnreadProvider({ roomId, children }: RoomUnreadProviderProps) {
+  const unread = useRoomUnread(roomId, roomToUnreadAtom);
+
+  return children(unread);
+}
+
+type RoomsUnreadProviderProps = {
+  rooms: string[];
+  children: (unread?: Unread) => ReactElement;
+};
+export function RoomsUnreadProvider({ rooms, children }: RoomsUnreadProviderProps) {
+  const unread = useRoomsUnread(rooms, roomToUnreadAtom);
+
+  return children(unread);
+}

src/app/components/SpaceChildDirectsProvider.tsx

@@ -0,0 +1,28 @@
+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<string>;
+  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);
+}

src/app/components/SpaceChildRoomsProvider.tsx

@@ -0,0 +1,28 @@
+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<string>;
+  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);
+}

src/app/components/SpecVersionsLoader.tsx

@@ -1,20 +1,25 @@
-import { ReactNode, useCallback, useEffect } from 'react';
+import { ReactNode, useCallback, useEffect, useState } from 'react';
 import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
 import { SpecVersions, specVersions } from '../cs-api';
-import { useAutoDiscoveryInfo } from '../hooks/useAutoDiscoveryInfo';
 
 type SpecVersionsLoaderProps = {
+  baseUrl: string;
   fallback?: () => ReactNode;
-  error?: (err: unknown) => ReactNode;
+  error?: (err: unknown, retry: () => void, ignore: () => void) => ReactNode;
   children: (versions: SpecVersions) => ReactNode;
 };
-export function SpecVersionsLoader({ fallback, error, children }: SpecVersionsLoaderProps) {
+export function SpecVersionsLoader({
-  const autoDiscoveryInfo = useAutoDiscoveryInfo();
+  baseUrl,
-  const baseUrl = autoDiscoveryInfo['m.homeserver'].base_url;
+  fallback,
-
+  error,
+  children,
+}: SpecVersionsLoaderProps) {
   const [state, load] = useAsyncCallback(
     useCallback(() => specVersions(fetch, baseUrl), [baseUrl])
   );
+  const [ignoreError, setIgnoreError] = useState(false);
+
+  const ignoreCallback = useCallback(() => setIgnoreError(true), []);
 
   useEffect(() => {
     load();
@@ -24,9 +29,15 @@ export function SpecVersionsLoader({ fallback, error, children }: SpecVersionsLo
     return fallback?.();
   }
 
-  if (state.status === AsyncStatus.Error) {
+  if (!ignoreError && state.status === AsyncStatus.Error) {
-    return error?.(state.error);
+    return error?.(state.error, load, ignoreCallback);
   }
 
-  return children(state.data);
+  return children(
+    state.status === AsyncStatus.Success
+      ? state.data
+      : {
+          versions: [],
+        }
+  );
 }

src/app/components/UIAFlowOverlay.tsx

@@ -13,6 +13,7 @@ import {
   IconButton,
 } from 'folds';
 import FocusTrap from 'focus-trap-react';
+import { stopPropagation } from '../utils/keyboard';
 
 export type UIAFlowOverlayProps = {
   currentStep: number;
@@ -28,7 +29,7 @@ export function UIAFlowOverlay({
 }: UIAFlowOverlayProps) {
   return (
     <Overlay open backdrop={<OverlayBackdrop />}>
-      <FocusTrap focusTrapOptions={{ initialFocus: false }}>
+      <FocusTrap focusTrapOptions={{ initialFocus: false, escapeDeactivates: stopPropagation }}>
         <Box style={{ height: '100%' }} direction="Column" grow="Yes" gap="400">
           <Box grow="Yes" direction="Column" alignItems="Center" justifyContent="Center">
             {children}

src/app/components/editor/Editor.preview.tsx

@@ -0,0 +1,84 @@
+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 '../../utils/keyboard';
+
+export function EditorPreview() {
+  const [open, setOpen] = useState(false);
+  const editor = useEditor();
+  const [toolbar, setToolbar] = useState(false);
+
+  return (
+    <>
+      <IconButton variant="SurfaceVariant" onClick={() => setOpen(!open)}>
+        <Icon src={Icons.BlockQuote} />
+      </IconButton>
+      <Overlay open={open} backdrop={<OverlayBackdrop />}>
+        <OverlayCenter>
+          <FocusTrap
+            focusTrapOptions={{
+              initialFocus: false,
+              onDeactivate: () => setOpen(false),
+              clickOutsideDeactivates: true,
+              escapeDeactivates: stopPropagation,
+            }}
+          >
+            <Modal size="500">
+              <div style={{ padding: config.space.S400 }}>
+                <CustomEditor
+                  editor={editor}
+                  placeholder="Send a message..."
+                  before={
+                    <IconButton variant="SurfaceVariant" size="300" radii="300">
+                      <Icon src={Icons.PlusCircle} />
+                    </IconButton>
+                  }
+                  after={
+                    <>
+                      <IconButton
+                        variant="SurfaceVariant"
+                        size="300"
+                        radii="300"
+                        onClick={() => setToolbar(!toolbar)}
+                        aria-pressed={toolbar}
+                      >
+                        <Icon src={toolbar ? Icons.AlphabetUnderline : Icons.Alphabet} />
+                      </IconButton>
+                      <IconButton variant="SurfaceVariant" size="300" radii="300">
+                        <Icon src={Icons.Smile} />
+                      </IconButton>
+                      <IconButton variant="SurfaceVariant" size="300" radii="300">
+                        <Icon src={Icons.Send} />
+                      </IconButton>
+                    </>
+                  }
+                  bottom={
+                    toolbar && (
+                      <div>
+                        <Line variant="SurfaceVariant" size="300" />
+                        <Toolbar />
+                      </div>
+                    )
+                  }
+                />
+              </div>
+            </Modal>
+          </FocusTrap>
+        </OverlayCenter>
+      </Overlay>
+    </>
+  );
+}

src/app/components/editor/Elements.tsx

@@ -14,6 +14,8 @@ import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { getEmojiUrl, isUsingTwemoji } from '../../plugins/emoji';
 import { getBeginCommand } from './utils';
 import { BlockType } from './types';
+import { mxcUrlToHttp } from '../../utils/matrix';
+import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
 
 // Put this at the start and end of an inline component to work around this Chromium bug:
 // https://bugs.chromium.org/p/chromium/issues/detail?id=1249405
@@ -77,6 +79,7 @@ function RenderEmoticonElement({
   children,
 }: { element: EmoticonElement } & RenderElementProps) {
   const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
   const selected = useSelected();
   const focused = useFocused();
 
@@ -91,7 +94,7 @@ function RenderEmoticonElement({
         {element.key.startsWith('mxc://') ? (
           <img
             className={css.EmoticonImg}
-            src={mx.mxcUrlToHttp(element.key) ?? element.key}
+            src={mxcUrlToHttp(mx, element.key, useAuthentication) ?? element.key}
             alt={element.shortcode}
           />
         ) : (

src/app/components/editor/Toolbar.tsx

@@ -10,13 +10,14 @@ import {
   Line,
   Menu,
   PopOut,
+  RectCords,
   Scroll,
   Text,
   Tooltip,
   TooltipProvider,
   toRem,
 } from 'folds';
-import React, { ReactNode, useState } from 'react';
+import React, { MouseEventHandler, ReactNode, useState } from 'react';
 import { ReactEditor, useSlate } from 'slate-react';
 import {
   headingLevel,
@@ -34,6 +35,7 @@ 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 '../../utils/keyboard';
 
 function BtnTooltip({ text, shortCode }: { text: string; shortCode?: string }) {
   return (
@@ -119,30 +121,38 @@ export function BlockButton({ format, icon, tooltip }: BlockButtonProps) {
 export function HeadingBlockButton() {
   const editor = useSlate();
   const level = headingLevel(editor);
-  const [open, setOpen] = useState(false);
+  const [anchor, setAnchor] = useState<RectCords>();
   const isActive = isBlockActive(editor, BlockType.Heading);
   const modKey = isMacOS() ? KeySymbol.Command : 'Ctrl';
 
   const handleMenuSelect = (selectedLevel: HeadingLevel) => {
-    setOpen(false);
+    setAnchor(undefined);
     toggleBlock(editor, BlockType.Heading, { level: selectedLevel });
     ReactEditor.focus(editor);
   };
 
+  const handleMenuOpen: MouseEventHandler<HTMLButtonElement> = (evt) => {
+    if (isActive) {
+      toggleBlock(editor, BlockType.Heading);
+      return;
+    }
+    setAnchor(evt.currentTarget.getBoundingClientRect());
+  };
   return (
     <PopOut
-      open={open}
+      anchor={anchor}
       offset={5}
       position="Top"
       content={
         <FocusTrap
           focusTrapOptions={{
             initialFocus: false,
-            onDeactivate: () => setOpen(false),
+            onDeactivate: () => setAnchor(undefined),
             clickOutsideDeactivates: true,
             isKeyForward: (evt: KeyboardEvent) =>
               evt.key === 'ArrowDown' || evt.key === 'ArrowRight',
             isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp' || evt.key === 'ArrowLeft',
+            escapeDeactivates: stopPropagation,
           }}
         >
           <Menu style={{ padding: config.space.S100 }}>
@@ -197,12 +207,10 @@ export function HeadingBlockButton() {
         </FocusTrap>
       }
     >
-      {(ref) => (
       <IconButton
         style={{ width: 'unset' }}
-          ref={ref}
         variant="SurfaceVariant"
-          onClick={() => (isActive ? toggleBlock(editor, BlockType.Heading) : setOpen(!open))}
+        onClick={handleMenuOpen}
         aria-pressed={isActive}
         size="400"
         radii="300"
@@ -210,7 +218,6 @@ export function HeadingBlockButton() {
         <Icon size="200" src={level ? Icons[`Heading${level}`] : Icons.Heading1} />
         <Icon size="200" src={isActive ? Icons.Cross : Icons.ChevronBottom} />
       </IconButton>
-      )}
     </PopOut>
   );
 }

src/app/components/editor/autocomplete/AutocompleteMenu.tsx

@@ -4,7 +4,7 @@ import { isKeyHotkey } from 'is-hotkey';
 import { Header, Menu, Scroll, config } from 'folds';
 
 import * as css from './AutocompleteMenu.css';
-import { preventScrollWithArrowKey } from '../../../utils/keyboard';
+import { preventScrollWithArrowKey, stopPropagation } from '../../../utils/keyboard';
 
 type AutocompleteMenuProps = {
   requestClose: () => void;
@@ -24,6 +24,7 @@ export function AutocompleteMenu({ headerContent, requestClose, children }: Auto
             allowOutsideClick: true,
             isKeyForward: (evt: KeyboardEvent) => isKeyHotkey('arrowdown', evt),
             isKeyBackward: (evt: KeyboardEvent) => isKeyHotkey('arrowup', evt),
+            escapeDeactivates: stopPropagation,
           }}
         >
           <Menu className={css.AutocompleteMenu}>

src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx

@@ -18,6 +18,8 @@ import { useRelevantImagePacks } from '../../../hooks/useImagePacks';
 import { IEmoji, emojis } from '../../../plugins/emoji';
 import { ExtendedPackImage, PackUsage } from '../../../plugins/custom-emoji';
 import { useKeyDown } from '../../../hooks/useKeyDown';
+import { mxcUrlToHttp } from '../../../utils/matrix';
+import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
 
 type EmoticonCompleteHandler = (key: string, shortcode: string) => void;
 
@@ -48,6 +50,7 @@ export function EmoticonAutocomplete({
   requestClose,
 }: EmoticonAutocompleteProps) {
   const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
 
   const imagePacks = useRelevantImagePacks(mx, PackUsage.Emoticon, imagePackRooms);
   const recentEmoji = useRecentEmoji(mx, 20);
@@ -103,7 +106,7 @@ export function EmoticonAutocomplete({
                 <Box
                   shrink="No"
                   as="img"
-                  src={mx.mxcUrlToHttp(key) || key}
+                  src={mxcUrlToHttp(mx, key, useAuthentication) || key}
                   alt={emoticon.shortcode}
                   style={{ width: toRem(24), height: toRem(24), objectFit: 'contain' }}
                 />

src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx

@@ -1,12 +1,11 @@
-import React, { KeyboardEvent as ReactKeyboardEvent, useCallback, useEffect, useMemo } from 'react';
+import React, { KeyboardEvent as ReactKeyboardEvent, useCallback, useEffect } from 'react';
 import { Editor } from 'slate';
-import { Avatar, AvatarFallback, AvatarImage, Icon, Icons, MenuItem, Text, color } from 'folds';
+import { Avatar, Icon, Icons, MenuItem, Text } from 'folds';
-import { MatrixClient } from 'matrix-js-sdk';
+import { JoinRule, MatrixClient } from 'matrix-js-sdk';
+import { useAtomValue } from 'jotai';
 
 import { createMentionElement, moveCursor, replaceWithElement } from '../utils';
-import { getRoomAvatarUrl, joinRuleToIconSrc } from '../../../utils/room';
+import { getDirectRoomAvatarUrl } from '../../../utils/room';
-import { roomIdByActivity } from '../../../../util/sort';
-import initMatrix from '../../../../client/initMatrix';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
 import { AutocompleteQuery } from './autocompleteQuery';
 import { AutocompleteMenu } from './AutocompleteMenu';
@@ -14,6 +13,11 @@ import { getMxIdServer, validMxId } from '../../../utils/matrix';
 import { UseAsyncSearchOptions, useAsyncSearch } from '../../../hooks/useAsyncSearch';
 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 '../../../utils/sort';
+import { RoomAvatar, RoomIcon } from '../../room-avatar';
+import { getViaServers } from '../../../plugins/via-servers';
 
 type MentionAutoCompleteHandler = (roomAliasOrId: string, name: string) => void;
 
@@ -74,15 +78,12 @@ export function RoomMentionAutocomplete({
   requestClose,
 }: RoomMentionAutocompleteProps) {
   const mx = useMatrixClient();
-  const dms: Set<string> = initMatrix.roomList?.directs ?? new Set();
+  const mDirects = useAtomValue(mDirectAtom);
 
-  const allRoomId: string[] = useMemo(() => {
+  const allRooms = useAtomValue(allRoomsAtom).sort(factoryRoomIdByActivity(mx));
-    const { spaces = [], rooms = [], directs = [] } = initMatrix.roomList ?? {};
-    return [...spaces, ...rooms, ...directs].sort(roomIdByActivity);
-  }, []);
 
   const [result, search, resetSearch] = useAsyncSearch(
-    allRoomId,
+    allRooms,
     useCallback(
       (rId) => {
         const r = mx.getRoom(rId);
@@ -96,7 +97,7 @@ export function RoomMentionAutocomplete({
     SEARCH_OPTIONS
   );
 
-  const autoCompleteRoomIds = result ? result.items : allRoomId.slice(0, 20);
+  const autoCompleteRoomIds = result ? result.items : allRooms.slice(0, 20);
 
   useEffect(() => {
     if (query.text) search(query.text);
@@ -104,10 +105,14 @@ export function RoomMentionAutocomplete({
   }, [query.text, search, resetSearch]);
 
   const handleAutocomplete: MentionAutoCompleteHandler = (roomAliasOrId, name) => {
+    const mentionRoom = mx.getRoom(roomAliasOrId);
+    const viaServers = mentionRoom ? getViaServers(mentionRoom) : undefined;
     const mentionEl = createMentionElement(
       roomAliasOrId,
       name.startsWith('#') ? name : `#${name}`,
-      roomId === roomAliasOrId || mx.getRoom(roomId)?.getCanonicalAlias() === roomAliasOrId
+      roomId === roomAliasOrId || mx.getRoom(roomId)?.getCanonicalAlias() === roomAliasOrId,
+      undefined,
+      viaServers
     );
     replaceWithElement(editor, query.range, mentionEl);
     moveCursor(editor, true);
@@ -136,9 +141,7 @@ export function RoomMentionAutocomplete({
         autoCompleteRoomIds.map((rId) => {
           const room = mx.getRoom(rId);
           if (!room) return null;
-          const dm = dms.has(room.roomId);
+          const dm = mDirects.has(room.roomId);
-          const avatarUrl = getRoomAvatarUrl(mx, room);
-          const iconSrc = !dm && joinRuleToIconSrc(Icons, room.getJoinRule(), room.isSpaceRoom());
 
           const handleSelect = () => handleAutocomplete(room.getCanonicalAlias() ?? rId, room.name);
 
@@ -158,17 +161,21 @@ export function RoomMentionAutocomplete({
               }
               before={
                 <Avatar size="200">
-                  {iconSrc && <Icon src={iconSrc} size="100" />}
+                  {dm ? (
-                  {avatarUrl && !iconSrc && <AvatarImage src={avatarUrl} alt={room.name} />}
+                    <RoomAvatar
-                  {!avatarUrl && !iconSrc && (
+                      roomId={room.roomId}
-                    <AvatarFallback
+                      src={getDirectRoomAvatarUrl(mx, room)}
-                      style={{
+                      alt={room.name}
-                        backgroundColor: color.Secondary.Container,
+                      renderFallback={() => (
-                        color: color.Secondary.OnContainer,
+                        <RoomIcon
-                      }}
+                          size="50"
-                    >
+                          joinRule={room.getJoinRule() ?? JoinRule.Restricted}
-                      <Text size="H6">{room.name[0]}</Text>
+                          filled
-                    </AvatarFallback>
+                        />
+                      )}
+                    />
+                  ) : (
+                    <RoomIcon size="100" joinRule={room.getJoinRule()} space={room.isSpaceRoom()} />
                   )}
                 </Avatar>
               }

src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, KeyboardEvent as ReactKeyboardEvent } from 'react';
 import { Editor } from 'slate';
-import { Avatar, AvatarFallback, AvatarImage, MenuItem, Text, color } from 'folds';
+import { Avatar, Icon, Icons, MenuItem, Text } from 'folds';
 import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
 
 import { AutocompleteQuery } from './autocompleteQuery';
@@ -17,6 +17,8 @@ import { createMentionElement, moveCursor, replaceWithElement } from '../utils';
 import { useKeyDown } from '../../../hooks/useKeyDown';
 import { getMxIdLocalPart, getMxIdServer, validMxId } from '../../../utils/matrix';
 import { getMemberDisplayName, getMemberSearchStr } from '../../../utils/room';
+import { UserAvatar } from '../../user-avatar';
+import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
 
 type MentionAutoCompleteHandler = (userId: string, name: string) => void;
 
@@ -26,12 +28,10 @@ const userIdFromQueryText = (mx: MatrixClient, text: string) =>
     : `@${text}${text.endsWith(':') ? '' : ':'}${getMxIdServer(mx.getUserId() ?? '')}`;
 
 function UnknownMentionItem({
-  query,
   userId,
   name,
   handleAutocomplete,
 }: {
-  query: AutocompleteQuery<string>;
   userId: string;
   name: string;
   handleAutocomplete: MentionAutoCompleteHandler;
@@ -46,14 +46,10 @@ function UnknownMentionItem({
       onClick={() => handleAutocomplete(userId, name)}
       before={
         <Avatar size="200">
-          <AvatarFallback
+          <UserAvatar
-            style={{
+            userId={userId}
-              backgroundColor: color.Secondary.Container,
+            renderFallback={() => <Icon size="50" src={Icons.User} filled />}
-              color: color.Secondary.OnContainer,
+          />
-            }}
-          >
-            <Text size="H6">{query.text[0]}</Text>
-          </AvatarFallback>
         </Avatar>
       }
     >
@@ -89,6 +85,7 @@ export function UserMentionAutocomplete({
   requestClose,
 }: UserMentionAutocompleteProps) {
   const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
   const roomId: string = room.roomId!;
   const roomAliasOrId = room.getCanonicalAlias() || roomId;
   const members = useRoomMembers(mx, roomId);
@@ -135,7 +132,6 @@ export function UserMentionAutocomplete({
     <AutocompleteMenu headerContent={<Text size="L400">Mentions</Text>} requestClose={requestClose}>
       {query.text === 'room' && (
         <UnknownMentionItem
-          query={query}
           userId={roomAliasOrId}
           name="@room"
           handleAutocomplete={handleAutocomplete}
@@ -143,14 +139,16 @@ export function UserMentionAutocomplete({
       )}
       {autoCompleteMembers.length === 0 ? (
         <UnknownMentionItem
-          query={query}
           userId={userIdFromQueryText(mx, query.text)}
           name={userIdFromQueryText(mx, query.text)}
           handleAutocomplete={handleAutocomplete}
         />
       ) : (
         autoCompleteMembers.map((roomMember) => {
-          const avatarUrl = roomMember.getAvatarUrl(mx.baseUrl, 32, 32, 'crop', undefined, false);
+          const avatarMxcUrl = roomMember.getMxcAvatarUrl();
+          const avatarUrl = avatarMxcUrl
+            ? mx.mxcUrlToHttp(avatarMxcUrl, 32, 32, 'crop', undefined, false, useAuthentication)
+            : undefined;
           return (
             <MenuItem
               key={roomMember.userId}
@@ -167,18 +165,12 @@ export function UserMentionAutocomplete({
               }
               before={
                 <Avatar size="200">
-                  {avatarUrl ? (
+                  <UserAvatar
-                    <AvatarImage src={avatarUrl} alt={getName(roomMember)} />
+                    userId={roomMember.userId}
-                  ) : (
+                    src={avatarUrl ?? undefined}
-                    <AvatarFallback
+                    alt={getName(roomMember)}
-                      style={{
+                    renderFallback={() => <Icon size="50" src={Icons.User} filled />}
-                        backgroundColor: color.Secondary.Container,
+                  />
-                        color: color.Secondary.OnContainer,
-                      }}
-                    >
-                      <Text size="H6">{getName(roomMember)[0]}</Text>
-                    </AvatarFallback>
-                  )}
                 </Avatar>
               }
             >

src/app/components/editor/input.ts

@@ -18,8 +18,14 @@ import {
   ParagraphElement,
   UnorderedListElement,
 } from './slate';
-import { parseMatrixToUrl } from '../../utils/matrix';
 import { createEmoticonElement, createMentionElement } from './utils';
+import {
+  parseMatrixToRoom,
+  parseMatrixToRoomEvent,
+  parseMatrixToUser,
+  testMatrixTo,
+} from '../../plugins/matrix-to';
+import { tryDecodeURIComponent } from '../../utils/dom';
 
 const markNodeToType: Record<string, MarkType> = {
   b: MarkType.Bold,
@@ -68,11 +74,33 @@ const elementToInlineNode = (node: Element): MentionElement | EmoticonElement |
     return createEmoticonElement(src, alt || 'Unknown Emoji');
   }
   if (node.name === 'a') {
-    const { href } = node.attribs;
+    const href = tryDecodeURIComponent(node.attribs.href);
     if (typeof href !== 'string') return undefined;
-    const [mxId] = parseMatrixToUrl(href);
+    if (testMatrixTo(href)) {
-    if (mxId) {
+      const userMention = parseMatrixToUser(href);
-      return createMentionElement(mxId, parseNodeText(node) || mxId, false);
+      if (userMention) {
+        return createMentionElement(userMention, parseNodeText(node) || userMention, false);
+      }
+      const roomMention = parseMatrixToRoom(href);
+      if (roomMention) {
+        return createMentionElement(
+          roomMention.roomIdOrAlias,
+          parseNodeText(node) || roomMention.roomIdOrAlias,
+          false,
+          undefined,
+          roomMention.viaServers
+        );
+      }
+      const eventMention = parseMatrixToRoomEvent(href);
+      if (eventMention) {
+        return createMentionElement(
+          eventMention.roomIdOrAlias,
+          parseNodeText(node) || eventMention.roomIdOrAlias,
+          false,
+          eventMention.eventId,
+          eventMention.viaServers
+        );
+      }
     }
   }
   return undefined;

src/app/components/editor/output.ts

@@ -51,10 +51,19 @@ const elementToCustomHtml = (node: CustomElement, children: string): string => {
     case BlockType.UnorderedList:
       return `<ul>${children}</ul>`;
 
-    case BlockType.Mention:
+    case BlockType.Mention: {
-      return `<a href="https://matrix.to/#/${encodeURIComponent(node.id)}">${sanitizeText(
+      let fragment = node.id;
-        node.name
+
-      )}</a>`;
+      if (node.eventId) {
+        fragment += `/${node.eventId}`;
+      }
+      if (node.viaServers && node.viaServers.length > 0) {
+        fragment += `?${node.viaServers.map((server) => `via=${server}`).join('&')}`;
+      }
+
+      const matrixTo = `https://matrix.to/#/${fragment}`;
+      return `<a href="${encodeURI(matrixTo)}">${sanitizeText(node.name)}</a>`;
+    }
     case BlockType.Emoticon:
       return node.key.startsWith('mxc://')
         ? `<img data-mx-emoticon src="${node.key}" alt="${sanitizeText(
@@ -62,7 +71,7 @@ const elementToCustomHtml = (node: CustomElement, children: string): string => {
           )}" title="${sanitizeText(node.shortcode)}" height="32" />`
         : sanitizeText(node.key);
     case BlockType.Link:
-      return `<a href="${encodeURIComponent(node.href)}">${node.children}</a>`;
+      return `<a href="${encodeURI(node.href)}">${node.children}</a>`;
     case BlockType.Command:
       return `/${sanitizeText(node.command)}`;
     default:

src/app/components/editor/slate.d.ts

@@ -29,6 +29,8 @@ export type LinkElement = {
 export type MentionElement = {
   type: BlockType.Mention;
   id: string;
+  eventId?: string;
+  viaServers?: string[];
   highlight: boolean;
   name: string;
   children: Text[];

src/app/components/editor/utils.ts

@@ -158,10 +158,14 @@ export const resetEditorHistory = (editor: Editor) => {
 export const createMentionElement = (
   id: string,
   name: string,
-  highlight: boolean
+  highlight: boolean,
+  eventId?: string,
+  viaServers?: string[]
 ): MentionElement => ({
   type: BlockType.Mention,
   id,
+  eventId,
+  viaServers,
   highlight,
   name,
   children: [{ text: '' }],

src/app/components/emoji-board/EmojiBoard.tsx

@@ -45,18 +45,19 @@ import {
 } from '../../plugins/emoji';
 import { IEmojiGroupLabels, useEmojiGroupLabels } from './useEmojiGroupLabels';
 import { IEmojiGroupIcons, useEmojiGroupIcons } from './useEmojiGroupIcons';
-import { preventScrollWithArrowKey } from '../../utils/keyboard';
+import { preventScrollWithArrowKey, stopPropagation } from '../../utils/keyboard';
 import { useRelevantImagePacks } from '../../hooks/useImagePacks';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { useRecentEmoji } from '../../hooks/useRecentEmoji';
 import { ExtendedPackImage, ImagePack, PackUsage } from '../../plugins/custom-emoji';
-import { isUserId } from '../../utils/matrix';
+import { isUserId, mxcUrlToHttp } from '../../utils/matrix';
 import { editableActiveElement, isIntersectingScrollView, targetFromEvent } from '../../utils/dom';
 import { useAsyncSearch, UseAsyncSearchOptions } from '../../hooks/useAsyncSearch';
 import { useDebounce } from '../../hooks/useDebounce';
 import { useThrottle } from '../../hooks/useThrottle';
 import { addRecentEmoji } from '../../plugins/recent-emoji';
 import { mobileOrTablet } from '../../utils/user-agent';
+import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
 
 const RECENT_GROUP_ID = 'recent_group';
 const SEARCH_GROUP_ID = 'search_group';
@@ -371,11 +372,13 @@ function ImagePackSidebarStack({
   packs,
   usage,
   onItemClick,
+  useAuthentication,
 }: {
   mx: MatrixClient;
   packs: ImagePack[];
   usage: PackUsage;
   onItemClick: (id: string) => void;
+  useAuthentication?: boolean;
 }) {
   const activeGroupId = useAtomValue(activeGroupIdAtom);
   return (
@@ -398,7 +401,7 @@ function ImagePackSidebarStack({
                 height: toRem(24),
                 objectFit: 'contain',
               }}
-              src={mx.mxcUrlToHttp(pack.getPackAvatarUrl(usage) ?? '') || pack.avatarUrl}
+              src={mxcUrlToHttp(mx, pack.getPackAvatarUrl(usage) ?? '', useAuthentication) || pack.avatarUrl}
               alt={label || 'Unknown Pack'}
             />
           </SidebarBtn>
@@ -470,12 +473,14 @@ export function SearchEmojiGroup({
   label,
   id,
   emojis: searchResult,
+  useAuthentication,
 }: {
   mx: MatrixClient;
   tab: EmojiBoardTab;
   label: string;
   id: string;
   emojis: Array<ExtendedPackImage | IEmoji>;
+  useAuthentication?: boolean;
 }) {
   return (
     <EmojiGroup key={id} id={id} label={label}>
@@ -503,7 +508,7 @@ export function SearchEmojiGroup({
                 loading="lazy"
                 className={css.CustomEmojiImg}
                 alt={emoji.body || emoji.shortcode}
-                  src={mx.mxcUrlToHttp(emoji.url) ?? emoji.url}
+                src={mxcUrlToHttp(mx, emoji.url, useAuthentication) ?? emoji.url}
               />
             </EmojiItem>
           )
@@ -521,7 +526,7 @@ export function SearchEmojiGroup({
                 loading="lazy"
                 className={css.StickerImg}
                 alt={emoji.body || emoji.shortcode}
-                  src={mx.mxcUrlToHttp(emoji.url) ?? emoji.url}
+                src={mxcUrlToHttp(mx, emoji.url, useAuthentication) ?? emoji.url}
               />
             </StickerItem>
           )
@@ -531,7 +536,7 @@ export function SearchEmojiGroup({
 }
 
 export const CustomEmojiGroups = memo(
-  ({ mx, groups }: { mx: MatrixClient; groups: ImagePack[] }) => (
+  ({ mx, groups, useAuthentication }: { mx: MatrixClient; groups: ImagePack[]; useAuthentication?: boolean }) => (
     <>
       {groups.map((pack) => (
         <EmojiGroup key={pack.id} id={pack.id} label={pack.displayName || 'Unknown'}>
@@ -547,7 +552,7 @@ export const CustomEmojiGroups = memo(
                 loading="lazy"
                 className={css.CustomEmojiImg}
                 alt={image.body || image.shortcode}
-                src={mx.mxcUrlToHttp(image.url) ?? image.url}
+                src={mxcUrlToHttp(mx, image.url, useAuthentication) ?? image.url}
               />
             </EmojiItem>
           ))}
@@ -557,7 +562,7 @@ export const CustomEmojiGroups = memo(
   )
 );
 
-export const StickerGroups = memo(({ mx, groups }: { mx: MatrixClient; groups: ImagePack[] }) => (
+export const StickerGroups = memo(({ mx, groups, useAuthentication }: { mx: MatrixClient; groups: ImagePack[]; useAuthentication?: boolean }) => (
   <>
     {groups.length === 0 && (
       <Box
@@ -590,7 +595,7 @@ export const StickerGroups = memo(({ mx, groups }: { mx: MatrixClient; groups: I
               loading="lazy"
               className={css.StickerImg}
               alt={image.body || image.shortcode}
-              src={mx.mxcUrlToHttp(image.url) ?? image.url}
+              src={mxcUrlToHttp(mx, image.url, useAuthentication) ?? image.url}
             />
           </StickerItem>
         ))}
@@ -662,6 +667,7 @@ export function EmojiBoard({
 
   const setActiveGroupId = useSetAtom(activeGroupIdAtom);
   const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
   const emojiGroupLabels = useEmojiGroupLabels();
   const emojiGroupIcons = useEmojiGroupIcons();
   const imagePacks = useRelevantImagePacks(mx, usage, imagePackRooms);
@@ -755,14 +761,14 @@ export function EmojiBoard({
       } else if (emojiInfo.type === EmojiType.CustomEmoji && emojiPreviewRef.current) {
         const img = document.createElement('img');
         img.className = css.CustomEmojiImg;
-        img.setAttribute('src', mx.mxcUrlToHttp(emojiInfo.data) || emojiInfo.data);
+        img.setAttribute('src', mxcUrlToHttp(mx, emojiInfo.data, useAuthentication) || emojiInfo.data);
         img.setAttribute('alt', emojiInfo.shortcode);
         emojiPreviewRef.current.textContent = '';
         emojiPreviewRef.current.appendChild(img);
       }
       emojiPreviewTextRef.current.textContent = `:${emojiInfo.shortcode}:`;
     },
-    [mx]
+    [mx, useAuthentication]
   );
 
   const throttleEmojiHover = useThrottle(handleEmojiPreview, {
@@ -801,6 +807,7 @@ export function EmojiBoard({
           !editableActiveElement() && isKeyHotkey(['arrowdown', 'arrowright'], evt),
         isKeyBackward: (evt: KeyboardEvent) =>
           !editableActiveElement() && isKeyHotkey(['arrowup', 'arrowleft'], evt),
+        escapeDeactivates: stopPropagation,
       }}
     >
       <EmojiBoardLayout
@@ -854,6 +861,7 @@ export function EmojiBoard({
                 usage={usage}
                 packs={imagePacks}
                 onItemClick={handleScrollToGroup}
+                useAuthentication={useAuthentication}
               />
             )}
             {emojiTab && (
@@ -915,13 +923,14 @@ export function EmojiBoard({
                   id={SEARCH_GROUP_ID}
                   label={result.items.length ? 'Search Results' : 'No Results found'}
                   emojis={result.items}
+                  useAuthentication={useAuthentication}
                 />
               )}
               {emojiTab && recentEmojis.length > 0 && (
                 <RecentEmojiGroup id={RECENT_GROUP_ID} label="Recent" emojis={recentEmojis} />
               )}
-              {emojiTab && <CustomEmojiGroups mx={mx} groups={imagePacks} />}
+              {emojiTab && <CustomEmojiGroups mx={mx} groups={imagePacks} useAuthentication={useAuthentication} />}
-              {stickerTab && <StickerGroups mx={mx} groups={imagePacks} />}
+              {stickerTab && <StickerGroups mx={mx} groups={imagePacks} useAuthentication={useAuthentication} />}
               {emojiTab && <NativeEmojiGroups groups={emojiGroups} labels={emojiGroupLabels} />}
             </Box>
           </Scroll>

src/app/components/event-readers/EventReaders.tsx

@@ -2,8 +2,6 @@ import React from 'react';
 import classNames from 'classnames';
 import {
   Avatar,
-  AvatarFallback,
-  AvatarImage,
   Box,
   Header,
   Icon,
@@ -21,8 +19,9 @@ import { getMemberDisplayName } from '../../utils/room';
 import { getMxIdLocalPart } from '../../utils/matrix';
 import * as css from './EventReaders.css';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
-import colorMXID from '../../../util/colorMXID';
 import { openProfileViewer } from '../../../client/action/navigation';
+import { UserAvatar } from '../user-avatar';
+import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
 
 export type EventReadersProps = {
   room: Room;
@@ -32,6 +31,7 @@ export type EventReadersProps = {
 export const EventReaders = as<'div', EventReadersProps>(
   ({ className, room, eventId, requestClose, ...props }, ref) => {
     const mx = useMatrixClient();
+    const useAuthentication = useMediaAuthentication();
     const latestEventReaders = useRoomEventReaders(room, eventId);
 
     const getName = (userId: string) =>
@@ -57,9 +57,10 @@ export const EventReaders = as<'div', EventReadersProps>(
             <Box className={css.Content} direction="Column">
               {latestEventReaders.map((readerId) => {
                 const name = getName(readerId);
-                const avatarUrl = room
+                const avatarMxcUrl = room
                   .getMember(readerId)
-                  ?.getAvatarUrl(mx.baseUrl, 100, 100, 'crop', undefined, false);
+                  ?.getMxcAvatarUrl();
+                const avatarUrl = avatarMxcUrl ? mx.mxcUrlToHttp(avatarMxcUrl, 100, 100, 'crop', undefined, false, useAuthentication) : undefined;
 
                 return (
                   <MenuItem
@@ -72,18 +73,12 @@ export const EventReaders = as<'div', EventReadersProps>(
                     }}
                     before={
                       <Avatar size="200">
-                        {avatarUrl ? (
+                        <UserAvatar
-                          <AvatarImage src={avatarUrl} />
+                          userId={readerId}
-                        ) : (
+                          src={avatarUrl ?? undefined}
-                          <AvatarFallback
+                          alt={name}
-                            style={{
+                          renderFallback={() => <Icon size="50" src={Icons.User} filled />}
-                              background: colorMXID(readerId),
+                        />
-                              color: 'white',
-                            }}
-                          >
-                            <Text size="H6">{name[0]}</Text>
-                          </AvatarFallback>
-                        )}
                       </Avatar>
                     }
                   >

src/app/components/image-viewer/ImageViewer.tsx

@@ -6,6 +6,7 @@ import { Box, Chip, Header, Icon, IconButton, Icons, Text, as } from 'folds';
 import * as css from './ImageViewer.css';
 import { useZoom } from '../../hooks/useZoom';
 import { usePan } from '../../hooks/usePan';
+import { downloadMedia } from '../../utils/matrix';
 
 export type ImageViewerProps = {
   alt: string;
@@ -18,8 +19,9 @@ export const ImageViewer = as<'div', ImageViewerProps>(
     const { zoom, zoomIn, zoomOut, setZoom } = useZoom(0.2);
     const { pan, cursor, onMouseDown } = usePan(zoom !== 1);
 
-    const handleDownload = () => {
+    const handleDownload = async () => {
-      FileSaver.saveAs(src, alt);
+      const fileContent = await downloadMedia(src);
+      FileSaver.saveAs(fileContent, alt);
     };
 
     return (

src/app/components/leave-room-prompt/LeaveRoomPrompt.tsx

@@ -0,0 +1,108 @@
+import React, { useCallback, useEffect } from 'react';
+import FocusTrap from 'focus-trap-react';
+import {
+  Dialog,
+  Overlay,
+  OverlayCenter,
+  OverlayBackdrop,
+  Header,
+  config,
+  Box,
+  Text,
+  IconButton,
+  Icon,
+  Icons,
+  color,
+  Button,
+  Spinner,
+} from 'folds';
+import { MatrixError } from 'matrix-js-sdk';
+import { useMatrixClient } from '../../hooks/useMatrixClient';
+import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
+import { stopPropagation } from '../../utils/keyboard';
+
+type LeaveRoomPromptProps = {
+  roomId: string;
+  onDone: () => void;
+  onCancel: () => void;
+};
+export function LeaveRoomPrompt({ roomId, onDone, onCancel }: LeaveRoomPromptProps) {
+  const mx = useMatrixClient();
+
+  const [leaveState, leaveRoom] = useAsyncCallback<undefined, MatrixError, []>(
+    useCallback(async () => {
+      mx.leave(roomId);
+    }, [mx, roomId])
+  );
+
+  const handleLeave = () => {
+    leaveRoom();
+  };
+
+  useEffect(() => {
+    if (leaveState.status === AsyncStatus.Success) {
+      onDone();
+    }
+  }, [leaveState, onDone]);
+
+  return (
+    <Overlay open backdrop={<OverlayBackdrop />}>
+      <OverlayCenter>
+        <FocusTrap
+          focusTrapOptions={{
+            initialFocus: false,
+            onDeactivate: onCancel,
+            clickOutsideDeactivates: true,
+            escapeDeactivates: stopPropagation,
+          }}
+        >
+          <Dialog variant="Surface">
+            <Header
+              style={{
+                padding: `0 ${config.space.S200} 0 ${config.space.S400}`,
+                borderBottomWidth: config.borderWidth.B300,
+              }}
+              variant="Surface"
+              size="500"
+            >
+              <Box grow="Yes">
+                <Text size="H4">Leave Room</Text>
+              </Box>
+              <IconButton size="300" onClick={onCancel} radii="300">
+                <Icon src={Icons.Cross} />
+              </IconButton>
+            </Header>
+            <Box style={{ padding: config.space.S400 }} direction="Column" gap="400">
+              <Box direction="Column" gap="200">
+                <Text priority="400">Are you sure you want to leave this room?</Text>
+                {leaveState.status === AsyncStatus.Error && (
+                  <Text style={{ color: color.Critical.Main }} size="T300">
+                    Failed to leave room! {leaveState.error.message}
+                  </Text>
+                )}
+              </Box>
+              <Button
+                type="submit"
+                variant="Critical"
+                onClick={handleLeave}
+                before={
+                  leaveState.status === AsyncStatus.Loading ? (
+                    <Spinner fill="Solid" variant="Critical" size="200" />
+                  ) : undefined
+                }
+                aria-disabled={
+                  leaveState.status === AsyncStatus.Loading ||
+                  leaveState.status === AsyncStatus.Success
+                }
+              >
+                <Text size="B400">
+                  {leaveState.status === AsyncStatus.Loading ? 'Leaving...' : 'Leave'}
+                </Text>
+              </Button>
+            </Box>
+          </Dialog>
+        </FocusTrap>
+      </OverlayCenter>
+    </Overlay>
+  );
+}

src/app/components/leave-room-prompt/index.ts

@@ -0,0 +1 @@
+export * from './LeaveRoomPrompt';

src/app/components/leave-space-prompt/LeaveSpacePrompt.tsx

@@ -0,0 +1,108 @@
+import React, { useCallback, useEffect } from 'react';
+import FocusTrap from 'focus-trap-react';
+import {
+  Dialog,
+  Overlay,
+  OverlayCenter,
+  OverlayBackdrop,
+  Header,
+  config,
+  Box,
+  Text,
+  IconButton,
+  Icon,
+  Icons,
+  color,
+  Button,
+  Spinner,
+} from 'folds';
+import { MatrixError } from 'matrix-js-sdk';
+import { useMatrixClient } from '../../hooks/useMatrixClient';
+import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
+import { stopPropagation } from '../../utils/keyboard';
+
+type LeaveSpacePromptProps = {
+  roomId: string;
+  onDone: () => void;
+  onCancel: () => void;
+};
+export function LeaveSpacePrompt({ roomId, onDone, onCancel }: LeaveSpacePromptProps) {
+  const mx = useMatrixClient();
+
+  const [leaveState, leaveRoom] = useAsyncCallback<undefined, MatrixError, []>(
+    useCallback(async () => {
+      mx.leave(roomId);
+    }, [mx, roomId])
+  );
+
+  const handleLeave = () => {
+    leaveRoom();
+  };
+
+  useEffect(() => {
+    if (leaveState.status === AsyncStatus.Success) {
+      onDone();
+    }
+  }, [leaveState, onDone]);
+
+  return (
+    <Overlay open backdrop={<OverlayBackdrop />}>
+      <OverlayCenter>
+        <FocusTrap
+          focusTrapOptions={{
+            initialFocus: false,
+            onDeactivate: onCancel,
+            clickOutsideDeactivates: true,
+            escapeDeactivates: stopPropagation,
+          }}
+        >
+          <Dialog variant="Surface">
+            <Header
+              style={{
+                padding: `0 ${config.space.S200} 0 ${config.space.S400}`,
+                borderBottomWidth: config.borderWidth.B300,
+              }}
+              variant="Surface"
+              size="500"
+            >
+              <Box grow="Yes">
+                <Text size="H4">Leave Space</Text>
+              </Box>
+              <IconButton size="300" onClick={onCancel} radii="300">
+                <Icon src={Icons.Cross} />
+              </IconButton>
+            </Header>
+            <Box style={{ padding: config.space.S400 }} direction="Column" gap="400">
+              <Box direction="Column" gap="200">
+                <Text priority="400">Are you sure you want to leave this space?</Text>
+                {leaveState.status === AsyncStatus.Error && (
+                  <Text style={{ color: color.Critical.Main }} size="T300">
+                    Failed to leave space! {leaveState.error.message}
+                  </Text>
+                )}
+              </Box>
+              <Button
+                type="submit"
+                variant="Critical"
+                onClick={handleLeave}
+                before={
+                  leaveState.status === AsyncStatus.Loading ? (
+                    <Spinner fill="Solid" variant="Critical" size="200" />
+                  ) : undefined
+                }
+                aria-disabled={
+                  leaveState.status === AsyncStatus.Loading ||
+                  leaveState.status === AsyncStatus.Success
+                }
+              >
+                <Text size="B400">
+                  {leaveState.status === AsyncStatus.Loading ? 'Leaving...' : 'Leave'}
+                </Text>
+              </Button>
+            </Box>
+          </Dialog>
+        </FocusTrap>
+      </OverlayCenter>
+    </Overlay>
+  );
+}

src/app/components/leave-space-prompt/index.ts

@@ -0,0 +1 @@
+export * from './LeaveSpacePrompt';

src/app/components/message/FileHeader.tsx

@@ -1,6 +1,6 @@
 import { Badge, Box, Text, as, toRem } from 'folds';
 import React from 'react';
-import { mimeTypeToExt } from '../../../utils/mimeTypes';
+import { mimeTypeToExt } from '../../utils/mimeTypes';
 
 const badgeStyles = { maxWidth: toRem(100) };
 

src/app/components/message/MsgTypeRenderers.tsx

@@ -0,0 +1,398 @@
+import React, { ReactNode } from 'react';
+import { Box, Chip, Icon, Icons, Text, toRem } from 'folds';
+import { IContent } from 'matrix-js-sdk';
+import { JUMBO_EMOJI_REG, URL_REG } from '../../utils/regex';
+import { trimReplyFromBody } from '../../utils/room';
+import { MessageTextBody } from './layout';
+import {
+  MessageBadEncryptedContent,
+  MessageBrokenContent,
+  MessageDeletedContent,
+  MessageEditedContent,
+  MessageUnsupportedContent,
+} from './content';
+import {
+  IAudioContent,
+  IAudioInfo,
+  IEncryptedFile,
+  IFileContent,
+  IFileInfo,
+  IImageContent,
+  IImageInfo,
+  IThumbnailContent,
+  IVideoContent,
+  IVideoInfo,
+} from '../../../types/matrix/common';
+import { FALLBACK_MIMETYPE, getBlobSafeMimeType } from '../../utils/mimeTypes';
+import { parseGeoUri, scaleYDimension } from '../../utils/common';
+import { Attachment, AttachmentBox, AttachmentContent, AttachmentHeader } from './attachment';
+import { FileHeader } from './FileHeader';
+
+export function MBadEncrypted() {
+  return (
+    <Text>
+      <MessageBadEncryptedContent />
+    </Text>
+  );
+}
+
+type RedactedContentProps = {
+  reason?: string;
+};
+export function RedactedContent({ reason }: RedactedContentProps) {
+  return (
+    <Text>
+      <MessageDeletedContent reason={reason} />
+    </Text>
+  );
+}
+
+export function UnsupportedContent() {
+  return (
+    <Text>
+      <MessageUnsupportedContent />
+    </Text>
+  );
+}
+
+export function BrokenContent() {
+  return (
+    <Text>
+      <MessageBrokenContent />
+    </Text>
+  );
+}
+
+type RenderBodyProps = {
+  body: string;
+  customBody?: string;
+};
+type MTextProps = {
+  edited?: boolean;
+  content: Record<string, unknown>;
+  renderBody: (props: RenderBodyProps) => ReactNode;
+  renderUrlsPreview?: (urls: string[]) => ReactNode;
+};
+export function MText({ edited, content, renderBody, renderUrlsPreview }: MTextProps) {
+  const { body, formatted_body: customBody } = content;
+
+  if (typeof body !== 'string') return <BrokenContent />;
+  const trimmedBody = trimReplyFromBody(body);
+  const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
+  const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
+
+  return (
+    <>
+      <MessageTextBody
+        preWrap={typeof customBody !== 'string'}
+        jumboEmoji={JUMBO_EMOJI_REG.test(trimmedBody)}
+      >
+        {renderBody({
+          body: trimmedBody,
+          customBody: typeof customBody === 'string' ? customBody : undefined,
+        })}
+        {edited && <MessageEditedContent />}
+      </MessageTextBody>
+      {renderUrlsPreview && urls && urls.length > 0 && renderUrlsPreview(urls)}
+    </>
+  );
+}
+
+type MEmoteProps = {
+  displayName: string;
+  edited?: boolean;
+  content: Record<string, unknown>;
+  renderBody: (props: RenderBodyProps) => ReactNode;
+  renderUrlsPreview?: (urls: string[]) => ReactNode;
+};
+export function MEmote({
+  displayName,
+  edited,
+  content,
+  renderBody,
+  renderUrlsPreview,
+}: MEmoteProps) {
+  const { body, formatted_body: customBody } = content;
+
+  if (typeof body !== 'string') return <BrokenContent />;
+  const trimmedBody = trimReplyFromBody(body);
+  const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
+  const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
+
+  return (
+    <>
+      <MessageTextBody
+        emote
+        preWrap={typeof customBody !== 'string'}
+        jumboEmoji={JUMBO_EMOJI_REG.test(trimmedBody)}
+      >
+        <b>{`${displayName} `}</b>
+        {renderBody({
+          body: trimmedBody,
+          customBody: typeof customBody === 'string' ? customBody : undefined,
+        })}
+        {edited && <MessageEditedContent />}
+      </MessageTextBody>
+      {renderUrlsPreview && urls && urls.length > 0 && renderUrlsPreview(urls)}
+    </>
+  );
+}
+
+type MNoticeProps = {
+  edited?: boolean;
+  content: Record<string, unknown>;
+  renderBody: (props: RenderBodyProps) => ReactNode;
+  renderUrlsPreview?: (urls: string[]) => ReactNode;
+};
+export function MNotice({ edited, content, renderBody, renderUrlsPreview }: MNoticeProps) {
+  const { body, formatted_body: customBody } = content;
+
+  if (typeof body !== 'string') return <BrokenContent />;
+  const trimmedBody = trimReplyFromBody(body);
+  const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
+  const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
+
+  return (
+    <>
+      <MessageTextBody
+        notice
+        preWrap={typeof customBody !== 'string'}
+        jumboEmoji={JUMBO_EMOJI_REG.test(trimmedBody)}
+      >
+        {renderBody({
+          body: trimmedBody,
+          customBody: typeof customBody === 'string' ? customBody : undefined,
+        })}
+        {edited && <MessageEditedContent />}
+      </MessageTextBody>
+      {renderUrlsPreview && urls && urls.length > 0 && renderUrlsPreview(urls)}
+    </>
+  );
+}
+
+type RenderImageContentProps = {
+  body: string;
+  info?: IImageInfo & IThumbnailContent;
+  mimeType?: string;
+  url: string;
+  encInfo?: IEncryptedFile;
+};
+type MImageProps = {
+  content: IImageContent;
+  renderImageContent: (props: RenderImageContentProps) => ReactNode;
+  outlined?: boolean;
+};
+export function MImage({ content, renderImageContent, outlined }: MImageProps) {
+  const imgInfo = content?.info;
+  const mxcUrl = content.file?.url ?? content.url;
+  if (typeof mxcUrl !== 'string') {
+    return <BrokenContent />;
+  }
+  const height = scaleYDimension(imgInfo?.w || 400, 400, imgInfo?.h || 400);
+
+  return (
+    <Attachment outlined={outlined}>
+      <AttachmentBox
+        style={{
+          height: toRem(height < 48 ? 48 : height),
+        }}
+      >
+        {renderImageContent({
+          body: content.body || 'Image',
+          info: imgInfo,
+          mimeType: imgInfo?.mimetype,
+          url: mxcUrl,
+          encInfo: content.file,
+        })}
+      </AttachmentBox>
+    </Attachment>
+  );
+}
+
+type RenderVideoContentProps = {
+  body: string;
+  info: IVideoInfo & IThumbnailContent;
+  mimeType: string;
+  url: string;
+  encInfo?: IEncryptedFile;
+};
+type MVideoProps = {
+  content: IVideoContent;
+  renderAsFile: () => ReactNode;
+  renderVideoContent: (props: RenderVideoContentProps) => ReactNode;
+  outlined?: boolean;
+};
+export function MVideo({ content, renderAsFile, renderVideoContent, outlined }: MVideoProps) {
+  const videoInfo = content?.info;
+  const mxcUrl = content.file?.url ?? content.url;
+  const safeMimeType = getBlobSafeMimeType(videoInfo?.mimetype ?? '');
+
+  if (!videoInfo || !safeMimeType.startsWith('video') || typeof mxcUrl !== 'string') {
+    if (mxcUrl) {
+      return renderAsFile();
+    }
+    return <BrokenContent />;
+  }
+
+  const height = scaleYDimension(videoInfo.w || 400, 400, videoInfo.h || 400);
+
+  return (
+    <Attachment outlined={outlined}>
+      <AttachmentBox
+        style={{
+          height: toRem(height < 48 ? 48 : height),
+        }}
+      >
+        {renderVideoContent({
+          body: content.body || 'Video',
+          info: videoInfo,
+          mimeType: safeMimeType,
+          url: mxcUrl,
+          encInfo: content.file,
+        })}
+      </AttachmentBox>
+    </Attachment>
+  );
+}
+
+type RenderAudioContentProps = {
+  info: IAudioInfo;
+  mimeType: string;
+  url: string;
+  encInfo?: IEncryptedFile;
+};
+type MAudioProps = {
+  content: IAudioContent;
+  renderAsFile: () => ReactNode;
+  renderAudioContent: (props: RenderAudioContentProps) => ReactNode;
+  outlined?: boolean;
+};
+export function MAudio({ content, renderAsFile, renderAudioContent, outlined }: MAudioProps) {
+  const audioInfo = content?.info;
+  const mxcUrl = content.file?.url ?? content.url;
+  const safeMimeType = getBlobSafeMimeType(audioInfo?.mimetype ?? '');
+
+  if (!audioInfo || !safeMimeType.startsWith('audio') || typeof mxcUrl !== 'string') {
+    if (mxcUrl) {
+      return renderAsFile();
+    }
+    return <BrokenContent />;
+  }
+
+  return (
+    <Attachment outlined={outlined}>
+      <AttachmentHeader>
+        <FileHeader body={content.body ?? 'Audio'} mimeType={safeMimeType} />
+      </AttachmentHeader>
+      <AttachmentBox>
+        <AttachmentContent>
+          {renderAudioContent({
+            info: audioInfo,
+            mimeType: safeMimeType,
+            url: mxcUrl,
+            encInfo: content.file,
+          })}
+        </AttachmentContent>
+      </AttachmentBox>
+    </Attachment>
+  );
+}
+
+type RenderFileContentProps = {
+  body: string;
+  info: IFileInfo & IThumbnailContent;
+  mimeType: string;
+  url: string;
+  encInfo?: IEncryptedFile;
+};
+type MFileProps = {
+  content: IFileContent;
+  renderFileContent: (props: RenderFileContentProps) => ReactNode;
+  outlined?: boolean;
+};
+export function MFile({ content, renderFileContent, outlined }: MFileProps) {
+  const fileInfo = content?.info;
+  const mxcUrl = content.file?.url ?? content.url;
+
+  if (typeof mxcUrl !== 'string') {
+    return <BrokenContent />;
+  }
+
+  return (
+    <Attachment outlined={outlined}>
+      <AttachmentHeader>
+        <FileHeader
+          body={content.body ?? 'Unnamed File'}
+          mimeType={fileInfo?.mimetype ?? FALLBACK_MIMETYPE}
+        />
+      </AttachmentHeader>
+      <AttachmentBox>
+        <AttachmentContent>
+          {renderFileContent({
+            body: content.body ?? 'File',
+            info: fileInfo ?? {},
+            mimeType: fileInfo?.mimetype ?? FALLBACK_MIMETYPE,
+            url: mxcUrl,
+            encInfo: content.file,
+          })}
+        </AttachmentContent>
+      </AttachmentBox>
+    </Attachment>
+  );
+}
+
+type MLocationProps = {
+  content: IContent;
+};
+export function MLocation({ content }: MLocationProps) {
+  const geoUri = content.geo_uri;
+  if (typeof geoUri !== 'string') return <BrokenContent />;
+  const location = parseGeoUri(geoUri);
+  return (
+    <Box direction="Column" alignItems="Start" gap="100">
+      <Text size="T400">{geoUri}</Text>
+      <Chip
+        as="a"
+        size="400"
+        href={`https://www.openstreetmap.org/?mlat=${location.latitude}&mlon=${location.longitude}#map=16/${location.latitude}/${location.longitude}`}
+        target="_blank"
+        rel="noreferrer noopener"
+        variant="Primary"
+        radii="Pill"
+        before={<Icon src={Icons.External} size="50" />}
+      >
+        <Text size="B300">Open Location</Text>
+      </Chip>
+    </Box>
+  );
+}
+
+type MStickerProps = {
+  content: IImageContent;
+  renderImageContent: (props: RenderImageContentProps) => ReactNode;
+};
+export function MSticker({ content, renderImageContent }: MStickerProps) {
+  const imgInfo = content?.info;
+  const mxcUrl = content.file?.url ?? content.url;
+  if (typeof mxcUrl !== 'string') {
+    return <MessageBrokenContent />;
+  }
+  const height = scaleYDimension(imgInfo?.w || 152, 152, imgInfo?.h || 152);
+
+  return (
+    <AttachmentBox
+      style={{
+        height: toRem(height < 48 ? 48 : height),
+        width: toRem(152),
+      }}
+    >
+      {renderImageContent({
+        body: content.body || 'Sticker',
+        info: imgInfo,
+        mimeType: imgInfo?.mimetype,
+        url: mxcUrl,
+        encInfo: content.file,
+      })}
+    </AttachmentBox>
+  );
+}

src/app/components/message/Reaction.tsx

@@ -5,7 +5,7 @@ import { MatrixClient, MatrixEvent, Room } from 'matrix-js-sdk';
 import * as css from './Reaction.css';
 import { getHexcodeForEmoji, getShortcodeFor, getEmojiUrl, isUsingTwemoji } from '../../plugins/emoji';
 import { getMemberDisplayName } from '../../utils/room';
-import { eventWithShortcode, getMxIdLocalPart } from '../../utils/matrix';
+import { eventWithShortcode, getMxIdLocalPart, mxcUrlToHttp } from '../../utils/matrix';
 
 export const Reaction = as<
   'button',
@@ -13,8 +13,9 @@ export const Reaction = as<
     mx: MatrixClient;
     count: number;
     reaction: string;
+    useAuthentication?: boolean;
   }
->(({ className, mx, count, reaction, ...props }, ref) => (
+>(({ className, mx, count, reaction, useAuthentication, ...props }, ref) => (
   <Box
     as="button"
     className={classNames(css.Reaction, className)}
@@ -28,7 +29,8 @@ export const Reaction = as<
       {reaction.startsWith('mxc://') ? (
         <img
           className={css.ReactionImg}
-          src={mx.mxcUrlToHttp(reaction) ?? reaction}
+          src={mxcUrlToHttp(mx, reaction, useAuthentication) ?? reaction
+          }
           alt={reaction}
         />
       ) : isUsingTwemoji() ? (

src/app/components/message/RenderBody.tsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import parse, { HTMLReactParserOptions } from 'html-react-parser';
+import Linkify from 'linkify-react';
+import { Opts } from 'linkifyjs';
+import { MessageEmptyContent } from './content';
+import { sanitizeCustomHtml } from '../../utils/sanitize';
+import { highlightText, scaleSystemEmoji } from '../../plugins/react-custom-html-parser';
+
+type RenderBodyProps = {
+  body: string;
+  customBody?: string;
+
+  highlightRegex?: RegExp;
+  htmlReactParserOptions: HTMLReactParserOptions;
+  linkifyOpts: Opts;
+};
+export function RenderBody({
+  body,
+  customBody,
+  highlightRegex,
+  htmlReactParserOptions,
+  linkifyOpts,
+}: RenderBodyProps) {
+  if (body === '') <MessageEmptyContent />;
+  if (customBody) {
+    if (customBody === '') <MessageEmptyContent />;
+    return parse(sanitizeCustomHtml(customBody), htmlReactParserOptions);
+  }
+  return (
+    <Linkify options={linkifyOpts}>
+      {highlightRegex
+        ? highlightText(highlightRegex, scaleSystemEmoji(body))
+        : scaleSystemEmoji(body)}
+    </Linkify>
+  );
+}

src/app/components/message/Reply.css.ts

@@ -1,13 +1,39 @@
 import { style } from '@vanilla-extract/css';
 import { config, toRem } from 'folds';
 
-export const Reply = style({
+export const ReplyBend = style({
-  padding: `0 ${config.space.S100}`,
+  flexShrink: 0,
-  marginBottom: toRem(1),
+});
+
+export const ThreadIndicator = style({
+  opacity: config.opacity.P300,
+  gap: toRem(2),
+
+  selectors: {
+    'button&': {
       cursor: 'pointer',
+    },
+    ':hover&': {
+      opacity: config.opacity.P500,
+    },
+  },
+});
+
+export const ThreadIndicatorIcon = style({
+  width: toRem(14),
+  height: toRem(14),
+});
+
+export const Reply = style({
+  marginBottom: toRem(1),
   minWidth: 0,
   maxWidth: '100%',
   minHeight: config.lineHeight.T300,
+  selectors: {
+    'button&': {
+      cursor: 'pointer',
+    },
+  },
 });
 
 export const ReplyContent = style({
@@ -19,7 +45,3 @@ export const ReplyContent = style({
     },
   },
 });
-
-export const ReplyContentText = style({
-  paddingRight: config.space.S100,
-});

src/app/components/message/Reply.tsx

@@ -1,7 +1,7 @@
 import { Box, Icon, Icons, Text, as, color, toRem } from 'folds';
 import { EventTimelineSet, MatrixClient, MatrixEvent, Room } from 'matrix-js-sdk';
 import { CryptoBackend } from 'matrix-js-sdk/lib/common-crypto/CryptoBackend';
-import React, { useEffect, useState } from 'react';
+import React, { MouseEventHandler, ReactNode, useEffect, useMemo, useState } from 'react';
 import to from 'await-to-js';
 import classNames from 'classnames';
 import colorMXID from '../../../util/colorMXID';
@@ -10,24 +10,56 @@ import { getMxIdLocalPart } from '../../utils/matrix';
 import { LinePlaceholder } from './placeholder';
 import { randomNumberBetween } from '../../utils/common';
 import * as css from './Reply.css';
-import {
+import { MessageBadEncryptedContent, MessageDeletedContent, MessageFailedContent } from './content';
-  MessageBadEncryptedContent,
+import { scaleSystemEmoji } from '../../plugins/react-custom-html-parser';
-  MessageDeletedContent,
+
-  MessageFailedContent,
+type ReplyLayoutProps = {
-} from './MessageContentFallback';
+  userColor?: string;
+  username?: ReactNode;
+};
+export const ReplyLayout = as<'div', ReplyLayoutProps>(
+  ({ username, userColor, className, children, ...props }, ref) => (
+    <Box
+      className={classNames(css.Reply, className)}
+      alignItems="Center"
+      alignSelf="Start"
+      gap="100"
+      {...props}
+      ref={ref}
+    >
+      <Box style={{ color: userColor, maxWidth: toRem(200) }} alignItems="Center" shrink="No">
+        <Icon size="100" src={Icons.ReplyArrow} />
+        {username}
+      </Box>
+      <Box grow="Yes" className={css.ReplyContent}>
+        {children}
+      </Box>
+    </Box>
+  )
+);
+
+export const ThreadIndicator = as<'div'>(({ ...props }, ref) => (
+  <Box className={css.ThreadIndicator} alignItems="Center" alignSelf="Start" {...props} ref={ref}>
+    <Icon className={css.ThreadIndicatorIcon} src={Icons.Message} />
+    <Text size="T200">Threaded reply</Text>
+  </Box>
+));
 
 type ReplyProps = {
   mx: MatrixClient;
   room: Room;
-  timelineSet: EventTimelineSet;
+  timelineSet?: EventTimelineSet | undefined;
-  eventId: string;
+  replyEventId: string;
+  threadRootId?: string | undefined;
+  onClick?: MouseEventHandler | undefined;
 };
 
-export const Reply = as<'div', ReplyProps>(
+export const Reply = as<'div', ReplyProps>((_, ref) => {
-  ({ className, mx, room, timelineSet, eventId, ...props }, ref) => {
+  const { mx, room, timelineSet, replyEventId, threadRootId, onClick, ...props } = _;
   const [replyEvent, setReplyEvent] = useState<MatrixEvent | null | undefined>(
-      timelineSet.findEventById(eventId)
+    timelineSet?.findEventById(replyEventId)
   );
+  const placeholderWidth = useMemo(() => randomNumberBetween(40, 400), []);
 
   const { body } = replyEvent?.getContent() ?? {};
   const sender = replyEvent?.getSender();
@@ -41,7 +73,7 @@ export const Reply = as<'div', ReplyProps>(
   useEffect(() => {
     let disposed = false;
     const loadEvent = async () => {
-        const [err, evt] = await to(mx.fetchRoomEvent(room.roomId, eventId));
+      const [err, evt] = await to(mx.fetchRoomEvent(room.roomId, replyEventId));
       const mEvent = new MatrixEvent(evt);
       if (disposed) return;
       if (err) {
@@ -57,47 +89,43 @@ export const Reply = as<'div', ReplyProps>(
     return () => {
       disposed = true;
     };
-    }, [replyEvent, mx, room, eventId]);
+  }, [replyEvent, mx, room, replyEventId]);
 
   const badEncryption = replyEvent?.getContent().msgtype === 'm.bad.encrypted';
-    const bodyJSX = body ? trimReplyFromBody(body) : fallbackBody;
+  const bodyJSX = body ? scaleSystemEmoji(trimReplyFromBody(body)) : fallbackBody;
 
   return (
-      <Box
+    <Box direction="Column" {...props} ref={ref}>
-        className={classNames(css.Reply, className)}
+      {threadRootId && (
-        alignItems="Center"
+        <ThreadIndicator as="button" data-event-id={threadRootId} onClick={onClick} />
-        gap="100"
-        {...props}
-        ref={ref}
-      >
-        <Box
-          style={{ color: colorMXID(sender ?? eventId), maxWidth: '50%' }}
-          alignItems="Center"
-          shrink="No"
-        >
-          <Icon src={Icons.ReplyArrow} size="50" />
-          {sender && (
-            <Text size="T300" truncate>
-              {getMemberDisplayName(room, sender) ?? getMxIdLocalPart(sender)}
-            </Text>
       )}
-        </Box>
+      <ReplyLayout
-        <Box grow="Yes" className={css.ReplyContent}>
+        as="button"
+        userColor={sender ? colorMXID(sender) : undefined}
+        username={
+          sender && (
+            <Text size="T300" truncate>
+              <b>{getMemberDisplayName(room, sender) ?? getMxIdLocalPart(sender)}</b>
+            </Text>
+          )
+        }
+        data-event-id={replyEventId}
+        onClick={onClick}
+      >
         {replyEvent !== undefined ? (
-            <Text className={css.ReplyContentText} size="T300" truncate>
+          <Text size="T300" truncate>
             {badEncryption ? <MessageBadEncryptedContent /> : bodyJSX}
           </Text>
         ) : (
           <LinePlaceholder
             style={{
               backgroundColor: color.SurfaceVariant.ContainerActive,
-                maxWidth: toRem(randomNumberBetween(40, 400)),
+              maxWidth: toRem(placeholderWidth),
               width: '100%',
             }}
           />
         )}
-        </Box>
+      </ReplyLayout>
     </Box>
   );
-  }
+});
-);

src/app/components/message/Time.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ComponentProps } from 'react';
 import { Text, as } from 'folds';
 import { timeDayMonYear, timeHourMinute, today, yesterday } from '../../utils/time';
 
@@ -7,7 +7,8 @@ export type TimeProps = {
   ts: number;
 };
 
-export const Time = as<'span', TimeProps>(({ compact, ts, ...props }, ref) => {
+export const Time = as<'span', TimeProps & ComponentProps<typeof Text>>(
+  ({ compact, ts, ...props }, ref) => {
     let time = '';
     if (compact) {
       time = timeHourMinute(ts);
@@ -24,4 +25,5 @@ export const Time = as<'span', TimeProps>(({ compact, ts, ...props }, ref) => {
         {time}
       </Text>
     );
-});
+  }
+);

src/app/components/message/attachment/Attachment.css.ts

@@ -9,7 +9,7 @@ export const Attachment = recipe({
     borderRadius: config.radii.R400,
     overflow: 'hidden',
     maxWidth: '100%',
-    // width: toRem(400),
+    width: toRem(400),
   },
   variants: {
     outlined: {
@@ -31,7 +31,7 @@ export const AttachmentBox = style([
   {
     maxWidth: '100%',
     maxHeight: toRem(600),
-    // width: toRem(400),
+    width: toRem(400),
     overflow: 'hidden',
   },
 ]);

src/app/components/message/content/AudioContent.tsx

@@ -0,0 +1,209 @@
+/* eslint-disable jsx-a11y/media-has-caption */
+import React, { 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';
+import { useMatrixClient } from '../../../hooks/useMatrixClient';
+import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
+import { IAudioInfo } from '../../../../types/matrix/common';
+import {
+  PlayTimeCallback,
+  useMediaLoading,
+  useMediaPlay,
+  useMediaPlayTimeCallback,
+  useMediaSeek,
+  useMediaVolume,
+} from '../../../hooks/media';
+import { useThrottle } from '../../../hooks/useThrottle';
+import { secondsToMinutesAndSeconds } from '../../../utils/common';
+import {
+  decryptFile,
+  downloadEncryptedMedia,
+  downloadMedia,
+  mxcUrlToHttp,
+} from '../../../utils/matrix';
+import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
+
+const PLAY_TIME_THROTTLE_OPS = {
+  wait: 500,
+  immediate: true,
+};
+
+type RenderMediaControlProps = {
+  after: ReactNode;
+  leftControl: ReactNode;
+  rightControl: ReactNode;
+  children: ReactNode;
+};
+export type AudioContentProps = {
+  mimeType: string;
+  url: string;
+  info: IAudioInfo;
+  encInfo?: EncryptedAttachmentInfo;
+  renderMediaControl: (props: RenderMediaControlProps) => ReactNode;
+};
+export function AudioContent({
+  mimeType,
+  url,
+  info,
+  encInfo,
+  renderMediaControl,
+}: AudioContentProps) {
+  const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
+
+  const [srcState, loadSrc] = useAsyncCallback(
+    useCallback(async () => {
+      const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
+      const fileContent = encInfo
+        ? await downloadEncryptedMedia(mediaUrl, (encBuf) => decryptFile(encBuf, mimeType, encInfo))
+        : await downloadMedia(mediaUrl);
+      return URL.createObjectURL(fileContent);
+    }, [mx, url, useAuthentication, mimeType, encInfo])
+  );
+
+  const audioRef = useRef<HTMLAudioElement | null>(null);
+
+  const [currentTime, setCurrentTime] = useState(0);
+  // duration in seconds. (NOTE: info.duration is in milliseconds)
+  const infoDuration = info.duration ?? 0;
+  const [duration, setDuration] = useState((infoDuration >= 0 ? infoDuration : 0) / 1000);
+
+  const getAudioRef = useCallback(() => audioRef.current, []);
+  const { loading } = useMediaLoading(getAudioRef);
+  const { playing, setPlaying } = useMediaPlay(getAudioRef);
+  const { seek } = useMediaSeek(getAudioRef);
+  const { volume, mute, setMute, setVolume } = useMediaVolume(getAudioRef);
+  const handlePlayTimeCallback: PlayTimeCallback = useCallback((d, ct) => {
+    setDuration(d);
+    setCurrentTime(ct);
+  }, []);
+  useMediaPlayTimeCallback(
+    getAudioRef,
+    useThrottle(handlePlayTimeCallback, PLAY_TIME_THROTTLE_OPS)
+  );
+
+  const handlePlay = () => {
+    if (srcState.status === AsyncStatus.Success) {
+      setPlaying(!playing);
+    } else if (srcState.status !== AsyncStatus.Loading) {
+      loadSrc();
+    }
+  };
+
+  return renderMediaControl({
+    after: (
+      <Range
+        step={1}
+        min={0}
+        max={duration || 1}
+        values={[currentTime]}
+        onChange={(values) => seek(values[0])}
+        renderTrack={(params) => (
+          <div {...params.props}>
+            {params.children}
+            <ProgressBar
+              as="div"
+              variant="Secondary"
+              size="300"
+              min={0}
+              max={duration}
+              value={currentTime}
+              radii="300"
+            />
+          </div>
+        )}
+        renderThumb={(params) => (
+          <Badge
+            size="300"
+            variant="Secondary"
+            fill="Solid"
+            radii="Pill"
+            outlined
+            {...params.props}
+            style={{
+              ...params.props.style,
+              zIndex: 0,
+            }}
+          />
+        )}
+      />
+    ),
+    leftControl: (
+      <>
+        <Chip
+          onClick={handlePlay}
+          variant="Secondary"
+          radii="300"
+          disabled={srcState.status === AsyncStatus.Loading}
+          before={
+            srcState.status === AsyncStatus.Loading || loading ? (
+              <Spinner variant="Secondary" size="50" />
+            ) : (
+              <Icon src={playing ? Icons.Pause : Icons.Play} size="50" filled={playing} />
+            )
+          }
+        >
+          <Text size="B300">{playing ? 'Pause' : 'Play'}</Text>
+        </Chip>
+
+        <Text size="T200">{`${secondsToMinutesAndSeconds(
+          currentTime
+        )} / ${secondsToMinutesAndSeconds(duration)}`}</Text>
+      </>
+    ),
+    rightControl: (
+      <>
+        <IconButton
+          variant="SurfaceVariant"
+          size="300"
+          radii="Pill"
+          onClick={() => setMute(!mute)}
+          aria-pressed={mute}
+        >
+          <Icon src={mute ? Icons.VolumeMute : Icons.VolumeHigh} size="50" />
+        </IconButton>
+        <Range
+          step={0.1}
+          min={0}
+          max={1}
+          values={[volume]}
+          onChange={(values) => setVolume(values[0])}
+          renderTrack={(params) => (
+            <div {...params.props}>
+              {params.children}
+              <ProgressBar
+                style={{ width: toRem(48) }}
+                variant="Secondary"
+                size="300"
+                min={0}
+                max={1}
+                value={volume}
+                radii="300"
+              />
+            </div>
+          )}
+          renderThumb={(params) => (
+            <Badge
+              size="300"
+              variant="Secondary"
+              fill="Solid"
+              radii="Pill"
+              outlined
+              {...params.props}
+              style={{
+                ...params.props.style,
+                zIndex: 0,
+              }}
+            />
+          )}
+        />
+      </>
+    ),
+    children: (
+      <audio controls={false} autoPlay ref={audioRef}>
+        {srcState.status === AsyncStatus.Success && <source src={srcState.data} type={mimeType} />}
+      </audio>
+    ),
+  });
+}

src/app/components/message/content/EventContent.tsx

@@ -1,6 +1,6 @@
 import { Box, Icon, IconSrc } from 'folds';
 import React, { ReactNode } from 'react';
-import { CompactLayout, ModernLayout } from '../../../components/message';
+import { CompactLayout, ModernLayout } from '..';
 
 export type EventContentProps = {
   messageLayout: number;

src/app/components/message/content/FileContent.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { ReactNode, useCallback, useState } from 'react';
 import {
   Box,
   Button,
@@ -20,25 +20,22 @@ import FocusTrap from 'focus-trap-react';
 import { IFileInfo } from '../../../../types/matrix/common';
 import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
-import { getFileSrcUrl, getSrcFile } from './util';
 import { bytesToSize } from '../../../utils/common';
-import { TextViewer } from '../../../components/text-viewer';
 import {
   READABLE_EXT_TO_MIME_TYPE,
   READABLE_TEXT_MIME_TYPES,
   getFileNameExt,
   mimeTypeToExt,
 } from '../../../utils/mimeTypes';
-import { PdfViewer } from '../../../components/Pdf-viewer';
+import * as css from './style.css';
-import * as css from './styles.css';
+import { stopPropagation } from '../../../utils/keyboard';
-
+import {
-export type FileContentProps = {
+  decryptFile,
-  body: string;
+  downloadEncryptedMedia,
-  mimeType: string;
+  downloadMedia,
-  url: string;
+  mxcUrlToHttp,
-  info: IFileInfo;
+} from '../../../utils/matrix';
-  encInfo?: EncryptedAttachmentInfo;
+import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
-};
 
 const renderErrorButton = (retry: () => void, text: string) => (
   <TooltipProvider
@@ -69,23 +66,35 @@ const renderErrorButton = (retry: () => void, text: string) => (
   </TooltipProvider>
 );
 
-function ReadTextFile({ body, mimeType, url, encInfo }: Omit<FileContentProps, 'info'>) {
+type RenderTextViewerProps = {
+  name: string;
+  text: string;
+  langName: string;
+  requestClose: () => void;
+};
+type ReadTextFileProps = {
+  body: string;
+  mimeType: string;
+  url: string;
+  encInfo?: EncryptedAttachmentInfo;
+  renderViewer: (props: RenderTextViewerProps) => ReactNode;
+};
+export function ReadTextFile({ body, mimeType, url, encInfo, renderViewer }: ReadTextFileProps) {
   const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
   const [textViewer, setTextViewer] = useState(false);
 
-  const loadSrc = useCallback(
-    () => getFileSrcUrl(mx.mxcUrlToHttp(url) ?? '', mimeType, encInfo),
-    [mx, url, mimeType, encInfo]
-  );
-
   const [textState, loadText] = useAsyncCallback(
     useCallback(async () => {
-      const src = await loadSrc();
+      const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
-      const blob = await getSrcFile(src);
+      const fileContent = encInfo
-      const text = blob.text();
+        ? await downloadEncryptedMedia(mediaUrl, (encBuf) => decryptFile(encBuf, mimeType, encInfo))
+        : await downloadMedia(mediaUrl);
+
+      const text = fileContent.text();
       setTextViewer(true);
       return text;
-    }, [loadSrc])
+    }, [mx, useAuthentication, mimeType, encInfo, url])
   );
 
   return (
@@ -98,6 +107,7 @@ function ReadTextFile({ body, mimeType, url, encInfo }: Omit<FileContentProps, '
                 initialFocus: false,
                 onDeactivate: () => setTextViewer(false),
                 clickOutsideDeactivates: true,
+                escapeDeactivates: stopPropagation,
               }}
             >
               <Modal
@@ -105,16 +115,14 @@ function ReadTextFile({ body, mimeType, url, encInfo }: Omit<FileContentProps, '
                 size="500"
                 onContextMenu={(evt: any) => evt.stopPropagation()}
               >
-                <TextViewer
+                {renderViewer({
-                  name={body}
+                  name: body,
-                  text={textState.data}
+                  text: textState.data,
-                  langName={
+                  langName: READABLE_TEXT_MIME_TYPES.includes(mimeType)
-                    READABLE_TEXT_MIME_TYPES.includes(mimeType)
                     ? mimeTypeToExt(mimeType)
-                      : mimeTypeToExt(READABLE_EXT_TO_MIME_TYPE[getFileNameExt(body)] ?? mimeType)
+                    : mimeTypeToExt(READABLE_EXT_TO_MIME_TYPE[getFileNameExt(body)] ?? mimeType),
-                  }
+                  requestClose: () => setTextViewer(false),
-                  requestClose={() => setTextViewer(false)}
+                })}
-                />
               </Modal>
             </FocusTrap>
           </OverlayCenter>
@@ -149,16 +157,32 @@ function ReadTextFile({ body, mimeType, url, encInfo }: Omit<FileContentProps, '
   );
 }
 
-function ReadPdfFile({ body, mimeType, url, encInfo }: Omit<FileContentProps, 'info'>) {
+type RenderPdfViewerProps = {
+  name: string;
+  src: string;
+  requestClose: () => void;
+};
+export type ReadPdfFileProps = {
+  body: string;
+  mimeType: string;
+  url: string;
+  encInfo?: EncryptedAttachmentInfo;
+  renderViewer: (props: RenderPdfViewerProps) => ReactNode;
+};
+export function ReadPdfFile({ body, mimeType, url, encInfo, renderViewer }: ReadPdfFileProps) {
   const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
   const [pdfViewer, setPdfViewer] = useState(false);
 
   const [pdfState, loadPdf] = useAsyncCallback(
     useCallback(async () => {
-      const httpUrl = await getFileSrcUrl(mx.mxcUrlToHttp(url) ?? '', mimeType, encInfo);
+      const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
+      const fileContent = encInfo
+        ? await downloadEncryptedMedia(mediaUrl, (encBuf) => decryptFile(encBuf, mimeType, encInfo))
+        : await downloadMedia(mediaUrl);
       setPdfViewer(true);
-      return httpUrl;
+      return URL.createObjectURL(fileContent);
-    }, [mx, url, mimeType, encInfo])
+    }, [mx, url, useAuthentication, mimeType, encInfo])
   );
 
   return (
@@ -171,6 +195,7 @@ function ReadPdfFile({ body, mimeType, url, encInfo }: Omit<FileContentProps, 'i
                 initialFocus: false,
                 onDeactivate: () => setPdfViewer(false),
                 clickOutsideDeactivates: true,
+                escapeDeactivates: stopPropagation,
               }}
             >
               <Modal
@@ -178,11 +203,11 @@ function ReadPdfFile({ body, mimeType, url, encInfo }: Omit<FileContentProps, 'i
                 size="500"
                 onContextMenu={(evt: any) => evt.stopPropagation()}
               >
-                <PdfViewer
+                {renderViewer({
-                  name={body}
+                  name: body,
-                  src={pdfState.data}
+                  src: pdfState.data,
-                  requestClose={() => setPdfViewer(false)}
+                  requestClose: () => setPdfViewer(false),
-                />
+                })}
               </Modal>
             </FocusTrap>
           </OverlayCenter>
@@ -215,15 +240,28 @@ function ReadPdfFile({ body, mimeType, url, encInfo }: Omit<FileContentProps, 'i
   );
 }
 
-function DownloadFile({ body, mimeType, url, info, encInfo }: FileContentProps) {
+export type DownloadFileProps = {
+  body: string;
+  mimeType: string;
+  url: string;
+  info: IFileInfo;
+  encInfo?: EncryptedAttachmentInfo;
+};
+export function DownloadFile({ body, mimeType, url, info, encInfo }: DownloadFileProps) {
   const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
 
   const [downloadState, download] = useAsyncCallback(
     useCallback(async () => {
-      const httpUrl = await getFileSrcUrl(mx.mxcUrlToHttp(url) ?? '', mimeType, encInfo);
+      const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
-      FileSaver.saveAs(httpUrl, body);
+      const fileContent = encInfo
-      return httpUrl;
+        ? await downloadEncryptedMedia(mediaUrl, (encBuf) => decryptFile(encBuf, mimeType, encInfo))
-    }, [mx, url, mimeType, encInfo, body])
+        : await downloadMedia(mediaUrl);
+
+      const fileURL = URL.createObjectURL(fileContent);
+      FileSaver.saveAs(fileURL, body);
+      return fileURL;
+    }, [mx, url, useAuthentication, mimeType, encInfo, body])
   );
 
   return downloadState.status === AsyncStatus.Error ? (
@@ -253,17 +291,20 @@ function DownloadFile({ body, mimeType, url, info, encInfo }: FileContentProps)
   );
 }
 
+type FileContentProps = {
+  body: string;
+  mimeType: string;
+  renderAsTextFile: () => ReactNode;
+  renderAsPdfFile: () => ReactNode;
+};
 export const FileContent = as<'div', FileContentProps>(
-  ({ body, mimeType, url, info, encInfo, ...props }, ref) => (
+  ({ body, mimeType, renderAsTextFile, renderAsPdfFile, children, ...props }, ref) => (
     <Box direction="Column" gap="300" {...props} ref={ref}>
       {(READABLE_TEXT_MIME_TYPES.includes(mimeType) ||
-        READABLE_EXT_TO_MIME_TYPE[getFileNameExt(body)]) && (
+        READABLE_EXT_TO_MIME_TYPE[getFileNameExt(body)]) &&
-        <ReadTextFile body={body} mimeType={mimeType} url={url} encInfo={encInfo} />
+        renderAsTextFile()}
-      )}
+      {mimeType === 'application/pdf' && renderAsPdfFile()}
-      {mimeType === 'application/pdf' && (
+      {children}
-        <ReadPdfFile body={body} mimeType={mimeType} url={url} encInfo={encInfo} />
-      )}
-      <DownloadFile body={body} mimeType={mimeType} url={url} info={info} encInfo={encInfo} />
     </Box>
   )
 );

src/app/components/message/content/ImageContent.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { ReactNode, useCallback, useEffect, useState } from 'react';
 import {
   Badge,
   Box,
@@ -22,13 +22,27 @@ 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 { getFileSrcUrl } from './util';
+import * as css from './style.css';
-import { Image } from '../../../components/media';
-import * as css from './styles.css';
 import { bytesToSize } from '../../../utils/common';
-import { ImageViewer } from '../../../components/image-viewer';
 import { FALLBACK_MIMETYPE } from '../../../utils/mimeTypes';
+import { stopPropagation } from '../../../utils/keyboard';
+import { decryptFile, downloadEncryptedMedia, mxcUrlToHttp } from '../../../utils/matrix';
+import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
 
+type RenderViewerProps = {
+  src: string;
+  alt: string;
+  requestClose: () => void;
+};
+type RenderImageProps = {
+  alt: string;
+  title: string;
+  src: string;
+  onLoad: () => void;
+  onError: () => void;
+  onClick: () => void;
+  tabIndex: number;
+};
 export type ImageContentProps = {
   body: string;
   mimeType?: string;
@@ -36,10 +50,27 @@ export type ImageContentProps = {
   info?: IImageInfo;
   encInfo?: EncryptedAttachmentInfo;
   autoPlay?: boolean;
+  renderViewer: (props: RenderViewerProps) => ReactNode;
+  renderImage: (props: RenderImageProps) => ReactNode;
 };
 export const ImageContent = as<'div', ImageContentProps>(
-  ({ className, body, mimeType, url, info, encInfo, autoPlay, ...props }, ref) => {
+  (
+    {
+      className,
+      body,
+      mimeType,
+      url,
+      info,
+      encInfo,
+      autoPlay,
+      renderViewer,
+      renderImage,
+      ...props
+    },
+    ref
+  ) => {
     const mx = useMatrixClient();
+    const useAuthentication = useMediaAuthentication();
     const blurHash = info?.[MATRIX_BLUR_HASH_PROPERTY_NAME];
 
     const [load, setLoad] = useState(false);
@@ -47,10 +78,16 @@ export const ImageContent = as<'div', ImageContentProps>(
     const [viewer, setViewer] = useState(false);
 
     const [srcState, loadSrc] = useAsyncCallback(
-      useCallback(
+      useCallback(async () => {
-        () => getFileSrcUrl(mx.mxcUrlToHttp(url) ?? '', mimeType || FALLBACK_MIMETYPE, encInfo),
+        const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
-        [mx, url, mimeType, encInfo]
+        if (encInfo) {
-      )
+          const fileContent = await downloadEncryptedMedia(mediaUrl, (encBuf) =>
+            decryptFile(encBuf, mimeType ?? FALLBACK_MIMETYPE, encInfo)
+          );
+          return URL.createObjectURL(fileContent);
+        }
+        return mediaUrl;
+      }, [mx, url, useAuthentication, mimeType, encInfo])
     );
 
     const handleLoad = () => {
@@ -80,6 +117,7 @@ export const ImageContent = as<'div', ImageContentProps>(
                   initialFocus: false,
                   onDeactivate: () => setViewer(false),
                   clickOutsideDeactivates: true,
+                  escapeDeactivates: stopPropagation,
                 }}
               >
                 <Modal
@@ -87,11 +125,11 @@ export const ImageContent = as<'div', ImageContentProps>(
                   size="500"
                   onContextMenu={(evt: any) => evt.stopPropagation()}
                 >
-                  <ImageViewer
+                  {renderViewer({
-                    src={srcState.data}
+                    src: srcState.data,
-                    alt={body}
+                    alt: body,
-                    requestClose={() => setViewer(false)}
+                    requestClose: () => setViewer(false),
-                  />
+                  })}
                 </Modal>
               </FocusTrap>
             </OverlayCenter>
@@ -121,17 +159,16 @@ export const ImageContent = as<'div', ImageContentProps>(
           </Box>
         )}
         {srcState.status === AsyncStatus.Success && (
-          <Box className={css.AbsoluteContainer} style={{position: 'unset'}}>
+          <Box className={css.AbsoluteContainer}>
-            <Image
+            {renderImage({
-              alt={body}
+              alt: body,
-              title={body}
+              title: body,
-              src={srcState.data}
+              src: srcState.data,
-              loading="lazy"
+              onLoad: handleLoad,
-              onLoad={handleLoad}
+              onError: handleError,
-              onError={handleError}
+              onClick: () => setViewer(true),
-              onClick={() => setViewer(true)}
+              tabIndex: 0,
-              tabIndex={0}
+            })}
-            />
           </Box>
         )}
         {(srcState.status === AsyncStatus.Loading || srcState.status === AsyncStatus.Success) &&

src/app/components/message/content/ThumbnailContent.tsx

@@ -0,0 +1,43 @@
+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 '../../../utils/matrix';
+import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
+import { FALLBACK_MIMETYPE } from '../../../utils/mimeTypes';
+
+export type ThumbnailContentProps = {
+  info: IThumbnailContent;
+  renderImage: (src: string) => ReactNode;
+};
+export function ThumbnailContent({ info, renderImage }: ThumbnailContentProps) {
+  const mx = useMatrixClient();
+  const useAuthentication = useMediaAuthentication();
+
+  const [thumbSrcState, loadThumbSrc] = useAsyncCallback(
+    useCallback(async () => {
+      const thumbInfo = info.thumbnail_info;
+      const thumbMxcUrl = info.thumbnail_file?.url ?? info.thumbnail_url;
+      const encInfo = info.thumbnail_file;
+      if (typeof thumbMxcUrl !== 'string' || typeof thumbInfo?.mimetype !== 'string') {
+        throw new Error('Failed to load thumbnail');
+      }
+
+      const mediaUrl = mxcUrlToHttp(mx, thumbMxcUrl, useAuthentication) ?? thumbMxcUrl;
+      if (encInfo) {
+        const fileContent = await downloadEncryptedMedia(mediaUrl, (encBuf) =>
+          decryptFile(encBuf, thumbInfo.mimetype ?? FALLBACK_MIMETYPE, encInfo)
+        );
+        return URL.createObjectURL(fileContent);
+      }
+
+      return mediaUrl;
+    }, [mx, info, useAuthentication])
+  );
+
+  useEffect(() => {
+    loadThumbSrc();
+  }, [loadThumbSrc]);
+
+  return thumbSrcState.status === AsyncStatus.Success ? renderImage(thumbSrcState.data) : null;
+}

src/app/components/message/content/VideoContent.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { ReactNode, useCallback, useEffect, useState } from 'react';
 import {
   Badge,
   Box,
@@ -19,50 +19,70 @@ import {
   IVideoInfo,
   MATRIX_BLUR_HASH_PROPERTY_NAME,
 } from '../../../../types/matrix/common';
-import * as css from './styles.css';
+import * as css from './style.css';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
 import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
-import { getFileSrcUrl } from './util';
-import { Image, Video } from '../../../components/media';
 import { bytesToSize } from '../../../../util/common';
 import { millisecondsToMinutesAndSeconds } from '../../../utils/common';
+import {
+  decryptFile,
+  downloadEncryptedMedia,
+  downloadMedia,
+  mxcUrlToHttp,
+} from '../../../utils/matrix';
+import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
 
-export type VideoContentProps = {
+type RenderVideoProps = {
+  title: string;
+  src: string;
+  onLoadedMetadata: () => void;
+  onError: () => void;
+  autoPlay: boolean;
+  controls: boolean;
+};
+type VideoContentProps = {
   body: string;
   mimeType: string;
   url: string;
   info: IVideoInfo & IThumbnailContent;
   encInfo?: EncryptedAttachmentInfo;
   autoPlay?: boolean;
-  loadThumbnail?: boolean;
+  renderThumbnail?: () => ReactNode;
+  renderVideo: (props: RenderVideoProps) => ReactNode;
 };
 export const VideoContent = as<'div', VideoContentProps>(
-  ({ className, body, mimeType, url, info, encInfo, autoPlay, loadThumbnail, ...props }, ref) => {
+  (
+    {
+      className,
+      body,
+      mimeType,
+      url,
+      info,
+      encInfo,
+      autoPlay,
+      renderThumbnail,
+      renderVideo,
+      ...props
+    },
+    ref
+  ) => {
     const mx = useMatrixClient();
+    const useAuthentication = useMediaAuthentication();
     const blurHash = info.thumbnail_info?.[MATRIX_BLUR_HASH_PROPERTY_NAME];
 
     const [load, setLoad] = useState(false);
     const [error, setError] = useState(false);
 
     const [srcState, loadSrc] = useAsyncCallback(
-      useCallback(
+      useCallback(async () => {
-        () => getFileSrcUrl(mx.mxcUrlToHttp(url) ?? '', mimeType, encInfo),
+        const mediaUrl = mxcUrlToHttp(mx, url, useAuthentication) ?? url;
-        [mx, url, mimeType, encInfo]
+        const fileContent = encInfo
+          ? await downloadEncryptedMedia(mediaUrl, (encBuf) =>
+              decryptFile(encBuf, mimeType, encInfo)
             )
-    );
+          : await downloadMedia(mediaUrl);
-    const [thumbSrcState, loadThumbSrc] = useAsyncCallback(
+        return URL.createObjectURL(fileContent);
-      useCallback(() => {
+      }, [mx, url, useAuthentication, mimeType, encInfo])
-        const thumbInfo = info.thumbnail_info;
-        const thumbMxcUrl = info.thumbnail_file?.url ?? info.thumbnail_url;
-        if (typeof thumbMxcUrl !== 'string' || typeof thumbInfo?.mimetype !== 'string') {
-          throw new Error('Failed to load thumbnail');
-        }
-        return getFileSrcUrl(
-          mx.mxcUrlToHttp(thumbMxcUrl) ?? '',
-          thumbInfo.mimetype,
-          info.thumbnail_file
-        );
-      }, [mx, info])
     );
 
     const handleLoad = () => {
@@ -81,9 +101,6 @@ export const VideoContent = as<'div', VideoContentProps>(
     useEffect(() => {
       if (autoPlay) loadSrc();
     }, [autoPlay, loadSrc]);
-    useEffect(() => {
-      if (loadThumbnail) loadThumbSrc();
-    }, [loadThumbnail, loadThumbSrc]);
 
     return (
       <Box className={classNames(css.RelativeBase, className)} {...props} ref={ref}>
@@ -96,9 +113,9 @@ export const VideoContent = as<'div', VideoContentProps>(
             punch={1}
           />
         )}
-        {thumbSrcState.status === AsyncStatus.Success && !load && (
+        {renderThumbnail && !load && (
           <Box className={css.AbsoluteContainer} alignItems="Center" justifyContent="Center">
-            <Image alt={body} title={body} src={thumbSrcState.data} loading="lazy" />
+            {renderThumbnail()}
           </Box>
         )}
         {!autoPlay && srcState.status === AsyncStatus.Idle && (
@@ -116,15 +133,15 @@ export const VideoContent = as<'div', VideoContentProps>(
           </Box>
         )}
         {srcState.status === AsyncStatus.Success && (
-          <Box className={css.AbsoluteContainer} style={{position: 'unset'}}>
+          <Box className={css.AbsoluteContainer}>
-            <Video
+            {renderVideo({
-              title={body}
+              title: body,
-              src={srcState.data}
+              src: srcState.data,
-              onLoadedMetadata={handleLoad}
+              onLoadedMetadata: handleLoad,
-              onError={handleError}
+              onError: handleError,
-              autoPlay
+              autoPlay: true,
-              controls
+              controls: true,
-            />
+            })}
           </Box>
         )}
         {(srcState.status === AsyncStatus.Loading || srcState.status === AsyncStatus.Success) &&

src/app/components/message/content/index.ts

@@ -0,0 +1,7 @@
+export * from './ThumbnailContent';
+export * from './ImageContent';
+export * from './VideoContent';
+export * from './AudioContent';
+export * from './FileContent';
+export * from './FallbackContent';
+export * from './EventContent';

src/app/components/message/content/style.css.ts

@@ -0,0 +1,37 @@
+import { style } from '@vanilla-extract/css';
+import { DefaultReset, config } from 'folds';
+
+export const RelativeBase = style([
+  DefaultReset,
+  {
+    position: 'relative',
+    width: '100%',
+    height: '100%',
+  },
+]);
+
+export const AbsoluteContainer = style([
+  DefaultReset,
+  {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    width: '100%',
+    height: '100%',
+  },
+]);
+
+export const AbsoluteFooter = style([
+  DefaultReset,
+  {
+    position: 'absolute',
+    bottom: config.space.S100,
+    left: config.space.S100,
+    right: config.space.S100,
+  },
+]);
+
+export const ModalWide = style({
+  minWidth: '85vw',
+  minHeight: '90vh',
+});

src/app/components/message/index.ts

@@ -3,5 +3,8 @@ export * from './placeholder';
 export * from './Reaction';
 export * from './attachment';
 export * from './Reply';
-export * from './MessageContentFallback';
+export * from './content';
 export * from './Time';
+export * from './MsgTypeRenderers';
+export * from './FileHeader';
+export * from './RenderBody';

src/app/components/message/layout/layout.css.ts

@@ -61,6 +61,7 @@ const highlightAnime = keyframes({
 const HighlightVariant = styleVariants({
   true: {
     animation: `${highlightAnime} 2000ms ease-in-out`,
+    animationIterationCount: 'infinite',
   },
 });
 
@@ -143,12 +144,14 @@ export const BubbleContent = style({
 });
 
 export const Username = style({
-  cursor: 'pointer',
   overflow: 'hidden',
   whiteSpace: 'nowrap',
   textOverflow: 'ellipsis',
   selectors: {
-    '&:hover, &:focus-visible': {
+    'button&': {
+      cursor: 'pointer',
+    },
+    'button&:hover, button&:focus-visible': {
       textDecoration: 'underline',
     },
   },

src/app/components/nav/NavCategory.tsx

@@ -0,0 +1,11 @@
+import React, { ReactNode } from 'react';
+import { as } from 'folds';
+import classNames from 'classnames';
+import * as css from './styles.css';
+
+type NavCategoryProps = {
+  children: ReactNode;
+};
+export const NavCategory = as<'div', NavCategoryProps>(({ className, ...props }, ref) => (
+  <div className={classNames(css.NavCategory, className)} {...props} ref={ref} />
+));

src/app/components/nav/NavCategoryHeader.tsx

@@ -0,0 +1,19 @@
+import React, { ReactNode } from 'react';
+import classNames from 'classnames';
+import { Header, as } from 'folds';
+import * as css from './styles.css';
+
+export type NavCategoryHeaderProps = {
+  children: ReactNode;
+};
+export const NavCategoryHeader = as<'div', NavCategoryHeaderProps>(
+  ({ className, ...props }, ref) => (
+    <Header
+      className={classNames(css.NavCategoryHeader, className)}
+      variant="Background"
+      size="300"
+      {...props}
+      ref={ref}
+    />
+  )
+);

src/app/components/nav/NavEmptyLayout.tsx

@@ -0,0 +1,40 @@
+import { Box, config } from 'folds';
+import React, { ReactNode } from 'react';
+
+export function NavEmptyCenter({ children }: { children: ReactNode }) {
+  return (
+    <Box
+      style={{
+        padding: config.space.S500,
+      }}
+      grow="Yes"
+      direction="Column"
+      justifyContent="Center"
+    >
+      {children}
+    </Box>
+  );
+}
+
+type NavEmptyLayoutProps = {
+  icon?: ReactNode;
+  title?: ReactNode;
+  content?: ReactNode;
+  options?: ReactNode;
+};
+export function NavEmptyLayout({ icon, title, content, options }: NavEmptyLayoutProps) {
+  return (
+    <Box direction="Column" gap="400">
+      <Box direction="Column" alignItems="Center" gap="200">
+        {icon}
+      </Box>
+      <Box direction="Column" gap="100" alignItems="Center">
+        {title}
+        {content}
+      </Box>
+      <Box direction="Column" gap="200">
+        {options}
+      </Box>
+    </Box>
+  );
+}

src/app/components/nav/NavItem.tsx

@@ -0,0 +1,33 @@
+import classNames from 'classnames';
+import React, { ComponentProps, forwardRef } from 'react';
+import { Link } from 'react-router-dom';
+import { as } from 'folds';
+import * as css from './styles.css';
+
+export const NavItem = as<
+  'div',
+  {
+    highlight?: boolean;
+  } & css.RoomSelectorVariants
+>(({ as: AsNavItem = 'div', className, highlight, variant, radii, children, ...props }, ref) => (
+  <AsNavItem
+    className={classNames(css.NavItem({ variant, radii }), className)}
+    data-highlight={highlight}
+    {...props}
+    ref={ref}
+  >
+    {children}
+  </AsNavItem>
+));
+
+export const NavLink = forwardRef<HTMLAnchorElement, ComponentProps<typeof Link>>(
+  ({ className, ...props }, ref) => (
+    <Link className={classNames(css.NavLink, className)} {...props} ref={ref} />
+  )
+);
+
+export const NavButton = as<'button'>(
+  ({ as: AsNavButton = 'button', className, ...props }, ref) => (
+    <AsNavButton className={classNames(css.NavLink, className)} {...props} ref={ref} />
+  )
+);

src/app/components/nav/NavItemContent.tsx

@@ -0,0 +1,10 @@
+import React, { ComponentProps } from 'react';
+import { Text, as } from 'folds';
+import classNames from 'classnames';
+import * as css from './styles.css';
+
+export const NavItemContent = as<'p', ComponentProps<typeof Text>>(
+  ({ className, ...props }, ref) => (
+    <Text className={classNames(css.NavItemContent, className)} size="T300" {...props} ref={ref} />
+  )
+);

src/app/components/nav/NavItemOptions.tsx

@@ -0,0 +1,17 @@
+import React, { ComponentProps } from 'react';
+import { Box, as } from 'folds';
+import classNames from 'classnames';
+import * as css from './styles.css';
+
+export const NavItemOptions = as<'div', ComponentProps<typeof Box>>(
+  ({ className, ...props }, ref) => (
+    <Box
+      className={classNames(css.NavItemOptions, className)}
+      alignItems="Center"
+      shrink="No"
+      gap="0"
+      {...props}
+      ref={ref}
+    />
+  )
+);

src/app/components/nav/index.ts

@@ -0,0 +1,6 @@
+export * from './NavCategory';
+export * from './NavCategoryHeader';
+export * from './NavEmptyLayout';
+export * from './NavItem';
+export * from './NavItemContent';
+export * from './NavItemOptions';

src/app/components/nav/styles.css.ts

@@ -0,0 +1,128 @@
+import { ComplexStyleRule, createVar, style } from '@vanilla-extract/css';
+import { RecipeVariants, recipe } from '@vanilla-extract/recipes';
+import { ContainerColor, DefaultReset, Disabled, RadiiVariant, color, config, toRem } from 'folds';
+
+export const NavCategory = style([
+  DefaultReset,
+  {
+    position: 'relative',
+  },
+]);
+
+export const NavCategoryHeader = style({
+  gap: config.space.S100,
+});
+
+export const NavLink = style({
+  color: 'inherit',
+  minWidth: 0,
+  display: 'flex',
+  alignItems: 'center',
+  cursor: 'pointer',
+  flexGrow: 1,
+  ':hover': {
+    textDecoration: 'unset',
+  },
+  ':focus': {
+    outline: 'none',
+  },
+});
+
+const Container = createVar();
+const ContainerHover = createVar();
+const ContainerActive = createVar();
+const ContainerLine = createVar();
+const OnContainer = createVar();
+
+const getVariant = (variant: ContainerColor): ComplexStyleRule => ({
+  vars: {
+    [Container]: color[variant].Container,
+    [ContainerHover]: color[variant].ContainerHover,
+    [ContainerActive]: color[variant].ContainerActive,
+    [ContainerLine]: color[variant].ContainerLine,
+    [OnContainer]: color[variant].OnContainer,
+  },
+});
+
+const NavItemBase = style({
+  width: '100%',
+  display: 'flex',
+  justifyContent: 'start',
+  cursor: 'pointer',
+  backgroundColor: Container,
+  color: OnContainer,
+  outline: 'none',
+  minHeight: toRem(36),
+
+  selectors: {
+    '&:hover, &:focus-visible': {
+      backgroundColor: ContainerHover,
+    },
+    '&[data-hover=true]': {
+      backgroundColor: ContainerHover,
+    },
+    [`&:has(.${NavLink}:active)`]: {
+      backgroundColor: ContainerActive,
+    },
+    '&[aria-selected=true]': {
+      backgroundColor: ContainerActive,
+    },
+    [`&:has(.${NavLink}:focus-visible)`]: {
+      outline: `${config.borderWidth.B600} solid ${ContainerLine}`,
+      outlineOffset: `calc(-1 * ${config.borderWidth.B600})`,
+    },
+  },
+  '@supports': {
+    [`not selector(:has(.${NavLink}:focus-visible))`]: {
+      ':focus-within': {
+        outline: `${config.borderWidth.B600} solid ${ContainerLine}`,
+        outlineOffset: `calc(-1 * ${config.borderWidth.B600})`,
+      },
+    },
+  },
+});
+export const NavItem = recipe({
+  base: [DefaultReset, NavItemBase, Disabled],
+  variants: {
+    variant: {
+      Background: getVariant('Background'),
+      Surface: getVariant('Surface'),
+      SurfaceVariant: getVariant('SurfaceVariant'),
+      Primary: getVariant('Primary'),
+      Secondary: getVariant('Secondary'),
+      Success: getVariant('Success'),
+      Warning: getVariant('Warning'),
+      Critical: getVariant('Critical'),
+    },
+    radii: RadiiVariant,
+  },
+  defaultVariants: {
+    variant: 'Surface',
+    radii: '400',
+  },
+});
+
+export type RoomSelectorVariants = RecipeVariants<typeof NavItem>;
+export const NavItemContent = style({
+  paddingLeft: config.space.S200,
+  paddingRight: config.space.S300,
+  height: 'inherit',
+  minWidth: 0,
+  flexGrow: 1,
+  display: 'flex',
+  alignItems: 'center',
+  fontWeight: config.fontWeight.W500,
+
+  selectors: {
+    '&:hover': {
+      textDecoration: 'unset',
+    },
+    [`.${NavItemBase}[data-highlight=true] &`]: {
+      fontWeight: config.fontWeight.W600,
+    },
+  },
+});
+
+export const NavItemOptions = style({
+  paddingRight: config.space.S200,
+});

src/app/components/page/Page.tsx

@@ -0,0 +1,148 @@
+import React, { ComponentProps, MutableRefObject, ReactNode } from 'react';
+import { Box, Header, Line, Scroll, Text, as } from 'folds';
+import classNames from 'classnames';
+import { ContainerColor } from '../../styles/ContainerColor.css';
+import * as css from './style.css';
+import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
+
+type PageRootProps = {
+  nav: ReactNode;
+  children: ReactNode;
+};
+
+export function PageRoot({ nav, children }: PageRootProps) {
+  const screenSize = useScreenSizeContext();
+
+  return (
+    <Box grow="Yes" className={ContainerColor({ variant: 'Background' })}>
+      {nav}
+      {screenSize !== ScreenSize.Mobile && (
+        <Line variant="Background" size="300" direction="Vertical" />
+      )}
+      {children}
+    </Box>
+  );
+}
+
+type ClientDrawerLayoutProps = {
+  children: ReactNode;
+};
+export function PageNav({ children }: ClientDrawerLayoutProps) {
+  const screenSize = useScreenSizeContext();
+  const isMobile = screenSize === ScreenSize.Mobile;
+
+  return (
+    <Box
+      grow={isMobile ? 'Yes' : undefined}
+      className={css.PageNav}
+      shrink={isMobile ? 'Yes' : 'No'}
+    >
+      <Box grow="Yes" direction="Column">
+        {children}
+      </Box>
+    </Box>
+  );
+}
+
+export const PageNavHeader = as<'header'>(({ className, ...props }, ref) => (
+  <Header
+    className={classNames(css.PageNavHeader, className)}
+    variant="Background"
+    size="600"
+    {...props}
+    ref={ref}
+  />
+));
+
+export function PageNavContent({
+  scrollRef,
+  children,
+}: {
+  children: ReactNode;
+  scrollRef?: MutableRefObject<HTMLDivElement | null>;
+}) {
+  return (
+    <Box grow="Yes" direction="Column">
+      <Scroll
+        ref={scrollRef}
+        variant="Background"
+        direction="Vertical"
+        size="300"
+        hideTrack
+        visibility="Hover"
+      >
+        <div className={css.PageNavContent}>{children}</div>
+      </Scroll>
+    </Box>
+  );
+}
+
+export const Page = as<'div'>(({ className, ...props }, ref) => (
+  <Box
+    grow="Yes"
+    direction="Column"
+    className={classNames(ContainerColor({ variant: 'Surface' }), className)}
+    {...props}
+    ref={ref}
+  />
+));
+
+export const PageHeader = as<'div', css.PageHeaderVariants>(
+  ({ className, balance, ...props }, ref) => (
+    <Header
+      as="header"
+      size="600"
+      className={classNames(css.PageHeader({ balance }), className)}
+      {...props}
+      ref={ref}
+    />
+  )
+);
+
+export const PageContent = as<'div'>(({ className, ...props }, ref) => (
+  <div className={classNames(css.PageContent, className)} {...props} ref={ref} />
+));
+
+export const PageHeroSection = as<'div', ComponentProps<typeof Box>>(
+  ({ className, ...props }, ref) => (
+    <Box
+      direction="Column"
+      className={classNames(css.PageHeroSection, className)}
+      {...props}
+      ref={ref}
+    />
+  )
+);
+
+export function PageHero({
+  icon,
+  title,
+  subTitle,
+  children,
+}: {
+  icon: ReactNode;
+  title: ReactNode;
+  subTitle: ReactNode;
+  children?: ReactNode;
+}) {
+  return (
+    <Box direction="Column" gap="400">
+      <Box direction="Column" alignItems="Center" gap="200">
+        {icon}
+      </Box>
+      <Box as="h2" direction="Column" gap="200" alignItems="Center">
+        <Text align="Center" size="H2">
+          {title}
+        </Text>
+        <Text align="Center" priority="400">
+          {subTitle}
+        </Text>
+      </Box>
+      {children}
+    </Box>
+  );
+}
+
+export const PageContentCenter = as<'div'>(({ className, ...props }, ref) => (
+  <div className={classNames(css.PageContentCenter, className)} {...props} ref={ref} />
+));

src/app/components/page/index.tsx

@@ -0,0 +1 @@
+export * from './Page';

src/app/components/page/style.css.ts

@@ -0,0 +1,80 @@
+import { style } from '@vanilla-extract/css';
+import { recipe, RecipeVariants } from '@vanilla-extract/recipes';
+import { DefaultReset, color, config, toRem } from 'folds';
+
+export const PageNav = style({
+  width: toRem(256),
+});
+
+export const PageNavHeader = style({
+  padding: `0 ${config.space.S200} 0 ${config.space.S300}`,
+  flexShrink: 0,
+  borderBottomWidth: 1,
+
+  selectors: {
+    'button&': {
+      cursor: 'pointer',
+    },
+    'button&[aria-pressed=true]': {
+      backgroundColor: color.Background.ContainerActive,
+    },
+    'button&:hover, button&:focus-visible': {
+      backgroundColor: color.Background.ContainerHover,
+    },
+    'button&:active': {
+      backgroundColor: color.Background.ContainerActive,
+    },
+  },
+});
+
+export const PageNavContent = style({
+  minHeight: '100%',
+  padding: config.space.S200,
+  paddingRight: 0,
+  paddingBottom: config.space.S700,
+});
+
+export const PageHeader = recipe({
+  base: {
+    paddingLeft: config.space.S400,
+    paddingRight: config.space.S200,
+    borderBottomWidth: config.borderWidth.B300,
+  },
+  variants: {
+    balance: {
+      true: {
+        paddingLeft: config.space.S200,
+      },
+    },
+  },
+});
+export type PageHeaderVariants = RecipeVariants<typeof PageHeader>;
+
+export const PageContent = style([
+  DefaultReset,
+  {
+    paddingTop: config.space.S400,
+    paddingLeft: config.space.S400,
+    paddingRight: 0,
+    paddingBottom: toRem(100),
+  },
+]);
+
+export const PageHeroSection = style([
+  DefaultReset,
+  {
+    padding: '40px 0',
+    maxWidth: toRem(466),
+    width: '100%',
+    margin: 'auto',
+  },
+]);
+
+export const PageContentCenter = style([
+  DefaultReset,
+  {
+    maxWidth: toRem(964),
+    width: '100%',
+    margin: 'auto',
+  },
+]);

src/app/components/room-avatar/RoomAvatar.css.ts

@@ -0,0 +1,14 @@
+import { style } from '@vanilla-extract/css';
+import { color } from 'folds';
+
+export const RoomAvatar = style({
+  backgroundColor: color.Secondary.Container,
+  color: color.Secondary.OnContainer,
+  textTransform: 'capitalize',
+
+  selectors: {
+    '&[data-image-loaded="true"]': {
+      backgroundColor: 'transparent',
+    },
+  },
+});

src/app/components/room-avatar/RoomAvatar.tsx

@@ -0,0 +1,56 @@
+import { JoinRule } from 'matrix-js-sdk';
+import { AvatarFallback, AvatarImage, Icon, Icons, color } from 'folds';
+import React, { ComponentProps, ReactEventHandler, ReactNode, forwardRef, useState } from 'react';
+import * as css from './RoomAvatar.css';
+import { joinRuleToIconSrc } from '../../utils/room';
+import colorMXID from '../../../util/colorMXID';
+
+type RoomAvatarProps = {
+  roomId: string;
+  src?: string;
+  alt?: string;
+  renderFallback: () => ReactNode;
+};
+export function RoomAvatar({ roomId, src, alt, renderFallback }: RoomAvatarProps) {
+  const [error, setError] = useState(false);
+
+  const handleLoad: ReactEventHandler<HTMLImageElement> = (evt) => {
+    evt.currentTarget.setAttribute('data-image-loaded', 'true');
+  };
+
+  if (!src || error) {
+    return (
+      <AvatarFallback
+        style={{ backgroundColor: colorMXID(roomId ?? ''), color: color.Surface.Container }}
+        className={css.RoomAvatar}
+      >
+        {renderFallback()}
+      </AvatarFallback>
+    );
+  }
+
+  return (
+    <AvatarImage
+      className={css.RoomAvatar}
+      src={src}
+      alt={alt}
+      onError={() => setError(true)}
+      onLoad={handleLoad}
+      draggable={false}
+    />
+  );
+}
+
+export const RoomIcon = forwardRef<
+  SVGSVGElement,
+  Omit<ComponentProps<typeof Icon>, 'src'> & {
+    joinRule: JoinRule;
+    space?: boolean;
+  }
+>(({ joinRule, space, ...props }, ref) => (
+  <Icon
+    src={joinRuleToIconSrc(Icons, joinRule, space || false) ?? Icons.Hash}
+    {...props}
+    ref={ref}
+  />
+));

src/app/components/room-avatar/index.ts

@@ -0,0 +1 @@
+export * from './RoomAvatar';

src/app/components/room-card/RoomCard.tsx

@@ -0,0 +1,320 @@
+import React, { ReactNode, useCallback, useRef, useState } from 'react';
+import { MatrixError, Room } from 'matrix-js-sdk';
+import {
+  Avatar,
+  Badge,
+  Box,
+  Button,
+  Dialog,
+  Icon,
+  Icons,
+  Overlay,
+  OverlayBackdrop,
+  OverlayCenter,
+  Spinner,
+  Text,
+  as,
+  color,
+  config,
+} from 'folds';
+import classNames from 'classnames';
+import FocusTrap from 'focus-trap-react';
+import * as css from './style.css';
+import { RoomAvatar } from '../room-avatar';
+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 '../../utils/keyboard';
+import { RoomType, StateEvent } from '../../../types/matrix/room';
+import { useJoinedRoomId } from '../../hooks/useJoinedRoomId';
+import { useElementSizeObserver } from '../../hooks/useElementSizeObserver';
+import { getRoomAvatarUrl, getStateEvent } from '../../utils/room';
+import { useStateEventCallback } from '../../hooks/useStateEventCallback';
+import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
+
+type GridColumnCount = '1' | '2' | '3';
+const getGridColumnCount = (gridWidth: number): GridColumnCount => {
+  if (gridWidth <= 498) return '1';
+  if (gridWidth <= 748) return '2';
+  return '3';
+};
+
+const setGridColumnCount = (grid: HTMLElement, count: GridColumnCount): void => {
+  grid.style.setProperty('grid-template-columns', `repeat(${count}, 1fr)`);
+};
+
+export function RoomCardGrid({ children }: { children: ReactNode }) {
+  const gridRef = useRef<HTMLDivElement>(null);
+
+  useElementSizeObserver(
+    useCallback(() => gridRef.current, []),
+    useCallback((width, _, target) => setGridColumnCount(target, getGridColumnCount(width)), [])
+  );
+
+  return (
+    <Box className={css.CardGrid} direction="Row" gap="400" wrap="Wrap" ref={gridRef}>
+      {children}
+    </Box>
+  );
+}
+
+export const RoomCardBase = as<'div'>(({ className, ...props }, ref) => (
+  <Box
+    direction="Column"
+    gap="300"
+    className={classNames(css.RoomCardBase, className)}
+    {...props}
+    ref={ref}
+  />
+));
+
+export const RoomCardName = as<'h6'>(({ ...props }, ref) => (
+  <Text as="h6" size="H6" truncate {...props} ref={ref} />
+));
+
+export const RoomCardTopic = as<'p'>(({ className, ...props }, ref) => (
+  <Text
+    as="p"
+    size="T200"
+    className={classNames(css.RoomCardTopic, className)}
+    {...props}
+    priority="400"
+    ref={ref}
+  />
+));
+
+function ErrorDialog({
+  title,
+  message,
+  children,
+}: {
+  title: string;
+  message: string;
+  children: (openError: () => void) => ReactNode;
+}) {
+  const [viewError, setViewError] = useState(false);
+  const closeError = () => setViewError(false);
+  const openError = () => setViewError(true);
+
+  return (
+    <>
+      {children(openError)}
+      <Overlay open={viewError} backdrop={<OverlayBackdrop />}>
+        <OverlayCenter>
+          <FocusTrap
+            focusTrapOptions={{
+              initialFocus: false,
+              clickOutsideDeactivates: true,
+              onDeactivate: closeError,
+              escapeDeactivates: stopPropagation,
+            }}
+          >
+            <Dialog variant="Surface">
+              <Box style={{ padding: config.space.S400 }} direction="Column" gap="400">
+                <Box direction="Column" gap="100">
+                  <Text>{title}</Text>
+                  <Text style={{ color: color.Critical.Main }} size="T300" priority="400">
+                    {message}
+                  </Text>
+                </Box>
+                <Button size="400" variant="Secondary" fill="Soft" onClick={closeError}>
+                  <Text size="B400">Cancel</Text>
+                </Button>
+              </Box>
+            </Dialog>
+          </FocusTrap>
+        </OverlayCenter>
+      </Overlay>
+    </>
+  );
+}
+
+type RoomCardProps = {
+  roomIdOrAlias: string;
+  allRooms: string[];
+  avatarUrl?: string;
+  name?: string;
+  topic?: string;
+  memberCount?: number;
+  roomType?: string;
+  viaServers?: string[];
+  onView?: (roomId: string) => void;
+  renderTopicViewer: (name: string, topic: string, requestClose: () => void) => ReactNode;
+};
+
+export const RoomCard = as<'div', RoomCardProps>(
+  (
+    {
+      roomIdOrAlias,
+      allRooms,
+      avatarUrl,
+      name,
+      topic,
+      memberCount,
+      roomType,
+      viaServers,
+      onView,
+      renderTopicViewer,
+      ...props
+    },
+    ref
+  ) => {
+    const mx = useMatrixClient();
+    const useAuthentication = useMediaAuthentication();
+    const joinedRoomId = useJoinedRoomId(allRooms, roomIdOrAlias);
+    const joinedRoom = mx.getRoom(joinedRoomId);
+    const [topicEvent, setTopicEvent] = useState(() =>
+      joinedRoom ? getStateEvent(joinedRoom, StateEvent.RoomTopic) : undefined
+    );
+
+    const fallbackName = getMxIdLocalPart(roomIdOrAlias) ?? roomIdOrAlias;
+    const fallbackTopic = roomIdOrAlias;
+
+    const avatar = joinedRoom
+      ? getRoomAvatarUrl(mx, joinedRoom, 96, useAuthentication)
+      : avatarUrl && mxcUrlToHttp(mx, avatarUrl, useAuthentication, 96, 96, 'crop');
+
+    const roomName = joinedRoom?.name || name || fallbackName;
+    const roomTopic =
+      (topicEvent?.getContent().topic as string) || undefined || topic || fallbackTopic;
+    const joinedMemberCount = joinedRoom?.getJoinedMemberCount() ?? memberCount;
+
+    useStateEventCallback(
+      mx,
+      useCallback(
+        (event) => {
+          if (
+            joinedRoom &&
+            event.getRoomId() === joinedRoom.roomId &&
+            event.getType() === StateEvent.RoomTopic
+          ) {
+            setTopicEvent(getStateEvent(joinedRoom, StateEvent.RoomTopic));
+          }
+        },
+        [joinedRoom]
+      )
+    );
+
+    const [joinState, join] = useAsyncCallback<Room, MatrixError, []>(
+      useCallback(() => mx.joinRoom(roomIdOrAlias, { viaServers }), [mx, roomIdOrAlias, viaServers])
+    );
+    const joining =
+      joinState.status === AsyncStatus.Loading || joinState.status === AsyncStatus.Success;
+
+    const [viewTopic, setViewTopic] = useState(false);
+    const closeTopic = () => setViewTopic(false);
+    const openTopic = () => setViewTopic(true);
+
+    return (
+      <RoomCardBase {...props} ref={ref}>
+        <Box gap="200" justifyContent="SpaceBetween">
+          <Avatar size="500">
+            <RoomAvatar
+              roomId={roomIdOrAlias}
+              src={avatar ?? undefined}
+              alt={roomIdOrAlias}
+              renderFallback={() => (
+                <Text as="span" size="H3">
+                  {nameInitials(roomName)}
+                </Text>
+              )}
+            />
+          </Avatar>
+          {(roomType === RoomType.Space || joinedRoom?.isSpaceRoom()) && (
+            <Badge variant="Secondary" fill="Soft" outlined>
+              <Text size="L400">Space</Text>
+            </Badge>
+          )}
+        </Box>
+        <Box grow="Yes" direction="Column" gap="100">
+          <RoomCardName>{roomName}</RoomCardName>
+          <RoomCardTopic onClick={openTopic} onKeyDown={onEnterOrSpace(openTopic)} tabIndex={0}>
+            {roomTopic}
+          </RoomCardTopic>
+
+          <Overlay open={viewTopic} backdrop={<OverlayBackdrop />}>
+            <OverlayCenter>
+              <FocusTrap
+                focusTrapOptions={{
+                  initialFocus: false,
+                  clickOutsideDeactivates: true,
+                  onDeactivate: closeTopic,
+                  escapeDeactivates: stopPropagation,
+                }}
+              >
+                {renderTopicViewer(roomName, roomTopic, closeTopic)}
+              </FocusTrap>
+            </OverlayCenter>
+          </Overlay>
+        </Box>
+        {typeof joinedMemberCount === 'number' && (
+          <Box gap="100">
+            <Icon size="50" src={Icons.User} />
+            <Text size="T200">{`${millify(joinedMemberCount)} Members`}</Text>
+          </Box>
+        )}
+        {typeof joinedRoomId === 'string' && (
+          <Button
+            onClick={onView ? () => onView(joinedRoomId) : undefined}
+            variant="Secondary"
+            fill="Soft"
+            size="300"
+          >
+            <Text size="B300" truncate>
+              View
+            </Text>
+          </Button>
+        )}
+        {typeof joinedRoomId !== 'string' && joinState.status !== AsyncStatus.Error && (
+          <Button
+            onClick={join}
+            variant="Secondary"
+            size="300"
+            disabled={joining}
+            before={joining && <Spinner size="50" variant="Secondary" fill="Soft" />}
+          >
+            <Text size="B300" truncate>
+              {joining ? 'Joining' : 'Join'}
+            </Text>
+          </Button>
+        )}
+        {typeof joinedRoomId !== 'string' && joinState.status === AsyncStatus.Error && (
+          <Box gap="200">
+            <Button
+              onClick={join}
+              className={css.ActionButton}
+              variant="Critical"
+              fill="Solid"
+              size="300"
+            >
+              <Text size="B300" truncate>
+                Retry
+              </Text>
+            </Button>
+            <ErrorDialog
+              title="Join Error"
+              message={joinState.error.message || 'Failed to join. Unknown Error.'}
+            >
+              {(openError) => (
+                <Button
+                  onClick={openError}
+                  className={css.ActionButton}
+                  variant="Critical"
+                  fill="Soft"
+                  outlined
+                  size="300"
+                >
+                  <Text size="B300" truncate>
+                    View Error
+                  </Text>
+                </Button>
+              )}
+            </ErrorDialog>
+          </Box>
+        )}
+      </RoomCardBase>
+    );
+  }
+);

src/app/components/room-card/index.ts

@@ -0,0 +1 @@
+export * from './RoomCard';

src/app/components/room-card/style.css.ts

@@ -0,0 +1,36 @@
+import { style } from '@vanilla-extract/css';
+import { DefaultReset, config } from 'folds';
+import { ContainerColor } from '../../styles/ContainerColor.css';
+
+export const CardGrid = style({
+  display: 'grid',
+  gridTemplateColumns: 'repeat(3, 1fr)',
+  gap: config.space.S400,
+});
+
+export const RoomCardBase = style([
+  DefaultReset,
+  ContainerColor({ variant: 'SurfaceVariant' }),
+  {
+    padding: config.space.S500,
+    borderRadius: config.radii.R500,
+  },
+]);
+
+export const RoomCardTopic = style({
+  minHeight: `calc(3 * ${config.lineHeight.T200})`,
+  display: '-webkit-box',
+  WebkitLineClamp: 3,
+  WebkitBoxOrient: 'vertical',
+  overflow: 'hidden',
+  cursor: 'pointer',
+
+  ':hover': {
+    textDecoration: 'underline',
+  },
+});
+
+export const ActionButton = style({
+  flex: '1 1 0',
+  minWidth: 1,
+});

src/app/components/room-intro/RoomIntro.tsx

@@ -1,14 +1,20 @@
 import React, { useCallback } from 'react';
-import { Avatar, AvatarFallback, AvatarImage, Box, Button, Spinner, Text, as, color } from 'folds';
+import { Avatar, Box, Button, Spinner, Text, as } from 'folds';
 import { Room } from 'matrix-js-sdk';
-import { openInviteUser, selectRoom } from '../../../client/action/navigation';
+import { useAtomValue } from 'jotai';
-import { useStateEvent } from '../../hooks/useStateEvent';
+import { openInviteUser } from '../../../client/action/navigation';
 import { IRoomCreateContent, Membership, StateEvent } from '../../../types/matrix/room';
 import { getMemberDisplayName, getStateEvent } from '../../utils/room';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
-import { getMxIdLocalPart } from '../../utils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '../../utils/matrix';
 import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
 import { timeDayMonthYear, timeHourMinute } from '../../utils/time';
+import { useRoomNavigate } from '../../hooks/useRoomNavigate';
+import { RoomAvatar } from '../room-avatar';
+import { nameInitials } from '../../utils/common';
+import { useRoomAvatar, useRoomName, useRoomTopic } from '../../hooks/useRoomMeta';
+import { mDirectAtom } from '../../state/mDirectList';
+import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
 
 export type RoomIntroProps = {
   room: Room;
@@ -16,21 +22,22 @@ export type RoomIntroProps = {
 
 export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) => {
   const mx = useMatrixClient();
-  const createEvent = getStateEvent(room, StateEvent.RoomCreate);
+  const useAuthentication = useMediaAuthentication();
-  const avatarEvent = useStateEvent(room, StateEvent.RoomAvatar);
+  const { navigateRoom } = useRoomNavigate();
-  const nameEvent = useStateEvent(room, StateEvent.RoomName);
+  const mDirects = useAtomValue(mDirectAtom);
-  const topicEvent = useStateEvent(room, StateEvent.RoomTopic);
-  const createContent = createEvent?.getContent<IRoomCreateContent>();
 
+  const createEvent = getStateEvent(room, StateEvent.RoomCreate);
+  const avatarMxc = useRoomAvatar(room, mDirects.has(room.roomId));
+  const name = useRoomName(room);
+  const topic = useRoomTopic(room);
+  const avatarHttpUrl = avatarMxc ? mxcUrlToHttp(mx, avatarMxc, useAuthentication) : undefined;
+
+  const createContent = createEvent?.getContent<IRoomCreateContent>();
   const ts = createEvent?.getTs();
   const creatorId = createEvent?.getSender();
   const creatorName =
     creatorId && (getMemberDisplayName(room, creatorId) ?? getMxIdLocalPart(creatorId));
   const prevRoomId = createContent?.predecessor?.room_id;
-  const avatarMxc = (avatarEvent?.getContent().url as string) || undefined;
-  const avatarHttpUrl = avatarMxc ? mx.mxcUrlToHttp(avatarMxc) : undefined;
-  const name = (nameEvent?.getContent().name || room.name) as string;
-  const topic = (topicEvent?.getContent().topic as string) || undefined;
 
   const [prevRoomState, joinPrevRoom] = useAsyncCallback(
     useCallback(async (roomId: string) => mx.joinRoom(roomId), [mx])
@@ -40,18 +47,12 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) =>
     <Box direction="Column" grow="Yes" gap="500" {...props} ref={ref}>
       <Box>
         <Avatar size="500">
-          {avatarHttpUrl ? (
+          <RoomAvatar
-            <AvatarImage src={avatarHttpUrl} alt={name} />
+            roomId={room.roomId}
-          ) : (
+            src={avatarHttpUrl ?? undefined}
-            <AvatarFallback
+            alt={name}
-              style={{
+            renderFallback={() => <Text size="H2">{nameInitials(name)}</Text>}
-                backgroundColor: color.SurfaceVariant.Container,
+          />
-                color: color.SurfaceVariant.OnContainer,
-              }}
-            >
-              <Text size="H2">{name[0]}</Text>
-            </AvatarFallback>
-          )}
         </Avatar>
       </Box>
       <Box direction="Column" gap="300">
@@ -82,7 +83,7 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) =>
           {typeof prevRoomId === 'string' &&
             (mx.getRoom(prevRoomId)?.getMyMembership() === Membership.Join ? (
               <Button
-                onClick={() => selectRoom(prevRoomId)}
+                onClick={() => navigateRoom(prevRoomId)}
                 variant="Success"
                 size="300"
                 fill="Soft"

src/app/components/room-topic-viewer/RoomTopicViewer.tsx

@@ -0,0 +1,41 @@
+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';
+import * as css from './style.css';
+import { LINKIFY_OPTS, scaleSystemEmoji } from '../../plugins/react-custom-html-parser';
+
+export const RoomTopicViewer = as<
+  'div',
+  {
+    name: string;
+    topic: string;
+    requestClose: () => void;
+  }
+>(({ name, topic, requestClose, className, ...props }, ref) => (
+  <Modal
+    size="300"
+    flexHeight
+    className={classNames(css.ModalFlex, className)}
+    {...props}
+    ref={ref}
+  >
+    <Header className={css.ModalHeader} variant="Surface" size="500">
+      <Box grow="Yes">
+        <Text size="H4" truncate>
+          {name}
+        </Text>
+      </Box>
+      <IconButton size="300" onClick={requestClose} radii="300">
+        <Icon src={Icons.Cross} />
+      </IconButton>
+    </Header>
+    <Scroll className={css.ModalScroll} size="300" hideTrack>
+      <Box className={css.ModalContent} direction="Column" gap="100">
+        <Text size="T300" className={css.ModalTopic} priority="400">
+          <Linkify options={LINKIFY_OPTS}>{scaleSystemEmoji(topic)}</Linkify>
+        </Text>
+      </Box>
+    </Scroll>
+  </Modal>
+));

src/app/components/room-topic-viewer/index.ts

@@ -0,0 +1 @@
+export * from './RoomTopicViewer';

src/app/components/room-topic-viewer/style.css.ts

@@ -0,0 +1,23 @@
+import { style } from '@vanilla-extract/css';
+import { config } from 'folds';
+
+export const ModalFlex = style({
+  display: 'flex',
+  flexDirection: 'column',
+});
+export const ModalHeader = style({
+  padding: `0 ${config.space.S200} 0 ${config.space.S400}`,
+  borderBottomWidth: config.borderWidth.B300,
+});
+export const ModalScroll = style({
+  flexGrow: 1,
+});
+export const ModalContent = style({
+  padding: config.space.S400,
+  paddingRight: config.space.S200,
+  paddingBottom: config.space.S700,
+});
+export const ModalTopic = style({
+  whiteSpace: 'pre-wrap',
+  wordBreak: 'break-word',
+});

src/app/components/scroll-top-container/ScrollTopContainer.tsx

@@ -0,0 +1,39 @@
+import React, { RefObject, useCallback, useState } from 'react';
+import { Box, as } from 'folds';
+import classNames from 'classnames';
+import * as css from './style.css';
+import {
+  getIntersectionObserverEntry,
+  useIntersectionObserver,
+} from '../../hooks/useIntersectionObserver';
+
+export const ScrollTopContainer = as<
+  'div',
+  {
+    scrollRef?: RefObject<HTMLElement>;
+    anchorRef: RefObject<HTMLElement>;
+    onVisibilityChange?: (onTop: boolean) => void;
+  }
+>(({ className, scrollRef, anchorRef, onVisibilityChange, ...props }, ref) => {
+  const [onTop, setOnTop] = useState(true);
+
+  useIntersectionObserver(
+    useCallback(
+      (intersectionEntries) => {
+        if (!anchorRef.current) return;
+        const entry = getIntersectionObserverEntry(anchorRef.current, intersectionEntries);
+        if (entry) {
+          setOnTop(entry.isIntersecting);
+          onVisibilityChange?.(entry.isIntersecting);
+        }
+      },
+      [anchorRef, onVisibilityChange]
+    ),
+    useCallback(() => ({ root: scrollRef?.current }), [scrollRef]),
+    useCallback(() => anchorRef.current, [anchorRef])
+  );
+
+  if (onTop) return null;
+
+  return <Box className={classNames(css.ScrollTopContainer, className)} {...props} ref={ref} />;
+});

src/app/components/scroll-top-container/index.ts

@@ -0,0 +1 @@
+export * from './ScrollTopContainer';

src/app/components/scroll-top-container/style.css.ts

@@ -0,0 +1,20 @@
+import { keyframes, style } from '@vanilla-extract/css';
+import { config } from 'folds';
+
+const ScrollContainerAnime = keyframes({
+  '0%': {
+    transform: `translate(-50%, -100%) scale(0)`,
+  },
+  '100%': {
+    transform: `translate(-50%, 0) scale(1)`,
+  },
+});
+
+export const ScrollTopContainer = style({
+  position: 'absolute',
+  top: config.space.S200,
+  left: '50%',
+  transform: 'translateX(-50%)',
+  zIndex: config.zIndex.Z100,
+  animation: `${ScrollContainerAnime} 100ms`,
+});

src/app/components/sequence-card/SequenceCard.tsx

@@ -0,0 +1,18 @@
+import React, { ComponentProps } from 'react';
+import { Box, as } from 'folds';
+import classNames from 'classnames';
+import { ContainerColor, ContainerColorVariants } from '../../styles/ContainerColor.css';
+import * as css from './style.css';
+
+export const SequenceCard = as<
+  'div',
+  ComponentProps<typeof Box> & ContainerColorVariants & css.SequenceCardVariants
+>(({ className, variant, firstChild, lastChild, outlined, ...props }, ref) => (
+  <Box
+    className={classNames(css.SequenceCard({ outlined }), ContainerColor({ variant }), className)}
+    data-first-child={firstChild}
+    data-last-child={lastChild}
+    {...props}
+    ref={ref}
+  />
+));