fix: handle arbitration missing

WFCD · Feb 18, 2023 · 68060ac · 68060ac · vercel · Feb 18, 2023
1 parent 65da0fe
commit 68060ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/components/panels/AggregatedTimePanel.jsx b/components/panels/AggregatedTimePanel.jsx
@@ -318,7 +318,9 @@ export default {
       return `${this.$t('time.Timer')}`;
     },
     isArbitrationActive() {
-      return dayjs(this.worldstate.arbitration.expiry).format('x') <= dayjs().format('x');
+      return (
+        !!this.worldstate.arbitration && dayjs(this.worldstate.arbitration.expiry).format('x') <= dayjs().format('x')
+      );
     },
     isSentientOutpostActive() {
       return this.worldstate.sentientOutposts.active;

diff --git a/store/worldstate.js b/store/worldstate.js
@@ -189,10 +189,11 @@ export const actions = {
       .concat(ws.conclaveChallenges.map((item) => item.id))
       .concat([ws.cetusCycle.id])
       .concat([ws.voidTrader.id])
-      .concat([`arbitration:${new Date(ws.arbitration.expiry).getTime()}`])
+      .concat(ws.arbitration && [`arbitration:${new Date(ws.arbitration.expiry).getTime()}`])
       // .concat(ws.persistentEnemies.map((enemy) => enemy.pid))
       .concat((ws.nightwave || { activeChallenges: [] }).activeChallenges.map((challenge) => challenge.id))
-      .concat([ws.sentientOutposts.id]);
+      .concat([ws.sentientOutposts.id])
+      .filter((id) => id);
     commit('notifiedIds', [newIds]);
   },
 };