From b1b7215532596acac7fe17fd83f65ca317dd8e7d Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Fri, 18 Sep 2020 18:08:17 -0400
Subject: [PATCH] fix lint and merge issues

---
 src/Login.js           | 6 +++---
 src/SecurityManager.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Login.js b/src/Login.js
index 0563952c5d..c04b086afa 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -25,7 +25,7 @@ import {
     cacheDehydrationKey,
     confirmToDismiss,
     getDehydrationKeyCache,
-} from "./CrossSigningManager";
+} from "./SecurityManager";
 import Matrix from "matrix-js-sdk";
 import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
 import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
@@ -173,8 +173,8 @@ export async function sendLoginRequest(hsUrl, isUrl, loginType, loginParams) {
         baseUrl: hsUrl,
         idBaseUrl: isUrl,
         cryptoCallbacks: {
-            getDehydrationKey
-        }
+            getDehydrationKey,
+        },
     });
 
     const data = await client.loginWithRehydration(null, loginType, loginParams);
diff --git a/src/SecurityManager.js b/src/SecurityManager.js
index e8bd63d2ff..967c0cc266 100644
--- a/src/SecurityManager.js
+++ b/src/SecurityManager.js
@@ -91,7 +91,7 @@ async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
     // if we dehydrated a device, see if that key works for SSSS
     if (dehydrationInfo.key) {
         try {
-            if (await MatrixClientPeg.get().checkSecretStorageKey(dehydrationInfo.key, info)) {
+            if (await MatrixClientPeg.get().checkSecretStorageKey(dehydrationInfo.key, keyInfo)) {
                 const key = dehydrationInfo.key;
                 // Save to cache to avoid future prompts in the current session
                 if (isCachingAllowed()) {