MetaMask
diff --git a/‎app/components/UI/Card/hooks/useCardDelegation.test.ts‎
Lines changed: 97 additions & 131 deletions b/‎app/components/UI/Card/hooks/useCardDelegation.test.ts‎
Lines changed: 97 additions & 131 deletions
@@ -52,6 +52,7 @@ jest.mock('../../../../util/address', () => ({
 
 const mockFetchDelegationChallenge = jest.fn();
 const mockApproveFunding = jest.fn();
+const mockGenerateCardDelegationSignatureMessage = jest.fn();
 
 jest.mock('../../../../core/Engine', () => ({
   context: {
@@ -65,6 +66,8 @@ jest.mock('../../../../core/Engine', () => ({
       fetchDelegationChallenge: (...args: unknown[]) =>
         mockFetchDelegationChallenge(...args),
       approveFunding: (...args: unknown[]) => mockApproveFunding(...args),
+      generateCardDelegationSignatureMessage: (...args: unknown[]) =>
+        mockGenerateCardDelegationSignatureMessage(...args),
     },
   },
   controllerMessenger: {
@@ -169,6 +172,13 @@ describe('useCardDelegation', () => {
     });
     mockApproveFunding.mockResolvedValue(undefined);
 
+    // Default SIWE message returned by the (provider-backed) controller.
+    // Tests that need a different shape (e.g. Solana wording) override this.
+    mockGenerateCardDelegationSignatureMessage.mockReset();
+    mockGenerateCardDelegationSignatureMessage.mockReturnValue(
+      'mocked-siwe-message',
+    );
+
     // Setup metrics mock
     mockBuild = jest.fn().mockReturnValue({ event: 'mock-event' });
     mockAddProperties = jest.fn().mockReturnValue({ build: mockBuild });
@@ -209,18 +219,21 @@ describe('useCardDelegation', () => {
       ensureNetworkExists: mockEnsureNetworkExists,
     });
 
-    // Setup controllerMessenger mock to simulate transaction confirmation
-    Engine.controllerMessenger.subscribeOnceIf = jest
+    // Setup controllerMessenger mock to simulate transaction confirmation via
+    // the awaitTransactionConfirmed util (subscribe/unsubscribe pattern).
+    Engine.controllerMessenger.subscribe = jest
       .fn()
-      .mockImplementation((_eventName, callback, _filter) => {
-        // Immediately call the callback with a confirmed transaction
-        setImmediate(() => {
-          callback({
-            id: 'transaction-meta-id-123',
-            status: TransactionStatus.confirmed,
+      .mockImplementation((eventName, callback) => {
+        if (eventName === 'TransactionController:transactionConfirmed') {
+          setImmediate(() => {
+            callback({
+              id: 'transaction-meta-id-123',
+              status: TransactionStatus.confirmed,
+            });
           });
-        });
+        }
       });
+    Engine.controllerMessenger.unsubscribe = jest.fn();
 
     // Setup utility mocks
     mockToTokenMinimalUnit.mockReturnValue(100000000000000000000n);
@@ -602,17 +615,8 @@ describe('useCardDelegation', () => {
       const mockToken = createMockToken();
       const params = createMockDelegationParams();
 
-      Engine.controllerMessenger.subscribeOnceIf = jest
-        .fn()
-        .mockImplementation((_eventName, callback) => {
-          // Immediately call the callback with a confirmed transaction
-          setImmediate(() => {
-            callback({
-              id: 'transaction-meta-id-123',
-              status: TransactionStatus.confirmed,
-            });
-          });
-        });
+      // Default beforeEach already emits a confirmed event on subscribe;
+      // approveFunding will reject after confirmation completes.
 
       const { result } = renderHook(() => useCardDelegation(mockToken));
 
@@ -872,8 +876,8 @@ describe('useCardDelegation', () => {
   });
 
   describe('generateSignatureMessage', () => {
-    it('generates multi-line SIWE message for EVM networks', async () => {
-      const mockToken = createMockToken();
+    it('forwards EVM args to CardController.generateCardDelegationSignatureMessage and signs the returned message', async () => {
+      const mockToken = createMockToken({ caipChainId: 'eip155:59144' });
       const params = createMockDelegationParams();
 
       const { result } = renderHook(() => useCardDelegation(mockToken));
@@ -882,6 +886,13 @@ describe('useCardDelegation', () => {
         await result.current.submitDelegation(params);
       });
 
+      expect(mockGenerateCardDelegationSignatureMessage).toHaveBeenCalledWith({
+        network: params.network,
+        address: mockAddress,
+        nonce: mockNonce,
+        caipChainId: 'eip155:59144',
+      });
+
       const mockSignPersonalMessage = Engine.context.KeyringController
         .signPersonalMessage as jest.MockedFunction<
         typeof Engine.context.KeyringController.signPersonalMessage
@@ -892,26 +903,10 @@ describe('useCardDelegation', () => {
         signedMessageHex.slice(2),
         'hex',
       ).toString('utf8');
-
-      // Verify content
-      expect(signedMessage).toContain(`${mockAddress}`);
-      expect(signedMessage).toContain('Chain ID: 59144');
-      expect(signedMessage).toContain(`Nonce: ${mockNonce}`);
-      expect(signedMessage).toContain(
-        'metamask.app.link wants you to sign in with your Ethereum account:',
-      );
-
-      // Verify multi-line format for EVM (contains newlines)
-      expect(signedMessage).toContain('\n');
-      expect(signedMessage).toContain('\nURI:');
-      expect(signedMessage).toContain('\nVersion:');
-      expect(signedMessage).toContain('\nChain ID:');
-      expect(signedMessage).toContain('\nNonce:');
-      expect(signedMessage).toContain('\nIssued At:');
-      expect(signedMessage).toContain('\nExpiration Time:');
+      expect(signedMessage).toBe('mocked-siwe-message');
     });
 
-    it('generates SIWE message for Solana network', async () => {
+    it('forwards Solana args to CardController.generateCardDelegationSignatureMessage and signs via the Solana snap', async () => {
       const mockToken = createMockToken();
       const mockSolanaAddress = 'SolanaAddress123ABC';
       const mockAccountId = 'solana-account-uuid-123';
@@ -928,12 +923,14 @@ describe('useCardDelegation', () => {
         }),
       );
 
-      // Mock handleSnapRequest for both signCardMessage and approveCardAmount
+      mockGenerateCardDelegationSignatureMessage.mockReturnValue(
+        'mocked-solana-siwe',
+      );
+
       mockHandleSnapRequest
-        .mockResolvedValueOnce({ signature: 'mock-solana-signature' }) // signCardMessage
-        .mockResolvedValueOnce({ signature: mockTxSignature }); // approveCardAmount
+        .mockResolvedValueOnce({ signature: 'mock-solana-signature' })
+        .mockResolvedValueOnce({ signature: mockTxSignature });
 
-      // Mock controllerMessenger.subscribe for Solana stateChange
       (Engine.controllerMessenger.subscribe as jest.Mock).mockImplementation(
         (eventName: string, callback: (state: unknown) => void) => {
           if (eventName === 'MultichainTransactionsController:stateChange') {
@@ -963,34 +960,22 @@ describe('useCardDelegation', () => {
         await result.current.submitDelegation(params);
       });
 
-      // Get the message that was passed to signCardMessage
-      // handleSnapRequest is called with (controllerMessenger, requestObject)
+      expect(mockGenerateCardDelegationSignatureMessage).toHaveBeenCalledWith(
+        expect.objectContaining({
+          network: 'solana',
+          address: mockSolanaAddress,
+          nonce: mockNonce,
+        }),
+      );
+
       const signCardMessageCall = mockHandleSnapRequest.mock.calls[0];
       const requestObject = signCardMessageCall[1];
       const base64Message = requestObject.request.params.message;
-
-      // Decode from base64
       const message = Buffer.from(base64Message, 'base64').toString('utf8');
-
-      // Verify content
-      expect(message).toContain(mockSolanaAddress);
-      expect(message).toContain(
-        'metamask.app.link wants you to sign in with your Solana account:',
-      );
-      expect(message).toContain(`Nonce: ${mockNonce}`);
-      expect(message).toContain('Chain ID: 1');
-      expect(message).toContain('URI: https://metamask.app.link');
-      expect(message).toContain('Version: 1');
-      expect(message).toContain('Issued At:');
-
-      // Verify multi-line format (same structure as EVM, but without Expiration Time)
-      expect(message).toContain('\nURI:');
-      expect(message).toContain('\nVersion:');
-      expect(message).toContain('\nChain ID:');
-      expect(message).not.toContain('Expiration Time:');
+      expect(message).toBe('mocked-solana-siwe');
     });
 
-    it('extracts chain ID from token caipChainId', async () => {
+    it('forwards token caipChainId to the controller', async () => {
       const mockToken = createMockToken({ caipChainId: 'eip155:1' });
       const params = createMockDelegationParams();
 
@@ -1000,21 +985,12 @@ describe('useCardDelegation', () => {
         await result.current.submitDelegation(params);
       });
 
-      const mockSignPersonalMessage = Engine.context.KeyringController
-        .signPersonalMessage as jest.MockedFunction<
-        typeof Engine.context.KeyringController.signPersonalMessage
-      >;
-      const signCallArgs = mockSignPersonalMessage.mock.calls[0][0];
-      const signedMessageHex = signCallArgs.data;
-      const signedMessage = Buffer.from(
-        signedMessageHex.slice(2),
-        'hex',
-      ).toString('utf8');
-
-      expect(signedMessage).toContain('Chain ID: 1');
+      expect(mockGenerateCardDelegationSignatureMessage).toHaveBeenCalledWith(
+        expect.objectContaining({ caipChainId: 'eip155:1' }),
+      );
     });
 
-    it('uses default chain ID when caipChainId is not provided', async () => {
+    it('forwards undefined caipChainId when the token has none', async () => {
       const mockToken = createMockToken({ caipChainId: undefined });
       const params = createMockDelegationParams();
 
@@ -1024,18 +1000,9 @@ describe('useCardDelegation', () => {
         await result.current.submitDelegation(params);
       });
 
-      const mockSignPersonalMessage = Engine.context.KeyringController
-        .signPersonalMessage as jest.MockedFunction<
-        typeof Engine.context.KeyringController.signPersonalMessage
-      >;
-      const signCallArgs = mockSignPersonalMessage.mock.calls[0][0];
-      const signedMessageHex = signCallArgs.data;
-      const signedMessage = Buffer.from(
-        signedMessageHex.slice(2),
-        'hex',
-      ).toString('utf8');
-
-      expect(signedMessage).toContain('Chain ID: 59144');
+      expect(mockGenerateCardDelegationSignatureMessage).toHaveBeenCalledWith(
+        expect.objectContaining({ caipChainId: undefined }),
+      );
     });
   });
 
@@ -1094,9 +1061,12 @@ describe('useCardDelegation', () => {
         await result.current.submitDelegation(params);
       });
 
-      expect(Engine.controllerMessenger.subscribeOnceIf).toHaveBeenCalledWith(
+      expect(Engine.controllerMessenger.subscribe).toHaveBeenCalledWith(
         'TransactionController:transactionConfirmed',
         expect.any(Function),
+      );
+      expect(Engine.controllerMessenger.unsubscribe).toHaveBeenCalledWith(
+        'TransactionController:transactionConfirmed',
         expect.any(Function),
       );
     });
@@ -1109,16 +1079,18 @@ describe('useCardDelegation', () => {
         resolveConfirmation = resolve;
       });
 
-      Engine.controllerMessenger.subscribeOnceIf = jest
-        .fn()
-        .mockImplementation((_eventName, callback) => {
-          confirmationPromise.then(() => {
-            callback({
-              id: 'transaction-meta-id-123',
-              status: TransactionStatus.confirmed,
+      (Engine.controllerMessenger.subscribe as jest.Mock).mockImplementation(
+        (eventName, callback) => {
+          if (eventName === 'TransactionController:transactionConfirmed') {
+            confirmationPromise.then(() => {
+              callback({
+                id: 'transaction-meta-id-123',
+                status: TransactionStatus.confirmed,
+              });
             });
-          });
-        });
+          }
+        },
+      );
 
       const { result } = renderHook(() => useCardDelegation(mockToken));
 
@@ -1150,24 +1122,22 @@ describe('useCardDelegation', () => {
       expect(mockApproveFunding).toHaveBeenCalled();
     });
 
-    it('handles transaction failure in confirmation listener', async () => {
+    it('handles transaction failure via transactionFailed event', async () => {
       const mockToken = createMockToken();
       const params = createMockDelegationParams();
 
-      Engine.controllerMessenger.subscribeOnceIf = jest
-        .fn()
-        .mockImplementation((_eventName, callback) => {
-          // Immediately call the callback with a failed transaction
-          setImmediate(() => {
-            callback({
-              id: 'transaction-meta-id-123',
-              status: TransactionStatus.failed,
-              error: {
-                message: 'Transaction execution failed',
-              },
+      (Engine.controllerMessenger.subscribe as jest.Mock).mockImplementation(
+        (eventName, callback) => {
+          if (eventName === 'TransactionController:transactionFailed') {
+            setImmediate(() => {
+              callback({
+                error: 'Transaction execution failed',
+                transactionMeta: { id: 'transaction-meta-id-123' },
+              });
             });
-          });
-        });
+          }
+        },
+      );
 
       const { result } = renderHook(() => useCardDelegation(mockToken));
 
@@ -1178,29 +1148,25 @@ describe('useCardDelegation', () => {
       });
 
       expect(result.current.error).toBe('Transaction execution failed');
-      expect(Logger.error).toHaveBeenCalledWith(
-        expect.any(Error),
-        'Transaction failed',
-      );
       expect(mockApproveFunding).not.toHaveBeenCalled();
     });
 
-    it('handles transaction failure with generic message when error details not provided', async () => {
+    it('handles transaction failure with generic message when no error string provided', async () => {
       const mockToken = createMockToken();
       const params = createMockDelegationParams();
 
-      Engine.controllerMessenger.subscribeOnceIf = jest
-        .fn()
-        .mockImplementation((_eventName, callback) => {
-          // Immediately call the callback with a failed transaction without error details
-          setImmediate(() => {
-            callback({
-              id: 'transaction-meta-id-123',
-              status: TransactionStatus.failed,
-              error: undefined,
+      (Engine.controllerMessenger.subscribe as jest.Mock).mockImplementation(
+        (eventName, callback) => {
+          if (eventName === 'TransactionController:transactionFailed') {
+            setImmediate(() => {
+              callback({
+                error: '',
+                transactionMeta: { id: 'transaction-meta-id-123' },
+              });
             });
-          });
-        });
+          }
+        },
+      );
 
       const { result } = renderHook(() => useCardDelegation(mockToken));