Socket now sends data instead of type

src/components/GameView.js

@@ -98,7 +98,7 @@ export default class GameView extends React.Component {
   getSocketSignal = data => {
     this.setState(
       {
-        socketSignal: data // TODO: change to data
+        socketSignal: data
       },
       () => {
         this.setState({
@@ -197,7 +197,11 @@ export default class GameView extends React.Component {
               zoom={this.state.zoom}
               mapUrl={this.state.mapUrl}
               currentGameId={this.state.gameInfo.id}
-              socketSignal={this.state.socketSignal}
+              socketSignal={
+                this.state.socketSignal === null
+                  ? null
+                  : this.state.socketSignal.type
+              }
               role={this.state.role}
             >
               <NotificationPopup socketSignal={this.state.socketSignal} />

src/components/Socket.js

@@ -20,8 +20,8 @@ export default class ClientSocket extends React.Component {
     console.log("hi socket");
     // need to explicitly update drawings and trackings when gameID first becomes available
     if (this.props.gameId !== null) {
-      await this.props.getSocketSignal("drawing-update");
-      await this.props.getSocketSignal("tracking-update");
+      await this.props.getSocketSignal({ type: "drawing-update" });
+      await this.props.getSocketSignal({ type: "tracking-update" });
     }
     this.initSocket();
   }
@@ -47,8 +47,7 @@ export default class ClientSocket extends React.Component {
 
     // set the socket to listen gameId-thread
     socket.on(this.props.gameId, data => {
-      console.log(data.type);
-      this.props.getSocketSignal(data.type);
+      this.props.getSocketSignal(data);
       // check socket update type
       this.setState({ update: data });
     });