From 123e36af3c4c9efa24195aced3027647bcc26db5 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Mon, 6 Jan 2025 15:08:57 +0000
Subject: [PATCH] fix: match signature request and message params ID (#5102)

## Explanation

Ensure the signature request `id` and message params `metamaskId` use
the same value so that legacy code using only the message params can
locate the associated signature request.

## References

## Changelog

### `@metamask/signature-controller`

- **FIXED**: Use same value for signature request `id` and message
params `metamaskId`.

## Checklist

- [x] I've updated the test suite for new or updated code as appropriate
- [x] I've updated documentation (JSDoc, Markdown, etc.) for new or
updated code as appropriate
- [x] I've highlighted breaking changes using the "BREAKING" category
above as appropriate
- [x] I've prepared draft pull requests for clients and consumer
packages to resolve any breaking changes
---
 packages/signature-controller/src/SignatureController.test.ts | 2 +-
 packages/signature-controller/src/SignatureController.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/signature-controller/src/SignatureController.test.ts b/packages/signature-controller/src/SignatureController.test.ts
index 368772bec26..3c903a87667 100644
--- a/packages/signature-controller/src/SignatureController.test.ts
+++ b/packages/signature-controller/src/SignatureController.test.ts
@@ -185,7 +185,7 @@ describe('SignatureController', () => {
 
     normalizePersonalMessageParamsMock.mockImplementation((params) => params);
     normalizeTypedMessageParamsMock.mockImplementation((params) => params);
-    uuidV1Mock.mockReturnValue(ID_MOCK);
+    uuidV1Mock.mockReturnValueOnce(ID_MOCK);
   });
 
   describe('unapprovedPersonalMessagesCount', () => {
diff --git a/packages/signature-controller/src/SignatureController.ts b/packages/signature-controller/src/SignatureController.ts
index b6a61f374dd..54b8f1e63ec 100644
--- a/packages/signature-controller/src/SignatureController.ts
+++ b/packages/signature-controller/src/SignatureController.ts
@@ -580,7 +580,7 @@ export class SignatureController extends BaseController<
 
     const metadata = {
       chainId,
-      id: random(),
+      id,
       messageParams: finalMessageParams,
       networkClientId,
       securityAlertResponse,