diff --git a/src/components/Player/Header/PlayerHeader.jsx b/src/components/Player/Header/PlayerHeader.jsx index 2c9c4ef55e..66d3f58a11 100644 --- a/src/components/Player/Header/PlayerHeader.jsx +++ b/src/components/Player/Header/PlayerHeader.jsx @@ -277,21 +277,19 @@ const PlayerHeader = ({ picture, registered, plus, - playerLoading, - playerError, + loading, + error, small, playerSoloCompetitiveRank, loggedInUser, rankTier, leaderboardRank, strings, - playerWinLossLoading, - playerWinLossError, }) => { - if (playerError || playerWinLossError) { + if (error) { return ; } - if (playerLoading || playerWinLossLoading) { + if (loading) { return ; } @@ -373,10 +371,8 @@ PlayerHeader.propTypes = { }; const mapStateToProps = state => ({ - playerLoading: state.app.player.loading, - playerWinLossLoading: state.app.playerWinLoss.loading, - playerError: state.app.player.error, - playerWinLossError: state.app.playerWinLoss.error, + loading: state.app.player.loading, + error: state.app.player.error, playerName: (state.app.player.data.profile || {}).personaname, officialPlayerName: (state.app.player.data.profile || {}).name, playerSoloCompetitiveRank: state.app.player.data.solo_competitive_rank, diff --git a/src/components/Player/Header/PlayerStats.jsx b/src/components/Player/Header/PlayerStats.jsx index 9dda2292dc..81f7e590ec 100644 --- a/src/components/Player/Header/PlayerStats.jsx +++ b/src/components/Player/Header/PlayerStats.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { connect } from 'react-redux'; // import ActionHelp from 'material-ui/svg-icons/action/help'; import styled from 'styled-components'; -import { Facebook } from 'react-content-loader'; +import Spinner from '../../Spinner'; import Error from '../../Error'; import PlayedWith from './PlayedWith'; import { PlayerStatsCard } from './Styled'; @@ -68,7 +68,7 @@ export const PlayerStatsCards = ({ return ; } if (loading) { - return ; + return ; } return (