From b87408225079d837616be5e77d4551fddf0e65b1 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Fri, 22 Oct 2021 13:49:24 +0300
Subject: [PATCH] Version Notifications: Support formatting

---
 src/components/middle/composer/Composer.tsx                  | 2 +-
 src/components/middle/composer/PollModal.tsx                 | 2 +-
 src/components/middle/composer/WebPagePreview.tsx            | 2 +-
 src/components/middle/composer/hooks/useDraft.ts             | 2 +-
 src/components/middle/composer/hooks/useEditing.ts           | 2 +-
 src/modules/actions/ui/messages.ts                           | 5 ++---
 .../middle/composer/helpers => util}/parseMessageInput.ts    | 4 ++--
 src/versionNotification.txt                                  | 4 +++-
 8 files changed, 12 insertions(+), 11 deletions(-)
 rename src/{components/middle/composer/helpers => util}/parseMessageInput.ts (97%)

diff --git a/src/components/middle/composer/Composer.tsx b/src/components/middle/composer/Composer.tsx
index f24bf2d5c..f0879bf0a 100644
--- a/src/components/middle/composer/Composer.tsx
+++ b/src/components/middle/composer/Composer.tsx
@@ -46,7 +46,7 @@ import {
 } from '../../../modules/helpers';
 import { formatMediaDuration, formatVoiceRecordDuration, getDayStartAt } from '../../../util/dateFormat';
 import focusEditableElement from '../../../util/focusEditableElement';
-import parseMessageInput from './helpers/parseMessageInput';
+import parseMessageInput from '../../../util/parseMessageInput';
 import buildAttachment from './helpers/buildAttachment';
 import renderText from '../../common/helpers/renderText';
 import insertHtmlInSelection from '../../../util/insertHtmlInSelection';
diff --git a/src/components/middle/composer/PollModal.tsx b/src/components/middle/composer/PollModal.tsx
index 49858703b..1746197c5 100644
--- a/src/components/middle/composer/PollModal.tsx
+++ b/src/components/middle/composer/PollModal.tsx
@@ -6,7 +6,7 @@ import React, {
 import { ApiNewPoll } from '../../../api/types';
 
 import captureEscKeyListener from '../../../util/captureEscKeyListener';
-import parseMessageInput from './helpers/parseMessageInput';
+import parseMessageInput from '../../../util/parseMessageInput';
 import useLang from '../../../hooks/useLang';
 
 import Button from '../../ui/Button';
diff --git a/src/components/middle/composer/WebPagePreview.tsx b/src/components/middle/composer/WebPagePreview.tsx
index 3c7149efb..557b60e2d 100644
--- a/src/components/middle/composer/WebPagePreview.tsx
+++ b/src/components/middle/composer/WebPagePreview.tsx
@@ -10,7 +10,7 @@ import { ISettings } from '../../../types';
 import { RE_LINK_TEMPLATE } from '../../../config';
 import { selectNoWebPage, selectTheme } from '../../../modules/selectors';
 import { pick } from '../../../util/iteratees';
-import parseMessageInput from './helpers/parseMessageInput';
+import parseMessageInput from '../../../util/parseMessageInput';
 import useOnChange from '../../../hooks/useOnChange';
 import useShowTransition from '../../../hooks/useShowTransition';
 import useCurrentOrPrev from '../../../hooks/useCurrentOrPrev';
diff --git a/src/components/middle/composer/hooks/useDraft.ts b/src/components/middle/composer/hooks/useDraft.ts
index fec1390b9..59d44c09e 100644
--- a/src/components/middle/composer/hooks/useDraft.ts
+++ b/src/components/middle/composer/hooks/useDraft.ts
@@ -7,7 +7,7 @@ import { DRAFT_DEBOUNCE, EDITABLE_INPUT_ID } from '../../../../config';
 import usePrevious from '../../../../hooks/usePrevious';
 import { debounce } from '../../../../util/schedulers';
 import focusEditableElement from '../../../../util/focusEditableElement';
-import parseMessageInput from '../helpers/parseMessageInput';
+import parseMessageInput from '../../../../util/parseMessageInput';
 import getMessageTextAsHtml from '../helpers/getMessageTextAsHtml';
 import useBackgroundMode from '../../../../hooks/useBackgroundMode';
 import useBeforeUnload from '../../../../hooks/useBeforeUnload';
diff --git a/src/components/middle/composer/hooks/useEditing.ts b/src/components/middle/composer/hooks/useEditing.ts
index fb5a73385..e41fea379 100644
--- a/src/components/middle/composer/hooks/useEditing.ts
+++ b/src/components/middle/composer/hooks/useEditing.ts
@@ -4,7 +4,7 @@ import { ApiMessage } from '../../../../api/types';
 import { GlobalActions } from '../../../../global/types';
 
 import { EDITABLE_INPUT_ID } from '../../../../config';
-import parseMessageInput from '../helpers/parseMessageInput';
+import parseMessageInput from '../../../../util/parseMessageInput';
 import getMessageTextAsHtml from '../helpers/getMessageTextAsHtml';
 import focusEditableElement from '../../../../util/focusEditableElement';
 import { hasMessageMedia } from '../../../../modules/helpers';
diff --git a/src/modules/actions/ui/messages.ts b/src/modules/actions/ui/messages.ts
index 611067197..83549e6b3 100644
--- a/src/modules/actions/ui/messages.ts
+++ b/src/modules/actions/ui/messages.ts
@@ -38,6 +38,7 @@ import { getServerTime } from '../../../util/serverTime';
 
 // @ts-ignore
 import versionNotification from '../../../versionNotification.txt';
+import parseMessageInput from '../../../util/parseMessageInput';
 
 const FOCUS_DURATION = 1500;
 const FOCUS_NO_HIGHLIGHT_DURATION = FAST_SMOOTH_MAX_DURATION + ANIMATION_END_DELAY;
@@ -529,9 +530,7 @@ addReducer('checkVersionNotification', (global, actions) => {
     chatId: SERVICE_NOTIFICATIONS_USER_ID,
     date: getServerTime(global.serverTimeOffset),
     content: {
-      text: {
-        text: versionNotification,
-      },
+      text: parseMessageInput(versionNotification),
     },
     isOutgoing: false,
   };
diff --git a/src/components/middle/composer/helpers/parseMessageInput.ts b/src/util/parseMessageInput.ts
similarity index 97%
rename from src/components/middle/composer/helpers/parseMessageInput.ts
rename to src/util/parseMessageInput.ts
index 0b24d0995..6cd3824a1 100644
--- a/src/components/middle/composer/helpers/parseMessageInput.ts
+++ b/src/util/parseMessageInput.ts
@@ -1,5 +1,5 @@
-import { ApiMessageEntity, ApiMessageEntityTypes, ApiFormattedText } from '../../../../api/types';
-import { IS_EMOJI_SUPPORTED } from '../../../../util/environment';
+import { ApiMessageEntity, ApiMessageEntityTypes, ApiFormattedText } from '../api/types';
+import { IS_EMOJI_SUPPORTED } from './environment';
 
 const ENTITY_CLASS_BY_NODE_NAME: Record<string, string> = {
   B: ApiMessageEntityTypes.Bold,
diff --git a/src/versionNotification.txt b/src/versionNotification.txt
index 76d1afffb..892e63c45 100644
--- a/src/versionNotification.txt
+++ b/src/versionNotification.txt
@@ -1,3 +1,5 @@
-Welcome to dev version.
+**Welcome to the __dev__ version.**
+
+⛱
 
 This is a demo notification.