ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 01:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

messages: addressing PR comments

Browse Source 
fixes urbit/landscape#4780
This commit is contained in:
James Acklin 2021-04-28 19:01:40 -04:00
parent 98d21ca27b
commit 7e754a819f
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/interface/src/views/landscape/components/NewChannel.tsx
View File

@ -45,18 +45,16 @@ const formSchema = (members?: string[]) =>
writePerms: Yup.string()
});
interface NewChannelProps {
type NewChannelProps = {
api: GlobalApi;
group?: string;
workspace: Workspace;
borderRadius?: number;
existingMembers?: Array;
}
existingMembers: string[];
} & PropFunc<typeof Col>;
export function NewChannel(props: NewChannelProps): ReactElement {
const history = useHistory();
const { api, group, workspace, borderRadius, existingMembers } = props;
const { api, group, workspace, existingMembers, ...rest } = props;
const groups = useGroupState(state => state.groups);
const waiter = useWaitForProps({ groups }, 5000);
@ -131,7 +129,7 @@ export function NewChannel(props: NewChannelProps): ReactElement {
overflowY='auto'
p={3}
backgroundColor='white'
borderRadius={borderRadius}
{...rest}
>
<Box
pb='3'

5
pkg/interface/src/views/landscape/components/ResourceSkeleton.tsx
View File

@ -2,7 +2,6 @@ import React, { ReactElement, ReactNode, useState, useCallback } from 'react';
import { Icon, Box, Col, Text } from '@tlon/indigo-react';
import styled from 'styled-components';
import { Link, useHistory } from 'react-router-dom';
import { without } from 'lodash';
import urbitOb from 'urbit-ob';
import { Association } from '@urbit/api/metadata';
import { Dropdown } from '~/views/components/Dropdown';
@ -13,7 +12,6 @@ import { getItemTitle } from '~/logic/lib/util';
import useContactState from '~/logic/state/contact';
import useGroupState from '~/logic/state/group';
import { MessageInvite } from '~/views/landscape/components/MessageInvite';
import { NewChannel } from '~/views/landscape/components/NewChannel';
const TruncatedText = styled(RichText)`
white-space: nowrap;
@ -37,7 +35,6 @@ export function ResourceSkeleton(props: ResourceSkeletonProps): ReactElement {
const groups = useGroupState(state => state.groups);
const group = groups[association.group];
let workspace = association.group;
const history = useHistory();
const [actionsWidth, setActionsWidth] = useState(0);
if (group?.hidden && app === 'chat') {
@ -165,7 +162,7 @@ export function ResourceSkeleton(props: ResourceSkeletonProps): ReactElement {
</Link>
);
}
return <></>;
return null;
};
const MenuControl = () => (