diff --git a/assets/js/updaters.js b/assets/js/updaters.js
index 902d59d9..1da85990 100644
--- a/assets/js/updaters.js
+++ b/assets/js/updaters.js
@@ -881,9 +881,7 @@ function updateInvasions() {
           $(`#${invasion.id}`).remove();
         } else {
           $(`#${invasion.id}_info`).html(`<b>${invasion.node}</b><br>${invasion.desc} ${endTimeEstimate}`);
-          const attackPercent =
-                Math.floor(((invasion.count + invasion.requiredRuns)
-                 / (invasion.requiredRuns * 2)) * 100);
+          const attackPercent = invasion.completion;
           const defendPercent = 100 - attackPercent;
 
           const attackBar = $(`#${invasion.id}_progress`).children()[0];
@@ -938,16 +936,13 @@ function updateInvasions() {
           }
         }
         invasionRow += '</div>';
-
         invasionRow += '<div class="row" style="margin-left:5px; margin-right:5px">';
 
         const runningTimeBadge = `<span class="timer" data-starttime="${moment(invasion.activation).unix()}">...</span>`;
         const progress = $(`<div class="progress" id="${invasion.id}_progress" data-html="true" data-placement="top" data-toggle="popover" title="Running time" style="cursor: pointer"></div>`);
         progress.attr('data-content', runningTimeBadge);
 
-        const attackPercent =
-              Math.floor(((invasion.count + invasion.requiredRuns)
-               / (invasion.requiredRuns * 2)) * 100);
+        const attackPercent = invasion.completion;
         const defendPercent = 100 - attackPercent;
         let attackWinning = '';
         let defendWinning = '';
@@ -968,7 +963,7 @@ function updateInvasions() {
           const sound = JSON.parse(localStorage.getItem('soundoptions') || '[]').includes('sound_invasion');
           const rewards = `${invasion.attackerReward.asString.length ? `${invasion.attackerReward.asString} vs ` : ''}${invasion.defenderReward.asString}`;
           sendNotification(
-            `${invasion.desc} • ${invasion.node}\n${invasion.attackingFaction} vs ${invasion.defendingFaction}\n${invasion.eta} Remaining`,
+            `${invasion.desc} • ${invasion.node}\n${invasion.attackingFaction} vs ${invasion.defendingFaction}\n${invasion.eta.replace('-Infinityd', '??').replace('Infinityd', '??')} Remaining`,
             `${rewards}`, sound ? 'audio/TextMessage_SingleDrumHit.mp3' : undefined,
           );
           addNotifiedId(invasion.id);