fix(issue-3148): removed extra loading condition in PlayerHeader

odota · Feb 7, 2024 · 93d8070 · 93d8070
1 parent 821084e
commit 93d8070
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git 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 <Error />;
   }
-  if (playerLoading || playerWinLossLoading) {
+  if (loading) {
     return <Facebook primaryColor="#666" secondaryColor="#ecebeb" width={400} height={60} animate />;
   }
 
@@ -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
@@ -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 <Error />;
   }
   if (loading) {
-    return <Facebook primaryColor="#666" secondaryColor="#ecebeb" width={400} height={60} animate />;
+    return <Spinner />;
   }
   return (
     <Styled>