urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-04 18:43:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3372 from urbit/mp/chat/fix-joining

Browse Source 
chat: restore join functionality
This commit is contained in:
matildepark 2020-08-25 22:14:04 -04:00 committed by GitHub
commit 63321ca176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/interface/src/views/apps/chat/app.tsx
View File

@ -203,7 +203,7 @@ export default class ChatApp extends React.Component<ChatAppProps, {}> {
<JoinScreen
api={api}
inbox={inbox}
autoJoin={station}
station={station}
chatSynced={chatSynced || {}}
{...props}
/>

13
pkg/interface/src/views/apps/chat/components/join.js
View File

@ -25,7 +25,6 @@ const schema = Yup.object().shape({
export class JoinScreen extends Component {
constructor(props) {
super(props);
this.state = {
awaiting: false
};
@ -38,17 +37,17 @@ export class JoinScreen extends Component {
}
onSubmit(values) {
console.log(values);
const { props } = this;
this.setState({ awaiting: true }, () => {
console.log(values);
const station = values.station.trim();
if (`/${station}` in this.props.chatSynced) {
this.props.history.push(`/~chat/room/${station}`);
if (`/${station}` in props.chatSynced) {
props.history.push(`/~chat/room${station}`);
return;
}
const ship = station.substr(1).slice(0,station.substr(1).indexOf('/'));
props.api.chat.join(ship, station, true)
this.props.history.push(`/~chat/room/${station}`);
props.api.chat.join(ship, station, true);
props.history.push(`/~chat/room${station}`);
});
}