Skip to content

Commit

Permalink
Merge pull request #3150 from jeyren95/fix/issue-3148
Browse files Browse the repository at this point in the history
Clear w/l display on player page switch
  • Loading branch information
howardchung authored Feb 7, 2024
2 parents 4539784 + 93d8070 commit 7b40abd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ build
.env
yarn.lock
src/*.d.ts
.vite
15 changes: 14 additions & 1 deletion src/components/Player/Header/PlayerHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,20 @@ const getRankTierMedal = (rankTier, leaderboardRank) => {
};

const PlayerHeader = ({
playerName, officialPlayerName, playerId, picture, registered, plus, loading, error, small, playerSoloCompetitiveRank, loggedInUser, rankTier, leaderboardRank, strings,
playerName,
officialPlayerName,
playerId,
picture,
registered,
plus,
loading,
error,
small,
playerSoloCompetitiveRank,
loggedInUser,
rankTier,
leaderboardRank,
strings,
}) => {
if (error) {
return <Error />;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Player/Header/PlayerStats.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ 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 Error from '../../Error';
import Spinner from '../../Spinner';
import Error from '../../Error';
import PlayedWith from './PlayedWith';
import { PlayerStatsCard } from './Styled';
import constants from '../../constants';
Expand Down Expand Up @@ -109,7 +109,7 @@ PlayerStatsCards.propTypes = {
};

const mapStateToProps = state => ({
loading: state.app.player.loading,
loading: state.app.playerWinLoss.loading,
error: state.app.player.error,
wins: state.app.playerWinLoss.data.win,
losses: state.app.playerWinLoss.data.lose,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Visualizations/Table/HeroImage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ class TableHeroImage extends React.Component {
this.setTooltipVisibility(false);
},
};

return (
<Styled style={expand}>
<HeroImageContainer>
Expand Down

0 comments on commit 7b40abd

Please sign in to comment.