Merge pull request #131 from ajbura/dev

v1.3.2

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

@@ -1,32 +0,0 @@
-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

@@ -1,78 +0,0 @@
-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.

.gitignore

@@ -2,5 +2,3 @@ experiment
 dist
 node_modules
 devAssets
-
-.DS_Store

README.md

@@ -51,13 +51,9 @@ 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 contributors
+Copyright (c) 2021 Ajay Bura (ajbura) and other contributors
 
 Code licensed under the MIT License: <http://opensource.org/licenses/MIT>
 

config.json

@@ -1,12 +0,0 @@
-{
-  "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.5.1",
+  "version": "1.3.2",
   "description": "Yet another matrix client",
   "main": "index.js",
   "engines": {
@@ -22,10 +22,8 @@
     "dateformat": "^4.5.1",
     "emojibase-data": "^6.2.0",
     "flux": "^4.0.1",
-    "formik": "^2.2.9",
     "html-react-parser": "^1.2.7",
-    "linkify-react": "^3.0.3",
+    "linkifyjs": "^3.0.0-beta.3",
-    "linkifyjs": "^3.0.3",
     "matrix-js-sdk": "^12.4.1",
     "micromark": "^3.0.3",
     "micromark-extension-gfm": "^1.0.0",
@@ -73,9 +71,9 @@
     "stream-browserify": "^3.0.0",
     "style-loader": "^2.0.0",
     "util": "^0.12.4",
-    "webpack": "^5.62.1",
+    "webpack": "^5.28.0",
-    "webpack-cli": "^4.9.1",
+    "webpack-cli": "^4.5.0",
-    "webpack-dev-server": "^4.4.0",
+    "webpack-dev-server": "^3.11.2",
     "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 maximum-scale=1.0 user-scalable=no">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <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

@@ -1,7 +0,0 @@
-<?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

@@ -29,7 +29,7 @@ function Avatar({
               {
                 iconSrc !== null
                   ? <RawIcon size={size} src={iconSrc} />
-                  : text !== null && <Text variant={textSize}>{[...text][0]}</Text>
+                  : text !== null && <Text variant={textSize}>{text}</Text>
               }
             </span>
           )

src/app/atoms/avatar/Avatar.scss

@@ -24,6 +24,7 @@
     height: var(--av-extra-small);
   }
 
+
   img {
     width: 100%;
     height: 100%;

src/app/atoms/button/Button.jsx

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

src/app/atoms/button/IconButton.jsx

@@ -17,8 +17,7 @@ const IconButton = React.forwardRef(({
       className={`ic-btn ic-btn-${variant}`}
       onMouseUp={(e) => blurOnBubbling(e, `.ic-btn-${variant}`)}
       onClick={onClick}
-      // eslint-disable-next-line react/button-has-type
+      type={type === 'button' ? 'button' : 'submit'}
-      type={type}
     >
       <RawIcon size={size} src={src} />
     </button>
@@ -46,7 +45,7 @@ IconButton.defaultProps = {
 IconButton.propTypes = {
   variant: PropTypes.oneOf(['surface', 'positive', 'caution', 'danger']),
   size: PropTypes.oneOf(['normal', 'small', 'extra-small']),
-  type: PropTypes.oneOf(['button', 'submit', 'reset']),
+  type: PropTypes.oneOf(['button', 'submit']),
   tooltip: PropTypes.string,
   tooltipPlacement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
   src: PropTypes.string.isRequired,

src/app/atoms/chip/Chip.jsx

@@ -7,14 +7,13 @@ import RawIcon from '../system-icons/RawIcon';
 
 function Chip({
   iconSrc, iconColor, text, children,
-  onClick,
 }) {
   return (
-    <button className="chip" type="button" onClick={onClick}>
+    <div className="chip">
-      {iconSrc != null && <RawIcon src={iconSrc} color={iconColor} size="extra-small" />}
+      {iconSrc != null && <RawIcon src={iconSrc} color={iconColor} size="small" />}
-      {(text != null && text !== '') && <Text variant="b3">{text}</Text>}
+      {(text != null && text !== '') && <Text variant="b2">{text}</Text>}
       {children}
-    </button>
+    </div>
   );
 }
 
@@ -23,7 +22,6 @@ Chip.propTypes = {
   iconColor: PropTypes.string,
   text: PropTypes.string,
   children: PropTypes.element,
-  onClick: PropTypes.func,
 };
 
 Chip.defaultProps = {
@@ -31,7 +29,6 @@ Chip.defaultProps = {
   iconColor: null,
   text: null,
   children: null,
-  onClick: null,
 };
 
 export default Chip;

src/app/atoms/chip/Chip.scss

@@ -7,27 +7,13 @@
   
   background: var(--bg-surface-low);
   border-radius: var(--bo-radius);
-  box-shadow: var(--bs-surface-border);
+  border: 1px solid var(--bg-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;
+    margin-right: var(--sp-extra-tight);
-    height: 16px;
-    margin-right: var(--sp-ultra-tight);
     [dir=rtl] & {
       margin-right: 0;
-      margin-left: var(--sp-ultra-tight);
+      margin-left: var(--sp-extra-tight);
     }
   }
 }

src/app/atoms/input/Input.jsx

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

@@ -32,7 +32,6 @@
 
 @mixin scroll {
   overflow: hidden;
-  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, useEffect } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import './SegmentedControls.scss';
 
@@ -17,10 +17,6 @@ function SegmentedControls({
     onSelect(segmentIndex);
   }
 
-  useEffect(() => {
-    setSelect(selected);
-  }, [selected]);
-
   return (
     <div className="segmented-controls">
       {

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

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

src/app/molecules/media/Media.scss

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

src/app/molecules/message/Message.jsx

@@ -2,7 +2,7 @@ import React, { useRef } from 'react';
 import PropTypes from 'prop-types';
 import './Message.scss';
 
-import Linkify from 'linkify-react';
+import Linkify from 'linkifyjs/react';
 import ReactMarkdown from 'react-markdown';
 import gfm from 'remark-gfm';
 import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
@@ -106,17 +106,10 @@ MessageReply.propTypes = {
   content: PropTypes.string.isRequired,
 };
 
-function MessageContent({
+function MessageContent({ content, isMarkdown, isEdited }) {
-  senderName,
-  content,
-  isMarkdown,
-  isEdited,
-  msgType,
-}) {
   return (
     <div className="message__content">
       <div className="text text-b1">
-        { msgType === 'm.emote' && `* ${senderName} ` }
         { isMarkdown ? genMarkdown(content) : linkifyContent(content) }
       </div>
       { isEdited && <Text className="message__content-edited" variant="b3">(edited)</Text>}
@@ -128,11 +121,9 @@ MessageContent.defaultProps = {
   isEdited: false,
 };
 MessageContent.propTypes = {
-  senderName: PropTypes.string.isRequired,
   content: PropTypes.node.isRequired,
   isMarkdown: PropTypes.bool,
   isEdited: PropTypes.bool,
-  msgType: PropTypes.string.isRequired,
 };
 
 function MessageEdit({ content, onSave, onCancel }) {
@@ -237,27 +228,10 @@ MessageOptions.propTypes = {
 
 function Message({
   avatar, header, reply, content, editContent, reactions, options,
-  msgType,
 }) {
-  const className = [
+  const msgClass = header === null ? ' message--content-only' : ' message--full';
-    'message',
-    header === null ? ' message--content-only' : ' message--full',
-  ];
-  switch (msgType) {
-    case 'm.text':
-      className.push('message--type-text');
-      break;
-    case 'm.emote':
-      className.push('message--type-emote');
-      break;
-    case 'm.notice':
-      className.push('message--type-notice');
-      break;
-    default:
-  }
-
   return (
-    <div className={className.join(' ')}>
+    <div className={`message${msgClass}`}>
       <div className="message__avatar-container">
         {avatar !== null && avatar}
       </div>
@@ -280,7 +254,6 @@ Message.defaultProps = {
   editContent: null,
   reactions: null,
   options: null,
-  msgType: 'm.text',
 };
 Message.propTypes = {
   avatar: PropTypes.node,
@@ -290,7 +263,6 @@ Message.propTypes = {
   editContent: PropTypes.node,
   reactions: PropTypes.node,
   options: PropTypes.node,
-  msgType: PropTypes.string,
 };
 
 export {

src/app/molecules/message/Message.scss

@@ -22,12 +22,11 @@
   
   &__avatar-container {
     padding-top: 6px;
-    margin-right: var(--sp-tight);
-
-    & button {
-      cursor: pointer;
   }
   
+  &__avatar-container{
+    margin-right: var(--sp-tight);
+
     [dir=rtl] & {
       margin: {
         left: var(--sp-tight);
@@ -160,7 +159,7 @@
   }
 
   & a {
-    word-break: break-word;
+    word-break: break-all;
   }
   &-edited {
     color: var(--tc-surface-low);
@@ -262,16 +261,6 @@
     right: unset;
   }
 }
-@media (min-width: 1620px) {
-  .message__options {
-    right: unset;
-    left: 770px;
-    [dir=rtl] {
-      left: unset;
-      right: 770px
-    }
-  }
-}
 
 // markdown formating
 .message__content {
@@ -410,14 +399,3 @@
     }
   }
 }
-
-.message.message--type-emote {
-  .message__content {
-    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,6 +2,8 @@ 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';
 

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

@@ -18,7 +18,7 @@ function PeopleSelector({
         onClick={onClick}
         type="button"
       >
-        <Avatar imageSrc={avatarSrc} text={name} bgColor={color} size="extra-small" />
+        <Avatar imageSrc={avatarSrc} text={name.slice(0, 1)} bgColor={color} size="extra-small" />
         <Text className="people-selector__name" variant="b1">{name}</Text>
         {peopleRole !== null && <Text className="people-selector__role" variant="b3">{peopleRole}</Text>}
       </button>

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

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './RoomIntro.scss';
 
-import Linkify from 'linkify-react';
+import Linkify from 'linkifyjs/react';
 import colorMXID from '../../../util/colorMXID';
 
 import Text from '../../atoms/text/Text';
@@ -17,7 +17,7 @@ function RoomIntro({
 }) {
   return (
     <div className="room-intro">
-      <Avatar imageSrc={avatarSrc} text={name} bgColor={colorMXID(roomId)} size="large" />
+      <Avatar imageSrc={avatarSrc} text={name.slice(0, 1)} bgColor={colorMXID(roomId)} size="large" />
       <div className="room-intro__content">
         <Text className="room-intro__name" variant="h1">{heading}</Text>
         <Text className="room-intro__desc" variant="b1">{linkifyContent(desc)}</Text>
@@ -28,7 +28,7 @@ function RoomIntro({
 }
 
 RoomIntro.defaultProps = {
-  avatarSrc: null,
+  avatarSrc: false,
   time: null,
 };
 

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

@@ -51,7 +51,7 @@ function RoomSelector({
       content={(
         <>
           <Avatar
-            text={name}
+            text={name.slice(0, 1)}
             bgColor={colorMXID(roomId)}
             imageSrc={imageSrc}
             iconSrc={iconSrc}

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

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './RoomTile.scss';
 
-import Linkify from 'linkify-react';
+import Linkify from 'linkifyjs/react';
 import colorMXID from '../../../util/colorMXID';
 
 import Text from '../../atoms/text/Text';
@@ -22,7 +22,7 @@ function RoomTile({
         <Avatar
           imageSrc={avatarSrc}
           bgColor={colorMXID(id)}
-          text={name}
+          text={name.slice(0, 1)}
         />
       </div>
       <div className="room-tile__content">

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

@@ -1,41 +0,0 @@
-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

@@ -1,25 +0,0 @@
-.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

@@ -5,7 +5,6 @@ import './CreateRoom.scss';
 import initMatrix from '../../../client/initMatrix';
 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';
@@ -13,7 +12,6 @@ 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';
 
@@ -30,7 +28,6 @@ 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);
@@ -48,7 +45,6 @@ function CreateRoom({ isOpen, onRequestClose }) {
     updateTitleValue(undefined);
     updateTopicValue(undefined);
     updateAddressValue(undefined);
-    setRoleIndex(0);
   }
 
   async function createRoom() {
@@ -64,15 +60,12 @@ function CreateRoom({ isOpen, onRequestClose }) {
       if (roomAlias.trim() === '') roomAlias = undefined;
     }
 
-    const powerLevel = roleIndex === 1 ? 101 : undefined;
-
     try {
-      const result = await roomActions.create({
+      await roomActions.create({
-        name, topic, isPublic, roomAlias, isEncrypted, powerLevel,
+        name, topic, isPublic, roomAlias, isEncrypted,
       });
 
       resetForm();
-      selectRoom(result.room_id);
       onRequestClose();
     } catch (e) {
       if (e.message === 'M_UNKNOWN: Invalid characters in room alias') {
@@ -146,19 +139,6 @@ 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,13 +9,6 @@
     }
   }
 
-  & .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'], isContain: true, limit: 40 });
+asyncSearch.setup(emojis, { keys: ['shortcode'], limit: 30 });
 function SearchedEmoji() {
   const [searchedEmojis, setSearchedEmojis] = useState(null);
 
   function handleSearchEmoji(resultEmojis, term) {
     if (term === '' || resultEmojis.length === 0) {
       if (term === '') setSearchedEmojis(null);
-      else setSearchedEmojis({ emojis: [] });
+      else setSearchedEmojis([]);
       return;
     }
-    setSearchedEmojis({ emojis: resultEmojis });
+    setSearchedEmojis(resultEmojis);
   }
 
   useEffect(() => {
@@ -102,7 +102,7 @@ function SearchedEmoji() {
 
   if (searchedEmojis === null) return false;
 
-  return <EmojiGroup key="-1" name={searchedEmojis.emojis.length === 0 ? 'No search result found' : 'Search results'} groupEmojis={searchedEmojis.emojis} />;
+  return <EmojiGroup key="-1" name={searchedEmojis.length === 0 ? 'No search result found' : 'Search results'} groupEmojis={searchedEmojis} />;
 }
 
 function EmojiBoard({ onSelect }) {

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

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

src/app/organisms/navigation/SideBar.jsx

@@ -24,28 +24,6 @@ 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
@@ -67,10 +45,10 @@ function ProfileAvatarMenu() {
       render={(toggleMenu) => (
         <SidebarAvatar
           onClick={toggleMenu}
-          tooltip={profile.displayName}
+          tooltip={mx.getUser(mx.getUserId()).displayName}
-          imageSrc={profile.avatarUrl !== null ? mx.mxcUrlToHttp(profile.avatarUrl, 42, 42, 'crop') : null}
+          imageSrc={mx.getUser(mx.getUserId()).avatarUrl !== null ? mx.mxcUrlToHttp(mx.getUser(mx.getUserId()).avatarUrl, 42, 42, 'crop') : null}
           bgColor={colorMXID(mx.getUserId())}
-          text={profile.displayName}
+          text={mx.getUser(mx.getUserId()).displayName.slice(0, 1)}
         />
       )}
     />
@@ -121,7 +99,6 @@ 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);
@@ -190,7 +167,7 @@ function SideBar() {
                       tooltip={room.name}
                       bgColor={colorMXID(room.roomId)}
                       imageSrc={room.getAvatarUrl(initMatrix.matrixClient.baseUrl, 42, 42, 'crop') || null}
-                      text={room.name}
+                      text={room.name.slice(0, 1)}
                       isUnread={notifications.hasNoti(sRoomId)}
                       notificationCount={abbreviateNumber(notifications.getTotalNoti(sRoomId))}
                       isAlert={notifications.getHighlightNoti(sRoomId) !== 0}

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useRef } from 'react';
 import PropTypes from 'prop-types';
 
 import initMatrix from '../../../client/initMatrix';
@@ -17,17 +17,11 @@ function ProfileEditor({
   const mx = initMatrix.matrixClient;
   const displayNameRef = useRef(null);
   const bgColor = colorMXID(userId);
-  const [avatarSrc, setAvatarSrc] = useState(null);
+  const [avatarSrc, setAvatarSrc] = useState(mx.mxcUrlToHttp(mx.getUser(mx.getUserId()).avatarUrl, 80, 80, 'crop') || 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

@@ -1,298 +0,0 @@
-import React, { useState, useEffect, useRef } from 'react';
-import PropTypes from 'prop-types';
-import './ProfileViewer.scss';
-
-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 canIKick = room.currentState.hasSufficientPowerLevelFor('kick', myPowerlevel);
-
-  useEffect(() => () => {
-    isMountedRef.current = false;
-  }, []);
-  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.currentState.members[userId]) {
-        selectRoom(directIds[i]);
-        onRequestClose();
-        return;
-      }
-    }
-
-    // Create new DM
-    try {
-      setIsCreatingDM(true);
-      const result = await roomActions.create({
-        isEncrypted: true,
-        isDirect: true,
-        invite: [userId],
-      });
-
-      if (isMountedRef.current === false) return;
-      setIsCreatingDM(false);
-      selectRoom(result.room_id);
-      onRequestClose();
-    } catch {
-      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">{username}</Text>
-            <Text variant="b2">{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

@@ -1,89 +0,0 @@
-.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: 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: 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/pw/Dialogs.jsx

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

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

@@ -11,7 +11,6 @@ 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);
@@ -59,10 +58,7 @@ function ReadReceipts() {
     return (
       <PeopleSelector
         key={receipt.userId}
-        onClick={() => {
+        onClick={() => alert('Viewing profile is yet to be implemented')}
-          setIsOpen(false);
-          openProfileViewer(receipt.userId, roomId);
-        }}
         avatarSrc={member?.getAvatarUrl(initMatrix.matrixClient.baseUrl, 24, 24, 'crop')}
         name={getUserDisplayName(receipt.userId)}
         color={colorMXID(receipt.userId)}

src/app/organisms/room/PeopleDrawer.jsx

@@ -1,29 +1,29 @@
-import React, {
+import React, { useState, useEffect } from 'react';
-  useState, useEffect, useCallback, useRef,
-} from 'react';
 import PropTypes from 'prop-types';
 import './PeopleDrawer.scss';
 
 import initMatrix from '../../../client/initMatrix';
-import { getPowerLabel, getUsernameOfRoomMember } from '../../../util/matrixUtil';
+import { getUsernameOfRoomMember } from '../../../util/matrixUtil';
 import colorMXID from '../../../util/colorMXID';
-import { openInviteUser, openProfileViewer } from '../../../client/action/navigation';
+import { openInviteUser } 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,102 +44,31 @@ 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 mx = initMatrix.matrixClient;
+  const room = initMatrix.matrixClient.getRoom(roomId);
-  const room = mx.getRoom(roomId);
+  const totalMemberList = room.getJoinedMembers().sort(AtoZ).sort(sortByPowerLevel);
+  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() {
-    setItemCount(itemCount + PER_PAGE_MEMBER);
+    updateMemberList(totalMemberList.slice(0, memberList.length + 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(() => {
-    asyncSearch.setup(memberList, {
+    updateMemberList(totalMemberList.slice(0, PER_PAGE_MEMBER));
-      keys: ['name', 'username', 'userId'],
-      limit: PER_PAGE_MEMBER,
-    });
-  }, [memberList]);
-
-  useEffect(() => {
-    let isGettingMembers = true;
-    const updateMemberList = (event) => {
-      if (isGettingMembers) return;
-      console.log(event?.event?.room_id);
-      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;
-      updateMemberList();
+      const newTotalMemberList = room.getJoinedMembers().sort(AtoZ).sort(sortByPowerLevel);
+      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>
@@ -155,53 +84,21 @@ 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]?.();
-                }}
-              />
               {
-                mList.map((member) => (
+                memberList.map((member) => (
                   <PeopleSelector
                     key={member.userId}
-                    onClick={() => openProfileViewer(member.userId, roomId)}
+                    onClick={() => alert('Viewing profile is yet to be implemented')}
-                    avatarSrc={member.avatarSrc}
+                    avatarSrc={member.getAvatarUrl(initMatrix.matrixClient.baseUrl, 24, 24, 'crop')}
-                    name={member.name}
+                    name={getUsernameOfRoomMember(member)}
                     color={colorMXID(member.userId)}
-                    peopleRole={member.peopleRole}
+                    peopleRole={getPowerLabel(member.powerLevel)}
                   />
                 ))
               }
-              {
-                (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">
                 {
-                  mList.length !== 0
+                  memberList.length !== totalMemberList.length && (
-                  && memberList.length > itemCount
-                  && searchedMembers === null
-                  && (
                     <Button onClick={loadMorePeople}>View more</Button>
                   )
                 }
@@ -211,12 +108,7 @@ function PeopleDrawer({ roomId }) {
         </div>
         <div className="people-drawer__sticky">
           <form onSubmit={(e) => e.preventDefault()} className="people-search">
-            <RawIcon size="small" src={SearchIC} />
+            <Input type="text" placeholder="Search" required />
-            <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,48 +35,19 @@
     @extend .people-drawer-flexItem;
   }
 
-  &__noresult {
-    padding: var(--sp-extra-tight) var(--sp-normal);
-    text-align: center;
-  }
-
   &__sticky {
+    display: none;
+
     & .people-search {
-      --search-input-height: 40px;
+      min-height: 48px;
-      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 {
-        padding: 0 calc(var(--sp-loose) + var(--sp-normal));
+        height: 48px;
-        height: var(--search-input-height);
       }
     }
   }
@@ -84,21 +55,7 @@
 
 .people-drawer__content {
   padding-top: var(--sp-extra-tight);
-  padding-bottom: calc(2 * var(--sp-normal));
+  padding-bottom: calc( var(--sp-extra-tight) + 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/RoomViewCmdBar.jsx

@@ -319,7 +319,6 @@ 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';
       }
     }
 
@@ -344,7 +343,7 @@ function RoomViewCmdBar({ roomId, roomTimeline, viewEvent }) {
       '>*': () => asyncSearch.setup(getRooms([...roomList.spaces]), { keys: ['name'], limit: 20 }),
       '>#': () => asyncSearch.setup(getRooms([...roomList.rooms]), { keys: ['name'], limit: 20 }),
       '>@': () => asyncSearch.setup(getRooms([...roomList.directs]), { keys: ['name'], limit: 20 }),
-      ':': () => asyncSearch.setup(emojis, { keys: ['shortcode'], isContain: true, limit: 20 }),
+      ':': () => asyncSearch.setup(emojis, { keys: ['shortcode'], limit: 20 }),
       '@': () => asyncSearch.setup(matrixClient.getRoom(roomId).getJoinedMembers().map((member) => ({
         name: member.name,
         userId: member.userId.slice(1),

src/app/organisms/room/RoomViewContent.jsx

@@ -8,10 +8,10 @@ import dateFormat from 'dateformat';
 import initMatrix from '../../../client/initMatrix';
 import cons from '../../../client/state/cons';
 import { redactEvent, sendReaction } from '../../../client/action/roomTimeline';
-import { getUsername, getUsernameOfRoomMember } from '../../../util/matrixUtil';
+import { getUsername, getUsernameOfRoomMember, doesRoomHaveUnread } from '../../../util/matrixUtil';
 import colorMXID from '../../../util/colorMXID';
 import { diffMinutes, isNotInSameDay, getEventCords } from '../../../util/common';
-import { openEmojiBoard, openProfileViewer, openReadReceipts } from '../../../client/action/navigation';
+import { openEmojiBoard, openReadReceipts } from '../../../client/action/navigation';
 
 import Divider from '../../atoms/divider/Divider';
 import Avatar from '../../atoms/avatar/Avatar';
@@ -191,7 +191,6 @@ function RoomViewContent({
   const [onPagination, setOnPagination] = useState(null);
   const [editEvent, setEditEvent] = useState(null);
   const mx = initMatrix.matrixClient;
-  const noti = initMatrix.notifications;
 
   function autoLoadTimeline() {
     if (timelineScroll.isScrollable() === true) return;
@@ -200,7 +199,7 @@ function RoomViewContent({
   function trySendingReadReceipt() {
     const { room, timeline } = roomTimeline;
     if (
-      (noti.doesRoomHaveUnread(room) || noti.hasNoti(roomId))
+      (doesRoomHaveUnread(room) || initMatrix.notifications.hasNoti(roomId))
       && timeline.length !== 0) {
       mx.sendReadReceipt(timeline[timeline.length - 1]);
     }
@@ -283,7 +282,6 @@ function RoomViewContent({
 
     let content = mEvent.getContent().body;
     if (typeof content === 'undefined') return null;
-    const msgType = mEvent.getContent()?.msgtype;
     let reply = null;
     let reactions = null;
     let isMarkdown = mEvent.getContent().format === 'org.matrix.custom.html';
@@ -355,14 +353,12 @@ function RoomViewContent({
 
     const senderMXIDColor = colorMXID(mEvent.sender.userId);
     const userAvatar = isContentOnly ? null : (
-      <button type="button" onClick={() => openProfileViewer(mEvent.sender.userId, roomId)}>
       <Avatar
         imageSrc={mEvent.sender.getAvatarUrl(initMatrix.matrixClient.baseUrl, 36, 36, 'crop')}
-          text={getUsernameOfRoomMember(mEvent.sender)}
+        text={getUsernameOfRoomMember(mEvent.sender).slice(0, 1)}
         bgColor={senderMXIDColor}
         size="small"
       />
-      </button>
     );
     const userHeader = isContentOnly ? null : (
       <MessageHeader
@@ -381,10 +377,8 @@ function RoomViewContent({
     );
     const userContent = (
       <MessageContent
-        senderName={getUsernameOfRoomMember(mEvent.sender)}
         isMarkdown={isMarkdown}
         content={isMedia(mEvent) ? genMediaContent(mEvent) : content}
-        msgType={msgType}
         isEdited={isEdited}
       />
     );
@@ -500,7 +494,6 @@ function RoomViewContent({
         header={userHeader}
         reply={userReply}
         content={editEvent !== null && isEditingEvent ? null : userContent}
-        msgType={msgType}
         editContent={editEvent !== null && isEditingEvent ? (
           <MessageEdit
             content={content}

src/app/organisms/room/RoomViewHeader.jsx

@@ -24,7 +24,7 @@ function RoomViewHeader({ roomId }) {
 
   return (
     <Header>
-      <Avatar imageSrc={avatarSrc} text={roomName} bgColor={colorMXID(roomId)} size="small" />
+      <Avatar imageSrc={avatarSrc} text={roomName.slice(0, 1)} bgColor={colorMXID(roomId)} size="small" />
       <TitleWrapper>
         <Text variant="h2">{roomName}</Text>
         { typeof roomTopic !== 'undefined' && <p title={roomTopic} className="text text-b3">{roomTopic}</p>}

src/app/organisms/room/RoomViewInput.jsx

@@ -29,7 +29,7 @@ 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;
@@ -313,7 +313,6 @@ function RoomViewInput({
 
   function addEmoji(emoji) {
     textAreaRef.current.value += emoji.unicode;
-    textAreaRef.current.focus();
   }
 
   function handleUploadClick() {
@@ -328,7 +327,8 @@ function RoomViewInput({
     if (file !== null) roomsInput.setAttachment(roomId, file);
   }
 
-  const canISend = roomTimeline.room.currentState.maySendMessage(mx.getUserId());
+  const myPowerlevel = roomTimeline.room.getMember(mx.getUserId()).powerLevel;
+  const canISend = roomTimeline.room.currentState.hasSufficientPowerLevelFor('events_default', myPowerlevel);
 
   function renderInputs() {
     if (!canISend) {

src/app/organisms/settings/Settings.jsx

@@ -3,7 +3,6 @@ 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';
 
@@ -105,13 +104,13 @@ function AboutSection() {
         <div>
           <Text variant="h2">
             Cinny
-            <span className="text text-b3" style={{ margin: '0 var(--sp-extra-tight)' }}>{`v${cons.version}`}</span>
+            <span className="text text-b3" style={{ margin: '0 var(--sp-extra-tight)' }}>v1.3.2</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://cinny.in/#sponsor')}>Support</Button>
+            <Button onClick={() => window.open('https://liberapay.com/ajbura/donate')}>Support</Button>
           </div>
         </div>
       </div>

src/app/pages/App.jsx

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

src/app/templates/auth/Auth.jsx

@@ -1,14 +1,10 @@
-/* eslint-disable react/prop-types */
+import React, { useState, useRef } from 'react';
-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';
@@ -16,556 +12,320 @@ 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 ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
+import EyeIC from '../../../../public/res/ic/outlined/eye.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 can only contain characters a-z, 0-9, or \'=_-./\'';
+const BAD_LOCALPART_ERROR = 'Username must contain only a-z, 0-9, ., _, =, -, and /.';
 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 lowercase, 1 uppercase, 1 number, 1 non-alphanumeric character, 8-127 characters with no space.';
+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 CONFIRM_PASSWORD_ERROR = 'Passwords don\'t match.';
 
-const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
+const EMAIL_REGEX = /([a-z0-9]+[_a-z0-9.-][a-z0-9]+)@([a-z0-9-]+(?:.[a-z0-9-]+).[a-z]{2,4})/;
 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, stopAutoFocus) {
+  renderErrorMessage(error);
+  if (!stopAutoFocus) $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(targetInput, regex, error, stopAutoFocus) {
+  if (!isValidInput(targetInput.value, regex) && targetInput.value) {
+    showBadInputError(targetInput, error, stopAutoFocus);
+    return false;
+  }
+  document.getElementById('auth_error').style.display = 'none';
+  targetInput.style.removeProperty('border');
+  targetInput.style.removeProperty('box-shadow');
+  document.getElementById('auth_submit-btn').disabled = false;
+  return true;
+}
+
+/**
+ * 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();
 }
 
-let searchingHs = null;
+function Auth({ type }) {
-function Homeserver({ onChange }) {
+  const [process, changeProcess] = useState(null);
-  const [hs, setHs] = useState(null);
+  const usernameRef = useRef(null);
-  const [debounce] = useState(new Debounce());
+  const homeserverRef = useRef(null);
-  const [process, setProcess] = useState({ isLoading: true, message: 'Loading homeserver list...' });
+  const passwordRef = useRef(null);
-  const hsRef = useRef();
+  const confirmPasswordRef = useRef(null);
+  const emailRef = useRef(null);
 
-  const setupHsConfig = async (servername) => {
+  function register(recaptchaValue, terms, verified) {
-    setProcess({ isLoading: true, message: 'Looking for homeserver...' });
+    auth.register(
-    let baseUrl = null;
+      usernameRef.current.value,
-    try {
+      homeserverRef.current.value,
-      baseUrl = await getBaseUrl(servername);
+      passwordRef.current.value,
-    } catch (e) {
+      emailRef.current.value,
-      baseUrl = e.message;
+      recaptchaValue,
+      terms,
+      verified,
+    ).then((res) => {
+      document.getElementById('auth_submit-btn').disabled = false;
+      if (res.type === 'recaptcha') {
+        changeProcess({ type: res.type, sitekey: res.public_key });
+        return;
       }
-    if (searchingHs !== servername) return;
+      if (res.type === 'terms') {
-    setProcess({ isLoading: true, message: `Connecting to ${baseUrl}...` });
+        changeProcess({ type: res.type, en: res.en });
-    const tempClient = auth.createTemporaryClient(baseUrl);
-
-    Promise.allSettled([tempClient.loginFlows(), tempClient.register()])
-      .then((values) => {
-        const loginFlow = values[0].status === 'fulfilled' ? values[0]?.value : undefined;
-        const registerFlow = values[1].status === 'rejected' ? values[1]?.reason?.data : undefined;
-        if (loginFlow === undefined || registerFlow === undefined) throw new Error();
-
-        if (searchingHs !== servername) return;
-        onChange({ baseUrl, login: loginFlow, register: registerFlow });
-        setProcess({ isLoading: false });
-      }).catch(() => {
-        if (searchingHs !== servername) return;
-        onChange(null);
-        setProcess({ isLoading: false, error: 'Unable to connect. Please check your input.' });
-      });
-  };
-
-  useEffect(() => {
-    onChange(null);
-    if (hs === null || hs?.selected.trim() === '') return;
-    searchingHs = hs.selected;
-    setupHsConfig(hs.selected);
-  }, [hs]);
-
-  useEffect(async () => {
-    const link = window.location.href;
-    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 });
+      if (res.type === 'email') {
-    } catch {
+        changeProcess({ type: res.type });
-      setHs({ selected: 'matrix.org', list: ['matrix.org'] });
       }
-  }, []);
+      if (res.type === 'done') {
-
+        window.location.replace('/');
-  const handleHsInput = (e) => {
-    const { value } = e.target;
-    setProcess({ isLoading: false });
-    debounce._(async () => {
-      setHs({ selected: value, list: hs.list });
-    }, 700)();
-  };
-
-  return (
-    <>
-      <div className="homeserver-form">
-        <Input name="homeserver" onChange={handleHsInput} value={hs?.selected} forwardRef={hsRef} label="Homeserver" />
-        <ContextMenu
-          placement="right"
-          content={(hideMenu) => (
-            <>
-              <MenuHeader>Homeserver list</MenuHeader>
-              {
-                hs?.list.map((hsName) => (
-                  <MenuItem
-                    key={hsName}
-                    onClick={() => {
-                      hideMenu();
-                      hsRef.current.value = hsName;
-                      setHs({ selected: hsName, list: hs.list });
-                    }}
-                  >
-                    {hsName}
-                  </MenuItem>
-                ))
       }
-            </>
-          )}
-          render={(toggleMenu) => <IconButton onClick={toggleMenu} src={ChevronBottomIC} />}
-        />
-      </div>
-      {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" />
-          <Text variant="b2">{process.message}</Text>
-        </div>
-      )}
-    </>
-  );
-}
-Homeserver.propTypes = {
-  onChange: PropTypes.func.isRequired,
-};
-
-function Login({ loginFlow, baseUrl }) {
-  const [typeIndex, setTypeIndex] = useState(0);
-  const loginTypes = ['Username', 'Email'];
-  const isPassword = loginFlow?.filter((flow) => flow.type === 'm.login.password')[0];
-  const ssoProviders = loginFlow?.filter((flow) => flow.type === 'm.login.sso')[0];
-
-  const initialValues = {
-    username: '', password: '', email: '', other: '',
-  };
-
-  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;
+      changeProcess(null);
-    if (msg === 'Unknown message') msg = 'Please check your credentials';
+      renderErrorMessage(error);
-    actions.setErrors({
+      document.getElementById('auth_submit-btn').disabled = false;
-      password: msg === 'Invalid password' ? msg : undefined,
-      other: msg !== 'Invalid password' ? msg : undefined,
-    });
-    actions.setSubmitting(false);
     });
+    if (terms) {
+      changeProcess({ type: 'loading', message: 'Sending email verification link...' });
+    } else changeProcess({ type: 'loading', message: 'Registration in progress...' });
+  }
 
+  function handleLogin(e) {
+    e.preventDefault();
+    document.getElementById('auth_submit-btn').disabled = true;
+    document.getElementById('auth_error').style.display = 'none';
+
+    /** @type {string} */
+    const rawUsername = usernameRef.current.value;
+    /** @type {string} */
+    const normalizedUsername = normalizeUsername(rawUsername);
+
+    auth.login(normalizedUsername, homeserverRef.current.value, passwordRef.current.value)
+      .then(() => {
+        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) {
+    e.preventDefault();
+    document.getElementById('auth_submit-btn').disabled = true;
+    document.getElementById('auth_error').style.display = 'none';
+
+    if (!isValidInput(usernameRef.current.value, LOCALPART_SIGNUP_REGEX)) {
+      showBadInputError(usernameRef.current, BAD_LOCALPART_ERROR);
+      return;
+    }
+    if (!isValidInput(passwordRef.current.value, PASSWORD_STRENGHT_REGEX)) {
+      showBadInputError(passwordRef.current, BAD_PASSWORD_ERROR);
+      return;
+    }
+    if (passwordRef.current.value !== confirmPasswordRef.current.value) {
+      showBadInputError(confirmPasswordRef.current, CONFIRM_PASSWORD_ERROR);
+      return;
+    }
+    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 (
     <>
-      <div className="auth-form__heading">
+      {process?.type === 'loading' && <LoadingScreen message={process.message} />}
-        <Text variant="h2">Login</Text>
+      {process?.type === 'recaptcha' && <Recaptcha message="Please check the box below to proceed." sitekey={process.sitekey} onChange={(v) => { if (typeof v === 'string') register(v); }} />}
-        {isPassword && (
+      {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' }}>
-              loginTypes.map((type, index) => (
+            <Text variant="h2">Verify email</Text>
-                <MenuItem
+            <div style={{ margin: 'var(--sp-normal) 0' }}>
-                  key={type}
+              <Text variant="b1">
-                  onClick={() => {
+                Please check your email
-                    hideMenu();
+                {' '}
-                    setTypeIndex(index);
+                <b>{`(${emailRef.current.value})`}</b>
-                  }}
+                {' '}
-                >
+                and validate before continuing further.
-                  {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>
+            </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.target, LOCALPART_LOGIN_REGEX, BAD_LOCALPART_ERROR)
+                  : validateOnChange(e.target, 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) => {
+                  const isValidPass = validateOnChange(e.target, ((type === 'login') ? PASSWORD_REGEX : PASSWORD_STRENGHT_REGEX), BAD_PASSWORD_ERROR);
+                  if (type === 'register' && isValidPass) {
+                    validateOnChange(
+                      confirmPasswordRef.current, passwordRef.current.value,
+                      CONFIRM_PASSWORD_ERROR, true,
+                    );
+                  }
+                }}
+                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.target, passwordRef.current.value, CONFIRM_PASSWORD_ERROR);
+                    }}
+                    id="auth_confirmPassword"
+                    type="password"
+                    label="Confirm password"
+                    required
+                  />
+                  <IconButton
+                    onClick={() => {
+                      if (confirmPasswordRef.current.type === 'password') {
+                        confirmPasswordRef.current.type = 'text';
+                      } else confirmPasswordRef.current.type = 'password';
+                    }}
+                    size="extra-small"
+                    src={EyeIC}
+                  />
+                </div>
+                <Input
+                  forwardRef={emailRef}
+                  onChange={(e) => validateOnChange(e.target, EMAIL_REGEX, BAD_EMAIL_ERROR)}
+                  id="auth_email"
+                  type="email"
+                  label="Email"
+                  required
+                />
+              </>
+            )}
+            <div className="submit-btn__wrapper flex--end">
+              <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>
+
+        <div className="flex--center">
+          <Text variant="b2">
+            {`${(type === 'login' ? 'Don\'t have' : 'Already have')} an account?`}
+            <Link to={type === 'login' ? '/register' : '/login'}>
+              { type === 'login' ? ' Register' : ' Login' }
+            </Link>
+          </Text>
+        </div>
+      </StaticWrapper>
     </>
   );
 }
 
-function Auth() {
+Auth.propTypes = {
-  const [loginToken, setLoginToken] = useState(getUrlPrams('loginToken'));
+  type: PropTypes.string.isRequired,
-
+};
-  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__base">
+      <div className="auth__wrapper flex--center">
-        <div className="auth__wrapper">
+        <div className="auth-card">
-          {loginToken && <LoadingScreen message="Redirecting..." />}
+          <div className="auth-card__interactive flex-v">
-          {!loginToken && (
+            <div className="app-ident flex">
-            <div className="auth-card flex-v">
+              <img className="app-ident__logo noselect" src={CinnySvg} alt="Cinny logo" />
-              <Header>
+              <div className="app-ident__text flex-v--center">
-                <Avatar size="extra-small" imageSrc={CinnySvg} />
-                <TitleWrapper>
                 <Text variant="h2">Cinny</Text>
-                </TitleWrapper>
+                <Text variant="b2">Yet another matrix client</Text>
-              </Header>
-              <div className="auth-card__content">
-                <AuthCard />
               </div>
             </div>
-          )}
+            { children }
           </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>
@@ -599,7 +359,7 @@ Recaptcha.propTypes = {
 function Terms({ url, onSubmit }) {
   return (
     <ProcessWrapper>
-      <form onSubmit={(e) => { e.preventDefault(); onSubmit(); }}>
+      <form onSubmit={() => onSubmit(undefined, true)}>
         <div style={{ margin: 'var(--sp-normal)', maxWidth: '450px' }}>
           <Text variant="h2">Agree with terms</Text>
           <div style={{ marginBottom: 'var(--sp-normal)' }} />
@@ -622,27 +382,6 @@ 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,144 +1,156 @@
-.auth__base {
+.auth__wrapper {
-  --pattern-size: 48px;
+  min-height: 100vh;
-  min-height: 100%;
+  padding: var(--sp-loose);
   background-color: var(--bg-surface-low);
 
-  background-image: radial-gradient(rgba(0, 0, 0, 6%) 2px, rgba(0, 0, 0, 0%) 2px);
+  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-size: var(--pattern-size) var(--pattern-size);
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: center;
 
-  display: flex;
-  flex-direction: column;
-}
-.auth__wrapper {
-  flex: 1;
-  padding: var(--sp-loose);
-  padding-bottom: 0;
-  display: flex;
-  justify-content: center;
-  align-items: flex-start;
-}
-.auth-footer {
-  padding: var(--sp-normal) 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  & > *:nth-child(2n) {
-    margin: 0 var(--sp-loose);
-  }
-  & a {
-    color: var(--tc-surface-normal);
-    &:hover { text-decoration: underline; }
-  }
-}
   .auth-card {
     width: 462px;
-  background-color: var(--bg-surface);
+    min-height: 644px;
+    background-color: var(--bg-surface-low);
     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;
-  }
-}
-
-.homeserver-form,
-.auth-form__heading {
-  & .context-menu .btn-surface .ic-raw {
-    width: 0;
-  }
-}
-
-.homeserver-form {
     display: flex;
-  margin-bottom: var(--sp-extra-tight);
+    flex-flow: row nowrap;
-  align-items: flex-end;
+    
-  & > .input-container {
+    &__interactive{
       flex: 1;
-    & .input {
+      min-width: 0;
-      border-right: unset;
+    }
-      border-radius: var(--bo-radius) 0 0 var(--bo-radius);
+
+    &__interactive {
+      padding: calc(var(--sp-normal) + var(--sp-extra-loose));
+      padding-bottom: var(--sp-extra-loose);
       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);
   }
 }
 
-  &__status {
+.app-ident {
-    margin-top: var(--sp-normal);
+  margin-bottom: var(--sp-extra-loose);
-    & .donut-spinner {
+
-      min-width: 28px;
+  &__logo {
+    width: 60px;
+    height: 60px;
   }
-    & .text {
+  &__text {
-      margin: 0 var(--sp-tight);
+    margin-left: calc(var(--sp-loose) + var(--sp-ultra-tight));
+
+    .text-s1 {
+      margin-top: var(--sp-tight);
+      color: var(--tc-surface-normal);
     }
+
+    [dir=rtl] & {
+      margin-left: 0;
+      margin-right:  calc(var(--sp-loose) + var(--sp-ultra-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: var(--sp-tight) 0 var(--sp-ultra-tight);
+    margin-top: var(--sp-tight);
   }
 
-  &__heading {
+  .submit-btn__wrapper {
-    display: flex;
+    margin-top: var(--sp-extra-loose);
-    justify-content: space-between;
+    margin-bottom: var(--sp-loose);
-    margin-top: calc(var(--sp-extra-loose) + var(--sp-tight));
+    align-items: flex-start;
-  }
 
-  &__btns {
+    & > .error-message {
-    padding-top: var(--sp-loose);
+      display: none;
-    margin-bottom: var(--sp-extra-loose);
-    display: flex;
-    justify-content: flex-end;
-  }
-
-  &__error {
-    color: var(--tc-danger-normal) !important;
-  }
-}
-.sso__divider {
-  margin-bottom: var(--sp-tight);
-  display: flex;
-  align-items: center;
-
-  &::before,
-  &::after {
       flex: 1;
-    content: '';
+      color: var(--tc-danger-normal);
-    margin: var(--sp-tight);
+      margin-right: var(--sp-normal);
-    border-bottom: 1px solid var(--bg-surface-border);
+      word-break: break;
+
+      [dir=rtl] & {
+        margin: {
+          right: 0;
+          left: var(--sp-normal);
+        }
+      }
+    }
+  }
+
+  &__wrapper {
+    height: 100%;
+  }
+}
+
+.username__wrapper {
+  display: flex;
+  align-items: flex-end;
+
+  & > :first-child {
+    flex: 1;
+
+    .input {
+      border-radius: var(--bo-radius) 0 0 var(--bo-radius);
+
+      [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: var(--sp-tight);
+    padding: 0;
-  }
+    background-image: none;
+    background-color: var(--bg-surface);
+
     .auth-card {
-    &__content {
+      border-radius: 0;
-      padding: var(--sp-loose) var(--sp-normal);
+      box-shadow: none;
+
+      &__interactive {
+        padding: var(--sp-extra-loose);
+      }
     }
   }
 }

src/app/templates/client/Client.jsx

@@ -9,31 +9,14 @@ 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();
@@ -42,11 +25,8 @@ 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">{loadingMsg}</Text>
+        <Text className="loading__message" variant="b2">Heating up</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: 100%;
+  height: 100vh;
 
   display: flex;
   flex-direction: column;
@@ -27,19 +27,8 @@
 }
 .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,64 +1,39 @@
 import * as sdk from 'matrix-js-sdk';
 import cons from '../state/cons';
+import { getBaseUrl } from '../../util/matrixUtil';
 
-function updateLocalStore(accessToken, deviceId, userId, baseUrl) {
+async function login(username, homeserver, password) {
-  localStorage.setItem(cons.secretKey.ACCESS_TOKEN, accessToken);
+  let baseUrl = null;
-  localStorage.setItem(cons.secretKey.DEVICE_ID, deviceId);
+  try {
-  localStorage.setItem(cons.secretKey.USER_ID, userId);
+    baseUrl = await getBaseUrl(homeserver);
-  localStorage.setItem(cons.secretKey.BASE_URL, baseUrl);
+  } catch (e) {
+    baseUrl = `https://${homeserver}`;
   }
 
-function createTemporaryClient(baseUrl) {
+  if (typeof baseUrl === 'undefined') throw new Error('Homeserver not found');
-  return sdk.createClient({ baseUrl });
-}
 
-async function startSsoLogin(baseUrl, type, idpId) {
+  const client = sdk.createClient({ baseUrl });
-  const client = createTemporaryClient(baseUrl);
-  localStorage.setItem(cons.secretKey.BASE_URL, client.baseUrl);
-  window.location.href = client.getSsoLoginUrl(window.location.href, type, idpId);
-}
 
-async function login(baseUrl, username, email, password) {
+  const response = await client.login('m.login.password', {
-  const identifier = {};
+    identifier: {
-  if (username) {
+      type: 'm.id.user',
-    identifier.type = 'm.id.user';
+      user: username,
-    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,
   });
 
-  const myBaseUrl = res?.well_known?.['m.homeserver']?.base_url || client.baseUrl;
+  localStorage.setItem(cons.secretKey.ACCESS_TOKEN, response.access_token);
-  updateLocalStore(res.access_token, res.device_id, res.user_id, myBaseUrl);
+  localStorage.setItem(cons.secretKey.DEVICE_ID, response.device_id);
+  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 loginWithToken(baseUrl, token) {
+async function getAdditionalInfo(baseUrl, content) {
-  const client = createTemporaryClient(baseUrl);
+  try {
-
+    const res = await fetch(`${baseUrl}/_matrix/client/r0/register`, {
-  const res = await client.login('m.login.token', {
-    token,
-    initial_device_display_name: cons.DEVICE_DISPLAY_NAME,
-  });
-
-  const myBaseUrl = res?.well_known?.['m.homeserver']?.base_url || client.baseUrl;
-  updateLocalStore(res.access_token, res.device_id, res.user_id, myBaseUrl);
-}
-
-// eslint-disable-next-line camelcase
-async function verifyEmail(baseUrl, email, client_secret, send_attempt, next_link) {
-  const res = await fetch(`${baseUrl}/_matrix/client/r0/register/email/requestToken`, {
       method: 'POST',
-    body: JSON.stringify({
+      body: JSON.stringify(content),
-      email, client_secret, send_attempt, next_link,
-    }),
       headers: {
         'Content-Type': 'application/json; charset=utf-8',
       },
@@ -66,39 +41,112 @@ async function verifyEmail(baseUrl, email, client_secret, send_attempt, next_lin
     });
     const data = await res.json();
     return data;
+  } catch (e) {
+    throw new Error(e);
   }
-
+}
-async function completeRegisterStage(
+async function verifyEmail(baseUrl, content) {
-  baseUrl, username, password, auth,
-) {
-  const tempClient = createTemporaryClient(baseUrl);
-
   try {
-    const result = await tempClient.registerRequest({
+    const res = await fetch(`${baseUrl}/_matrix/client/r0/register/email/requestToken`, {
-      username,
+      method: 'POST',
-      password,
+      body: JSON.stringify(content),
-      auth,
+      headers: {
-      initial_device_display_name: cons.DEVICE_DISPLAY_NAME,
+        'Content-Type': 'application/json; charset=utf-8',
+      },
+      credentials: 'same-origin',
     });
-    const data = { completed: result.completed || [] };
+    const data = await res.json();
-    if (result.access_token) {
-      data.done = true;
-      updateLocalStore(result.access_token, result.device_id, result.user_id, baseUrl);
-    }
     return data;
   } catch (e) {
-    const result = e.data;
+    throw new Error(e);
-    const data = { completed: result.completed || [] };
-    if (result.access_token) {
-      data.done = true;
-      updateLocalStore(result.access_token, result.device_id, result.user_id, baseUrl);
-    }
-    return data;
   }
 }
 
-export {
+let session = null;
-  createTemporaryClient, login, verifyEmail,
+let clientSecret = null;
-  loginWithToken, startSsoLogin,
+let sid = null;
-  completeRegisterStage,
+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) {
+    return ({
+      type: 'recaptcha',
+      public_key: additionalInfo.params['m.login.recaptcha'].public_key,
+    });
+  }
+  if (additionalInfo.completed.find((process) => process === 'm.login.recaptcha') === 'm.login.recaptcha'
+    && !additionalInfo.completed.find((process) => process === 'm.login.terms')) {
+    return ({
+      type: 'terms',
+      en: additionalInfo.params['m.login.terms'].policies.privacy_policy.en,
+    });
+  }
+  if (verified || additionalInfo.completed.find((process) => process === 'm.login.terms') === 'm.login.terms') {
+    const tpc = {
+      client_secret: clientSecret,
+      sid,
     };
+    const verifyData = await getAdditionalInfo(baseUrl, {
+      auth: {
+        session,
+        type: 'm.login.email.identity',
+        threepidCreds: tpc,
+        threepid_creds: tpc,
+      },
+      username,
+      password,
+    });
+    if (verifyData.errcode === 'M_UNAUTHORIZED') {
+      return { type: 'email' };
+    }
+
+    localStorage.setItem(cons.secretKey.ACCESS_TOKEN, verifyData.access_token);
+    localStorage.setItem(cons.secretKey.DEVICE_ID, verifyData.device_id);
+    localStorage.setItem(cons.secretKey.USER_ID, verifyData.user_id);
+    localStorage.setItem(cons.secretKey.BASE_URL, baseUrl);
+    return { type: 'done' };
+  }
+  return {};
+}
+
+export { login, register };

src/client/action/logout.js

@@ -2,7 +2,6 @@ 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

@@ -55,14 +55,6 @@ function openInviteUser(roomId, searchTerm) {
   });
 }
 
-function openProfileViewer(userId, roomId) {
-  appDispatcher.dispatch({
-    type: cons.actions.navigation.OPEN_PROFILE_VIEWER,
-    userId,
-    roomId,
-  });
-}
-
 function openSettings() {
   appDispatcher.dispatch({
     type: cons.actions.navigation.OPEN_SETTINGS,
@@ -102,7 +94,6 @@ export {
   openPublicRooms,
   openCreateRoom,
   openInviteUser,
-  openProfileViewer,
   openSettings,
   openEmojiBoard,
   openReadReceipts,

src/client/action/room.js

@@ -132,11 +132,9 @@ 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,
@@ -145,10 +143,6 @@ 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) {
@@ -188,15 +182,12 @@ async function create(opts) {
 async function invite(roomId, userId) {
   const mx = initMatrix.matrixClient;
 
+  try {
     const result = await mx.invite(roomId, userId);
     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) {
@@ -215,6 +206,6 @@ function deleteSpaceShortcut(roomId) {
 
 export {
   join, leave,
-  create, invite, kick,
+  create, invite,
   createSpaceShortcut, deleteSpaceShortcut,
 };

src/client/initMatrix.js

@@ -31,7 +31,6 @@ class InitMatrix extends EventEmitter {
       sessionStore: new sdk.WebStorageSessionStore(global.localStorage),
       cryptoStore: new sdk.IndexedDBCryptoStore(global.indexedDB, 'crypto-store'),
       deviceId: secret.deviceId,
-      timelineSupport: true,
     });
 
     await this.matrixClient.initCrypto();

src/client/state/Notifications.js

@@ -77,28 +77,12 @@ class Notifications extends EventEmitter {
     return this.roomIdToNoti.has(roomId);
   }
 
-  _getAllParentIds(roomId) {
-    let allParentIds = this.roomList.roomIdToParents.get(roomId);
-    if (allParentIds === undefined) return new Set();
-    const parentIds = [...allParentIds];
-
-    parentIds.forEach((pId) => {
-      allParentIds = new Set(
-        [...allParentIds, ...this._getAllParentIds(pId)],
-      );
-    });
-
-    return allParentIds;
-  }
-
   _setNoti(roomId, total, highlight, childId) {
     const prevTotal = this.roomIdToNoti.get(roomId)?.total ?? null;
     const noti = this.getNoti(roomId);
 
-    if (!childId || this._remainingParentIds?.has(roomId)) {
     noti.total += total;
     noti.highlight += highlight;
-    }
     if (childId) {
       if (noti.from === null) noti.from = new Set();
       noti.from.add(childId);
@@ -107,16 +91,9 @@ class Notifications extends EventEmitter {
     this.roomIdToNoti.set(roomId, noti);
     this.emit(cons.events.notifications.NOTI_CHANGED, roomId, noti.total, prevTotal);
 
-    if (!childId) this._remainingParentIds = this._getAllParentIds(roomId);
-    else this._remainingParentIds.delete(roomId);
-
     const parentIds = this.roomList.roomIdToParents.get(roomId);
-    if (typeof parentIds === 'undefined') {
+    if (typeof parentIds === 'undefined') return;
-      if (!childId) this._remainingParentIds = undefined;
-      return;
-    }
     [...parentIds].forEach((parentId) => this._setNoti(parentId, total, highlight, roomId));
-    if (!childId) this._remainingParentIds = undefined;
   }
 
   _deleteNoti(roomId, total, highlight, childId) {
@@ -126,12 +103,8 @@ class Notifications extends EventEmitter {
     const prevTotal = noti.total;
     noti.total -= total;
     noti.highlight -= highlight;
-    if (noti.total < 0) {
-      noti.total = 0;
-      noti.highlight = 0;
-    }
     if (childId && noti.from !== null) {
-      if (!this.hasNoti(childId)) noti.from.delete(childId);
+      noti.from.delete(childId);
     }
     if (noti.from === null || noti.from.size === 0) {
       this.roomIdToNoti.delete(roomId);

src/client/state/cons.js

@@ -1,5 +1,4 @@
 const cons = {
-  version: '1.5.1',
   secretKey: {
     ACCESS_TOKEN: 'cinny_access_token',
     DEVICE_ID: 'cinny_device_id',
@@ -28,7 +27,6 @@ const cons = {
       OPEN_PUBLIC_ROOMS: 'OPEN_PUBLIC_ROOMS',
       OPEN_CREATE_ROOM: 'OPEN_CREATE_ROOM',
       OPEN_INVITE_USER: 'OPEN_INVITE_USER',
-      OPEN_PROFILE_VIEWER: 'OPEN_PROFILE_VIEWER',
       OPEN_SETTINGS: 'OPEN_SETTINGS',
       OPEN_EMOJIBOARD: 'OPEN_EMOJIBOARD',
       OPEN_READRECEIPTS: 'OPEN_READRECEIPTS',
@@ -59,7 +57,6 @@ const cons = {
       CREATE_ROOM_OPENED: 'CREATE_ROOM_OPENED',
       INVITE_USER_OPENED: 'INVITE_USER_OPENED',
       SETTINGS_OPENED: 'SETTINGS_OPENED',
-      PROFILE_VIEWER_OPENED: 'PROFILE_VIEWER_OPENED',
       EMOJIBOARD_OPENED: 'EMOJIBOARD_OPENED',
       READRECEIPTS_OPENED: 'READRECEIPTS_OPENED',
       ROOMOPTIONS_OPENED: 'ROOMOPTIONS_OPENED',

src/client/state/navigation.js

@@ -69,9 +69,6 @@ class Navigation extends EventEmitter {
       [cons.actions.navigation.OPEN_INVITE_USER]: () => {
         this.emit(cons.events.navigation.INVITE_USER_OPENED, action.roomId, action.searchTerm);
       },
-      [cons.actions.navigation.OPEN_PROFILE_VIEWER]: () => {
-        this.emit(cons.events.navigation.PROFILE_VIEWER_OPENED, action.userId, action.roomId);
-      },
       [cons.actions.navigation.OPEN_SETTINGS]: () => {
         this.emit(cons.events.navigation.SETTINGS_OPENED);
       },

src/index.scss

@@ -290,17 +290,6 @@ button {
   overflow: visible;
   -webkit-appearance: button;
 }
-textarea,
-input,
-input[type],
-input[type=text],
-input[type=username],
-input[type=password],
-input[type=email] {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-}
 textarea {
   color: inherit;
   word-spacing: inherit;

src/util/common.js

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 export function bytesToSize(bytes) {
   const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
   if (bytes === 0) return 'n/a';
@@ -34,53 +33,3 @@ export function abbreviateNumber(number) {
   if (number > 99) return '99+';
   return number;
 }
-
-export class Debounce {
-  constructor() {
-    this.timeoutId = null;
-  }
-
-  /**
-   * @param {function} func - callback function
-   * @param {number} wait - wait in milliseconds to call func
-   * @returns {func} debounceCallback - to pass arguments to func callback
-   */
-  _(func, wait) {
-    const that = this;
-    return function debounceCallback(...args) {
-      clearTimeout(that.timeoutId);
-      that.timeoutId = setTimeout(() => {
-        func.apply(this, args);
-        that.timeoutId = null;
-      }, wait);
-    };
-  }
-}
-
-export class Throttle {
-  constructor() {
-    this.timeoutId = null;
-  }
-
-  /**
-   * @param {function} func - callback function
-   * @param {number} wait - wait in milliseconds to call func
-   * @returns {function} throttleCallback - to pass arguments to func callback
-   */
-  _(func, wait) {
-    const that = this;
-    return function throttleCallback(...args) {
-      if (that.timeoutId !== null) return;
-      that.timeoutId = setTimeout(() => {
-        func.apply(this, args);
-        that.timeoutId = null;
-      }, wait);
-    };
-  }
-}
-
-export function getUrlPrams(paramName) {
-  const queryString = window.location.search;
-  const urlParams = new URLSearchParams(queryString);
-  return urlParams.get(paramName);
-}

src/util/matrixUtil.js

@@ -2,18 +2,15 @@ import initMatrix from '../client/initMatrix';
 
 const WELL_KNOWN_URI = '/.well-known/matrix/client';
 
-async function getBaseUrl(servername) {
+async function getBaseUrl(homeserver) {
-  let protocol = 'https://';
+  const serverDiscoveryUrl = `https://${homeserver}${WELL_KNOWN_URI}`;
-  if (servername.match(/^https?:\/\//) !== null) protocol = '';
-  const serverDiscoveryUrl = `${protocol}${servername}${WELL_KNOWN_URI}`;
   try {
-    const result = await (await fetch(serverDiscoveryUrl, { method: 'GET' })).json();
+    const result = await fetch(serverDiscoveryUrl, { method: 'GET' });
+    const data = await result.json();
 
-    const baseUrl = result?.['m.homeserver']?.base_url;
+    return data?.['m.homeserver']?.base_url;
-    if (baseUrl === undefined) throw new Error();
-    return baseUrl;
   } catch (e) {
-    throw new Error(`${protocol}${servername}`);
+    throw new Error('Homeserver not found');
   }
 }
 
@@ -48,15 +45,31 @@ async function isRoomAliasAvailable(alias) {
   }
 }
 
-function getPowerLabel(powerLevel) {
+function doesRoomHaveUnread(room) {
-  if (powerLevel > 9000) return 'Goku';
+  const userId = initMatrix.matrixClient.getUserId();
-  if (powerLevel > 100) return 'Founder';
+  const readUpToId = room.getEventReadUpTo(userId);
-  if (powerLevel === 100) return 'Admin';
+  const supportEvents = ['m.room.message', 'm.room.encrypted', 'm.sticker'];
-  if (powerLevel >= 50) return 'Mod';
+
-  return null;
+  if (room.timeline.length
+    && room.timeline[room.timeline.length - 1].sender
+    && room.timeline[room.timeline.length - 1].sender.userId === userId
+    && room.timeline[room.timeline.length - 1].getType() !== 'm.room.member') {
+    return false;
+  }
+
+  for (let i = room.timeline.length - 1; i >= 0; i -= 1) {
+    const event = room.timeline[i];
+
+    if (event.getId() === readUpToId) return false;
+
+    if (supportEvents.includes(event.getType())) {
+      return true;
+    }
+  }
+  return true;
 }
 
 export {
   getBaseUrl, getUsername, getUsernameOfRoomMember,
-  isRoomAliasAvailable, getPowerLabel,
+  isRoomAliasAvailable, doesRoomHaveUnread,
 };

webpack.common.js

@@ -1,6 +1,6 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const FaviconsWebpackPlugin = require('favicons-webpack-plugin');
-const CopyPlugin = require("copy-webpack-plugin");
+const webpack = require('webpack');
 
 module.exports = {
   entry: {
@@ -38,13 +38,15 @@ module.exports = {
         use: ['html-loader'],
       },
       {
-        test: /\.(png|jpe?g|gif|otf|ttf)$/,
+        test: /\.(svg|png|jpe?g|gif|otf|ttf)$/,
-        type: 'asset/resource',
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: '[name].[hash].[ext]',
+            outputPath: 'assets',
+          },
+        },
       },
-      {
-        test: /\.svg$/,
-        type: 'asset/inline',
-      }
     ],
   },
   plugins: [
@@ -65,12 +67,8 @@ module.exports = {
         }
       }
     }),
-    new CopyPlugin({
+    new webpack.DefinePlugin({
-      patterns: [
+      'process.env': JSON.stringify(process.env),
-        { from: 'olm.wasm' },
-        { from: '_redirects' },
-        { from: 'config.json' },
-      ],
     }),
   ],
 };

webpack.prod.js

@@ -4,6 +4,7 @@ const { merge } = require('webpack-merge');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+const CopyPlugin = require("copy-webpack-plugin");
 
 module.exports = merge(common, {
   mode: 'production',
@@ -35,5 +36,11 @@ module.exports = merge(common, {
     new MiniCssExtractPlugin({
       filename: '[name].[contenthash].bundle.css',
     }),
+    new CopyPlugin({
+      patterns: [
+        { from: 'olm.wasm' },
+        { from: '_redirects' },
+      ],
+    }),
   ],
 });