Merge branch 'main' into dev

src/core/statistics/deltaTankStats.ts

@@ -4,12 +4,19 @@ import {
   emptyIndividualTankStats,
 } from '../../types/tanksStats';
 
-export function deltaTankStats(a: NormalizedTankStats, b: NormalizedTankStats) {
+export function deltaTankStats(
+  a: NormalizedTankStats,
+  b: NormalizedTankStats,
+  time?: number,
+) {
   const bTanks = Object.keys(b);
   const changedTanks = bTanks.filter((id) => {
     return (
       a[id as unknown as number]?.all.battles !==
-      b[id as unknown as number].all.battles
+        b[id as unknown as number].all.battles &&
+      (time === undefined
+        ? true
+        : b[id as unknown as number].last_battle_time > time)
     );
   });
   const diff = changedTanks.map((id) => {
@@ -24,7 +31,10 @@ export function deltaTankStats(a: NormalizedTankStats, b: NormalizedTankStats) {
       in_garage: bTank.in_garage,
       max_xp: Math.max(aTank.max_xp, bTank.max_xp),
       in_garage_updated: bTank.in_garage_updated,
-      last_battle_time: bTank.last_battle_time - aTank.last_battle_time,
+      last_battle_time: Math.max(
+        bTank.last_battle_time,
+        aTank.last_battle_time,
+      ),
       mark_of_mastery: bTank.mark_of_mastery,
       tank_id: bTank.tank_id,