From 3c0d4fac766c3a31bdbebe4f7e88f83ba1ea58da Mon Sep 17 00:00:00 2001
From: Mo <mo@standardnotes.com>
Date: Fri, 23 Sep 2022 09:59:16 -0500
Subject: [PATCH] fix: biometrics timing loading (#1622)

---
 packages/snjs/lib/Application/Application.ts               | 4 ----
 packages/snjs/lib/Services/Protection/ProtectionService.ts | 7 ++-----
 .../Preferences/Panes/Security/BiometricsLock.tsx          | 7 ++-----
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/packages/snjs/lib/Application/Application.ts b/packages/snjs/lib/Application/Application.ts
index c8d6fb753..36342b081 100644
--- a/packages/snjs/lib/Application/Application.ts
+++ b/packages/snjs/lib/Application/Application.ts
@@ -960,10 +960,6 @@ export class SNApplication
       | undefined
   }
 
-  async loadMobileUnlockTiming() {
-    return this.protectionService.loadMobileUnlockTiming()
-  }
-
   getBiometricsTimingOptions() {
     return this.protectionService.getBiometricsTimingOptions()
   }
diff --git a/packages/snjs/lib/Services/Protection/ProtectionService.ts b/packages/snjs/lib/Services/Protection/ProtectionService.ts
index 3c7c345d5..52a0c6ff0 100644
--- a/packages/snjs/lib/Services/Protection/ProtectionService.ts
+++ b/packages/snjs/lib/Services/Protection/ProtectionService.ts
@@ -87,6 +87,8 @@ export class SNProtectionService extends AbstractService<ProtectionEvent> implem
   override handleApplicationStage(stage: ApplicationStage): Promise<void> {
     if (stage === ApplicationStage.LoadedDatabase_12) {
       this.updateSessionExpiryTimer(this.getSessionExpiryDate())
+      this.mobilePasscodeTiming = this.getPasscodeTiming()
+      this.mobileBiometricsTiming = this.getBiometricsTiming()
     }
     return Promise.resolve()
   }
@@ -284,11 +286,6 @@ export class SNProtectionService extends AbstractService<ProtectionEvent> implem
     return this.storageService.getValue(StorageKey.MobileScreenshotPrivacyEnabled, StorageValueModes.Default, false)
   }
 
-  loadMobileUnlockTiming(): void {
-    this.mobilePasscodeTiming = this.getPasscodeTiming()
-    this.mobileBiometricsTiming = this.getBiometricsTiming()
-  }
-
   private async validateOrRenewSession(
     reason: ChallengeReason,
     { fallBackToAccountPassword = true, requireAccountPassword = false } = {},
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/BiometricsLock.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/BiometricsLock.tsx
index f53ce8ae4..dec998720 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/BiometricsLock.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/BiometricsLock.tsx
@@ -19,10 +19,8 @@ const BiometricsLock = ({ application }: Props) => {
   const [biometricsTimingOptions, setBiometricsTimingOptions] = useState(() => application.getBiometricsTimingOptions())
 
   useEffect(() => {
-    const getHasBiometrics = async () => {
-      const appHasBiometrics = application.hasBiometrics()
-      setHasBiometrics(appHasBiometrics)
-    }
+    const appHasBiometrics = application.hasBiometrics()
+    setHasBiometrics(appHasBiometrics)
 
     const hasBiometricsSupport = async () => {
       const hasBiometricsAvailable = await (
@@ -30,7 +28,6 @@ const BiometricsLock = ({ application }: Props) => {
       ).getDeviceBiometricsAvailability?.()
       setSupportsBiometrics(hasBiometricsAvailable)
     }
-    void getHasBiometrics()
     void hasBiometricsSupport()
   }, [application])