From c731241689e7807d24e922d4c0bf2edee83c7a8a Mon Sep 17 00:00:00 2001
From: Konstantin Ullrich <konstantinullrich12@gmail.com>
Date: Mon, 24 Feb 2020 19:23:30 +0100
Subject: [PATCH 1/3] Remove search icon in message view
---
.../conversation/ConversationHeader.tsx | 20 -------------------
1 file changed, 20 deletions(-)
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index ad5a59e56..678226871 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -254,19 +254,6 @@ export class ConversationHeader extends React.Component<Props> {
);
}
- public renderSearch() {
- return (
- <div className="search-icon">
- <SessionIconButton
- iconType={SessionIconType.Search}
- iconSize={SessionIconSize.Large}
- iconPadded={true}
- onClick={this.highlightMessageSearch}
- />
- </div>
- );
- }
-
public renderOptions(triggerId: string) {
const { showBackButton } = this.props;
@@ -394,7 +381,6 @@ export class ConversationHeader extends React.Component<Props> {
{!this.props.isRss && (
<>
- {this.renderSearch()}
{this.renderAvatar()}
</>
)}
@@ -411,12 +397,6 @@ export class ConversationHeader extends React.Component<Props> {
}
}
- public highlightMessageSearch() {
- // This is a temporary fix. In future we want to search
- // messages in the current conversation
- $('.session-search-input input').focus();
- }
-
private renderPublicMenuItems() {
const {
i18n,
From 05a15dc9cdc7b740c1b3ead8f2a50782d5fbb2e3 Mon Sep 17 00:00:00 2001
From: Konstantin Ullrich <konstantinullrich12@gmail.com>
Date: Mon, 24 Feb 2020 19:50:31 +0100
Subject: [PATCH 2/3] Small Code formating
---
ts/components/conversation/ConversationHeader.tsx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 678226871..9ffd481b8 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -379,11 +379,7 @@ export class ConversationHeader extends React.Component<Props> {
</div>
{this.renderExpirationLength()}
- {!this.props.isRss && (
- <>
- {this.renderAvatar()}
- </>
- )}
+ {!this.props.isRss && <>{this.renderAvatar()}</>}
{this.renderMenu(triggerId)}
</div>
From 99bb9a2c309e43242cd8fb760abbef586fa55669 Mon Sep 17 00:00:00 2001
From: Konstantin <konstantinullrich12@gmail.com>
Date: Tue, 25 Feb 2020 09:12:39 +0100
Subject: [PATCH 3/3] Remove redundant braces
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
---
ts/components/conversation/ConversationHeader.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 9ffd481b8..5f90e7920 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -379,7 +379,7 @@ export class ConversationHeader extends React.Component<Props> {
</div>
{this.renderExpirationLength()}
- {!this.props.isRss && <>{this.renderAvatar()}</>}
+ {!this.props.isRss && this.renderAvatar()}
{this.renderMenu(triggerId)}
</div>