fix lint and merge issues

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);

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()) {