diff --git a/packages/keychain/src/components/Container/index.tsx b/packages/keychain/src/components/Container/index.tsx
index 44b573ee7..a5b212cb7 100644
--- a/packages/keychain/src/components/Container/index.tsx
+++ b/packages/keychain/src/components/Container/index.tsx
@@ -44,7 +44,7 @@ export function Container({
           onClick={close}
         />
       )}
-      
+
       <Header chainId={chainId} onBack={onBack} hideAccount={hideAccount} />
 
       <VStack
diff --git a/packages/keychain/src/components/Transaction.tsx b/packages/keychain/src/components/Transaction.tsx
index 6f07c60ce..e0fe7fadd 100644
--- a/packages/keychain/src/components/Transaction.tsx
+++ b/packages/keychain/src/components/Transaction.tsx
@@ -6,7 +6,6 @@ import { StarkscanUrl } from "utils/url";
 import { CheckIcon, ExternalIcon, StarknetIcon, Loading } from "@cartridge/ui";
 import { useController } from "hooks/controller";
 import { useChainName } from "hooks/chain";
-import Account from "utils/account";
 
 export type TransactionState = "pending" | "success" | "error";
 
@@ -32,7 +31,6 @@ export function Transaction({
       let result: TransactionState = "pending";
       controller.account
         .waitForTransaction(hash, {
-          ...Account.waitForTransactionOptions,
           retryInterval: 8000,
         })
         .then(() => {
diff --git a/packages/keychain/src/components/connect/Login.tsx b/packages/keychain/src/components/connect/Login.tsx
index f107bb5c5..a3fa3f228 100644
--- a/packages/keychain/src/components/connect/Login.tsx
+++ b/packages/keychain/src/components/connect/Login.tsx
@@ -90,7 +90,17 @@ export function Login({
 
       setIsLoading(false);
     },
-    [chainId, rpcUrl, origin, policies, expiresAt, isSlot, log],
+    [
+      chainId,
+      rpcUrl,
+      origin,
+      policies,
+      expiresAt,
+      mode,
+      log,
+      onSuccess,
+      setController,
+    ],
   );
 
   return (