Bugs fixed

Signed-off-by: Ajay Bura <ajbura@gmail.com>

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

@@ -0,0 +1,32 @@
+name: 'Build PR'
+
+on:
+  pull_request:
+    types: ['opened', 'synchronize']
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        env:
+          PR_NUMBER: ${{github.event.number}}
+        steps:
+            - uses: actions/checkout@v2
+            - name: Build
+              run: npm install && npm run build
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v2
+              with:
+                  name: previewbuild
+                  path: dist
+                  retention-days: 1
+            - uses: actions/github-script@v3.1.0
+              with:
+                script: |
+                    var fs = require('fs');
+                    fs.writeFileSync('${{github.workspace}}/pr.json', JSON.stringify(context.payload.pull_request));
+            - name: Upload PR Info
+              uses: actions/upload-artifact@v2
+              with:
+                  name: pr.json
+                  path: pr.json
+                  retention-days: 1

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

@@ -0,0 +1,78 @@
+name: Upload Preview Build to Netlify
+on:
+    workflow_run:
+        workflows: ["Build PR"]
+        types:
+            - completed
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        if: >
+            ${{ github.event.workflow_run.conclusion == 'success' }}
+        steps:
+            # There's a 'download artifact' action but it hasn't been updated for the
+            # workflow_run action (https://github.com/actions/download-artifact/issues/60)
+            # so instead we get this mess:
+            - name: 'Download artifact'
+              uses: actions/github-script@v3.1.0
+              with:
+                script: |
+                  var artifacts = await github.actions.listWorkflowRunArtifacts({
+                     owner: context.repo.owner,
+                     repo: context.repo.repo,
+                     run_id: ${{github.event.workflow_run.id }},
+                  });
+                  var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+                    return artifact.name == "previewbuild"
+                  })[0];
+                  var download = await github.actions.downloadArtifact({
+                     owner: context.repo.owner,
+                     repo: context.repo.repo,
+                     artifact_id: matchArtifact.id,
+                     archive_format: 'zip',
+                  });
+                  var fs = require('fs');
+                  fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
+                  var prInfoArtifact = artifacts.data.artifacts.filter((artifact) => {
+                    return artifact.name == "pr.json"
+                  })[0];
+                  var download = await github.actions.downloadArtifact({
+                     owner: context.repo.owner,
+                     repo: context.repo.repo,
+                     artifact_id: prInfoArtifact.id,
+                     archive_format: 'zip',
+                  });
+                  var fs = require('fs');
+                  fs.writeFileSync('${{github.workspace}}/pr.json.zip', Buffer.from(download.data));
+            - name: Extract Artifacts
+              run: unzip -d dist previewbuild.zip && rm previewbuild.zip && unzip pr.json.zip && rm pr.json.zip
+            - name: 'Read PR Info'
+              id: readctx
+              uses: actions/github-script@v3.1.0
+              with:
+                script: |
+                    var fs = require('fs');
+                    var pr = JSON.parse(fs.readFileSync('${{github.workspace}}/pr.json'));
+                    console.log(`::set-output name=prnumber::${pr.number}`);
+            - name: Deploy to Netlify
+              id: netlify
+              uses: nwtgck/actions-netlify@v1.2
+              with:
+                  publish-dir: dist
+                  deploy-message: "Deploy from GitHub Actions"
+                  # These don't work because we're in workflow_run
+                  enable-pull-request-comment: false
+                  enable-commit-comment: false
+              env:
+                  NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+                  NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE3_ID }}
+              timeout-minutes: 1
+            - name: Edit PR Description
+              uses: velas/pr-description@v1.0.1
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  pull-request-number: ${{ steps.readctx.outputs.prnumber }}
+                  description-message: |
+                      Preview: ${{ steps.netlify.outputs.deploy-url }}
+                      ⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.

.github/workflows/netlify-dev.yaml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - uses: jsmrcaga/action-netlify-deploy@master
+      - uses: jsmrcaga/action-netlify-deploy@9cc40dcd499dd1511b3cc99912444f8970411cc6
         with:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE2_ID }}

.github/workflows/netlify-prod.yaml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - uses: jsmrcaga/action-netlify-deploy@master
+      - uses: jsmrcaga/action-netlify-deploy@9cc40dcd499dd1511b3cc99912444f8970411cc6
         with:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

.gitignore

@@ -1,4 +1,6 @@
 experiment
 dist
 node_modules
-devAssets
+devAssets
+
+.DS_Store

CONTRIBUTING.md

