feat: add toasts for non-success states (SDKConnectV2)

Author: ffmcgee725

app/core/SDKConnectV2/adapters/host-application-adapter.test.ts

@@ -118,6 +118,22 @@ describe('HostApplicationAdapter', () => {
       });
       expect(store.dispatch).toHaveBeenCalledTimes(1);
     });
+
+    it('dispatches an error notification when request is rejected or fails', () => {
+      adapter.showConnectionError(
+        createMockConnectionInfo('session-123', 'Test DApp'),
+      );
+
+      expect(showSimpleNotification).toHaveBeenCalledTimes(1);
+      expect(showSimpleNotification).toHaveBeenCalledWith({
+        id: 'session-123',
+        autodismiss: 5000,
+        title: 'sdk_connect_v2.show_error.title',
+        description: 'sdk_connect_v2.show_error.description',
+        status: 'error',
+      });
+      expect(store.dispatch).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('showReturnToApp', () => {

app/core/SDKConnectV2/adapters/host-application-adapter.ts

@@ -33,10 +33,10 @@ export class HostApplicationAdapter implements IHostApplicationAdapter {
     store.dispatch(hideNotificationById(conninfo.id));
   }
 
-  showConnectionError(): void {
+  showConnectionError(conninfo?: ConnectionInfo): void {
     store.dispatch(
       showSimpleNotification({
-        id: Date.now().toString(),
+        id: conninfo?.id || Date.now().toString(),
         autodismiss: 5000,
         title: strings('sdk_connect_v2.show_error.title'),
         description: strings('sdk_connect_v2.show_error.description'),

app/core/SDKConnectV2/services/connection.test.ts

@@ -331,5 +331,74 @@ describe('Connection', () => {
         responsePayload,
       );
     });
+
+    it('should show error toast when bridge response includes an error', async () => {
+      await Connection.create(
+        mockConnectionInfo,
+        mockKeyManager,
+        RELAY_URL,
+        mockHostApp,
+      );
+
+      const errorResponsePayload = {
+        data: {
+          id: 1,
+          jsonrpc: '2.0',
+          error: {
+            code: -32000,
+            message: 'User rejected the request',
+          },
+        },
+      };
+
+      // Simulate the RPCBridgeAdapter emitting an error response
+      onBridgeResponseCallback(errorResponsePayload);
+
+      // Should show error toast, not success toast
+      expect(mockHostApp.showConnectionError).toHaveBeenCalledTimes(1);
+      expect(mockHostApp.showConnectionError).toHaveBeenCalledWith(
+        mockConnectionInfo,
+      );
+      expect(mockHostApp.showReturnToApp).not.toHaveBeenCalled();
+
+      // And still send the error response to the client
+      expect(mockWalletClientInstance.sendResponse).toHaveBeenCalledTimes(1);
+      expect(mockWalletClientInstance.sendResponse).toHaveBeenCalledWith(
+        errorResponsePayload,
+      );
+    });
+
+    it('should show success toast for successful response with result', async () => {
+      await Connection.create(
+        mockConnectionInfo,
+        mockKeyManager,
+        RELAY_URL,
+        mockHostApp,
+      );
+
+      const successResponsePayload = {
+        data: {
+          id: 1,
+          jsonrpc: '2.0',
+          result: ['0x123'],
+        },
+      };
+
+      // Simulate the RPCBridgeAdapter emitting a success response
+      onBridgeResponseCallback(successResponsePayload);
+
+      // Should show success toast, not error toast
+      expect(mockHostApp.showReturnToApp).toHaveBeenCalledTimes(1);
+      expect(mockHostApp.showReturnToApp).toHaveBeenCalledWith(
+        mockConnectionInfo,
+      );
+      expect(mockHostApp.showConnectionError).not.toHaveBeenCalled();
+
+      // And still send the response to the client
+      expect(mockWalletClientInstance.sendResponse).toHaveBeenCalledTimes(1);
+      expect(mockWalletClientInstance.sendResponse).toHaveBeenCalledWith(
+        successResponsePayload,
+      );
+    });
   });
 });

app/core/SDKConnectV2/services/connection.ts

@@ -46,7 +46,16 @@ export class Connection {
 
       // If the payload includes an id, its a JSON-RPC response, otherwise its a notification
       if ('data' in payload && 'id' in payload.data) {
-        this.hostApp.showReturnToApp(this.info);
+        const responseData = payload.data;
+        // Check if the response is an error (JSON-RPC error responses have an 'error' property)
+        const isError =
+          'error' in responseData && responseData.error !== undefined;
+
+        if (isError) {
+          this.hostApp.showConnectionError(this.info);
+        } else {
+          this.hostApp.showReturnToApp(this.info);
+        }
       }
 
       this.client.sendResponse(payload);

app/core/SDKConnectV2/types/host-application-adapter.ts

@@ -23,10 +23,10 @@ export interface IHostApplicationAdapter {
   /**
    * Displays a global, non-interactive error modal.
    */
-  showConnectionError(): void;
+  showConnectionError(conninfo?: ConnectionInfo): void;
 
   /**
-   * Displays a "Return to App" toast notification.
+   * Displays a "Return to App" toast notification for successful requests.
    */
   showReturnToApp(conninfo: ConnectionInfo): void;