Remove channels

2020-05-07 13:46:36 +10:00 · 2020-05-07 13:46:36 +10:00 · 711112d076
parent 5564bfa134
commit 711112d076
9 changed files with 36 additions and 17 deletions
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@ -784,7 +784,7 @@
    "description": "Shown to separate the types of search results"
  },
  "messagesHeader": {
-    "message": "Session",
+    "message": "Conversations",
    "description": "Shown to separate the types of search results"
  },
  "settingsHeader": {
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@ -91,6 +91,7 @@ textarea {
  width: auto;
  display: flex;
  justify-content: center;
+  align-items: center;
  font-weight: 700;
  user-select: none;
  white-space: nowrap;
--- a/ts/components/LeftPane.tsx
+++ b/ts/components/LeftPane.tsx
@ -12,6 +12,7 @@ import { ConversationType } from '../state/ducks/conversations';
 import { LeftPaneContactSection } from './session/LeftPaneContactSection';
 import { LeftPaneSettingSection } from './session/LeftPaneSettingSection';
 import { LeftPaneChannelSection } from './session/LeftPaneChannelSection';
+import { SessionIconType } from './session/icon';

 // from https://github.com/bvaughn/react-virtualized/blob/fb3484ed5dcc41bffae8eab029126c0fb8f7abc0/source/List/types.js#L5
 export type RowRendererParamsType = {
@ -59,6 +60,7 @@ export class LeftPane extends React.Component<Props, State> {
    labels: Array<string>,
    onTabSelected?: any,
    buttonLabel?: string,
+    buttonIcon?: SessionIconType,
    buttonClicked?: any,
    notificationCount?: number
  ): JSX.Element {
@ -68,6 +70,7 @@ export class LeftPane extends React.Component<Props, State> {
        selectedTab={0}
        labels={labels}
        buttonLabel={buttonLabel}
+        buttonIcon={buttonIcon}
        buttonClicked={buttonClicked}
        notificationCount={notificationCount}
      />
--- a/ts/components/session/ActionsPanel.tsx
+++ b/ts/components/session/ActionsPanel.tsx
@ -136,7 +136,6 @@ export class ActionsPanel extends React.Component<Props, State> {
    const isProfilePageSelected = selectedSection === SectionType.Profile;
    const isMessagePageSelected = selectedSection === SectionType.Message;
    const isContactPageSelected = selectedSection === SectionType.Contact;
-    const isChannelPageSelected = selectedSection === SectionType.Channel;
    const isSettingsPageSelected = selectedSection === SectionType.Settings;
    const isMoonPageSelected = selectedSection === SectionType.Moon;

@ -154,11 +153,6 @@ export class ActionsPanel extends React.Component<Props, State> {
          onSelect={this.handleSectionSelect}
          notificationCount={unreadMessageCount}
        />
-        <this.Section
-          type={SectionType.Channel}
-          isSelected={isChannelPageSelected}
-          onSelect={this.handleSectionSelect}
-        />
        <this.Section
          type={SectionType.Contact}
          isSelected={isContactPageSelected}
--- a/ts/components/session/LeftPaneContactSection.tsx
+++ b/ts/components/session/LeftPaneContactSection.tsx
@ -89,6 +89,7 @@ export class LeftPaneContactSection extends React.Component<Props, State> {
      labels,
      this.handleTabSelected,
      undefined,
+      undefined,
      this.handleToggleFriendRequestPopup,
      receivedFriendRequestCount
    );
@ -321,7 +322,9 @@ export class LeftPaneContactSection extends React.Component<Props, State> {

  private renderList() {
    const { sentFriendsRequest } = this.props;
-    const friends = window.getFriendsFromContacts(this.props.friends);
+
+    const contacts = this.props.friends.filter(f => f.type === 'direct');
+    const friends = window.getFriendsFromContacts(contacts);
    const length = Number(sentFriendsRequest.length) + Number(friends.length);
    const combined = [...sentFriendsRequest, ...friends];

--- a/ts/components/session/LeftPaneMessageSection.tsx
+++ b/ts/components/session/LeftPaneMessageSection.tsx
@ -197,7 +197,8 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
    return LeftPane.RENDER_HEADER(
      labels,
      null,
-      window.i18n('newSession'),
+      undefined,
+      SessionIconType.Plus,
      this.handleToggleOverlay
    );
  }
--- a/ts/components/session/LeftPaneSectionHeader.tsx
+++ b/ts/components/session/LeftPaneSectionHeader.tsx
@ -1,6 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import { SessionButton } from './SessionButton';
+import { SessionIcon, SessionIconSize, SessionIconType } from './icon';
 import {
  NotificationCountSize,
  SessionNotificationCount,
@ -43,6 +44,7 @@ interface Props {
  labels: Array<string>;
  notificationCount?: number;
  buttonLabel?: string;
+  buttonIcon?: SessionIconType;
  buttonClicked?: any;
 }

@ -65,10 +67,13 @@ export class LeftPaneSectionHeader extends React.Component<Props, State> {
    const {
      labels,
      buttonLabel,
+      buttonIcon,
      buttonClicked,
      notificationCount,
    } = this.props;

+    const hasButton = buttonLabel || buttonIcon;
+
    const children = [];
    //loop to create children
    for (let i = 0; i < labels.length; i++) {
@ -83,15 +88,20 @@ export class LeftPaneSectionHeader extends React.Component<Props, State> {
      );
    }

-    if (buttonLabel && !notificationCount) {
-      children.push(
-        <SessionButton
-          text={buttonLabel}
-          onClick={buttonClicked}
-          key="compose"
-          disabled={false}
-        />
+    if (hasButton && !notificationCount) {
+      const buttonContent = buttonIcon ? (
+        <SessionIcon iconType={buttonIcon} iconSize={SessionIconSize.Small} />
+      ) : (
+        buttonLabel
      );
+
+      const button = (
+        <SessionButton onClick={buttonClicked} key="compose" disabled={false}>
+          {buttonContent}
+        </SessionButton>
+      );
+
+      children.push(button);
    } else if (buttonLabel && notificationCount && notificationCount > 0) {
      children.push(
        <div className="contact-notification-section">
--- a/ts/components/session/LeftPaneSettingSection.tsx
+++ b/ts/components/session/LeftPaneSettingSection.tsx
@ -57,6 +57,7 @@ export class LeftPaneSettingSection extends React.Component<any, State> {
      null,
      undefined,
      undefined,
+      undefined,
      undefined
    );
  }
--- a/ts/components/session/icon/Icons.tsx
+++ b/ts/components/session/icon/Icons.tsx
@ -23,6 +23,7 @@ export enum SessionIconType {
  Microphone = 'microphone',
  Moon = 'moon',
  Pencil = 'pencil',
+  Plus = 'plus',
  Reply = 'reply',
  Search = 'search',
  Send = 'send',
@ -160,6 +161,11 @@ export const icons = {
      'M4,16.4142136 L4,20 L7.58578644,20 L19.5857864,8 L16,4.41421356 L4,16.4142136 Z M16.7071068,2.29289322 L21.7071068,7.29289322 C22.0976311,7.68341751 22.0976311,8.31658249 21.7071068,8.70710678 L8.70710678,21.7071068 C8.5195704,21.8946432 8.26521649,22 8,22 L3,22 C2.44771525,22 2,21.5522847 2,21 L2,16 C2,15.7347835 2.10535684,15.4804296 2.29289322,15.2928932 L15.2928932,2.29289322 C15.6834175,1.90236893 16.3165825,1.90236893 16.7071068,2.29289322 Z',
    viewBox: '1 1 21 21',
  },
+  [SessionIconType.Plus]: {
+    path:
+      'm405.332031 192h-170.664062v-170.667969c0-11.773437-9.558594-21.332031-21.335938-21.332031-11.773437 0-21.332031 9.558594-21.332031 21.332031v170.667969h-170.667969c-11.773437 0-21.332031 9.558594-21.332031 21.332031 0 11.777344 9.558594 21.335938 21.332031 21.335938h170.667969v170.664062c0 11.777344 9.558594 21.335938 21.332031 21.335938 11.777344 0 21.335938-9.558594 21.335938-21.335938v-170.664062h170.664062c11.777344 0 21.335938-9.558594 21.335938-21.335938 0-11.773437-9.558594-21.332031-21.335938-21.332031zm0 0',
+    viewBox: '0 0 427 427',
+  },
  [SessionIconType.Reply]: {
    path:
      'M4,3 C4.55228475,3 5,3.44771525 5,4 L5,4 L5,11 C5,12.6568542 6.34314575,14 8,14 L8,14 L17.585,14 L14.2928932,10.7071068 C13.9324093,10.3466228 13.9046797,9.77939176 14.2097046,9.38710056 L14.2928932,9.29289322 C14.6834175,8.90236893 15.3165825,8.90236893 15.7071068,9.29289322 L15.7071068,9.29289322 L20.7071068,14.2928932 C20.7355731,14.3213595 20.7623312,14.3515341 20.787214,14.3832499 C20.788658,14.3849951 20.7902348,14.3870172 20.7918027,14.389044 C20.8140715,14.4179625 20.8348358,14.4480862 20.8539326,14.4793398 C20.8613931,14.4913869 20.8685012,14.5036056 20.8753288,14.5159379 C20.8862061,14.5357061 20.8966234,14.5561086 20.9063462,14.5769009 C20.914321,14.5939015 20.9218036,14.6112044 20.9287745,14.628664 C20.9366843,14.6484208 20.9438775,14.6682023 20.9504533,14.6882636 C20.9552713,14.7031487 20.9599023,14.7185367 20.9641549,14.734007 C20.9701664,14.7555635 20.9753602,14.7772539 20.9798348,14.7992059 C20.9832978,14.8166247 20.9863719,14.834051 20.9889822,14.8515331 C20.9962388,14.8996379 21,14.9493797 21,15 L20.9962979,14.9137692 C20.9978436,14.9317345 20.9989053,14.9497336 20.9994829,14.9677454 L21,15 C21,15.0112225 20.9998151,15.0224019 20.9994483,15.0335352 C20.9988772,15.050591 20.997855,15.0679231 20.996384,15.0852242 C20.994564,15.1070574 20.9920941,15.1281144 20.9889807,15.1489612 C20.9863719,15.165949 20.9832978,15.1833753 20.9797599,15.2007258 C20.9753602,15.2227461 20.9701664,15.2444365 20.964279,15.2658396 C20.9599023,15.2814633 20.9552713,15.2968513 20.9502619,15.3121425 C20.9438775,15.3317977 20.9366843,15.3515792 20.928896,15.3710585 C20.9218036,15.3887956 20.914321,15.4060985 20.9063266,15.4232215 C20.8974314,15.4421635 20.8879327,15.4609002 20.8778732,15.4792864 C20.8703855,15.4931447 20.862375,15.5070057 20.8540045,15.5207088 C20.8382813,15.546275 20.8215099,15.5711307 20.8036865,15.5951593 C20.774687,15.6343256 20.7425008,15.6717127 20.7071068,15.7071068 L20.787214,15.6167501 C20.7849289,15.6196628 20.7826279,15.6225624 20.7803112,15.625449 L20.7071068,15.7071068 L15.7071068,20.7071068 C15.3165825,21.0976311 14.6834175,21.0976311 14.2928932,20.7071068 C13.9023689,20.3165825 13.9023689,19.6834175 14.2928932,19.2928932 L14.2928932,19.2928932 L17.585,16 L8,16 C5.3112453,16 3.11818189,13.8776933 3.00461951,11.2168896 L3,11 L3,4 C3,3.44771525 3.44771525,3 4,3',