ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-11 04:48:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3127 from ryjm/jm/groups-refactor

Browse Source 
chat, groups: update module name, fix perms
This commit is contained in:
Liam Fitzgerald 2020-07-15 12:35:00 +10:00 committed by GitHub
commit 9c040df443
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/interface/src/apps/chat/components/settings.js
View File

@ -217,11 +217,6 @@ export class SettingsScreen extends Component {
);
}
const groups = {};
Object.keys(props.permissions).forEach((pem) => {
groups[pem] = props.permissions[pem].who;
});
return (
<div>
<div className={'w-100 fl mt3'} style={{ maxWidth: '29rem' }}>
@ -231,7 +226,7 @@ export class SettingsScreen extends Component {
group to add this chat to.
</p>
<InviteSearch
groups={groups}
groups={props.groups}
contacts={props.contacts}
associations={props.associations}
groupResults={true}
@ -357,7 +352,7 @@ export class SettingsScreen extends Component {
const { props, state } = this;
const isinPopout = this.props.popout ? 'popout/' : '';
const permission = Array.from(props.permission.who.values());
const permission = Array.from(props.group.members.values());
if (state.isLoading) {
let title = props.station.substr(1);

2
pkg/interface/src/apps/groups/components/join.js
View File

@ -47,7 +47,7 @@ export class JoinScreen extends Component {
const text = 'Joining group';
this.props.api.contactView.join({ ship, name }).then(() => {
this.props.api.contacts.join({ ship, name }).then(() => {
this.setState({ awaiting: text });
});
}