Code

chore: Resolve conflict v12.4.0#27541

Code

Merged

Gudahtt merged 8 commits intoVersion-v12.4.0MetaMask/metamask-extension:Version-v12.4.0from resolve-conflict-12.4.0MetaMask/metamask-extension:resolve-conflict-12.4.0Copy head branch name to clipboardOct 1, 2024

+13-13

Commits

Commits on Sep 26, 2024

• Version v12.3.1

  metamaskbot

  committed
  7e88180

  Copy full SHA for 7e88180

• fix: fix changes that were introduced in (#26807) but broken by 3e1094a (#27435)

  Show description for 5f93766
  

  danjm

  and

  matteoscurati

  authored
  5f93766

  Copy full SHA for 5f93766

Commits on Sep 27, 2024

• fix: duplicate network validation in 12.3 (#27463)

  Show description for 190572f
  bergeron

  authored
  190572f

  Copy full SHA for 190572f

• fix: Handle null return value from getMethodData to prevent destructuring error (#27457) (#27462)

  Show description for 31d1f14
  

  Gudahtt

  and

  pedronfigueiredo

  authored
  31d1f14

  Copy full SHA for 31d1f14

Commits on Sep 30, 2024

• chore: Update changelog for v12.3.1 (#27465)

  Show description for 98a6968
  Gudahtt

  authored
  98a6968

  Copy full SHA for 98a6968

• chore: Fix link in change entry (#27508)

  Show description for 2ede67e
  Gudahtt

  authored
  2ede67e

  Copy full SHA for 2ede67e

• Merge pull request #27434 from MetaMask/Version-v12.3.1

  Show description for 762b968
  Gudahtt

  authored
  762b968

  Copy full SHA for 762b968

Commits on Oct 1, 2024

• Merge branch 'master' into resolve-conflict-12.4.0

  chloeYue

  committed
  99811e0

  Copy full SHA for 99811e0