Update icon logic

w3champions · Aug 12, 2022 · f8c48f2 · f8c48f2
1 parent 8283655
commit f8c48f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/src/components/ladder/CountryRankingsGrid.vue b/src/components/ladder/CountryRankingsGrid.vue
@@ -392,26 +392,20 @@ export default class CountryRankingsGrid extends Vue {
     const playersInfo = ranking.playersInfo;
     if (!playersInfo) return this.$t("races.RANDOM");
     const playerInfo = playersInfo[playerIndex];
-    if (
-      CountryRankingsGrid.hasSelectedIcon(playerInfo) &&
-      playerInfo.selectedRace <= ERaceEnum.UNDEAD
-    ) {
+    if (CountryRankingsGrid.hasSelectedIcon(playerInfo)) {
       return this.$t(`races.${ERaceEnum[playerInfo.selectedRace]}`);
     } else {
       return this.$t(`races.${ERaceEnum[playerInfo.calculatedRace]}`);
     }
   }
 
   private static hasSelectedIcon(playerInfo: PlayerInfo) {
-    if (
+    return (
       playerInfo.selectedRace !== undefined &&
       playerInfo.selectedRace != null &&
       playerInfo.pictureId !== undefined &&
       playerInfo.pictureId != null
-    ) {
-      return playerInfo.selectedRace !== EAvatarCategory.TOTAL;
-    }
-    return false;
+    );
   }
 
   raceIcon(race: ERaceEnum) {

diff --git a/src/components/ladder/RankingsGrid.vue b/src/components/ladder/RankingsGrid.vue
@@ -364,26 +364,20 @@ export default class RankingsGrid extends Vue {
     const playersInfo = ranking.playersInfo;
     if (!playersInfo) return "Random";
     const playerInfo = playersInfo[playerIndex];
-    if (
-      RankingsGrid.hasSelectedIcon(playerInfo) &&
-      playerInfo.selectedRace <= ERaceEnum.UNDEAD
-    ) {
+    if (RankingsGrid.hasSelectedIcon(playerInfo)) {
       return this.$t(`races.${ERaceEnum[playerInfo.selectedRace]}`);
     } else {
       return this.$t(`races.${ERaceEnum[playerInfo.calculatedRace]}`);
     }
   }
 
   private static hasSelectedIcon(playerInfo: PlayerInfo) {
-    if (
+    return (
       playerInfo.selectedRace !== undefined &&
       playerInfo.selectedRace != null &&
       playerInfo.pictureId !== undefined &&
       playerInfo.pictureId != null
-    ) {
-      return playerInfo.selectedRace !== EAvatarCategory.TOTAL;
-    }
-    return false;
+    );
   }
 
   raceIcon(race: ERaceEnum) {