From fb71ef7e8a463176033ad621cfd6241050322bda Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Tue, 27 Feb 2024 15:43:36 +0000
Subject: [PATCH] Pass the nonce lock at the initialization step

---
 app/scripts/metamask-controller.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b4456bc230fa..2adecdb4fe9e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1316,7 +1316,7 @@ export default class MetamaskController extends EventEmitter {
     this.on('controllerConnectionChanged', (activeControllerConnections) => {
       const { completedOnboarding } =
         this.onboardingController.store.getState();
-      if (activeControllerConnections > 0 && completedOnboarding && this.isUnlocked()) {
+      if (activeControllerConnections > 0 && completedOnboarding) {
         this.triggerNetworkrequests();
       } else {
         this.stopNetworkRequests();
@@ -1689,9 +1689,6 @@ export default class MetamaskController extends EventEmitter {
           networkControllerMessenger,
           'NetworkController:stateChange',
         ),
-        getNonceLock: this.txController.nonceTracker.getNonceLock.bind(
-          this.txController.nonceTracker,
-        ),
         confirmExternalTransaction:
           this.txController.confirmExternalTransaction.bind(this.txController),
         trackMetaMetricsEvent: this.metaMetricsController.trackEvent.bind(
@@ -2244,7 +2241,10 @@ export default class MetamaskController extends EventEmitter {
     this.accountTracker.delayedInit(this.blockTracker, this.provider);
     this.txController.delayedInit(this.provider, this.blockTracker);
     this.swapsController.delayedInit(this.provider);
-    this.smartTransactionsController.delayedInit(this.provider);
+    this.smartTransactionsController.delayedInit(
+      this.provider,
+      this.txController.nonceTracker.getNonceLock,
+    );
     this.detectTokensController.restartTokenDetection();
   }