From e37d4f32e8b100201bb16af7762e671c2a907416 Mon Sep 17 00:00:00 2001
From: Blazebrain <davidadegoke16@gmail.com>
Date: Wed, 18 Jun 2025 18:51:40 +0100
Subject: [PATCH] refactor(solana): Remove redundant session request responses
 and simplify error handling in SolanaChainService

---
 .../solana/solana_chain_service.dart          | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_service.dart b/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_service.dart
index 076c63228..f7a57b51d 100644
--- a/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_service.dart
+++ b/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_service.dart
@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:blockchain_utils/base58/base58.dart';
 import 'package:blockchain_utils/blockchain_utils.dart' as blockchain_utils;
-import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/solana/solana_supported_methods.dart';
 import 'package:flutter/material.dart';
 import 'package:on_chain/solana/solana.dart';
@@ -91,8 +90,6 @@ class SolanaChainService {
       );
     }
 
-    await walletKit.respondSessionRequest(topic: topic, response: response);
-
     _handleResponseForTopic(topic, response);
   }
 
@@ -158,8 +155,6 @@ class SolanaChainService {
       );
     }
 
-    await walletKit.respondSessionRequest(topic: topic, response: response);
-
     _handleResponseForTopic(topic, response);
   }
 
@@ -221,8 +216,6 @@ class SolanaChainService {
       );
     }
 
-    await walletKit.respondSessionRequest(topic: topic, response: response);
-
     _handleResponseForTopic(topic, response);
   }
 
@@ -242,21 +235,14 @@ class SolanaChainService {
         topic,
         session!.peer.metadata.redirect,
         response.error?.message,
+        response.error == null,
       );
     } on ReownSignError catch (error) {
-      if (error.message.contains('No matching key')) {
-        MethodsUtils.handleRedirect(
-          topic,
-          session!.peer.metadata.redirect,
-          '${S.current.error_while_processing} ${S.current.youCanGoBackToYourDapp}',
-        );
-      } else {
-        MethodsUtils.handleRedirect(
-          topic,
-          session!.peer.metadata.redirect,
-          error.message,
-        );
-      }
+      MethodsUtils.handleRedirect(
+        topic,
+        session!.peer.metadata.redirect,
+        error.message,
+      );
     }
   }
 }