Address PR comments

src/components/ChallengeTabHeader.vue

@@ -15,9 +15,6 @@ export default {
       isAutoECVisible: false,
       showAllChallenges: false,
       autoEC: false,
-      remainingECTiers: 0,
-      untilNextEC: TimeSpan.zero,
-      untilAllEC: TimeSpan.zero,
     };
   },
   watch: {
@@ -35,14 +32,6 @@ export default {
       this.isShowAllVisible = PlayerProgress.eternityUnlocked();
       this.isAutoECVisible = Perk.autocompleteEC1.isBought;
       this.autoEC = player.reality.autoEC;
-      const remainingCompletions = EternityChallenges.remainingCompletions;
-      this.remainingECTiers = remainingCompletions;
-      if (remainingCompletions !== 0) {
-        const autoECInterval = EternityChallenges.autoComplete.interval;
-        const untilNextEC = Math.max(autoECInterval - player.reality.lastAutoEC, 0);
-        this.untilNextEC.setFrom(untilNextEC);
-        this.untilAllEC.setFrom(untilNextEC + (autoECInterval * (remainingCompletions - 1)));
-      }
     },
     restartChallenge() {
       const current = Player.anyChallenge;
@@ -94,26 +83,6 @@ export default {
         Exit Challenge
       </PrimaryButton>
     </div>
-    <div>
-      Some Normal Challenges have requirements to be able to run that challenge.
-    </div>
-    <div v-if="autoEC && isAutoECVisible">
-      Eternity Challenges are automatically completed sequentially, requiring all previous
-      Eternity Challenges to be fully completed before any progress is made.
-    </div>
-    <div
-      v-if="autoEC && isAutoECVisible && remainingECTiers > 0"
-      class="c-challenges-tab__auto-ec-info l-challenges-tab__auto-ec-info"
-    >
-      <div class="l-challenges-tab__auto-ec-timers">
-        <span v-if="remainingECTiers > 1">
-          Next Auto Eternity Challenge completion in: {{ untilNextEC }} (real time)
-        </span>
-        <span>
-          All Auto Eternity Challenge completions in: {{ untilAllEC }} (real time)
-        </span>
-      </div>
-    </div>
   </div>
 </template>
 

src/components/tabs/eternity-challenges/EternityChallengesTab.vue

@@ -13,18 +13,35 @@ export default {
   data() {
     return {
       unlockedCount: 0,
-      showAllChallenges: false
+      showAllChallenges: false,
+      autoEC: false,
+      isAutoECVisible: false,
+      remainingECTiers: 0,
+      untilNextEC: TimeSpan.zero,
+      untilAllEC: TimeSpan.zero,
     };
   },
   methods: {
     update() {
-      this.unlockedCount = [...Array(12).keys()]
-        .filter(id => this.isChallengeVisible(id + 1))
-        .length;
       this.showAllChallenges = player.options.showAllChallenges;
+      this.unlockedCount = EternityChallenges.all
+        .filter(this.isChallengeVisible)
+        .length;
+      this.isAutoECVisible = Perk.autocompleteEC1.isBought;
+      this.autoEC = player.reality.autoEC;
+      const remainingCompletions = EternityChallenges.remainingCompletions;
+      this.remainingECTiers = remainingCompletions;
+      if (remainingCompletions !== 0) {
+        const autoECInterval = EternityChallenges.autoComplete.interval;
+        const untilNextEC = Math.max(autoECInterval - player.reality.lastAutoEC, 0);
+        this.untilNextEC.setFrom(untilNextEC);
+        this.untilAllEC.setFrom(untilNextEC + (autoECInterval * (remainingCompletions - 1)));
+      }
     },
-    isChallengeVisible(id) {
-      const challenge = EternityChallenge(id);
+    isChallengeVisibleById(id) {
+      return this.isChallengeVisible(EternityChallenge(id));
+    },
+    isChallengeVisible(challenge) {
       return challenge.completions > 0 ||
         challenge.isUnlocked ||
         (this.showAllChallenges && PlayerProgress.realityUnlocked());
@@ -36,6 +53,23 @@ export default {
 <template>
   <div class="l-challenges-tab">
     <ChallengeTabHeader />
+    <div v-if="autoEC && isAutoECVisible">
+      Eternity Challenges are automatically completed sequentially, requiring all previous
+      Eternity Challenges to be fully completed before any progress is made.
+    </div>
+    <div
+      v-if="autoEC && isAutoECVisible && remainingECTiers > 0"
+      class="c-challenges-tab__auto-ec-info l-challenges-tab__auto-ec-info"
+    >
+      <div class="l-challenges-tab__auto-ec-timers">
+        <span v-if="remainingECTiers > 1">
+          Next Auto Eternity Challenge completion in: {{ untilNextEC }} (real time)
+        </span>
+        <span>
+          All Auto Eternity Challenge completions in: {{ untilAllEC }} (real time)
+        </span>
+      </div>
+    </div>
     <div>Complete Eternity Challenges again for a bigger reward, maximum of {{ formatInt(5) }} times.</div>
     <div v-if="unlockedCount !== 12">
       You have seen {{ formatInt(unlockedCount) }} out of {{ formatInt(12) }} Eternity Challenges.
@@ -46,7 +80,7 @@ export default {
     <ChallengeGrid
       v-slot="slotProps"
       :count="12"
-      :is-challenge-visible="isChallengeVisible"
+      :is-challenge-visible="isChallengeVisibleById"
     >
       <EternityChallengeBox :challenge-id="slotProps.challengeId" />
     </ChallengeGrid>

src/components/tabs/normal-challenges/NormalChallengesTab.vue

@@ -16,6 +16,9 @@ export default {
 <template>
   <div class="l-challenges-tab">
     <ChallengeTabHeader />
+    <div>
+      Some Normal Challenges have requirements to be able to run that challenge.
+    </div>
     <div>
       If you have an active Big Crunch Autobuyer, it will attempt to Crunch
       as soon as possible when reaching Infinite antimatter.