From 0d64d847a16204434232b5c0d22d3fc13edd2d12 Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Tue, 3 Dec 2019 16:53:24 +0700
Subject: [PATCH] boris and flow for everyone

---
 src/components/main/Header/index.tsx | 21 ++++++++++-----------
 src/utils/dom.ts                     |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/main/Header/index.tsx b/src/components/main/Header/index.tsx
index 20b10d35..fed058b0 100644
--- a/src/components/main/Header/index.tsx
+++ b/src/components/main/Header/index.tsx
@@ -60,21 +60,20 @@ const HeaderUnconnected: FC<IProps> = memo(
 
           <Filler />
 
-          {is_user && (
-            <div className={style.plugs}>
-              <Link className={style.item} to={URLS.BASE}>
-                ФЛОУ
-              </Link>
-
-              <Link className={style.item} to={URLS.BORIS}>
-                БОРИС
-              </Link>
+          <div className={style.plugs}>
+            <Link className={style.item} to={URLS.BASE}>
+              ФЛОУ
+            </Link>
 
+            <Link className={style.item} to={URLS.BORIS}>
+              БОРИС
+            </Link>
+            {is_user && (
               <div className={style.item}>
                 <Notifications />
               </div>
-            </div>
-          )}
+            )}
+          </div>
 
           {is_user && (
             <UserButton user={user} onLogout={authLogout} authOpenProfile={authOpenProfile} />
diff --git a/src/utils/dom.ts b/src/utils/dom.ts
index 360bd21c..a9a2fe80 100644
--- a/src/utils/dom.ts
+++ b/src/utils/dom.ts
@@ -89,7 +89,7 @@ export const formatText = (text: string): string =>
         .replace(/</g, '&lt;')
         .replace(/>/g, '&gt;')
         .replace(
-          /~([\wа-яА-Я\-]+)/giu,
+          /~([\wа-яА-Я-]+)/giu,
           '<span class="username" onClick="window.postMessage({ type: \'username\', username: \'$1\'});">~$1</span>'
         )
         .replace(/:\/\//gim, ':|--|')