From c5b71e55c1c28a8904e2bc74e9285832c02b7af1 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Mon, 24 Aug 2020 23:10:56 -0400
Subject: [PATCH] chat: restore join functionality

Fixes #3371.
---
 pkg/interface/src/views/apps/chat/app.tsx         |  2 +-
 .../src/views/apps/chat/components/join.js        | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/app.tsx b/pkg/interface/src/views/apps/chat/app.tsx
index 7f7239ee60..63bf752e95 100644
--- a/pkg/interface/src/views/apps/chat/app.tsx
+++ b/pkg/interface/src/views/apps/chat/app.tsx
@@ -207,7 +207,7 @@ export default class ChatApp extends React.Component<ChatAppProps, {}> {
                 <JoinScreen
                   api={api}
                   inbox={inbox}
-                  autoJoin={station}
+                  station={station}
                   chatSynced={chatSynced || {}}
                   {...props}
                 />
diff --git a/pkg/interface/src/views/apps/chat/components/join.js b/pkg/interface/src/views/apps/chat/components/join.js
index b2dae0a779..556bbe79af 100644
--- a/pkg/interface/src/views/apps/chat/components/join.js
+++ b/pkg/interface/src/views/apps/chat/components/join.js
@@ -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}`);
     });
   }
 
@@ -84,7 +83,7 @@ export class JoinScreen extends Component {
                 mt={4}
                 id="station"
                 placeholder="~zod/chatroom"
-                fontFamily="mono" 
+                fontFamily="mono"
                 caption="Chat names use lowercase, hyphens, and slashes." />
               <Button>Join Chat</Button>
               <Spinner