Skip to content

Commit

Permalink
Pass the nonce lock at the initialization step
Browse files Browse the repository at this point in the history
  • Loading branch information
pedronfigueiredo committed Feb 27, 2024
1 parent b678631 commit fb71ef7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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();
}

Expand Down

0 comments on commit fb71ef7

Please sign in to comment.