Merge remote-tracking branch 'origin/dev' into lobby-feature-updates

src/components/ui/Button.tsx

@@ -13,7 +13,7 @@ export const Button = props => (
 
 
 Button.propTypes = {
-  width: PropTypes.number,
+  width: PropTypes.string,
   style: PropTypes.object || PropTypes.string,
   className: PropTypes.string,
   children: PropTypes.node,

src/components/views/Gameroom.tsx

@@ -6,9 +6,9 @@ import PropTypes from "prop-types";
 import "styles/views/Gameroom.scss";
 import "styles/views/Header.scss";
 import "styles/twemoji-amazing.css";
-import Header from "./Header";
+import Header from "./Header"
 import { FFmpeg } from "@ffmpeg/ffmpeg";
-import { Roundstatus, RoundstatusProps} from "components/views/GameroomRoundStatus";
+import { Roundstatus, RoundstatusProps } from "components/views/GameroomRoundStatus";
 import { PlayerList } from "components/views/GameroomPlayerList";
 import { ValidateAnswerForm } from "components/views/GameroomAnswerForm";
 // Stomp related imports
@@ -158,8 +158,8 @@ const Gameroom = () => {
     const onResponseReceived = (payload) => {
       const payloadData = JSON.parse(payload.body);
       console.error("Response received", payloadData.message);
-      alert("Response server side receive!"+payloadData.message)
-      navigate("/lobby");
+      // alert("Response server side receive!"+payloadData.message)
+      // navigate("/lobby");
       // TODO: handle response
       /// 1. filter the response by the receiptId
       /// 2. if the response is success, do nothing
@@ -174,7 +174,7 @@ const Gameroom = () => {
         const myInfo = payloadData.message.find(item => item.user.id === user.id);
         //console.log("set info for myself")
         //console.log(myInfo);
-        if (myInfo.roundFinished !== null){
+        if (myInfo && myInfo.roundFinished !== null){
           roundFinished.current = myInfo.roundFinished;
           //console.log("roundFinished?")
           //console.log(roundFinished.current);
@@ -188,7 +188,7 @@ const Gameroom = () => {
 
     const onGameInfoReceived = (payload) => {
       const payloadData = JSON.parse(payload.body);
-      console.error("GameInfo received", JSON.stringify(payloadData.message));
+      // console.error("GameInfo received", JSON.stringify(payloadData.message));
       if (JSON.stringify(gameInfoRef.current) === JSON.stringify(payloadData.message)) {
         console.log("Same game info received, ignore");
 
@@ -593,7 +593,7 @@ const Gameroom = () => {
   };
 
 
-  if (playerLists === null) {
+  if (playerLists === null || playerLists.length === 0) {
     return <div>Loading...</div>;
   }