Minor UI Fixes

AdamKyle · Feb 4, 2022 · aac8479 · aac8479
1 parent 0776249
commit aac8479
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/resources/js/components/game/character/character-sheet.jsx b/resources/js/components/game/character/character-sheet.jsx
@@ -28,10 +28,6 @@ export default class CharacterSheet extends React.Component {
         this.setState({
           characterSheet: result.data.sheet,
           loading: false,
-        }, () => {
-          if (result.data.sheet.timeout_until !== null) {
-            // this.props.openTimeOutModal(result.data.sheet.timeout_until)
-          }
         });
       }).catch((err) => {
         this.setState({loading: false});

diff --git a/resources/js/components/game/game.jsx b/resources/js/components/game/game.jsx
@@ -616,10 +616,10 @@ export default class Game extends React.Component {
             />
           : null
         }
-        {/*{*/}
-        {/*  this.state.openTimeOutModal ?*/}
-        {/*    <TimeoutDialogue userId={this.props.userId} show={this.state.openTimeOutModal} timeOutFor={this.state.timeOutFor}/> : null*/}
-        {/*}*/}
+        {
+          this.state.openTimeOutModal ?
+            <TimeoutDialogue userId={this.props.userId} show={this.state.openTimeOutModal} timeOutFor={this.state.timeOutFor}/> : null
+        }
         </>
     )
   }

diff --git a/resources/js/components/game/messages/chat.jsx b/resources/js/components/game/messages/chat.jsx
@@ -162,6 +162,10 @@ export default class Chat extends React.Component {
   }
 
   isGod(user) {
+    if (!user.hasOwnProperty('roles')) {
+      return false;
+    }
+
     if (isEmpty(user.roles)) {
       return false;
     }

diff --git a/resources/js/components/game/sections/character-info-section.jsx b/resources/js/components/game/sections/character-info-section.jsx
@@ -28,10 +28,6 @@ export default class CharacterInfoTopSection extends React.Component {
           isLoading: false,
           forceNameChange: result.data.sheet.force_name_change,
         }, () => {
-          if (result.data.sheet.timeout_until !== null) {
-            this.props.openTimeOutModal(result.data.sheet.timeout_until)
-          }
-
           this.props.updateCharacterGold(result.data.sheet.gold);
         });
       }).catch((err) => {