@@ -10,7 +10,7 @@ All types of contributions are encouraged and valued. See the [Table of Contents
 > - Tweet about it (tag @cinnyapp)
 > - Refer this project in your project's readme
 > - Mention the project at local meetups and tell your friends/colleagues
-> - [Donate to us](https://liberapay.com/ajbura/donate)
+> - [Donate to us](https://cinny.in/#sponsor)
 
 <!-- omit in toc -->
 ## Table of Contents

README.md

@@ -14,6 +14,11 @@ Cinny is a [Matrix](https://matrix.org) client focusing primarily on simple, ele
 
 ## Building and Running
 
+### Running pre-compiled
+
+A tarball of pre-compiled version of the app is provided with each [release](https://github.com/ajbura/cinny/releases).
+You can serve the application with a webserver of your choosing by simply copying `dist/` directory to the webroot.
+
 ### Building from source
 
 Execute the following commands to compile the app from its source code:
@@ -44,10 +49,16 @@ docker run -p 8080:80 cinny:latest
 This will forward your `localhost` port 8080 to the container's port 80. You can visit the app in your browser by
 navigating to `http://localhost:8080`.
 
+Alternatively you can just pull the [DockerHub image](https://hub.docker.com/r/ajbura/cinny) by `docker pull ajbura/cinny`.
+
+### Configuring default Homeserver
+
+To set default Homeserver on login and register page, place a customized [`config.json`](config.json) in webroot of your choice.
+
 ## License
 
-Copyright (c) 2021 Ajay Bura (ajbura) and other contributors
+Copyright (c) 2021 Ajay Bura (ajbura) and contributors
 
 Code licensed under the MIT License: <http://opensource.org/licenses/MIT>
 
-Graphics licensed under CC-BY 4.0: <https://creativecommons.org/licenses/by/4.0/>
+Graphics licensed under CC-BY 4.0: <https://creativecommons.org/licenses/by/4.0/>

config.json

@@ -0,0 +1,12 @@
+{
+  "defaultHomeserver": 5,
+  "homeserverList": [
+    "boba.best",
+    "converser.eu",
+    "envs.net",
+    "halogen.city",
+    "kde.org",
+    "matrix.org",
+    "mozilla.modular.im"
+  ]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cinny",
-  "version": "1.3.1",
+  "version": "1.6.0",
   "description": "Yet another matrix client",
   "main": "index.js",
   "engines": {
@@ -15,16 +15,18 @@
   "author": "Ajay Bura",
   "license": "MIT",
   "dependencies": {
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz",
+    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
     "@tippyjs/react": "^4.2.5",
     "babel-polyfill": "^6.26.0",
     "browser-encrypt-attachment": "^0.3.0",
     "dateformat": "^4.5.1",
     "emojibase-data": "^6.2.0",
+    "file-saver": "^2.0.5",
     "flux": "^4.0.1",
+    "formik": "^2.2.9",
     "html-react-parser": "^1.2.7",
-    "linkifyjs": "^3.0.0-beta.3",
+    "linkifyjs": "^2.1.9",
-    "matrix-js-sdk": "^12.4.1",
+    "matrix-js-sdk": "^15.2.1",
     "micromark": "^3.0.3",
     "micromark-extension-gfm": "^1.0.0",
     "prop-types": "^15.7.2",
@@ -32,11 +34,8 @@
     "react-autosize-textarea": "^7.1.0",
     "react-dom": "^17.0.2",
     "react-google-recaptcha": "^2.1.0",
-    "react-markdown": "^6.0.1",
     "react-modal": "^3.13.1",
-    "react-router-dom": "^5.2.0",
+    "sanitize-html": "^2.5.3",
-    "react-syntax-highlighter": "^15.4.3",
-    "remark-gfm": "^1.0.0",
     "tippy.js": "^6.3.1",
     "twemoji": "^13.1.0"
   },
@@ -71,9 +70,9 @@
     "stream-browserify": "^3.0.0",
     "style-loader": "^2.0.0",
     "util": "^0.12.4",
-    "webpack": "^5.28.0",
+    "webpack": "^5.62.1",
-    "webpack-cli": "^4.5.0",
+    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^3.11.2",
+    "webpack-dev-server": "^4.4.0",
     "webpack-merge": "^5.7.3"
   }
 }

public/index.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0 user-scalable=no">
     <link href="https://api.fontshare.com/css?f[]=supreme@300,301,400,401,500,501,700,701&display=swap" rel="stylesheet">
     <title>Cinny</title>
     <meta name="name"        content="Cinny">

public/res/ic/outlined/shield-empty.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<path d="M12,2L3,6v7c0,5,4,9,9,9c5,0,9-4,9-9V6L12,2z M19,13c0,3.9-3.1,7-7,7s-7-3.1-7-7V7.3l7-3.1l7,3.1V13z"/>
+</svg>

src/app/atoms/avatar/Avatar.jsx

@@ -2,6 +2,8 @@ import React, { useState, useEffect } 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';
 
@@ -29,7 +31,11 @@ function Avatar({
               {
                 iconSrc !== null
                   ? <RawIcon size={size} src={iconSrc} />
-                  : text !== null && <Text variant={textSize}>{text}</Text>
+                  : text !== null && (
+                    <Text variant={textSize}>
+                      {twemojify([...text][0])}
+                    </Text>
+                  )
               }
             </span>
           )

src/app/atoms/avatar/Avatar.scss

@@ -24,8 +24,7 @@
     height: var(--av-extra-small);
   }
 
-
+  > img {
-  img {
     width: 100%;
     height: 100%;
     object-fit: cover;

src/app/atoms/button/Button.jsx

@@ -6,18 +6,20 @@ import Text from '../text/Text';
 import RawIcon from '../system-icons/RawIcon';
 import { blurOnBubbling } from './script';
 
-function Button({
+const Button = React.forwardRef(({
   id, className, variant, iconSrc,
   type, onClick, children, disabled,
-}) {
+}, ref) => {
   const iconClass = (iconSrc === null) ? '' : `btn-${variant}--icon`;
   return (
     <button
+      ref={ref}
       id={id === '' ? undefined : id}
       className={`${className ? `${className} ` : ''}btn-${variant} ${iconClass} noselect`}
       onMouseUp={(e) => blurOnBubbling(e, `.btn-${variant}`)}
       onClick={onClick}
-      type={type === 'button' ? 'button' : 'submit'}
+      // eslint-disable-next-line react/button-has-type
+      type={type}
       disabled={disabled}
     >
       {iconSrc !== null && <RawIcon size="small" src={iconSrc} />}
@@ -25,7 +27,7 @@ function Button({
       {typeof children !== 'string' && children }
     </button>
   );
-}
+});
 
 Button.defaultProps = {
   id: '',
@@ -42,7 +44,7 @@ Button.propTypes = {
   className: PropTypes.string,
   variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
   iconSrc: PropTypes.string,
-  type: PropTypes.oneOf(['button', 'submit']),
+  type: PropTypes.oneOf(['button', 'submit', 'reset']),
   onClick: PropTypes.func,
   children: PropTypes.node.isRequired,
   disabled: PropTypes.bool,

src/app/atoms/button/IconButton.jsx

@@ -9,7 +9,7 @@ import Text from '../text/Text';
 
 const IconButton = React.forwardRef(({
   variant, size, type,
-  tooltip, tooltipPlacement, src, onClick,
+  tooltip, tooltipPlacement, src, onClick, tabIndex,
 }, ref) => {
   const btn = (
     <button
@@ -17,7 +17,9 @@ const IconButton = React.forwardRef(({
       className={`ic-btn ic-btn-${variant}`}
       onMouseUp={(e) => blurOnBubbling(e, `.ic-btn-${variant}`)}
       onClick={onClick}
-      type={type === 'button' ? 'button' : 'submit'}
+      // eslint-disable-next-line react/button-has-type
+      type={type}
+      tabIndex={tabIndex}
     >
       <RawIcon size={size} src={src} />
     </button>
@@ -40,16 +42,18 @@ IconButton.defaultProps = {
   tooltip: null,
   tooltipPlacement: 'top',
   onClick: null,
+  tabIndex: 0,
 };
 
 IconButton.propTypes = {
-  variant: PropTypes.oneOf(['surface', 'positive', 'caution', 'danger']),
+  variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
   size: PropTypes.oneOf(['normal', 'small', 'extra-small']),
-  type: PropTypes.oneOf(['button', 'submit']),
+  type: PropTypes.oneOf(['button', 'submit', 'reset']),
   tooltip: PropTypes.string,
   tooltipPlacement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
   src: PropTypes.string.isRequired,
   onClick: PropTypes.func,
+  tabIndex: PropTypes.number,
 };
 
 export default IconButton;

src/app/atoms/button/IconButton.scss

@@ -29,6 +29,13 @@
   @include focus(var(--bg-surface-hover));
   @include state.active(var(--bg-surface-active));
 }
+.ic-btn-primary {
+  @include color(var(--ic-primary-normal));
+  @include state.hover(var(--bg-primary-hover));
+  @include focus(var(--bg-primary-hover));
+  @include state.active(var(--bg-primary-active));
+  background-color: var(--bg-primary);
+}
 .ic-btn-positive {
   @include color(var(--ic-positive-normal));
   @include state.hover(var(--bg-positive-hover));

src/app/atoms/chip/Chip.jsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import './Chip.scss';
+
+import Text from '../text/Text';
+import RawIcon from '../system-icons/RawIcon';
+
+function Chip({
+  iconSrc, iconColor, text, children,
+  onClick,
+}) {
+  return (
+    <button className="chip" type="button" onClick={onClick}>
+      {iconSrc != null && <RawIcon src={iconSrc} color={iconColor} size="extra-small" />}
+      {(text != null && text !== '') && <Text variant="b3">{text}</Text>}
+      {children}
+    </button>
+  );
+}
+
+Chip.propTypes = {
+  iconSrc: PropTypes.string,
+  iconColor: PropTypes.string,
+  text: PropTypes.string,
+  children: PropTypes.element,
+  onClick: PropTypes.func,
+};
+
+Chip.defaultProps = {
+  iconSrc: null,
+  iconColor: null,
+  text: null,
+  children: null,
+  onClick: null,
+};
+
+export default Chip;

src/app/atoms/chip/Chip.scss

@@ -0,0 +1,33 @@
+.chip {
+  padding: var(--sp-ultra-tight) var(--sp-extra-tight);
+  
+  display: inline-flex;
+  flex-direction: row;
+  align-items: center;
+  
+  background: var(--bg-surface-low);
+  border-radius: var(--bo-radius);
+  box-shadow: var(--bs-surface-border);
+  cursor: pointer;
+
+  @media (hover: hover) {
+    &:hover {
+      background-color: var(--bg-surface-hover);
+    }
+  }
+
+  & > .text {
+    flex: 1;
+    color: var(--tc-surface-high);
+  }
+
+  & > .ic-raw {
+    width: 16px;
+    height: 16px;
+    margin-right: var(--sp-ultra-tight);
+    [dir=rtl] & {
+      margin-right: 0;
+      margin-left: var(--sp-ultra-tight);
+    }
+  }
+}

src/app/atoms/context-menu/ContextMenu.jsx

@@ -31,6 +31,7 @@ function ContextMenu({
       interactive
       arrow={false}
       maxWidth={maxWidth}
+      duration={200}
     >
       {render(isVisible ? hideMenu : showMenu)}
     </Tippy>
@@ -66,7 +67,7 @@ function MenuHeader({ children }) {
 }
 
 MenuHeader.propTypes = {
-  children: PropTypes.string.isRequired,
+  children: PropTypes.node.isRequired,
 };
 
 function MenuItem({

src/app/atoms/context-menu/ContextMenu.scss

@@ -44,7 +44,7 @@
 .context-menu__item {
   button[class^="btn"] {
     width: 100%;
-    justify-content: start;
+    justify-content: flex-start;
     border-radius: 0;
     box-shadow: none;
     white-space: nowrap;

src/app/atoms/divider/Divider.jsx

@@ -4,26 +4,25 @@ import './Divider.scss';
 
 import Text from '../text/Text';
 
-function Divider({ text, variant }) {
+function Divider({ text, variant, align }) {
-  const dividerClass = ` divider--${variant}`;
+  const dividerClass = ` divider--${variant} divider--${align}`;
   return (
     <div className={`divider${dividerClass}`}>
-      {text !== false && <Text className="divider__text" variant="b3">{text}</Text>}
+      {text !== null && <Text className="divider__text" variant="b3">{text}</Text>}
     </div>
   );
 }
 
 Divider.defaultProps = {
-  text: false,
+  text: null,
   variant: 'surface',
+  align: 'center',
 };
 
 Divider.propTypes = {
-  text: PropTypes.oneOfType([
+  text: PropTypes.string,
-    PropTypes.string,
+  variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
-    PropTypes.bool,
+  align: PropTypes.oneOf(['left', 'center', 'right']),
-  ]),
-  variant: PropTypes.oneOf(['surface', 'primary', 'caution', 'danger']),
 };
 
 export default Divider;

src/app/atoms/divider/Divider.scss

@@ -1,68 +1,69 @@
-.divider {
+.divider-line {
-  --local-divider-color: var(--bg-surface-border);
+  content: '';
+  display: inline-block;
+  flex: 1;
+  border-bottom: 1px solid var(--local-divider-color);
+  opacity: var(--local-divider-opacity);
+}
 
-  margin: var(--sp-extra-tight) var(--sp-normal);
+.divider {
-  margin-right: var(--sp-extra-tight);
   display: flex;
   align-items: center;
-  position: relative;
 
-  &::before {
+  &--center::before,
-    content: "";
+  &--right::before {
-    display: inline-block;
+    @extend .divider-line;
-    flex: 1;
+  }
-    margin-left: calc(var(--av-small) + var(--sp-tight));
+  &--center::after,
-    border-bottom: 1px solid var(--local-divider-color);
+  &--left::after {
-    opacity: 0.18;
+    @extend .divider-line;
-
-    [dir=rtl] & {
-      margin: {
-        left: 0;
-        right: calc(var(--av-small) + var(--sp-tight));
-      }
-    }
   }
 
   &__text {
-    margin-left: var(--sp-normal);
+    padding: 2px var(--sp-extra-tight);
-  }
+    border-radius: calc(var(--bo-radius) / 2);
-
+    font-weight: 500;
-  [dir=rtl] & {
-    margin: {
-      left: var(--sp-extra-tight);
-      right: var(--sp-normal);
-    }
-
-    &__text {
-      margin: {
-        left: 0;
-        right: var(--sp-normal);
-      }
-    }
   }
 }
 
 .divider--surface {
-  --local-divider-color: var(--tc-surface-low);
+  --local-divider-color: var(--bg-divider);
+  --local-divider-opacity: 1;
+
   .divider__text {
     color: var(--tc-surface-low);
+    border: 1px solid var(--bg-divider);
   }
 }
 .divider--primary {
   --local-divider-color: var(--bg-primary);
+  --local-divider-opacity: .8;
   .divider__text {
-    color: var(--bg-primary);
+    color: var(--tc-primary-high);
+    background-color: var(--bg-primary);
+  }
+}
+.divider--positive {
+  --local-divider-color: var(--bg-positive);
+  --local-divider-opacity: .8;
+  .divider__text {
+    color: var(--bg-surface);
+    background-color: var(--bg-positive);
   }
 }
 .divider--danger {
   --local-divider-color: var(--bg-danger);
+  --local-divider-opacity: .8;
   .divider__text {
-    color: var(--bg-danger);
+    color: var(--bg-surface);
+    background-color: var(--bg-danger);
   }
 }
 .divider--caution {
   --local-divider-color: var(--bg-caution);
+  --local-divider-opacity: .8;
   .divider__text {
-    color: var(--bg-caution);
+    color: var(--bg-surface);
+    background-color: var(--bg-caution);
   }
-}
+}

src/app/atoms/input/Input.jsx

@@ -5,7 +5,7 @@ import './Input.scss';
 import TextareaAutosize from 'react-autosize-textarea';
 
 function Input({
-  id, label, value, placeholder,
+  id, label, name, value, placeholder,
   required, type, onChange, forwardRef,
   resizable, minHeight, onResize, state,
   onKeyDown,
@@ -17,6 +17,7 @@ function Input({
         ? (
           <TextareaAutosize
             style={{ minHeight: `${minHeight}px` }}
+            name={name}
             id={id}
             className={`input input--resizable${state !== 'normal' ? ` input--${state}` : ''}`}
             ref={forwardRef}
@@ -33,6 +34,7 @@ function Input({
           <input
             ref={forwardRef}
             id={id}
+            name={name}
             className={`input ${state !== 'normal' ? ` input--${state}` : ''}`}
             type={type}
             placeholder={placeholder}
@@ -49,6 +51,7 @@ function Input({
 
 Input.defaultProps = {
   id: null,
+  name: '',
   label: '',
   value: '',
   placeholder: '',
@@ -65,6 +68,7 @@ Input.defaultProps = {
 
 Input.propTypes = {
   id: PropTypes.string,
+  name: PropTypes.string,
   label: PropTypes.string,
   value: PropTypes.string,
   placeholder: PropTypes.string,

src/app/atoms/input/Input.scss

@@ -2,6 +2,7 @@
   display: block;
   width: 100%;
   min-width: 0px;
+  margin: 0;
   padding: var(--sp-tight) var(--sp-normal);
   background-color: var(--bg-surface-low);
   color: var(--tc-surface-normal);

src/app/atoms/modal/RawModal.jsx

@@ -4,6 +4,8 @@ import './RawModal.scss';
 
 import Modal from 'react-modal';
 
+import navigation from '../../../client/state/navigation';
+
 Modal.setAppElement('#root');
 
 function RawModal({
@@ -23,6 +25,9 @@ function RawModal({
     default:
       modalClass += 'raw-modal__small ';
   }
+
+  navigation.setIsRawModalVisible(isOpen);
+
   const modalOverlayClass = (overlayClassName !== null) ? `${overlayClassName} ` : '';
   return (
     <Modal

src/app/atoms/scroll/_scrollbar.scss

@@ -32,6 +32,8 @@
 
 @mixin scroll {
   overflow: hidden;
+  // Below code stop scroll when x-scrollable content come in timeline
+  // overscroll-behavior: none;
   @extend .firefox-scrollbar;
   @extend .webkit-scrollbar;
   @extend .webkit-scrollbar-track;

src/app/atoms/segmented-controls/SegmentedControls.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import './SegmentedControls.scss';
 
@@ -17,6 +17,10 @@ function SegmentedControls({
     onSelect(segmentIndex);
   }
 
+  useEffect(() => {
+    setSelect(selected);
+  }, [selected]);
+
   return (
     <div className="segmented-controls">
       {

src/app/atoms/text/Text.scss

@@ -4,12 +4,26 @@
   font-weight: $weight;
   letter-spacing: var(--ls-#{$type});
   line-height: var(--lh-#{$type});
+
+  & img.emoji,
+  & img[data-mx-emoticon] {
+    height: var(--fs-#{$type});
+  }
 }
 
 %text {
   margin: 0;
   padding: 0;
   color: var(--tc-surface-high);
+
+  & img.emoji,
+  & img[data-mx-emoticon] {
+    margin: 0 !important;
+    margin-right: 2px !important;
+    padding: 0 !important;
+    position: relative;
+    top: 2px;
+  }
 }
 
 .text-h1 {

src/app/atoms/tooltip/Tooltip.jsx

@@ -4,7 +4,7 @@ import './Tooltip.scss';
 import Tippy from '@tippyjs/react';
 
 function Tooltip({
-  className, placement, content, children,
+  className, placement, content, delay, children,
 }) {
   return (
     <Tippy
@@ -14,7 +14,7 @@ function Tooltip({
       arrow={false}
       maxWidth={250}
       placement={placement}
-      delay={[0, 0]}
+      delay={delay}
       duration={[100, 0]}
     >
       {children}
@@ -25,12 +25,14 @@ function Tooltip({
 Tooltip.defaultProps = {
   placement: 'top',
   className: '',
+  delay: [200, 0],
 };
 
 Tooltip.propTypes = {
   className: PropTypes.string,
   placement: PropTypes.string,
   content: PropTypes.node.isRequired,
+  delay: PropTypes.arrayOf(PropTypes.number),
   children: PropTypes.node.isRequired,
 };
 

src/app/hooks/useForceUpdate.js

@@ -0,0 +1,10 @@
+/* eslint-disable import/prefer-default-export */
+import { useState } from 'react';
+
+export function useForceUpdate() {
+  const [data, setData] = useState(null);
+
+  return [data, function forceUpdateHook() {
+    setData({});
+  }];
+}

src/app/hooks/useStore.js

@@ -0,0 +1,22 @@
+/* eslint-disable import/prefer-default-export */
+import { useEffect, useRef } from 'react';
+
+export function useStore(...args) {
+  const itemRef = useRef(null);
+
+  const getItem = () => itemRef.current;
+
+  const setItem = (event) => {
+    itemRef.current = event;
+    return itemRef.current;
+  };
+
+  useEffect(() => {
+    itemRef.current = null;
+    return () => {
+      itemRef.current = null;
+    };
+  }, args);
+
+  return { getItem, setItem };
+}

src/app/molecules/dialog/Dialog.jsx

@@ -2,6 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './Dialog.scss';
 
+import { twemojify } from '../../../util/twemojify';
+
 import Text from '../../atoms/text/Text';
 import Header, { TitleWrapper } from '../../atoms/header/Header';
 import ScrollView from '../../atoms/scroll/ScrollView';
@@ -22,7 +24,7 @@ function Dialog({
         <div className="dialog__content">
           <Header>
             <TitleWrapper>
-              <Text variant="h2">{title}</Text>
+              <Text variant="h2">{twemojify(title)}</Text>
             </TitleWrapper>
             {contentOptions}
           </Header>

src/app/molecules/following-members/FollowingMembers.jsx

@@ -0,0 +1,59 @@
+/* eslint-disable react/prop-types */
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import './FollowingMembers.scss';
+
+import initMatrix from '../../../client/initMatrix';
+import cons from '../../../client/state/cons';
+import { openReadReceipts } from '../../../client/action/navigation';
+
+import Text from '../../atoms/text/Text';
+import RawIcon from '../../atoms/system-icons/RawIcon';
+import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
+
+import { getUsersActionJsx } from '../../organisms/room/common';
+
+function FollowingMembers({ roomTimeline }) {
+  const [followingMembers, setFollowingMembers] = useState([]);
+  const { roomId } = roomTimeline;
+  const mx = initMatrix.matrixClient;
+  const { roomsInput } = initMatrix;
+  const myUserId = mx.getUserId();
+
+  const handleOnMessageSent = () => setFollowingMembers([]);
+
+  useEffect(() => {
+    const updateFollowingMembers = () => {
+      setFollowingMembers(roomTimeline.getLiveReaders());
+    };
+    updateFollowingMembers();
+    roomTimeline.on(cons.events.roomTimeline.LIVE_RECEIPT, updateFollowingMembers);
+    roomsInput.on(cons.events.roomsInput.MESSAGE_SENT, handleOnMessageSent);
+    return () => {
+      roomTimeline.removeListener(cons.events.roomTimeline.LIVE_RECEIPT, updateFollowingMembers);
+      roomsInput.removeListener(cons.events.roomsInput.MESSAGE_SENT, handleOnMessageSent);
+    };
+  }, [roomTimeline]);
+
+  const filteredM = followingMembers.filter((userId) => userId !== myUserId);
+
+  return filteredM.length !== 0 && (
+    <button
+      className="following-members"
+      onClick={() => openReadReceipts(roomId, followingMembers)}
+      type="button"
+    >
+      <RawIcon
+        size="extra-small"
+        src={TickMarkIC}
+      />
+      <Text variant="b2">{getUsersActionJsx(roomId, filteredM, 'following the conversation.')}</Text>
+    </button>
+  );
+}
+
+FollowingMembers.propTypes = {
+  roomTimeline: PropTypes.shape({}).isRequired,
+};
+
+export default FollowingMembers;

src/app/molecules/following-members/FollowingMembers.scss

@@ -0,0 +1,32 @@
+
+.following-members {
+  width: 100%;
+  padding: 0 var(--sp-normal);
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  cursor: pointer;
+  
+  & .ic-raw {
+    min-width: var(--ic-extra-small);
+    opacity: 0.4;
+    margin: 0 var(--sp-extra-tight);
+  }
+  & .text {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    color: var(--tc-surface-low);
+    b {
+      color: var(--tc-surface-normal);
+    }
+  }
+
+  &:hover,
+  &:focus {
+    background-color: var(--bg-surface-hover);
+  }
+  &:active {
+    background-color: var(--bg-surface-active);
+  }
+}

src/app/molecules/image-upload/ImageUpload.jsx

@@ -48,7 +48,7 @@ function ImageUpload({
       >
         <Avatar
           imageSrc={imageSrc}
-          text={text.slice(0, 1)}
+          text={text}
           bgColor={bgColor}
           size="large"
         />

src/app/molecules/import-e2e-room-keys/ImportE2ERoomKeys.jsx

@@ -1,108 +0,0 @@
-import React, { useState, useEffect, useRef } from 'react';
-import './ImportE2ERoomKeys.scss';
-import EventEmitter from 'events';
-
-import initMatrix from '../../../client/initMatrix';
-import decryptMegolmKeyFile from '../../../util/decryptE2ERoomKeys';
-
-import Text from '../../atoms/text/Text';
-import IconButton from '../../atoms/button/IconButton';
-import Button from '../../atoms/button/Button';
-import Input from '../../atoms/input/Input';
-import Spinner from '../../atoms/spinner/Spinner';
-
-import CirclePlusIC from '../../../../public/res/ic/outlined/circle-plus.svg';
-
-const viewEvent = new EventEmitter();
-
-async function tryDecrypt(file, password) {
-  try {
-    const arrayBuffer = await file.arrayBuffer();
-    viewEvent.emit('importing', true);
-    viewEvent.emit('status', 'Decrypting file...');
-    const keys = await decryptMegolmKeyFile(arrayBuffer, password);
-
-    viewEvent.emit('status', 'Decrypting messages...');
-    await initMatrix.matrixClient.importRoomKeys(JSON.parse(keys));
-
-    viewEvent.emit('status', null);
-    viewEvent.emit('importing', false);
-  } catch (e) {
-    viewEvent.emit('status', e.friendlyText || 'Something went wrong!');
-    viewEvent.emit('importing', false);
-  }
-}
-
-function ImportE2ERoomKeys() {
-  const [keyFile, setKeyFile] = useState(null);
-  const [status, setStatus] = useState(null);
-  const [isImporting, setIsImporting] = useState(false);
-  const inputRef = useRef(null);
-  const passwordRef = useRef(null);
-
-  useEffect(() => {
-    const handleIsImporting = (isImp) => setIsImporting(isImp);
-    const handleStatus = (msg) => setStatus(msg);
-    viewEvent.on('importing', handleIsImporting);
-    viewEvent.on('status', handleStatus);
-
-    return () => {
-      viewEvent.removeListener('importing', handleIsImporting);
-      viewEvent.removeListener('status', handleStatus);
-    };
-  }, []);
-
-  function importE2ERoomKeys() {
-    const password = passwordRef.current.value;
-    if (password === '' || keyFile === null) return;
-    if (isImporting) return;
-
-    tryDecrypt(keyFile, password);
-  }
-
-  function handleFileChange(e) {
-    const file = e.target.files.item(0);
-    passwordRef.current.value = '';
-    setKeyFile(file);
-    setStatus(null);
-  }
-  function removeImportKeysFile() {
-    inputRef.current.value = null;
-    passwordRef.current.value = null;
-    setKeyFile(null);
-    setStatus(null);
-  }
-
-  useEffect(() => {
-    if (!isImporting && status === null) {
-      removeImportKeysFile();
-    }
-  }, [isImporting, status]);
-
-  return (
-    <div className="import-e2e-room-keys">
-      <input ref={inputRef} onChange={handleFileChange} style={{ display: 'none' }} type="file" />
-
-      <form className="import-e2e-room-keys__form" onSubmit={(e) => { e.preventDefault(); importE2ERoomKeys(); }}>
-        { keyFile !== null && (
-          <div className="import-e2e-room-keys__file">
-            <IconButton onClick={removeImportKeysFile} src={CirclePlusIC} tooltip="Remove file" />
-            <Text>{keyFile.name}</Text>
-          </div>
-        )}
-        {keyFile === null && <Button onClick={() => inputRef.current.click()}>Import keys</Button>}
-        <Input forwardRef={passwordRef} type="password" placeholder="Password" required />
-        <Button disabled={isImporting} variant="primary" type="submit">Decrypt</Button>
-      </form>
-      { isImporting && status !== null && (
-        <div className="import-e2e-room-keys__process">
-          <Spinner size="small" />
-          <Text variant="b2">{status}</Text>
-        </div>
-      )}
-      {!isImporting && status !== null && <Text className="import-e2e-room-keys__error" variant="b2">{status}</Text>}
-    </div>
-  );
-}
-
-export default ImportE2ERoomKeys;

src/app/molecules/import-export-e2e-room-keys/ExportE2ERoomKeys.jsx

@@ -0,0 +1,100 @@
+import React, { useState, useEffect, useRef } from 'react';
+import './ExportE2ERoomKeys.scss';
+
+import FileSaver from 'file-saver';
+
+import initMatrix from '../../../client/initMatrix';
+import cons from '../../../client/state/cons';
+import { encryptMegolmKeyFile } from '../../../util/cryptE2ERoomKeys';
+
+import Text from '../../atoms/text/Text';
+import Button from '../../atoms/button/Button';
+import Input from '../../atoms/input/Input';
+import Spinner from '../../atoms/spinner/Spinner';
+
+import { useStore } from '../../hooks/useStore';
+
+function ExportE2ERoomKeys() {
+  const isMountStore = useStore();
+  const [status, setStatus] = useState({
+    isOngoing: false,
+    msg: null,
+    type: cons.status.PRE_FLIGHT,
+  });
+  const passwordRef = useRef(null);
+  const confirmPasswordRef = useRef(null);
+
+  const exportE2ERoomKeys = async () => {
+    const password = passwordRef.current.value;
+    if (password !== confirmPasswordRef.current.value) {
+      setStatus({
+        isOngoing: false,
+        msg: 'Password does not match.',
+        type: cons.status.ERROR,
+      });
+      return;
+    }
+    setStatus({
+      isOngoing: true,
+      msg: 'Getting keys...',
+      type: cons.status.IN_FLIGHT,
+    });
+    try {
+      const keys = await initMatrix.matrixClient.exportRoomKeys();
+      if (isMountStore.getItem()) {
+        setStatus({
+          isOngoing: true,
+          msg: 'Encrypting keys...',
+          type: cons.status.IN_FLIGHT,
+        });
+      }
+      const encKeys = await encryptMegolmKeyFile(JSON.stringify(keys), password);
+      const blob = new Blob([encKeys], {
+        type: 'text/plain;charset=us-ascii',
+      });
+      FileSaver.saveAs(blob, 'cinny-keys.txt');
+      if (isMountStore.getItem()) {
+        setStatus({
+          isOngoing: false,
+          msg: 'Successfully exported all keys.',
+          type: cons.status.SUCCESS,
+        });
+      }
+    } catch (e) {
+      if (isMountStore.getItem()) {
+        setStatus({
+          isOngoing: false,
+          msg: e.friendlyText || 'Failed to export keys. Please try again.',
+          type: cons.status.ERROR,
+        });
+      }
+    }
+  };
+
+  useEffect(() => {
+    isMountStore.setItem(true);
+    return () => {
+      isMountStore.setItem(false);
+    };
+  }, []);
+
+  return (
+    <div className="export-e2e-room-keys">
+      <form className="export-e2e-room-keys__form" onSubmit={(e) => { e.preventDefault(); exportE2ERoomKeys(); }}>
+        <Input forwardRef={passwordRef} type="password" placeholder="Password" required />
+        <Input forwardRef={confirmPasswordRef} type="password" placeholder="Confirm password" required />
+        <Button disabled={status.isOngoing} variant="primary" type="submit">Export</Button>
+      </form>
+      { status.type === cons.status.IN_FLIGHT && (
+        <div className="import-e2e-room-keys__process">
+          <Spinner size="small" />
+          <Text variant="b2">{status.msg}</Text>
+        </div>
+      )}
+      {status.type === cons.status.SUCCESS && <Text className="import-e2e-room-keys__success" variant="b2">{status.msg}</Text>}
+      {status.type === cons.status.ERROR && <Text className="import-e2e-room-keys__error" variant="b2">{status.msg}</Text>}
+    </div>
+  );
+}
+
+export default ExportE2ERoomKeys;

src/app/molecules/import-export-e2e-room-keys/ExportE2ERoomKeys.scss

@@ -0,0 +1,28 @@
+.export-e2e-room-keys {
+  margin-top: var(--sp-extra-tight);
+  &__form {
+    display: flex;
+    & > .input-container {
+      flex: 1;
+      min-width: 0;
+    }
+    & > *:nth-child(2) {
+      margin: 0 var(--sp-tight);
+    }
+  }
+
+  &__process {
+    margin-top: var(--sp-tight);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    & .text {
+      margin: 0 var(--sp-tight);
+    }
+  }
+  &__error {
+    margin-top: var(--sp-tight);
+    color: var(--tc-danger-high);
+  }
+
+}

src/app/molecules/import-export-e2e-room-keys/ImportE2ERoomKeys.jsx

@@ -0,0 +1,133 @@
+import React, { useState, useEffect, useRef } from 'react';
+import './ImportE2ERoomKeys.scss';
+
+import initMatrix from '../../../client/initMatrix';
+import cons from '../../../client/state/cons';
+import { decryptMegolmKeyFile } from '../../../util/cryptE2ERoomKeys';
+
+import Text from '../../atoms/text/Text';
+import IconButton from '../../atoms/button/IconButton';
+import Button from '../../atoms/button/Button';
+import Input from '../../atoms/input/Input';
+import Spinner from '../../atoms/spinner/Spinner';
+
+import CirclePlusIC from '../../../../public/res/ic/outlined/circle-plus.svg';
+
+import { useStore } from '../../hooks/useStore';
+
+function ImportE2ERoomKeys() {
+  const isMountStore = useStore();
+  const [keyFile, setKeyFile] = useState(null);
+  const [status, setStatus] = useState({
+    isOngoing: false,
+    msg: null,
+    type: cons.status.PRE_FLIGHT,
+  });
+  const inputRef = useRef(null);
+  const passwordRef = useRef(null);
+
+  async function tryDecrypt(file, password) {
+    try {
+      const arrayBuffer = await file.arrayBuffer();
+      if (isMountStore.getItem()) {
+        setStatus({
+          isOngoing: true,
+          msg: 'Decrypting file...',
+          type: cons.status.IN_FLIGHT,
+        });
+      }
+
+      const keys = await decryptMegolmKeyFile(arrayBuffer, password);
+      if (isMountStore.getItem()) {
+        setStatus({
+          isOngoing: true,
+          msg: 'Decrypting messages...',
+          type: cons.status.IN_FLIGHT,
+        });
+      }
+      await initMatrix.matrixClient.importRoomKeys(JSON.parse(keys));
+      if (isMountStore.getItem()) {
+        setStatus({
+          isOngoing: false,
+          msg: 'Successfully imported all keys.',
+          type: cons.status.SUCCESS,
+        });
+        inputRef.current.value = null;
+        passwordRef.current.value = null;
+      }
+    } catch (e) {
+      if (isMountStore.getItem()) {
+        setStatus({
+          isOngoing: false,
+          msg: e.friendlyText || 'Failed to decrypt keys. Please try again.',
+          type: cons.status.ERROR,
+        });
+      }
+    }
+  }
+
+  const importE2ERoomKeys = () => {
+    const password = passwordRef.current.value;
+    if (password === '' || keyFile === null) return;
+    if (status.isOngoing) return;
+
+    tryDecrypt(keyFile, password);
+  };
+
+  const handleFileChange = (e) => {
+    const file = e.target.files.item(0);
+    passwordRef.current.value = '';
+    setKeyFile(file);
+    setStatus({
+      isOngoing: false,
+      msg: null,
+      type: cons.status.PRE_FLIGHT,
+    });
+  };
+  const removeImportKeysFile = () => {
+    if (status.isOngoing) return;
+    inputRef.current.value = null;
+    passwordRef.current.value = null;
+    setKeyFile(null);
+    setStatus({
+      isOngoing: false,
+      msg: null,
+      type: cons.status.PRE_FLIGHT,
+    });
+  };
+
+  useEffect(() => {
+    isMountStore.setItem(true);
+    return () => {
+      isMountStore.setItem(false);
+    };
+  }, []);
+
+  return (
+    <div className="import-e2e-room-keys">
+      <input ref={inputRef} onChange={handleFileChange} style={{ display: 'none' }} type="file" />
+
+      <form className="import-e2e-room-keys__form" onSubmit={(e) => { e.preventDefault(); importE2ERoomKeys(); }}>
+        { keyFile !== null && (
+          <div className="import-e2e-room-keys__file">
+            <IconButton onClick={removeImportKeysFile} src={CirclePlusIC} tooltip="Remove file" />
+            <Text>{keyFile.name}</Text>
+          </div>
+        )}
+        {keyFile === null && <Button onClick={() => inputRef.current.click()}>Import keys</Button>}
+        <Input forwardRef={passwordRef} type="password" placeholder="Password" required />
+        <Button disabled={status.isOngoing} variant="primary" type="submit">Decrypt</Button>
+      </form>
+      { status.type === cons.status.IN_FLIGHT && (
+        <div className="import-e2e-room-keys__process">
+          <Spinner size="small" />
+          <Text variant="b2">{status.msg}</Text>
+        </div>
+      )}
+      {status.type === cons.status.SUCCESS && <Text className="import-e2e-room-keys__success" variant="b2">{status.msg}</Text>}
+      {status.type === cons.status.ERROR && <Text className="import-e2e-room-keys__error" variant="b2">{status.msg}</Text>}
+    </div>
+  );
+}
+
+export default ImportE2ERoomKeys;

src/app/molecules/import-export-e2e-room-keys/ImportE2ERoomKeys.scss

@@ -58,6 +58,10 @@
   }
   &__error {
     margin-top: var(--sp-tight);
-    color: var(--bg-danger);
+    color: var(--tc-danger-high);
+  }
+  &__success {
+    margin-top: var(--sp-tight);
+    color: var(--tc-positive-high);
   }
 }

src/app/molecules/media/Media.scss

@@ -11,6 +11,10 @@
     overflow: hidden;
     text-overflow: ellipsis;
   }
+
+  & a {
+    line-height: 0;
+  }
 }
 
 .file-container {

src/app/molecules/message/Message.jsx

@@ -1,51 +1,37 @@
-import React, { useRef } from 'react';
+/* eslint-disable react/prop-types */
+import React, { useState, useEffect, useCallback, useRef } from 'react';
 import PropTypes from 'prop-types';
 import './Message.scss';
 
-import Linkify from 'linkifyjs/react';
+import dateFormat from 'dateformat';
-import ReactMarkdown from 'react-markdown';
+import { twemojify } from '../../../util/twemojify';
-import gfm from 'remark-gfm';
+
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import initMatrix from '../../../client/initMatrix';
-import { coy } from 'react-syntax-highlighter/dist/esm/styles/prism';
+import { getUsername, getUsernameOfRoomMember, parseReply } from '../../../util/matrixUtil';
-import parse from 'html-react-parser';
+import colorMXID from '../../../util/colorMXID';
-import twemoji from 'twemoji';
+import { getEventCords } from '../../../util/common';
-import { getUsername } from '../../../util/matrixUtil';
+import { redactEvent, sendReaction } from '../../../client/action/roomTimeline';
+import {
+  openEmojiBoard, openProfileViewer, openReadReceipts, replyTo,
+} from '../../../client/action/navigation';
+import { sanitizeCustomHtml } from '../../../util/sanitize';
 
 import Text from '../../atoms/text/Text';
 import RawIcon from '../../atoms/system-icons/RawIcon';
 import Button from '../../atoms/button/Button';
 import Tooltip from '../../atoms/tooltip/Tooltip';
 import Input from '../../atoms/input/Input';
+import Avatar from '../../atoms/avatar/Avatar';
+import IconButton from '../../atoms/button/IconButton';
+import ContextMenu, { MenuHeader, MenuItem, MenuBorder } from '../../atoms/context-menu/ContextMenu';
+import * as Media from '../media/Media';
 
 import ReplyArrowIC from '../../../../public/res/ic/outlined/reply-arrow.svg';
-
+import EmojiAddIC from '../../../../public/res/ic/outlined/emoji-add.svg';
-const components = {
+import VerticalMenuIC from '../../../../public/res/ic/outlined/vertical-menu.svg';
-  code({
+import PencilIC from '../../../../public/res/ic/outlined/pencil.svg';
-    // eslint-disable-next-line react/prop-types
+import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
-    inline, className, children,
+import BinIC from '../../../../public/res/ic/outlined/bin.svg';
-  }) {
-    const match = /language-(\w+)/.exec(className || '');
-    return !inline && match ? (
-      <SyntaxHighlighter
-        style={coy}
-        language={match[1]}
-        PreTag="div"
-        showLineNumbers
-      >
-        {String(children).replace(/\n$/, '')}
-      </SyntaxHighlighter>
-    ) : (
-      <code className={className}>{String(children)}</code>
-    );
-  },
-};
-
-function linkifyContent(content) {
-  return <Linkify options={{ target: { url: '_blank' } }}>{content}</Linkify>;
-}
-function genMarkdown(content) {
-  return <ReactMarkdown remarkPlugins={[gfm]} components={components} linkTarget="_blank">{content}</ReactMarkdown>;
-}
 
 function PlaceholderMessage() {
   return (
@@ -55,7 +41,7 @@ function PlaceholderMessage() {
       </div>
       <div className="ph-msg__main-container">
         <div className="ph-msg__header" />
-        <div className="ph-msg__content">
+        <div className="ph-msg__body">
           <div />
           <div />
           <div />
@@ -66,35 +52,46 @@ function PlaceholderMessage() {
   );
 }
 
-function MessageHeader({
+const MessageAvatar = React.memo(({
-  userId, name, color, time,
+  roomId, mEvent, userId, username,
-}) {
+}) => {
+  const avatarSrc = mEvent.sender.getAvatarUrl(initMatrix.matrixClient.baseUrl, 36, 36, 'crop');
   return (
-    <div className="message__header">
+    <div className="message__avatar-container">
-      <div style={{ color }} className="message__profile">
+      <button type="button" onClick={() => openProfileViewer(userId, roomId)}>
-        <Text variant="b1">{name}</Text>
+        <Avatar imageSrc={avatarSrc} text={username} bgColor={colorMXID(userId)} size="small" />
-        <Text variant="b1">{userId}</Text>
+      </button>
-      </div>
-      <div className="message__time">
-        <Text variant="b3">{time}</Text>
-      </div>
     </div>
   );
-}
+});
+
+const MessageHeader = React.memo(({
+  userId, username, time,
+}) => (
+  <div className="message__header">
+    <div style={{ color: colorMXID(userId) }} className="message__profile">
+      <Text variant="b1">{twemojify(username)}</Text>
+      <Text variant="b1">{twemojify(userId)}</Text>
+    </div>
+    <div className="message__time">
+      <Text variant="b3">{time}</Text>
+    </div>
+  </div>
+));
 MessageHeader.propTypes = {
   userId: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
+  username: PropTypes.string.isRequired,
-  color: PropTypes.string.isRequired,
   time: PropTypes.string.isRequired,
 };
 
-function MessageReply({ name, color, content }) {
+function MessageReply({ name, color, body }) {
   return (
     <div className="message__reply">
       <Text variant="b2">
         <RawIcon color={color} size="extra-small" src={ReplyArrowIC} />
-        <span style={{ color }}>{name}</span>
+        <span style={{ color }}>{twemojify(name)}</span>
-        <>{` ${content}`}</>
+        {' '}
+        {twemojify(body)}
       </Text>
     </div>
   );
@@ -103,45 +100,122 @@ function MessageReply({ name, color, content }) {
 MessageReply.propTypes = {
   name: PropTypes.string.isRequired,
   color: PropTypes.string.isRequired,
-  content: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
 };
 
-function MessageContent({ content, isMarkdown, isEdited }) {
+const MessageReplyWrapper = React.memo(({ roomTimeline, eventId }) => {
+  const [reply, setReply] = useState(null);
+  const isMountedRef = useRef(true);
+
+  useEffect(() => {
+    const mx = initMatrix.matrixClient;
+    const timelineSet = roomTimeline.getUnfilteredTimelineSet();
+    const loadReply = async () => {
+      const eTimeline = await mx.getEventTimeline(timelineSet, eventId);
+      await roomTimeline.decryptAllEventsOfTimeline(eTimeline);
+
+      const mEvent = eTimeline.getTimelineSet().findEventById(eventId);
+
+      const rawBody = mEvent.getContent().body;
+      const username = getUsernameOfRoomMember(mEvent.sender);
+
+      if (isMountedRef.current === false) return;
+      const fallbackBody = mEvent.isRedacted() ? '*** This message has been deleted ***' : '*** Unable to load reply content ***';
+      setReply({
+        to: username,
+        color: colorMXID(mEvent.getSender()),
+        body: parseReply(rawBody)?.body ?? rawBody ?? fallbackBody,
+        event: mEvent,
+      });
+    };
+    loadReply();
+
+    return () => {
+      isMountedRef.current = false;
+    };
+  }, []);
+
+  const focusReply = () => {
+    if (reply?.event.isRedacted()) return;
+    roomTimeline.loadEventTimeline(eventId);
+  };
+
   return (
-    <div className="message__content">
+    <div
-      <div className="text text-b1">
+      className="message__reply-wrapper"
-        { isMarkdown ? genMarkdown(content) : linkifyContent(content) }
+      onClick={focusReply}
-      </div>
+      onKeyDown={focusReply}
-      { isEdited && <Text className="message__content-edited" variant="b3">(edited)</Text>}
+      role="button"
+      tabIndex="0"
+    >
+      {reply !== null && <MessageReply name={reply.to} color={reply.color} body={reply.body} />}
     </div>
   );
-}
+});
-MessageContent.defaultProps = {
+MessageReplyWrapper.propTypes = {
-  isMarkdown: false,
+  roomTimeline: PropTypes.shape({}).isRequired,
-  isEdited: false,
+  eventId: PropTypes.string.isRequired,
-};
-MessageContent.propTypes = {
-  content: PropTypes.node.isRequired,
-  isMarkdown: PropTypes.bool,
-  isEdited: PropTypes.bool,
 };
 
-function MessageEdit({ content, onSave, onCancel }) {
+const MessageBody = React.memo(({
+  senderName,
+  body,
+  isCustomHTML,
+  isEdited,
+  msgType,
+}) => {
+  // if body is not string it is a React element.
+  if (typeof body !== 'string') return <div className="message__body">{body}</div>;
+
+  const content = isCustomHTML
+    ? twemojify(sanitizeCustomHtml(body), undefined, true, false)
+    : <p>{twemojify(body, undefined, true)}</p>;
+
+  return (
+    <div className="message__body">
+      <div className="text text-b1">
+        { msgType === 'm.emote' && (
+          <>
+            {'* '}
+            {twemojify(senderName)}
+            {' '}
+          </>
+        )}
+        { content }
+      </div>
+      { isEdited && <Text className="message__body-edited" variant="b3">(edited)</Text>}
+    </div>
+  );
+});
+MessageBody.defaultProps = {
+  isCustomHTML: false,
+  isEdited: false,
+  msgType: null,
+};
+MessageBody.propTypes = {
+  senderName: PropTypes.string.isRequired,
+  body: PropTypes.node.isRequired,
+  isCustomHTML: PropTypes.bool,
+  isEdited: PropTypes.bool,
+  msgType: PropTypes.string,
+};
+
+function MessageEdit({ body, onSave, onCancel }) {
   const editInputRef = useRef(null);
 
-  function handleKeyDown(e) {
+  const handleKeyDown = (e) => {
     if (e.keyCode === 13 && e.shiftKey === false) {
       e.preventDefault();
       onSave(editInputRef.current.value);
     }
-  }
+  };
 
   return (
     <form className="message__edit" onSubmit={(e) => { e.preventDefault(); onSave(editInputRef.current.value); }}>
       <Input
         forwardRef={editInputRef}
         onKeyDown={handleKeyDown}
-        value={content}
+        value={body}
         placeholder="Edit message"
         required
         resizable
@@ -154,21 +228,43 @@ function MessageEdit({ content, onSave, onCancel }) {
   );
 }
 MessageEdit.propTypes = {
-  content: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
   onSave: PropTypes.func.isRequired,
   onCancel: PropTypes.func.isRequired,
 };
 
-function MessageReactionGroup({ children }) {
+function getMyEmojiEvent(emojiKey, eventId, roomTimeline) {
-  return (
+  const mx = initMatrix.matrixClient;
-    <div className="message__reactions text text-b3 noselect">
+  const rEvents = roomTimeline.reactionTimeline.get(eventId);
-      { children }
+  let rEvent = null;
-    </div>
+  rEvents?.find((rE) => {
-  );
+    if (rE.getRelation() === null) return false;
+    if (rE.getRelation().key === emojiKey && rE.getSender() === mx.getUserId()) {
+      rEvent = rE;
+      return true;
+    }
+    return false;
+  });
+  return rEvent;
+}
+
+function toggleEmoji(roomId, eventId, emojiKey, roomTimeline) {
+  const myAlreadyReactEvent = getMyEmojiEvent(emojiKey, eventId, roomTimeline);
+  if (myAlreadyReactEvent) {
+    const rId = myAlreadyReactEvent.getId();
+    if (rId.startsWith('~')) return;
+    redactEvent(roomId, rId);
+    return;
+  }
+  sendReaction(roomId, eventId, emojiKey);
+}
+
+function pickEmoji(e, roomId, eventId, roomTimeline) {
+  openEmojiBoard(getEventCords(e), (emoji) => {
+    toggleEmoji(roomId, eventId, emoji.unicode, roomTimeline);
+    e.target.click();
+  });
 }
-MessageReactionGroup.propTypes = {
-  children: PropTypes.node.isRequired,
-};
 
 function genReactionMsg(userIds, reaction) {
   const genLessContText = (text) => <span style={{ opacity: '.6' }}>{text}</span>;
@@ -184,95 +280,390 @@ function genReactionMsg(userIds, reaction) {
     <>
       {msg}
       {genLessContText(' reacted with')}
-      {parse(twemoji.parse(reaction))}
+      {twemojify(reaction, { className: 'react-emoji' })}
     </>
   );
 }
 
 function MessageReaction({
-  reaction, users, isActive, onClick,
+  reaction, count, users, isActive, onClick,
 }) {
   return (
     <Tooltip
       className="msg__reaction-tooltip"
-      content={<Text variant="b2">{genReactionMsg(users, reaction)}</Text>}
+      content={<Text variant="b2">{users.length > 0 ? genReactionMsg(users, reaction) : 'Unable to load who has reacted'}</Text>}
     >
       <button
         onClick={onClick}
         type="button"
         className={`msg__reaction${isActive ? ' msg__reaction--active' : ''}`}
       >
-        { parse(twemoji.parse(reaction)) }
+        { twemojify(reaction, { className: 'react-emoji' }) }
-        <Text variant="b3" className="msg__reaction-count">{users.length}</Text>
+        <Text variant="b3" className="msg__reaction-count">{count}</Text>
       </button>
     </Tooltip>
   );
 }
 MessageReaction.propTypes = {
   reaction: PropTypes.node.isRequired,
+  count: PropTypes.number.isRequired,
   users: PropTypes.arrayOf(PropTypes.string).isRequired,
   isActive: PropTypes.bool.isRequired,
   onClick: PropTypes.func.isRequired,
 };
 
-function MessageOptions({ children }) {
+function MessageReactionGroup({ roomTimeline, mEvent }) {
+  const { roomId, reactionTimeline } = roomTimeline;
+  const eventId = mEvent.getId();
+  const mx = initMatrix.matrixClient;
+  const reactions = {};
+
+  const eventReactions = reactionTimeline.get(eventId);
+  const addReaction = (key, count, senderId, isActive) => {
+    let reaction = reactions[key];
+    if (reaction === undefined) {
+      reaction = {
+        count: 0,
+        users: [],
+        isActive: false,
+      };
+    }
+    if (count) {
+      reaction.count = count;
+    } else {
+      reaction.users.push(senderId);
+      reaction.count = reaction.users.length;
+      reaction.isActive = isActive;
+    }
+
+    reactions[key] = reaction;
+  };
+  if (eventReactions) {
+    eventReactions.forEach((rEvent) => {
+      if (rEvent.getRelation() === null) return;
+      const reaction = rEvent.getRelation();
+      const senderId = rEvent.getSender();
+      const isActive = senderId === mx.getUserId();
+
+      addReaction(reaction.key, undefined, senderId, isActive);
+    });
+  } else {
+    // Use aggregated reactions
+    const aggregatedReaction = mEvent.getServerAggregatedRelation('m.annotation')?.chunk;
+    if (!aggregatedReaction) return null;
+    aggregatedReaction.forEach((reaction) => {
+      if (reaction.type !== 'm.reaction') return;
+      addReaction(reaction.key, reaction.count, undefined, false);
+    });
+  }
+
   return (
-    <div className="message__options">
+    <div className="message__reactions text text-b3 noselect">
-      {children}
+      {
+        Object.keys(reactions).map((key) => (
+          <MessageReaction
+            key={key}
+            reaction={key}
+            count={reactions[key].count}
+            users={reactions[key].users}
+            isActive={reactions[key].isActive}
+            onClick={() => {
+              toggleEmoji(roomId, eventId, key, roomTimeline);
+            }}
+          />
+        ))
+      }
+      <IconButton
+        onClick={(e) => {
+          pickEmoji(e, roomId, eventId, roomTimeline);
+        }}
+        src={EmojiAddIC}
+        size="extra-small"
+        tooltip="Add reaction"
+      />
     </div>
   );
 }
-MessageOptions.propTypes = {
+MessageReactionGroup.propTypes = {
-  children: PropTypes.node.isRequired,
+  roomTimeline: PropTypes.shape({}).isRequired,
+  mEvent: PropTypes.shape({}).isRequired,
 };
 
-function Message({
+function isMedia(mE) {
-  avatar, header, reply, content, editContent, reactions, options,
-}) {
-  const msgClass = header === null ? ' message--content-only' : ' message--full';
   return (
-    <div className={`message${msgClass}`}>
+    mE.getContent()?.msgtype === 'm.file'
-      <div className="message__avatar-container">
+    || mE.getContent()?.msgtype === 'm.image'
-        {avatar !== null && avatar}
+    || mE.getContent()?.msgtype === 'm.audio'
-      </div>
+    || mE.getContent()?.msgtype === 'm.video'
+    || mE.getType() === 'm.sticker'
+  );
+}
+
+const MessageOptions = React.memo(({
+  roomTimeline, mEvent, edit, reply,
+}) => {
+  const { roomId, room } = roomTimeline;
+  const mx = initMatrix.matrixClient;
+  const eventId = mEvent.getId();
+  const senderId = mEvent.getSender();
+
+  const myPowerlevel = room.getMember(mx.getUserId())?.powerLevel;
+  const canIRedact = room.currentState.hasSufficientPowerLevelFor('redact', myPowerlevel);
+
+  return (
+    <div className="message__options">
+      <IconButton
+        onClick={(e) => pickEmoji(e, roomId, eventId, roomTimeline)}
+        src={EmojiAddIC}
+        size="extra-small"
+        tooltip="Add reaction"
+      />
+      <IconButton
+        onClick={() => reply()}
+        src={ReplyArrowIC}
+        size="extra-small"
+        tooltip="Reply"
+      />
+      {(senderId === mx.getUserId() && !isMedia(mEvent)) && (
+        <IconButton
+          onClick={() => edit(true)}
+          src={PencilIC}
+          size="extra-small"
+          tooltip="Edit"
+        />
+      )}
+      <ContextMenu
+        content={() => (
+          <>
+            <MenuHeader>Options</MenuHeader>
+            <MenuItem
+              iconSrc={TickMarkIC}
+              onClick={() => openReadReceipts(roomId, roomTimeline.getEventReaders(eventId))}
+            >
+              Read receipts
+            </MenuItem>
+            {(canIRedact || senderId === mx.getUserId()) && (
+              <>
+                <MenuBorder />
+                <MenuItem
+                  variant="danger"
+                  iconSrc={BinIC}
+                  onClick={() => {
+                    if (window.confirm('Are you sure you want to delete this event')) {
+                      redactEvent(roomId, eventId);
+                    }
+                  }}
+                >
+                  Delete
+                </MenuItem>
+              </>
+            )}
+          </>
+        )}
+        render={(toggleMenu) => (
+          <IconButton
+            onClick={toggleMenu}
+            src={VerticalMenuIC}
+            size="extra-small"
+            tooltip="Options"
+          />
+        )}
+      />
+    </div>
+  );
+});
+MessageOptions.propTypes = {
+  roomTimeline: PropTypes.shape({}).isRequired,
+  mEvent: PropTypes.shape({}).isRequired,
+  edit: PropTypes.func.isRequired,
+  reply: PropTypes.func.isRequired,
+};
+
+function genMediaContent(mE) {
+  const mx = initMatrix.matrixClient;
+  const mContent = mE.getContent();
+  if (!mContent || !mContent.body) return <span style={{ color: 'var(--bg-danger)' }}>Malformed event</span>;
+
+  let mediaMXC = mContent?.url;
+  const isEncryptedFile = typeof mediaMXC === 'undefined';
+  if (isEncryptedFile) mediaMXC = mContent?.file?.url;
+
+  let thumbnailMXC = mContent?.info?.thumbnail_url;
+
+  if (typeof mediaMXC === 'undefined' || mediaMXC === '') return <span style={{ color: 'var(--bg-danger)' }}>Malformed event</span>;
+
+  let msgType = mE.getContent()?.msgtype;
+  if (mE.getType() === 'm.sticker') msgType = 'm.image';
+
+  switch (msgType) {
+    case 'm.file':
+      return (
+        <Media.File
+          name={mContent.body}
+          link={mx.mxcUrlToHttp(mediaMXC)}
+          type={mContent.info?.mimetype}
+          file={mContent.file || null}
+        />
+      );
+    case 'm.image':
+      return (
+        <Media.Image
+          name={mContent.body}
+          width={typeof mContent.info?.w === 'number' ? mContent.info?.w : null}
+          height={typeof mContent.info?.h === 'number' ? mContent.info?.h : null}
+          link={mx.mxcUrlToHttp(mediaMXC)}
+          file={isEncryptedFile ? mContent.file : null}
+          type={mContent.info?.mimetype}
+        />
+      );
+    case 'm.audio':
+      return (
+        <Media.Audio
+          name={mContent.body}
+          link={mx.mxcUrlToHttp(mediaMXC)}
+          type={mContent.info?.mimetype}
+          file={mContent.file || null}
+        />
+      );
+    case 'm.video':
+      if (typeof thumbnailMXC === 'undefined') {
+        thumbnailMXC = mContent.info?.thumbnail_file?.url || null;
+      }
+      return (
+        <Media.Video
+          name={mContent.body}
+          link={mx.mxcUrlToHttp(mediaMXC)}
+          thumbnail={thumbnailMXC === null ? null : mx.mxcUrlToHttp(thumbnailMXC)}
+          thumbnailFile={isEncryptedFile ? mContent.info?.thumbnail_file : null}
+          thumbnailType={mContent.info?.thumbnail_info?.mimetype || null}
+          width={typeof mContent.info?.w === 'number' ? mContent.info?.w : null}
+          height={typeof mContent.info?.h === 'number' ? mContent.info?.h : null}
+          file={isEncryptedFile ? mContent.file : null}
+          type={mContent.info?.mimetype}
+        />
+      );
+    default:
+      return <span style={{ color: 'var(--bg-danger)' }}>Malformed event</span>;
+  }
+}
+
+function getEditedBody(editedMEvent) {
+  const newContent = editedMEvent.getContent()['m.new_content'];
+  if (typeof newContent === 'undefined') return [null, false, null];
+
+  const isCustomHTML = newContent.format === 'org.matrix.custom.html';
+  const parsedContent = parseReply(newContent.body);
+  if (parsedContent === null) {
+    return [newContent.body, isCustomHTML, newContent.formatted_body ?? null];
+  }
+  return [parsedContent.body, isCustomHTML, newContent.formatted_body ?? null];
+}
+
+function Message({
+  mEvent, isBodyOnly, roomTimeline, focus, time,
+}) {
+  const [isEditing, setIsEditing] = useState(false);
+  const { roomId, editedTimeline, reactionTimeline } = roomTimeline;
+
+  const className = ['message', (isBodyOnly ? 'message--body-only' : 'message--full')];
+  if (focus) className.push('message--focus');
+  const content = mEvent.getContent();
+  const eventId = mEvent.getId();
+  const msgType = content?.msgtype;
+  const senderId = mEvent.getSender();
+  let { body } = content;
+  const username = getUsernameOfRoomMember(mEvent.sender);
+
+  const edit = useCallback(() => {
+    setIsEditing(true);
+  }, []);
+  const reply = useCallback(() => {
+    replyTo(senderId, eventId, body);
+  }, [body]);
+
+  if (body === undefined) return null;
+  if (msgType === 'm.emote') className.push('message--type-emote');
+
+  let isCustomHTML = content.format === 'org.matrix.custom.html';
+  const isEdited = editedTimeline.has(eventId);
+  const haveReactions = reactionTimeline.has(eventId) || !!mEvent.getServerAggregatedRelation('m.annotation');
+  const isReply = !!mEvent.replyEventId;
+  let customHTML = isCustomHTML ? content.formatted_body : null;
+
+  if (isEdited) {
+    const editedList = editedTimeline.get(eventId);
+    const editedMEvent = editedList[editedList.length - 1];
+    [body, isCustomHTML, customHTML] = getEditedBody(editedMEvent);
+    if (typeof body !== 'string') return null;
+  }
+
+  if (isReply) {
+    body = parseReply(body)?.body ?? body;
+  }
+
+  return (
+    <div className={className.join(' ')}>
+      {
+        isBodyOnly
+          ? <div className="message__avatar-container" />
+          : <MessageAvatar roomId={roomId} mEvent={mEvent} userId={senderId} username={username} />
+      }
       <div className="message__main-container">
-        {header !== null && header}
+        {!isBodyOnly && (
-        {reply !== null && reply}
+          <MessageHeader userId={senderId} username={username} time={time} />
-        {content !== null && content}
+        )}
-        {editContent !== null && editContent}
+        {isReply && (
-        {reactions !== null && reactions}
+          <MessageReplyWrapper
-        {options !== null && options}
+            roomTimeline={roomTimeline}
+            eventId={mEvent.replyEventId}
+          />
+        )}
+        {!isEditing && (
+          <MessageBody
+            senderName={username}
+            isCustomHTML={isCustomHTML}
+            body={isMedia(mEvent) ? genMediaContent(mEvent) : customHTML ?? body}
+            msgType={msgType}
+            isEdited={isEdited}
+          />
+        )}
+        {isEditing && (
+          <MessageEdit
+            body={body}
+            onSave={(newBody) => {
+              if (newBody !== body) {
+                initMatrix.roomsInput.sendEditedMessage(roomId, mEvent, newBody);
+              }
+              setIsEditing(false);
+            }}
+            onCancel={() => setIsEditing(false)}
+          />
+        )}
+        {haveReactions && (
+          <MessageReactionGroup roomTimeline={roomTimeline} mEvent={mEvent} />
+        )}
+        {!isEditing && (
+          <MessageOptions
+            roomTimeline={roomTimeline}
+            mEvent={mEvent}
+            edit={edit}
+            reply={reply}
+          />
+        )}
       </div>
     </div>
   );
 }
 Message.defaultProps = {
-  avatar: null,
+  isBodyOnly: false,
-  header: null,
+  focus: false,
-  reply: null,
-  content: null,
-  editContent: null,
-  reactions: null,
-  options: null,
 };
 Message.propTypes = {
-  avatar: PropTypes.node,
+  mEvent: PropTypes.shape({}).isRequired,
-  header: PropTypes.node,
+  isBodyOnly: PropTypes.bool,
-  reply: PropTypes.node,
+  roomTimeline: PropTypes.shape({}).isRequired,
-  content: PropTypes.node,
+  focus: PropTypes.bool,
-  editContent: PropTypes.node,
+  time: PropTypes.string.isRequired,
-  reactions: PropTypes.node,
-  options: PropTypes.node,
 };
 
-export {
+export { Message, MessageReply, PlaceholderMessage };
-  Message,
-  MessageHeader,
-  MessageReply,
-  MessageContent,
-  MessageEdit,
-  MessageReactionGroup,
-  MessageReaction,
-  MessageOptions,
-  PlaceholderMessage,
-};

src/app/molecules/message/Message.scss

@@ -22,10 +22,18 @@
   
   &__avatar-container {
     padding-top: 6px;
-  }
-  
-  &__avatar-container{
     margin-right: var(--sp-tight);
+    & .avatar-container {
+      transition: transform 200ms var(--fluid-push);
+      &:hover {
+        transform: translateY(-4px);
+      }
+    }
+
+    & button {
+      cursor: pointer;
+      display: flex;
+    }
 
     [dir=rtl] & {
       margin: {
@@ -45,7 +53,7 @@
 
 .message {
   &--full + &--full,
-  &--content-only + &--full,
+  &--body-only + &--full,
   & + .timeline-change,
   .timeline-change + & {
     margin-top: var(--sp-normal);
@@ -53,6 +61,10 @@
   &__avatar-container {
     width: var(--av-small);
   }
+  &--focus {
+    box-shadow: inset 2px 0 0 var(--bg-caution);
+    background-color: var(--bg-caution-hover);
+  }
 }
 
 .ph-msg {
@@ -64,7 +76,7 @@
   }
 
   &__header,
-  &__content > div {
+  &__body > div {
     margin: var(--sp-ultra-tight) 0;
     margin-right: var(--sp-extra-tight);
     height: var(--fs-b1);
@@ -80,23 +92,24 @@
       }
     }
   }
-  &__content {
+  &__body {
     display: flex;
     flex-wrap: wrap;
   }
-  &__content > div:nth-child(1n) {
+  &__body > div:nth-child(1n) {
     max-width: 10%;
   }
-  &__content > div:nth-child(2n) {
+  &__body > div:nth-child(2n) {
     max-width: 50%;
   }
 }
 
 .message__reply,
-.message__content,
+.message__body,
+.message__body__wrapper,
 .message__edit,
 .message__reactions {
-  max-width: 640px;
+  max-width: calc(100% - 88px);
   min-width: 0;
 }
 
@@ -140,6 +153,19 @@
   }
 }
 .message__reply {
+  &-wrapper {
+    min-height: 20px;
+    cursor: pointer;
+    &:empty {
+      border-radius: calc(var(--bo-radius) / 2);
+      background-color: var(--bg-surface-hover);
+      max-width: 200px;
+      cursor: auto;
+    }
+    &:hover .text {
+      color: var(--tc-surface-high);
+    }
+  }
   .text {
     color: var(--tc-surface-low);
     white-space: nowrap;
@@ -151,15 +177,57 @@
     height: 14px;
   }
 }
-.message__content {
+.message__body {
   word-break: break-word;
-  
+
   & > .text > * {
     white-space: pre-wrap;
   }
 
   & a {
-    word-break: break-all;
+    word-break: break-word;
+  }
+  & span[data-mx-pill] {
+    background-color: hsla(0, 0%, 64%, 0.15);
+    padding: 0 2px;
+    border-radius: 4px;
+    cursor: pointer;
+    font-weight: 500;
+    &:hover {
+      background-color: hsla(0, 0%, 64%, 0.3);
+      color: var(--tc-surface-high);
+    }
+
+    &[data-mx-ping] {
+      background-color: var(--bg-ping);
+      &:hover {
+        background-color: var(--bg-ping-hover);
+      }
+    }
+  }
+
+  & span[data-mx-spoiler] {
+    border-radius: 4px;
+    background-color: rgba(124, 124, 124, 0.5);
+    color:transparent;
+    cursor: pointer;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    & > * {
+      opacity: 0;
+    }
+  }
+  .data-mx-spoiler--visible {
+    background-color: var(--bg-surface-active) !important;
+    color: inherit !important;
+    user-select: initial !important;
+    & > * {
+      opacity: inherit !important;
+    }
   }
   &-edited {
     color: var(--tc-surface-low);
@@ -199,7 +267,7 @@
   border-radius: 4px;
   cursor: pointer;
 
-  & .emoji {
+  & .react-emoji {
     width: 14px;
     height: 14px;
     margin: 2px;
@@ -208,7 +276,7 @@
     margin: 0 var(--sp-ultra-tight);
     color: var(--tc-surface-normal)
   }
-  &-tooltip .emoji {
+  &-tooltip .react-emoji  {
     width: 14px;
     height: 14px;
     margin: 0 var(--sp-ultra-tight);
@@ -248,7 +316,7 @@
   position: absolute;
   top: 0;
   right: 60px;
-  z-index: 999;
+  z-index: 99;
   transform: translateY(-50%);
 
   border-radius: var(--bo-radius);
@@ -263,27 +331,27 @@
 }
 
 // markdown formating
-.message__content {
+.message__body {
   & h1,
   & h2 {
     color: var(--tc-surface-high);
-    margin: var(--sp-extra-loose) 0 var(--sp-normal);
+    margin: var(--sp-loose) 0 var(--sp-normal);
     line-height: var(--lh-h1);
   }
   & h3,
   & h4 {
     color: var(--tc-surface-high);
-    margin: var(--sp-loose) 0 var(--sp-tight);
+    margin: var(--sp-normal) 0 var(--sp-tight);
     line-height: var(--lh-h2);
   }
   & h5,
   & h6 {
     color: var(--tc-surface-high);
-    margin: var(--sp-normal) 0 var(--sp-extra-tight);
+    margin: var(--sp-tight) 0 var(--sp-extra-tight);
     line-height: var(--lh-s1);
   }
   & hr {
-    border-color: var(--bg-surface-border);
+    border-color: var(--bg-divider);
   }
 
   .text img {
@@ -325,10 +393,20 @@
     @include scrollbar.scroll__h;
     @include scrollbar.scroll--auto-hide;
   }
-  & pre code {
+  & pre {
-    color: var(--tc-surface-normal) !important;
+    display: inline-block;
+    max-width: 100%;
+    @include scrollbar.scroll;
+    @include scrollbar.scroll__h;
+    @include scrollbar.scroll--auto-hide;
+    & code {
+      color: var(--tc-surface-normal) !important;
+      white-space: pre;
+    }
   }
   & blockquote {
+    display: inline-block;
+    max-width: 100%;
     padding-left: var(--sp-extra-tight);
     border-left: 4px solid var(--bg-surface-active);
     white-space: initial !important;
@@ -370,15 +448,22 @@
     list-style: none;
   }
   & table {
+    display: inline-block;
+    max-width: 100%;
+    white-space: normal !important;
     background-color: var(--bg-surface-hover);
     border-radius: calc(var(--bo-radius) / 2);
     border-spacing: 0;
     border: 1px solid var(--bg-surface-border);
+    @include scrollbar.scroll;
+    @include scrollbar.scroll__h;
+    @include scrollbar.scroll--auto-hide;
 
     & td, & th {
       padding: var(--sp-extra-tight);
       border: 1px solid var(--bg-surface-border);
       border-width: 0 1px 1px 0;
+      white-space: pre;
       &:last-child {
         border-width: 0;
         border-bottom-width: 1px;
@@ -398,4 +483,15 @@
       border-bottom-width: 0px !important;
     }
   }
-}
+}
+
+.message.message--type-emote {
+  .message__body {
+    font-style: italic;
+
+    // Remove blockness of first `<p>` so that markdown emotes stay on one line.
+    p:first-of-type {
+      display: inline;
+    }
+  }
+}

src/app/molecules/message/TimelineChange.jsx

@@ -2,8 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './TimelineChange.scss';
 
-// import Linkify from 'linkifyjs/react';
-
 import Text from '../../atoms/text/Text';
 import RawIcon from '../../atoms/system-icons/RawIcon';
 
@@ -12,9 +10,10 @@ import LeaveArraowIC from '../../../../public/res/ic/outlined/leave-arrow.svg';
 import InviteArraowIC from '../../../../public/res/ic/outlined/invite-arrow.svg';
 import InviteCancelArraowIC from '../../../../public/res/ic/outlined/invite-cancel-arrow.svg';
 import UserIC from '../../../../public/res/ic/outlined/user.svg';
-import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
 
-function TimelineChange({ variant, content, time, onClick }) {
+function TimelineChange({
+  variant, content, time, onClick,
+}) {
   let iconSrc;
 
   switch (variant) {
@@ -33,9 +32,6 @@ function TimelineChange({ variant, content, time, onClick }) {
     case 'avatar':
       iconSrc = UserIC;
       break;
-    case 'follow':
-      iconSrc = TickMarkIC;
-      break;
     default:
       iconSrc = JoinArraowIC;
       break;
@@ -49,7 +45,6 @@ function TimelineChange({ variant, content, time, onClick }) {
       <div className="timeline-change__content">
         <Text variant="b2">
           {content}
-          {/* <Linkify options={{ target: { url: '_blank' } }}>{content}</Linkify> */}
         </Text>
       </div>
       <div className="timeline-change__time">
@@ -68,7 +63,6 @@ TimelineChange.propTypes = {
   variant: PropTypes.oneOf([
     'join', 'leave', 'invite',
     'invite-cancel', 'avatar', 'other',
-    'follow',
   ]),
   content: PropTypes.oneOfType([
     PropTypes.string,

src/app/molecules/people-selector/PeopleSelector.jsx

@@ -2,6 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './PeopleSelector.scss';
 
+import { twemojify } from '../../../util/twemojify';
+
 import { blurOnBubbling } from '../../atoms/button/script';
 
 import Text from '../../atoms/text/Text';
@@ -18,8 +20,8 @@ function PeopleSelector({
         onClick={onClick}
         type="button"
       >
-        <Avatar imageSrc={avatarSrc} text={name.slice(0, 1)} bgColor={color} size="extra-small" />
+        <Avatar imageSrc={avatarSrc} text={name} bgColor={color} size="extra-small" />
-        <Text className="people-selector__name" variant="b1">{name}</Text>
+        <Text className="people-selector__name" variant="b1">{twemojify(name)}</Text>
         {peopleRole !== null && <Text className="people-selector__role" variant="b3">{peopleRole}</Text>}
       </button>
     </div>

src/app/molecules/popup-window/PopupWindow.jsx

@@ -2,6 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './PopupWindow.scss';
 
+import { twemojify } from '../../../util/twemojify';
+
 import Text from '../../atoms/text/Text';
 import IconButton from '../../atoms/button/IconButton';
 import { MenuItem } from '../../atoms/context-menu/ContextMenu';
@@ -66,7 +68,7 @@ function PopupWindow({
             <Header>
               <IconButton size="small" src={ChevronLeftIC} onClick={onRequestClose} tooltip="Back" />
               <TitleWrapper>
-                <Text variant="s1">{title}</Text>
+                <Text variant="s1">{twemojify(title)}</Text>
               </TitleWrapper>
               {drawerOptions}
             </Header>
@@ -82,7 +84,7 @@ function PopupWindow({
         <div className="pw__content">
           <Header>
             <TitleWrapper>
-              <Text variant="h2">{contentTitle !== null ? contentTitle : title}</Text>
+              <Text variant="h2">{twemojify(contentTitle !== null ? contentTitle : title)}</Text>
             </TitleWrapper>
             {contentOptions}
           </Header>

src/app/molecules/room-intro/RoomIntro.jsx

@@ -2,25 +2,21 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './RoomIntro.scss';
 
-import Linkify from 'linkifyjs/react';
+import { twemojify } from '../../../util/twemojify';
 import colorMXID from '../../../util/colorMXID';
 
 import Text from '../../atoms/text/Text';
 import Avatar from '../../atoms/avatar/Avatar';
 
-function linkifyContent(content) {
-  return <Linkify options={{ target: { url: '_blank' } }}>{content}</Linkify>;
-}
-
 function RoomIntro({
   roomId, avatarSrc, name, heading, desc, time,
 }) {
   return (
     <div className="room-intro">
-      <Avatar imageSrc={avatarSrc} text={name.slice(0, 1)} bgColor={colorMXID(roomId)} size="large" />
+      <Avatar imageSrc={avatarSrc} text={name} bgColor={colorMXID(roomId)} size="large" />
       <div className="room-intro__content">
-        <Text className="room-intro__name" variant="h1">{heading}</Text>
+        <Text className="room-intro__name" variant="h1">{twemojify(heading)}</Text>
-        <Text className="room-intro__desc" variant="b1">{linkifyContent(desc)}</Text>
+        <Text className="room-intro__desc" variant="b1">{twemojify(desc, undefined, true)}</Text>
         { time !== null && <Text className="room-intro__time" variant="b3">{time}</Text>}
       </div>
     </div>
@@ -28,7 +24,7 @@ function RoomIntro({
 }
 
 RoomIntro.defaultProps = {
-  avatarSrc: false,
+  avatarSrc: null,
   time: null,
 };
 

src/app/molecules/room-intro/RoomIntro.scss

@@ -13,7 +13,7 @@
 
   .room-intro__content {
     margin-top: var(--sp-extra-loose);
-    max-width: 640px;
+    width: calc(100% - 88px);
   }
   &__name {
     color: var(--tc-surface-high);

src/app/molecules/room-selector/RoomSelector.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './RoomSelector.scss';
 
+import { twemojify } from '../../../util/twemojify';
 import colorMXID from '../../../util/colorMXID';
 
 import Text from '../../atoms/text/Text';
@@ -40,7 +41,7 @@ RoomSelectorWrapper.propTypes = {
 };
 
 function RoomSelector({
-  name, roomId, imageSrc, iconSrc,
+  name, parentName, roomId, imageSrc, iconSrc,
   isSelected, isUnread, notificationCount, isAlert,
   options, onClick,
 }) {
@@ -51,13 +52,21 @@ function RoomSelector({
       content={(
         <>
           <Avatar
-            text={name.slice(0, 1)}
+            text={name}
             bgColor={colorMXID(roomId)}
             imageSrc={imageSrc}
             iconSrc={iconSrc}
             size="extra-small"
           />
-          <Text variant="b1">{name}</Text>
+          <Text variant="b1">
+            {twemojify(name)}
+            {parentName && (
+              <span className="text text-b3">
+                {' — '}
+                {twemojify(parentName)}
+              </span>
+            )}
+          </Text>
           { isUnread && (
             <NotificationBadge
               alert={isAlert}
@@ -72,6 +81,7 @@ function RoomSelector({
   );
 }
 RoomSelector.defaultProps = {
+  parentName: null,
   isSelected: false,
   imageSrc: null,
   iconSrc: null,
@@ -79,6 +89,7 @@ RoomSelector.defaultProps = {
 };
 RoomSelector.propTypes = {
   name: PropTypes.string.isRequired,
+  parentName: PropTypes.string,
   roomId: PropTypes.string.isRequired,
   imageSrc: PropTypes.string,
   iconSrc: PropTypes.string,

src/app/molecules/room-tile/RoomTile.jsx

@@ -2,16 +2,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './RoomTile.scss';
 
-import Linkify from 'linkifyjs/react';
+import { twemojify } from '../../../util/twemojify';
+import { sanitizeText } from '../../../util/sanitize';
+
 import colorMXID from '../../../util/colorMXID';
 
 import Text from '../../atoms/text/Text';
 import Avatar from '../../atoms/avatar/Avatar';
 
-function linkifyContent(content) {
-  return <Linkify options={{ target: { url: '_blank' } }}>{content}</Linkify>;
-}
-
 function RoomTile({
   avatarSrc, name, id,
   inviterName, memberCount, desc, options,
@@ -22,11 +20,11 @@ function RoomTile({
         <Avatar
           imageSrc={avatarSrc}
           bgColor={colorMXID(id)}
-          text={name.slice(0, 1)}
+          text={name}
         />
       </div>
       <div className="room-tile__content">
-        <Text variant="s1">{name}</Text>
+        <Text variant="s1">{twemojify(name)}</Text>
         <Text variant="b3">
           {
             inviterName !== null
@@ -36,7 +34,7 @@ function RoomTile({
         </Text>
         {
           desc !== null && (typeof desc === 'string')
-            ? <Text className="room-tile__content__desc" variant="b2">{linkifyContent(desc)}</Text>
+            ? <Text className="room-tile__content__desc" variant="b2">{twemojify(desc, undefined, true)}</Text>
             : desc
         }
       </div>

src/app/molecules/sidebar-avatar/SidebarAvatar.jsx

@@ -2,6 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './SidebarAvatar.scss';
 
+import { twemojify } from '../../../util/twemojify';
+
 import Avatar from '../../atoms/avatar/Avatar';
 import Text from '../../atoms/text/Text';
 import Tooltip from '../../atoms/tooltip/Tooltip';
@@ -16,7 +18,7 @@ const SidebarAvatar = React.forwardRef(({
   if (active) activeClass = ' sidebar-avatar--active';
   return (
     <Tooltip
-      content={<Text variant="b1">{tooltip}</Text>}
+      content={<Text variant="b1">{twemojify(tooltip)}</Text>}
       placement="right"
     >
       <button

src/app/molecules/sidebar-avatar/SidebarAvatar.scss

@@ -14,6 +14,16 @@
 
     margin: 0 !important;
   }
+  & .avatar-container,
+  & .notification-badge {
+    transition: transform 200ms var(--fluid-push);
+  }
+  &:hover .avatar-container {
+    transform: translateX(4px)
+  }
+  &:hover .notification-badge {
+    transform: translate(calc(20% + 4px), -20%);
+  }
   &:focus {
     outline: none;
   }
@@ -33,7 +43,7 @@
 
     width: 3px;
     height: 12px;
-    background-color: var(--ic-surface-normal);
+    background-color: var(--tc-surface-high);
     border-radius: 0 4px 4px 0;
     transition: height 200ms linear;
 

src/app/molecules/sso-buttons/SSOButtons.jsx

@@ -0,0 +1,41 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import './SSOButtons.scss';
+
+import { createTemporaryClient, startSsoLogin } from '../../../client/action/auth';
+
+import Button from '../../atoms/button/Button';
+
+function SSOButtons({ type, identityProviders, baseUrl }) {
+  const tempClient = createTemporaryClient(baseUrl);
+  function handleClick(id) {
+    startSsoLogin(baseUrl, type, id);
+  }
+  return (
+    <div className="sso-buttons">
+      {identityProviders
+        .sort((idp, idp2) => {
+          if (typeof idp.icon !== 'string') return -1;
+          return idp.name.toLowerCase() > idp2.name.toLowerCase() ? 1 : -1;
+        })
+        .map((idp) => (
+          idp.icon
+            ? (
+              <button key={idp.id} type="button" className="sso-btn" onClick={() => handleClick(idp.id)}>
+                <img className="sso-btn__img" src={tempClient.mxcUrlToHttp(idp.icon)} alt={idp.name} />
+              </button>
+            ) : <Button key={idp.id} className="sso-btn__text-only" onClick={() => handleClick(idp.id)}>{`Login with ${idp.name}`}</Button>
+        ))}
+    </div>
+  );
+}
+
+SSOButtons.propTypes = {
+  identityProviders: PropTypes.arrayOf(
+    PropTypes.shape({}),
+  ).isRequired,
+  baseUrl: PropTypes.string.isRequired,
+  type: PropTypes.oneOf(['sso', 'cas']).isRequired,
+};
+
+export default SSOButtons;

src/app/molecules/sso-buttons/SSOButtons.scss

@@ -0,0 +1,25 @@
+.sso-buttons {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;  
+}
+
+.sso-btn {
+  margin: var(--sp-tight);
+  display: inline-flex;
+  justify-content: center;
+
+  cursor: pointer;
+
+  &__img {
+    height: var(--av-small);
+    width: var(--av-small);
+  }
+  &__text-only {
+    margin-top: var(--sp-normal);
+    flex-basis: 100%;
+    & .text {
+      color: var(--tc-link);
+    }
+  }
+}

src/app/organisms/create-room/CreateRoom.jsx

@@ -1,10 +1,12 @@
-import React, { useState, useRef } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import './CreateRoom.scss';
 
 import initMatrix from '../../../client/initMatrix';
+import cons from '../../../client/state/cons';
 import { isRoomAliasAvailable } from '../../../util/matrixUtil';
 import * as roomActions from '../../../client/action/room';
+import { selectRoom } from '../../../client/action/navigation';
 
 import Text from '../../atoms/text/Text';
 import Button from '../../atoms/button/Button';
@@ -12,6 +14,7 @@ import Toggle from '../../atoms/button/Toggle';
 import IconButton from '../../atoms/button/IconButton';
 import Input from '../../atoms/input/Input';
 import Spinner from '../../atoms/spinner/Spinner';
+import SegmentControl from '../../atoms/segmented-controls/SegmentedControls';
 import PopupWindow from '../../molecules/popup-window/PopupWindow';
 import SettingTile from '../../molecules/setting-tile/SettingTile';
 
@@ -28,6 +31,7 @@ function CreateRoom({ isOpen, onRequestClose }) {
   const [titleValue, updateTitleValue] = useState(undefined);
   const [topicValue, updateTopicValue] = useState(undefined);
   const [addressValue, updateAddressValue] = useState(undefined);
+  const [roleIndex, setRoleIndex] = useState(0);
 
   const addressRef = useRef(null);
   const topicRef = useRef(null);
@@ -45,8 +49,23 @@ function CreateRoom({ isOpen, onRequestClose }) {
     updateTitleValue(undefined);
     updateTopicValue(undefined);
     updateAddressValue(undefined);
+    setRoleIndex(0);
   }
 
+  const onCreated = (roomId) => {
+    resetForm();
+    selectRoom(roomId);
+    onRequestClose();
+  };
+
+  useEffect(() => {
+    const { roomList } = initMatrix;
+    roomList.on(cons.events.roomList.ROOM_CREATED, onCreated);
+    return () => {
+      roomList.removeListener(cons.events.roomList.ROOM_CREATED, onCreated);
+    };
+  }, []);
+
   async function createRoom() {
     if (isCreatingRoom) return;
     updateIsCreatingRoom(true);
@@ -60,13 +79,12 @@ function CreateRoom({ isOpen, onRequestClose }) {
       if (roomAlias.trim() === '') roomAlias = undefined;
     }
 
+    const powerLevel = roleIndex === 1 ? 101 : undefined;
+
     try {
       await roomActions.create({
-        name, topic, isPublic, roomAlias, isEncrypted,
+        name, topic, isPublic, roomAlias, isEncrypted, powerLevel,
       });
-
-      resetForm();
-      onRequestClose();
     } catch (e) {
       if (e.message === 'M_UNKNOWN: Invalid characters in room alias') {
         updateCreatingError('ERROR: Invalid characters in room address');
@@ -75,8 +93,8 @@ function CreateRoom({ isOpen, onRequestClose }) {
         updateCreatingError('ERROR: Room address is already in use');
         updateIsValidAddress(false);
       } else updateCreatingError(e.message);
+      updateIsCreatingRoom(false);
     }
-    updateIsCreatingRoom(false);
   }
 
   function validateAddress(e) {
@@ -139,6 +157,19 @@ function CreateRoom({ isOpen, onRequestClose }) {
               content={<Text variant="b3">You can’t disable this later. Bridges & most bots won’t work yet.</Text>}
             />
           )}
+          <SettingTile
+            title="Select your role"
+            options={(
+              <SegmentControl
+                selected={roleIndex}
+                segments={[{ text: 'Admin' }, { text: 'Founder' }]}
+                onSelect={setRoleIndex}
+              />
+            )}
+            content={(
+              <Text variant="b3">Override the default (100) power level.</Text>
+            )}
+          />
           <Input value={topicValue} onChange={handleTopicChange} forwardRef={topicRef} minHeight={174} resizable label="Topic (optional)" />
           <div className="create-room__name-wrapper">
             <Input value={titleValue} onChange={handleTitleChange} forwardRef={nameRef} label="Room name" required />

src/app/organisms/create-room/CreateRoom.scss

@@ -9,6 +9,13 @@
     }
   }
 
+  & .segment-btn {
+    padding: var(--sp-ultra-tight) 0;
+    &__base {
+      padding: 0 var(--sp-tight);
+    }
+  }
+
   &__address {
     display: flex;
     &__label {

src/app/organisms/emoji-board/EmojiBoard.jsx

@@ -80,17 +80,17 @@ EmojiGroup.propTypes = {
 };
 
 const asyncSearch = new AsyncSearch();
-asyncSearch.setup(emojis, { keys: ['shortcode'], limit: 30 });
+asyncSearch.setup(emojis, { keys: ['shortcode'], isContain: true, limit: 40 });
 function SearchedEmoji() {
   const [searchedEmojis, setSearchedEmojis] = useState(null);
 
   function handleSearchEmoji(resultEmojis, term) {
     if (term === '' || resultEmojis.length === 0) {
       if (term === '') setSearchedEmojis(null);
-      else setSearchedEmojis([]);
+      else setSearchedEmojis({ emojis: [] });
       return;
     }
-    setSearchedEmojis(resultEmojis);
+    setSearchedEmojis({ emojis: resultEmojis });
   }
 
   useEffect(() => {
@@ -102,7 +102,7 @@ function SearchedEmoji() {
 
   if (searchedEmojis === null) return false;
 
-  return <EmojiGroup key="-1" name={searchedEmojis.length === 0 ? 'No search result found' : 'Search results'} groupEmojis={searchedEmojis} />;
+  return <EmojiGroup key="-1" name={searchedEmojis.emojis.length === 0 ? 'No search result found' : 'Search results'} groupEmojis={searchedEmojis.emojis} />;
 }
 
 function EmojiBoard({ onSelect }) {

src/app/organisms/invite-list/InviteList.jsx

@@ -5,6 +5,7 @@ import './InviteList.scss';
 import initMatrix from '../../../client/initMatrix';
 import cons from '../../../client/state/cons';
 import * as roomActions from '../../../client/action/room';
+import { selectRoom, selectTab } from '../../../client/action/navigation';
 
 import Text from '../../atoms/text/Text';
 import Button from '../../atoms/button/Button';
@@ -29,13 +30,18 @@ function InviteList({ isOpen, onRequestClose }) {
     roomActions.leave(roomId, isDM);
   }
   function updateInviteList(roomId) {
-    if (procInvite.has(roomId)) {
+    if (procInvite.has(roomId)) procInvite.delete(roomId);
-      procInvite.delete(roomId);
+    changeProcInvite(new Set(Array.from(procInvite)));
-      changeProcInvite(new Set(Array.from(procInvite)));
-    } else changeProcInvite(new Set(Array.from(procInvite)));
 
     const rl = initMatrix.roomList;
-    const totalInvites = rl.inviteDirects.size + rl.inviteRooms.size;
+    const totalInvites = rl.inviteDirects.size + rl.inviteRooms.size + rl.inviteSpaces.size;
+    const room = initMatrix.matrixClient.getRoom(roomId);
+    const isRejected = room === null || room?.getMyMembership() !== 'join';
+    if (!isRejected) {
+      if (room.isSpaceRoom()) selectTab(roomId);
+      else selectRoom(roomId);
+      onRequestClose();
+    }
     if (totalInvites === 0) onRequestClose();
   }
 

src/app/organisms/navigation/Drawer.scss

@@ -49,7 +49,7 @@
   &::before {
     position: absolute;
     top: 0;
-    
+    z-index: 99;
     content: '';
     display: inline-block;
     width: 100%;

src/app/organisms/navigation/DrawerBreadcrumb.jsx

@@ -2,6 +2,8 @@ import React, { useState, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import './DrawerBreadcrumb.scss';
 
+import { twemojify } from '../../../util/twemojify';
+
 import initMatrix from '../../../client/initMatrix';
 import cons from '../../../client/state/cons';
 import { selectSpace } from '../../../client/action/navigation';
@@ -101,7 +103,7 @@ function DrawerBreadcrumb({ spaceId }) {
                     className={index === spacePath.length - 1 ? 'breadcrumb__btn--selected' : ''}
                     onClick={() => selectSpace(id)}
                   >
-                    <Text variant="b2">{id === cons.tabs.HOME ? 'Home' : mx.getRoom(id).name}</Text>
+                    <Text variant="b2">{id === cons.tabs.HOME ? 'Home' : twemojify(mx.getRoom(id).name)}</Text>
                     { noti !== null && (
                       <NotificationBadge
                         alert={noti.highlight !== 0}

src/app/organisms/navigation/DrawerHeader.jsx

@@ -1,6 +1,8 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 
+import { twemojify } from '../../../util/twemojify';
+
 import initMatrix from '../../../client/initMatrix';
 import cons from '../../../client/state/cons';
 import {
@@ -30,7 +32,7 @@ function DrawerHeader({ selectedTab, spaceId }) {
   return (
     <Header>
       <TitleWrapper>
-        <Text variant="s1">{spaceName || tabName}</Text>
+        <Text variant="s1">{twemojify(spaceName) || tabName}</Text>
       </TitleWrapper>
       {spaceName && (
         <IconButton

src/app/organisms/navigation/SideBar.jsx

@@ -6,7 +6,7 @@ import cons from '../../../client/state/cons';
 import colorMXID from '../../../util/colorMXID';
 import logout from '../../../client/action/logout';
 import {
-  selectTab, openInviteList, openPublicRooms, openSettings,
+  selectTab, openInviteList, openSearch, openSettings,
 } from '../../../client/action/navigation';
 import navigation from '../../../client/state/navigation';
 import { abbreviateNumber } from '../../../util/common';
@@ -17,13 +17,35 @@ import ContextMenu, { MenuItem, MenuHeader, MenuBorder } from '../../atoms/conte
 
 import HomeIC from '../../../../public/res/ic/outlined/home.svg';
 import UserIC from '../../../../public/res/ic/outlined/user.svg';
-import HashSearchIC from '../../../../public/res/ic/outlined/hash-search.svg';
+import SearchIC from '../../../../public/res/ic/outlined/search.svg';
 import InviteIC from '../../../../public/res/ic/outlined/invite.svg';
 import SettingsIC from '../../../../public/res/ic/outlined/settings.svg';
 import PowerIC from '../../../../public/res/ic/outlined/power.svg';
 
 function ProfileAvatarMenu() {
   const mx = initMatrix.matrixClient;
+  const [profile, setProfile] = useState({
+    avatarUrl: null,
+    displayName: mx.getUser(mx.getUserId()).displayName,
+  });
+
+  useEffect(() => {
+    const user = mx.getUser(mx.getUserId());
+    const setNewProfile = (avatarUrl, displayName) => setProfile({
+      avatarUrl: avatarUrl || null,
+      displayName: displayName || profile.displayName,
+    });
+    const onAvatarChange = (event, myUser) => {
+      setNewProfile(myUser.avatarUrl, myUser.displayName);
+    };
+    mx.getProfileInfo(mx.getUserId()).then((info) => {
+      setNewProfile(info.avatar_url, info.displayname);
+    });
+    user.on('User.avatarUrl', onAvatarChange);
+    return () => {
+      user.removeListener('User.avatarUrl', onAvatarChange);
+    };
+  }, []);
 
   return (
     <ContextMenu
@@ -45,10 +67,10 @@ function ProfileAvatarMenu() {
       render={(toggleMenu) => (
         <SidebarAvatar
           onClick={toggleMenu}
-          tooltip={mx.getUser(mx.getUserId()).displayName}
+          tooltip={profile.displayName}
-          imageSrc={mx.getUser(mx.getUserId()).avatarUrl !== null ? mx.mxcUrlToHttp(mx.getUser(mx.getUserId()).avatarUrl, 42, 42, 'crop') : null}
+          imageSrc={profile.avatarUrl !== null ? mx.mxcUrlToHttp(profile.avatarUrl, 42, 42, 'crop') : null}
           bgColor={colorMXID(mx.getUserId())}
-          text={mx.getUser(mx.getUserId()).displayName.slice(0, 1)}
+          text={profile.displayName}
         />
       )}
     />
@@ -99,6 +121,7 @@ function SideBar() {
     let noti = null;
 
     orphans.forEach((roomId) => {
+      if (roomList.spaceShortcut.has(roomId)) return;
       if (!notifications.hasNoti(roomId)) return;
       if (noti === null) noti = { total: 0, highlight: 0 };
       const childNoti = notifications.getNoti(roomId);
@@ -152,7 +175,6 @@ function SideBar() {
                 notificationCount={dmsNoti !== null ? abbreviateNumber(dmsNoti.total) : 0}
                 isAlert={dmsNoti?.highlight > 0}
               />
-              <SidebarAvatar onClick={() => openPublicRooms()} tooltip="Public rooms" iconSrc={HashSearchIC} />
             </div>
             <div className="sidebar-divider" />
             <div className="space-container">
@@ -167,7 +189,7 @@ function SideBar() {
                       tooltip={room.name}
                       bgColor={colorMXID(room.roomId)}
                       imageSrc={room.getAvatarUrl(initMatrix.matrixClient.baseUrl, 42, 42, 'crop') || null}
-                      text={room.name.slice(0, 1)}
+                      text={room.name}
                       isUnread={notifications.hasNoti(sRoomId)}
                       notificationCount={abbreviateNumber(notifications.getTotalNoti(sRoomId))}
                       isAlert={notifications.getHighlightNoti(sRoomId) !== 0}
@@ -183,6 +205,11 @@ function SideBar() {
       <div className="sidebar__sticky">
         <div className="sidebar-divider" />
         <div className="sticky-container">
+          <SidebarAvatar
+            onClick={() => openSearch()}
+            tooltip="Search"
+            iconSrc={SearchIC}
+          />
           { totalInvites !== 0 && (
             <SidebarAvatar
               isUnread

src/app/organisms/navigation/SideBar.scss

@@ -10,6 +10,7 @@
   width: var(--navigation-sidebar-width);
   height: 100%;
   border-right: 1px solid var(--bg-surface-border);
+  background-color: var(--bg-surface-extra-low);
 
   [dir=rtl] & {
     border-right: none;
@@ -41,8 +42,8 @@
     background: transparent;
     background-image: linear-gradient(
       to top,
-      var(--bg-surface-low),
+      var(--bg-surface-extra-low),
-      var(--bg-surface-low-transparent));
+      var(--bg-surface-extra-low-transparent));
     position: sticky;
     bottom: -1px;
     left: 0;

src/app/organisms/profile-editor/ProfileEditor.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useRef } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 
 import initMatrix from '../../../client/initMatrix';
@@ -17,11 +17,17 @@ function ProfileEditor({
   const mx = initMatrix.matrixClient;
   const displayNameRef = useRef(null);
   const bgColor = colorMXID(userId);
-  const [avatarSrc, setAvatarSrc] = useState(mx.mxcUrlToHttp(mx.getUser(mx.getUserId()).avatarUrl, 80, 80, 'crop') || null);
+  const [avatarSrc, setAvatarSrc] = useState(null);
   const [disabled, setDisabled] = useState(true);
 
   let username = mx.getUser(mx.getUserId()).displayName;
 
+  useEffect(() => {
+    mx.getProfileInfo(mx.getUserId()).then((info) => {
+      setAvatarSrc(info.avatar_url ? mx.mxcUrlToHttp(info.avatar_url, 80, 80, 'crop') : null);
+    });
+  }, [userId]);
+
   // Sets avatar URL and updates the avatar component in profile editor to reflect new upload
   function handleAvatarUpload(url) {
     if (url === null) {

src/app/organisms/profile-viewer/ProfileViewer.jsx

@@ -0,0 +1,309 @@
+import React, { useState, useEffect, useRef } from 'react';
+import PropTypes from 'prop-types';
+import './ProfileViewer.scss';
+
+import { twemojify } from '../../../util/twemojify';
+
+import initMatrix from '../../../client/initMatrix';
+import cons from '../../../client/state/cons';
+import navigation from '../../../client/state/navigation';
+import { selectRoom } from '../../../client/action/navigation';
+import * as roomActions from '../../../client/action/room';
+
+import { getUsername, getUsernameOfRoomMember, getPowerLabel } from '../../../util/matrixUtil';
+import colorMXID from '../../../util/colorMXID';
+
+import Text from '../../atoms/text/Text';
+import Chip from '../../atoms/chip/Chip';
+import IconButton from '../../atoms/button/IconButton';
+import Avatar from '../../atoms/avatar/Avatar';
+import Button from '../../atoms/button/Button';
+import Dialog from '../../molecules/dialog/Dialog';
+import SettingTile from '../../molecules/setting-tile/SettingTile';
+
+import ShieldEmptyIC from '../../../../public/res/ic/outlined/shield-empty.svg';
+import ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
+import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
+
+function SessionInfo({ userId }) {
+  const [devices, setDevices] = useState(null);
+  const mx = initMatrix.matrixClient;
+
+  useEffect(() => {
+    let isUnmounted = false;
+
+    async function loadDevices() {
+      try {
+        await mx.downloadKeys([userId], true);
+        const myDevices = mx.getStoredDevicesForUser(userId);
+
+        if (isUnmounted) return;
+        setDevices(myDevices);
+      } catch {
+        setDevices([]);
+      }
+    }
+    loadDevices();
+
+    return () => {
+      isUnmounted = true;
+    };
+  }, [userId]);
+
+  function renderSessionChips() {
+    return (
+      <div className="session-info__chips">
+        {devices === null && <Text variant="b3">Loading sessions...</Text>}
+        {devices?.length === 0 && <Text variant="b3">No session found.</Text>}
+        {devices !== null && (devices.map((device) => (
+          <Chip
+            key={device.deviceId}
+            iconSrc={ShieldEmptyIC}
+            text={device.getDisplayName() || device.deviceId}
+          />
+        )))}
+      </div>
+    );
+  }
+
+  return (
+    <div className="session-info">
+      <SettingTile
+        title="Sessions"
+        content={renderSessionChips()}
+      />
+    </div>
+  );
+}
+
+SessionInfo.propTypes = {
+  userId: PropTypes.string.isRequired,
+};
+
+function ProfileFooter({ roomId, userId, onRequestClose }) {
+  const [isCreatingDM, setIsCreatingDM] = useState(false);
+  const [isIgnoring, setIsIgnoring] = useState(false);
+  const [isUserIgnored, setIsUserIgnored] = useState(initMatrix.matrixClient.isUserIgnored(userId));
+
+  const isMountedRef = useRef(true);
+  const mx = initMatrix.matrixClient;
+  const room = mx.getRoom(roomId);
+  const member = room.getMember(userId);
+  const isInvitable = member?.membership !== 'join' && member?.membership !== 'ban';
+
+  const [isInviting, setIsInviting] = useState(false);
+  const [isInvited, setIsInvited] = useState(member?.membership === 'invite');
+
+  const myPowerlevel = room.getMember(mx.getUserId()).powerLevel;
+  const userPL = room.getMember(userId)?.powerLevel || 0;
+  const canIKick = room.currentState.hasSufficientPowerLevelFor('kick', myPowerlevel) && userPL < myPowerlevel;
+
+  const onCreated = (dmRoomId) => {
+    if (isMountedRef.current === false) return;
+    setIsCreatingDM(false);
+    selectRoom(dmRoomId);
+    onRequestClose();
+  };
+
+  useEffect(() => {
+    const { roomList } = initMatrix;
+    roomList.on(cons.events.roomList.ROOM_CREATED, onCreated);
+    return () => {
+      isMountedRef.current = false;
+      roomList.removeListener(cons.events.roomList.ROOM_CREATED, onCreated);
+    };
+  }, []);
+  useEffect(() => {
+    setIsUserIgnored(initMatrix.matrixClient.isUserIgnored(userId));
+    setIsIgnoring(false);
+    setIsInviting(false);
+  }, [userId]);
+
+  async function openDM() {
+    const directIds = [...initMatrix.roomList.directs];
+
+    // Check and open if user already have a DM with userId.
+    for (let i = 0; i < directIds.length; i += 1) {
+      const dRoom = mx.getRoom(directIds[i]);
+      const roomMembers = dRoom.getMembers();
+      if (roomMembers.length <= 2 && dRoom.getMember(userId)) {
+        selectRoom(directIds[i]);
+        onRequestClose();
+        return;
+      }
+    }
+
+    // Create new DM
+    try {
+      setIsCreatingDM(true);
+      await roomActions.create({
+        isEncrypted: true,
+        isDirect: true,
+        invite: [userId],
+      });
+    } catch {
+      if (isMountedRef.current === false) return;
+      setIsCreatingDM(false);
+    }
+  }
+
+  async function toggleIgnore() {
+    const ignoredUsers = mx.getIgnoredUsers();
+    const uIndex = ignoredUsers.indexOf(userId);
+    if (uIndex >= 0) {
+      if (uIndex === -1) return;
+      ignoredUsers.splice(uIndex, 1);
+    } else ignoredUsers.push(userId);
+
+    try {
+      setIsIgnoring(true);
+      await mx.setIgnoredUsers(ignoredUsers);
+
+      if (isMountedRef.current === false) return;
+      setIsUserIgnored(uIndex < 0);
+      setIsIgnoring(false);
+    } catch {
+      setIsIgnoring(false);
+    }
+  }
+
+  async function toggleInvite() {
+    try {
+      setIsInviting(true);
+      let isInviteSent = false;
+      if (isInvited) await roomActions.kick(roomId, userId);
+      else {
+        await roomActions.invite(roomId, userId);
+        isInviteSent = true;
+      }
+      if (isMountedRef.current === false) return;
+      setIsInvited(isInviteSent);
+      setIsInviting(false);
+    } catch {
+      setIsInviting(false);
+    }
+  }
+
+  return (
+    <div className="profile-viewer__buttons">
+      <Button
+        variant="primary"
+        onClick={openDM}
+        disabled={isCreatingDM}
+      >
+        {isCreatingDM ? 'Creating room...' : 'Message'}
+      </Button>
+      { member?.membership === 'join' && <Button>Mention</Button>}
+      { (isInvited ? canIKick : room.canInvite(mx.getUserId())) && isInvitable && (
+        <Button
+          onClick={toggleInvite}
+          disabled={isInviting}
+        >
+          {
+            isInvited
+              ? `${isInviting ? 'Disinviting...' : 'Disinvite'}`
+              : `${isInviting ? 'Inviting...' : 'Invite'}`
+          }
+        </Button>
+      )}
+      <Button
+        variant={isUserIgnored ? 'positive' : 'danger'}
+        onClick={toggleIgnore}
+        disabled={isIgnoring}
+      >
+        {
+          isUserIgnored
+            ? `${isIgnoring ? 'Unignoring...' : 'Unignore'}`
+            : `${isIgnoring ? 'Ignoring...' : 'Ignore'}`
+        }
+      </Button>
+    </div>
+  );
+}
+ProfileFooter.propTypes = {
+  roomId: PropTypes.string.isRequired,
+  userId: PropTypes.string.isRequired,
+  onRequestClose: PropTypes.func.isRequired,
+};
+
+function ProfileViewer() {
+  const [isOpen, setIsOpen] = useState(false);
+  const [roomId, setRoomId] = useState(null);
+  const [userId, setUserId] = useState(null);
+
+  const mx = initMatrix.matrixClient;
+  const room = roomId ? mx.getRoom(roomId) : null;
+  let username = '';
+  if (room !== null) {
+    const roomMember = room.getMember(userId);
+    if (roomMember) username = getUsernameOfRoomMember(roomMember);
+    else username = getUsername(userId);
+  }
+
+  function loadProfile(uId, rId) {
+    setIsOpen(true);
+    setUserId(uId);
+    setRoomId(rId);
+  }
+
+  useEffect(() => {
+    navigation.on(cons.events.navigation.PROFILE_VIEWER_OPENED, loadProfile);
+    return () => {
+      navigation.removeListener(cons.events.navigation.PROFILE_VIEWER_OPENED, loadProfile);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (isOpen) return;
+    setUserId(null);
+    setRoomId(null);
+  }, [isOpen]);
+
+  function renderProfile() {
+    const member = room.getMember(userId) || mx.getUser(userId) || {};
+    const avatarMxc = member.getMxcAvatarUrl?.() || member.avatarUrl;
+
+    return (
+      <div className="profile-viewer">
+        <div className="profile-viewer__user">
+          <Avatar
+            imageSrc={!avatarMxc ? null : mx.mxcUrlToHttp(avatarMxc, 80, 80, 'crop')}
+            text={username}
+            bgColor={colorMXID(userId)}
+            size="large"
+          />
+          <div className="profile-viewer__user__info">
+            <Text variant="s1">{twemojify(username)}</Text>
+            <Text variant="b2">{twemojify(userId)}</Text>
+          </div>
+          <div className="profile-viewer__user__role">
+            <Text variant="b3">Role</Text>
+            <Button iconSrc={ChevronBottomIC}>{getPowerLabel(member.powerLevel) || 'Member'}</Button>
+          </div>
+        </div>
+        <SessionInfo userId={userId} />
+        { userId !== mx.getUserId() && (
+          <ProfileFooter
+            roomId={roomId}
+            userId={userId}
+            onRequestClose={() => setIsOpen(false)}
+          />
+        )}
+      </div>
+    );
+  }
+
+  return (
+    <Dialog
+      className="profile-viewer__dialog"
+      isOpen={isOpen}
+      title={`${username} in ${room?.name ?? ''}`}
+      onRequestClose={() => setIsOpen(false)}
+      contentOptions={<IconButton src={CrossIC} onClick={() => setIsOpen(false)} tooltip="Close" />}
+    >
+      {isOpen && renderProfile()}
+    </Dialog>
+  );
+}
+
+export default ProfileViewer;

src/app/organisms/profile-viewer/ProfileViewer.scss

@@ -0,0 +1,89 @@
+.profile-viewer__dialog {
+  & .dialog__content__wrapper {
+    position: relative;
+  }
+  & .dialog__content-container {
+    padding: var(--sp-normal);
+    padding-bottom: 89px;
+    padding-right: var(--sp-extra-tight);
+    [dir=rtl] & {
+      padding-right: var(--sp-normal);
+      padding-left: var(--sp-extra-tight);
+    }
+  }
+}
+
+.profile-viewer {
+  &__user {
+    display: flex;
+    padding-bottom: var(--sp-normal);
+    border-bottom: 1px solid var(--bg-surface-border);
+
+    &__info {
+      align-self: flex-end;
+      flex: 1;
+      min-width: 0;
+
+      margin: 0 var(--sp-normal);
+
+      & .text-s1 {
+        font-weight: 500;
+      }
+      & .text {
+        white-space: pre-wrap;
+        word-break: break-word;
+      }
+    }
+    &__role {
+      align-self: flex-end;
+      & > .text {
+        margin-bottom: var(--sp-ultra-tight);
+      }
+    }
+  }
+  
+  & .session-info {
+    margin-top: var(--sp-normal);
+  }
+
+  &__buttons {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    
+    width: 100%;
+    padding: var(--sp-normal);
+    background-color: var(--bg-surface);
+    border-top: 1px solid var(--bg-surface-border);
+    display: flex;
+
+    & > *:nth-child(2n) {
+      margin: 0 var(--sp-normal)
+    }
+    & > *:last-child {
+      margin-left: auto;
+      [dir=rtl] & {
+        margin-left: 0;
+        margin-right: auto;
+      }
+    }
+  }
+}
+
+.session-info {
+  & .setting-tile__title .text {
+    color: var(--tc-surface-high);
+  }
+  &__chips {
+    padding-top: var(--sp-ultra-tight);
+    & .chip {
+      margin: {
+        top: var(--sp-extra-tight);
+        right: var(--sp-extra-tight);
+      }
+      [dir=rtl] & {
+        margin: 0 0 var(--sp-extra-tight) var(--sp-extra-tight);
+      }
+    }
+  } 
+}

src/app/organisms/public-rooms/PublicRooms.jsx

@@ -139,14 +139,20 @@ function PublicRooms({ isOpen, searchTerm, onRequestClose }) {
       updateIsViewMore(false);
       if (totalRooms.length === 0) {
         updateSearchQuery({
-          error: `No result found for "${inputRoomName}" on ${inputHs}`,
+          error: inputRoomName === ''
+            ? `No public rooms on ${inputHs}`
+            : `No result found for "${inputRoomName}" on ${inputHs}`,
           alias: isInputAlias ? inputRoomName : null,
         });
       }
     } catch (e) {
       updatePublicRooms([]);
+      let err = 'Something went wrong!';
+      if (e?.httpStatus >= 400 && e?.httpStatus < 500) {
+        err = e.message;
+      }
       updateSearchQuery({
-        error: 'Something went wrong!',
+        error: err,
         alias: isInputAlias ? inputRoomName : null,
       });
       updateIsSearching(false);

src/app/organisms/pw/Dialogs.jsx

@@ -1,11 +1,15 @@
 import React from 'react';
 
 import ReadReceipts from '../read-receipts/ReadReceipts';
+import ProfileViewer from '../profile-viewer/ProfileViewer';
+import Search from '../search/Search';
 
 function Dialogs() {
   return (
     <>
       <ReadReceipts />
+      <ProfileViewer />
+      <Search />
     </>
   );
 }

src/app/organisms/read-receipts/ReadReceipts.jsx

@@ -11,30 +11,19 @@ import PeopleSelector from '../../molecules/people-selector/PeopleSelector';
 import Dialog from '../../molecules/dialog/Dialog';
 
 import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
+import { openProfileViewer } from '../../../client/action/navigation';
 
 function ReadReceipts() {
   const [isOpen, setIsOpen] = useState(false);
+  const [readers, setReaders] = useState([]);
   const [roomId, setRoomId] = useState(null);
-  const [readReceipts, setReadReceipts] = useState([]);
-
-  function loadReadReceipts(myRoomId, eventId) {
-    const mx = initMatrix.matrixClient;
-    const room = mx.getRoom(myRoomId);
-    const { timeline } = room;
-    const myReadReceipts = [];
-
-    const myEventIndex = timeline.findIndex((mEvent) => mEvent.getId() === eventId);
-
-    for (let eventIndex = myEventIndex; eventIndex < timeline.length; eventIndex += 1) {
-      myReadReceipts.push(...room.getReceiptsForEvent(timeline[eventIndex]));
-    }
-
-    setReadReceipts(myReadReceipts);
-    setRoomId(myRoomId);
-    setIsOpen(true);
-  }
 
   useEffect(() => {
+    const loadReadReceipts = (rId, userIds) => {
+      setReaders(userIds);
+      setRoomId(rId);
+      setIsOpen(true);
+    };
     navigation.on(cons.events.navigation.READRECEIPTS_OPENED, loadReadReceipts);
     return () => {
       navigation.removeListener(cons.events.navigation.READRECEIPTS_OPENED, loadReadReceipts);
@@ -43,25 +32,28 @@ function ReadReceipts() {
 
   useEffect(() => {
     if (isOpen === false) {
+      setReaders([]);
       setRoomId(null);
-      setReadReceipts([]);
     }
   }, [isOpen]);
 
-  function renderPeople(receipt) {
+  function renderPeople(userId) {
     const room = initMatrix.matrixClient.getRoom(roomId);
-    const member = room.getMember(receipt.userId);
+    const member = room.getMember(userId);
-    const getUserDisplayName = (userId) => {
+    const getUserDisplayName = () => {
       if (room?.getMember(userId)) return getUsernameOfRoomMember(room.getMember(userId));
       return getUsername(userId);
     };
     return (
       <PeopleSelector
-        key={receipt.userId}
+        key={userId}
-        onClick={() => alert('Viewing profile is yet to be implemented')}
+        onClick={() => {
+          setIsOpen(false);
+          openProfileViewer(userId, roomId);
+        }}
         avatarSrc={member?.getAvatarUrl(initMatrix.matrixClient.baseUrl, 24, 24, 'crop')}
-        name={getUserDisplayName(receipt.userId)}
+        name={getUserDisplayName(userId)}
-        color={colorMXID(receipt.userId)}
+        color={colorMXID(userId)}
       />
     );
   }
@@ -74,7 +66,7 @@ function ReadReceipts() {
       contentOptions={<IconButton src={CrossIC} onClick={() => setIsOpen(false)} tooltip="Close" />}
     >
       {
-        readReceipts.map(renderPeople)
+        readers.map(renderPeople)
       }
     </Dialog>
   );

src/app/organisms/room-optons/RoomOptions.jsx

@@ -1,6 +1,8 @@
 import React, { useState, useEffect, useRef } from 'react';
 import './RoomOptions.scss';
 
+import { twemojify } from '../../../util/twemojify';
+
 import initMatrix from '../../../client/initMatrix';
 import cons from '../../../client/state/cons';
 import navigation from '../../../client/state/navigation';
@@ -9,6 +11,7 @@ import * as roomActions from '../../../client/action/room';
 
 import ContextMenu, { MenuHeader, MenuItem } from '../../atoms/context-menu/ContextMenu';
 
+import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
 import BellIC from '../../../../public/res/ic/outlined/bell.svg';
 import BellRingIC from '../../../../public/res/ic/outlined/bell-ring.svg';
 import BellPingIC from '../../../../public/res/ic/outlined/bell-ping.svg';
@@ -146,9 +149,20 @@ function RoomOptions() {
     };
   }, []);
 
+  const handleMarkAsRead = () => {
+    const mx = initMatrix.matrixClient;
+    const room = mx.getRoom(roomId);
+    if (!room) return;
+    const events = room.getLiveTimeline().getEvents();
+    mx.sendReadReceipt(events[events.length - 1]);
+  };
+
   const handleInviteClick = () => openInviteUser(roomId);
-  const handleLeaveClick = () => {
+  const handleLeaveClick = (toggleMenu) => {
-    if (confirm('Are you really want to leave this room?')) roomActions.leave(roomId);
+    if (confirm('Are you really want to leave this room?')) {
+      roomActions.leave(roomId);
+      toggleMenu();
+    }
   };
 
   function setNotif(nState, currentNState) {
@@ -163,7 +177,15 @@ function RoomOptions() {
       maxWidth={298}
       content={(toggleMenu) => (
         <>
-          <MenuHeader>{`Options for ${initMatrix.matrixClient.getRoom(roomId)?.name}`}</MenuHeader>
+          <MenuHeader>{twemojify(`Options for ${initMatrix.matrixClient.getRoom(roomId)?.name}`)}</MenuHeader>
+          <MenuItem
+            iconSrc={TickMarkIC}
+            onClick={() => {
+              handleMarkAsRead(); toggleMenu();
+            }}
+          >
+            Mark as read
+          </MenuItem>
           <MenuItem
             iconSrc={AddUserIC}
             onClick={() => {
@@ -172,7 +194,7 @@ function RoomOptions() {
           >
             Invite
           </MenuItem>
-          <MenuItem iconSrc={LeaveArrowIC} variant="danger" onClick={handleLeaveClick}>Leave</MenuItem>
+          <MenuItem iconSrc={LeaveArrowIC} variant="danger" onClick={() => handleLeaveClick(toggleMenu)}>Leave</MenuItem>
           <MenuHeader>Notification</MenuHeader>
           <MenuItem
             variant={notifState === cons.notifs.DEFAULT ? 'positive' : 'surface'}

src/app/organisms/room/PeopleDrawer.jsx

@@ -1,29 +1,29 @@
-import React, { useState, useEffect } from 'react';
+import React, {
+  useState, useEffect, useCallback, useRef,
+} from 'react';
 import PropTypes from 'prop-types';
 import './PeopleDrawer.scss';
 
 import initMatrix from '../../../client/initMatrix';
-import { getUsernameOfRoomMember } from '../../../util/matrixUtil';
+import { getPowerLabel, getUsernameOfRoomMember } from '../../../util/matrixUtil';
 import colorMXID from '../../../util/colorMXID';
-import { openInviteUser } from '../../../client/action/navigation';
+import { openInviteUser, openProfileViewer } from '../../../client/action/navigation';
+import AsyncSearch from '../../../util/AsyncSearch';
 
 import Text from '../../atoms/text/Text';
 import Header, { TitleWrapper } from '../../atoms/header/Header';
+import RawIcon from '../../atoms/system-icons/RawIcon';
 import IconButton from '../../atoms/button/IconButton';
 import Button from '../../atoms/button/Button';
 import ScrollView from '../../atoms/scroll/ScrollView';
 import Input from '../../atoms/input/Input';
+import SegmentedControl from '../../atoms/segmented-controls/SegmentedControls';
 import PeopleSelector from '../../molecules/people-selector/PeopleSelector';
 
 import AddUserIC from '../../../../public/res/ic/outlined/add-user.svg';
+import SearchIC from '../../../../public/res/ic/outlined/search.svg';
+import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
 
-function getPowerLabel(powerLevel) {
-  if (powerLevel > 9000) return 'Goku';
-  if (powerLevel > 100) return 'Founder';
-  if (powerLevel === 100) return 'Admin';
-  if (powerLevel >= 50) return 'Mod';
-  return null;
-}
 function AtoZ(m1, m2) {
   const aName = m1.name;
   const bName = m2.name;
@@ -44,31 +44,101 @@ function sortByPowerLevel(m1, m2) {
   if (pl1 < pl2) return 1;
   return 0;
 }
+function simplyfiMembers(members) {
+  const mx = initMatrix.matrixClient;
+  return members.map((member) => ({
+    userId: member.userId,
+    name: getUsernameOfRoomMember(member),
+    username: member.userId.slice(1, member.userId.indexOf(':')),
+    avatarSrc: member.getAvatarUrl(mx.baseUrl, 24, 24, 'crop'),
+    peopleRole: getPowerLabel(member.powerLevel),
+    powerLevel: members.powerLevel,
+  }));
+}
 
+const asyncSearch = new AsyncSearch();
 function PeopleDrawer({ roomId }) {
   const PER_PAGE_MEMBER = 50;
-  const room = initMatrix.matrixClient.getRoom(roomId);
+  const mx = initMatrix.matrixClient;
-  const totalMemberList = room.getJoinedMembers().sort(AtoZ).sort(sortByPowerLevel);
+  const room = mx.getRoom(roomId);
-  const [memberList, updateMemberList] = useState([]);
+
-  let isRoomChanged = false;
+  const [itemCount, setItemCount] = useState(PER_PAGE_MEMBER);
+  const [membership, setMembership] = useState('join');
+  const [memberList, setMemberList] = useState([]);
+  const [searchedMembers, setSearchedMembers] = useState(null);
+  const searchRef = useRef(null);
+
+  const getMembersWithMembership = useCallback(
+    (mship) => room.getMembersWithMembership(mship),
+    [roomId, membership],
+  );
 
   function loadMorePeople() {
-    updateMemberList(totalMemberList.slice(0, memberList.length + PER_PAGE_MEMBER));
+    setItemCount(itemCount + PER_PAGE_MEMBER);
+  }
+
+  function handleSearchData(data) {
+    // NOTICE: data is passed as object property
+    // because react sucks at handling state update with array.
+    setSearchedMembers({ data });
+    setItemCount(PER_PAGE_MEMBER);
+  }
+
+  function handleSearch(e) {
+    const term = e.target.value;
+    if (term === '' || term === undefined) {
+      searchRef.current.value = '';
+      searchRef.current.focus();
+      setSearchedMembers(null);
+      setItemCount(PER_PAGE_MEMBER);
+    } else asyncSearch.search(term);
   }
 
   useEffect(() => {
-    updateMemberList(totalMemberList.slice(0, PER_PAGE_MEMBER));
+    asyncSearch.setup(memberList, {
+      keys: ['name', 'username', 'userId'],
+      limit: PER_PAGE_MEMBER,
+    });
+  }, [memberList]);
+
+  useEffect(() => {
+    let isGettingMembers = true;
+    let isRoomChanged = false;
+    const updateMemberList = (event) => {
+      if (isGettingMembers) return;
+      if (event && event?.event?.room_id !== roomId) return;
+      setMemberList(
+        simplyfiMembers(
+          getMembersWithMembership(membership)
+            .sort(AtoZ).sort(sortByPowerLevel),
+        ),
+      );
+    };
+    searchRef.current.value = '';
+    updateMemberList();
     room.loadMembersIfNeeded().then(() => {
+      isGettingMembers = false;
       if (isRoomChanged) return;
-      const newTotalMemberList = room.getJoinedMembers().sort(AtoZ).sort(sortByPowerLevel);
+      updateMemberList();
-      updateMemberList(newTotalMemberList.slice(0, PER_PAGE_MEMBER));
     });
 
+    asyncSearch.on(asyncSearch.RESULT_SENT, handleSearchData);
+    mx.on('RoomMember.membership', updateMemberList);
     return () => {
       isRoomChanged = true;
+      setMemberList([]);
+      setSearchedMembers(null);
+      setItemCount(PER_PAGE_MEMBER);
+      asyncSearch.removeListener(asyncSearch.RESULT_SENT, handleSearchData);
+      mx.removeListener('RoomMember.membership', updateMemberList);
     };
+  }, [roomId, membership]);
+
+  useEffect(() => {
+    setMembership('join');
   }, [roomId]);
 
+  const mList = searchedMembers !== null ? searchedMembers.data : memberList.slice(0, itemCount);
   return (
     <div className="people-drawer">
       <Header>
@@ -84,21 +154,53 @@ function PeopleDrawer({ roomId }) {
         <div className="people-drawer__scrollable">
           <ScrollView autoHide>
             <div className="people-drawer__content">
+              <SegmentedControl
+                selected={
+                  (() => {
+                    const getSegmentIndex = {
+                      join: 0,
+                      invite: 1,
+                      ban: 2,
+                    };
+                    return getSegmentIndex[membership];
+                  })()
+                }
+                segments={[{ text: 'Joined' }, { text: 'Invited' }, { text: 'Banned' }]}
+                onSelect={(index) => {
+                  const selectSegment = [
+                    () => setMembership('join'),
+                    () => setMembership('invite'),
+                    () => setMembership('ban'),
+                  ];
+                  selectSegment[index]?.();
+                }}
+              />
               {
-                memberList.map((member) => (
+                mList.map((member) => (
                   <PeopleSelector
                     key={member.userId}
-                    onClick={() => alert('Viewing profile is yet to be implemented')}
+                    onClick={() => openProfileViewer(member.userId, roomId)}
-                    avatarSrc={member.getAvatarUrl(initMatrix.matrixClient.baseUrl, 24, 24, 'crop')}
+                    avatarSrc={member.avatarSrc}
-                    name={getUsernameOfRoomMember(member)}
+                    name={member.name}
                     color={colorMXID(member.userId)}
-                    peopleRole={getPowerLabel(member.powerLevel)}
+                    peopleRole={member.peopleRole}
                   />
                 ))
               }
+              {
+                (searchedMembers?.data.length === 0 || memberList.length === 0)
+                && (
+                  <div className="people-drawer__noresult">
+                    <Text variant="b2">No result found!</Text>
+                  </div>
+                )
+              }
               <div className="people-drawer__load-more">
                 {
-                  memberList.length !== totalMemberList.length && (
+                  mList.length !== 0
+                  && memberList.length > itemCount
+                  && searchedMembers === null
+                  && (
                     <Button onClick={loadMorePeople}>View more</Button>
                   )
                 }
@@ -108,7 +210,12 @@ function PeopleDrawer({ roomId }) {
         </div>
         <div className="people-drawer__sticky">
           <form onSubmit={(e) => e.preventDefault()} className="people-search">
-            <Input type="text" placeholder="Search" required />
+            <RawIcon size="small" src={SearchIC} />
+            <Input forwardRef={searchRef} type="text" onChange={handleSearch} placeholder="Search" required />
+            {
+              searchedMembers !== null
+              && <IconButton onClick={handleSearch} size="small" src={CrossIC} />
+            }
           </form>
         </div>
       </div>

src/app/organisms/room/PeopleDrawer.scss

@@ -35,19 +35,48 @@
     @extend .people-drawer-flexItem;
   }
 
-  &__sticky {
+  &__noresult {
-    display: none;
+    padding: var(--sp-extra-tight) var(--sp-normal);
+    text-align: center;
+  }
 
+  &__sticky {
     & .people-search {
-      min-height: 48px;
+      --search-input-height: 40px;
+      min-height: var(--search-input-height);
   
       margin: 0 var(--sp-normal);
 
       position: relative;
       bottom: var(--sp-normal);
+      display: flex;
+      align-items: center;
 
+      & > .ic-raw,
+      & > .ic-btn {
+        position: absolute;
+        z-index: 99;
+      }
+      & > .ic-raw {
+        left: var(--sp-tight);
+        [dir=rtl] & {
+          right: var(--sp-tight);
+          left: unset;
+        }
+      }
+      & > .ic-btn {
+        right: 2px;
+        [dir=rtl] & {
+          left: 2px;
+          right: unset;
+        }
+      }
+      & .input-container {
+        flex: 1;
+      }
       & .input {
-        height: 48px;
+        padding: 0 calc(var(--sp-loose) + var(--sp-normal));
+        height: var(--search-input-height);
       }
     }
   }
@@ -55,7 +84,21 @@
 
 .people-drawer__content {
   padding-top: var(--sp-extra-tight);
-  padding-bottom: calc( var(--sp-extra-tight) + var(--sp-normal));
+  padding-bottom: calc(2 * var(--sp-normal));
+  
+  & .segmented-controls {
+    display: flex;
+    margin-bottom: var(--sp-extra-tight);
+    margin-left: var(--sp-extra-tight);
+    [dir=rtl] & {
+      margin-left: unset;
+      margin-right: var(--sp-extra-tight);
+    }
+  }
+  & .segment-btn {
+    flex: 1;
+    padding: var(--sp-ultra-tight) 0;
+  }
 }
 .people-drawer__load-more {
   padding: var(--sp-normal);

src/app/organisms/room/Room.jsx

@@ -1,38 +1,50 @@
 import React, { useState, useEffect } from 'react';
 import './Room.scss';
 
+import initMatrix from '../../../client/initMatrix';
 import cons from '../../../client/state/cons';
 import navigation from '../../../client/state/navigation';
+import settings from '../../../client/state/settings';
+import RoomTimeline from '../../../client/state/RoomTimeline';
 
 import Welcome from '../welcome/Welcome';
 import RoomView from './RoomView';
 import PeopleDrawer from './PeopleDrawer';
 
 function Room() {
-  const [selectedRoomId, changeSelectedRoomId] = useState(null);
+  const [roomTimeline, setRoomTimeline] = useState(null);
-  const [isDrawerVisible, toggleDrawerVisiblity] = useState(navigation.isPeopleDrawerVisible);
+  const [eventId, setEventId] = useState(null);
-  useEffect(() => {
+  const [isDrawer, setIsDrawer] = useState(settings.isPeopleDrawer);
-    const handleRoomSelected = (roomId) => {
-      changeSelectedRoomId(roomId);
-    };
-    const handleDrawerToggling = (visiblity) => {
-      toggleDrawerVisiblity(visiblity);
-    };
-    navigation.on(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
-    navigation.on(cons.events.navigation.PEOPLE_DRAWER_TOGGLED, handleDrawerToggling);
 
+  const mx = initMatrix.matrixClient;
+  const handleRoomSelected = (rId, pRoomId, eId) => {
+    if (mx.getRoom(rId)) {
+      setRoomTimeline(new RoomTimeline(rId, initMatrix.notifications));
+      setEventId(eId);
+    } else {
+      // TODO: add ability to join room if roomId is invalid
+      setRoomTimeline(null);
+      setEventId(null);
+    }
+  };
+  const handleDrawerToggling = (visiblity) => setIsDrawer(visiblity);
+
+  useEffect(() => {
+    navigation.on(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    settings.on(cons.events.settings.PEOPLE_DRAWER_TOGGLED, handleDrawerToggling);
     return () => {
       navigation.removeListener(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
-      navigation.removeListener(cons.events.navigation.PEOPLE_DRAWER_TOGGLED, handleDrawerToggling);
+      settings.removeListener(cons.events.settings.PEOPLE_DRAWER_TOGGLED, handleDrawerToggling);
+      roomTimeline?.removeInternalListeners();
     };
   }, []);
 
-  if (selectedRoomId === null) return <Welcome />;
+  if (roomTimeline === null) return <Welcome />;
 
   return (
     <div className="room-container">
-      <RoomView roomId={selectedRoomId} />
+      <RoomView roomTimeline={roomTimeline} eventId={eventId} />
-      { isDrawerVisible && <PeopleDrawer roomId={selectedRoomId} />}
+      { isDrawer && <PeopleDrawer roomId={roomTimeline.roomId} />}
     </div>
   );
 }

src/app/organisms/room/RoomView.jsx

@@ -1,150 +1,58 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import './RoomView.scss';
 
 import EventEmitter from 'events';
 
-import RoomTimeline from '../../../client/state/RoomTimeline';
-
-import ScrollView from '../../atoms/scroll/ScrollView';
-
 import RoomViewHeader from './RoomViewHeader';
 import RoomViewContent from './RoomViewContent';
 import RoomViewFloating from './RoomViewFloating';
 import RoomViewInput from './RoomViewInput';
 import RoomViewCmdBar from './RoomViewCmdBar';
 
-import { scrollToBottom, isAtBottom, autoScrollToBottom } from './common';
-
 const viewEvent = new EventEmitter();
 
-let lastScrollTop = 0;
+function RoomView({ roomTimeline, eventId }) {
-let lastScrollHeight = 0;
+  // eslint-disable-next-line react/prop-types
-let isReachedBottom = true;
+  const { roomId } = roomTimeline;
-let isReachedTop = false;
-function RoomView({ roomId }) {
-  const [roomTimeline, updateRoomTimeline] = useState(null);
-  const timelineSVRef = useRef(null);
-
-  useEffect(() => {
-    roomTimeline?.removeInternalListeners();
-    updateRoomTimeline(new RoomTimeline(roomId));
-    isReachedBottom = true;
-    isReachedTop = false;
-  }, [roomId]);
-
-  const timelineScroll = {
-    reachBottom() {
-      scrollToBottom(timelineSVRef);
-    },
-    autoReachBottom() {
-      autoScrollToBottom(timelineSVRef);
-    },
-    tryRestoringScroll() {
-      const sv = timelineSVRef.current;
-      const { scrollHeight } = sv;
-
-      if (lastScrollHeight === scrollHeight) return;
-
-      if (lastScrollHeight < scrollHeight) {
-        sv.scrollTop = lastScrollTop + (scrollHeight - lastScrollHeight);
-      } else {
-        timelineScroll.reachBottom();
-      }
-    },
-    enableSmoothScroll() {
-      timelineSVRef.current.style.scrollBehavior = 'smooth';
-    },
-    disableSmoothScroll() {
-      timelineSVRef.current.style.scrollBehavior = 'auto';
-    },
-    isScrollable() {
-      const oHeight = timelineSVRef.current.offsetHeight;
-      const sHeight = timelineSVRef.current.scrollHeight;
-      if (sHeight > oHeight) return true;
-      return false;
-    },
-  };
-
-  function onTimelineScroll(e) {
-    const { scrollTop, scrollHeight, offsetHeight } = e.target;
-    const scrollBottom = scrollTop + offsetHeight;
-    lastScrollTop = scrollTop;
-    lastScrollHeight = scrollHeight;
-
-    const PLACEHOLDER_HEIGHT = 96;
-    const PLACEHOLDER_COUNT = 3;
-
-    const topPagKeyPoint = PLACEHOLDER_COUNT * PLACEHOLDER_HEIGHT;
-    const bottomPagKeyPoint = scrollHeight - (offsetHeight / 2);
-
-    if (!isReachedBottom && isAtBottom(timelineSVRef)) {
-      isReachedBottom = true;
-      viewEvent.emit('toggle-reached-bottom', true);
-    }
-    if (isReachedBottom && !isAtBottom(timelineSVRef)) {
-      isReachedBottom = false;
-      viewEvent.emit('toggle-reached-bottom', false);
-    }
-    // TOP of timeline
-    if (scrollTop < topPagKeyPoint && isReachedTop === false) {
-      isReachedTop = true;
-      viewEvent.emit('reached-top');
-      return;
-    }
-    isReachedTop = false;
-
-    // BOTTOM of timeline
-    if (scrollBottom > bottomPagKeyPoint) {
-      // TODO:
-    }
-  }
 
   return (
     <div className="room-view">
       <RoomViewHeader roomId={roomId} />
       <div className="room-view__content-wrapper">
         <div className="room-view__scrollable">
-          <ScrollView onScroll={onTimelineScroll} ref={timelineSVRef} autoHide>
+          <RoomViewContent
-            {roomTimeline !== null && (
+            eventId={eventId}
-              <RoomViewContent
+            roomTimeline={roomTimeline}
-                roomId={roomId}
+          />
-                roomTimeline={roomTimeline}
+          <RoomViewFloating
-                timelineScroll={timelineScroll}
+            roomId={roomId}
-                viewEvent={viewEvent}
+            roomTimeline={roomTimeline}
-              />
+          />
-            )}
+        </div>
-          </ScrollView>
+        <div className="room-view__sticky">
-          {roomTimeline !== null && (
+          <RoomViewInput
-            <RoomViewFloating
+            roomId={roomId}
-              roomId={roomId}
+            roomTimeline={roomTimeline}
-              roomTimeline={roomTimeline}
+            viewEvent={viewEvent}
-              timelineScroll={timelineScroll}
+          />
-              viewEvent={viewEvent}
+          <RoomViewCmdBar
-            />
+            roomId={roomId}
-          )}
+            roomTimeline={roomTimeline}
+            viewEvent={viewEvent}
+          />
         </div>
-        {roomTimeline !== null && (
-          <div className="room-view__sticky">
-            <RoomViewInput
-              roomId={roomId}
-              roomTimeline={roomTimeline}
-              timelineScroll={timelineScroll}
-              viewEvent={viewEvent}
-            />
-            <RoomViewCmdBar
-              roomId={roomId}
-              roomTimeline={roomTimeline}
-              viewEvent={viewEvent}
-            />
-          </div>
-        )}
       </div>
     </div>
   );
 }
+
+RoomView.defaultProps = {
+  eventId: null,
+};
 RoomView.propTypes = {
-  roomId: PropTypes.string.isRequired,
+  roomTimeline: PropTypes.shape({}).isRequired,
+  eventId: PropTypes.string,
 };
 
 export default RoomView;

src/app/organisms/room/RoomViewCmdBar.jsx

@@ -6,31 +6,19 @@ import parse from 'html-react-parser';
 import twemoji from 'twemoji';
 
 import initMatrix from '../../../client/initMatrix';
-import cons from '../../../client/state/cons';
 import { toggleMarkdown } from '../../../client/action/settings';
 import * as roomActions from '../../../client/action/room';
 import {
-  selectTab,
-  selectRoom,
   openCreateRoom,
   openPublicRooms,
   openInviteUser,
-  openReadReceipts,
 } from '../../../client/action/navigation';
 import { emojis } from '../emoji-board/emoji';
 import AsyncSearch from '../../../util/AsyncSearch';
 
 import Text from '../../atoms/text/Text';
-import Button from '../../atoms/button/Button';
-import IconButton from '../../atoms/button/IconButton';
-import ContextMenu, { MenuHeader } from '../../atoms/context-menu/ContextMenu';
 import ScrollView from '../../atoms/scroll/ScrollView';
-import SettingTile from '../../molecules/setting-tile/SettingTile';
+import FollowingMembers from '../../molecules/following-members/FollowingMembers';
-import TimelineChange from '../../molecules/message/TimelineChange';
-
-import CmdIC from '../../../../public/res/ic/outlined/cmd.svg';
-
-import { getUsersActionJsx } from './common';
 
 const commands = [{
   name: 'markdown',
@@ -61,128 +49,6 @@ const commands = [{
   exe: (roomId, searchTerm) => openInviteUser(roomId, searchTerm),
 }];
 
-function CmdHelp() {
-  return (
-    <ContextMenu
-      placement="top"
-      content={(
-        <>
-          <MenuHeader>General command</MenuHeader>
-          <Text variant="b2">/command_name</Text>
-          <MenuHeader>Go-to commands</MenuHeader>
-          <Text variant="b2">{'>*space_name'}</Text>
-          <Text variant="b2">{'>#room_name'}</Text>
-          <Text variant="b2">{'>@people_name'}</Text>
-          <MenuHeader>Autofill commands</MenuHeader>
-          <Text variant="b2">:emoji_name</Text>
-          <Text variant="b2">@name</Text>
-        </>
-      )}
-      render={(toggleMenu) => (
-        <IconButton
-          src={CmdIC}
-          size="extra-small"
-          onClick={toggleMenu}
-          tooltip="Commands"
-        />
-      )}
-    />
-  );
-}
-
-function ViewCmd() {
-  function renderAllCmds() {
-    return commands.map((command) => (
-      <SettingTile
-        key={command.name}
-        title={command.name}
-        content={(<Text variant="b3">{command.description}</Text>)}
-      />
-    ));
-  }
-  return (
-    <ContextMenu
-      maxWidth={250}
-      placement="top"
-      content={(
-        <>
-          <MenuHeader>General commands</MenuHeader>
-          {renderAllCmds()}
-        </>
-      )}
-      render={(toggleMenu) => (
-        <span>
-          <Button onClick={toggleMenu}><span className="text text-b3">View all</span></Button>
-        </span>
-      )}
-    />
-  );
-}
-
-function FollowingMembers({ roomId, roomTimeline, viewEvent }) {
-  const [followingMembers, setFollowingMembers] = useState([]);
-  const mx = initMatrix.matrixClient;
-
-  function handleOnMessageSent() {
-    setFollowingMembers([]);
-  }
-
-  function updateFollowingMembers() {
-    const room = mx.getRoom(roomId);
-    const { timeline } = room;
-    const userIds = room.getUsersReadUpTo(timeline[timeline.length - 1]);
-    const myUserId = mx.getUserId();
-    setFollowingMembers(userIds.filter((userId) => userId !== myUserId));
-  }
-
-  useEffect(() => updateFollowingMembers(), [roomId]);
-
-  useEffect(() => {
-    roomTimeline.on(cons.events.roomTimeline.READ_RECEIPT, updateFollowingMembers);
-    viewEvent.on('message_sent', handleOnMessageSent);
-    return () => {
-      roomTimeline.removeListener(cons.events.roomTimeline.READ_RECEIPT, updateFollowingMembers);
-      viewEvent.removeListener('message_sent', handleOnMessageSent);
-    };
-  }, [roomTimeline]);
-
-  const lastMEvent = roomTimeline.timeline[roomTimeline.timeline.length - 1];
-  return followingMembers.length !== 0 && (
-    <TimelineChange
-      variant="follow"
-      content={getUsersActionJsx(roomId, followingMembers, 'following the conversation.')}
-      time=""
-      onClick={() => openReadReceipts(roomId, lastMEvent.getId())}
-    />
-  );
-}
-
-FollowingMembers.propTypes = {
-  roomId: PropTypes.string.isRequired,
-  roomTimeline: PropTypes.shape({}).isRequired,
-  viewEvent: PropTypes.shape({}).isRequired,
-};
-
-function getCmdActivationMessage(prefix) {
-  function genMessage(prime, secondary) {
-    return (
-      <>
-        <span>{prime}</span>
-        <span>{secondary}</span>
-      </>
-    );
-  }
-  const cmd = {
-    '/': () => genMessage('General command mode activated. ', 'Type command name for suggestions.'),
-    '>*': () => genMessage('Go-to command mode activated. ', 'Type space name for suggestions.'),
-    '>#': () => genMessage('Go-to command mode activated. ', 'Type room name for suggestions.'),
-    '>@': () => genMessage('Go-to command mode activated. ', 'Type people name for suggestions.'),
-    ':': () => genMessage('Emoji autofill command mode activated. ', 'Type emoji shortcut for suggestions.'),
-    '@': () => genMessage('Name autofill command mode activated. ', 'Type name for suggestions.'),
-  };
-  return cmd[prefix]?.();
-}
-
 function CmdItem({ onClick, children }) {
   return (
     <button className="cmd-item" onClick={onClick} type="button">
@@ -195,8 +61,8 @@ CmdItem.propTypes = {
   children: PropTypes.node.isRequired,
 };
 
-function getCmdSuggestions({ prefix, option, suggestions }, fireCmd) {
+function renderSuggestions({ prefix, option, suggestions }, fireCmd) {
-  function getGenCmdSuggestions(cmdPrefix, cmds) {
+  function renderCmdSuggestions(cmdPrefix, cmds) {
     const cmdOptString = (typeof option === 'string') ? `/${option}` : '/?';
     return cmds.map((cmd) => (
       <CmdItem
@@ -214,23 +80,7 @@ function getCmdSuggestions({ prefix, option, suggestions }, fireCmd) {
     ));
   }
 
-  function getRoomsSuggestion(cmdPrefix, rooms) {
+  function renderEmojiSuggestion(emPrefix, emos) {
-    return rooms.map((room) => (
-      <CmdItem
-        key={room.roomId}
-        onClick={() => {
-          fireCmd({
-            prefix: cmdPrefix,
-            result: room,
-          });
-        }}
-      >
-        <Text variant="b2">{room.name}</Text>
-      </CmdItem>
-    ));
-  }
-
-  function getEmojiSuggestion(emPrefix, emos) {
     return emos.map((emoji) => (
       <CmdItem
         key={emoji.hexcode}
@@ -255,7 +105,7 @@ function getCmdSuggestions({ prefix, option, suggestions }, fireCmd) {
     ));
   }
 
-  function getNameSuggestion(namePrefix, members) {
+  function renderNameSuggestion(namePrefix, members) {
     return members.map((member) => (
       <CmdItem
         key={member.userId}
@@ -272,12 +122,9 @@ function getCmdSuggestions({ prefix, option, suggestions }, fireCmd) {
   }
 
   const cmd = {
-    '/': (cmds) => getGenCmdSuggestions(prefix, cmds),
+    '/': (cmds) => renderCmdSuggestions(prefix, cmds),
-    '>*': (spaces) => getRoomsSuggestion(prefix, spaces),
+    ':': (emos) => renderEmojiSuggestion(prefix, emos),
-    '>#': (rooms) => getRoomsSuggestion(prefix, rooms),
+    '@': (members) => renderNameSuggestion(prefix, members),
-    '>@': (peoples) => getRoomsSuggestion(prefix, peoples),
-    ':': (emos) => getEmojiSuggestion(prefix, emos),
-    '@': (members) => getNameSuggestion(prefix, members),
   };
   return cmd[prefix]?.(suggestions);
 }
@@ -319,35 +166,35 @@ function RoomViewCmdBar({ roomId, roomTimeline, viewEvent }) {
         else if (searchTerm.match(/^[-]?(\()$/)) searchTerm = 'pleading_face';
         else if (searchTerm.match(/^[-]?(\$)$/)) searchTerm = 'money';
         else if (searchTerm.match(/^(<3)$/)) searchTerm = 'heart';
+        else if (searchTerm.match(/^(c|ca|cat)$/)) searchTerm = '_cat';
       }
     }
 
     asyncSearch.search(searchTerm);
   }
   function activateCmd(prefix) {
-    setCmd({ prefix });
     cmdPrefix = prefix;
+    cmdPrefix = undefined;
 
-    const { roomList, matrixClient } = initMatrix;
+    const mx = initMatrix.matrixClient;
-    function getRooms(roomIds) {
-      return roomIds.map((rId) => {
-        const room = matrixClient.getRoom(rId);
-        return {
-          name: room.name,
-          roomId: room.roomId,
-        };
-      });
-    }
     const setupSearch = {
-      '/': () => asyncSearch.setup(commands, { keys: ['name'], isContain: true }),
+      '/': () => {
-      '>*': () => asyncSearch.setup(getRooms([...roomList.spaces]), { keys: ['name'], limit: 20 }),
+        asyncSearch.setup(commands, { keys: ['name'], isContain: true });
-      '>#': () => asyncSearch.setup(getRooms([...roomList.rooms]), { keys: ['name'], limit: 20 }),
+        setCmd({ prefix, suggestions: commands });
-      '>@': () => asyncSearch.setup(getRooms([...roomList.directs]), { keys: ['name'], limit: 20 }),
+      },
-      ':': () => asyncSearch.setup(emojis, { keys: ['shortcode'], limit: 20 }),
+      ':': () => {
-      '@': () => asyncSearch.setup(matrixClient.getRoom(roomId).getJoinedMembers().map((member) => ({
+        asyncSearch.setup(emojis, { keys: ['shortcode'], isContain: true, limit: 20 });
-        name: member.name,
+        setCmd({ prefix, suggestions: emojis.slice(26, 46) });
-        userId: member.userId.slice(1),
+      },
-      })), { keys: ['name', 'userId'], limit: 20 }),
+      '@': () => {
+        const members = mx.getRoom(roomId).getJoinedMembers().map((member) => ({
+          name: member.name,
+          userId: member.userId.slice(1),
+        }));
+        asyncSearch.setup(members, { keys: ['name', 'userId'], limit: 20 });
+        const endIndex = members.length > 20 ? 20 : members.length;
+        setCmd({ prefix, suggestions: members.slice(0, endIndex) });
+      },
     };
     setupSearch[prefix]?.();
   }
@@ -357,11 +204,6 @@ function RoomViewCmdBar({ roomId, roomTimeline, viewEvent }) {
     cmdPrefix = undefined;
   }
   function fireCmd(myCmd) {
-    if (myCmd.prefix.match(/^>[*#@]$/)) {
-      if (cmd.prefix === '>*') selectTab(myCmd.result.roomId);
-      else selectRoom(myCmd.result.roomId);
-      viewEvent.emit('cmd_fired');
-    }
     if (myCmd.prefix === '/') {
       myCmd.result.exe(roomId, myCmd.option);
       viewEvent.emit('cmd_fired');
@@ -378,14 +220,6 @@ function RoomViewCmdBar({ roomId, roomTimeline, viewEvent }) {
     }
     deactivateCmd();
   }
-  function executeCmd() {
-    if (cmd.suggestions.length === 0) return;
-    fireCmd({
-      prefix: cmd.prefix,
-      option: cmd.option,
-      result: cmd.suggestions[0],
-    });
-  }
 
   function listenKeyboard(event) {
     const { activeElement } = document;
@@ -416,26 +250,20 @@ function RoomViewCmdBar({ roomId, roomTimeline, viewEvent }) {
   useEffect(() => {
     if (cmd !== null) document.body.addEventListener('keydown', listenKeyboard);
     viewEvent.on('cmd_process', processCmd);
-    viewEvent.on('cmd_exe', executeCmd);
     asyncSearch.on(asyncSearch.RESULT_SENT, displaySuggestions);
     return () => {
       if (cmd !== null) document.body.removeEventListener('keydown', listenKeyboard);
 
       viewEvent.removeListener('cmd_process', processCmd);
-      viewEvent.removeListener('cmd_exe', executeCmd);
       asyncSearch.removeListener(asyncSearch.RESULT_SENT, displaySuggestions);
     };
   }, [cmd]);
 
-  if (typeof cmd?.error === 'string') {
+  const isError = typeof cmd?.error === 'string';
+  if (cmd === null || isError) {
     return (
       <div className="cmd-bar">
-        <div className="cmd-bar__info">
+        <FollowingMembers roomTimeline={roomTimeline} />
-          <div className="cmd-bar__info-indicator--error" />
-        </div>
-        <div className="cmd-bar__content">
-          <Text className="cmd-bar__content-error" variant="b2">{cmd.error}</Text>
-        </div>
       </div>
     );
   }
@@ -443,27 +271,14 @@ function RoomViewCmdBar({ roomId, roomTimeline, viewEvent }) {
   return (
     <div className="cmd-bar">
       <div className="cmd-bar__info">
-        {cmd === null && <CmdHelp />}
+        <Text variant="b3">TAB</Text>
-        {cmd !== null && typeof cmd.suggestions === 'undefined' && <div className="cmd-bar__info-indicator" /> }
-        {cmd !== null && typeof cmd.suggestions !== 'undefined' && <Text variant="b3">TAB</Text>}
       </div>
       <div className="cmd-bar__content">
-        {cmd === null && (
+        <ScrollView horizontal vertical={false} invisible>
-          <FollowingMembers
+          <div className="cmd-bar__content-suggestions">
-            roomId={roomId}
+            { renderSuggestions(cmd, fireCmd) }
-            roomTimeline={roomTimeline}
+          </div>
-            viewEvent={viewEvent}
+        </ScrollView>
-          />
-        )}
-        {cmd !== null && typeof cmd.suggestions === 'undefined' && <Text className="cmd-bar__content-help" variant="b2">{getCmdActivationMessage(cmd.prefix)}</Text>}
-        {cmd !== null && typeof cmd.suggestions !== 'undefined' && (
-          <ScrollView horizontal vertical={false} invisible>
-            <div className="cmd-bar__content__suggestions">{getCmdSuggestions(cmd, fireCmd)}</div>
-          </ScrollView>
-        )}
-      </div>
-      <div className="cmd-bar__more">
-        {cmd !== null && cmd.prefix === '/' && <ViewCmd />}
       </div>
     </div>
   );

src/app/organisms/room/RoomViewCmdBar.scss

@@ -11,37 +11,14 @@
 
   &__info {
     display: flex;
-    width: calc(2 * var(--sp-extra-loose));
+    width: 40px;
-    padding-left: var(--sp-ultra-tight);
+    margin: 0 10px 0 14px;
     [dir=rtl] & {
-      padding-left: 0;
+      margin: 0 14px 0 10px;
-      padding-right: var(--sp-ultra-tight);
     }
-
     & > * {
       margin: auto;
     }
-
-    & .ic-btn-surface {
-      padding: 0;
-      & .ic-raw {
-        background-color: var(--tc-surface-low);
-      }
-    }
-    & .context-menu .text-b2 {
-      margin: var(--sp-extra-tight) var(--sp-tight);
-    }
-
-    &-indicator,
-    &-indicator--error {
-      width: 8px;
-      height: 8px;
-      border-radius: 50%;
-      background-color: var(--bg-positive);
-    }
-    &-indicator--error {
-      background-color: var(--bg-danger);
-    }
   }
 
   &__content {
@@ -49,58 +26,14 @@
     flex: 1;
     display: flex;
 
-    &-help,
+    &-suggestions {
-    &-error {
-      @extend .overflow-ellipsis;
-      align-self: center;
-      span {
-        color: var(--tc-surface-low);
-        &:first-child {
-          color: var(--tc-surface-normal)
-        }
-      }
-    }
-    &-error {
-      color: var(--bg-danger);
-    }
-    &__suggestions {
-      display: flex;
       height: 100%;
       white-space: nowrap;
-    }
+      display: flex;
-  }
+      align-items: center;
-  &__more {
-    display: flex;
-    & button {
-      min-width: 0;
-      height: 100%;
-      margin: 0 var(--sp-normal);
-      padding: 0 var(--sp-extra-tight);
-      box-shadow: none;
-      border-radius: var(--bo-radius) var(--bo-radius) 0 0;
-      & .text {
-        color: var(--tc-surface-normal);
-      }
-    }
-    & .setting-tile {
-      margin: var(--sp-tight);
-    }
-  }
 
-  & .timeline-change {
-    width: 100%;
-    justify-content: flex-end;
-    padding: var(--sp-ultra-tight) var(--sp-normal);
-    border-radius: var(--bo-radius) var(--bo-radius) 0 0;
-
-    &__content {
-      margin: 0;
-      flex: unset;
       & > .text {
         @extend .overflow-ellipsis;
-        & b {
-          color: var(--tc-surface-normal);
-        }
       }
     }
   }

src/app/organisms/room/RoomViewContent.scss

@@ -9,5 +9,30 @@
     min-height: 0;
     min-width: 0;
     padding-bottom: var(--typing-noti-height);
+
+    & .message,
+    & .ph-msg,
+    & .timeline-change {
+      border-radius: 0 var(--bo-radius) var(--bo-radius) 0;
+      [dir=rtl] & {
+        border-radius: var(--bo-radius) 0 0 var(--bo-radius);
+      }
+    }
+    
+    & > .divider {
+      margin: var(--sp-extra-tight) var(--sp-normal);
+      margin-right: var(--sp-extra-tight);
+      padding-left: calc(var(--av-small) + var(--sp-tight));
+      [dir=rtl] & {
+        padding: {
+          left: 0;
+          right: calc(var(--av-small) + var(--sp-tight));
+        }
+        margin: {
+          left: var(--sp-extra-tight);
+          right: var(--sp-normal);
+        }
+      }
+    }
   }
 }

src/app/organisms/room/RoomViewFloating.jsx

@@ -7,63 +7,114 @@ import initMatrix from '../../../client/initMatrix';
 import cons from '../../../client/state/cons';
 
 import Text from '../../atoms/text/Text';
+import Button from '../../atoms/button/Button';
 import IconButton from '../../atoms/button/IconButton';
 
 import ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
+import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
 
 import { getUsersActionJsx } from './common';
 
-function RoomViewFloating({
+function useJumpToEvent(roomTimeline) {
-  roomId, roomTimeline, timelineScroll, viewEvent,
+  const [eventId, setEventId] = useState(null);
-}) {
+
-  const [reachedBottom, setReachedBottom] = useState(true);
+  const jumpToEvent = () => {
+    roomTimeline.loadEventTimeline(eventId);
+  };
+
+  const cancelJumpToEvent = () => {
+    roomTimeline.markAllAsRead();
+    setEventId(null);
+  };
+
+  useEffect(() => {
+    const readEventId = roomTimeline.getReadUpToEventId();
+    // we only show "Jump to unread" btn only if the event is not in timeline.
+    // if event is in timeline
+    // we will automatically open the timeline from that event position
+    if (!readEventId?.startsWith('~') && !roomTimeline.hasEventInTimeline(readEventId)) {
+      setEventId(readEventId);
+    }
+
+    const handleMarkAsRead = () => setEventId(null);
+    roomTimeline.on(cons.events.roomTimeline.MARKED_AS_READ, handleMarkAsRead);
+
+    return () => {
+      roomTimeline.removeListener(cons.events.roomTimeline.MARKED_AS_READ, handleMarkAsRead);
+      setEventId(null);
+    };
+  }, [roomTimeline]);
+
+  return [!!eventId, jumpToEvent, cancelJumpToEvent];
+}
+
+function useTypingMembers(roomTimeline) {
   const [typingMembers, setTypingMembers] = useState(new Set());
-  const mx = initMatrix.matrixClient;
 
-  function isSomeoneTyping(members) {
+  const updateTyping = (members) => {
-    const m = members;
+    const mx = initMatrix.matrixClient;
-    m.delete(mx.getUserId());
+    members.delete(mx.getUserId());
-    if (m.size === 0) return false;
-    return true;
-  }
-
-  function getTypingMessage(members) {
-    const userIds = members;
-    userIds.delete(mx.getUserId());
-    return getUsersActionJsx(roomId, [...userIds], 'typing...');
-  }
-
-  function updateTyping(members) {
     setTypingMembers(members);
-  }
+  };
 
   useEffect(() => {
-    setReachedBottom(true);
     setTypingMembers(new Set());
-    viewEvent.on('toggle-reached-bottom', setReachedBottom);
-    return () => viewEvent.removeListener('toggle-reached-bottom', setReachedBottom);
-  }, [roomId]);
-
-  useEffect(() => {
     roomTimeline.on(cons.events.roomTimeline.TYPING_MEMBERS_UPDATED, updateTyping);
     return () => {
       roomTimeline?.removeListener(cons.events.roomTimeline.TYPING_MEMBERS_UPDATED, updateTyping);
     };
   }, [roomTimeline]);
 
+  return [typingMembers];
+}
+
+function useScrollToBottom(roomTimeline) {
+  const [isAtBottom, setIsAtBottom] = useState(true);
+  const handleAtBottom = (atBottom) => setIsAtBottom(atBottom);
+
+  useEffect(() => {
+    setIsAtBottom(true);
+    roomTimeline.on(cons.events.roomTimeline.AT_BOTTOM, handleAtBottom);
+    return () => roomTimeline.removeListener(cons.events.roomTimeline.AT_BOTTOM, handleAtBottom);
+  }, [roomTimeline]);
+
+  return [isAtBottom, setIsAtBottom];
+}
+
+function RoomViewFloating({
+  roomId, roomTimeline,
+}) {
+  const [isJumpToEvent, jumpToEvent, cancelJumpToEvent] = useJumpToEvent(roomTimeline);
+  const [typingMembers] = useTypingMembers(roomTimeline);
+  const [isAtBottom, setIsAtBottom] = useScrollToBottom(roomTimeline);
+
+  const handleScrollToBottom = () => {
+    roomTimeline.emit(cons.events.roomTimeline.SCROLL_TO_LIVE);
+    setIsAtBottom(true);
+  };
+
   return (
     <>
-      <div className={`room-view__typing${isSomeoneTyping(typingMembers) ? ' room-view__typing--open' : ''}`}>
+      <div className={`room-view__unread ${isJumpToEvent ? 'room-view__unread--open' : ''}`}>
-        <div className="bouncing-loader"><div /></div>
+        <Button onClick={jumpToEvent} variant="primary">
-        <Text variant="b2">{getTypingMessage(typingMembers)}</Text>
+          <Text variant="b2">Jump to unread</Text>
-      </div>
+        </Button>
-      <div className={`room-view__STB${reachedBottom ? '' : ' room-view__STB--open'}`}>
         <IconButton
-          onClick={() => {
+          onClick={cancelJumpToEvent}
-            timelineScroll.enableSmoothScroll();
+          variant="primary"
-            timelineScroll.reachBottom();
+          size="extra-small"
-            timelineScroll.disableSmoothScroll();
+          src={TickMarkIC}
-          }}
+          tooltipPlacement="bottom"
+          tooltip="Mark as read"
+        />
+      </div>
+      <div className={`room-view__typing${typingMembers.size > 0 ? ' room-view__typing--open' : ''}`}>
+        <div className="bouncing-loader"><div /></div>
+        <Text variant="b2">{getUsersActionJsx(roomId, [...typingMembers], 'typing...')}</Text>
+      </div>
+      <div className={`room-view__STB${isAtBottom ? '' : ' room-view__STB--open'}`}>
+        <IconButton
+          onClick={handleScrollToBottom}
           src={ChevronBottomIC}
           tooltip="Scroll to Bottom"
         />
@@ -74,10 +125,6 @@ function RoomViewFloating({
 RoomViewFloating.propTypes = {
   roomId: PropTypes.string.isRequired,
   roomTimeline: PropTypes.shape({}).isRequired,
-  timelineScroll: PropTypes.shape({
-    reachBottom: PropTypes.func,
-  }).isRequired,
-  viewEvent: PropTypes.shape({}).isRequired,
 };
 
 export default RoomViewFloating;

src/app/organisms/room/RoomViewFloating.scss

@@ -88,4 +88,35 @@
       transform: translateY(-28px) scale(1);
     }
   }
+
+  &__unread {
+    position: absolute;
+    top: var(--sp-extra-tight);
+    right: var(--sp-extra-tight);
+    z-index: 999;
+
+    display: none;
+    background-color: var(--bg-surface);
+    border-radius: var(--bo-radius);
+    box-shadow: var(--bs-primary-border);
+    overflow: hidden;
+
+    &--open {
+      display: flex;
+    }
+    
+    & .ic-btn {
+      padding: 6px var(--sp-extra-tight);
+      border-radius: 0;
+    }
+    & .btn-primary {
+      flex: 1;
+      min-width: 0;
+      border-radius: 0;
+      padding: 0 var(--sp-tight);
+      &:focus {
+        background-color: var(--bg-primary-hover);
+      }
+    }
+  }
 }

src/app/organisms/room/RoomViewHeader.jsx

@@ -1,8 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import { twemojify } from '../../../util/twemojify';
+
 import initMatrix from '../../../client/initMatrix';
-import { togglePeopleDrawer, openRoomOptions } from '../../../client/action/navigation';
+import { openRoomOptions } from '../../../client/action/navigation';
+import { togglePeopleDrawer } from '../../../client/action/settings';
 import colorMXID from '../../../util/colorMXID';
 import { getEventCords } from '../../../util/common';
 
@@ -24,10 +27,10 @@ function RoomViewHeader({ roomId }) {
 
   return (
     <Header>
-      <Avatar imageSrc={avatarSrc} text={roomName.slice(0, 1)} bgColor={colorMXID(roomId)} size="small" />
+      <Avatar imageSrc={avatarSrc} text={roomName} bgColor={colorMXID(roomId)} size="small" />
       <TitleWrapper>
-        <Text variant="h2">{roomName}</Text>
+        <Text variant="h2">{twemojify(roomName)}</Text>
-        { typeof roomTopic !== 'undefined' && <p title={roomTopic} className="text text-b3">{roomTopic}</p>}
+        { typeof roomTopic !== 'undefined' && <p title={roomTopic} className="text text-b3">{twemojify(roomTopic)}</p>}
       </TitleWrapper>
       <IconButton onClick={togglePeopleDrawer} tooltip="People" src={UserIC} />
       <IconButton

src/app/organisms/room/RoomViewInput.jsx

@@ -9,6 +9,7 @@ import initMatrix from '../../../client/initMatrix';
 import cons from '../../../client/state/cons';
 import settings from '../../../client/state/settings';
 import { openEmojiBoard } from '../../../client/action/navigation';
+import navigation from '../../../client/state/navigation';
 import { bytesToSize, getEventCords } from '../../../util/common';
 import { getUsername } from '../../../util/matrixUtil';
 import colorMXID from '../../../util/colorMXID';
@@ -29,12 +30,12 @@ import MarkdownIC from '../../../../public/res/ic/outlined/markdown.svg';
 import FileIC from '../../../../public/res/ic/outlined/file.svg';
 import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
 
-const CMD_REGEX = /(\/|>[#*@]|:|@)(\S*)$/;
+const CMD_REGEX = /(^\/|:|@)(\S*)$/;
 let isTyping = false;
 let isCmdActivated = false;
 let cmdCursorPos = null;
 function RoomViewInput({
-  roomId, roomTimeline, timelineScroll, viewEvent,
+  roomId, roomTimeline, viewEvent,
 }) {
   const [attachment, setAttachment] = useState(null);
   const [isMarkdown, setIsMarkdown] = useState(settings.isMarkdown);
@@ -45,7 +46,6 @@ function RoomViewInput({
   const uploadInputRef = useRef(null);
   const uploadProgressRef = useRef(null);
   const rightOptionsRef = useRef(null);
-  const escBtnRef = useRef(null);
 
   const TYPING_TIMEOUT = 5000;
   const mx = initMatrix.matrixClient;
@@ -92,39 +92,24 @@ function RoomViewInput({
   function rightOptionsA11Y(A11Y) {
     const rightOptions = rightOptionsRef.current.children;
     for (let index = 0; index < rightOptions.length; index += 1) {
-      rightOptions[index].disabled = !A11Y;
+      rightOptions[index].tabIndex = A11Y ? 0 : -1;
     }
   }
 
   function activateCmd(prefix) {
     isCmdActivated = true;
-    requestAnimationFrame(() => {
-      inputBaseRef.current.style.boxShadow = '0 0 0 1px var(--bg-positive)';
-      escBtnRef.current.style.display = 'block';
-    });
     rightOptionsA11Y(false);
     viewEvent.emit('cmd_activate', prefix);
   }
   function deactivateCmd() {
-    if (inputBaseRef.current !== null) {
-      requestAnimationFrame(() => {
-        inputBaseRef.current.style.boxShadow = 'var(--bs-surface-border)';
-        escBtnRef.current.style.display = 'none';
-      });
-      rightOptionsA11Y(true);
-    }
     isCmdActivated = false;
     cmdCursorPos = null;
+    rightOptionsA11Y(true);
   }
   function deactivateCmdAndEmit() {
     deactivateCmd();
     viewEvent.emit('cmd_deactivate');
   }
-  function errorCmd() {
-    requestAnimationFrame(() => {
-      inputBaseRef.current.style.boxShadow = '0 0 0 1px var(--bg-danger)';
-    });
-  }
   function setCursorPosition(pos) {
     setTimeout(() => {
       textAreaRef.current.focus();
@@ -152,9 +137,9 @@ function RoomViewInput({
     textAreaRef.current.focus();
   }
 
-  function setUpReply(userId, eventId, content) {
+  function setUpReply(userId, eventId, body) {
-    setReplyTo({ userId, eventId, content });
+    setReplyTo({ userId, eventId, body });
-    roomsInput.setReplyTo(roomId, { userId, eventId, content });
+    roomsInput.setReplyTo(roomId, { userId, eventId, body });
     focusInput();
   }
 
@@ -162,9 +147,8 @@ function RoomViewInput({
     roomsInput.on(cons.events.roomsInput.UPLOAD_PROGRESS_CHANGES, uploadingProgress);
     roomsInput.on(cons.events.roomsInput.ATTACHMENT_CANCELED, clearAttachment);
     roomsInput.on(cons.events.roomsInput.FILE_UPLOADED, clearAttachment);
-    viewEvent.on('cmd_error', errorCmd);
     viewEvent.on('cmd_fired', firedCmd);
-    viewEvent.on('reply_to', setUpReply);
+    navigation.on(cons.events.navigation.REPLY_TO_CLICKED, setUpReply);
     if (textAreaRef?.current !== null) {
       isTyping = false;
       focusInput();
@@ -176,13 +160,13 @@ function RoomViewInput({
       roomsInput.removeListener(cons.events.roomsInput.UPLOAD_PROGRESS_CHANGES, uploadingProgress);
       roomsInput.removeListener(cons.events.roomsInput.ATTACHMENT_CANCELED, clearAttachment);
       roomsInput.removeListener(cons.events.roomsInput.FILE_UPLOADED, clearAttachment);
-      viewEvent.removeListener('cmd_error', errorCmd);
       viewEvent.removeListener('cmd_fired', firedCmd);
-      viewEvent.removeListener('reply_to', setUpReply);
+      navigation.removeListener(cons.events.navigation.REPLY_TO_CLICKED, setUpReply);
       if (isCmdActivated) deactivateCmd();
       if (textAreaRef?.current === null) return;
 
       const msg = textAreaRef.current.value;
+      textAreaRef.current.style.height = 'unset';
       inputBaseRef.current.style.backgroundImage = 'unset';
       if (msg.trim() === '') {
         roomsInput.setMessage(roomId, '');
@@ -192,7 +176,8 @@ function RoomViewInput({
     };
   }, [roomId]);
 
-  async function sendMessage() {
+  const sendMessage = async () => {
+    requestAnimationFrame(() => deactivateCmdAndEmit());
     const msgBody = textAreaRef.current.value;
     if (roomsInput.isSending(roomId)) return;
     if (msgBody.trim() === '' && attachment === null) return;
@@ -210,11 +195,10 @@ function RoomViewInput({
     focusInput();
 
     textAreaRef.current.value = roomsInput.getMessage(roomId);
-    timelineScroll.reachBottom();
     viewEvent.emit('message_sent');
     textAreaRef.current.style.height = 'unset';
     if (replyTo !== null) setReplyTo(null);
-  }
+  };
 
   function processTyping(msg) {
     const isEmptyMsg = msg === '';
@@ -259,33 +243,23 @@ function RoomViewInput({
       return;
     }
     if (!isCmdActivated) activateCmd(cmdPrefix);
-    requestAnimationFrame(() => {
-      inputBaseRef.current.style.boxShadow = '0 0 0 1px var(--bg-caution)';
-    });
     viewEvent.emit('cmd_process', cmdPrefix, cmdSlug);
   }
 
-  function handleMsgTyping(e) {
+  const handleMsgTyping = (e) => {
     const msg = e.target.value;
     recognizeCmd(e.target.value);
     if (!isCmdActivated) processTyping(msg);
-  }
+  };
 
-  function handleKeyDown(e) {
+  const handleKeyDown = (e) => {
     if (e.keyCode === 13 && e.shiftKey === false) {
       e.preventDefault();
-
+      sendMessage();
-      if (isCmdActivated) {
-        viewEvent.emit('cmd_exe');
-      } else sendMessage();
     }
-    if (e.keyCode === 27 && isCmdActivated) {
+  };
-      deactivateCmdAndEmit();
-      e.preventDefault();
-    }
-  }
 
-  function handlePaste(e) {
+  const handlePaste = (e) => {
     if (e.clipboardData === false) {
       return;
     }
@@ -309,25 +283,33 @@ function RoomViewInput({
         }
       }
     }
-  }
+  };
 
   function addEmoji(emoji) {
     textAreaRef.current.value += emoji.unicode;
+    textAreaRef.current.focus();
   }
 
-  function handleUploadClick() {
+  const handleUploadClick = () => {
     if (attachment === null) uploadInputRef.current.click();
     else {
       roomsInput.cancelAttachment(roomId);
     }
-  }
+  };
   function uploadFileChange(e) {
     const file = e.target.files.item(0);
     setAttachment(file);
     if (file !== null) roomsInput.setAttachment(roomId, file);
   }
 
+  const canISend = roomTimeline.room.currentState.maySendMessage(mx.getUserId());
+
   function renderInputs() {
+    if (!canISend) {
+      return (
+        <Text className="room-input__alert">You do not have permission to post to this room</Text>
+      );
+    }
     return (
       <>
         <div className={`room-input__option-container${attachment === null ? '' : ' room-attachment__option'}`}>
@@ -335,21 +317,20 @@ function RoomViewInput({
           <IconButton onClick={handleUploadClick} tooltip={attachment === null ? 'Upload' : 'Cancel'} src={CirclePlusIC} />
         </div>
         <div ref={inputBaseRef} className="room-input__input-container">
-          {roomTimeline.isEncryptedRoom() && <RawIcon size="extra-small" src={ShieldIC} />}
+          {roomTimeline.isEncrypted() && <RawIcon size="extra-small" src={ShieldIC} />}
           <ScrollView autoHide>
             <Text className="room-input__textarea-wrapper">
               <TextareaAutosize
+                id="message-textarea"
                 ref={textAreaRef}
                 onChange={handleMsgTyping}
                 onPaste={handlePaste}
-                onResize={() => timelineScroll.autoReachBottom()}
                 onKeyDown={handleKeyDown}
                 placeholder="Send a message..."
               />
             </Text>
           </ScrollView>
           {isMarkdown && <RawIcon size="extra-small" src={MarkdownIC} />}
-          <button ref={escBtnRef} tabIndex="-1" onClick={deactivateCmdAndEmit} className="btn-cmd-esc" type="button"><Text variant="b3">ESC</Text></button>
         </div>
         <div ref={rightOptionsRef} className="room-input__option-container">
           <IconButton
@@ -402,7 +383,7 @@ function RoomViewInput({
           userId={replyTo.userId}
           name={getUsername(replyTo.userId)}
           color={colorMXID(replyTo.userId)}
-          content={replyTo.content}
+          body={replyTo.body}
         />
       </div>
     );
@@ -414,9 +395,7 @@ function RoomViewInput({
       { attachment !== null && attachFile() }
       <form className="room-input" onSubmit={(e) => { e.preventDefault(); }}>
         {
-          roomTimeline.room.isSpaceRoom()
+          renderInputs()
-            ? <Text className="room-input__space" variant="b1">Spaces are yet to be implemented</Text>
-            : renderInputs()
         }
       </form>
     </>
@@ -425,13 +404,6 @@ function RoomViewInput({
 RoomViewInput.propTypes = {
   roomId: PropTypes.string.isRequired,
   roomTimeline: PropTypes.shape({}).isRequired,
-  timelineScroll: PropTypes.shape({
-    reachBottom: PropTypes.func,
-    autoReachBottom: PropTypes.func,
-    tryRestoringScroll: PropTypes.func,
-    enableSmoothScroll: PropTypes.func,
-    disableSmoothScroll: PropTypes.func,
-  }).isRequired,
   viewEvent: PropTypes.shape({}).isRequired,
 };
 

src/app/organisms/room/RoomViewInput.scss

@@ -1,13 +1,12 @@
 .room-input {
   padding: var(--sp-extra-tight) calc(var(--sp-normal) - 2px);
   display: flex;
-  min-height: 48px;
+  min-height: 56px;
 
-  &__space {
+  &__alert {
-    min-width: 0;
-    align-self: center;
     margin: auto;
     padding: 0 var(--sp-tight);
+    text-align: center;
   }
 
   &__input-container {
@@ -25,17 +24,6 @@
       transform: scale(0.8);
       margin: 0 var(--sp-extra-tight);
     }
-
-    & .btn-cmd-esc {
-      display: none;
-      margin: 0 var(--sp-extra-tight);
-      padding: var(--sp-ultra-tight) var(--sp-extra-tight);
-      background-color: var(--bg-surface);
-      border-radius: calc(var(--bo-radius) / 2);
-      box-shadow: var(--bs-surface-border);
-      cursor: pointer;
-      & .text { color: var(--tc-surface-normal); }
-    }
  
     & .scrollbar {
       max-height: 50vh;

src/app/organisms/room/common.jsx

@@ -1,5 +1,7 @@
 import React from 'react';
 
+import { twemojify } from '../../../util/twemojify';
+
 import initMatrix from '../../../client/initMatrix';
 import { getUsername, getUsernameOfRoomMember } from '../../../util/matrixUtil';
 
@@ -8,7 +10,7 @@ function getTimelineJSXMessages() {
     join(user) {
       return (
         <>
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {' joined the room'}
         </>
       );
@@ -17,27 +19,27 @@ function getTimelineJSXMessages() {
       const reasonMsg = (typeof reason === 'string') ? `: ${reason}` : '';
       return (
         <>
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {' left the room'}
-          {reasonMsg}
+          {twemojify(reasonMsg)}
         </>
       );
     },
     invite(inviter, user) {
       return (
         <>
-          <b>{inviter}</b>
+          <b>{twemojify(inviter)}</b>
           {' invited '}
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
         </>
       );
     },
     cancelInvite(inviter, user) {
       return (
         <>
-          <b>{inviter}</b>
+          <b>{twemojify(inviter)}</b>
           {' canceled '}
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {'\'s invite'}
         </>
       );
@@ -45,7 +47,7 @@ function getTimelineJSXMessages() {
     rejectInvite(user) {
       return (
         <>
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {' rejected the invitation'}
         </>
       );
@@ -54,10 +56,10 @@ function getTimelineJSXMessages() {
       const reasonMsg = (typeof reason === 'string') ? `: ${reason}` : '';
       return (
         <>
-          <b>{actor}</b>
+          <b>{twemojify(actor)}</b>
           {' kicked '}
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
-          {reasonMsg}
+          {twemojify(reasonMsg)}
         </>
       );
     },
@@ -65,26 +67,26 @@ function getTimelineJSXMessages() {
       const reasonMsg = (typeof reason === 'string') ? `: ${reason}` : '';
       return (
         <>
-          <b>{actor}</b>
+          <b>{twemojify(actor)}</b>
           {' banned '}
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
-          {reasonMsg}
+          {twemojify(reasonMsg)}
         </>
       );
     },
     unban(actor, user) {
       return (
         <>
-          <b>{actor}</b>
+          <b>{twemojify(actor)}</b>
           {' unbanned '}
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
         </>
       );
     },
     avatarSets(user) {
       return (
         <>
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {' set the avatar'}
         </>
       );
@@ -92,7 +94,7 @@ function getTimelineJSXMessages() {
     avatarChanged(user) {
       return (
         <>
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {' changed the avatar'}
         </>
       );
@@ -100,7 +102,7 @@ function getTimelineJSXMessages() {
     avatarRemoved(user) {
       return (
         <>
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {' removed the avatar'}
         </>
       );
@@ -108,27 +110,27 @@ function getTimelineJSXMessages() {
     nameSets(user, newName) {
       return (
         <>
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {' set the display name to '}
-          <b>{newName}</b>
+          <b>{twemojify(newName)}</b>
         </>
       );
     },
     nameChanged(user, newName) {
       return (
         <>
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {' changed the display name to '}
-          <b>{newName}</b>
+          <b>{twemojify(newName)}</b>
         </>
       );
     },
     nameRemoved(user, lastName) {
       return (
         <>
-          <b>{user}</b>
+          <b>{twemojify(user)}</b>
           {' removed the display name '}
-          <b>{lastName}</b>
+          <b>{twemojify(lastName)}</b>
         </>
       );
     },
@@ -141,7 +143,7 @@ function getUsersActionJsx(roomId, userIds, actionStr) {
     if (room?.getMember(userId)) return getUsernameOfRoomMember(room.getMember(userId));
     return getUsername(userId);
   };
-  const getUserJSX = (userId) => <b>{getUserDisplayName(userId)}</b>;
+  const getUserJSX = (userId) => <b>{twemojify(getUserDisplayName(userId))}</b>;
   if (!Array.isArray(userIds)) return 'Idle';
   if (userIds.length === 0) return 'Idle';
   const MAX_VISIBLE_COUNT = 3;
@@ -165,27 +167,6 @@ function getUsersActionJsx(roomId, userIds, actionStr) {
   return <>{u1Jsx}, {u2Jsx}, {u3Jsx} and {othersCount} other are {actionStr}</>;
 }
 
-function parseReply(rawContent) {
-  if (rawContent.indexOf('>') !== 0) return null;
-  let content = rawContent.slice(rawContent.indexOf('<') + 1);
-  const user = content.slice(0, content.indexOf('>'));
-
-  content = content.slice(content.indexOf('>') + 2);
-  const replyContent = content.slice(0, content.indexOf('\n\n'));
-  content = content.slice(content.indexOf('\n\n') + 2);
-
-  if (user === '') return null;
-
-  const isUserId = user.match(/^@.+:.+/);
-
-  return {
-    userId: isUserId ? user : null,
-    displayName: isUserId ? null : user,
-    replyContent,
-    content,
-  };
-}
-
 function parseTimelineChange(mEvent) {
   const tJSXMsgs = getTimelineJSXMessages();
   const makeReturnObj = (variant, content) => ({
@@ -234,39 +215,8 @@ function parseTimelineChange(mEvent) {
   }
 }
 
-function scrollToBottom(ref) {
-  const maxScrollTop = ref.current.scrollHeight - ref.current.offsetHeight;
-  // eslint-disable-next-line no-param-reassign
-  ref.current.scrollTop = maxScrollTop;
-}
-
-function isAtBottom(ref) {
-  const { scrollHeight, scrollTop, offsetHeight } = ref.current;
-  const scrollUptoBottom = scrollTop + offsetHeight;
-
-  // scroll view have to div inside div which contains messages
-  const lastMessage = ref.current.lastElementChild.lastElementChild.lastElementChild;
-  const lastChildHeight = lastMessage.offsetHeight;
-
-  // auto scroll to bottom even if user has EXTRA_SPACE left to scroll
-  const EXTRA_SPACE = 48;
-
-  if (scrollHeight - scrollUptoBottom <= lastChildHeight + EXTRA_SPACE) {
-    return true;
-  }
-  return false;
-}
-
-function autoScrollToBottom(ref) {
-  if (isAtBottom(ref)) scrollToBottom(ref);
-}
-
 export {
   getTimelineJSXMessages,
   getUsersActionJsx,
-  parseReply,
   parseTimelineChange,
-  scrollToBottom,
-  isAtBottom,
-  autoScrollToBottom,
 };

src/app/organisms/search/Search.jsx

@@ -0,0 +1,239 @@
+import React, { useState, useEffect, useRef } from 'react';
+import './Search.scss';
+
+import initMatrix from '../../../client/initMatrix';
+import cons from '../../../client/state/cons';
+import navigation from '../../../client/state/navigation';
+import AsyncSearch from '../../../util/AsyncSearch';
+import { selectRoom, selectTab } from '../../../client/action/navigation';
+
+import Text from '../../atoms/text/Text';
+import RawIcon from '../../atoms/system-icons/RawIcon';
+import IconButton from '../../atoms/button/IconButton';
+import Input from '../../atoms/input/Input';
+import RawModal from '../../atoms/modal/RawModal';
+import ScrollView from '../../atoms/scroll/ScrollView';
+import RoomSelector from '../../molecules/room-selector/RoomSelector';
+
+import SearchIC from '../../../../public/res/ic/outlined/search.svg';
+import HashIC from '../../../../public/res/ic/outlined/hash.svg';
+import HashLockIC from '../../../../public/res/ic/outlined/hash-lock.svg';
+import SpaceIC from '../../../../public/res/ic/outlined/space.svg';
+import SpaceLockIC from '../../../../public/res/ic/outlined/space-lock.svg';
+import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
+
+function useVisiblityToggle(setResult) {
+  const [isOpen, setIsOpen] = useState(false);
+
+  useEffect(() => {
+    const handleSearchOpen = (term) => {
+      setResult({
+        term,
+        chunk: [],
+      });
+      setIsOpen(true);
+    };
+    navigation.on(cons.events.navigation.SEARCH_OPENED, handleSearchOpen);
+    return () => {
+      navigation.removeListener(cons.events.navigation.SEARCH_OPENED, handleSearchOpen);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (isOpen === false) {
+      setResult(undefined);
+    }
+  }, [isOpen]);
+
+  const requestClose = () => setIsOpen(false);
+
+  return [isOpen, requestClose];
+}
+
+function mapRoomIds(roomIds, type) {
+  const mx = initMatrix.matrixClient;
+  const { directs, roomIdToParents } = initMatrix.roomList;
+
+  return roomIds.map((roomId) => {
+    let roomType = type;
+
+    if (!roomType) {
+      roomType = directs.has(roomId) ? 'direct' : 'room';
+    }
+
+    const room = mx.getRoom(roomId);
+    const parentSet = roomIdToParents.get(roomId);
+    const parentNames = parentSet
+      ? [...parentSet].map((parentId) => mx.getRoom(parentId).name)
+      : undefined;
+
+    const parents = parentNames ? parentNames.join(', ') : null;
+
+    return ({
+      type: roomType,
+      name: room.name,
+      parents,
+      roomId,
+      room,
+    });
+  });
+}
+
+function Search() {
+  const [result, setResult] = useState(null);
+  const [asyncSearch] = useState(new AsyncSearch());
+  const [isOpen, requestClose] = useVisiblityToggle(setResult);
+  const searchRef = useRef(null);
+  const mx = initMatrix.matrixClient;
+
+  const handleSearchResults = (chunk, term) => {
+    setResult({
+      term,
+      chunk,
+    });
+  };
+
+  const generateResults = (term) => {
+    const prefix = term.match(/^[#@*]/)?.[0];
+
+    if (term.length === 1) {
+      const { roomList } = initMatrix;
+      const spaces = mapRoomIds([...roomList.spaces], 'space').reverse();
+      const rooms = mapRoomIds([...roomList.rooms], 'room').reverse();
+      const directs = mapRoomIds([...roomList.directs], 'direct').reverse();
+
+      if (prefix === '*') {
+        asyncSearch.setup(spaces, { keys: 'name', isContain: true, limit: 20 });
+        handleSearchResults(spaces, '*');
+      } else if (prefix === '#') {
+        asyncSearch.setup(rooms, { keys: 'name', isContain: true, limit: 20 });
+        handleSearchResults(rooms, '#');
+      } else if (prefix === '@') {
+        asyncSearch.setup(directs, { keys: 'name', isContain: true, limit: 20 });
+        handleSearchResults(directs, '@');
+      } else {
+        const dataList = spaces.concat(rooms, directs);
+        asyncSearch.setup(dataList, { keys: 'name', isContain: true, limit: 20 });
+        asyncSearch.search(term);
+      }
+    } else {
+      asyncSearch.search(prefix ? term.slice(1) : term);
+    }
+  };
+
+  const loadRecentRooms = () => {
+    const { recentRooms } = navigation;
+    handleSearchResults(mapRoomIds(recentRooms).reverse(), '');
+  };
+
+  const handleAfterOpen = () => {
+    searchRef.current.focus();
+    loadRecentRooms();
+    asyncSearch.on(asyncSearch.RESULT_SENT, handleSearchResults);
+
+    if (typeof result.term === 'string') {
+      generateResults(result.term);
+      searchRef.current.value = result.term;
+    }
+  };
+
+  const handleAfterClose = () => {
+    asyncSearch.removeListener(asyncSearch.RESULT_SENT, handleSearchResults);
+  };
+
+  const handleOnChange = () => {
+    const { value } = searchRef.current;
+    if (value.length === 0) {
+      loadRecentRooms();
+      return;
+    }
+    generateResults(value);
+  };
+
+  const handleCross = (e) => {
+    e.preventDefault();
+    const { value } = searchRef.current;
+    if (value.length === 0) requestClose();
+    else {
+      searchRef.current.value = '';
+      searchRef.current.focus();
+    }
+  };
+
+  const openItem = (roomId, type) => {
+    if (type === 'space') selectTab(roomId);
+    else selectRoom(roomId);
+    requestClose();
+  };
+
+  const openFirstResult = () => {
+    const { chunk } = result;
+    if (chunk?.length > 0) {
+      const item = chunk[0];
+      openItem(item.roomId, item.type);
+    }
+  };
+
+  const notifs = initMatrix.notifications;
+  const renderRoomSelector = (item) => {
+    const isPrivate = item.room.getJoinRule() === 'invite';
+    let imageSrc = null;
+    let iconSrc = null;
+    if (item.type === 'room') iconSrc = isPrivate ? HashLockIC : HashIC;
+    if (item.type === 'space') iconSrc = isPrivate ? SpaceLockIC : SpaceIC;
+    if (item.type === 'direct') imageSrc = item.room.getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, 24, 24, 'crop') || null;
+
+    const isUnread = notifs.hasNoti(item.roomId);
+    const noti = notifs.getNoti(item.roomId);
+
+    return (
+      <RoomSelector
+        key={item.roomId}
+        name={item.name}
+        parentName={item.parents}
+        roomId={item.roomId}
+        imageSrc={imageSrc}
+        iconSrc={iconSrc}
+        isUnread={isUnread}
+        notificationCount={noti.total}
+        isAlert={noti.highlight > 0}
+        onClick={() => openItem(item.roomId, item.type)}
+      />
+    );
+  };
+
+  return (
+    <RawModal
+      className="search-dialog__model dialog-model"
+      isOpen={isOpen}
+      onAfterOpen={handleAfterOpen}
+      onAfterClose={handleAfterClose}
+      onRequestClose={requestClose}
+      size="small"
+    >
+      <div className="search-dialog">
+        <form className="search-dialog__input" onSubmit={(e) => { e.preventDefault(); openFirstResult()}}>
+          <RawIcon src={SearchIC} size="small" />
+          <Input
+            onChange={handleOnChange}
+            forwardRef={searchRef}
+            placeholder="Search"
+          />
+          <IconButton size="small" src={CrossIC} type="reset" onClick={handleCross} tabIndex={-1} />
+        </form>
+        <div className="search-dialog__content-wrapper">
+          <ScrollView autoHide>
+            <div className="search-dialog__content">
+              { Array.isArray(result?.chunk) && result.chunk.map(renderRoomSelector) }
+            </div>
+          </ScrollView>
+        </div>
+        <div className="search-dialog__footer">
+          <Text variant="b3">Type # for rooms, @ for DMs and * for spaces. Hotkey: Ctrl + k</Text>
+        </div>
+      </div>
+    </RawModal>
+  );
+}
+
+export default Search;

src/app/organisms/search/Search.scss

@@ -0,0 +1,86 @@
+.search-dialog__model {
+  --modal-height: 380px;
+  height: 100%;
+  background-color: var(--bg-surface);
+}
+
+.search-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+
+  &__input {
+    padding: var(--sp-normal);
+    display: flex;
+    align-items: center;
+    position: relative;
+
+    & > .ic-raw {
+      position: absolute;
+      left: calc(var(--sp-normal) + var(--sp-tight));
+      [dir=rtl] & {
+        left: unset;
+        right: calc(var(--sp-normal) + var(--sp-tight));
+      }
+    }
+    & > .ic-btn {
+      border-radius: calc(var(--bo-radius) / 2);
+      position: absolute;
+      right: calc(var(--sp-normal) + var(--sp-extra-tight));
+      [dir=rtl] & {
+        right: unset;
+        left: calc(var(--sp-normal) + var(--sp-extra-tight));
+      }
+    }
+    & .input-container {
+      min-width: 0;
+      flex: 1;
+    }
+
+    & input {
+      padding-left: 40px;
+      padding-right: 40px;
+      font-size: var(--fs-s1);
+      letter-spacing: var(--ls-s1);
+      line-height: var(--lh-s1);
+      color: var(--tc-surface-high);
+    }
+  }
+  &__content-wrapper {
+    min-height: 0;
+    flex: 1;
+    position: relative;
+    &::before,
+    &::after {
+      position: absolute;
+      top: 0;
+      z-index: 99;
+      content: "";
+      display: inline-block;
+      width: 100%;
+      height: 8px;
+      background-image: linear-gradient(to bottom, var(--bg-surface), var(--bg-surface-transparent));
+    }
+    &::after {
+      top: unset;
+      bottom: 0;
+      background-image: linear-gradient(to bottom, var(--bg-surface-transparent), var(--bg-surface));
+    }
+  }
+
+  &__content {
+    padding: var(--sp-extra-tight) var(--sp-normal);
+    padding-right: var(--sp-extra-tight);
+    
+    [dir=rtl] & {
+      padding-left: var(--sp-extra-tight);
+      padding-right: var(--sp-normal);
+    }
+  }
+
+  &__footer {
+    padding: var(--sp-tight) var(--sp-normal);
+    text-align: center;
+  }
+
+}

src/app/organisms/settings/Settings.jsx

@@ -3,8 +3,9 @@ import PropTypes from 'prop-types';
 import './Settings.scss';
 
 import initMatrix from '../../../client/initMatrix';
+import cons from '../../../client/state/cons';
 import settings from '../../../client/state/settings';
-import { toggleMarkdown } from '../../../client/action/settings';
+import { toggleMarkdown, toggleMembershipEvents, toggleNickAvatarEvents } from '../../../client/action/settings';
 
 import Text from '../../atoms/text/Text';
 import IconButton from '../../atoms/button/IconButton';
@@ -14,7 +15,8 @@ import SegmentedControls from '../../atoms/segmented-controls/SegmentedControls'
 
 import PopupWindow, { PWContentSelector } from '../../molecules/popup-window/PopupWindow';
 import SettingTile from '../../molecules/setting-tile/SettingTile';
-import ImportE2ERoomKeys from '../../molecules/import-e2e-room-keys/ImportE2ERoomKeys';
+import ImportE2ERoomKeys from '../../molecules/import-export-e2e-room-keys/ImportE2ERoomKeys';
+import ExportE2ERoomKeys from '../../molecules/import-export-e2e-room-keys/ExportE2ERoomKeys';
 
 import ProfileEditor from '../profile-editor/ProfileEditor';
 
@@ -64,11 +66,31 @@ function AppearanceSection() {
         options={(
           <Toggle
             isActive={settings.isMarkdown}
-            onToggle={(isMarkdown) => { toggleMarkdown(isMarkdown); updateState({}); }}
+            onToggle={() => { toggleMarkdown(); updateState({}); }}
           />
         )}
         content={<Text variant="b3">Format messages with markdown syntax before sending.</Text>}
       />
+      <SettingTile
+        title="Hide membership events"
+        options={(
+          <Toggle
+            isActive={settings.hideMembershipEvents}
+            onToggle={() => { toggleMembershipEvents(); updateState({}); }}
+          />
+        )}
+        content={<Text variant="b3">Hide membership change messages from room timeline. (Join, Leave, Invite, Kick and Ban)</Text>}
+      />
+      <SettingTile
+        title="Hide nick/avatar events"
+        options={(
+          <Toggle
+            isActive={settings.hideNickAvatarEvents}
+            onToggle={() => { toggleNickAvatarEvents(); updateState({}); }}
+          />
+        )}
+        content={<Text variant="b3">Hide nick and avatar change messages from room timeline.</Text>}
+      />
     </div>
   );
 }
@@ -83,6 +105,15 @@ function SecuritySection() {
         title={`Device key: ${initMatrix.matrixClient.getDeviceEd25519Key().match(/.{1,4}/g).join(' ')}`}
         content={<Text variant="b3">Use this device ID-key combo to verify or manage this session from Element client.</Text>}
       />
+      <SettingTile
+        title="Export E2E room keys"
+        content={(
+          <>
+            <Text variant="b3">Export end-to-end encryption room keys to decrypt old messages in other session. In order to encrypt keys you need to set a password, which will be used while importing.</Text>
+            <ExportE2ERoomKeys />
+          </>
+        )}
+      />
       <SettingTile
         title="Import E2E room keys"
         content={(
@@ -104,13 +135,13 @@ function AboutSection() {
         <div>
           <Text variant="h2">
             Cinny
-            <span className="text text-b3" style={{ margin: '0 var(--sp-extra-tight)' }}>v1.3.1</span>
+            <span className="text text-b3" style={{ margin: '0 var(--sp-extra-tight)' }}>{`v${cons.version}`}</span>
           </Text>
           <Text>Yet another matrix client</Text>
 
           <div className="set-about__btns">
             <Button onClick={() => window.open('https://github.com/ajbura/cinny')}>Source code</Button>
-            <Button onClick={() => window.open('https://liberapay.com/ajbura/donate')}>Support</Button>
+            <Button onClick={() => window.open('https://cinny.in/#sponsor')}>Support</Button>
           </div>
         </div>
       </div>

src/app/pages/App.jsx

@@ -1,29 +1,12 @@
 import React from 'react';
-import {
-  BrowserRouter, Switch, Route, Redirect,
-} from 'react-router-dom';
 
-import { isAuthanticated } from '../../client/state/auth';
+import { isAuthenticated } from '../../client/state/auth';
 
 import Auth from '../templates/auth/Auth';
 import Client from '../templates/client/Client';
 
 function App() {
-  return (
+  return isAuthenticated() ? <Client /> : <Auth />;
-    <BrowserRouter>
-      <Switch>
-        <Route exact path="/">
-          { isAuthanticated() ? <Client /> : <Redirect to="/login" />}
-        </Route>
-        <Route path="/login">
-          { isAuthanticated() ? <Redirect to="/" /> : <Auth type="login" />}
-        </Route>
-        <Route path="/register">
-          { isAuthanticated() ? <Redirect to="/" /> : <Auth type="register" />}
-        </Route>
-      </Switch>
-    </BrowserRouter>
-  );
 }
 
 export default App;

src/app/templates/auth/Auth.jsx

@@ -1,10 +1,14 @@
-import React, { useState, useRef } from 'react';
+/* eslint-disable react/prop-types */
+import React, { useState, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import './Auth.scss';
 import ReCAPTCHA from 'react-google-recaptcha';
+import { Formik } from 'formik';
 
-import { Link } from 'react-router-dom';
 import * as auth from '../../../client/action/auth';
+import cons from '../../../client/state/cons';
+import { Debounce, getUrlPrams } from '../../../util/common';
+import { getBaseUrl } from '../../../util/matrixUtil';
 
 import Text from '../../atoms/text/Text';
 import Button from '../../atoms/button/Button';
@@ -12,308 +16,556 @@ import IconButton from '../../atoms/button/IconButton';
 import Input from '../../atoms/input/Input';
 import Spinner from '../../atoms/spinner/Spinner';
 import ScrollView from '../../atoms/scroll/ScrollView';
+import Header, { TitleWrapper } from '../../atoms/header/Header';
+import Avatar from '../../atoms/avatar/Avatar';
+import ContextMenu, { MenuItem, MenuHeader } from '../../atoms/context-menu/ContextMenu';
 
-import EyeIC from '../../../../public/res/ic/outlined/eye.svg';
+import ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
 import CinnySvg from '../../../../public/res/svg/cinny.svg';
+import SSOButtons from '../../molecules/sso-buttons/SSOButtons';
 
-// This regex validates historical usernames, which don't satisfy today's username requirements.
-// See https://matrix.org/docs/spec/appendices#id13 for more info.
-const LOCALPART_LOGIN_REGEX = /.*/;
 const LOCALPART_SIGNUP_REGEX = /^[a-z0-9_\-.=/]+$/;
-const BAD_LOCALPART_ERROR = 'Username must contain only a-z, 0-9, ., _, =, -, and /.';
+const BAD_LOCALPART_ERROR = 'Username can only contain characters a-z, 0-9, or \'=_-./\'';
 const USER_ID_TOO_LONG_ERROR = 'Your user ID, including the hostname, can\'t be more than 255 characters long.';
 
-const PASSWORD_REGEX = /.+/;
 const PASSWORD_STRENGHT_REGEX = /^(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[^\w\d\s:])([^\s]){8,127}$/;
-const BAD_PASSWORD_ERROR = 'Password must contain at least 1 number, 1 uppercase letter, 1 lowercase letter, 1 non-alphanumeric character. Passwords can range from 8-127 characters with no whitespaces.';
+const BAD_PASSWORD_ERROR = 'Password must contain at least 1 lowercase, 1 uppercase, 1 number, 1 non-alphanumeric character, 8-127 characters with no space.';
 const CONFIRM_PASSWORD_ERROR = 'Passwords don\'t match.';
 
-const EMAIL_REGEX = /([a-z0-9]+[_a-z0-9.-][a-z0-9]+)@([a-z0-9-]+(?:.[a-z0-9-]+).[a-z]{2,4})/;
+const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
 const BAD_EMAIL_ERROR = 'Invalid email address';
 
 function isValidInput(value, regex) {
+  if (typeof regex === 'string') return regex === value;
   return regex.test(value);
 }
-function renderErrorMessage(error) {
-  const $error = document.getElementById('auth_error');
-  $error.textContent = error;
-  $error.style.display = 'block';
-}
-function showBadInputError($input, error) {
-  renderErrorMessage(error);
-  $input.focus();
-  const myInput = $input;
-  myInput.style.border = '1px solid var(--bg-danger)';
-  myInput.style.boxShadow = 'none';
-  document.getElementById('auth_submit-btn').disabled = true;
-}
-
-function validateOnChange(e, regex, error) {
-  if (!isValidInput(e.target.value, regex) && e.target.value) {
-    showBadInputError(e.target, error);
-    return;
-  }
-  document.getElementById('auth_error').style.display = 'none';
-  e.target.style.removeProperty('border');
-  e.target.style.removeProperty('box-shadow');
-  document.getElementById('auth_submit-btn').disabled = false;
-}
-
-/**
- * Normalizes a username into a standard format.
- *
- * Removes leading and trailing whitespaces and leading "@" symbols.
- * @param {string} rawUsername A raw-input username, which may include invalid characters.
- * @returns {string}
- */
 function normalizeUsername(rawUsername) {
   const noLeadingAt = rawUsername.indexOf('@') === 0 ? rawUsername.substr(1) : rawUsername;
   return noLeadingAt.trim();
 }
 
-function Auth({ type }) {
+let searchingHs = null;
-  const [process, changeProcess] = useState(null);
+function Homeserver({ onChange }) {
-  const usernameRef = useRef(null);
+  const [hs, setHs] = useState(null);
-  const homeserverRef = useRef(null);
+  const [debounce] = useState(new Debounce());
-  const passwordRef = useRef(null);
+  const [process, setProcess] = useState({ isLoading: true, message: 'Loading homeserver list...' });
-  const confirmPasswordRef = useRef(null);
+  const hsRef = useRef();
-  const emailRef = useRef(null);
 
-  function register(recaptchaValue, terms, verified) {
+  const setupHsConfig = async (servername) => {
-    auth.register(
+    setProcess({ isLoading: true, message: 'Looking for homeserver...' });
-      usernameRef.current.value,
+    let baseUrl = null;
-      homeserverRef.current.value,
+    try {
-      passwordRef.current.value,
+      baseUrl = await getBaseUrl(servername);
-      emailRef.current.value,
+    } catch (e) {
-      recaptchaValue,
+      baseUrl = e.message;
-      terms,
+    }
-      verified,
+    if (searchingHs !== servername) return;
-    ).then((res) => {
+    setProcess({ isLoading: true, message: `Connecting to ${baseUrl}...` });
-      document.getElementById('auth_submit-btn').disabled = false;
+    const tempClient = auth.createTemporaryClient(baseUrl);
-      if (res.type === 'recaptcha') {
-        changeProcess({ type: res.type, sitekey: res.public_key });
-        return;
-      }
-      if (res.type === 'terms') {
-        changeProcess({ type: res.type, en: res.en });
-      }
-      if (res.type === 'email') {
-        changeProcess({ type: res.type });
-      }
-      if (res.type === 'done') {
-        window.location.replace('/');
-      }
-    }).catch((error) => {
-      changeProcess(null);
-      renderErrorMessage(error);
-      document.getElementById('auth_submit-btn').disabled = false;
-    });
-    if (terms) {
-      changeProcess({ type: 'loading', message: 'Sending email verification link...' });
-    } else changeProcess({ type: 'loading', message: 'Registration in progress...' });
-  }
 
-  function handleLogin(e) {
+    Promise.allSettled([tempClient.loginFlows(), tempClient.register()])
-    e.preventDefault();
+      .then((values) => {
-    document.getElementById('auth_submit-btn').disabled = true;
+        const loginFlow = values[0].status === 'fulfilled' ? values[0]?.value : undefined;
-    document.getElementById('auth_error').style.display = 'none';
+        const registerFlow = values[1].status === 'rejected' ? values[1]?.reason?.data : undefined;
+        if (loginFlow === undefined || registerFlow === undefined) throw new Error();
 
-    /** @type {string} */
+        if (searchingHs !== servername) return;
-    const rawUsername = usernameRef.current.value;
+        onChange({ baseUrl, login: loginFlow, register: registerFlow });
-    /** @type {string} */
+        setProcess({ isLoading: false });
-    const normalizedUsername = normalizeUsername(rawUsername);
+      }).catch(() => {
-
+        if (searchingHs !== servername) return;
-    auth.login(normalizedUsername, homeserverRef.current.value, passwordRef.current.value)
+        onChange(null);
-      .then(() => {
+        setProcess({ isLoading: false, error: 'Unable to connect. Please check your input.' });
-        document.getElementById('auth_submit-btn').disabled = false;
-        window.location.replace('/');
-      })
-      .catch((error) => {
-        changeProcess(null);
-        renderErrorMessage(error);
-        document.getElementById('auth_submit-btn').disabled = false;
       });
-    changeProcess({ type: 'loading', message: 'Login in progress...' });
+  };
-  }
 
-  function handleRegister(e) {
+  useEffect(() => {
-    e.preventDefault();
+    onChange(null);
-    document.getElementById('auth_submit-btn').disabled = true;
+    if (hs === null || hs?.selected.trim() === '') return;
-    document.getElementById('auth_error').style.display = 'none';
+    searchingHs = hs.selected;
+    setupHsConfig(hs.selected);
+  }, [hs]);
 
-    if (!isValidInput(usernameRef.current.value, LOCALPART_SIGNUP_REGEX)) {
+  useEffect(async () => {
-      showBadInputError(usernameRef.current, BAD_LOCALPART_ERROR);
+    const link = window.location.href;
-      return;
+    const configFileUrl = `${link}${link[link.length - 1] === '/' ? '' : '/'}config.json`;
+    try {
+      const result = await (await fetch(configFileUrl, { method: 'GET' })).json();
+      const selectedHs = result?.defaultHomeserver;
+      const hsList = result?.homeserverList;
+      if (!hsList?.length > 0 || selectedHs < 0 || selectedHs >= hsList?.length) {
+        throw new Error();
+      }
+      setHs({ selected: hsList[selectedHs], list: hsList });
+    } catch {
+      setHs({ selected: 'matrix.org', list: ['matrix.org'] });
     }
-    if (!isValidInput(passwordRef.current.value, PASSWORD_STRENGHT_REGEX)) {
+  }, []);
-      showBadInputError(passwordRef.current, BAD_PASSWORD_ERROR);
+
-      return;
+  const handleHsInput = (e) => {
-    }
+    const { value } = e.target;
-    if (passwordRef.current.value !== confirmPasswordRef.current.value) {
+    setProcess({ isLoading: false });
-      showBadInputError(confirmPasswordRef.current, CONFIRM_PASSWORD_ERROR);
+    debounce._(async () => {
-      return;
+      setHs({ selected: value, list: hs.list });
-    }
+    }, 700)();
-    if (!isValidInput(emailRef.current.value, EMAIL_REGEX)) {
+  };
-      showBadInputError(emailRef.current, BAD_EMAIL_ERROR);
-      return;
-    }
-    if (`@${usernameRef.current.value}:${homeserverRef.current.value}`.length > 255) {
-      showBadInputError(usernameRef.current, USER_ID_TOO_LONG_ERROR);
-      return;
-    }
-    register();
-  }
 
-  const handleAuth = (type === 'login') ? handleLogin : handleRegister;
   return (
     <>
-      {process?.type === 'loading' && <LoadingScreen message={process.message} />}
+      <div className="homeserver-form">
-      {process?.type === 'recaptcha' && <Recaptcha message="Please check the box below to proceed." sitekey={process.sitekey} onChange={(v) => { if (typeof v === 'string') register(v); }} />}
+        <Input name="homeserver" onChange={handleHsInput} value={hs?.selected} forwardRef={hsRef} label="Homeserver" />
-      {process?.type === 'terms' && <Terms url={process.en.url} onSubmit={register} />}
+        <ContextMenu
-      {process?.type === 'email' && (
+          placement="right"
-        <ProcessWrapper>
+          content={(hideMenu) => (
-          <div style={{ margin: 'var(--sp-normal)', maxWidth: '450px' }}>
+            <>
-            <Text variant="h2">Verify email</Text>
+              <MenuHeader>Homeserver list</MenuHeader>
-            <div style={{ margin: 'var(--sp-normal) 0' }}>
+              {
-              <Text variant="b1">
+                hs?.list.map((hsName) => (
-                Please check your email
+                  <MenuItem
-                {' '}
+                    key={hsName}
-                <b>{`(${emailRef.current.value})`}</b>
-                {' '}
-                and validate before continuing further.
-              </Text>
-            </div>
-            <Button variant="primary" onClick={() => register(undefined, undefined, true)}>Continue</Button>
-          </div>
-        </ProcessWrapper>
-      )}
-      <StaticWrapper>
-        <div className="auth-form__wrapper flex-v--center">
-          <form onSubmit={handleAuth} className="auth-form">
-            <Text variant="h2">{ type === 'login' ? 'Login' : 'Register' }</Text>
-            <div className="username__wrapper">
-              <Input
-                forwardRef={usernameRef}
-                onChange={(e) => (type === 'login'
-                  ? validateOnChange(e, LOCALPART_LOGIN_REGEX, BAD_LOCALPART_ERROR)
-                  : validateOnChange(e, LOCALPART_SIGNUP_REGEX, BAD_LOCALPART_ERROR))}
-                id="auth_username"
-                label="Username"
-                required
-              />
-              <Input
-                forwardRef={homeserverRef}
-                id="auth_homeserver"
-                placeholder="Homeserver"
-                value="matrix.org"
-                required
-              />
-            </div>
-            <div className="password__wrapper">
-              <Input
-                forwardRef={passwordRef}
-                onChange={(e) => validateOnChange(e, ((type === 'login') ? PASSWORD_REGEX : PASSWORD_STRENGHT_REGEX), BAD_PASSWORD_ERROR)}
-                id="auth_password"
-                type="password"
-                label="Password"
-                required
-              />
-              <IconButton
-                onClick={() => {
-                  if (passwordRef.current.type === 'password') {
-                    passwordRef.current.type = 'text';
-                  } else passwordRef.current.type = 'password';
-                }}
-                size="extra-small"
-                src={EyeIC}
-              />
-            </div>
-            {type === 'register' && (
-              <>
-                <div className="password__wrapper">
-                  <Input
-                    forwardRef={confirmPasswordRef}
-                    onChange={(e) => validateOnChange(e, new RegExp(`^(${passwordRef.current.value})$`), CONFIRM_PASSWORD_ERROR)}
-                    id="auth_confirmPassword"
-                    type="password"
-                    label="Confirm password"
-                    required
-                  />
-                  <IconButton
                     onClick={() => {
-                      if (confirmPasswordRef.current.type === 'password') {
+                      hideMenu();
-                        confirmPasswordRef.current.type = 'text';
+                      hsRef.current.value = hsName;
-                      } else confirmPasswordRef.current.type = 'password';
+                      setHs({ selected: hsName, list: hs.list });
                     }}
-                    size="extra-small"
+                  >
-                    src={EyeIC}
+                    {hsName}
-                  />
+                  </MenuItem>
-                </div>
+                ))
-                <Input
+              }
-                  forwardRef={emailRef}
+            </>
-                  onChange={(e) => validateOnChange(e, EMAIL_REGEX, BAD_EMAIL_ERROR)}
+          )}
-                  id="auth_email"
+          render={(toggleMenu) => <IconButton onClick={toggleMenu} src={ChevronBottomIC} />}
-                  type="email"
+        />
-                  label="Email"
+      </div>
-                  required
+      {process.error !== undefined && <Text className="homeserver-form__error" variant="b3">{process.error}</Text>}
-                />
+      {process.isLoading && (
-              </>
+        <div className="homeserver-form__status flex--center">
-            )}
+          <Spinner size="small" />
-            <div className="submit-btn__wrapper flex--end">
+          <Text variant="b2">{process.message}</Text>
-              <Text id="auth_error" className="error-message" variant="b3">Error</Text>
-              <Button
-                id="auth_submit-btn"
-                variant="primary"
-                type="submit"
-              >
-                {type === 'login' ? 'Login' : 'Register' }
-              </Button>
-            </div>
-          </form>
         </div>
+      )}
+    </>
+  );
+}
+Homeserver.propTypes = {
+  onChange: PropTypes.func.isRequired,
+};
 
-        <div className="flex--center">
+function Login({ loginFlow, baseUrl }) {
-          <Text variant="b2">
+  const [typeIndex, setTypeIndex] = useState(0);
-            {`${(type === 'login' ? 'Don\'t have' : 'Already have')} an account?`}
+  const loginTypes = ['Username', 'Email'];
-            <Link to={type === 'login' ? '/register' : '/login'}>
+  const isPassword = loginFlow?.filter((flow) => flow.type === 'm.login.password')[0];
-              { type === 'login' ? ' Register' : ' Login' }
+  const ssoProviders = loginFlow?.filter((flow) => flow.type === 'm.login.sso')[0];
-            </Link>
+
-          </Text>
+  const initialValues = {
-        </div>
+    username: '', password: '', email: '', other: '',
-      </StaticWrapper>
+  };
+
+  const validator = (values) => {
+    const errors = {};
+    if (typeIndex === 0 && values.username.length > 0 && values.username.indexOf(':') > -1) {
+      errors.username = 'Username must contain local-part only';
+    }
+    if (typeIndex === 1 && values.email.length > 0 && !isValidInput(values.email, EMAIL_REGEX)) {
+      errors.email = BAD_EMAIL_ERROR;
+    }
+    return errors;
+  };
+  const submitter = (values, actions) => auth.login(
+    baseUrl,
+    typeIndex === 0 ? normalizeUsername(values.username) : undefined,
+    typeIndex === 1 ? values.email : undefined,
+    values.password,
+  ).then(() => {
+    actions.setSubmitting(true);
+    window.location.reload();
+  }).catch((error) => {
+    let msg = error.message;
+    if (msg === 'Unknown message') msg = 'Please check your credentials';
+    actions.setErrors({
+      password: msg === 'Invalid password' ? msg : undefined,
+      other: msg !== 'Invalid password' ? msg : undefined,
+    });
+    actions.setSubmitting(false);
+  });
+
+  return (
+    <>
+      <div className="auth-form__heading">
+        <Text variant="h2">Login</Text>
+        {isPassword && (
+          <ContextMenu
+            placement="right"
+            content={(hideMenu) => (
+              loginTypes.map((type, index) => (
+                <MenuItem
+                  key={type}
+                  onClick={() => {
+                    hideMenu();
+                    setTypeIndex(index);
+                  }}
+                >
+                  {type}
+                </MenuItem>
+              ))
+            )}
+            render={(toggleMenu) => (
+              <Button onClick={toggleMenu} iconSrc={ChevronBottomIC}>
+                {loginTypes[typeIndex]}
+              </Button>
+            )}
+          />
+        )}
+      </div>
+      {isPassword && (
+        <Formik
+          initialValues={initialValues}
+          onSubmit={submitter}
+          validate={validator}
+        >
+          {({
+            values, errors, handleChange, handleSubmit, isSubmitting,
+          }) => (
+            <>
+              {isSubmitting && <LoadingScreen message="Login in progress..." />}
+              <form className="auth-form" onSubmit={handleSubmit}>
+                {typeIndex === 0 && <Input values={values.username} name="username" onChange={handleChange} label="Username" type="username" required />}
+                {errors.username && <Text className="auth-form__error" variant="b3">{errors.username}</Text>}
+                {typeIndex === 1 && <Input values={values.email} name="email" onChange={handleChange} label="Email" type="email" required />}
+                {errors.email && <Text className="auth-form__error" variant="b3">{errors.email}</Text>}
+                <Input values={values.password} name="password" onChange={handleChange} label="Password" type="password" required />
+                {errors.password && <Text className="auth-form__error" variant="b3">{errors.password}</Text>}
+                {errors.other && <Text className="auth-form__error" variant="b3">{errors.other}</Text>}
+                <div className="auth-form__btns">
+                  <Button variant="primary" type="submit" disabled={isSubmitting}>Login</Button>
+                </div>
+              </form>
+            </>
+          )}
+        </Formik>
+      )}
+      {ssoProviders && isPassword && <Text className="sso__divider">OR</Text>}
+      {ssoProviders && (
+        <SSOButtons
+          type="sso"
+          identityProviders={ssoProviders.identity_providers}
+          baseUrl={baseUrl}
+        />
+      )}
+    </>
+  );
+}
+Login.propTypes = {
+  loginFlow: PropTypes.arrayOf(
+    PropTypes.shape({}),
+  ).isRequired,
+  baseUrl: PropTypes.string.isRequired,
+};
+
+let sid;
+let clientSecret;
+function Register({ registerInfo, loginFlow, baseUrl }) {
+  const [process, setProcess] = useState({});
+  const formRef = useRef();
+
+  const ssoProviders = loginFlow?.filter((flow) => flow.type === 'm.login.sso')[0];
+  const isDisabled = registerInfo.errcode !== undefined;
+  const { flows, params, session } = registerInfo;
+
+  let isEmail = false;
+  let isEmailRequired = true;
+  let isRecaptcha = false;
+  let isTerms = false;
+  let isDummy = false;
+
+  flows?.forEach((flow) => {
+    if (isEmailRequired && flow.stages.indexOf('m.login.email.identity') === -1) isEmailRequired = false;
+    if (!isEmail) isEmail = flow.stages.indexOf('m.login.email.identity') > -1;
+    if (!isRecaptcha) isRecaptcha = flow.stages.indexOf('m.login.recaptcha') > -1;
+    if (!isTerms) isTerms = flow.stages.indexOf('m.login.terms') > -1;
+    if (!isDummy) isDummy = flow.stages.indexOf('m.login.dummy') > -1;
+  });
+
+  const initialValues = {
+    username: '', password: '', confirmPassword: '', email: '', other: '',
+  };
+
+  const validator = (values) => {
+    const errors = {};
+    if (values.username.list > 255) errors.username = USER_ID_TOO_LONG_ERROR;
+    if (values.username.length > 0 && !isValidInput(values.username, LOCALPART_SIGNUP_REGEX)) {
+      errors.username = BAD_LOCALPART_ERROR;
+    }
+    if (values.password.length > 0 && !isValidInput(values.password, PASSWORD_STRENGHT_REGEX)) {
+      errors.password = BAD_PASSWORD_ERROR;
+    }
+    if (values.confirmPassword.length > 0
+      && !isValidInput(values.confirmPassword, values.password)) {
+      errors.confirmPassword = CONFIRM_PASSWORD_ERROR;
+    }
+    if (values.email.length > 0 && !isValidInput(values.email, EMAIL_REGEX)) {
+      errors.email = BAD_EMAIL_ERROR;
+    }
+    return errors;
+  };
+  const submitter = (values, actions) => {
+    const tempClient = auth.createTemporaryClient(baseUrl);
+    clientSecret = tempClient.generateClientSecret();
+    return tempClient.isUsernameAvailable(values.username)
+      .then(async (isAvail) => {
+        if (!isAvail) {
+          actions.setErrors({ username: 'Username is already taken' });
+          actions.setSubmitting(false);
+        }
+        if (isEmail && values.email.length > 0) {
+          const result = await auth.verifyEmail(baseUrl, values.email, clientSecret, 1);
+          if (result.errcode) {
+            if (result.errcode === 'M_THREEPID_IN_USE') actions.setErrors({ email: result.error });
+            else actions.setErrors({ others: result.error || result.message });
+            actions.setSubmitting(false);
+            return;
+          }
+          sid = result.sid;
+        }
+        setProcess({ type: 'processing', message: 'Registration in progress....' });
+        actions.setSubmitting(false);
+      }).catch((err) => {
+        const msg = err.message || err.error;
+        if (['M_USER_IN_USE', 'M_INVALID_USERNAME', 'M_EXCLUSIVE'].indexOf(err.errcode) > -1) {
+          actions.setErrors({ username: err.errcode === 'M_USER_IN_USE' ? 'Username is already taken' : msg });
+        } else if (msg) actions.setErrors({ other: msg });
+
+        actions.setSubmitting(false);
+      });
+  };
+
+  const refreshWindow = () => window.location.reload();
+
+  const getInputs = () => {
+    const f = formRef.current;
+    return [f.username.value, f.password.value, f?.email?.value];
+  };
+
+  useEffect(() => {
+    if (process.type !== 'processing') return;
+    const asyncProcess = async () => {
+      const [username, password, email] = getInputs();
+      const d = await auth.completeRegisterStage(baseUrl, username, password, { session });
+
+      if (isRecaptcha && !d.completed.includes('m.login.recaptcha')) {
+        const sitekey = params['m.login.recaptcha'].public_key;
+        setProcess({ type: 'm.login.recaptcha', sitekey });
+        return;
+      }
+      if (isTerms && !d.completed.includes('m.login.terms')) {
+        const pp = params['m.login.terms'].policies.privacy_policy;
+        const url = pp?.en.url || pp[Object.keys(pp)[0]].url;
+        setProcess({ type: 'm.login.terms', url });
+        return;
+      }
+      if (isEmail && email.length > 0) {
+        setProcess({ type: 'm.login.email.identity', email });
+        return;
+      }
+      if (isDummy) {
+        const data = await auth.completeRegisterStage(baseUrl, username, password, {
+          type: 'm.login.dummy',
+          session,
+        });
+        if (data.done) refreshWindow();
+      }
+    };
+    asyncProcess();
+  }, [process]);
+
+  const handleRecaptcha = async (value) => {
+    if (typeof value !== 'string') return;
+    const [username, password] = getInputs();
+    const d = await auth.completeRegisterStage(baseUrl, username, password, {
+      type: 'm.login.recaptcha',
+      response: value,
+      session,
+    });
+    if (d.done) refreshWindow();
+    else setProcess({ type: 'processing', message: 'Registration in progress...' });
+  };
+  const handleTerms = async () => {
+    const [username, password] = getInputs();
+    const d = await auth.completeRegisterStage(baseUrl, username, password, {
+      type: 'm.login.terms',
+      session,
+    });
+    if (d.done) refreshWindow();
+    else setProcess({ type: 'processing', message: 'Registration in progress...' });
+  };
+  const handleEmailVerify = async () => {
+    const [username, password] = getInputs();
+    const d = await auth.completeRegisterStage(baseUrl, username, password, {
+      type: 'm.login.email.identity',
+      threepidCreds: { sid, client_secret: clientSecret },
+      threepid_creds: { sid, client_secret: clientSecret },
+      session,
+    });
+    if (d.done) refreshWindow();
+    else setProcess({ type: 'processing', message: 'Registration in progress...' });
+  };
+
+  return (
+    <>
+      {process.type === 'processing' && <LoadingScreen message={process.message} />}
+      {process.type === 'm.login.recaptcha' && <Recaptcha message="Please check the box below to proceed." sitekey={process.sitekey} onChange={handleRecaptcha} />}
+      {process.type === 'm.login.terms' && <Terms url={process.url} onSubmit={handleTerms} />}
+      {process.type === 'm.login.email.identity' && <EmailVerify email={process.email} onContinue={handleEmailVerify} />}
+      <div className="auth-form__heading">
+        {!isDisabled && <Text variant="h2">Register</Text>}
+        {isDisabled && <Text className="auth-form__error">{registerInfo.error}</Text>}
+      </div>
+      {!isDisabled && (
+        <Formik
+          initialValues={initialValues}
+          onSubmit={submitter}
+          validate={validator}
+        >
+          {({
+            values, errors, handleChange, handleSubmit, isSubmitting,
+          }) => (
+            <>
+              {process.type === undefined && isSubmitting && <LoadingScreen message="Registration in progress..." />}
+              <form className="auth-form" ref={formRef} onSubmit={handleSubmit}>
+                <Input values={values.username} name="username" onChange={handleChange} label="Username" type="username" required />
+                {errors.username && <Text className="auth-form__error" variant="b3">{errors.username}</Text>}
+                <Input values={values.password} name="password" onChange={handleChange} label="Password" type="password" required />
+                {errors.password && <Text className="auth-form__error" variant="b3">{errors.password}</Text>}
+                <Input values={values.confirmPassword} name="confirmPassword" onChange={handleChange} label="Confirm password" type="password" required />
+                {errors.confirmPassword && <Text className="auth-form__error" variant="b3">{errors.confirmPassword}</Text>}
+                {isEmail && <Input values={values.email} name="email" onChange={handleChange} label={`Email${isEmailRequired ? '' : ' (optional)'}`} type="email" required={isEmailRequired} />}
+                {errors.email && <Text className="auth-form__error" variant="b3">{errors.email}</Text>}
+                {errors.other && <Text className="auth-form__error" variant="b3">{errors.other}</Text>}
+                <div className="auth-form__btns">
+                  <Button variant="primary" type="submit" disabled={isSubmitting}>Register</Button>
+                </div>
+              </form>
+            </>
+          )}
+        </Formik>
+      )}
+      {isDisabled && ssoProviders && (
+        <SSOButtons
+          type="sso"
+          identityProviders={ssoProviders.identity_providers}
+          baseUrl={baseUrl}
+        />
+      )}
+    </>
+  );
+}
+Register.propTypes = {
+  registerInfo: PropTypes.shape({}).isRequired,
+  loginFlow: PropTypes.arrayOf(
+    PropTypes.shape({}),
+  ).isRequired,
+  baseUrl: PropTypes.string.isRequired,
+};
+
+function AuthCard() {
+  const [hsConfig, setHsConfig] = useState(null);
+  const [type, setType] = useState('login');
+
+  const handleHsChange = (info) => {
+    console.log(info);
+    setHsConfig(info);
+  };
+
+  return (
+    <>
+      <Homeserver onChange={handleHsChange} />
+      { hsConfig !== null && (
+        type === 'login'
+          ? <Login loginFlow={hsConfig.login.flows} baseUrl={hsConfig.baseUrl} />
+          : (
+            <Register
+              registerInfo={hsConfig.register}
+              loginFlow={hsConfig.login.flows}
+              baseUrl={hsConfig.baseUrl}
+            />
+          )
+      )}
+      { hsConfig !== null && (
+        <Text variant="b2" className="auth-card__switch flex--center">
+          {`${(type === 'login' ? 'Don\'t have' : 'Already have')} an account?`}
+          <button
+            type="button"
+            style={{ color: 'var(--tc-link)', cursor: 'pointer', margin: '0 var(--sp-ultra-tight)' }}
+            onClick={() => setType((type === 'login') ? 'register' : 'login')}
+          >
+            { type === 'login' ? ' Register' : ' Login' }
+          </button>
+        </Text>
+      )}
     </>
   );
 }
 
-Auth.propTypes = {
+function Auth() {
-  type: PropTypes.string.isRequired,
+  const [loginToken, setLoginToken] = useState(getUrlPrams('loginToken'));
-};
+
+  useEffect(async () => {
+    if (!loginToken) return;
+    if (localStorage.getItem(cons.secretKey.BASE_URL) === undefined) {
+      setLoginToken(null);
+      return;
+    }
+    const baseUrl = localStorage.getItem(cons.secretKey.BASE_URL);
+    try {
+      await auth.loginWithToken(baseUrl, loginToken);
+
+      const { href } = window.location;
+      window.location.replace(href.slice(0, href.indexOf('?')));
+    } catch {
+      setLoginToken(null);
+    }
+  }, []);
 
-function StaticWrapper({ children }) {
   return (
     <ScrollView invisible>
-      <div className="auth__wrapper flex--center">
+      <div className="auth__base">
-        <div className="auth-card">
+        <div className="auth__wrapper">
-          <div className="auth-card__interactive flex-v">
+          {loginToken && <LoadingScreen message="Redirecting..." />}
-            <div className="app-ident flex">
+          {!loginToken && (
-              <img className="app-ident__logo noselect" src={CinnySvg} alt="Cinny logo" />
+            <div className="auth-card flex-v">
-              <div className="app-ident__text flex-v--center">
+              <Header>
-                <Text variant="h2">Cinny</Text>
+                <Avatar size="extra-small" imageSrc={CinnySvg} />
-                <Text variant="b2">Yet another matrix client</Text>
+                <TitleWrapper>
+                  <Text variant="h2">Cinny</Text>
+                </TitleWrapper>
+              </Header>
+              <div className="auth-card__content">
+                <AuthCard />
               </div>
             </div>
-            { children }
+          )}
-          </div>
+        </div>
+
+        <div className="auth-footer">
+          <Text variant="b2">
+            <a href="https://cinny.in" target="_blank" rel="noreferrer">About</a>
+          </Text>
+          <Text variant="b2">
+            <a href="https://github.com/ajbura/cinny/releases" target="_blank" rel="noreferrer">{`v${cons.version}`}</a>
+          </Text>
+          <Text variant="b2">
+            <a href="https://twitter.com/cinnyapp" target="_blank" rel="noreferrer">Twitter</a>
+          </Text>
+          <Text variant="b2">
+            <a href="https://matrix.org" target="_blank" rel="noreferrer">Powered by Matrix</a>
+          </Text>
         </div>
       </div>
     </ScrollView>
   );
 }
 
-StaticWrapper.propTypes = {
-  children: PropTypes.node.isRequired,
-};
-
 function LoadingScreen({ message }) {
   return (
     <ProcessWrapper>
@@ -347,13 +599,13 @@ Recaptcha.propTypes = {
 function Terms({ url, onSubmit }) {
   return (
     <ProcessWrapper>
-      <form onSubmit={() => onSubmit(undefined, true)}>
+      <form onSubmit={(e) => { e.preventDefault(); onSubmit(); }}>
         <div style={{ margin: 'var(--sp-normal)', maxWidth: '450px' }}>
           <Text variant="h2">Agree with terms</Text>
           <div style={{ marginBottom: 'var(--sp-normal)' }} />
           <Text variant="b1">In order to complete registration, you need to agree to the terms and conditions.</Text>
           <div style={{ display: 'flex', alignItems: 'center', margin: 'var(--sp-normal) 0' }}>
-            <input id="termsCheckbox" type="checkbox" required />
+            <input style={{ marginRight: '8px' }} id="termsCheckbox" type="checkbox" required />
             <Text variant="b1">
               {'I accept '}
               <a style={{ cursor: 'pointer' }} href={url} rel="noreferrer" target="_blank">Terms and Conditions</a>
@@ -370,6 +622,27 @@ Terms.propTypes = {
   onSubmit: PropTypes.func.isRequired,
 };
 
+function EmailVerify({ email, onContinue }) {
+  return (
+    <ProcessWrapper>
+      <div style={{ margin: 'var(--sp-normal)', maxWidth: '450px' }}>
+        <Text variant="h2">Verify email</Text>
+        <div style={{ margin: 'var(--sp-normal) 0' }}>
+          <Text variant="b1">
+            {'Please check your email '}
+            <b>{`(${email})`}</b>
+            {' and validate before continuing further.'}
+          </Text>
+        </div>
+        <Button variant="primary" onClick={onContinue}>Continue</Button>
+      </div>
+    </ProcessWrapper>
+  );
+}
+EmailVerify.propTypes = {
+  email: PropTypes.string.isRequired,
+};
+
 function ProcessWrapper({ children }) {
   return (
     <div className="process-wrapper">

src/app/templates/auth/Auth.scss

@@ -1,156 +1,144 @@
-.auth__wrapper {
+.auth__base {
-  min-height: 100vh;
+  --pattern-size: 48px;
-  padding: var(--sp-loose);
+  min-height: 100%;
   background-color: var(--bg-surface-low);
 
-  background-image: url("https://images.unsplash.com/photo-1562619371-b67725b6fde2?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=1950&q=80");
+  background-image: radial-gradient(rgba(0, 0, 0, 6%) 2px, rgba(0, 0, 0, 0%) 2px);
-  background-size: cover;
+  background-size: var(--pattern-size) var(--pattern-size);
-  background-repeat: no-repeat;
-  background-position: center;
 
-  .auth-card {
+  display: flex;
-    width: 462px;
+  flex-direction: column;
-    min-height: 644px;
+}
-    background-color: var(--bg-surface-low);
+.auth__wrapper {
-    border-radius: var(--bo-radius);
+  flex: 1;
-    box-shadow: var(--bs-popup);
+  padding: var(--sp-loose);
-    overflow: hidden;
+  padding-bottom: 0;
-    display: flex;
+  display: flex;
-    flex-flow: row nowrap;
+  justify-content: center;
-    
+  align-items: flex-start;
-    &__interactive{
+}
-      flex: 1;
+.auth-footer {
-      min-width: 0;
+  padding: var(--sp-normal) 0;
-    }
+  display: flex;
+  justify-content: center;
+  align-items: center;
 
-    &__interactive {
+  & > *:nth-child(2n) {
-      padding: calc(var(--sp-normal) + var(--sp-extra-loose));
+    margin: 0 var(--sp-loose);
-      padding-bottom: var(--sp-extra-loose);
+  }
-      background-color: var(--bg-surface);
+  & a {
-    }
+    color: var(--tc-surface-normal);
+    &:hover { text-decoration: underline; }
+  }
+}
+.auth-card {
+  width: 462px;
+  background-color: var(--bg-surface);
+  border-radius: var(--bo-radius);
+  box-shadow: var(--bs-popup);
+  overflow: hidden;
 
+  &__content {
+    padding: var(--sp-extra-loose) calc(var(--sp-normal) + var(--sp-extra-loose));
+  }
+  &__switch {
+    margin-top: var(--sp-loose) !important;
   }
 }
 
-.app-ident {
+.homeserver-form,
-  margin-bottom: var(--sp-extra-loose);
+.auth-form__heading {
-
+  & .context-menu .btn-surface .ic-raw {
-  &__logo {
+    width: 0;
-    width: 60px;
-    height: 60px;
   }
-  &__text {
+}
-    margin-left: calc(var(--sp-loose) + var(--sp-ultra-tight));
 
-    .text-s1 {
+.homeserver-form {
-      margin-top: var(--sp-tight);
+  display: flex;
-      color: var(--tc-surface-normal);
+  margin-bottom: var(--sp-extra-tight);
+  align-items: flex-end;
+  & > .input-container {
+    flex: 1;
+    & .input {
+      border-right: unset;
+      border-radius: var(--bo-radius) 0 0 var(--bo-radius);
+      background-color: var(--bg-surface);
     }
+  }
+  & .ic-btn {
+    height: 46px;
+    border: 1px solid var(--bg-surface-border);
+    border-radius: 0 var(--bo-radius) var(--bo-radius) 0;
+  }
+  [dir=rtl] & {
+    & .input {
+      border-radius: 0 var(--bo-radius) var(--bo-radius) 0;
+      border-radius: 1px;
+      border-left: unset;
+    }
+    .ic-btn {
+      border-radius: var(--bo-radius) 0 0 var(--bo-radius);
+    }
+  }
 
-    [dir=rtl] & {
+  &__status {
-      margin-left: 0;
+    margin-top: var(--sp-normal);
-      margin-right:  calc(var(--sp-loose) + var(--sp-ultra-tight));
+    & .donut-spinner {
+      min-width: 28px;
     }
+    & .text {
+      margin: 0 var(--sp-tight);
+    }
+  }
+  &__error {
+    margin-bottom: var(--sp-normal) !important;
+    color: var(--tc-danger-normal) !important;
   }
 }
 
 .auth-form {
-
-  & > .text {
-    margin-bottom: var(--sp-loose);
-    margin-top: var(--sp-loose);
-  }
   & > .input-container {
-    margin-top: var(--sp-tight);
+    margin: var(--sp-tight) 0 var(--sp-ultra-tight);
+  }
+  
+  &__heading {
+    display: flex;
+    justify-content: space-between;
+    margin-top: calc(var(--sp-extra-loose) + var(--sp-tight));
   }
 
-  .submit-btn__wrapper {
+  &__btns {
-    margin-top: var(--sp-extra-loose);
+    padding-top: var(--sp-loose);
-    margin-bottom: var(--sp-loose);
+    margin-bottom: var(--sp-extra-loose);
-    align-items: flex-start;
+    display: flex;
-
+    justify-content: flex-end;
-    & > .error-message {
-      display: none;
-      flex: 1;
-      color: var(--tc-danger-normal);
-      margin-right: var(--sp-normal);
-      word-break: break;
-
-      [dir=rtl] & {
-        margin: {
-          right: 0;
-          left: var(--sp-normal);
-        }
-      }
-    }
   }
 
-  &__wrapper {
+  &__error {
-    height: 100%;
+    color: var(--tc-danger-normal) !important;
   }
 }
-
+.sso__divider {
-.username__wrapper {
+  margin-bottom: var(--sp-tight);
   display: flex;
-  align-items: flex-end;
+  align-items: center;
 
-  & > :first-child {
+  &::before,
+  &::after {
     flex: 1;
-
+    content: '';
-    .input {
+    margin: var(--sp-tight);
-      border-radius: var(--bo-radius) 0 0 var(--bo-radius);
+    border-bottom: 1px solid var(--bg-surface-border);
-
-      [dir=rtl] & {
-        border-radius:  0 var(--bo-radius) var(--bo-radius) 0;
-      }
-    }
-  }
-  & > :last-child {
-    width: 110px;
-
-    .input {
-      border-left-width: 0;
-      background-color: var(--bg-surface);
-      border-radius: 0 var(--bo-radius) var(--bo-radius) 0;
-
-      [dir=rtl] & {
-        border-left-width: 1px;
-        border-right-width: 0;
-        border-radius: var(--bo-radius) 0 0 var(--bo-radius);
-      }
-    }
-  }
-}
-
-.password__wrapper {
-  margin-top: var(--sp-tight);
-  position: relative;
-
-  & .ic-btn {
-    position: absolute;
-    right: 6px;
-    bottom: 6px;
-    border-radius: calc(var(--bo-radius) / 2);
-    [dir=rtl] & {
-      left: 6px;
-      right: unset;
-    }
   }
 }
 
 @media (max-width: 462px) {
   .auth__wrapper {
-    padding: 0;
+    padding: var(--sp-tight);
-    background-image: none;
+  }
-    background-color: var(--bg-surface);
+  .auth-card {
-
+    &__content {
-    .auth-card {
+      padding: var(--sp-loose) var(--sp-normal);
-      border-radius: 0;
-      box-shadow: none;
-
-      &__interactive {
-        padding: var(--sp-extra-loose);
-      }
     }
   }
 }

src/app/templates/client/Client.jsx

@@ -9,14 +9,31 @@ import Windows from '../../organisms/pw/Windows';
 import Dialogs from '../../organisms/pw/Dialogs';
 import EmojiBoardOpener from '../../organisms/emoji-board/EmojiBoardOpener';
 import RoomOptions from '../../organisms/room-optons/RoomOptions';
+import logout from '../../../client/action/logout';
 
 import initMatrix from '../../../client/initMatrix';
 
 function Client() {
   const [isLoading, changeLoading] = useState(true);
+  const [loadingMsg, setLoadingMsg] = useState('Heating up');
 
   useEffect(() => {
+    let counter = 0;
+    const iId = setInterval(() => {
+      const msgList = [
+        'Sometimes it takes a while...',
+        'Looks like you have a lot of stuff to heat up!',
+      ];
+      if (counter === msgList.length - 1) {
+        setLoadingMsg(msgList[msgList.length - 1]);
+        clearInterval(iId);
+        return;
+      }
+      setLoadingMsg(msgList[counter]);
+      counter += 1;
+    }, 9000);
     initMatrix.once('init_loading_finished', () => {
+      clearInterval(iId);
       changeLoading(false);
     });
     initMatrix.init();
@@ -25,8 +42,11 @@ function Client() {
   if (isLoading) {
     return (
       <div className="loading-display">
+        <button className="loading__logout" onClick={logout} type="button">
+          <Text variant="b3">Logout</Text>
+        </button>
         <Spinner />
-        <Text className="loading__message" variant="b2">Heating up</Text>
+        <Text className="loading__message" variant="b2">{loadingMsg}</Text>
 
         <div className="loading__appname">
           <Text variant="h2">Cinny</Text>

src/app/templates/client/Client.scss

@@ -18,7 +18,7 @@
   top: 0;
   left: 0;
   width: 100vw;
-  height: 100vh;
+  height: 100%;
 
   display: flex;
   flex-direction: column;
@@ -27,8 +27,19 @@
 }
 .loading__message {
   margin-top: var(--sp-normal);
+  max-width: 350px;
+  text-align: center;
 }
 .loading__appname {
   position: absolute;
   bottom: var(--sp-normal);
+}
+.loading__logout {
+  position: absolute;
+  bottom: var(--sp-extra-tight);
+  right: var(--sp-extra-tight);
+  cursor: pointer;
+  .text {
+    color: var(--tc-link);
+  }
 }

src/client/action/auth.js

@@ -1,152 +1,104 @@
 import * as sdk from 'matrix-js-sdk';
 import cons from '../state/cons';
-import { getBaseUrl } from '../../util/matrixUtil';
 
-async function login(username, homeserver, password) {
+function updateLocalStore(accessToken, deviceId, userId, baseUrl) {
-  let baseUrl = null;
+  localStorage.setItem(cons.secretKey.ACCESS_TOKEN, accessToken);
-  try {
+  localStorage.setItem(cons.secretKey.DEVICE_ID, deviceId);
-    baseUrl = await getBaseUrl(homeserver);
+  localStorage.setItem(cons.secretKey.USER_ID, userId);
-  } catch (e) {
+  localStorage.setItem(cons.secretKey.BASE_URL, baseUrl);
-    baseUrl = `https://${homeserver}`;
+}
-  }
 
-  if (typeof baseUrl === 'undefined') throw new Error('Homeserver not found');
+function createTemporaryClient(baseUrl) {
+  return sdk.createClient({ baseUrl });
+}
 
-  const client = sdk.createClient({ baseUrl });
+async function startSsoLogin(baseUrl, type, idpId) {
+  const client = createTemporaryClient(baseUrl);
+  localStorage.setItem(cons.secretKey.BASE_URL, client.baseUrl);
+  window.location.href = client.getSsoLoginUrl(window.location.href, type, idpId);
+}
 
-  const response = await client.login('m.login.password', {
+async function login(baseUrl, username, email, password) {
-    identifier: {
+  const identifier = {};
-      type: 'm.id.user',
+  if (username) {
-      user: username,
+    identifier.type = 'm.id.user';
-    },
+    identifier.user = username;
+  } else if (email) {
+    identifier.type = 'm.id.thirdparty';
+    identifier.medium = 'email';
+    identifier.address = email;
+  } else throw new Error('Bad Input');
+
+  const client = createTemporaryClient(baseUrl);
+  const res = await client.login('m.login.password', {
+    identifier,
     password,
     initial_device_display_name: cons.DEVICE_DISPLAY_NAME,
   });
 
-  localStorage.setItem(cons.secretKey.ACCESS_TOKEN, response.access_token);
+  const myBaseUrl = res?.well_known?.['m.homeserver']?.base_url || client.baseUrl;
-  localStorage.setItem(cons.secretKey.DEVICE_ID, response.device_id);
+  updateLocalStore(res.access_token, res.device_id, res.user_id, myBaseUrl);
-  localStorage.setItem(cons.secretKey.USER_ID, response.user_id);
-  localStorage.setItem(cons.secretKey.BASE_URL, response?.well_known?.['m.homeserver']?.base_url || baseUrl);
 }
 
-async function getAdditionalInfo(baseUrl, content) {
+async function loginWithToken(baseUrl, token) {
-  try {
+  const client = createTemporaryClient(baseUrl);
-    const res = await fetch(`${baseUrl}/_matrix/client/r0/register`, {
-      method: 'POST',
-      body: JSON.stringify(content),
-      headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-      },
-      credentials: 'same-origin',
-    });
-    const data = await res.json();
-    return data;
-  } catch (e) {
-    throw new Error(e);
-  }
-}
-async function verifyEmail(baseUrl, content) {
-  try {
-    const res = await fetch(`${baseUrl}/_matrix/client/r0/register/email/requestToken`, {
-      method: 'POST',
-      body: JSON.stringify(content),
-      headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-      },
-      credentials: 'same-origin',
-    });
-    const data = await res.json();
-    return data;
-  } catch (e) {
-    throw new Error(e);
-  }
-}
 
-let session = null;
+  const res = await client.login('m.login.token', {
-let clientSecret = null;
+    token,
-let sid = null;
+    initial_device_display_name: cons.DEVICE_DISPLAY_NAME,
-async function register(username, homeserver, password, email, recaptchaValue, terms, verified) {
-  const baseUrl = await getBaseUrl(homeserver);
-
-  if (typeof baseUrl === 'undefined') throw new Error('Homeserver not found');
-
-  const client = sdk.createClient({ baseUrl });
-
-  const isAvailable = await client.isUsernameAvailable(username);
-  if (!isAvailable) throw new Error('Username not available');
-
-  if (typeof recaptchaValue === 'string') {
-    await getAdditionalInfo(baseUrl, {
-      auth: {
-        type: 'm.login.recaptcha',
-        session,
-        response: recaptchaValue,
-      },
-    });
-  } else if (terms === true) {
-    await getAdditionalInfo(baseUrl, {
-      auth: {
-        type: 'm.login.terms',
-        session,
-      },
-    });
-  } else if (verified !== true) {
-    session = null;
-    clientSecret = client.generateClientSecret();
-    const verifyData = await verifyEmail(baseUrl, {
-      email,
-      client_secret: clientSecret,
-      send_attempt: 1,
-    });
-    if (typeof verifyData.error === 'string') {
-      throw new Error(verifyData.error);
-    }
-    sid = verifyData.sid;
-  }
-
-  const additionalInfo = await getAdditionalInfo(baseUrl, {
-    auth: { session: (session !== null) ? session : undefined },
   });
-  session = additionalInfo.session;
+
-  if (typeof additionalInfo.completed === 'undefined' || additionalInfo.completed.length === 0) {
+  const myBaseUrl = res?.well_known?.['m.homeserver']?.base_url || client.baseUrl;
-    return ({
+  updateLocalStore(res.access_token, res.device_id, res.user_id, myBaseUrl);
-      type: 'recaptcha',
+}
-      public_key: additionalInfo.params['m.login.recaptcha'].public_key,
+
-    });
+// eslint-disable-next-line camelcase
-  }
+async function verifyEmail(baseUrl, email, client_secret, send_attempt, next_link) {
-  if (additionalInfo.completed.find((process) => process === 'm.login.recaptcha') === 'm.login.recaptcha'
+  const res = await fetch(`${baseUrl}/_matrix/client/r0/register/email/requestToken`, {
-    && !additionalInfo.completed.find((process) => process === 'm.login.terms')) {
+    method: 'POST',
-    return ({
+    body: JSON.stringify({
-      type: 'terms',
+      email, client_secret, send_attempt, next_link,
-      en: additionalInfo.params['m.login.terms'].policies.privacy_policy.en,
+    }),
-    });
+    headers: {
-  }
+      'Content-Type': 'application/json; charset=utf-8',
-  if (verified || additionalInfo.completed.find((process) => process === 'm.login.terms') === 'm.login.terms') {
+    },
-    const tpc = {
+    credentials: 'same-origin',
-      client_secret: clientSecret,
+  });
-      sid,
+  const data = await res.json();
-    };
+  return data;
-    const verifyData = await getAdditionalInfo(baseUrl, {
+}
-      auth: {
+
-        session,
+async function completeRegisterStage(
-        type: 'm.login.email.identity',
+  baseUrl, username, password, auth,
-        threepidCreds: tpc,
+) {
-        threepid_creds: tpc,
+  const tempClient = createTemporaryClient(baseUrl);
-      },
+
+  try {
+    const result = await tempClient.registerRequest({
       username,
       password,
+      auth,
+      initial_device_display_name: cons.DEVICE_DISPLAY_NAME,
     });
-    if (verifyData.errcode === 'M_UNAUTHORIZED') {
+    const data = { completed: result.completed || [] };
-      return { type: 'email' };
+    if (result.access_token) {
+      data.done = true;
+      updateLocalStore(result.access_token, result.device_id, result.user_id, baseUrl);
     }
-
+    return data;
-    localStorage.setItem(cons.secretKey.ACCESS_TOKEN, verifyData.access_token);
+  } catch (e) {
-    localStorage.setItem(cons.secretKey.DEVICE_ID, verifyData.device_id);
+    const result = e.data;
-    localStorage.setItem(cons.secretKey.USER_ID, verifyData.user_id);
+    const data = { completed: result.completed || [] };
-    localStorage.setItem(cons.secretKey.BASE_URL, baseUrl);
+    if (result.access_token) {
-    return { type: 'done' };
+      data.done = true;
+      updateLocalStore(result.access_token, result.device_id, result.user_id, baseUrl);
+    }
+    return data;
   }
-  return {};
 }
 
-export { login, register };
+export {
+  createTemporaryClient, login, verifyEmail,
+  loginWithToken, startSsoLogin,
+  completeRegisterStage,
+};

src/client/action/logout.js

@@ -2,6 +2,7 @@ import initMatrix from '../initMatrix';
 
 function logout() {
   const mx = initMatrix.matrixClient;
+  mx.stopClient();
   mx.logout().then(() => {
     mx.clearStores();
     window.localStorage.clear();

src/client/action/navigation.js

@@ -1,53 +1,48 @@
 import appDispatcher from '../dispatcher';
 import cons from '../state/cons';
 
-function selectTab(tabId) {
+export function selectTab(tabId) {
   appDispatcher.dispatch({
     type: cons.actions.navigation.SELECT_TAB,
     tabId,
   });
 }
 
-function selectSpace(roomId) {
+export function selectSpace(roomId) {
   appDispatcher.dispatch({
     type: cons.actions.navigation.SELECT_SPACE,
     roomId,
   });
 }
 
-function selectRoom(roomId) {
+export function selectRoom(roomId, eventId) {
   appDispatcher.dispatch({
     type: cons.actions.navigation.SELECT_ROOM,
     roomId,
+    eventId,
   });
 }
 
-function togglePeopleDrawer() {
+export function openInviteList() {
-  appDispatcher.dispatch({
-    type: cons.actions.navigation.TOGGLE_PEOPLE_DRAWER,
-  });
-}
-
-function openInviteList() {
   appDispatcher.dispatch({
     type: cons.actions.navigation.OPEN_INVITE_LIST,
   });
 }
 
-function openPublicRooms(searchTerm) {
+export function openPublicRooms(searchTerm) {
   appDispatcher.dispatch({
     type: cons.actions.navigation.OPEN_PUBLIC_ROOMS,
     searchTerm,
   });
 }
 
-function openCreateRoom() {
+export function openCreateRoom() {
   appDispatcher.dispatch({
     type: cons.actions.navigation.OPEN_CREATE_ROOM,
   });
 }
 
-function openInviteUser(roomId, searchTerm) {
+export function openInviteUser(roomId, searchTerm) {
   appDispatcher.dispatch({
     type: cons.actions.navigation.OPEN_INVITE_USER,
     roomId,
@@ -55,13 +50,21 @@ function openInviteUser(roomId, searchTerm) {
   });
 }
 
-function openSettings() {
+export function openProfileViewer(userId, roomId) {
+  appDispatcher.dispatch({
+    type: cons.actions.navigation.OPEN_PROFILE_VIEWER,
+    userId,
+    roomId,
+  });
+}
+
+export function openSettings() {
   appDispatcher.dispatch({
     type: cons.actions.navigation.OPEN_SETTINGS,
   });
 }
 
-function openEmojiBoard(cords, requestEmojiCallback) {
+export function openEmojiBoard(cords, requestEmojiCallback) {
   appDispatcher.dispatch({
     type: cons.actions.navigation.OPEN_EMOJIBOARD,
     cords,
@@ -69,15 +72,15 @@ function openEmojiBoard(cords, requestEmojiCallback) {
   });
 }
 
-function openReadReceipts(roomId, eventId) {
+export function openReadReceipts(roomId, userIds) {
   appDispatcher.dispatch({
     type: cons.actions.navigation.OPEN_READRECEIPTS,
     roomId,
-    eventId,
+    userIds,
   });
 }
 
-function openRoomOptions(cords, roomId) {
+export function openRoomOptions(cords, roomId) {
   appDispatcher.dispatch({
     type: cons.actions.navigation.OPEN_ROOMOPTIONS,
     cords,
@@ -85,17 +88,18 @@ function openRoomOptions(cords, roomId) {
   });
 }
 
-export {
+export function replyTo(userId, eventId, body) {
-  selectTab,
+  appDispatcher.dispatch({
-  selectSpace,
+    type: cons.actions.navigation.CLICK_REPLY_TO,
-  selectRoom,
+    userId,
-  togglePeopleDrawer,
+    eventId,
-  openInviteList,
+    body,
-  openPublicRooms,
+  });
-  openCreateRoom,
+}
-  openInviteUser,
+
-  openSettings,
+export function openSearch(term) {
-  openEmojiBoard,
+  appDispatcher.dispatch({
-  openReadReceipts,
+    type: cons.actions.navigation.OPEN_SEARCH,
-  openRoomOptions,
+    term,
-};
+  });
+}

src/client/action/room.js

@@ -132,9 +132,11 @@ function leave(roomId) {
  * @param {boolean} [opts.isEncrypted=false] Makes room encrypted
  * @param {boolean} [opts.isDirect=false] Makes room as direct message
  * @param {string[]} [opts.invite=[]] An array of userId's to invite
+ * @param{number} [opts.powerLevel=100] My power level
  */
 async function create(opts) {
   const mx = initMatrix.matrixClient;
+  const customPowerLevels = [101];
   const options = {
     name: opts.name,
     topic: opts.topic,
@@ -143,6 +145,10 @@ async function create(opts) {
     is_direct: opts.isDirect === true,
     invite: opts.invite || [],
     initial_state: [],
+    preset: opts.isDirect === true ? 'trusted_private_chat' : undefined,
+    power_level_content_override: customPowerLevels.indexOf(opts.powerLevel) === -1 ? undefined : {
+      users: { [initMatrix.matrixClient.getUserId()]: opts.powerLevel },
+    },
   };
 
   if (opts.isPublic !== true && opts.isEncrypted === true) {
@@ -182,12 +188,15 @@ async function create(opts) {
 async function invite(roomId, userId) {
   const mx = initMatrix.matrixClient;
 
-  try {
+  const result = await mx.invite(roomId, userId);
-    const result = await mx.invite(roomId, userId);
+  return result;
-    return result;
+}
-  } catch (e) {
+
-    throw new Error(e);
+async function kick(roomId, userId) {
-  }
+  const mx = initMatrix.matrixClient;
+
+  const result = await mx.kick(roomId, userId);
+  return result;
 }
 
 function createSpaceShortcut(roomId) {
@@ -206,6 +215,6 @@ function deleteSpaceShortcut(roomId) {
 
 export {
   join, leave,
-  create, invite,
+  create, invite, kick,
   createSpaceShortcut, deleteSpaceShortcut,
 };

src/client/action/settings.js

@@ -1,12 +1,26 @@
 import appDispatcher from '../dispatcher';
 import cons from '../state/cons';
 
-function toggleMarkdown() {
+export function toggleMarkdown() {
   appDispatcher.dispatch({
     type: cons.actions.settings.TOGGLE_MARKDOWN,
   });
 }
 
-export {
+export function togglePeopleDrawer() {
-  toggleMarkdown,
+  appDispatcher.dispatch({
-};
+    type: cons.actions.settings.TOGGLE_PEOPLE_DRAWER,
+  });
+}
+
+export function toggleMembershipEvents() {
+  appDispatcher.dispatch({
+    type: cons.actions.settings.TOGGLE_MEMBERSHIP_EVENT,
+  });
+}
+
+export function toggleNickAvatarEvents() {
+  appDispatcher.dispatch({
+    type: cons.actions.settings.TOGGLE_NICKAVATAR_EVENT,
+  });
+}

src/client/event/hotkeys.js

@@ -0,0 +1,37 @@
+import { openSearch } from '../action/navigation';
+import navigation from '../state/navigation';
+
+function listenKeyboard(event) {
+  // Ctrl +
+  if (event.ctrlKey) {
+    // k - for search Modal
+    if (event.keyCode === 75) {
+      event.preventDefault();
+      if (navigation.isRawModalVisible) return;
+      openSearch();
+    }
+  }
+  if (!event.ctrlKey && !event.altKey) {
+    if (navigation.isRawModalVisible) return;
+    if (['text', 'textarea'].includes(document.activeElement.type)) {
+      return;
+    }
+    if (event.keyCode < 48
+      || (event.keyCode >= 91 && event.keyCode <= 93)
+      || (event.keyCode >= 112 && event.keyCode <= 183)) {
+      return;
+    }
+    const msgTextarea = document.getElementById('message-textarea');
+    msgTextarea?.focus();
+  }
+}
+
+function initHotkeys() {
+  document.body.addEventListener('keydown', listenKeyboard);
+}
+
+function removeHotkeys() {
+  document.body.removeEventListener('keydown', listenKeyboard);
+}
+
+export { initHotkeys, removeHotkeys };