From 01ea8b05d55bb6bd3cc1537a3a87740f36b20b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Thu, 24 Oct 2019 12:53:44 +0200 Subject: [PATCH] Fixed display name. --- app/src/RoomClient.js | 3 +++ app/src/components/JoinDialog.js | 4 ++-- app/src/components/Lobby.js | 4 ++-- app/src/reducers/settings.js | 6 +----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js index 56cdb1c..dac26a0 100644 --- a/app/src/RoomClient.js +++ b/app/src/RoomClient.js @@ -418,6 +418,9 @@ export default class RoomClient { logger.debug('changeDisplayName() [displayName:"%s"]', displayName); + if (!displayName) + displayName = 'Guest'; + try { await this.sendRequest('changeDisplayName', { displayName }); diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js index 95095af..22d47da 100644 --- a/app/src/components/JoinDialog.js +++ b/app/src/components/JoinDialog.js @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React from 'react'; import { connect } from 'react-redux'; import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../RoomContext'; @@ -158,7 +158,7 @@ JoinDialog.propTypes = { roomClient : PropTypes.any.isRequired, displayName : PropTypes.string.isRequired, - loginEnabled : PropTypes.string.isRequired, + loginEnabled : PropTypes.bool.isRequired, changeDisplayName : PropTypes.func.isRequired, classes : PropTypes.object.isRequired }; diff --git a/app/src/components/Lobby.js b/app/src/components/Lobby.js index e374879..e0fe8e9 100644 --- a/app/src/components/Lobby.js +++ b/app/src/components/Lobby.js @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React from 'react'; import { connect } from 'react-redux'; import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../RoomContext'; @@ -139,7 +139,7 @@ Lobby.propTypes = roomClient : PropTypes.any.isRequired, url : PropTypes.string.isRequired, displayName : PropTypes.string.isRequired, - loginEnabled : PropTypes.string.isRequired, + loginEnabled : PropTypes.bool.isRequired, changeDisplayName : PropTypes.func.isRequired, classes : PropTypes.object.isRequired }; diff --git a/app/src/reducers/settings.js b/app/src/reducers/settings.js index 1f0a0db..88734d6 100644 --- a/app/src/reducers/settings.js +++ b/app/src/reducers/settings.js @@ -24,11 +24,7 @@ const settings = (state = initialState, action) => case 'SET_DISPLAY_NAME': { - let { displayName } = action.payload; - - // Be ready for undefined displayName (so keep previous one). - if (!displayName) - displayName = state.displayName; + const { displayName } = action.payload; return { ...state, displayName }; }