1
0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-06 18:57:56 +01:00

fix merge issues

This commit is contained in:
Jacob Fink 2023-07-07 11:10:15 -04:00
parent e789d6ec70
commit 89120532b2
No known key found for this signature in database
GPG Key ID: C2F7ACF05859D008

View File

@ -37,7 +37,7 @@ export class DeviceTrustCryptoService implements DeviceTrustCryptoServiceAbstrac
async trustDevice(): Promise<DeviceResponse> {
// Attempt to get user key
const userKey: UserKey = await this.cryptoService.getUserKeyFromMemory();
const userKey: UserKey = await this.cryptoService.getUserKey();
// If user key is not found, throw error
if (!userKey) {