+ {this.renderOptions(triggerId)}
{this.renderBackButton()}
- {this.renderAvatar()}
{this.renderTitle()}
{isPrivateGroup ? this.renderMemberCount() : null}
{this.renderExpirationLength()}
- {this.renderGear(triggerId)}
+ {this.renderSearch()}
+ {this.renderAvatar()}
{this.renderMenu(triggerId)}
);
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 77be54364..e26dea64c 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -31,6 +31,7 @@ import { getIncrement } from '../../util/timer';
import { isFileDangerous } from '../../util/isFileDangerous';
import { ColorType, LocalizerType } from '../../types/Util';
import { ContextMenu, ContextMenuTrigger, MenuItem } from 'react-contextmenu';
+import { SessionIcon, SessionIconSize, SessionIconType } from '../session/icon';
declare global {
interface Window {
@@ -311,16 +312,14 @@ export class Message extends React.PureComponent