From 92a17c6cf14476fd43ea51c6382dc198a10627fb Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Tue, 29 Jun 2021 17:23:34 +0300
Subject: [PATCH] Message / Buttons: Do not show arrow for t.me links

---
 src/components/middle/message/InlineButtons.tsx        | 4 +++-
 src/components/middle/message/hooks/useFocusMessage.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/middle/message/InlineButtons.tsx b/src/components/middle/message/InlineButtons.tsx
index 010955041..2741715c5 100644
--- a/src/components/middle/message/InlineButtons.tsx
+++ b/src/components/middle/message/InlineButtons.tsx
@@ -2,6 +2,8 @@ import React, { FC } from '../../../lib/teact/teact';
 
 import { ApiKeyboardButton, ApiMessage } from '../../../api/types';
 
+import { RE_TME_LINK } from '../../../config';
+
 import Button from '../../ui/Button';
 
 import './InlineButtons.scss';
@@ -24,7 +26,7 @@ const InlineButtons: FC<OwnProps> = ({ message, onClick }) => {
               onClick={() => onClick({ button })}
             >
               {button.text}
-              {button.type === 'url' && <i className="icon-arrow-right" />}
+              {button.type === 'url' && !button.value!.match(RE_TME_LINK) && <i className="icon-arrow-right" />}
             </Button>
           ))}
         </div>
diff --git a/src/components/middle/message/hooks/useFocusMessage.ts b/src/components/middle/message/hooks/useFocusMessage.ts
index bc98b8f90..85613cedf 100644
--- a/src/components/middle/message/hooks/useFocusMessage.ts
+++ b/src/components/middle/message/hooks/useFocusMessage.ts
@@ -23,7 +23,7 @@ export default function useFocusMessage(
         messagesContainer,
         elementRef.current,
         // `noFocusHighlight` always called from “scroll-to-bottom” buttons
-        noFocusHighlight ? 'end' : 'center',
+        noFocusHighlight ? 'end' : 'centerOrTop',
         FOCUS_MARGIN,
         focusDirection === undefined ? FOCUS_MAX_OFFSET : RELOCATED_FOCUS_OFFSET,
         focusDirection,