From b4fb8d516386dd4e14ecac9387c5f39681ebd1bf Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 9 Apr 2020 12:48:55 +1000
Subject: [PATCH] chat-fe: show spinner on join

Shows the spinner whilst joining a channel, both manually and from a
url. Also fixes an issue where a newly joined channel may be navigated
away from automatically.
---
 pkg/interface/chat/src/js/components/chat.js |  5 ++++-
 pkg/interface/chat/src/js/components/join.js | 20 ++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkg/interface/chat/src/js/components/chat.js b/pkg/interface/chat/src/js/components/chat.js
index 9d241ac990..9b98e1612a 100644
--- a/pkg/interface/chat/src/js/components/chat.js
+++ b/pkg/interface/chat/src/js/components/chat.js
@@ -69,7 +69,10 @@ export class ChatScreen extends Component {
           this.updateReadNumber();
         }
       );
-    } else if (props.chatInitialized && !(props.station in props.inbox)) {
+    } else if (props.chatInitialized &&
+               !(props.station in props.inbox) &&
+               !(props.station in props.chatSynced) ) {
+
       props.history.push("/~chat");
     } else if (
       props.envelopes.length - prevProps.envelopes.length >=
diff --git a/pkg/interface/chat/src/js/components/join.js b/pkg/interface/chat/src/js/components/join.js
index 2f864a9ae5..82c08a7134 100644
--- a/pkg/interface/chat/src/js/components/join.js
+++ b/pkg/interface/chat/src/js/components/join.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import classnames from 'classnames';
 import { Route, Link } from 'react-router-dom';
+import { Spinner } from './lib/icons/icon-spinner';
 import urbitOb from 'urbit-ob';
 
 
@@ -11,7 +12,8 @@ export class JoinScreen extends Component {
 
     this.state = {
       station: '/',
-      error: false
+      error: false,
+      awaiting: false,
     };
 
     this.stationChange = this.stationChange.bind(this);
@@ -36,11 +38,12 @@ export class JoinScreen extends Component {
         });
         return;
       }
+
+
       this.setState({
-        station
-      }, () => {
-        props.api.chatView.join(ship, station, true);
-      });
+        station,
+        awaiting: true
+      }, () => props.api.chatView.join(ship, station, true))
     }
   }
 
@@ -48,6 +51,7 @@ export class JoinScreen extends Component {
     const { props, state } = this;
     if (state.station in props.inbox ||
         props.chatSynced !== prevProps.chatSynced) {
+      this.setState({ awaiting: false });
       props.history.push(`/~chat/room${state.station}`);
     }
   }
@@ -81,7 +85,10 @@ export class JoinScreen extends Component {
       return;
     }
 
-    props.api.chatView.join(ship, `/${station}`, true);
+    this.setState({
+      awaiting: true,
+      station: `/${station}`
+    }, () => props.api.chatView.join(ship, `/${station}`, true))
   }
 
   stationChange(event) {
@@ -140,6 +147,7 @@ export class JoinScreen extends Component {
             onClick={this.onClickJoin.bind(this)}
             className={joinClasses}
           >Join Chat</button>
+          <Spinner awaiting={this.state.awaiting} classes="mt4" text="Joining chat..." />
         </div>
       </div>
     );