From 73d2db479915ac3daa1a0ab6134717ff7b4ed8b4 Mon Sep 17 00:00:00 2001
From: Miodec <jack@monkeytype.com>
Date: Mon, 17 Apr 2023 16:37:31 +0200
Subject: [PATCH] moved the code responsible for removing trailing afk from
 bailed out tests to the test finish function

---
 frontend/src/ts/test/test-logic.ts | 5 +++++
 frontend/src/ts/test/test-stats.ts | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts
index b54b24077..5b4040612 100644
--- a/frontend/src/ts/test/test-logic.ts
+++ b/frontend/src/ts/test/test-logic.ts
@@ -1555,6 +1555,11 @@ export async function finish(difficultyFailed = false): Promise<void> {
 
   TestInput.forceKeyup(now); //this ensures that the last keypress(es) are registered
 
+  const endAfkSeconds = (now - TestInput.keypressTimings.spacing.last) / 1000;
+  if ((Config.mode == "zen" || TestInput.bailout) && endAfkSeconds < 7) {
+    TestStats.setEnd(TestInput.keypressTimings.spacing.last);
+  }
+
   TestUI.setResultCalculating(true);
   TestUI.setResultVisible(true);
   TestState.setActive(false);
diff --git a/frontend/src/ts/test/test-stats.ts b/frontend/src/ts/test/test-stats.ts
index ae69c7289..a30f7ddaf 100644
--- a/frontend/src/ts/test/test-stats.ts
+++ b/frontend/src/ts/test/test-stats.ts
@@ -186,16 +186,12 @@ export function setInvalid(): void {
 
 export function calculateTestSeconds(now?: number): number {
   if (now === undefined) {
-    const endAfkSeconds = (end - TestInput.lastKeypress) / 1000;
-    if ((Config.mode == "zen" || TestInput.bailout) && endAfkSeconds < 7) {
-      return (TestInput.lastKeypress - start) / 1000;
-    } else {
       return (end - start) / 1000;
-    }
   } else {
     return (now - start) / 1000;
   }
 }
+
 let avg = 0;
 export function calculateWpmAndRaw(): MonkeyTypes.WordsPerMinuteAndRaw {
   const start = performance.now();